Virgin import of FSF groff v1.19

511 files changed, 119296 insertions, 17879 deletions

diff --git a/contrib/groff/ChangeLog b/contrib/groff/ChangeLog
index 926b60b..ff97293 100644
--- a/contrib/groff/ChangeLog
+++ b/contrib/groff/ChangeLog
@@ -1,3 +1,1728 @@
+2003-04-29  Werner LEMBERG  <wl@gnu.org>
+
+	* VERSION: Set to 1.19.
+	* REVISION: Set to 0.
+	* doc/groff.texinfo, doc/webpage.ms, NEWS: Updated.
+
+	* src/devices/grohtml/post-html.cpp (html_printer::~html_printer):
+	Define charset as `US-ASCII' in html output.
+
+	* tmac/www.tmac (ULE): Add missing scaling indicator.
+
+	* win32-diffs: Removed.
+
+2003-04-28  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Document `dn' and `dl' registers if used with
+	`.da' and `.boxa'.
+	Document how to insert discardable whitespace with `.ss'.
+
+2003-04-27  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/pic/tex.cpp (tex_output::start_picture): Make code
+	work with plain TeX also.
+
+	* src/preproc/pic/pic.man, doc/pic.ms: Fix TeX code example.
+
+2003-04-25  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/devices/grohtml/post-html.cpp (html_printer::~html_printer):
+	Use a loose DTD.
+
+2003-04-24  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/pic/pic.man, doc/pic.ms: Explain how to get a
+	vbox with positive height and zero depth if in TeX mode.
+
+	* NEWS: Document glyph name changes for grodvi and grolj4.
+
+2003-04-23  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/pic/tex.cpp (tex_output::start_picture): Fix TeX code.
+	* doc/pic.ms: Fixed.
+
+2003-04-21  Werner LEMBERG  <wl@gnu.org>
+
+	HP-UX 10.20 has `snprintf' but it isn't declared.
+
+	* configure.ac: Add declaration test for snprintf.
+	* configure: Regenerated.
+	* src/include/lib.h: Handle `NEED_DECLARATION_SNPRINTF'.
+	* src/include/config.hin: Regenerated.
+
+2003-04-19  Werner LEMBERG  <wl@gnu.org>
+
+	Add keyword `figname' to pic, specifying the name of the picture
+	box in TeX mode.  Based on a patch from William J Poser
+	<wjposer@unagi.cis.upenn.edu>.
+
+	* src/preproc/pic/pic.y: New token `FIGNAME'.
+	(macro_name): New rule of type <str>.
+	(placeless_element): Handle `FIGNAME'.
+	* src/preproc/pic/lex.cpp (lookup_keyword): Add `figname'.
+	* src/preproc/pic/main.cpp (graphname): New global variable.
+	(do_picture): Initialize `graphname'.
+	* src/preproc/pic/pic.h: Updated.
+	* src/preproc/pic/tex.cpp (tex_output::start_picture): Use
+	`graphname'.
+	Simplify TeX code.
+	(tex_output::text): Beautify output.
+	* src/preproc/pic/object.cpp (object_spec::~object_spec): Deallocate
+	`shaded' and `outlined' unconditionally.
+	* NEWS, src/preproc/pic/pic.man, doc/pic.ms: Updated.
+	Minor improvements.
+
+	* PROBLEMS, README.CVS: Mention that bison version 1.875b or
+	greater is necessary.
+
+2003-04-17  Hartmut Henkel  <hartmut_henkel@gmx.de>
+
+	Add option -r to soelim to avoid emission of `.lf' lines.
+	Add option -t to produces TeX comment lines instead of `.lf' lines.
+
+	* src/preproc/soelim/soelim.cpp: New global variables `raw_flag'
+	and `tex_flag'.
+	(usage): Updated.
+	(main): Handle `-r' and `-t'.
+	(set_location): Handle `raw_flag' and `tex_flag'.
+	* src/preproc/soelim/soelim.man, NEWS: Updated.
+
+2003-04-17  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/hyphenex.sh: Replaced with...
+	* tmac/hyphenex.pl: This perl script to avoid sed compatibility
+	nightmares.
+
+	* aclocal.m4 (GROFF_HTML_PROGRAMS): Emit useful warning message
+	if --quiet is used for the configure script.
+	* configure: Regenerated.
+
+2003-04-16  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/post-html.cpp (text_glob::text_glob):
+	Add `const' to second argument.
+	(html_printer::add_table_end): Add `const' to argument.
+	* src/devices/grohtml/html-text.cpp (html_text::issue_tag): Add
+	`const' to arguments.
+	* src/devices/grohtml/html-text.h: Updated.
+
+	* src/devices/grolbp/charset.h (symset): Use `unsigned char'.
+	* src/devices/grolbp/lbp.h (lbpputc): Use `unsigned char' for
+	argument.
+
+	* src/devices/grotty/tty.cpp (tty_printer::make_rgb_string): Use
+	cast for integer constant.
+
+	* src/preproc/html/pre-html.cpp (image_device): Use `const'.
+	(writeNbytes): Add `const' to first argument.
+	(writeString): Add `const' to argument.
+	(char_buffer::can_see): Add `const' to third argument.
+	* src/preproc/html/pushback.cpp (pushBackBuffer::isString): Add
+	`const' to argument.
+	* src/preproc/html/pushback.h: Updated.
+
+	* src/preproc/soelim/soelim.cpp (include_list): Add `const'.
+	(include_path_append): Add `const' to argument.
+	(do_file): Updated.
+
+	* src/roff/troff/uniglyph.cpp (unicode_to_glyph_list): Use `const'
+	for `value'.
+	(unicode_to_glyph_init::unicode_to_glyph_init): Updated.
+	* src/roff/troff/uniuni.cpp (unicode_decompose_list): Use `const'
+	for `value'.
+	(unicode_decompose_init::unicode_decompose_init): Updated.
+	* src/roff/troff/glyphuni.cpp (glyph_to_unicode_list): Use `const'
+	for `value'.
+	(glyph_to_unicode_init::glyph_to_unicode_init): Updated.
+	* src/roff/troff/input.cc (process_startup_file): Add `const' to
+	argument.
+
+	* tmac/hyphenex.sh: Make script more portable by using a here
+	document.
+
+2003-04-15  Werner LEMBERG  <wl@gnu.org>
+
+	Renamed all `*.cc' files to `*.cpp'.
+	Updated all configuration files, makefiles, and documentation.
+
+2003-04-14  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/hyphenex.sh: Slight improvements.
+
+2003-04-13  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devascii/R.proto, font/devcp1037/R.proto,
+	font/devlatin1/R.proto, font/devutf8/R.proto: Fill up remaining
+	character slots with unnamed glyphs.
+
+	* tmac/an-old.tmac: Fix hyphenation value if `cR' is active.
+	(an-first): New global variable.
+	(an-header): Emit vertical space between multiple man pages.
+
+2003-04-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo, man/groff_out.man: \S only accepts integer
+	values.
+
+2003-04-10  Werner LEMBERG  <wl@gnu.org>
+
+	* PROBLEMS: Revised.
+
+2003-04-10  Bernd Warken  <bwarken@mayn.de>
+
+	* doc/webpage.ms: Improved.
+
+2003-04-09  Werner LEMBERG  <wl@gnu.org>
+
+	Add register \n[.height] which returns the value of \H.
+	Add register \n[.slant] which returns the value of \S.
+
+	* src/roff/troff/env.cc (init_env_requests): Implement.
+	* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
+	Document.
+
+2003-04-08  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/html.tmac: Move some of the data into html-end.tmac.
+	Remove most of the character translations for eqn since html fonts
+	now cover those characters.
+	Load www.tmac.
+	* tmac/html-end.tmac: New file.
+	* tmac/troffrc: Load html.tmac not www.tmac for -Thtml.
+	* tmac/troffrc-end: Load html-end.tmac not html.tmac for -Thtml.
+	* tmac/Makefile.sub (NORMALFILES): Add html-end.tmac.
+
+2003-04-07  Werner LEMBERG  <wl@gnu.org>
+
+	* man/groff_out.man: Document negative values of `N' if -Thtml is
+	used.
+
+2003-04-06  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.comm (depend.temp): Check location of YTABC.
+
+2003-04-05  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* contrib/mom/Makefile.sub (GROFFBIN): New variable for groff
+	binary path.
+	(groff_bin_path): Rename to GROFF_BIN_PATH.
+	(GROFF): Use GROFFBIN and GROFF_BIN_PATH.
+	* doc/Makefile.in (TROFFBIN): New variable for troff
+	binary path.
+	(GROFFBIN): New variable for groff binary path.
+	(groff_bin_path): Rename to GROFF_BIN_PATH.
+	(TROFF): Use TROFFBIN.
+	(GROFF): Use GROFFBIN and GROFF_BIN_PATH.
+	* doc/Makefile.sub (GROFFBIN): New variable for groff
+	binary path.
+	(groff_bin_path): Rename to GROFF_BIN_PATH.
+	(GROFF): Use GROFFBIN and GROFF_BIN_PATH.
+
+	* Makefile.comm (install_dev): Install scripts from DEVSCRIPTS
+	with INSTALL_SCRIPT.
+	(uninstall_dev): Uninstall scripts from DEVSCRIPTS.
+	* Makefile.dev (all): Depend on DEVSCRIPTS.
+	(install_dev): Likewise.
+	* font/devdvi/Makefile.sub (DEVSCRIPTS): New variable to hold
+	scripts.
+	* font/devps/Makefile.sub (DEVSCRIPTS): Likewise.
+	(DEVGENSCRIPTS): New variable to hold generated scripts.
+
+2003-04-05  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libdriver/input.cc (IntArray::operator[],
+	IntArray::get_data): Remove meaningless `const' in return value.
+
+	* README.CVS: New file.
+
+2003-04-04  Werner LEMBERG  <wl@gnu.org>
+
+	Check for stdint.h in C++, not in C.
+
+	* aclocal.m4 (GROFF_STDINT_H): New function,
+	* configure.ac: Check for stdint.h with GROFF_STDINT_H instead of
+	AC_CHECK_HEADERS.
+	* configure, src/include/config.hin: Regenerated.
+	* src/libs/libgroff/tmpname.cc: Use HAVE_CC_STDINT_H.
+
+
+	Fix handling of &nbsp; in grohtml.  To do this, troff emits `N'
+	with a negative value, representing the width of the unbreakable
+	space (only for -Thtml).  grohtml then converts this back to
+	&nbsp; and uses the value of N as its width.
+
+	* src/roff/troff/node.cc (space_char_hmotion_node::tprint,
+	unbreakable_space_node::tprint): Emit `N-<width>'.
+	* src/include/printer.h (printer::set_numbered_char): Make it
+	virtual.
+	Make members `font_table' and `nfonts' protected instead of private.
+	* src/devices/grohtml/post-html.cc
+	(html_printer::set_numbered_char): New member function.
+
+
+	* src/libs/libgroff/maxfilename.cc:
+	s/HAVE_LIMITS_H/HAVE_CC_LIMITS_H/.
+
+	* src/roff/troff/node.cc (unbreakable_space_node::tprint): Don't
+	emit word marker.
+
+2003-04-03  Sergey A. Osokin  <osa@freebsd.org.ru>
+
+	* man/roff.man: Small fixes.
+
+2003-04-03  Werner LEMBERG  <wl@gnu.org>
+
+	Make groff independent from locale's numeric settings.
+
+	* configure.ac: Check for `setlocale'.
+	* configure, src/include/config.hin: Regenerated.
+
+	* src/include/lib.h: Handle HAVE_SETLOCALE.
+
+	* src/devices/grodvi/dvi.cc (main), src/devices/grolj4/lj4.cc
+	(main), src/devices/grops/ps.cc (main), src/preproc/grn/main.cc
+	(main), src/preproc/pic/main.cc (main): Call `setlocale'.
+
+
+	* doc/groff.texinfo: Change dir category to `Typesetting'.
+	(Man font macros): Mention that there is no space between arguments
+	of .BI and friends.
+
+	* src/libs/libdriver/printer.cc, src/devices/grotty/tty.cc
+	(*printer::change_color, *printer::change_fill_color): Add missing
+	`const'.
+
+2003-04-02  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/html-table.cc (html_table::emit_col,
+	html_table::is_gap): Compute table widths after converting border
+	positions to avoid rounding errors.
+
+2003-04-01  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/html-text.cc (html_text::do_space): Handle
+	`space_emitted' properly.
+
+2003-03-31  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/html-table.cc: Fix column width calculation.
+	(html_table::set_linelength): Don't add 1.
+	(html_table::add_indent): Don't subtract 1.
+
+	* tmac/html.tmac: Set default page offset to zero.
+
+2003-03-30  Werner LEMBERG  <wl@gnu.org>
+
+	Make groff emit `&nbsp;' for `\ ' and `\~' if `-Thtml' is used.
+
+	* src/roff/troff/node.cc (space_char_hmotion_node::tprint,
+	unbreakable_space_node::tprint): New functions.
+	(troff_output_file): Make space_char_hmotion_mode::tprint and
+	unbreakable_space_node::tprint to friends.
+	* src/roff/troff/node.h: Updated.
+
+	* font/devhtml/R.proto: Add `&nbsp' at position 0xA0 (as defined
+	in the HTML standard).
+
+2003-03-29  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/env.cc (point_size): Fix emission of html tag.
+	Otherwise, the following code
+
+	  .di xxx
+	  .ps 10
+	  a
+	  .br
+	  .di
+	  x\*[xxx]
+
+	produces `x a' instead of `xa'.  This is a temporary fix, disabling
+	font changes in diversions for -Thtml.
+
+	* tmac/an-old.tmac (TH, SH): Use `HTML-TAG-NS' instead of
+	`HTML-TAG'.
+	(an-do-tag-html): Merge with ...
+	(an-do-tag): This macro.
+	Change code slightly to circumvent grohtml bug.
+	* tmac/troffrc-end: Define dummy for HTML-TAG-NS.
+
+	* src/devices/grohtml/html-table.cc (html_table::emit_col,
+	html_table::is_gap): Round `width' properly.
+
+	* tmac/html.tmac: Provide some default layout parameters for
+	grohtml.
+
+	* font/devhtml/DESC.proto: Don't use discrete values for `sizes'
+	command.
+
+2003-03-28  Werner LEMBERG  <wl@gnu.org>
+
+	src/devices/grops/ps.cc (ps_printer::do_import): Fix error message.
+
+2003-03-27  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac (BT): Don't call .tl if register `ps4html' is
+	defined.
+
+2003-03-20  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/env.cc (vertical_spacing): Allow zero value for
+	`.vs'.
+	* doc/groff.texinfo: Updated.
+
+2003-03-19  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc (process_input_stack) <TOKEN_BEGIN_TRAP,
+	TOKEN_END_TRAP>: Reset `have_input'.
+
+2003-03-18  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/groff/groff.man: Mention groff_trace man page.
+
+2003-03-16  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in (LIBEXT): New variable to indicate the file extension
+	of library files.  Computed heuristically from $(OBJEXT).
+	(MDEFINES): Add $(LIBEXT).
+	* Makefile.lib, Makefile.comm: Use it.
+
+	* src/utils/pfbtops/pfbtops.c (get_text): New function.  Split
+	overlong lines into smaller chunks.
+	(get_binary): New function.
+	(main): Use them.
+	* src/utils/pfbtops/pfbtops.man: Updated.
+
+2003-03-15  Colin Watson  <cjwatson@debian.org>
+
+	* src/roff/groff/groff.man: Minor syntax fix.
+
+2003-03-14  Egil Kvaleberg  <egil@kvaleberg.no>
+
+	* src/devices/grops/ps.cc (ps_printer::media_set,
+	ps_printer::~ps_printer): Handle zero paper width and length.
+
+2003-03-13  Werner LEMBERG  <wl@gnu.org>
+
+	Add options -p and -l to grodvi.
+
+	* src/devices/grodvi/dvi.cc: Include paper.h.
+	(landscape_flag, user_paper_length, user_paper_width): New global
+	variables.
+	(dvi_printer::begin_page): Emit `papersize' special.
+	Set color after initialization of `cur_h' and `cur_v'.
+	(main): Add options `-l' and `-p'.
+	* font/devdvi/Makefile.sub (DESC): Set `papersize'.
+	* src/devices/grodvi/grodvi.man, NEWS: Updated.
+
+	* src/devices/grops/psrm.cc (valid_input_table): Fixed.
+
+2003-03-12  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grops/grops.man: Move documentation of .PSPIC to...
+	* man/groff_tmac.man: This man page.
+	* man/groff_font.man: Declare `paperwidth' and `paperlength' as
+	deprecated.
+
+	* tmac/X.tmac: Don't load pspic.tmac.
+
+2003-03-11  Werner LEMBERG  <wl@gnu.org>
+
+	Make variable `pr' local to libdriver/input.cc.  Based on a patch
+	by Bernd Warken <bwarken@mayn.de>.
+
+	* src/include/driver.h (pr): Removed.
+
+	* src/libs/libdriver/input.cc (pr): New global variable.
+	(do_file): Deallocate `pr'.
+	* src/libs/libdriver/printer.cc (pr): Removed.
+
+	* src/devices/grodvi/dvi.cc (main), src/devices/grohtml/post-html.cc
+	(main), src/devices/grolbp/lbp.cc (main), src/devices/grolj4/lj4.cc
+	(main), src/devices/grops/ps.cc (main), src/devices/grotty/tty.cc
+	(main): Don't delete `pr'.
+
+2003-03-10  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/a4.tmac, tmac/composite.tmac: Use `.do'.
+	* tmac/papersize.tmac: New file.
+	* tmac/troffrc: Include `papersize.tmac'.
+	* tmac/Makefile.sub (NORMALFILES): Add `papersize.tmac'.
+	* tmac/an-old.tmac: Set LT to LL by default.
+
+	* NEWS, MANIFEST, tmac/groff_man.man, man/groff_tmac.man,
+	doc/groff.texinfo: Updated.
+
+	* src/libs/libgroff/paper.cc (add_iso_paper): Fix very embarassing
+	bug which caused all odd iso papers to have wrong dimensions.
+
+	* src/devices/grops/ps.cc (user_paper_width): New global variable.
+	(main) <'p'>: Set `user_paper_width' also.
+	(ps_printer::media_width, ps_printer::media_height): Use values
+	given with option `-p'.
+
+2003-03-09  Werner LEMBERG  <wl@gnu.org>
+
+	* src/include/nonposix.h: Provide default for SET_BINARY.
+
+	* src/devices/grodvi/dvi.cc, src/devices/grolbp/lbp.cc,
+	src/devices/grolj4/lj4.cc, src/devices/grops/ps.cc: Call SET_BINARY
+	unconditionally.
+
+	* src/utils/pfbtops/pfbtops.c: Call SET_BINARY unconditionally.
+	(main): Treat \r\n as \n.
+
+2003-03-08  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac: Use register `HY' to control hyphenation.
+	* NEWS, tmac/groff_man.man, doc/groff.texinfo: Document it.
+
+2003-03-07  Werner LEMBERG  <wl@gnu.org>
+
+	Added support to access more than 256 glyphs in Type 1 fonts.
+
+	* src/devices/grops/ps.cc (subencoding): New structure.
+	(style): Add `sub' field.
+	Updated all users.
+	(ps_printer): Add `subencodings' and `next_subencoding_index' fields.
+	Add `set_subencoding', `get_subfont' and `encode_subfont' member
+	functions.
+	Updated all users.
+	(ps_printer::set_char): Use `set_subencoding'.
+	(make_subencoding_name): New function.
+	(ps_printer::set_style): Handle case where `sty.sub' is not zero.
+	(ps_printer::~ps_printer): Emit subencoding definitions.
+
+	* src/devices/grops/psrm.cc (valid_input_table): New array to
+	properly support EBCDIC.
+	(white_space): Add `\f'.
+	(ps_get_line): Change first argument to be of type `string &'.
+	Updated all callers.
+	This allows to get lines of arbitrary length.
+	Use `valid_input_table'.
+	Remove warning about non-conforming PS line length.  This seems
+	not to be of great importance -- for example, dvips don't emit
+	a warning either.
+	(PS_LINE_MAX): Removed.
+	(matches_comment): Change first argument to be of type `string &'.
+
+	* src/devices/grops/grops.man, src/devices/grops/TODO: Updated.
+
+	* src/utils/afmtodit/afmtodit.pl (%unicode_decomposed,
+	%AGL_to_unicode, %default_ligatures): New hash tables.
+	Read all map entries.
+	Add unencoded characters.
+	Check for default ligatures if there are no `L' entries.
+	Print all kern entries.
+	Print all characters in charset.
+	* src/utils/afmtodit/afmtodit.man: Updated.
+
+	* font/devps/*: Regerated all fonts.
+
+	* tmac/latin[129].tmac, tmac/cp1047.tmac: Don't test for existence
+	of characters, just use `.trin'.  Otherwise the mapping depends
+	on the font encoding.
+	* tmac/ps.tmac: Add `fi' and `fl'.
+	Improve `Fi' and `Fl'.
+	* tmac/X.tmac, tmac/lbp.tmac, tmac/tty.tmac: Improve `Fi' and `Fl'.
+	* tmac/Xps.tmac: Fix `em'.
+
+	* NEWS: Updated.
+
+2003-03-04  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc (charinfo_to_node_list): Reset
+	`have_input'.
+
+2003-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.sub (DISTCLEANFILES): Add gxditview._man.
+
+	* font/devps/generate/textmap: Remove entry `similarequal'.
+	* font/devps/symbolmap: Updated.
+
+2003-03-02  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libgroff/font.cc (font::load): Fix error message for
+	bad character type.
+
+	* src/devices/grops/grops.man: Improve documentation of the -b
+	flag.
+
+	* tmac/tty.tmac: Load latin1.tmac for all TTY devices except
+	`ascii' and `cp1047'.
+
+2003-03-01  Werner LEMBERG  <wl@gnu.org>
+
+	Document composite glyphs and the `composite' request.
+
+	* man/groff.man, man/groff_diff.man, doc/groff.texinfo: Do it.
+
+2003-02-28  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate/ec.map: Add some more Unicode entities.
+	* font/devdvi/*EC: Updated.
+
+	* tmac/composite.tmac, tmac/latin2.tmac, tmac/latin9.tmac: New files.
+	* tmac/latin1 (latin1-tr): Undo any previous mapping.
+	* tmac/troffrc: Load `composite.tmac'.
+	* tmac/Makefile.sub (NORMALFILES): Updated.
+
+	* doc/groff.texinfo (Input Encodings): New section.
+	* NEWS: Updated.
+
+2003-02-27  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/texinfo.tex: New version 2003-02-11.06.
+
+	* tmac/doc-common (Dt): Don't emit warning for unknown section.
+	* tmac/groff_mdoc.man: Fix description of `Dt'.
+
+2003-02-26  Egil Kvaleberg  <egil@kvaleberg.no>
+
+	* font/devps/prologue.ps: Fix for included Postscript that does
+	a setpagedevice -- which is now safely ignored.
+
+	* NEWS: Updated.
+
+	* src/devices/grops/ps.cc: Now sets the page size in the generated
+	document.  This is done in two ways: Via a %%-comment for gv and
+	the like, and via a PageSize and setpagedevice for programs that
+	understands Postscript proper, like ps2pdf.
+
+	* src/devices/grops/ps.h: New broken-flag to avoid page size
+	definition, if required.
+
+	* src/devices/grops/grops.man: New broken-flag 16 mentioned.
+
+	* doc/Makefile.in: Added -nosetpage flag (via @pnmtops_nosetpage@).
+	Not really necessary due to the fix in prologue.ps, but cleaner:
+	Such information does not belong in an .eps file.
+
+	* doc/Makefile.sub: See doc/Makefile.in.
+
+2003-02-26  Ralph Corderoy  <ralph@inputplus.co.uk>
+
+	* aclocal.m4 (GROFF_PNMTOPS_NOSETPAGE): Use P2 format for testing
+	instead of P1 since the latter is broken in some versions of netpbm.
+	* configure: Updated.
+
+2003-02-26  Larry Kollar  <kollar@alltel.net>
+
+	Make man pages more customizable.
+
+	* tmac/an-old.tmac (FT): New register holding footer distance from
+	bottom.
+	(HF): New string holding the default heading font.
+	(TH): Handle registers `IN' and `SN' set on the command line.
+	Use `FT'.
+	(PT, BT): New strings to customize header and footer lines.
+	(an-header, an-footer): Use them.
+	(SH, SS): Use `HF'.
+	* tmac/groff_man.man: Document changes.
+
+	* doc/groff.texinfo: Document man changes.
+	Document Ultrix extensions of man.
+
+2003-02-26  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc (do_width, do_if_request): Reset
+	`have_input' after changing back to old environment.
+
+	* src/devices/grolbp/lbp.cc (lbp_printer::set_line_thickness): Move
+	function up to be defined before first call.  This is necessary to
+	avoid a compilation problem with Sun's WorkShop 6 C++ compiler.
+
+	* src/utils/afmtodit/afmtodit.pl: Make script search for files in
+	the default font directory also.  Based on a patch from James
+	J. Ramsey <jjramsey_6x9eq42@yahoo.com>.
+	* src/utils/afmtodit/Makefile.sub (afmtodit): Handle @FONTDIR@.
+	* src/utils/afmtodit/afmtodit.man: Document it.
+
+	* NEWS: Updated.
+
+	* tmac/groff_man.man, doc/groff.texinfo: Many minor fixes.
+
+2003-02-25  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* aclocal.m4 (GROFF_HTML_PROGRAMS): Add test for pnmtops.
+	(GROFF_PNMTOPS_NOSETPAGE): New macro.
+	* configure.ac: Use it.
+	* configure: Regenerated.
+	* Makefile.in: Updated.
+
+	* tmac/Makefile.sub (NORMALFILES): Remove www.tmac.
+	(CLEANADD): Add www.tmac-sed.
+	(pnmtops_nosetpage): Define default.
+	(install_data): Handle www.tmac-sed and substitute
+	@PNMTOPS_NOSETPAGE@.
+	(stamp-sed): Add www.tmac.
+	* tmac/www.tmac: Rewritten, based on a patch by Bernd Warken.
+	It now breaks URLs at suitable places.
+	(www:substring_ok): New register set by...
+	(www:@test_substring): New macro.
+	(www:error): New alias to www-error.
+	(www:lenstr, www:splitstr, www:url_breaks, www:url_breaks_splitted):
+	New macros.
+	(URL): Use www:url_breaks.
+	(PIMG, MPIMG): Use @PNMTOPS_NOSETPAGE@.
+	(CDS, CDE): New macros.
+
+2003-02-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grops/ps.cc (ps_printer::define_encoding): Avoid
+	buffer overflow.
+
+2003-02-24  Werner LEMBERG  <wl@gnu.org>
+
+	Contrary to the PCL5 Developer's Guide, the ascenders in TFM files
+	can be negative also.
+
+	* src/utils/hpftodit/hpftodit.cc (char_info): `ascent' must be
+	`int16'.
+	(read_char_table): Avoid negative ascenders.
+	(output_charset): Add cast.
+	* font/devlj4/*: Regenerated.
+
+	Replace unnamed glyphs for DVI fonts with `uXXXX' glyph names where
+	possible.
+
+	* font/devdvi/generate/{tc,texttt,ec,texmi,texsy,textex}.map: Do it.
+	* font/devdvi/generate/textex.map: Map glyph 23 to `u21C6' instead
+	of `<>'.
+	* font/devdvi/*: Regenerated.
+
+	Map `la' and `ra' to U+27E8 and U+27E9.  These two characters have
+	normal width, while the previously used characters (U+2329 and
+	U+232A) are classified as wide due to canonical equivalence with the
+	CJK punctuation characters U+3008 and U+3009.
+
+	* font/devutf8/R.proto: Updated.
+	* src/roff/troff/uniglyph.cc, src/roff/troff/glyphuni.cc: Ditto.
+
+	* man/groff_char.man: Simplify handling of table traps by
+	introducing `start block' and `end block' macros.
+	(Ns, Ne, 2s, 2e, Ds, De): New macros.
+	(DL): Make it work with Unix troff also.
+	Fix code values of `la' and `ra'.
+
+	* tmac/dvi.tmac: Define `<>' for CW and CWI.
+
+2003-02-23  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/devices/grohtml/post-html.cc (element_list::~element_list):
+	New destructor, fixing a major memory leak.
+
+2003-02-22  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devhtml/R.proto, font/devutf8/R.proto: Flip `*f' and `+f'
+	to be in conformance with Unicode 3.0 and newer.
+
+	* font/devlj4/generate/text.map: Add `Eu'.
+	* font/devlj4/generate/special.map: Flip `*e' and `+e'.
+	* font/devlj4/S: Regenerated.
+
+	* man/groff_char.man: Completely rewritten.
+
+	* doc/groff.texinfo: Fix description of request and macro arguments.
+
+2003-02-20  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Valgrind fixes.
+
+	* src/devices/grohtml/html-table.cc (html_table::~html_table):
+	Deallocate `columns' list.
+	* src/devices/grohtml/post-html.cc (char_block::~char_block):
+	New destructor.
+	(text_glob::text_glob_html, text_glob::text_glob_special,
+	text_glob::text_glob_line, text_glob::text_glob_auto_image,
+	text_glob::text_glob_tag): Avoid memory leaks.
+	(text_glob::remember_table): Free memory before reassigning.
+
+2003-02-19  Werner LEMBERG  <wl@gnu.org>
+
+	Add glyph `+e', greek lunate epsilon symbol, and `-h' (with the
+	alias `hbar'), the Planck constant over two pi.
+
+	* font/devdvi/generate/texmi.map: Use `*e' for position 15 and
+	`+e' for position 34.
+	* font/devdvi/generate/texsy.map: Replace `DI' and `HE' with
+	`u2662' and `u2661'.
+	* font/devdvi/{MI,S}: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `+e', `-h', `hbar'.
+	* font/devlbp/*: Add `hbar' alias.
+	* font/devlj4/generate/special.map: Ditto.
+	* font/devlj4/S: Regenerated.
+	* font/devps/generate/symbolchars: Add `+e'.
+	* font/devps/generate/textmap: Fix PS name for `-h'.
+	Add `hbar' alias.
+	* font/devps/symbolmap: Regenerated.
+
+	* src/devices/grops/ps.cc (transform_fill): Removed since unused.
+
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Add `+e',
+	`-h', `hbar'.
+	* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Add `+e',
+	`-h'.
+
+	* tmac/X.tmac, tmac/ps.tmac: Provide definitions for `-h' and
+	`hbar'.
+	* tmac/tty-char.tmac: Add `+e'.
+
+2003-02-17  Werner LEMBERG  <wl@gnu.org>
+
+	Another round trying to really fix problems with `have_input'.
+
+	* src/roff/troff/input.cc (input_stack::get): Handle `have_input'.
+	(token::next) <'\n'>, <\'\n'>: Don't handle `have_input'.
+
+	* src/devices/grotty/tty.cc (tty_printer::put_color): Fix color
+	handling if both foreground and background colors are default.
+
+	* doc/groff.texinfo (Debugging): Document .lf differences to
+	AT&T troff.
+
+2003-02-16  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grotty/tty.cc (tty_printer::make_rgb_string): Avoid
+	null-bytes in created string.
+
+	* src/roff/troff/input.cc (lookup_color, interpolate_macro,
+	alias_macro, lookup_request): Improve warning messages.
+
+	* src/roff/troff/node.cc (suppress_node::tprint): Use `strsave',
+	not `strdup'.
+	Free `last_image_filename'.
+
+	* src/preproc/html/pre-html.cc (char_block::char_block): Initialize
+	`buffer'.
+	(imageList::createPage, imageList::createImage): Use `free', not
+	`a_delete'.
+	(imageItem::~imageItem): Free `imageName'.
+	(addRegDef): Use `strsave', not `strdup'.
+	(get_resolution): Free `pathp'.
+
+2003-02-15  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grotty/tty.cc (tty_printer::tty_printer): Fix pointer
+	to `dummy'.
+
+2003-02-14  Werner LEMBERG  <wl@gnu.org>
+
+	Add memory management for colors to deallocate unnamed colors
+	properly.
+
+	* src/include/color.h (color): New members `free_list' and `next'.
+	New member functions `new' and `delete'.
+	Add destructor.
+	* src/libs/libgroff/color.cc: Implement it.
+
+	* src/libs/libgroff/font.cc (font::add_kern): Use integer cast
+	for array size of new operator.
+
+	* src/libs/libdriver/input.cc (IntArray::operator[]): Remove
+	redundant comparison.
+
+	* src/roff/troff/input.cc (word_space_node::reread,
+	hmotion_node::reread): Avoid warning about unused parameter.
+	(reset_output_registers): Remove redundant parameter.
+	(define_color): Undo change 2003-02-12.
+
+	* src/roff/troff/reg.h: Updated.
+
+	* src/roff/troff/node.cc (troff_output_file::really_print_line,
+	output_file::put_filename, real_output_file::really_put_filename,
+	ascii_output_file::really_print_line,
+	break_char_node::get_hyphen_list): Avoid warning about unused
+	parameter.
+	(suppress_node::tprint): Updated.
+
+	* configure.ac: Check declaration for rand() and srand().
+	* configure: Regenerated.
+
+	* src/preproc/pic/pic.h: Declare fmod(), rand(), and srand()
+	conditionally.
+	* src/preproc/pic/pic.y: Remove declaration of fmod(), rand(),
+	and srand().
+
+	* src/preproc/eqn/delim.cc (delim_table): Add missing initializers
+	to avoid compiler warnings.
+
+	* src/preproc/grn/hgraph.cc (HGPrintElt): Second parameter is
+	unused.
+
+	* src/devices/grops/ps.cc (ps_printer::set_char): Last parameter
+	is unused.
+	* src/devices/grops/psrm.cc (skip_possible_newline): Remove first
+	(unused) parameter.
+	Updated all callers.
+
+	* src/devices/grotty/tty.cc (tty_printer::set_char): Last parameter
+	is unused.
+	* src/devices/grodvi/dvi.cc (dvi_printer::set_char): Ditto.
+	* src/devices/grolj4/lj4.cc (lj4_printer::set_char): Ditto.
+
+	* src/devices/grohtml/post-html.cc (html_printer::emit_line):
+	Parameter is unused.
+	(html_printer::add_table_end): Define parameter conditionally.
+	* src/devices/grohtml/output.cc (simple_output::special): Parameter
+	is unused.
+
+	* src/devices/grolbp/lbp.cc: Define _GNU_SOURCE conditionally.
+	(lbp_printer::set_char): Last parameter is unused.
+
+	* src/utils/indxbib/indxbib.cc (main): Remove redundant comparison.
+
+2003-02-13  Werner LEMBERG  <wl@gnu.org>
+
+	New commands \D'Fr ...', \D'Fc ...', etc. for orthogonality.
+	Make \D'f ...' move horizontally again for backwards compatibility.
+	Replace it with \D'Fg ...' where appropriate to avoid dependency
+	on horizontal resolution.
+
+	* src/roff/troff/input.cc (do_get_long_name): New function.
+	(get_long_name): Call it.
+
+	(read_draw_node): Handle `\D'Fx ...' by calling ...
+	(read_color_draw_node): New function.
+
+	(read_rgb, read_cmy, read_cmyk, read_gray): New optional argument
+	`end'.
+	Pass it to `do_get_long_name' which is used instead of
+	`get_long_name'.
+
+	* src/libs/libdriver/input.cc (color_from_Df_command): Remove
+	unnecessary value guard.
+	(parse_D_command) <'f'>: Add horizontal shift.
+
+	* src/preproc/grn/hgraph.cc (HGPrintElt) <POLYGON>: Use \D'Fg ...'.
+	* src/preproc/pic/troff.cc (troff_output::set_fill): Ditto.
+	(FILL_MAX): Removed.
+
+	* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
+	Updated.
+
+2003-02-12  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc (do_name_test, do_expr_test,
+	do_zero_width): Push `\n' if closing delimiter is missing.
+
+	(token::next) <ESCAPE_NEWLINE>, <'\n'>, <\'\n'>: Reset `have_input'.
+	<'F'>: Make \F non-transparent at the beginning of line.
+	(process_input_stack) <token::TOKEN_CHAR, token::TOKEN_NEWLINE,
+	token::TOKEN_REQUEST, token::TOKEN_BEGIN_TRAP>: Don't handle
+	`have_input'.
+
+	(define_color): Free color in case of reassignment.
+
+	* doc/groff.texinfo (@Defesc, @DefescList, @DefescItem,
+	@DefescListEnd): Use @Var, not @var.
+	Fix all calls.
+
+	* src/preproc/grn/hgraph.cc (HGPrintElt): Fix typo.
+
+	* src/preproc/pic/object.cc (object_spec::~object_spec): Free
+	`shaded' and `outlined' arrays.
+	(object_spec::object_spec): Initialize `shaded' and `outlined'.
+	(graphic_object::set_fill_color, graphic_object::set_outline_color):
+	Use strsave.
+	(closed_object::set_fill_color): Ditto.
+	* src/preproc/pic/troff.cc (troff_output::set_color): Use strsave
+	instead of strdup.
+	(troff_output::reset_color): Use a_delete instead of free.
+	* src/preproc/pic/main.cc (do_file): Free `out' in case of error.
+
+2003-02-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Improve documentation of `ad'.
+	Document that \D'f...' is dependent on the horizontal resolution.
+	* man/groff_diff.man: Improve documentation of \D'f...'.
+
+	* src/preproc/grn/hgraph.cc (HGPrintElt) <POLYGON>: Don't emit
+	compensating \h'...' for \D'f ...' since the latter no longer moves
+	current position.
+	* src/preproc/pic/troff.cc (troff_output::set_fill): Ditto.
+
+2003-02-10  Werner LEMBERG  <wl@gnu.org>
+
+	Improve error messages for `x F' (and `F') commands.
+
+	* src/include/error.h: Add declaration for
+	`current_source_filename'.
+	* src/libs/libgroff/filename.cc: Add `current_source_filename'.
+	* src/libs/libgroff/error.cc (do_error_with_file_and_line): Add
+	parameter for source file string.
+	Updated all callers.
+
+	* src/libs/libdriver/input.cc: Add `current_source_filename'.
+	(remember_source_filename): New function.
+	(parse_x_command <'F'>, do_file <'F'>): Use it.
+
+2003-02-09  Werner LEMBERG  <wl@gnu.org>
+
+	Make grotty not emit warnings about unknown colors more than
+	necessary.
+
+	* src/devices/grotty/tty.cc: Include `ptable.h'.
+	(TTY_MAX_COLORS): Removed.
+	(DEFAULT_COLOR_IDX): Defined to -1.
+	(glyph): Change `back_color_idx' and `fore_color_idx' to `char'.
+	(tty_printer): Change `curr_back_idx' and `curr_fore_idx' to `char'.
+	Change `tty_colors' to be a ptable.
+	First arg of `put_color' is now `char'.
+	New functions `make_rgb_string' and `tty_color'.
+	(tty_printer::tty_printer): Use `tty_color'.
+	(tty_printer::color_to_idx): Return value is now `char'.
+	Use `tty_color'.
+
+	* src/include/color.h (color): Add `print_color' member function.
+	* src/libs/libgroff/color.cc (color::print_color): Implement it.
+
+2003-02-08  Werner LEMBERG  <wl@gnu.org>
+
+	Valgrind fixes.
+
+	* src/devices/grops/ps.cc (ps_printer::define_encoding): Close
+	encoding file.
+
+	* src/include/ptable.h (PTABLE::~PTABLE, PTABLE::define): Always
+	assume that value has been allocated with `new[]', thus use
+	`a_delete' for deallocation.
+
+	* src/libs/libdriver/input.cc (get_integer_arg,
+	get_possibly_int_args, parse_x_command, do_file): Use `a_delete'
+	where appropriate.
+
+	* src/libs/libgroff/new.cc (delete) [!COOKIE_BUG]: Define.
+	* src/libs/libgroff/nametoindex.cc
+	(character_indexer::named_char_index): Use `new <type>[1]'.
+
+	* src/preproc/eqn/lex.cc (init_table, do_definition): Use `new
+	<type>[1]'.
+	* src/preproc/eqn/text.cc (set_special_char_type): Ditto.
+	(split_text): Use `a_delete'.
+
+	* src/preproc/pic/pic.y (define_label, define_variable): Use `new
+	<type>[1]'.
+
+	* src/roff/troff/env.cc (environment::choose_breakpoint): Avoid
+	harmless memory leak.
+	(hyphen_trie::read_patterns_file): Initialize `buf'.
+	* src/roff/troff/node.cc (troff_output_file::troff_output_file):
+	Initialize `current_fill_color'and `current_glyph_color'.
+	* src/roff/troff/glyphuni.cc
+	(glyph_to_unicode_init::glyph_to_unicode_init): Use `new <type>[1]'.
+	* src/roff/troff/uniuni.cc
+	(unicode_decompose_init::unicode_decompose_init): Ditto.
+	* src/roff/troff/uniglyph.cc
+	(unicode_to_glyph_init::unicode_to_glyph_init): Ditto.
+
+2003-01-26  Werner LEMBERG  <wl@gnu.org>
+
+	* src/utils/indxbib/indxbib.cc (main) [__EMX__]: Check with
+	`access' before calling `unlink'.
+	(do_file): Handle __EMX__.
+
+	* src/include/nonposix.h: Handle __EMX__.
+
+	* Makefile.in (SEP): New variable; set to @PATH_SEPARATOR@.
+	(fontpath,tmacpath): Use it.
+	(MDEFINES): Add it.
+	Sorted alphabetically.
+
+	* src/preproc/eqn/neqn.sh, src/roff/nroff/nroff.sh: Use
+	@SEP@.
+	* src/preproc/eqn/Makefile.sub, src/roff/nroff/Makefile.sub: Handle
+	@SEP@.
+
+2003-01-27  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libgroff/strcasecmp.c, src/libs/libgroff/strncasecmp.c:
+	New files, copied from gnulib.
+	* src/libs/libgroff/Makefile.sub (CSRCS): Add them.
+	* configure.ac: Updated.
+	* configure: Regenerated.
+
+	* src/include/config.hin: Regenerated.
+	* src/include/lib.h [!HAVE_STRCASECMP]: Declare `strcasecmp'.
+	Don't define `strcasecmp' as `strcmp'.
+	[!HAVE_STRNCASECMP]: Declare `strncasecmp'.
+	Dont define `strncasecmp' as `strncmp'.
+
+	* src/roff/groff/pipeline.c [!HAVE_STRCASECMP, !HAVE_STRNCASECMP]:
+	Removed.
+
+2003-01-26  Werner LEMBERG  <wl@gnu.org>
+
+	* src/utils/indxbib/indxbib.cc (main) [__EMX__]: Fix typo:
+	s/unline/unlink/.
+
+2003-01-25  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo (Ligatures and Kerning): Mention limitations.
+
+2003-01-24  Werner LEMBERG  <wl@gnu.org>
+
+	Add US-english hyphenation exceptions (converted from Barbara
+	Beeton's hyphenation exception log reports which appear irregularly
+	in TUGBoat).
+
+	* tmac/hyphen.us: Updated to latest version.
+	* tmac/README: Updated.
+	* tmac/hyphenex.us, tmac/hyphenex.sh: New files.
+	* tmac/troffrc: Load `hyphenex.us'.
+	* tmac/Makefile.sub (NORMALFILES): Add `hyphenex.us'.
+	* doc/groff.texinfo: Updated.
+
+2003-01-23  Werner LEMBERG  <wl@gnu.org>
+
+	Improve hyphenation slightly.  This is a first step in redesigning
+	the hyphenation algorithm to make it more flexible (e.g. allowing
+	kerns and ligatures between the hyphenation character and the
+	following character -- while not used normally in English, other
+	languages like German would benefit).
+
+	* src/roff/troff/env.cc (environment::hyphenate_line): Use
+	assertion instead of if-clause.
+	Let `get_hyphen_list' return the number of involved characters in
+	the hyphenation pattern instead of computing it directly (which
+	often yields too small values).
+	* src/roff/troff/node.h (*::get_hyphen_list): Add second parameter.
+	* src/roff/troff/node.cc (*::get_hyphen_list): Handle new second
+	parameter.
+
+2003-01-22  Werner LEMBERG  <wl@gnu.org>
+
+	Fixing a bug which caused groff to hang if the hyphenation exception
+	dictionary tried to grow.
+
+	* src/roff/troff/env.cc (hyphen_trie::insert_hyphenation,
+	hyphen_trie::read_patterns_file, do_hyphenation_patterns_file): Use
+	pointer to dictionary.
+
+2003-01-20  Werner LEMBERG  <wl@gnu.org>
+
+	* src/utils/afmtodit/afmtodit.pl: Add switch `-m' to suppress
+	negative left italic correction.
+	* src/utils/afmtodit/afmtodit.man: Document it.
+
+	* font/devps/generate/Makefile (RFLAG): Add `-m'.
+	* font/devps/{AB,AR,BMB,BMR,CB,CR,EURO,HB,HR,HNB,HNR,NB,NR,PB,PR,
+	S,TB,TR,ZD,ZDR}: Regenerated with afmtodit options `-i 0 -m'.
+
+	* NEWS: Updated.
+
+2003-01-16  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS: Updated.
+
+2003-01-16  Jörgen Grahn  <jgrahn@algonet.se>
+
+	* src/preproc/refer/refer.man: Mention REFER environment variable.
+
+2003-01-05  Werner LEMBERG  <wl@gnu.org>
+
+	Similar to \[is], the square root glyph (\[sr]) and the square root
+	extension glyph (\[radicalex]) are now text symbols.  The new
+	mathematical versions are called \[sqrt] and \[sqrtex],
+	respectively.
+
+	* font/devX*/S: Regenerated.
+	* font/devdvi/generate/texex.map: Rename `sr[0123]' to `sqrt[0123]'.
+	* font/devdvi/generate/texsy.map: Rename `sr' to `sqrt'.
+	* font/devdvi/EX, font/devdvi/S: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `sqrt'.
+	* font/devlj4/generate/special.map: Add `sqrt'.
+	* font/devlj4/S: Regenerated.
+	* font/devps/generate/textmap: Add `sqrt'.
+	* font/devps/S, font/devps/symbolmap: Regenerated.
+
+	* src/preproc/eqn/sqrt.cc (SQRT_CHAR, RADICAL_EXTENSION_CHAR,
+	SQRT_CHAIN, BAR_CHAIN): Use `sqrt*' and `sqrtex*'.
+	* src/roff/troff/input.cc (init_charset_table): Make `sqrtex'
+	overlap horizontally.
+
+	* tmac/X.tmac, tmac/ps.tmac, tmac/lj4.tmac: Add `sqrtex'.
+	* tmac/dvi.tmac: Add `sr', and `sqrtex'.
+	Fix `radicalex'.
+
+	* doc/groff.texinfo, man/groff_diff.man: Document that `radicalex'
+	and `sqrtex' are overlapping glyphs.
+
+2003-01-04  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate/texsy.map: Add `is'.
+	* font/devps/symbolmap: Regenerated.
+	* font/devdvi/*TC, MI, S: Regenerated.
+
+	* tmac/dvi.tmac: Remove `is'.
+
+2003-01-03  Werner LEMBERG  <wl@gnu.org>
+
+	`is' is now a text symbol (only relevant for dvi).  The math variant
+	can be accessed with `integral'.
+
+	* font/devX*/S: Regenerated.
+	* font/devdvi/generate/texex.map: Remove `is'.
+	* font/devdvi/EX: Updated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `integral'.
+	* font/devlj4/generate/special.map: Ditto.
+	* font/devlj4/S: Regenerated.
+	* font/devps/generate/textmap: Add `integral'.
+	* font/devps/S: Regenerated.
+
+	* tmac/dvi.tmac: Define `is'.
+
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Add `integral'.
+
+	* src/preproc/tbl/main.cc (process_format): Fix error message.
+
+2003-01-02  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `ne' and `nc'.
+	* font/devps/textmap: Fix entries for `ne' and `nc'.
+	* font/devps/symbolmap: Regenerated.
+
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list),
+	src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Add `18',
+	`38', `58', `78', `-+', `|=', `nc', `ne'.
+
+	* tmac/dvi.tmac: Add `nm', `ne', `nc'.
+	Use `schar' for `aq'.
+	* tmac/ps.tmac, tmac/X.tmac: Add `nc' and `ne'.
+	* tmac/ec.tmac: Add `SC' to special fonts for `CW' and `CWI'.
+	* tmac/tty.tmac: Add `ne'.
+
+	* src/roff/troff/node.cc (make_glyph_node): Test with `get_macro'
+	for fallback glyphs.
+
+2002-12-29  Werner LEMBERG  <wl@gnu.org>
+
+	Add glyph `|='.
+
+	* font/devX*/*: Regenerated.
+	* font/devdvi/generate/ec.map: Remove `eq'.
+	* font/devdvi/generate/texsy.map: Make `~=' the same as `~~'.
+	Assign `|=' to position 39.
+	* font/devdvi/*EC, S: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `|='.
+	* font/devlj4/generate/special.map: Make `~=' the same as `~~'.
+	Assign `|=' to position 549.
+	* font/devps/generate/textmap, font/devps/enerate/symbolmap: Remove
+	`equalmath'.
+	Add `uni2243' for `|='.
+
+	* tmac/ec.tmac: Add `eq'.
+	* tmac/dvi.tmac: Add `=~'.
+	* tmac/tty-char.tmac, tmac/ps.tmac, tmac/X.tmac, tmac/lbp.tmac: Add
+	`|='.
+
+2002-12-21  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate/tc.map: Remove `**'.
+	* font/devdvi/*TC: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `18', `38', `58',
+	`78', `<<', `>>'.
+	* font/devutf8/NOTES: Updated.
+
+	* src/roff/troff/charinfo.h (charinfo): Add `setx_macro' function.
+	Don't give default parameter to `set_macro'.
+	* src/roff/troff/input.cc (do_define_character): Use `setx_macro'
+	instead of `set_macro'.
+	(charinfo::setx_macro): Implement it.
+	(charinfo::set_macro): Don't change `mode'.
+
+	* tmac/tty.tmac: Add `18', `38', `58', `78', `<<', `>>'.
+	* tmac/ps.tmac, tmac/X.tmac: Add `<<', `>>'.
+	* tmac/dvi.tmac: Define `!=' with `.schar'.
+
+2002-12-20  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devX*/S: Regenerated.
+	* font/devdvi/generate/ec.map: Remove `pl'.
+	* font/devdvi/generate/tc.map: Remove `mi', `14', `12', `34'.
+	* font/devdvi/*{TC,EC}: Regenerated.
+	* font/devhtml/R.proto: Add `-+'.
+	Remove double entries for `rk', `lk', `lt', `rt', `rb', `lb'.
+	* font/devlbp/*: Remove `or'.
+	* font/devlj4/generate/special.map: Remove `or'.
+	* font/devlj4/S: Regenerated.
+	* font/devps/generate/textmap: Add `fiveeighths', `oneeighth',
+	`seveneighths', `threeeighths'.
+	Remove `plusmath'.
+	Replace `minusplus' with `uni2213'.
+	* font/devps/symbolmap: Regenerated.
+	* font/devutf8/R.proto: Replace `shc' with unnamed glyph.
+	Add `-+'.
+
+	* src/roff/troff/charinfo.h (charinfo): Add `is_normal' inline
+	function.
+	* src/roff/troff/node.cc (troff_output_file::put_char_width):
+	Call glyph_color and fill_color even if tcommand_flag isn't set.
+	(make_node, node::add_char): Check not ci->is_fallback but
+	ci->is_normal.
+
+	* tmac/lj4.tmac, tmac/lbp.tmac: Define `or'.
+	* tmac/ec.tmac: Add .rchar entry for `f/'.
+	Don't remove `12', `14', `34'.
+	Define `pl' to be always roman.
+	* tmac/ps.tmac (ps-frac, ps-frac-mono): New macros.
+	Define `18', `38', `58', `78'.
+	* tmac/tty.tmac: Add `-+'.
+	* tmac/dvi.tmac: Define `f/'.
+	(dvi-frac): Use `f/'.
+	* tmac/X.tmac (X-frac, X-frac-mono): New macros.
+	Define `18', `38', `58', `78'.
+
+2002-12-15  Colin Watson  <cjwatson@debian.org>
+
+	* contrib/pic2graph/pic2graph.sh: Add missing `;;'.
+
+2002-12-10  Werner LEMBERG  <wl@gnu.org>
+
+	Add glyph `tno', a textual variant of `no'.
+
+	* font/devX*/*: Regenerated.
+	* font/{devcp1047,devlatin1,devutf8,devhtml}/R.proto: Add `tno'.
+	* font/devdvi/generate/{tc.map: Replace `no' with `tno'.
+	* font/devdvi/generated/{texsy,textex}.map: Add `tno'.
+	* font/devdvi/*: Regenerated.
+	* font/devlbp/*: Add `tno'.
+	* font/devlj4/generate/tex.map: Replace `no' with `tno'.
+	* font/devlj4/*: Regenerated.
+	* font/devps/generate/textmap: Replace `no' with `tno'.
+	* font/devps/generate/symbolchars: Add `no'.
+	* font/devps/*: Regenerated.
+
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Add `tno'.
+
+	* tmac/cp1047.tmac, tmac/latin1.tmac: Replace `no' with `tno'.
+	* tmac/tty-char.tmac: Add entry for `tno' and `3d'.
+
+	* NEWS: Updated.
+
+	* tmac/dvi.tmac: Replace most `\\' with `\E'.
+	Add definition for `sd'.
+	* tmac/X.tmac, tmac/ps.tmac: Replace most `\\' with `\E'.
+
+	* tmac/eqnrc <dvi>: Use `integral' instead of `is' glyph.
+
+2002-12-08  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac (TH): Use integer value for `IN' if in nroff
+	mode to avoid rounding errors.
+	(an-do-tag, an-do-tag-html, RS, RE): Remove redundant `.br'.
+
+	* src/roff/groff/groff.man, src/roff/nroff/nroff.man,
+	src/roff/troff/troff.man: Improve documentation of -T.
+
+2002-12-07  Jeff Conrad  <jeff_conrad@msn.com>
+
+	* src/roff/groff/pipeline.c: Don't define `const' for _WIN32.
+	(run_pipeline) [_WIN32]: Provide working function without `fork'.
+
+2002-12-06  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devps/generate/freeeuro.sfd: Make dimensions of Euro.symbol
+	glyphs compatible to Adobe's Euro fonts (scaling them down a bit).
+	Scaling Euro.sansserif glyphs down to have the same height as
+	digits.
+	Removed unnecessary points; added some extrema.
+
+	* font/devps/EURO, font/devps/freeeuro.afm, font/devps/freeeuro.pfa:
+	Regenerated.
+
+2002-12-04  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devps/generate/freeeuro.sfd: Add glyphs `Euro.symbol.slanted'
+	and `Euro.symbol.bold.slanted'.
+	Improve some glyph offsets and widths.
+	* font/devps/EURO, font/devps/freeeuro.afm, font/devps/freeeuro.pfa:
+	Regenerated.
+	* font/devps/generate/Makefile (freeeuro.afm freeeuro.pfa): Fix
+	typo.
+	* font/devps/generate/sfdtopfa.pe: Generate PFA in current
+	direcory.
+
+	* tmac/europs.tmac: Updated to new glyph indices.
+	Use Euro.symbol for font familiy `A'.
+
+	* doc/groff.texinfo: Minor improvements.
+
+2002-12-02  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate.tc.map: s/%O/%0/.
+	* font/devdvi/*TC: Regenerated.
+
+	* src/roff/troff/div.cc (init_div_requests): Sorted.
+
+	* tmac/dvi.tmac: Remove `Ye'.
+	* tmac/ec.tmac: Remove `Ye'.
+	Add .rchar entry for `de'.
+
+	* man/groff.man, man/groff_diff.man: Document register `.pe'.
+	* doc/groff.texinfo: Document registers `.pe', `.n', and `.w'.
+	* NEWS: Updated.
+
+2002-11-30  Werner LEMBERG  <wl@gnu.org>
+
+	Add PS font for various Euro glyphs.
+
+	* font/devps/generate/freeeuro.sfd: New master font file for
+	pfaedit.
+	* font/devps/generate/sfdtopfa.pe: New conversion script for
+	pfaedit.
+	* font/devps/generate/Makefile (FONTS): Add `EURO'.
+	(EURO, freeeuro.afm, freeeuro.pfa): New rules.
+	* font/devps/freeeuro.pfa, font/devps/freeeuro.afm: Generated from
+	`freeeuro.sfd'.
+	* font/devps/EURO: Generated from `freeeuro.afm'.
+	* font/devps/download: Add `freeuro.pfa'.
+	* font/devps/Makefile.sub (NORMALFILES): Adde `EURO' and
+	`freeeuro.pfa'.
+
+	* tmac/europs.tmac: New file.
+	* tmac/ps.tmac: Include `europs.tmac'.
+	* tmac/Makefile.sub (DISTFILES): Add `europs.tmac'.
+
+2002-11-29  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate/texsy.map: Remove `lh' and `rh'.
+	* font/devdvi/S: Regenerated.
+	* font/devhtml/R.proto: Fix `CR' and `ci'.
+	Add `OK'.
+	* font/devps/generate/textmap: Fix `lh', `rh', and `sq'.
+	Remove `bs'.
+	* font/devps/symbolmap: Regenerated.
+	* font/devutf8/R.proto: Fix `CR' and `ci'.
+	Add `OK'.
+	* font/devutf8/NOTES: Updated.
+
+	* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Fix `CR' and
+	`ci'.
+	Add `OK'.
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Ditto.
+
+	* tmac/dvi.tmac: Add `lh' and `rh'.
+	* tmac/Xps.tmac: Fix `lh' and `rh'.
+	* tmac/X.tmac: Add `OK'.
+	* tmac/lj4.tmac: Ditto.
+
+2002-11-24  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devX*/S: Regenerated.
+	* font/devascii/R.proto, font/devcp1047/R.proto: Remove glyphs `lb',
+	`lc', `lf', `lk', `lt', `rb', `rc', `rf', `rk', and `rt'.
+	* font/devdvi/generate/texsy.map: Remove `or' glyph.
+	* font/devdvi/S: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add/fix glyphs
+	`parenlefttp', `parenleftex', `parenleftbt', `parenrighttp',
+	`parenrightex', `parenrightbt', `bracketlefttp', `bracketleftex',
+	`bracketleftbt', `bracketrighttp', `bracketrightex',
+	`bracketrightbt', `bracelefttp', `braceleftmid', `braceleftbt',
+	`braceex', `braceleftex', `bracerightex', `bracerighttp',
+	`bracerightmid', `bracerightbt', `lt', `lk', `lb', `rt', `rk',
+	`rb', and `bv'.
+	* src/roff/troff/glyphuni.cc, src/roff/troff/uniglyph.cc: Ditto.
+	* font/devutf8/NOTES: Updated.
+	* font/devlj4/generate/special.map: Add glyph `braceex'.
+	* font/devlj4/S: Regenerated.
+
+	* tmac/tty-char.tmac: Add glyphs `lf', `rf', `lc', and `rc'.
+
+2002-11-14  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Add `va'
+	and `vA'.
+	Fix code for `an'.
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Ditto.
+
+	* doc/texinfo.tex: New version from texinfo 4.3.
+	* doc/groff.texinfo: Updated for texinfo 4.3.
+	Use @tie{} where appropriate.
+	* font/devdvi/generate/ec.map: Don't include `or' and `bv'.
+	* font/devdvi/generate/tc.map: Remove `rn'.
+	* font/devdvi/*TC, font/devdvi/*EC: Regenerated.
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `vA'.
+	Fix code for `an'.
+	* font/devX100/*, font/devX100-12/*, font/devX75/*,
+	font/devX75-12/*: Regenerated.
+
+	* tmac/dvi.tmac: Add special fonts `SA' and `SB'.
+	Use .char (again) for `br', `ul', `rn', `or', and `ru'.
+	Improve definition of `an'.
+	* tmac/ps.tmac: Use .char (again) for `br', `ul', `rn', `or', and
+	`ru'.
+	* tmac/lj4.tmac: Use .char (again) for `br', `ul', `rn', and `ru'.
+	* tmac/X.tmac: Add definition for `or'.
+	* tmac/Xps.tmac: Undo change 2002-11-05.
+	* tmac/lbp.tmac: Add definitions for `br', `rn', `ul', and `ru'.
+
+2002-11-11  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/node.cc (troff_output_file::put_char): Always
+	call flush_tbuf.
+
+2002-11-10  Werner LEMBERG  <wl@gnu.org>
+
+	Added three new requests `schar', `fschar', and `rfschar'.  `schar'
+	defines a glyph which is searched after the check for fonts declared
+	with `.special' (and before the check for all mounted special
+	fonts).  `fschar' defines a glyph for a particular font which is
+	searched after the check for fonts declared with `.fspecial' (and
+	before the check for fonts declared with `.special').  `rfschar'
+	removes glyphs defined with `fschar'.
+
+	* src/roff/troff/token.h (char_mode): New enum.
+	Declare do_define_character.
+	* src/roff/troff/charinfo.h (charinfo): Replace `fallback' with
+	`mode'.
+	(charinfo::is_fallback): Updated.
+	(charinfo::is_special): New method.
+	* src/roff/troff/input.cc (do_define_character): Add and use
+	optional second parameter used as a prefix for font-specific glyph
+	names.
+	(define_character, define_fallback_character): Updated.
+	(define_special_character): New function.
+	(init_input_requests): Add `schar'.
+	(charinfo::charinfo, charinfo::set_macro): Updated.
+	* src/roff/troff/node.cc: Include `stringclass.h'.
+	(make_glyph_node): Handle special glyphs defined with `.schar' and
+	`.fschar'.
+	(define_font_special_character, remove_font_special_character): New
+	functions.
+	(init_node_requests): Sorted.
+	Add `fschar' and `rfschar'.
+	* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
+	Document new requests.
+
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `va'.
+	* tmac/dvi.tmac: Add `va' for CW and CWI (using `.fschar').
+
+2002-11-08  Werner LEMBERG  <wl@gnu.org>
+
+	Added new font `SC' (cmtex10) to devdvi.
+
+	* devdvi/generate/Makefile (FONTS): Add `SC'.
+	(SC): New rule.
+	* devdvi/generate/textex.map: New map file for cmtex.
+	* devdvi/SC: New.
+	* devdvi/Makefile.sub (DEVFILES): Updated.
+	* tmac/dvi.tmac: Add fspecial entries for SC.
+	Add `MI', `S' and `CW' to the `special' call.  Otherwise, `SC' is
+	found before `S' since the font position of `SC' is lower due to the
+	gaps in DESC's `font' line.
+	* tmac/ec.tmac: Add a `special' call.
+	* NEWS: Updated.
+
+	* font/devhtml/R.proto: Remove double entry for `ti'.
+	* tmac/tty.tmac: Add entries for `IJ', `ij', and `bq'.
+	* tmac/tty-char.tmac: Remove entry for `bq'.
+	* tmac/lbp.tmac: Add entries for `lq', `rq', `fo', `fc', and `em'.
+	* tmac/ec.tmac: Don't remove `aq' glyph.
+	* tmac/X.tmac: Fix entry for `em'.
+	Add entries for `fo' and `fc'.
+	* tmac/dvi.tmac: Add entries for `em', `en', `hy', `fo', and `fc'.
+
+	* doc/groff.texinfo, man/groff.man, man/groff_diff.man: Fix
+	documentation of `special' and `fspecial' requests.
+
+2002-11-05  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devascii/R.proto, font/devcp1047/R.proto,
+	font/devlatin1/R.proto: Remove entry for `.i'.
+	* font/devdvi/generate/textt.map: Add entry for `ad'.
+	* font/devdvi/generate/texr.map, font/devdvi/generate/texb.map,
+	font/devdvi/generate/texi.map: Add dummy glyph name `slash@for@l'.
+	We need this for getting kerning values to compose `/l' and `/L'.
+	* font/devdvi: Regenerated font definition files for CM fonts.
+	* font/devhtml/R.proto: Add entries for "'C", "'c", `IJ', and `ij'.
+	* font/devutf8/R.proto: Ditto.
+	Remove double entry for `ti'.
+
+	* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Fix entries
+	for (groff) ligatures, `la', and `ra'.
+	Add "'C", "'c", `IJ', and `ij'.
+	Remove double entry for `ti'.
+	* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Remove all
+	double entries.
+	Add "'C", "'c", `IJ', and `ij'.
+	Fix entries for (groff) ligatures, `la', and `ra'.
+
+	* tmac/ps.tmac (ps-achar): New macro.
+	Define "'c" and "'C".
+	* tmac/tty.tmac: Add entry for `.i'.
+	* tmac/X.tmac (X-achar): New macro.
+	Define "'c", "'C", and `:Y'.
+	Add entries for `IJ' and `ij'.
+	* tmac/Xps.tmac (Xps-achar): New macro.
+	Define "'c" and "'C".
+	Add entries for `IJ' and `ij'.
+	* tmac/lbp.tmac (lbp-achar): New macro.
+	Add fallback characters for all groff ligatures and many other
+	glyphs.
+	* tmac/dvi.tmac: Fix definitions of `_' and `ul'.
+	Add entries for `/l' and `/L'.
+	Define "'c" and "'C".
+	Add entries for `IJ' and `ij'.
+
+2002-11-02  Larry Kollar  <kollar@alltel.net>
+
+	* PROBLEMS: Document how to solve Mac OS X compilation problems.
+
+2002-11-02  Werner LEMBERG  <wl@gnu.org>
+
+	Adding support for composite glyphs: \[xxx yyy ...] and the
+	`composite' request.
+
+	* src/roff/troff/glyphuni.cc: New file for mapping groff glyph names
+	to Unicode-based glyph names.
+	* src/roff/troff/uniglyph.cc: New file for mapping Unicode-based
+	glyph names to groff glyph names.
+	* src/roff/troff/uniuni.cc: New file for canonically decomposing
+	Unicode-based glyph names.
+	* src/roff/troff/unicode.cc, src/roff/troff/unicode.h: New files
+	for handling Unicode glyph names.
+	* src/roff/troff/input.cc: Include unicode.h.
+	(composite_glyph_name): New function.
+	(token::next) <'['>: Handle Unicode glyph names and composite
+	glyphs.
+	(composite_dictionary): New dictionary for the `composite' request.
+	(composite_request): Implement `composite' request.
+	(init_input_requests): Add `composite'.
+	Alphabetically sorted.
+	* src/roff/troff/env.cc (tabs_save, tabs_restore): Removed (already
+	commented out).
+	(init_env_requests): Alphabetically sorted.
+	Removed `tas' and `tar' (already commented out).
+	* src/roff/troff/Makefile.sub: Updated.
+
+2002-10-31  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* src/roff/nroff/nroff.man, src/roff/nroff/nroff.sh: Fix description
+	of options.
+
+2002-10-29  Werner LEMBERG  <wl@gnu.org>
+
+	Fix computation of .trunc register.  Additionally, its value (and
+	the value of the .ne register) is now always set before entering the
+	trap.
+
+	* src/roff/troff/div.cc (diversion::need): Set `truncated_space' and
+	`needed_space' before calling `space'.
+	(top_level_diversion::space): Remove special code for 'sp before the
+	first page.
+	Call `begin_page' with the discarded space as a parameter.
+	(top_level_diversion::begin_page): Add optional parameter to set
+	`truncated_space'.
+	* src/roff/troff/div.h: Updated.
+
+	* doc/groff.texinfo: Improve documentation of .sp, \n[.trunc], and
+	\n[.ne].
+
+	* tmac/an-old.tmac (SH, SS, TP, IP, HP, TS): Undo change 2002-10-26.
+	(LP): Remove superfluous call to `br'.
+	* tmac/doc-common (doc-paragraph): Undo change 2002-10-26.
+	* tmac/doc.tmac (Bd, Bl, doc-set-vertical-and-indent): Ditto.
+
+2002-10-26  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/doc-ditroff: Remove useless switch/variable -rC.
+	(doc-setup-header): Don't set page register `%'.
+	* tmac/doc-nroff: Remove variable `C'.
+	(doc-setup-page-layout): Set doc-header-space to .5i unconditionally.
+	(doc-setup-header): Don't set page register `%'.
+	Don't call `bp'.
+	* tmac/doc-common (doc-header): Call `ns'.
+	(doc-paragraph): Protect .sp with .br so that it survives traps
+	possibly set by the user.
+	* tmac/doc.tmac (Bd, Bl, doc-set-vertical-and-indent): Ditto.
+
+	* tmac/doc*: Replace ' with . for consistency if no effect.
+
+2002-10-26  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac (SH, SS, TP, IP, HP, TS): Protect .sp with .br
+	so that it survives traps possibly set by the user.
+
+	* src/roff/troff/node.cc: Fix the changes from 2002-10-23.
+	(troff_output_file::set_font): Call flush_tbuf if necessary.
+	(troff_output_file::fill_color, troff_output_file::glyph_color): Call
+	flush_tbuf and do_motion only if necessary.
+	(troff_output_file::start_special,
+	troff_output_file::put_char_width, troff_output_file::put_char,
+	troff_output_file::draw): Updated.
+	(word_space_node::tprint, space_node::tprint, hmotion_node::tprint,
+	vmotion_node::tprint): Undo change 2002-10-23.
+
+2002-10-25  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/www.tmac (DC): Fix case of overlapping images.
+
+2002-10-23  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/node.cc (troff_output_file::fill_color,
+	troff_output_file::glyph_color): Set current color before testing
+	color_flag.
+	(troff_output_file::put_char_width, troff_output_file::put_char,
+	troff_output_file::draw): Don't call flush_tbuf and/or do_motion
+	before glyph_color.
+	(troff_output_file::file_color, troff_output_file::glyph_color):
+	Call do_motion.
+	(word_space_node::tprint, space_node::tprint, hmotion_node::tprint,
+	vmotion_node::tprint): Move first, then call fill_color.
+
+2002-10-20  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo, man/groff_tmac.man: Document that it is not
+	possible to use multiple main macro packages.
+
+2002-10-19  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grops/ps.cc (cmyk_flag): New global variable.
+	(ps_printer::set_color): Set `cmyk_flag' for CMY and CMYK colors.
+	(ps_printer::~ps_printer): Emit `%%Extensions: CMYK' if `cmyk_flag'
+	is set.
+	* font/devps/prologue.ps (Fk, Ck): Enclose definitions with a
+	`where' construction since `cmyksetcolor' is a PS Level 2 operator.
+
+2002-10-16  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS, doc/webpage.ms: Updated.
+
+2002-10-14  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/node.cc (troff_output_file::put_char_width,
+	troff_output_file::put_char, troff_output_file::fill_color,
+	troff_output_file::glyph_color): Handle case where color pointer
+	is null.
+
+2002-10-13  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	Add the new -r option to grotty.  It is similar to the -i option
+	except it tells grotty(1) to use the "reverse video" attribute to
+	render italic fonts.
+
+	* src/devices/grotty/tty.cc (reverse_flag): New global variable.
+	(SGR_REVERSE, SGR_NO_REVERSE): New macros.
+	(tty_printer::make_underline, tty_printer::put_color,
+	tty_printer::end_page): Use it.
+	(main): Add -r switch.
+	(usage): Updated.
+	* src/devices/grotty/grotty.man: Document it.
+
+2002-10-11  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* src/roff/troff/env.cc (hyphen_trie::read_patterns_file): Add
+	cast to `unsigned char' to properly read patterns with 8bit
+	characters.
+
+2002-10-08  Werner LEMBERG  <wl@gnu.org>
+
+	* REVISION: Increased to 2.
+
+Version 1.18.1 released
+=======================
+
 2002-10-08  Werner LEMBERG  <wl@gnu.org>
 
 	* doc/webpage.ms, NEWS: Updated.
@@ -394,7 +2119,7 @@
 	* src/roff/troff/node.cc (node::add_char): Call `freeze_space' for
 	unbreakable space.
 
-2002-08-08  Aaron Campbell <aaron@monkey.org>
+2002-08-08  Aaron Campbell  <aaron@monkey.org>
 
 	* src/preproc/pic/object.cc (object_spec::make_move): Fix typo
 	(&& -> &).
@@ -681,7 +2406,7 @@ Version 1.18.0 released
 	(init_input_requests): Updated.
 	* src/roff/troff/request.h: Updated.
 
-2002-07-08  Robert D. Goulding <goulding@Princeton.EDU>
+2002-07-08  Robert D. Goulding  <goulding@Princeton.EDU>
 
 	* src/roff/grog/grog.sh: Fix typo.
 
@@ -1971,7 +3696,7 @@ Version 1.18.0 released
 
 	* NEWS, man/groff_char.man: Updated.
 
-2002-02-21  Phil Lobbes <phil@perkpartners.com>
+2002-02-21  Phil Lobbes  <phil@perkpartners.com>
 
 	* src/include/lib.h [HAVE_SNPRINTF]: Include stdarg.h.
 
@@ -9403,7 +11128,7 @@ Mon Aug 10 11:17:53 1992  James Clark  (jjc at jclark)
 	* include/lib.h (illegal_input_char): Use table.
 	* troff/input.cc (ESCAPE_RIGHT_PARENTHESIS): Renumber to 0206.
 	* pic/lex.cc (ARG1): Renumber to 14.
-	* eqn/lex.cc (ARG1: Likewise.
+	* eqn/lex.cc (ARG1): Likewise.
 
 	* troff/Makefile.sub (majorminor.cc): Handle 3 part versions
 	(eg 1.05.90) correctly.
diff --git a/contrib/groff/INSTALL b/contrib/groff/INSTALL
index 0fb618e..c009b6d 100644
--- a/contrib/groff/INSTALL
+++ b/contrib/groff/INSTALL
@@ -6,7 +6,7 @@ This file contains information that supplements those instructions.
 MS-Windows, see the file arch/djgpp/README.)
 
 groff is written in C++, so you will need a C++ compiler.  The C++
-source files use a suffix of `.cc', so your C++ compiler must be able
+source files use a suffix of `.cpp', so your C++ compiler must be able
 to handle this.  If you don't already have a C++ compiler, I suggest
 gcc 2.7.1 or later (gcc version 2 includes GNU C++ as well as GNU C).
 From gcc 2.5, it is no longer necessary to install libg++: the C++
@@ -44,7 +44,7 @@ subdirectory.
 To get a DVI, PDF, or HTML version of the groff texinfo manual, say `make
 groff.dvi', `make groff.pdf', or `make groff.html', respectively, in the
 `doc' subdirectory (after compiling the groff package).  Note that you
-need texinfo version 4.2 or newer as a prerequisite.
+need texinfo version 4.3 or newer as a prerequisite.
 
 If you have problems, read the PROBLEMS file.  If this doesn't help
 send a bug report using the form in the file BUG-REPORT.
diff --git a/contrib/groff/MANIFEST b/contrib/groff/MANIFEST
index b45c046..c0ce12e 100644
--- a/contrib/groff/MANIFEST
+++ b/contrib/groff/MANIFEST
@@ -1,10 +1,10 @@
 MANIFEST 
 
-Last update: 21 Dec 2001
+Last update: 13 Apr 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2001 Free Software Foundation, Inc.
+Copyright (C) 2001, 2003 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -50,6 +50,8 @@ the groff source distribution.
   djgpp         Data special for the 32-bit DOS compiler djgpp.
 
 ./contrib       Part of groff, but maintained by other people.
+  eqn2graph     Convert equations created with EQN into different
+                graphical formats.
   groffer       A wrapper to conveniently view roff files.
   mm            The groff mm macro package.
   mom           The groff mom macro package.
@@ -107,8 +109,6 @@ the groff source distribution.
   nroff         Emulate classical nroff text formatter.
   troff         Main roff formatter program.
 
-./src/xditview  A groff (pre)viewer for the X Window System.
-
 ./src/utils     Utility programs around groff.
   addftinfo     Add information to old troff font files for use with groff.
   afmtodit      Create font description files for the PostScript device.
@@ -116,9 +116,11 @@ the groff source distribution.
   indxbib       Make inverted index for bibliographic databases.
   lkbib         Search bibliographic databases.
   lookbib       Interactively search bibliographic databases.
-  pfbtops       Translate a PostScript font in .pfb format to ASCII.
+  pfbtops       Translate a PostScript font in PFB format to PFA.
   tfmtodit      Create font description files for TeX DVI device.
 
+./src/xditview  A groff (pre)viewer for the X Window System.
+
 ./tmac          Macro files.
 
 
@@ -141,12 +143,13 @@ The groff documentation is scattered upon several places.
 
 4) The roff parser
 
-The parsing of the roff language is done by troff.  The input is
-transformed into "nodes" by `src/roff/troff/node.cc'.  From these, the
-intermediate output is generated.
+The parsing of the roff language is done by troff.  The input is converted
+to tokens in `src/roff/troff/input.cpp' and transformed into `nodes' by
+`src/roff/troff/env.cpp' and `src/roff/troff/node.cpp'.  From these, the
+intermediate output is generated (also in `node.cpp').
 
 
 5) Postprocessing
 
 The parser for the intermediate output and the postprocessing is in
-`src/libs/libdriver/input.cc'.  This is used by all postprocessors.
+`src/libs/libdriver/input.cpp'.  This is used by all postprocessors.
diff --git a/contrib/groff/Makefile.ccpg b/contrib/groff/Makefile.ccpg
index b89fab1..ec46a94 100644
--- a/contrib/groff/Makefile.ccpg
+++ b/contrib/groff/Makefile.ccpg
@@ -9,7 +9,7 @@ MAKEFILEPARTS=\
 all: $(PROG) $(MANPAGES)
 
 $(PROG): $(OBJS) $(XLIBS)
-	$(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	$(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
 
 install_bin: install_prog
 install_prog: $(PROG)
@@ -30,4 +30,4 @@ pure: $(PROG).pure
 
 $(PROG).pure: $(OBJS) $(XLIBS)
 	$(PURIFY) $(PURIFYCCFLAGS) \
-	  $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	  $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
diff --git a/contrib/groff/Makefile.comm b/contrib/groff/Makefile.comm
index 6d246c5..fd27b8e 100644
--- a/contrib/groff/Makefile.comm
+++ b/contrib/groff/Makefile.comm
@@ -23,14 +23,14 @@ SHELL=/bin/sh
 INCLUDES=-I. -I$(srcdir) \
   -I$(top_builddir)/src/include -I$(top_srcdir)/src/include
 ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
-COMPILE.cc=$(CCC) $(ALL_CCFLAGS) -c
+COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
 ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
 COMPILE.c=$(CC) $(ALL_CFLAGS) -c
-LINK.cc=$(CCC) $(CCFLAGS) $(LDFLAGS)
+LINK.cpp=$(CCC) $(CCFLAGS) $(LDFLAGS)
 LINK.c=$(CC) $(CFLAGS) $(LDFLAGS)
-LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.a
-LIBBIB=$(top_builddir)/src/libs/libbib/libbib.a
-LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.a
+LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT)
+LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
+LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT)
 MLIB=
 XLIBS=
 YTABH=
@@ -96,21 +96,21 @@ extraclean: distclean
 	-rm -f \#* *~ =* core junk grot old temp tmp tem
 
 .SUFFIXES:
-.SUFFIXES: .o .obj .cc .c .y .man .n
+.SUFFIXES: .o .obj .cpp .c .y .man .n
 
-.cc.o:
-	$(COMPILE.cc) $<
+.cpp.o:
+	$(COMPILE.cpp) $<
 
 .c.o:
 	$(COMPILE.c) $<
 
-.cc.obj:
-	$(COMPILE.cc) $<
+.cpp.obj:
+	$(COMPILE.cpp) $<
 
 .c.obj:
 	$(COMPILE.c) $<
 
-.y.cc:
+.y.cpp:
 	if test -n "$(YTABH)"; then \
 	  $(YACC) $(YACCFLAGS) -d $<; \
 	else \
@@ -122,7 +122,7 @@ extraclean: distclean
 	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
 
 # The next rule is needed for make of Solaris 2.5.1 to override its
-# built-in .y.o rule (which takes precedence over the .y.cc rule above).
+# built-in .y.o rule (which takes precedence over the .y.cpp rule above).
 .y.o:
 	if test -n "$(YTABH)"; then \
 	  $(YACC) $(YACCFLAGS) -d $<; \
@@ -133,7 +133,7 @@ extraclean: distclean
 	-test -f y.tab.c && mv y.tab.c y_tab.c
 	mv y_tab.c $(YTABC)
 	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
-	$(COMPILE.cc) $(YTABC)
+	$(COMPILE.cpp) $(YTABC)
 
 .man.n:
 	@echo Making $@ from $<
@@ -246,10 +246,18 @@ install_dev:
 	    $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
 	  fi; \
 	done
+	-for f in $(DEVSCRIPTS); do \
+	  rm -f $(fontsubdir)/$$f; \
+	  if test -f $$f; then \
+	    $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
+	  else \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
+	  fi; \
+	done
 
 .PHONY: uninstall_dev
 uninstall_dev:
-	-for f in $(DEVFILES); do rm -f $(fontsubdir)/$$f; done
+	-for f in $(DEVFILES) $(DEVSCRIPTS); do rm -f $(fontsubdir)/$$f; done
 	-if test -d $(fontsubdir)/generate; then \
 	  rmdir $(fontsubdir)/generate; \
 	fi
@@ -261,8 +269,13 @@ depend_src: depend.temp
 
 depend.temp: FORCE
 	> depend.temp;
+	if test -f "$(srcdir)/$(YTABC)"; then \
+	  ytabc="$(srcdir)/$(YTABC)"; \
+	else \
+	  ytabc="$(YTABC)"; \
+	fi; \
 	test -z "$(CCSRCS)$(YTABC)" \
-	  || $(CCC) $(ALL_CCFLAGS) -MM $(CCSRCS) $(YTABC) >>depend.temp
+	  || $(CCC) $(ALL_CCFLAGS) -MM $(CCSRCS) $$ytabc >>depend.temp
 	test -z "$(CSRCS)" \
 	  || $(CC) $(ALL_CFLAGS) -MM $(CSRCS) >>depend.temp
 	if test -n "$(YTABH)"; then \
diff --git a/contrib/groff/Makefile.dev b/contrib/groff/Makefile.dev
index ae9a672..6c70fff 100644
--- a/contrib/groff/Makefile.dev
+++ b/contrib/groff/Makefile.dev
@@ -1,4 +1,4 @@
-all: $(DEVFILES)
+all: $(DEVFILES) $(DEVSCRIPTS)
 install_data: install_dev
 uninstall_sub: uninstall_dev
-install_dev: $(DEVFILES)
+install_dev: $(DEVFILES) $(DEVSCRIPTS)
diff --git a/contrib/groff/Makefile.in b/contrib/groff/Makefile.in
index 411d8b9..765eee5 100644
--- a/contrib/groff/Makefile.in
+++ b/contrib/groff/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -21,6 +21,7 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH=@srcdir@
 top_builddir=@groff_top_builddir@
+SEP=@PATH_SEPARATOR@
 
 version=`cat $(top_srcdir)/VERSION`
 # No additional number if revision is zero.
@@ -120,7 +121,7 @@ localfontdir=$(dataprogramdir)/site-font
 legacyfontdir=/usr/lib/font
 
 # `fontpath' says where to look for dev*/*.
-fontpath=$(localfontdir):$(fontdir):$(legacyfontdir)
+fontpath=$(localfontdir)$(SEP)$(fontdir)$(SEP)$(legacyfontdir)
 
 # `tmacdir' says where to install macros.
 tmacdir=$(datasubdir)/tmac
@@ -136,11 +137,16 @@ localtmacdir=$(dataprogramdir)/site-tmac
 # directory will be always added.
 # `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the
 # current nor in the home directory.
-tmacpath=$(systemtmacdir):$(localtmacdir):$(tmacdir)
+tmacpath=$(systemtmacdir)$(SEP)$(localtmacdir)$(SEP)$(tmacdir)
 
 # `sys_tmac_prefix' is prefix (if any) for system macro packages.
 sys_tmac_prefix=@sys_tmac_prefix@
 
+# `pnmtops_nosetpage' is the command to be run to generate an eps
+# file.  Some versions of pnmtops provide the -nosetpage option.
+# We detect this and use it if present.
+pnmtops_nosetpage=@pnmtops_nosetpage@
+
 # `tmac_wrap' is list of system macro packages that should be made
 # available to groff by creating a corresponding macro package
 # in the groff macro directory that references the system macro
@@ -214,7 +220,7 @@ make_install_html=@make_install_html@
 # -DHAVE_CC_LIMITS_H		if you have a C++ <limits.h>
 # -DHAVE_MATH_H			if you have <math.h>
 # -DHAVE_CC_OSFCN_H		if you have a C++ <osfcn.h>
-# -DHAVE_STDINT_H		if you have <stdint.h>
+# -DHAVE_CC_STDINT_H		if you have a C++ <stdint.h>
 # -DHAVE_STDLIB_H		if you have <stdlib.h>
 # -DHAVE_STRING_H		if you have <string.h>
 # -DHAVE_STRINGS_H		if you have <strings.h>
@@ -230,6 +236,7 @@ make_install_html=@make_install_html@
 # -DHAVE_MMAP			if you have mmap()
 # -DHAVE_PUTENV			if you have putenv()
 # -DHAVE_RENAME			if you have rename()
+# -DHAVE_SETLOCALE		if you have setlocale()
 # -DHAVE_SNPRINTF		if you have snprintf()
 # -DHAVE_STRCASECMP		if you have strcasecmp()
 # -DHAVE_STRNCASECMP		if you have strncasecmp()
@@ -244,6 +251,9 @@ make_install_html=@make_install_html@
 # -DNEED_DECLARATION_PCLOSE	if your C++ <stdio.h> doesn't declare pclose()
 # -DNEED_DECLARATION_POPEN	if your C++ <stdio.h> doesn't declare popen()
 # -DNEED_DECLARATION_PUTENV	if your C++ <stdlib.h> doesn't declare putenv()
+# -DNEED_DECLARATION_RAND	if your C++ <stdlib.h> doesn't declare rand()
+# -DNEED_DECLARATION_SNPRINTF	if your C++ <stdio.h> doesn't declare snprintf()
+# -DNEED_DECLARATION_SRAND	if your C++ <stdlib.h> doesn't declare srand()
 # -DNEED_DECLARATION_STRCASECMP if your C++ <string.h> doesn't declare
 #				strcasecmp()
 # -DNEED_DECLARATION_STRNCASECMP
@@ -265,12 +275,13 @@ DEFINES=@DEFS@
 
 # Include
 #
-#   {fmod,getcwd,mkstemp,putenv,snprintf,strerror,strtol}.$(OBJEXT)
+#   {fmod,getcwd,mkstemp,putenv,snprintf,strcasecmp,
+#    strerror,strncasecmp,strtol}.$(OBJEXT)
 #
 # in LIBOBJS if your C library is missing the corresponding function.
 LIBOBJS=@LIBOBJS@
 
-# `CCC' is the compiler for C++ (.cc) files.
+# `CCC' is the compiler for C++ (.cpp) files.
 CCC=@CXX@
 CC=@CC@
 # CCDEFINES are definitions for C++ compilations.
@@ -286,6 +297,8 @@ YACCFLAGS=-v
 
 EXEEXT=@EXEEXT@
 OBJEXT=@OBJEXT@
+# a simple heuristic assumption
+LIBEXT=`case $(OBJEXT) in obj) echo lib;; *) echo a;; esac`
 LIBS=@LIBS@
 LIBM=@LIBM@
 RANLIB=@RANLIB@
@@ -317,85 +330,88 @@ PURIFYCCFLAGS=
 # copy of $(MDEFINES) when making individual directories; this could
 # cause the argument list to become too long on some systems.
 MDEFINES= \
-  "MAKEOVERRIDES=$(MAKEOVERRIDES)" \
-  "PAGE=$(PAGE)" \
+  "AR=$(AR)" \
   "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
+  "CC=$(CC)" \
+  "CCC=$(CCC)" \
+  "CCDEFINES=$(CCDEFINES)" \
+  "CCFLAGS=$(CCFLAGS)" \
+  "CDEFINES=$(CDEFINES)" \
+  "CFLAGS=$(CFLAGS)" \
   "DEVICE=$(DEVICE)" \
-  "TTYDEVDIRS=$(TTYDEVDIRS)" \
+  "DVIPRINT=$(DVIPRINT)" \
+  "ETAGS=$(ETAGS)" \
+  "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
+  "ETAGSFLAGS=$(ETAGSFLAGS)" \
+  "EXEEXT=$(EXEEXT)" \
+  "INSTALL_DATA=$(INSTALL_DATA)" \
+  "INSTALL_INFO=$(INSTALL_INFO)" \
+  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+  "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+  "LDFLAGS=$(LDFLAGS)" \
+  "LIBEXT=$(LIBEXT)" \
+  "LIBM=$(LIBM)" \
+  "LIBOBJS=$(LIBOBJS)" \
+  "LIBS=$(LIBS)" \
+  "MAKEOVERRIDES=$(MAKEOVERRIDES)" \
+  "OBJEXT=$(OBJEXT)" \
   "OTHERDEVDIRS=$(OTHERDEVDIRS)" \
+  "PAGE=$(PAGE)" \
+  "PERLPATH=$(PERLPATH)" \
   "PSPRINT=$(PSPRINT)" \
-  "DVIPRINT=$(DVIPRINT)" \
-  "version=$(version)" \
-  "revision=$(revision)" \
-  "top_srcdir=$(top_srcdir)" \
-  "top_builddir=$(top_builddir)" \
-  "prefix=$(prefix)" \
-  "exec_prefix=$(exec_prefix)" \
-  "g=$(g)" \
+  "PURIFY=$(PURIFY)" \
+  "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \
+  "RANLIB=$(RANLIB)" \
+  "SEP=$(SEP)" \
+  "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
+  "TTYDEVDIRS=$(TTYDEVDIRS)" \
+  "YACC=$(YACC)" \
+  "YACCFLAGS=$(YACCFLAGS)" \
+  "bindir=$(bindir)" \
+  "common_words_file=$(common_words_file)" \
   "datadir=$(datadir)" \
   "dataprogramdir=$(dataprogramdir)" \
   "datasubdir=$(datasubdir)" \
-  "infodir=$(infodir)" \
   "docdir=$(docdir)" \
   "exampledir=$(exampledir)" \
+  "exec_prefix=$(exec_prefix)" \
+  "fontdir=$(fontdir)" \
+  "fontpath=$(fontpath)" \
+  "g=$(g)" \
   "htmldocdir=$(htmldocdir)" \
+  "indexdir=$(indexdir)" \
+  "indexext=$(indexext)" \
+  "indexname=$(indexname)" \
+  "infodir=$(infodir)" \
+  "legacyfontdir=$(legacyfontdir)" \
   "libdir=$(libdir)" \
   "libprogramdir=$(libprogramdir)" \
-  "bindir=$(bindir)" \
-  "fontdir=$(fontdir)" \
   "localfontdir=$(localfontdir)" \
-  "legacyfontdir=$(legacyfontdir)" \
-  "fontpath=$(fontpath)" \
-  "tmacdir=$(tmacdir)" \
-  "systemtmacdir=$(systemtmacdir)" \
   "localtmacdir=$(localtmacdir)" \
-  "tmacpath=$(tmacpath)" \
-  "indexext=$(indexext)" \
-  "indexdir=$(indexdir)" \
-  "indexname=$(indexname)" \
-  "common_words_file=$(common_words_file)" \
-  "manroot=$(manroot)" \
-  "man1ext=$(man1ext)" \
+  "make_html=$(make_html)" \
+  "make_install_html=$(make_install_html)" \
   "man1dir=$(man1dir)" \
-  "man5ext=$(man5ext)" \
+  "man1ext=$(man1ext)" \
   "man5dir=$(man5dir)" \
-  "man7ext=$(man7ext)" \
+  "man5ext=$(man5ext)" \
   "man7dir=$(man7dir)" \
-  "make_html=$(make_html)" \
-  "make_install_html=$(make_install_html)" \
+  "man7ext=$(man7ext)" \
+  "manroot=$(manroot)" \
   "mkinstalldirs=$(mkinstalldirs)" \
-  "tmac_wrap=$(tmac_wrap)" \
+  "prefix=$(prefix)" \
+  "revision=$(revision)" \
   "sys_tmac_prefix=$(sys_tmac_prefix)" \
+  "pnmtops_nosetpage=$(pnmtops_nosetpage)" \
+  "systemtmacdir=$(systemtmacdir)" \
   "tmac_an_prefix=$(tmac_an_prefix)" \
-  "tmac_s_prefix=$(tmac_s_prefix)" \
   "tmac_m_prefix=$(tmac_m_prefix)" \
-  "EXEEXT=$(EXEEXT)" \
-  "OBJEXT=$(OBJEXT)" \
-  "CCC=$(CCC)" \
-  "CC=$(CC)" \
-  "CCDEFINES=$(CCDEFINES)" \
-  "CDEFINES=$(CDEFINES)" \
-  "CCFLAGS=$(CCFLAGS)" \
-  "CFLAGS=$(CFLAGS)" \
-  "LDFLAGS=$(LDFLAGS)" \
-  "YACC=$(YACC)" \
-  "YACCFLAGS=$(YACCFLAGS)" \
-  "LIBM=$(LIBM)" \
-  "LIBS=$(LIBS)" \
-  "LIBOBJS=$(LIBOBJS)" \
-  "RANLIB=$(RANLIB)" \
-  "AR=$(AR)" \
-  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-  "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-  "INSTALL_DATA=$(INSTALL_DATA)" \
-  "INSTALL_INFO=$(INSTALL_INFO)" \
-  "ETAGS=$(ETAGS)" \
-  "ETAGSFLAGS=$(ETAGSFLAGS)" \
-  "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
-  "PERLPATH=$(PERLPATH)" \
-  "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
-  "PURIFY=$(PURIFY)" \
-  "PURIFYCCFLAGS=$(PURIFYCCFLAGS)"
+  "tmac_s_prefix=$(tmac_s_prefix)" \
+  "tmac_wrap=$(tmac_wrap)" \
+  "tmacdir=$(tmacdir)" \
+  "tmacpath=$(tmacpath)" \
+  "top_builddir=$(top_builddir)" \
+  "top_srcdir=$(top_srcdir)" \
+  "version=$(version)"
 
 SHELL=/bin/sh
 INCDIRS=src/include
diff --git a/contrib/groff/Makefile.lib b/contrib/groff/Makefile.lib
index 8861360..62a8222 100644
--- a/contrib/groff/Makefile.lib
+++ b/contrib/groff/Makefile.lib
@@ -1,4 +1,4 @@
-LIBCLEAN=lib$(LIB).a
+LIBCLEAN=lib$(LIB).$(LIBEXT)
 MAKEFILEPARTS=\
   $(top_srcdir)/Makefile.comm \
   $(top_builddir)/Makefile.cfg \
@@ -6,9 +6,9 @@ MAKEFILEPARTS=\
   $(top_srcdir)/Makefile.lib \
   Makefile.dep
 
-all: lib$(LIB).a
+all: lib$(LIB).$(LIBEXT)
 
-lib$(LIB).a: $(OBJS)
+lib$(LIB).$(LIBEXT): $(OBJS)
 	$(AR) r $@ $?
 	$(RANLIB) $@
 
diff --git a/contrib/groff/Makefile.sub b/contrib/groff/Makefile.sub
index 8dc3c71..689fd63 100644
--- a/contrib/groff/Makefile.sub
+++ b/contrib/groff/Makefile.sub
@@ -5,6 +5,7 @@ DISTCLEANFILES=\
   stamp-h \
   Makefile \
   src/xditview/Imakefile \
+  $(srcdir)/src/xditview/gxditview._man \
   src/include/config.h
 CLEANADD=Makefile.cfg conftest*
 
diff --git a/contrib/groff/NEWS b/contrib/groff/NEWS
index f93d10c..d99f3a3 100644
--- a/contrib/groff/NEWS
+++ b/contrib/groff/NEWS
@@ -1,6 +1,227 @@
 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.19
+============
+
+Troff
+-----
+
+o Input encoding files for latin-9 (a.k.a. latin-0 and ISO 8859-15) and
+  latin-2 (ISO 8859-2) have been added.  Example use:
+
+    groff -Tdvi -mlatin9 my_file > my_file.dvi
+
+  You still need proper fonts with the necessary glyphs.  Out of the box,
+  the groff package supports latin-9 only for -Tps, -Tdvi, and -Tutf8,
+  and latin-2 only for -Tdvi and -Tutf8.
+
+o Composite glyphs are now supported.  To do this, a subset of the Adobe
+  Glyph List (AGL) Algorithm as described in 
+
+    http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+
+  is used to construct glyph names based on Unicode character codes.  The
+  existing groff glyph names are frozen; no glyph names which can't be
+  constructed algorithmically will be added in the future.
+
+  The \[...] escape sequence has been extended to specify multiple glyph
+  components.  Example:
+
+    \[A ho]
+
+  this accesses a glyph with the name `u0041_0328'.
+
+  Some groff glyphs which are useful as composites map to `wrong' Unicode
+  code points.  For example, `ho' maps to U+02DB which is a spacing
+  ogonek, whereas a non-spacing ogonek U+0328 is needed for composite
+  glyphs.  The new request
+
+    .composite from to
+
+  will change the mapping while a composite glyph name is constructed.
+  To make \[A ho] yield the expected result,
+
+    .composite ho u0328
+
+  is needed.  [The new file `composite.tmac' loaded at start-up already
+  contains proper calls to `.composite'.]
+
+  Please refer to the info pages of groff and to the groff_char man page
+  for more details.
+
+o A new request `fschar' has been added to define font-specific fallback
+  characters.  They are searched after the list of fonts declared with the
+  `fspecial' request but before the list of fonts declared with `special'.
+
+o Fallback characters defined with `fschar' can be removed with the
+  new `rfschar' request.
+
+o A new request `schar' has been added to define global fallback
+  characters.  They are searched after the list of fonts declared with the
+  `special' request but before the already mounted special fonts.
+
+o In groff versions 1.18 and 1.18.1, \D'f ...' didn't move the current
+  point horizontally.  Despite of being silly, this change has been
+  reverted for backwards compatibility.  Consequently, the intermediate
+  output command `Df' also moves the position horizontally again.
+
+  \D'f ...' is deprecated since it depends on the horizontal resolution of
+  the output device (given with the `hor' parameter in the DESC file).
+  Use the new \D'Fg ...' escape instead.
+
+o For orthogonality, new \D subcommands to change the fill color are
+  available:
+
+    \D'Fr ...' (rgb)
+    \D'Fc ...' (cmy)
+    \D'Fg ...' (gray)
+    \D'Fk ...' (cmyk)
+    \D'Fd'     (default color)
+
+  The arguments are the same as with the `defcolor' request.  The current
+  position is *not* changed.
+
+o The values set with \H and \S are now available in number registers
+  \n[.height] and \n[.slant], respectively.
+
+o The `.pe' number register isn't new but hasn't been documented before.
+  It is set to 1 during a page ejection caused by the `bp' request.
+
+o The new glyph symbol `tno' is a textual variant of `no'.
+
+o The new glyph symbol `+e' represents U+03F5, GREEK LUNATE EPSILON SYMBOL.
+  (Well, it is not really new since it has been previously supported by
+  grolj4.)  The mapping for both the dvi and lj4 symbol font has been
+  changed accordingly so that Greek small letter epsilon, `*e', has the
+  same glyph shape as with other devices.
+
+Grops
+-----
+
+o The font `freeeuro.pfa' has been added to provide various default glyph
+  shapes for `eu' and `Eu'.
+
+o It is now possible to access all glyphs in a Type 1 font, not only 256
+  (provided the font file created by afmtodit has proper entries).  grops
+  constructs additional encoding vectors on the fly if necessary.
+
+o The paper size is now emitted via the %%DocumentMedia and PageSize
+  mechanisms so that it is no longer required to tell `gv' or `ps2pdf'
+  about the paper size.  The `broken' flag value 16 omits this feature
+  (the used PostScript command `setpagedevice' is a LanguageLevel 2
+  extension).  Patch by Egil Kvaleberg <egil@kvaleberg.no>.
+
+o Non-slanted PostScript metrics have been changed again; they no longer
+  contain negative left italic correction values.  This assures correct
+  spacing with eqn.
+
+Grodvi
+------
+
+o The font cmtex10 has been added as the special font `SC' to the DVI fonts.
+  It is used as a font-specific special font for CW and CWI.
+
+o New options -l and -p to set landscape orientation and the paper size.
+  grodvi now emits a `papersize' special which is understood by DVI drivers
+  like dvips.
+
+  Consequently, the DESC file should contain a `papersize' keyword.
+
+o The glyph shapes for \[*f] and \[*e] have been exchanged with \[+f] and
+  \[+e], respectively, to be in sync with all other devices.
+
+o Glyphs \[HE] and \[DI] have been replaced with \[u2662] and \[u2661],
+  respectively, since the former two glyphs have a black (filled) shape
+  which grodvi doesn't provide by default (it never has actually).
+
+Grolj4
+------
+
+o The glyphs \[*e] and \[+e] have been exchanged to be in sync with
+  all other devices.
+
+o The glyph \[~=] is now called \[|=].  Similar to other devices, \[~=]
+  is now another name for glyph \[~~].
+
+Grotty
+------
+
+o New option `-r'.  It is similar to the -i option except it tells grotty to
+  use the `reverse video' attribute to render italic fonts.
+
+Pic
+---
+
+o New command `figname' to set the name of a picture's output box in TeX
+  mode.
+
+Refer
+-----
+
+o The environment variable `REFER' to override the name of the default
+  database isn't new but hasn't been documented before.
+
+Soelim
+------
+
+o New option `-r' to avoid emission of `.lf' lines.
+
+o New option `-t' to emit TeX comment lines (giving current file and the
+  line number) instead of `.lf' lines.
+
+Afmtodit
+--------
+
+o Unencoded glyphs in an AFM file are output also (since grops can now emit
+  multiple encoding vectors for a single font).
+
+o New option `-m' to prevent negative left italic correction values.
+
+o The mapping and encoding file together with file `DESC' are now searched
+  in the default font directory also.  Please refer to the man page of
+  afmtodit for more details.
+
+Macro Packages
+--------------
+
+o Larry Kollar <kollar@alltel.net> and others made the man macros more
+  customizable.
+
+  . New command line options -rFT, -rIN, and -rSN to set the vertical
+    location of the footer line, the body text indentation, and the
+    sub-subheading indentation.
+
+  . New command line option -rHY (similar to the ms macros) to control
+    hyphenation.
+
+  . New macros `.PT' and `.BT' to print the header and footer strings.
+    They can be replaced with a customized version in `man.local'.
+
+  . The string `HF' now holds the typeface to print headings and
+    subheadings.
+
+  . Similar to the ms macros, the LT register now defaults to LL if not
+    explicitly specified on the command line.
+
+o troff's start-up file `troffrc' now includes `papersize.tmac' to set
+  the paper size with the command line option `-dpaper=<size>'.
+
+  Possible values for `<size>' are the same as the predefined `papersize'
+  values in the DESC file (only lowercase; see the groff_font man page)
+  except a7-d7.  An appended `l' (ell) character denotes landscape
+  orientation.  Examples: `a4', `c3l', `letterl'.
+
+  Most output drivers need additional command line switches `-p' and
+  `-l' to override the default paper length and orientation as set in
+  the driver specific DESC file.
+
+  For example, use the following for PS output on A4 paper in landscape
+  orientation:
+
+    groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+
+
 VERSION 1.18.1
 ==============
 
@@ -8,11 +229,11 @@ Troff
 -----
 
 o The non-slanted PostScript font definition files have been regenerated to
-  include left and right italic correction values. Applying those to a glyph
-  (this is, prepending the glyph with `\,' and appending `\/' to the glyph)
-  sets the glyph width to the real value given by the horizontal bounding
-  box values. Without those escapes, the advance width for the particular
-  glyph is used (which can differ considerably).
+  include left and right italic correction values.  Applying those to a
+  glyph (this is, prepending the glyph with `\,' and appending `\/' to the
+  glyph) sets the glyph width to the real value given by the horizontal
+  bounding box values.  Without those escapes, the advance width for the
+  particular glyph is used (which can differ considerably).
 
   Most users will neither need this feature nor notice a difference in
   existing documents (provided \, and \/ is used as advertised, namely for
diff --git a/contrib/groff/PROBLEMS b/contrib/groff/PROBLEMS
index e3e6a7b..f679c3a 100644
--- a/contrib/groff/PROBLEMS
+++ b/contrib/groff/PROBLEMS
@@ -38,10 +38,10 @@ or, if you want to be portable to older troff versions, as follows:
 * groff can't handle my troff document.  It works fine with AT&T
   troff.
 
-Read the section on incompatibilities in gtroff(1).  Try using the -C
-option.  Alternatively there's the sed script `tmac/fixmacros.sed'
-which will attempt 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 will attempt to edit a file of macros so
+that it can be used with groff without the -C flag.
 
 ----------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ slow computers.)
 
 * Groff doesn't use the font names I'm used to.
 
-Use the `ftr' request.  See (g)troff(1).
+Use the `ftr' request.  See groff_diff(7).
 
 ----------------------------------------------------------------------
 
@@ -119,18 +119,8 @@ comments, you can do it like this:
 
 There seem to be many different styles of page header and footer
 produced by different versions of the -man macros.  You will need to
-modify tmac/an-old.tmac to suit your personal taste.  For example, if
-you want the center of the page header to say
-
-  System Programmer's Manual
-
-you will need to change the line
-
-  .el .ds an-extra3 \"System Programmer's Manual
-
-to
-
-  .el .ds an-extra3 System Programmer's Manual
+put modified macros from tmac/an-old.tmac into man.local.  More
+information is available in groff_man(7).
 
 ----------------------------------------------------------------------
 
@@ -335,18 +325,26 @@ are available in the devps directory.
 * I've configured groff for A4 paper, but gtroff still seems to think
   that the length of a page (as returned by `\n(.p') is 11 inches.
 
-This is intentional.  The PAGE option is used only by grops.  For
-compatibility with ditroff, the default page length in gtroff is
-always 11 inches.  The page length can be changed with the `pl'
-request.
+This is intentional.  The PAGE option during configuration is used
+only by grops.  For compatibility with ditroff, the default page
+length in gtroff is always 11 inches.  The page length can be changed
+with the `pl' request.
+
+A convenient way to set paper dimensions is to use the -dpaper option
+of groff, together with proper -P options for the postprocessor
+(overriding the default).  For example, use the following for PS
+output on A4 paper in landscape orientation:
+
+  groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+
+See groff_tmac(5) for more information.
 
 ----------------------------------------------------------------------
 
-* When I print the output groff -Tps, the output is always shifted up
-  by about 0.7 inches; I'm using 8.5x11 inch paper.
+* When I print the output of groff -Tps, the output is always shifted
+  up by about 0.7 inches; I'm using 8.5x11 inch paper.
 
-Make sure that PAGE is defined to be `letter' in the top-level
-Makefile.
+Make sure that the paper size is `letter'.  See groff_tmac(5).
 
 ----------------------------------------------------------------------
 
@@ -421,12 +419,14 @@ You have at least 3 options:
 * Groff seems to generate level 3 Postscript, but my printer is only a
   level 1 or 2 PostScript printer.
 
-In fact groff generates only level 1 PostScript.  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 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.
+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
+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.
 
 
 
@@ -613,8 +613,12 @@ Compilation Problems
     y.tab.c: In function `int yyparse()':
     y.tab.c: `size_t' undeclared in namespace `std'
 
-This is a bug in bison 1.32.  Don't use this version.  1.28 or 1.33 works
-fine.  Alternatively, use yacc or byacc.
+* bison reports conflicts (either on stderr or in the `pic.output'
+  file) while processing `pic.y', and the produced pic binary doesn't
+  work at all.
+
+You need bison version 1.875b or greater.  Alternatively, use yacc or
+byacc.
 
 ----------------------------------------------------------------------
 
@@ -783,3 +787,9 @@ patch is available.  Use GCC 2.95.2 or later instead.
 Make sure -DCFRONT_ANSI_BUG is included in DEFINES in the top-level
 Makefile.  If that doesn't solve the problem, define INT_MIN as
 -INT_MAX in libgroff/lib.h.
+
+----------------------------------------------------------------------
+
+* When compiling on MacOS X, groff compiles but does not run well.
+
+Use  ./configure CXX=g++2  then make as usual.
diff --git a/contrib/groff/README.CVS b/contrib/groff/README.CVS
new file mode 100644
index 0000000..ca284dc
--- /dev/null
+++ b/contrib/groff/README.CVS
@@ -0,0 +1,6 @@
+You need the following tools to build groff directly from CVS:
+
+  the netpbm package
+  texinfo >= 4.3
+  bison >= 1.875b or byacc
+  ghostscript
diff --git a/contrib/groff/REVISION b/contrib/groff/REVISION
index d00491f..573541a 100644
--- a/contrib/groff/REVISION
+++ b/contrib/groff/REVISION
@@ -1 +1 @@
-1
+0
diff --git a/contrib/groff/VERSION b/contrib/groff/VERSION
index adc97d8..bc44934 100644
--- a/contrib/groff/VERSION
+++ b/contrib/groff/VERSION
@@ -1 +1 @@
-1.18
+1.19
diff --git a/contrib/groff/aclocal.m4 b/contrib/groff/aclocal.m4
index c3e6b64..4b1b68e 100644
--- a/contrib/groff/aclocal.m4
+++ b/contrib/groff/aclocal.m4
@@ -63,25 +63,82 @@ dnl
 AC_DEFUN(GROFF_HTML_PROGRAMS,
 [make_html=html
 make_install_html=install_html
+missing=
 AC_CHECK_PROG(pnmcut, pnmcut, found, missing)
+if test $pnmcut = missing; then
+	missing="$missing pnmcut"
+fi
 AC_CHECK_PROG(pnmcrop, pnmcrop, found, missing)
+if test $pnmcrop = missing; then
+	missing="$missing pnmcrop"
+fi
 AC_CHECK_PROG(pnmtopng, pnmtopng, found, missing)
+if test $pnmtopng = missing; then
+	missing="$missing pnmtopng"
+fi
 AC_CHECK_PROG(gs, gs gsos2, found, missing)
+if test $gs = missing; then
+	missing="$missing gs"
+fi
 AC_CHECK_PROG(psselect, psselect, found, missing)
-case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
-*missing*)
+if test $psselect = missing; then
+	missing="$missing psselect"
+fi
+AC_CHECK_PROG(pnmtops, pnmtops, found, missing)
+if test $pnmtops = missing; then
+	missing="$missing pnmtops"
+fi
+if test -n "$missing"; then
+	cnt=0
+	for i in $missing
+	do
+		cnt=`expr $cnt + 1`
+		eval "prog$cnt=$i"
+	done
+	plural="s"
+	case $cnt in
+	1)
+		plural=""
+		progs="\`$prog1'" ;;
+	2)
+		progs="\`$prog1' and \`$prog2'" ;;
+	3)
+		progs="\`$prog1', \`$prog2', and \`$prog3'" ;;
+	4)
+		progs="\`$prog1', \`$prog2', \`$prog3', and \`$prog4'" ;;
+	5)
+		progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', and \`$prog5'" ;;
+	6)
+		progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', \`$prog5', and \`$prog6'" ;;
+	esac
 	make_html=
 	make_install_html=
 	AC_MSG_WARN([
 
-  Since one or more of the above five programs can't be found in the path,
-  the HTML backend of groff (grohtml) won't work properly.  Consequently,
-  no documentation in HTML format is built and installed.
-]) ;;
-esac
+  The program$plural
+    $progs
+  can't be found in the path, thus the HTML backend of groff (grohtml)
+  won't work properly.  Consequently, no documentation in HTML format
+  is built and installed.
+])
+fi
 AC_SUBST(make_html)
 AC_SUBST(make_install_html)])dnl
 dnl
+dnl check to see whether pnmtops can handle the -nosetpage option
+dnl
+AC_DEFUN(GROFF_PNMTOPS_NOSETPAGE,
+[AC_MSG_CHECKING([whether pnmtops can handle the -nosetpage option])
+if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then
+	AC_MSG_RESULT(yes)
+	pnmtops_nosetpage="pnmtops -nosetpage"
+else
+	AC_MSG_RESULT(no)
+	pnmtops_nosetpage="pnmtops"
+fi
+AC_SUBST(pnmtops_nosetpage)
+])dnl
+dnl
 dnl
 dnl GROFF_CSH_HACK(if hack present, if not present)
 dnl
@@ -188,6 +245,17 @@ AC_MSG_RESULT(no))
 AC_LANG_POP(C++)])dnl
 dnl
 dnl
+AC_DEFUN(GROFF_STDINT_H,
+[AC_LANG_PUSH(C++)
+AC_MSG_CHECKING([C++ <stdint.h>])
+AC_TRY_COMPILE([#include <stdint.h>],
+[uint32_t x; int32_t y;],
+AC_MSG_RESULT(yes);AC_DEFINE(HAVE_CC_STDINT_H, 1,
+			     [Define if you have a C++ <stdint.h>.]),
+AC_MSG_RESULT(no))
+AC_LANG_POP(C++)])dnl
+dnl
+dnl
 AC_DEFUN(GROFF_TIME_T,
 [AC_LANG_PUSH(C++)
 AC_MSG_CHECKING([for declaration of time_t])
@@ -545,12 +613,12 @@ fi
 AC_LANG_POP(C++)])dnl
 dnl
 dnl
-dnl If mkstemp() isn't available, use our own mkstemp.cc file.
+dnl If mkstemp() isn't available, use our own mkstemp.cpp file.
 dnl
 AC_DEFUN(GROFF_MKSTEMP,
 [AC_MSG_CHECKING([for mkstemp])
 AC_LANG_PUSH(C++)
-AC_LIBSOURCE(mkstemp.cc)
+AC_LIBSOURCE(mkstemp.cpp)
 AC_TRY_LINK([#include <stdlib.h>
 #include <unistd.h>
 int (*f) (char *);],
diff --git a/contrib/groff/configure b/contrib/groff/configure
index fc28d84..b6ad057 100755
--- a/contrib/groff/configure
+++ b/contrib/groff/configure
@@ -267,7 +267,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-ac_unique_file="src/roff/groff/groff.cc"
+ac_unique_file="src/roff/groff/groff.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -305,7 +305,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS groff_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD CPP EGREP LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap pnmcut pnmcrop pnmtopng gs psselect make_html make_install_html LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS groff_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD CPP EGREP LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap pnmcut pnmcrop pnmtopng gs psselect pnmtops make_html make_install_html pnmtops_nosetpage LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3459,9 +3459,8 @@ done
 
 
 
-
 for ac_header in stdlib.h unistd.h dirent.h limits.h sys/dir.h \
-                 string.h strings.h math.h stdint.h sys/time.h
+                 string.h strings.h math.h sys/time.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4093,6 +4092,246 @@ 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
 
+echo "$as_me:$LINENO: checking whether rand must be declared" >&5
+echo $ECHO_N "checking whether rand must be declared... $ECHO_C" >&6
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+int
+main ()
+{
+#ifndef rand
+  char *p = (char *) rand;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  groff_cv_decl_needed_rand=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+groff_cv_decl_needed_rand=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $groff_cv_decl_needed_rand" >&5
+echo "${ECHO_T}$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
+
+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
+
+echo "$as_me:$LINENO: checking whether snprintf must be declared" >&5
+echo $ECHO_N "checking whether snprintf must be declared... $ECHO_C" >&6
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+int
+main ()
+{
+#ifndef snprintf
+  char *p = (char *) snprintf;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  groff_cv_decl_needed_snprintf=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+groff_cv_decl_needed_snprintf=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $groff_cv_decl_needed_snprintf" >&5
+echo "${ECHO_T}$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
+
+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
+
+echo "$as_me:$LINENO: checking whether srand must be declared" >&5
+echo $ECHO_N "checking whether srand must be declared... $ECHO_C" >&6
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+int
+main ()
+{
+#ifndef srand
+  char *p = (char *) srand;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  groff_cv_decl_needed_srand=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+groff_cv_decl_needed_srand=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $groff_cv_decl_needed_srand" >&5
+echo "${ECHO_T}$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
+
+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
+
 echo "$as_me:$LINENO: checking whether strcasecmp must be declared" >&5
 echo $ECHO_N "checking whether strcasecmp must be declared... $ECHO_C" >&6
 ac_ext=cc
@@ -4453,6 +4692,57 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+echo "$as_me:$LINENO: checking C++ <stdint.h>" >&5
+echo $ECHO_N "checking C++ <stdint.h>... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdint.h>
+int
+main ()
+{
+uint32_t x; int32_t y;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6;
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CC_STDINT_H 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.$ac_objext 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
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 echo "$as_me:$LINENO: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
@@ -5118,7 +5408,10 @@ LIBS="$LIBS -lc $LIBM"
 
 
 
-for ac_func in fmod getcwd putenv snprintf strerror strtol
+
+
+for ac_func in fmod getcwd putenv snprintf strcasecmp \
+                 strerror strncasecmp strtol
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5196,8 +5489,7 @@ LIBS="$saved_libs"
 
 
 
-
-for ac_func in gettimeofday isatty rename strcasecmp strncasecmp strsep
+for ac_func in gettimeofday isatty rename setlocale strsep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5660,6 +5952,7 @@ echo "${ECHO_T}$tmac_wrap" >&6
 
 make_html=html
 make_install_html=install_html
+missing=
 # Extract the first word of "pnmcut", so it can be a program name with args.
 set dummy pnmcut; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5696,6 +5989,9 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+if test $pnmcut = missing; then
+	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
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5732,6 +6028,9 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+if test $pnmcrop = missing; then
+	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
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5768,6 +6067,9 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+if test $pnmtopng = missing; then
+	missing="$missing pnmtopng"
+fi
 # Extract the first word of "gs gsos2", so it can be a program name with args.
 set dummy gs gsos2; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5804,6 +6106,9 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+if test $gs = missing; then
+	missing="$missing gs"
+fi
 # Extract the first word of "psselect", so it can be a program name with args.
 set dummy psselect; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5840,23 +6145,103 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
-*missing*)
+if test $psselect = missing; then
+	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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_pnmtops+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$pnmtops"; then
+  ac_cv_prog_pnmtops="$pnmtops" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_pnmtops="found"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_pnmtops" && ac_cv_prog_pnmtops="missing"
+fi
+fi
+pnmtops=$ac_cv_prog_pnmtops
+if test -n "$pnmtops"; then
+  echo "$as_me:$LINENO: result: $pnmtops" >&5
+echo "${ECHO_T}$pnmtops" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test $pnmtops = missing; then
+	missing="$missing pnmtops"
+fi
+if test -n "$missing"; then
+	cnt=0
+	for i in $missing
+	do
+		cnt=`expr $cnt + 1`
+		eval "prog$cnt=$i"
+	done
+	plural="s"
+	case $cnt in
+	1)
+		plural=""
+		progs="\`$prog1'" ;;
+	2)
+		progs="\`$prog1' and \`$prog2'" ;;
+	3)
+		progs="\`$prog1', \`$prog2', and \`$prog3'" ;;
+	4)
+		progs="\`$prog1', \`$prog2', \`$prog3', and \`$prog4'" ;;
+	5)
+		progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', and \`$prog5'" ;;
+	6)
+		progs="\`$prog1', \`$prog2', \`$prog3', \`$prog4', \`$prog5', and \`$prog6'" ;;
+	esac
 	make_html=
 	make_install_html=
 	{ echo "$as_me:$LINENO: WARNING:
 
-  Since one or more of the above five programs can't be found in the path,
-  the HTML backend of groff (grohtml) won't work properly.  Consequently,
-  no documentation in HTML format is built and installed.
+  The program$plural
+    $progs
+  can't be found in the path, thus the HTML backend of groff (grohtml)
+  won't work properly.  Consequently, no documentation in HTML format
+  is built and installed.
 " >&5
 echo "$as_me: WARNING:
 
-  Since one or more of the above five programs can't be found in the path,
-  the HTML backend of groff (grohtml) won't work properly.  Consequently,
-  no documentation in HTML format is built and installed.
-" >&2;} ;;
-esac
+  The program$plural
+    $progs
+  can't be found in the path, thus the HTML backend of groff (grohtml)
+  won't work properly.  Consequently, no documentation in HTML format
+  is built and installed.
+" >&2;}
+fi
+
+
+echo "$as_me:$LINENO: checking whether pnmtops can handle the -nosetpage option" >&5
+echo $ECHO_N "checking whether pnmtops can handle the -nosetpage option... $ECHO_C" >&6
+if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	pnmtops_nosetpage="pnmtops -nosetpage"
+else
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	pnmtops_nosetpage="pnmtops"
+fi
 
 
           ac_config_files="$ac_config_files stamp-h"
@@ -6495,8 +6880,10 @@ s,@pnmcrop@,$pnmcrop,;t t
 s,@pnmtopng@,$pnmtopng,;t t
 s,@gs@,$gs,;t t
 s,@psselect@,$psselect,;t t
+s,@pnmtops@,$pnmtops,;t t
 s,@make_html@,$make_html,;t t
 s,@make_install_html@,$make_install_html,;t t
+s,@pnmtops_nosetpage@,$pnmtops_nosetpage,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff --git a/contrib/groff/configure.ac b/contrib/groff/configure.ac
index 75c4799..c507963 100644
--- a/contrib/groff/configure.ac
+++ b/contrib/groff/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_HEADERS(src/include/config.h:src/include/config.hin)
-AC_CONFIG_SRCDIR([src/roff/groff/groff.cc])
+AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])
 dnl checks for programs
 GROFF_SRCDIR
 GROFF_BUILDDIR
@@ -24,7 +24,7 @@ GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='1s/a/a/')
 AC_SUBST(SH_SCRIPT_SED_CMD)
 dnl checks for headers
 AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \
-                 string.h strings.h math.h stdint.h sys/time.h)
+                 string.h strings.h math.h sys/time.h)
 GROFF_ISC_SYSV3
 GROFF_POSIX
 GROFF_SRAND
@@ -33,12 +33,16 @@ GROFF_NEED_DECLARATION(hypot)
 GROFF_NEED_DECLARATION(popen)
 GROFF_NEED_DECLARATION(pclose)
 GROFF_NEED_DECLARATION(putenv)
+GROFF_NEED_DECLARATION(rand)
+GROFF_NEED_DECLARATION(snprintf)
+GROFF_NEED_DECLARATION(srand)
 GROFF_NEED_DECLARATION(strcasecmp)
 GROFF_NEED_DECLARATION(strncasecmp)
 GROFF_SYS_NERR
 GROFF_SYS_ERRLIST
 GROFF_OSFCN_H
 GROFF_LIMITS_H
+GROFF_STDINT_H
 GROFF_INTTYPES_H
 dnl checks for typedefs
 GROFF_UNSIGNED_LONG_LONG
@@ -52,9 +56,10 @@ dnl checks for functions
 AC_FUNC_MMAP
 saved_libs="$LIBS"
 LIBS="$LIBS -lc $LIBM"
-AC_REPLACE_FUNCS(fmod getcwd putenv snprintf strerror strtol)
+AC_REPLACE_FUNCS(fmod getcwd putenv snprintf strcasecmp \
+                 strerror strncasecmp strtol)
 LIBS="$saved_libs"
-AC_CHECK_FUNCS(gettimeofday isatty rename strcasecmp strncasecmp strsep)
+AC_CHECK_FUNCS(gettimeofday isatty rename setlocale strsep)
 GROFF_MKSTEMP
 AC_DECL_SYS_SIGLIST
 dnl checks for compiler characteristics
@@ -68,6 +73,7 @@ GROFF_PAGE
 GROFF_G
 GROFF_TMAC
 GROFF_HTML_PROGRAMS
+GROFF_PNMTOPS_NOSETPAGE
 AC_CONFIG_FILES(stamp-h, [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile doc/Makefile src/xditview/Imakefile])
 AC_OUTPUT
diff --git a/contrib/groff/contrib/groffer/ChangeLog b/contrib/groff/contrib/groffer/ChangeLog
index 263dbcd..f706907 100644
--- a/contrib/groff/contrib/groffer/ChangeLog
+++ b/contrib/groff/contrib/groffer/ChangeLog
@@ -1,3 +1,100 @@
+2003-01-22  Bernd Warken  <bwarken@mayn.de>
+	________________________________________________________________
+	* release of groffer 0.9.4
+
+	* groffer.sh: corrections for some restrictive shells
+	- Possible exit codes in actual `ash' are between 0 and 63.  To
+	handle even deeper restrictions, use 7 as maximal code instead
+	of 255 as replacement for error -1.
+	- Remove variables $_BAD2 and $_BAD3.
+	- Replace `trap' argument `EXIT' by 0 and write new fuctions
+	`trap_clean' and `trap_set' to handle the restrictions of `trap'
+	for some shells.
+	- Correct wrong $MANPATH to $_MAN_PATH in function
+	`man_do_filespec'.
+	- Test existence of directory before deleting it in the
+	`clean_up' definitions.
+	- Correct help output in `usage' (called by `--help').
+	
+	* TODO:
+	Remove mention of `shoop' and `apropos'.
+
+2002-10-21  Bernd Warken  <bwarken@mayn.de>
+	________________________________________________________________
+	* release of groffer 0.9.3
+
+	* groffer.sh: new temporary subdirectory
+	- Generate temporary subdirectory for storing temporary files
+	with better names in future groffer versions (name:
+	"groffer$$" in usual temporary directory).
+	- Use `umask 000' for temporary files to allow cleaning up
+	for everyone after a system break.
+	- Change both clean_up() functions (for normal shell and
+	for main_display() subshell) to handle the new subdirectory.
+	- clean_up_secondary() and $_TMP_PREFIX are unnecessary now, so
+	they were removed.
+
+	* Makefile.sub: `sed' commands for "groffer:"
+	- Remove "@g@" entry (not used in "groffer.sh").
+	- Add global replace for "@BINDIR@" and "@VERSION@" for future
+	usage.
+
+	* TODO: think about...
+	- writing part of groffer in C/C++.
+	- handling several files with different macro packages.
+	
+2002-10-17  Bernd Warken  <bwarken@mayn.de>
+	________________________________________________________________
+	* fixes of groffer 0.9.2
+
+	* groffer.sh:
+	Terminate main_parse_MANOPT() if $MANOPT is empty or consists
+	of space characters only.
+
+	* groffer.man: some fixes in "GROFFER OPTIONS"
+	- New macro ".Header_CB" for CB font in .TP headers; used for
+	definition of variables in option --mode.
+	- Fix some option references to refer to long options.
+	
+	* README:
+	New file for general information on the groffer source; it is
+	not installed.
+	
+2002-10-14  Bernd Warken  <bwarken@mayn.de>
+
+	* Makefile.sub:
+	add replacement "@BINDIR@" to "$(bindir)" for "groffer:"
+
+	* groffer.sh:
+	Define $_this as "@BINDIR@/${_PROGRAM_NAME}" to save the right
+	installation position of groffer for the special shell calling.
+
+	* groffer.man:
+	Remove double definition of filespec parameters.
+
+2002-10-13  Bernd Warken  <bwarken@mayn.de>
+	________________________________________________________________
+	* release of groffer 0.9.2
+
+	* groffer.sh: fixes
+	- Fix some 'sed' functions: two in func_stack_dump(), one in
+	  base_name(), add 'sed' command in list_from_cmdline().
+	- Finish main_parse_MANOPT() if $MANOPT is empty.
+	- Sort $_OPTS_GROFF_SHORT_NA like groff short options (but
+	  unchanged).
+	- Fix some comments.
+
+	* groffer.man: make it more readable (but no additions)
+	- A shortened section "SYNOPSIS" is followed by a simplified
+	  section "DESCRIPTION".
+	- The options from "SYNOPSIS" go to new section "OPTION
+	  OVERVIEW" with all groffer options in a single subsection.
+	- The details of all groffer options are described in section
+	  "GROFFER OPTIONS".
+	- New macro for file names ".File_name".
+	- "Option Parsing" is moved to section "COMPATIBILITY".
+	- Fix some "EXAMPLES".
+	
 2002-09-30  Bernd Warken  <bwarken@mayn.de>
 	________________________________________________________________
 	* release of groffer 0.9.1
diff --git a/contrib/groff/contrib/groffer/Makefile.sub b/contrib/groff/contrib/groffer/Makefile.sub
index 4be6846..333dedb 100644
--- a/contrib/groff/contrib/groffer/Makefile.sub
+++ b/contrib/groff/contrib/groffer/Makefile.sub
@@ -2,7 +2,7 @@
 
 # File position: <groff-source>/contrib/groffer/Makefile.sub
 
-# Last update: 23 June 2002
+# Last update: 21 October 2002
 
 # Copyright (C) 2001,2002 Free Software Foundation, Inc.
 # Written by Werner Lemberg <wl@gnu.org>
@@ -33,8 +33,8 @@ all: groffer
 
 groffer: groffer.sh
 	rm -f $@; \
-	sed -e "s|@g@|$(g)|g" \
-	    -e "s|@VERSION@|$(version)$(revision)|" \
+	sed -e "s|@BINDIR@|$(bindir)|g" \
+	    -e "s|@VERSION@|$(version)$(revision)|g" \
 	    -e $(SH_SCRIPT_SED_CMD) $(srcdir)/groffer.sh >$@; \
 	chmod +x $@
 
diff --git a/contrib/groff/contrib/groffer/README b/contrib/groff/contrib/groffer/README
new file mode 100644
index 0000000..413f49f
--- /dev/null
+++ b/contrib/groff/contrib/groffer/README
@@ -0,0 +1,23 @@
+The `groffer' program is the easiest way to read `groff' documents.
+All input is sent to `grog' and then to `groff' such that no special
+`groff' arguments must be determined.
+
+`groffer' also has many built-in `man' functionalities to find and
+read the manual pages on UNIX and similar operating systems.  It
+accepts the information from an installed `man' program, but tries to
+find a man path by itself if there isn't any.
+
+So far, `groffer' is a shell script.  It should run on any POSIX or
+Bourne style shell, but it runs the fastest if the `ash' shell is
+installed on the system.  This shell is found out and started
+automatically.  There are efforts to port part of the shell script to
+C/C++ to increase the speed independent of the shell.
+
+For reporting bugs of `groffer', groff's free mailing list
+<bug-groff@gnu.org> can be used.  For a general discussion, the
+<groff@gnu.org> is more useful; see the `README' file in the top
+directory of the `groff' source package for more details on this
+mailing list.
+
+`groffer' is a `groff contrib' project that was written by Bernd
+Warken <bwarken@mayn.de>.
diff --git a/contrib/groff/contrib/groffer/TODO b/contrib/groff/contrib/groffer/TODO
index 6ff8f65..3aadb19 100644
--- a/contrib/groff/contrib/groffer/TODO
+++ b/contrib/groff/contrib/groffer/TODO
@@ -2,9 +2,9 @@
 
 # File position: <groff-source>/contrib/groffer/TODO
 
-# Last update: 30 Sep 2002
+# Last update: 22 Jan 2003
 
-# Copyright (C) 2001,2002 Free Software Foundation, Inc.
+# Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
 # Written by Bernd Warken <bwarken@mayn.de>
 
 # This file is part of groff.
@@ -32,9 +32,10 @@ Optimization:
 - Optimize man path determination in manpath_add_lang_sys() for speed
   by building-up the man path only by and by as far as necessary
   (not trivial).
+- To increase the running speed write part of the groffer shell script
+  in C/C++.
 
 Features:
-- Consider using the `shoop' package (OOP for `sh').
 - Revise option handling of `grog'.
 - `gxditview' needs a complete shower.
 
@@ -42,9 +43,11 @@ Revision:
 - Should there be a native implementation for `--apropos'?
 - Revise the `--all' feature to better reflect GNU man.
 - The debug function stack is buggy (no effect on normal operation).
+- The actual `groff' and `grog' do not support file arguments each
+of which has a different macro package (except `man' and `doc').  So
+`roffer' should create several display files for such arguments.
 
 Documentation:
-- Write a README file.
 - Improve the documentation of the search algorithm for man pages in
   both the groffer script and the man page `groffer.man'.
 - In `groff.man', add more documentation for parts that were taken over
diff --git a/contrib/groff/contrib/groffer/groffer.man b/contrib/groff/contrib/groffer/groffer.man
index fd72504..da6a532 100644
--- a/contrib/groff/contrib/groffer/groffer.man
+++ b/contrib/groff/contrib/groffer/groffer.man
@@ -15,8 +15,8 @@ groffer.1 - man page for groffer (section 1).
 Source file position:  <groff_source_top>/contrib/groffer/groffer.man
 Installed position:    $prefix/share/man/man1/groffer.1
 
-Version     : groffer 0.9.1
-Last update : 30 Sep 2002
+Version     : groffer 0.9.2
+Last update : 13 Oct 2002
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -59,7 +59,7 @@ FDL in the main directory of the groff source package.
 .ds @i- "\f[CI]-\f[]\""
 .ds @i-- "\f[CI]--\f[]\""
 .
-.ds Ellipsis .\|.\|.\"
+.ds Ellipsis ".\|.\|.\""
 .
 .\" --------------------------------------------------------------------
 .\" setup for the macro definitions below
@@ -160,6 +160,24 @@ FDL in the main directory of the groff source package.
 .  hy
 ..
 .c --------------------------------------------------------------------
+.c .File_name  (<path_name>)
+.c
+.c Display a file or directory name in CB font.
+.c
+.de File_name
+.  Header_CB \\$@
+..
+.c --------------------------------------------------------------------
+.c .Header_CB  (<path_name>)
+.c
+.c Display a line in CB font, for example after .TP
+.c
+.de Header_CB
+.  nh
+.  Text \f[CB]\\$1\f[]\\$2
+.  hy
+..
+.c --------------------------------------------------------------------
 .c .Opt_-  ([<punct>])
 .c
 .c Print `-' (minus sign); optional punctuation. 
@@ -611,8 +629,7 @@ FDL in the main directory of the groff source package.
 .
 .ad l
 .Synopsis groffer
-.RI [ viewing_options ]
-.RI [ man_options ]
+.RI [ groffer_options ]
 .RI [ groff_options ]
 .Opt_[--]
 .RI [ "filespec" "\*[Ellipsis]]"
@@ -627,16 +644,81 @@ FDL in the main directory of the groff source package.
 ./Synopsis
 .
 .
+.\" --------------------------------------------------------------------
+.SH DESCRIPTION
+.\" --------------------------------------------------------------------
+.
+The
+.I groffer
+program is the easiest way to use
+.BR groff (@MAN1EXT@).
+It can display arbitrary documents written in the
+.BR groff (@MAN7EXT@)
+language or other
+.BR roff (@MAN7EXT@)
+languages that are compatible to the original troff language.
+.
+The
+.I groffer
+program also includes many of the features for finding and displaying
+the UNIX manual pages
+.RI ( man\~pages ),
+such that it can be used as a replacement for a
+.BR man (1)
+program.
+.
+Moreover, compressed files that can be handled by
+.BR gzip (1)
+or
+.BR bzip2 (1)
+are decompressed on-the-fly.
+.
+.
+.P
+The normal usage is quite simple by supplying a file name or name of a
+man\~page without further options.
+.
+But the option handling has many possibilities for creating special
+behaviors.
+.
+These can be stored in a configuration file.
+.
+.
+.P
+The output can be generated and viewed in several different ways
+available for
+.IR groff .
+.
+This includes the groff native X viewer
+.BR gxditview (@MAN1EXT@),
+each Postcript or dvi display program, a web browser by generating
+html in www-mode, or several text modes in text terminals.
+.
+.
+.P
+Most options that must be named when running
+.I groff
+are determined automatically because
+.I groffer
+internally calls the
+.BR grog (@MAN1EXT@)
+program.
+.
+But all parts can be controlled manually by supplying options.
+.
+.
+.\" --------------------------------------------------------------------
+.SH "OPTION OVERVIEW"
+.\" --------------------------------------------------------------------
+.
 .TP
-.I viewing_options
-These options determine and configure the display mode.
+.I groffer_options
+The following options determine and configure the display mode.
 .
 They were synchronized with the options of both
 .BR groff (@MAN1EXT@)
 and GNU
 .BR man (1).
-As groff uses almost any letter in its option set, only long option
-names are available for most features.
 .
 If none of these options is used groffer tries to find a suitable
 display mode automatically.
@@ -670,7 +752,10 @@ display mode automatically.
 .
 .P
 The following long options were adapted from the corresponding X
-Toolkit options with a single leading minus; see
+Toolkit options.
+.
+Their single leading minus in X Toolkit was changed to a double minus
+for long options; see
 .BR X (1).
 .
 .
@@ -687,6 +772,50 @@ Toolkit options with a single leading minus; see
 .Opt_[alt] -- title string
 .Opt_[alt] -- xrm X_resource
 .
+.
+.P
+The following long options regulate whether and how
+.I man\~pages
+(UNIX manual pages) are searched.
+.
+They were constructed for
+.IR groffer ,
+but they are compatible with the long options of the
+.I GNU man
+program.
+.
+.
+.P
+.Opt_[alt] -- all
+.Opt_[alt] -- ascii
+.Opt_[alt] -- apropos
+.Opt_[alt] -- ditroff
+.Opt_[alt] -- extension suffix
+.Opt_[alt] -- locale language
+.Opt_[alt] -- local-file
+.Opt_[alt] -- man
+.Opt_[alt] -- manpath dir1:dir2:\*[Ellipsis]
+.Opt_[alt] -- no-location
+.Opt_[alt] -- no-man
+.Opt_[alt] -- sections sec1:sec2:\*[Ellipsis]
+.Opt_[alt] -- systems sys1,sys2,\*[Ellipsis]
+.Opt_[alt] -- troff-device device
+.Opt_[alt] -- whatis
+.
+.
+.P
+The GNU
+.I man
+long options that are not mentioned are recognized, but they are just
+ignored because of alternative implementations.
+.
+The full set of long and short options of the GNU man program can be
+passed via the environment variable
+.Env_var $MANOPT ;
+see
+.BR man (1)
+if your system has GNU man installed.
+.
 .RE
 .
 .
@@ -731,302 +860,85 @@ and
 .
 .
 .TP
-.I man_options
-These options regulate whether and how man pages are searched.
-.
-They are compatible with the long options of the
-.I GNU man
-program.
-.
-.
-.RS
-.
-.P
-.Opt_[alt] -- all
-.Opt_[alt] -- ascii
-.Opt_[alt] -- apropos
-.Opt_[alt] -- ditroff
-.Opt_[alt] -- extension suffix
-.Opt_[alt] -- locale language
-.Opt_[alt] -- local-file
-.Opt_[alt] -- man
-.Opt_[alt] -- manpath dir1:dir2:\*[Ellipsis]
-.Opt_[alt] -- no-location
-.Opt_[alt] -- no-man
-.Opt_[alt] -- sections sec1:sec2:\*[Ellipsis]
-.Opt_[alt] -- systems sys1,sys2,\*[Ellipsis]
-.Opt_[alt] -- troff-device device
-.Opt_[alt] -- whatis
-.
-.
-.P
-The GNU
-.I man
-long options that are not mentioned are recognized, but they are just
-ignored because of alternative implementations.
-.
-The full set of long and short options of the GNU man program can be
-passed via the environment variable
-.Env_var $MANOPT ;
-see
-.BR man (1)
-if your system has GNU man installed.
-.
-.RE
-.
-.
-.TP
 .I filespec
-is a sequence of file names or templates for searching
+is one or more file names or templates for searching
 man\~pages, see
 .BR man (1).
-A
+Each
 .I filespec
 can have one of the following forms.
 .
 .
 .RS
 .
-.TP 10m
-.I filename
-the path name of an existing file.
+.P
+No
+.I filespec
+parameters means standard input.
 .
 .
-.TP
+.TP 10m
 .Opt_short
 stands for standard input (can occur several times).
 .
 .
 .TP
-.BI man: name ( section )
-search the man\~page
-.I name
-in section\~\c
-.IR section .
+.I filename
+the path name of an existing file.
 .
 .
 .TP
-.BI man: name . section
-search the man\~page
 .I name
-in section\~\c
-.IR section .
+if 
+.I name
+is not an existing file search for the man\~page called in the lowest
+man\~section that has a document for this name.
 .
 .
 .TP
 .BI man: name
-search the man\~page
-.I name
-in the lowest available section.
+search for a man\~page in the lowest man\~section that has a document
+called
+.IR name .
 .
 .
 .TP
+.BI man: name . section
+.TP+
+.BI man: name ( section )
+.TP+
 .IB name ( section )
-search the man\~page
-.I name
-in section\~\c
-.IR section .
-.
-.
-.TP
+.TP+
 .IB name . section
-search the man\~page
+each of these search the man\~page
 .I name
-in section\~\c
+in man\~section\~\c
 .IR section .
 .
 .
 .TP
-.I standard_section
-if this is `1', \*[Ellipsis], `9', `o', or `n' try to retrieve the
-next argument as a man\~page in this section.
-.
-.
-.TP
-.I name
-search for the man\~page
+.I "std_section name"
+two arguments like in the
+.BR man (1)
+program to find man\~page
 .I name
-in the lowest available section.
+in man\~section
+.IR std_section .
 .
+In
+.IR groffer ,
+the argument
+.I std_section
+is a standard section name for man\~pages; these are a digit `1',
+\&\*[Ellipsis], `9', or the single letters `o' or `n'.
 .
-.P
-No
-.I filespec
-parameters means standard input.
+This should be used only with care.
 .
 .RE
 .
 .
-.P
-For details on the options, see section
-.BR OPTIONS .
-.
-.
-.\" --------------------------------------------------------------------
-.SH DESCRIPTION
-.\" --------------------------------------------------------------------
-.
-The
-.I groffer
-program is part of
-.BR groff (@MAN7EXT@).
-It can be used to display arbitrary documents written in the
-.BR roff (@MAN7EXT@)
-formatting language in several different ways, in an X window viewer
-program or in a text terminal.
-.
-The viewer programs can be chosen as the groff native viewer
-.BR gxditview (@MAN1EXT@),
-a Postcript or dvi display program, or a web browser.
-.
-.
-.P
-A search facility for manual pages (
-.IR man\~pages )
-is provided.
-.
-Almost the whole functionality of the
-.I GNU man
-program was provided or suitably adapted.
-.
-This makes the groffer program a valuable tool on systems with a poor
-.I man
-system.
-.
-.
-.P
-The program always concatenates all input specified by the non-option
-parameters of the calling command line or standard input.
-.
-Compressed standard input or files are decompressed on-the-fly.
-.
-.
-.P
-Normally, the input is run through the
-.BR groff (@MAN1EXT@)
-text processor before being displayed.
-.
-By using the option
-.Opt_short Q ,
-the roff source code is displayed without formatting.
-.
-.
-.P
-The formatting process can be regulated by all options that are
-available groff.
-.
-By using the
-.Opt_short T
-option, groffer can be switched to behave exactly like groff without
-using its viewer facilities, but additionally with the search and
-decompression features.
-.
-.
-.P
-All necessary options can be determined automatically.
-.
-For example, the groffer program internally uses the
-.BR grog (@MAN1EXT@)
-program to determine from the unformatted document which preprocessors
-should be run and which macro files should be included.
-.
-But all parts of the program can be controlled manually by suitable
-options.
-.
-.
-.\" --------------------------------------------------------------------
-.SH OPTIONS
-.\" --------------------------------------------------------------------
-.
-The groffer program provides its own parser for command line options
-that is compatible to both POSIX
-.BR getopts (1)
-and GNU
-.BR getopt (1).
-The command line behaves as usually.
-.
-For completeness, the details are provided here.
-.
-.
-.\" --------------------------------------------------------------------
-.SS "Option Parsing"
-.\" --------------------------------------------------------------------
-.
-The following types of options are supported, equally on all systems
-that are able to run the groffer program:
-.
-.
-.Topic
-single character options are always preceded by a single minus
-character, for example,
-.Opt_short c .
-.
-.
-.Topic
-the argument for a single character option is the next command line
-argument, for example,
-.Opt_alt - o\~ arg ,
-or can be appended to the option character within the same argument
-.Opt_alt - o arg .
-.
-.
-.Topic
-clusters of such single character options without an argument,
-eventually terminated by a single character option with an argument;
-for example,
-.Opt_alt - abo arg
-is equivalent to
-.Opt_short a\~\c
-.Opt_short b\~\c
-.Opt_short o\~\c
-.I arg .
-.
-.
-.Topic
-Long options, that means option with names longer than one character
-are always prededed by a double minus; an option argument can either
-go to the next command line argument or be appended with an equal sign
-to the argument; for example,
-.Opt_alt -- long= arg
-is equivalent to
-.Opt_alt -- long\~ arg .
-.
-.
-.Topic
-An argument of
-.Opt_--
-ends option parsing; all further command line arguments are
-interpreted as filespec arguments.
-.
-.
-.Topic
-By default, all command line arguments that are neither options nor
-option arguments are interpreted as filespec parameters and stored
-until option parsing has finished.
-.
-For example, the command line
-.Shell_cmd "groffer file1 -a -o arg file 2"
-is, by default, equivalent to
-.Shell_cmd "groffer -a -o arg -- file1 file 2"
-.
-.
-.Topic
-This behavior can be changed by setting the environment variable
-.Env_var $POSIXLY_CORRECT
-to a non-empty value; in this case, option processing is stopped as
-soon as the first non-option argument is found.
-.
-For example, in posixly correct mode, the command line
-.Shell_cmd "groffer file1 -a -o arg file 2"
-is equivalent to
-.Shell_cmd "groffer -- file1 -a -o arg file 2"
-As this leads to unwanted behavior in most cases, most people do not
-want to set
-.Env_var $POSIXLY_CORRECT .
-.
-.
 .\" --------------------------------------------------------------------
-.SS "Compatibility with Options from other Programs"
+.SH "GROFFER OPTIONS"
 .\" --------------------------------------------------------------------
 .
 All short options of
@@ -1067,10 +979,6 @@ These options are documented in the following; the other
 options are recognized, but ignored.
 .
 .
-.\" --------------------------------------------------------------------
-.SS "Native groffer Options"
-.\" --------------------------------------------------------------------
-.
 .Opt_def - h
 Print usage message to standard error and exit.
 .
@@ -1084,13 +992,10 @@ This is the equivalent
 .
 .Opt_def - T devname
 Switch to
-.Opt_long mode\~device ,
-.
-thus disabling the
-.I groffer
-viewing.
+.Opt_long mode
+.IR devname .
 .
-Instead, the input is formatted and postprocessed using plain
+The input is formatted and postprocessed using plain
 .I groff
 with
 .I devname
@@ -1271,14 +1176,14 @@ Originates from GNU
 .
 .Opt_def -- foreground color
 This is equivalent to
-.Opt_short fg .
+.Opt_long fg .
 .
 .
 .Opt_def -- fg color
 Set the foreground color of the viewer window.
 .
 This is an adaption of the X Toolkit option
-.Opt_short bg .
+.Opt_long bg .
 .
 The argument is an X color name, see
 .BR (1)
@@ -1287,7 +1192,7 @@ for details.
 .
 .Opt_def -- font font_name
 This is equivalent to
-.Opt_short ft .
+.Opt_long ft .
 .
 .
 .Opt_def -- ft font_name
@@ -1367,7 +1272,7 @@ The following mode values are recognized:
 .
 .
 .TP
-.B auto
+.Header_CB auto
 Display in the default manner; this actually means to try the modes
 .IR ps ,
 .IR x ,
@@ -1381,40 +1286,41 @@ with
 .
 .
 .TP
-.B dvi
+.Header_CB dvi
 Display formatted input in a dvi viewer program; equivalent to
 .Opt_long dvi .
 .
 .
 .TP
-.B pdf
+.Header_CB pdf
 Display formatted input in a PDF (Portable Document Format) viewer
 program; equivalent to
 .Opt_long pdf .
 .
 .
 .TP
-.B ps
+.Header_CB ps
 Display formatted input in a Postscript viewer program; equivalent to
 .Opt_long ps .
 .
 .
 .TP
-.B tty
+.Header_CB tty
 Display formatted input in a text terminal; equivalent to
 .Opt_long tty .
 .
 .
 .TP
-.B www
+.Header_CB www
 Display formatted input in a internet browser program; equivalent to
 .Opt_long www .
 .
 .
 .TP
-.B x
+.Header_CB x
 Display formatted input in a native roff viewer such as
-.BR gxditview (@MAN1EXT@); equivalent to
+.BR gxditview (@MAN1EXT@);
+equivalent to
 .Opt_long x .
 .
 .
@@ -1427,7 +1333,7 @@ They are only interesting for advanced applications.
 .
 .
 .TP
-.B groff
+.Header_CB groff
 Generate device output with plain
 .I groff
 without using the special viewing features of
@@ -1442,7 +1348,7 @@ is assumed.
 .
 .
 .TP
-.B source
+.Header_CB source
 Display source code; same as
 .Opt_short Q .
 .
@@ -1772,7 +1678,7 @@ This mode testing sequence for
 .B default
 mode can be changed by specifying a comma separated list of modes
 with the option
-.Opt_long default-modes.
+.Opt_long default\-modes.
 .
 .
 .P
@@ -1840,11 +1746,11 @@ PDF format, so it was not chosen as the major mode.
 You can change this by the options
 .Opt_long pdf
 and
-.Opt_long auto-modes .
+.Opt_long auto\-modes .
 .
 .
 .\" --------------------------------------------------------------------
-.SS "Displaying on a tty"
+.SS "Text mode"
 .\" --------------------------------------------------------------------
 .
 If the variable
@@ -1868,7 +1774,7 @@ This can be changed by specifying option
 .P
 The pager to be used can be specified by option
 .Opt_long pager
-by the environment variable
+or by the environment variable
 .Env_var $PAGER .
 If this is not set or empty the
 .BR less (1)
@@ -1924,22 +1830,14 @@ for customization), and
 .
 .
 .\" --------------------------------------------------------------------
-.SH "FILE PARAMETERS"
-.\" --------------------------------------------------------------------
-.
-The non-option command line parameters determine which files should be
-displayed.
-.
-.
-.\" --------------------------------------------------------------------
-.SS "Filespecs"
+.SH "MAN\~PAGE\~SEARCHING"
 .\" --------------------------------------------------------------------
 .
-The default behavior of groffer is to first test whether the file
-parameter is represents a local file; if not, it is assumed to
-represent a filespec for searching one or more man\~page.
+The default behavior of groffer is to first test whether a file
+parameter represents a local file; if it is not an existing file name,
+it is assumed to represent a name of a man\~page.
 .
-This behavior can be modified by options.
+This behavior can be modified by the following options.
 .
 .
 .TP
@@ -1948,111 +1846,51 @@ forces to interpret all file parameters as filespecs for searching
 man\~pages.
 .
 .TP
-.Opt_long no-man
+.Opt_long no\-man
 .TP+
-.Opt_long local-file
+.Opt_long local\-file
 disable the man searching; so only local files are displayed.
 .
 .
 .P
-The following parameter formats are recognized to represent a wanted
-man\~page.
-.
-.
-.TP
-.BI man: name ( section )
-the quasi-URL notation used in many Desktop systems to 
-represent the man\~page
-.I name
-in
-.IR section .
-.
-.
-.TP
-.BI man: name
-search the man\~page
-.I name
-in the lowest section.
-The corresponding command with the man program would be
-.Shell_cmd man\~ name
-.
-.
-.TP
-.IB name . section
-the man\~page
-.I name
-in
-.IR section .
-The corresponding command with the man program would be
-.Shell_cmd man\~ section\~name
-.
-.
-.TP
-.I name
-if
-.I name
-is not an existing file search for the man\~page
-.I name
-in the lowest section just like
-.Shell_cmd man\~ name
-.
-.
-.TP
-.I section name
-Even this curious construct known from the various
-.I man
-programs is handled.
-.
-For example,
-.Shell_cmd "groffer 7 groff"
-was modelled according to
-.Shell_cmd "man 7 groff"
-retrieves the man\~page named
-.I groff
-in section 7.
-.
-Only a few standard section names are accepted, being actually the
-number sections
-.I 1, 2, 3, 4, 5, 6, 7, 8,
-and
-.IR 9,
-and the lower case letters
-.I `o'
-and
-.IR `n' .
-.
-.
-.P
 If neither a local file nor a man\~page was retrieved for some file
 parameter a warning is issued on standard error, but processing is
 continued.
 .
 .
-.\" --------------------------------------------------------------------
-.SS "Man\~Page Searching"
-.\" --------------------------------------------------------------------
-.
-The groffer program provides a search facility for system manual pages
-(man\~pages).
+.P
+The groffer program provides a search facility for man\~pages.
 .
 All long options, all environment variables, and most of the
 functionality of the GNU
 .BR man (1)
 program were implemented.
 .
+This inludes the extended file names of man\~pages, for example,
+the man\~page of
+.I groff
+in man\~section 7 may be stored under
+.File_name /usr/share/man/man7/groff.7.gz ,
+where
+.File_name /usr/share/man/
+is part of the man\~path, the subdirectory
+.I man7
+and the file extension
+.I .7
+refer to the man\~section 7;
+.I .gz
+shows the compression of the file.
+.
 .
 .P
-Preformatted man\~pages (cat\~pages) are intentionally excluded from
-the search because groffer is a roff program that wants to format by
-its own, not spit out stuff that was digested previously by someone
-else.
+The
+.I cat\~pages
+(preformatted man\~pages) are intentionally excluded from the search
+because groffer is a roff program that wants to format by its own.
 .
 With the excellent performance of the actual computers, the
 preformatted man\~pages aren't necessary any longer.
 .
-Due to their inflexible nature, they tend to provoke some trouble with
-changing line lengths and different environments in networks.
-.
 .
 .P
 The algorithm for retrieving man\~pages uses five search methods.
@@ -2189,8 +2027,8 @@ language and system specific directories is used.
 The search can further be restricted by limiting it to certain
 sections.
 .
-A single section can be specified within a filespec, several sections
-as a colon-separated list in command line option
+A single section can be specified within each filespec argument,
+several sections as a colon-separated list in command line option
 .Opt_long sections
 or environment variable
 .Env_var $MANSECT .
@@ -2216,7 +2054,7 @@ For further details on man\~page searching, see
 .
 .
 .\" --------------------------------------------------------------------
-.SS Decompression
+.SH DECOMPRESSION
 .\" --------------------------------------------------------------------
 .
 The program has a decompression facility.
@@ -2372,7 +2210,7 @@ Usually, you do not want to set this environment variable.
 The groffer program internally calls groff, so all environment
 variables documented in
 .BR groff (@MAN1EXT@)
-are internally used within groffer as well; see there for details.
+are internally used within groffer as well.
 .
 The following variables have a direct meaning for the groffer program.
 .
@@ -2386,7 +2224,7 @@ groffer uses it for storing its temporary files, just as groff does.
 .SS "Man Variables"
 .\" --------------------------------------------------------------------
 .
-Parts of the functionality of the man program were implemented in
+Parts of the functionality of the man\~program were implemented in
 groffer; support for all environment variables documented in
 .BR man (1)
 was added to groffer, but the meaning was slightly modified due to the
@@ -2457,7 +2295,7 @@ determined automatically.
 .
 .
 .\" --------------------------------------------------------------------
-.SH "FILES"
+.SH "CONFIGURATION FILES"
 .\" --------------------------------------------------------------------
 .
 The groffer program can be preconfigured by two configuration files.
@@ -2470,12 +2308,12 @@ syntax.
 .
 .
 .TP
-.CB /etc/groff/groffer.conf
+.File_name /etc/groff/groffer.conf
 System-wide configuration file for groffer.
 .
 .
 .TP
-.CB $HOME/.groff/groffer.conf
+.File_name $HOME/.groff/groffer.conf
 User-specific configuration file for groffer, where
 .Env_var $HOME
 denotes the user's home directory.
@@ -2500,10 +2338,11 @@ prepending should be preferred to appending and setting in order not
 to delete the environment variable provided by the 
 .
 .Topic
-Write functions for calling viewer programs in a special way and feed
-them into the
-.Opt_long \f[I]*\f[]-viewer
-options.
+Write a function for calling a viewer program for a special
+.I mode
+and feed this name into its corresponding
+.Opt_long \f[I]mode\f[]\-viewer
+option.
 .
 Note that the name of such a function must coincide with some existing
 program in the system path
@@ -2528,6 +2367,7 @@ gxditview()
 {
   /usr/local/bin/gxditview --fg DarkBlue "$@";
 }
+GROFF_OPT="--x-viewer gxditview $GROFF_OPT";
 .fi
 .hy
 .ft
@@ -2536,17 +2376,29 @@ gxditview()
 .P
 This has the following effects:
 .Topic
-allows to start groffer in a graphical mode even from a text
-terminal;
+allows to start groffer in a graphical mode (here on first running X
+display by
+.IR localhost:0.0 )
+even from a text terminal (empty
+.Env_var $DISPLAY );
 .Topic
-all graphical modes use a resolution of 100 dpi where applicable;
+all graphical modes use a resolution of
+.I 100 dpi
+where applicable;
 .Topic
 the
 .BR gxditview (@MAN1EXT@)
 program is told to use
 .I DarkBlue
-as the text color.
+as the text color by defining a shell function with the program's name
+.Topic
+force
+.I gxditview
+to be used in X mode by option
+.Opt_long x\­viewer .
 .
+.
+.P
 These configurations can be overridden by command line options and by
 environment variable
 .Env_var $GROFFER_OPT .
@@ -2581,9 +2433,9 @@ pager program when not in X.
 The arguments that are not existing files are looked-up as the
 following man\~pages:
 .I groff
-(in section\~7),
+(in man\~section\~7),
 .I groff
-(automatic search, should be found in section\~1),
+(automatic search, should be found in man\~section\~1),
 .I troff
 (in section\~1),
 and
@@ -2605,11 +2457,13 @@ The formatted files are concatenated and displayed in one piece.
 .TP
 .Shell_cmd "LANG=de\~groffer\~--man\~--www\~--www-viever=netscape\~ls"
 .
-Retrieve the German man\~page for the
+Retrieve the German man\~page (language
+.IR de )
+for the
 .B ls
-program (or the English one if there is a German version), decompress
-it, format it into the html format and view the result in the default
-web browser
+program (the English version is used if there is no German version),
+decompress it, format it into the html format (www mode) and view the
+result in the default web browser
 .I netscape .
 The option
 .Opt_long man
@@ -2621,27 +2475,35 @@ exists in the actual directory.
 .TP
 .Shell_cmd "groffer\~-Q\~'man:roff(7)'"
 .
-Print the unformatted content of the man\~page called
+Get the man\~page called
 .I roff
-in section 7 on standard output.
+in man\~section 7 and print its unformatted content (source code
+because of option
+.Opt_short Q )
+on standard output.
 .
 .
 .TP
-.Shell_cmd "groffer\~-Z\~-mfoo"
+.Shell_cmd "cat\~file.gz\~|\~groffer\~-Z\~-mfoo"
 .
 Decompress the standard input, switch to
 .I groff
-mode, format the input with groff using the macro package foo, but do
-not postprocess the result, thus producing the intermediate output.
+using macro package
+.I foo
+(groff option
+.Opt_short m ) in non-postprocessing mode (groff option
+.Opt_short Z );
+this produces the groff intermediate output, see
+.BR groff_out (@MAN7EXT@).
 .
 .
 .TP
 .Shell_cmd "echo\~'\[rs]f[CB]WOW!'\~|"
 .TP+
-.Shell_cmd+ "groffer --x --bg red --fg yellow --geometry 200x100"
+.Shell_cmd+ "groffer --x --bg red --fg yellow --geometry 200x100 -"
 .
-Display \f[CB]WOW!\f[] in a small window in constant-width bold font,
-using color yellow on red background.
+Display the word \f[CB]WOW!\f[] in a small window in constant-width
+bold font, using color yellow on red background.
 .
 .
 .\" --------------------------------------------------------------------
@@ -2677,7 +2539,7 @@ implementations of the POSIX shell:
 .BR ash (1),
 .BR bash (1),
 .BR ksh (1),
-and POSIX
+POSIX
 .BR sh (1),
 and others.
 .
@@ -2693,30 +2555,71 @@ shell; so groffer tries to run under
 .I ash
 whenever possible.
 .
-The procedure to determine the shell to run groffer was programmed to
-be as follows:
+If not available the shell under which the script was started in the
+first place is used instead.
+.
+This can be modified by the option
+.Opt_long shell .
+.
+.
+.P
+The groffer program provides its own parser for command line arguments
+that is compatible to both POSIX
+.BR getopts (1)
+and GNU
+.BR getopt (1).
+.
+The following usual types of options are supported.
 .
 .
 .Topic
-the argument of the command line option
-.Opt_long shell ;
-if not set
+A single minus always refers to single character options, for example,
+.Opt_short Qmfoo
+is equivalent to
+.Opt_short Q\~\-m\~foo.
+.
 .
 .Topic
-the argument of the option
-.Opt_long shell
-in the environment variable
-.Env_var $GROFF_OPT ;
-if not set
+Long options that means option with names longer than one character
+are always prededed by a double minus; an option argument can either
+go to the next command line argument or be appended with an equal sign
+to the argument; for example,
+.Opt_alt -- long=arg
+is equivalent to
+.Opt_alt -- long\~arg .
+.
 .
 .Topic
-try
-.IR ash ;
-if not available
+An argument of
+.Opt_--
+ends option parsing; all further command line arguments are
+interpreted as filespec arguments.
+.
 .
 .Topic
-continue with the shell under which the script was started in the
-first place.
+By default, all command line arguments that are neither options nor
+option arguments are interpreted as filespec parameters and stored
+until option parsing has finished.
+.
+For example, the command line
+.Shell_cmd "groffer file1 -a -o arg file2"
+is, by default, equivalent to
+.Shell_cmd "groffer -a -o arg -- file1 file2"
+.
+.
+.P
+This behavior can be changed by setting the environment variable
+.Env_var $POSIXLY_CORRECT
+to a non-empty value; in this case, option processing is stopped as
+soon as the first non-option argument is found.
+.
+For example, in posixly correct mode, the command line
+.Shell_cmd "groffer file1 -a -o arg file 2"
+is equivalent to
+.Shell_cmd "groffer -- file1 -a -o arg file 2"
+As this leads to unwanted behavior in most cases, most people do not
+want to set
+.Env_var $POSIXLY_CORRECT .
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/contrib/groff/contrib/groffer/groffer.sh b/contrib/groff/contrib/groffer/groffer.sh
index 6cabefa..4e7332c 100644
--- a/contrib/groff/contrib/groffer/groffer.sh
+++ b/contrib/groff/contrib/groffer/groffer.sh
@@ -2,9 +2,9 @@
 
 # groffer - display groff files
 
-# File position: <groff-source>/contrib/groffer/groffer
+# Source file position: <groff-source>/contrib/groffer/groffer.sh
 
-# Copyright (C) 2001,2002 Free Software Foundation, Inc.
+# Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
 # Written by Bernd Warken <bwarken@mayn.de>
 
 # This file is part of groff.
@@ -29,8 +29,10 @@ export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
 _PROGRAM_NAME='groffer';
-_PROGRAM_VERSION='0.9.1';
-_LAST_UPDATE='30 Sep 2002';
+_PROGRAM_VERSION='0.9.4';
+_LAST_UPDATE='22 Jan 2003';
+
+# This program is installed with groff version @VERSION@.
 
 ########################################################################
 # Determine the shell under which to run this script;
@@ -44,9 +46,7 @@ if test "${_groffer_run}" != 'second'; then
   export _groffer_run;
   export _this;
 
-
-  #_this="@BINDIR@/${_PROGRAM_NAME}";
-  _this='groffer.sh';
+  _this="@BINDIR@/${_PROGRAM_NAME}";
 
   ###########################
   # _get_opt_shell ("$@")
@@ -217,7 +217,6 @@ _DEBUG_LM='no';			# disable landmark messages
 # base_name (path)
 # catz (<file>)
 # clean_up ()
-# clean_up_secondary ()
 # diag (text>*)
 # dirname_append (<path> [<dir...>])
 # dirname_chop (<path>)
@@ -271,6 +270,8 @@ _DEBUG_LM='no';			# disable landmark messages
 # tmp_cat ()
 # tmp_create (<suffix>?)
 # to_tmp (<filename>)
+# trap_clean ()
+# trap_set (<functionname>)
 # usage ()
 # version ()
 # warning (<string>)
@@ -366,9 +367,8 @@ _SQUOTE="'";
 _TAB='	';
 
 # function return values; `0' means ok; other values are error codes
+export _ALL_EXIT;
 export _BAD;
-export _BAD2;
-export _BAD3;
 export _ERROR;
 export _GOOD;
 export _NO;
@@ -377,9 +377,9 @@ export _YES;
 
 _GOOD='0';			# return ok
 _BAD='1';			# return negatively, error code `1'
-_BAD2='2';			# return negatively, error code `2'
-_BAD3='3';			# return negatively, error code `3'
-_ERROR='255';			# for syntax errors; no `-1' in `ash'
+_ERROR='7';			# for syntax errors; no `-1' in `ash'
+
+_ALL_EXIT="${_GOOD} ${_BAD} ${_ERROR}"; # all exit codes (for `trap_set')
 
 _NO="${_BAD}";
 _YES="${_GOOD}";
@@ -492,8 +492,8 @@ _OPTS_GROFFER_LONG_ARG="'background' 'bd' 'bg' 'bw' 'default-modes' \
 
 ##### options inhereted from groff
 
-_OPTS_GROFF_SHORT_NA="'a' 'b' 'c' 'e' 'g' 'i' 'l' 'p' 's' 't' 'z' \
-'C' 'E' 'G' 'N' 'R' 'S' 'U' 'V'";
+_OPTS_GROFF_SHORT_NA="'a' 'b' 'c' 'C' 'e' 'E' 'g' 'G' 'i' 'l' 'N' 'p' \
+'R' 's' 'S' 't' 'U' 'V' 'z'";
 _OPTS_GROFF_SHORT_ARG="'d' 'f' 'F' 'I' 'L' 'm' 'M' 'n' 'o' 'P' 'r' \
 'w' 'W'";
 _OPTS_GROFF_LONG_NA="";
@@ -614,9 +614,9 @@ export _OPT_X;			# groff option -X.
 export _OPT_XRM;		# specify X resource.
 export _OPT_Z;			# groff option -Z.
 # _TMP_* temporary files
-export _TMP_DIR;		# directory for temporary files
+export _TMP_DIR;		# groff directory for temporary files
+export _TMP_DIR_SUB;		# groffer directory for temporary files
 export _TMP_CAT;		# stores concatenation of everything
-export _TMP_PREFIX;		# dir and base name for temporary files
 export _TMP_STDIN;		# stores stdin, if any
 
 # these variables are preset in section `Preset' after the rudim. test
@@ -674,8 +674,8 @@ _HAS_OPTS_POSIX='';
 
 # _TMP_* temporary files
 _TMP_DIR='';
+_TMP_DIR_SUB='';
 _TMP_CAT='';
-_TMP_PREFIX='';
 _TMP_STDIN='';
 
 
@@ -790,19 +790,10 @@ landmark "1: debugging functions";
 #
 clean_up()
 {
-  clean_up_secondary;
-  rm -f "${_TMP_CAT}";
-}
-
-
-##############
-# clean_up_secondary ()
-#
-# Clean up temporary files without $_TMP_CAT.
-#
-clean_up_secondary()
-{
-  rm -f "${_TMP_STDIN}";
+  if test -d "${_TMP_DIR}"; then
+    rm -f "${_TMP_DIR}"/*;
+    rmdir "${_TMP_DIR}";
+  fi;
 }
 
 
@@ -1044,9 +1035,9 @@ func_stack_dump()
       _rest="${_FUNC_STACK}";
       while test "${_rest}" != ''; do
         # get part before the first bang `!'.
-        diag "$(echo -n "${_rest}" | sed -e 's/^\([^!]*\)!.*$/\1/')";
-        # delete part up to the first bang `!'.
-        _rest="$(echo -n "${_rest}" | sed -e 's/^!*[^!]*!*//')";
+        diag "$(echo -n "${_rest}" | sed -e 's/!.*$//')";
+        # delete part before and including the first bang `!'.
+        _rest="$(echo -n "${_rest}" | sed -e 's/^[^!]*!//')";
       done;
       ;;
     *)
@@ -1219,8 +1210,8 @@ base_name()
       do_nothing;
       ;;
     */*)
-      # delete everything up to last slash `/'.
-      echo -n "$1" | sed -e '\|^.*/*\([^/]*\)$|s||\1|';
+      # delete everything before and including the last slash `/'.
+      echo -n "$1" | sed -e '\|^.*//*\([^/]*\)$|s||\1|';
       ;;
     *)
       echo -n "$1";
@@ -1280,14 +1271,6 @@ fi;
 
 
 ########################################################################
-# clean_up_secondary ()
-#
-# Do the second but final cleaning up.
-#
-# defined above
-
-
-########################################################################
 # diag (<text>*)
 #
 # Print marked message to standard error; useful for debugging.
@@ -1926,7 +1909,7 @@ list_from_args()
 
 
 ########################################################################
-# list_from_cmdline (<s_n> <s_a> <l_n> <l_n> [<cmdline_arg>...])
+# list_from_cmdline (<s_n> <s_a> <l_n> <l_a> [<cmdline_arg>...])
 #
 # Transform command line arguments into a normalized form.
 #
@@ -2033,20 +2016,20 @@ list_from_cmdline()
           # get next short option from cluster (first char of $_rest)
           _optchar="$(echo -n "${_rest}" | sed -e 's/^\(.\).*$/\1/')";
           # remove first character from ${_rest};
-          _rest="$(echo -n "${_rest}" | 's/^.//')";
+          _rest="$(echo -n "${_rest}" | sed -e 's/^.//')";
           if list_has "${_short_n}" "${_optchar}"; then
             _result="$(list_append "${_result}" "-${_optchar}")";
             continue;
           elif list_has "${_short_a}" "${_optchar}"; then
             # remove leading character
             case "${_optchar}" in
-              /)		# cannot use normal `sed' separator
+              /)
                 _rest="$(echo -n "${_rest}" | sed -e '\|^.|s|||')";
                 ;;
               ?)
                 _rest="$(echo -n "${_rest}" | sed -e 's/^.//')";
                 ;;
-              *)
+              ??*)
                 error "${_fn} several chars parsed for short option."
                 ;;
             esac;
@@ -2283,7 +2266,7 @@ man_do_filespec()
   local _spec;
   local _string;
   local s;
-  if is_empty "${MANPATH}"; then
+  if is_empty "${_MAN_PATH}"; then
     eval "${return_bad}";
   fi;
   if is_empty "$1"; then
@@ -2915,7 +2898,7 @@ if test "${_HAS_COMPRESSION}" = 'yes'; then
   {
     local _f;
     func_check save_stdin = 0 "$@";
-    _f="$(tmp_create)";
+     _f="${_TMP_DIR}"/INPUT;
     cat >"${_f}";
     catz "${_f}" >"${_TMP_STDIN}";
     rm -f "${_f}";
@@ -3007,9 +2990,9 @@ tmp_create()
 {
   func_check tmp_create '<=' 1 "$@";
   local _tmp;
-  _tmp="${_TMP_PREFIX}${_PROCESS_ID}$1";
+  _tmp="${_TMP_DIR}/$1";
   echo -n >"${_tmp}";
-  echo -n "${_tmp}";
+  echo -n "${_tmp}";		# output file name
   eval "${return_ok}";
 }
 
@@ -3039,6 +3022,44 @@ to_tmp()
 
 
 ########################################################################
+# trap_clean ()
+#
+# disable trap on all exit codes ($_ALL_EXIT)
+#
+# Arguments: 0
+# Globals:   $_ALL_EXIT
+#
+trap_clean()
+{
+  func_check trap_clean = 0 "$@";
+  local i;
+  for i in ${_ALL_EXIT}; do
+    trap "" "$i" 2>/dev/null || true;
+  done;
+  eval "${return_ok}";
+}
+
+
+########################################################################
+# trap_set (<functionname>)
+#
+# call function on all exit codes ($_ALL_EXIT)
+#
+# Arguments: 1 (name of a shell function)
+# Globals:   $_ALL_EXIT
+#
+trap_set()
+{
+  func_check trap_set = 1 "$@";
+  local i;
+  for i in ${_ALL_EXIT}; do
+    trap "$1" "$i" 2>/dev/null || true;
+  done;
+  eval "${return_ok}";
+}
+
+
+########################################################################
 # usage ()
 #
 # print usage information to stderr
@@ -3054,18 +3075,18 @@ This is free software licensed under the GNU General Public License.
 
 EOF
 
-  echo2 "Usage: ${_PROGRAM_NAME} ${_header} [option]... [filespec]...";
+  echo2 "Usage: ${_PROGRAM_NAME} [option]... [filespec]...";
 
   cat >&2 <<EOF
 
 where "filespec" is one of
-  "filename"       name of a readablefile
+  "filename"       name of a readable file
   "-"              for standard input
   "man:name.n"     man page "name" in section "n"
   "man:name"       man page "name" in first section found
   "name.n"         man page "name" in section "n"
   "name"           man page "name" in first section found
-and some more (see groff(1) for details).
+and some more (see groffer(1) for details).
 
 Display roff files, standard input, and/or Unix manual pages with
 in a X window viewer or in a text pager.
@@ -3279,7 +3300,7 @@ main_init()
 {
   func_check main_init = 0 "$@";
   # call clean_up() on any signal
-  trap clean_up  2>/dev/null || true;
+  trap_set clean_up;
 
   for f in ${_CONFFILES}; do
     if is_file "$f"; then
@@ -3288,24 +3309,39 @@ main_init()
   done;
 
   # determine temporary directory
+  umask 000;
+  _TMP_DIR='';
   for d in "${GROFF_TMPDIR}" "${TMPDIR}" "${TMP}" "${TEMP}" \
            "${TEMPDIR}" "${HOME}"'/tmp' '/tmp' "${HOME}" '.';
   do
     if test "$d" != ""; then
       if test -d "$d" && test -r "$d" && test -w "$d"; then
-        _TMP_DIR="$d";
-        break;
+        _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}";
+        if test -d "${_TMP_DIR}"; then
+	  rm -f "${_TMP_DIR}"/*;
+          break;
+        else
+          mkdir "${_TMP_DIR}";
+          if test ! -d "${_TMP_DIR}"; then
+	    _TMP_DIR='';
+	    continue;
+  	  fi;
+          break;
+	fi;
+      fi;
+      if test ! -w "${_TMP_DIR}"; then
+	_TMP_DIR='';
+	continue;
       fi;
     fi;
   done;
   unset d;
-  if test "${_TMP_DIR}" = ""; then
-    error "Couldn't find a directory for storing temorary files.";
+  if test "${_TMP_DIR}" = ''; then
+    error "Couldn't create a directory for storing temporary files.";
   fi;
-  _TMP_PREFIX="${_TMP_DIR}/${_PROGRAM_NAME}";
 
-  _TMP_CAT="$(tmp_create)";
-  _TMP_STDIN="$(tmp_create i)";
+  _TMP_CAT="$(tmp_create groffer_cat)";
+  _TMP_STDIN="$(tmp_create groffer_input)";
   eval "${return_ok}";
 } # main_init()
 
@@ -3313,7 +3349,8 @@ main_init()
 ########################################################################
 # main_parse_MANOPT ()
 #
-# Parse $MANOPT; this clobbered by the command line.
+# Parse $MANOPT to retrieve man options, but only if it is a non-empty
+# string; found man arguments can be overwritten by the command line.
 #
 # Globals:
 #   in: $MANOPT, $_OPTS_MAN_*
@@ -3327,7 +3364,14 @@ main_parse_MANOPT()
   local _opt;
   local _list;
   _list='';
-  # feed in $MANOPT
+  if test "${MANOPT}" != ''; then
+    MANOPT="$(echo -n "${MANOPT}" | \
+      sed -e 's/^'"${_SPACE}${_SPACE}"'*//')";
+  fi;
+  if test "${MANOPT}" = ''; then
+    eval "${return_ok}";
+  fi;
+  # add arguments in $MANOPT by mapping them to groffer options
   eval set -- "$(list_from_cmdline \
     "${_OPTS_MAN_SHORT_NA}" "${_OPTS_MAN_SHORT_ARG}" \
     "${_OPTS_MAN_LONG_NA}" "${_OPTS_MAN_LONG_ARG}" \
@@ -4042,7 +4086,7 @@ main_do_fileargs()
       _exitcode="${_GOOD}";
     fi;
   done;
-  clean_up_secondary;
+  rm -f "${_TMP_STDIN}";
   if is_equal "${_exitcode}" "${_BAD}"; then
     eval "${return_bad}";
   fi;
@@ -4185,7 +4229,7 @@ main_set_resources()
 # Globals:
 #   in: $_DISPLAY_MODE, $_OPT_DEVICE,
 #       $_ADDOPTS_GROFF, $_ADDOPTS_POST, $_ADDOPTS_X,
-#       $_REGISTERED_TITLE, $_TMP_PREFIX, $_TMP_CAT,
+#       $_REGISTERED_TITLE, $_TMP_CAT,
 #       $_OPT_PAGER $PAGER $_MANOPT_PAGER
 #
 landmark '19: main_display()';
@@ -4218,7 +4262,7 @@ main_display()
         _ADDOPTS_GROFF="${_ADDOPTS_GROFF} -T${_OPT_DEVICE}";
       fi;
       _groggy="$(tmp_cat | eval grog "${_options}")";
-      trap "" EXIT 2>/dev/null || true;
+      trap_clean;
       # start a new shell program to get another process ID.
       sh -c '
         set -e;
@@ -4233,7 +4277,7 @@ main_display()
           {
             rm -f "${_modefile}";
           }
-          trap clean_up EXIT 2>/dev/null || true;
+          trap clean_up 0 2>/dev/null || true;
           eval "${_groggy}" "${_ADDOPTS_GROFF}";
         ) &'
       ;;
@@ -4293,7 +4337,7 @@ main_display()
           ;;
       esac;
       _groggy="$(tmp_cat | grog -Tps)";
-      trap "" EXIT 2>/dev/null || true;
+      trap_clean;
       # start a new shell program to get another process ID.
       sh -c '
         set -e;
@@ -4313,7 +4357,7 @@ main_display()
           {
             rm -f "${_modefile}";
           }
-          trap clean_up EXIT 2>/dev/null || true;
+          trap clean_up 0 2>/dev/null || true;
           eval "${_DISPLAY_PROG}" ${_DISPLAY_ARGS} "${_modefile}";
         ) &'
       ;;
@@ -4370,8 +4414,9 @@ main_display()
 
 _do_display()
 {
-  trap "" EXIT 2>/dev/null || true;
-  # start a new shell program to get another process ID.
+  trap_clean;
+  # start a new shell program for another process ID and better
+  # cleaning-up of the temporary files.
   sh -c '
     set -e;
     _PROCESS_ID="$$";
@@ -4383,9 +4428,12 @@ _do_display()
     (
       clean_up()
       {
-        rm -f "${_modefile}";
+        if test -d "${_TMP_DIR}"; then
+          rm -f "${_TMP_DIR}"/*;
+          rmdir "${_TMP_DIR}";
+        fi;
       }
-      trap clean_up EXIT 2>/dev/null || true;
+      trap clean_up 0 2>/dev/null || true;
       eval "${_DISPLAY_PROG}" ${_DISPLAY_ARGS} "${_modefile}";
     ) &'
 }
diff --git a/contrib/groff/contrib/mm/ChangeLog b/contrib/groff/contrib/mm/ChangeLog
index 3033a1f..d678fe8 100644
--- a/contrib/groff/contrib/mm/ChangeLog
+++ b/contrib/groff/contrib/mm/ChangeLog
@@ -1,3 +1,33 @@
+Wed Apr 06:42:35 2003  Joergen Haegg <jh@axis.com>
+
+	* the footer was not adjusted by VM due to a missing
+	  pg*extra-footer-size in the calculation of pg*last-pos
+
+Wed Apr 06:04:58 2003  Joergen Haegg <jh@axis.com>
+
+	* space adjustments in 4.MT to make it more like
+	  the original
+
+Sun Mar 21:45:10 2003  Joergen Haegg <jh@axis.com>
+
+	* removed error check i 4.MT, .AF is not mandatory anymore
+
+Sat Mar 21:56:57 2003  Joergen Haegg <jh@axis.com>
+
+	* cov*firm now defined only if arg to AF is non-empty
+	  That will also enable cov*default-firm from the mm locale-file
+	  to work.
+
+Sat Mar 21:05:29 2003  Joergen Haegg <jh@axis.com>
+
+	* added .ll in pg@set-env to initialize the
+	  header environment properly
+
+Wed Mar 19 23:02:16 2003  Werner LEMBERG  <wl@gnu.org>
+
+	* groff_mm.man: Some fixes from Robert D. Goulding
+	<goulding@Princeton.EDU>.
+
 Wed Sep 09:53:06 2002  Joergen Haegg <jh@axis.com>
 
 	* added implicit -mm to mmroff, it's now possible
diff --git a/contrib/groff/contrib/mm/groff_mm.man b/contrib/groff/contrib/mm/groff_mm.man
index 2bb9e10..8229f23 100644
--- a/contrib/groff/contrib/mm/groff_mm.man
+++ b/contrib/groff/contrib/mm/groff_mm.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 2.8 2002/05/30 05:39:54 jhaegg Exp $
+.\" $Id: groff_mm.man,v 2.9 2003/03/19 22:05:11 wlemb Exp $
 .\"
 .de T2
 .if t .ne 2v
@@ -1654,8 +1654,8 @@ Floating displays does not generate line break.
 A string containing the word "APPENDIX".
 .TP
 .B Apptxt
-.TP
 The current appendix text.
+.TP
 .B "EM"
 Em dash string
 .TP
@@ -1673,11 +1673,11 @@ Normally "0 0 0 0 0 0 0" which is the same as
 "10 10 10 10 10 10 10".
 .TP
 .B Index
-.TP
 Contains \fIINDEX\fP.
-.B Indcmd
 .TP
+.B Indcmd
 Contains the index command, \fIsort\ -t\et\fP.
+.TP
 .B Lifg
 String containing \fIFigure\fP.
 .TP
@@ -1845,10 +1845,10 @@ Append a dot after the level one heading number if >\ 0.
 Default is\ 1.
 .TP
 .B H1h
-.TP
 Copy of number register \fBH1\fP, but it is incremented
 just before the page break.
 Useful in user defined header macros.
+.TP
 .B Hb
 Heading break level [0:7], default\ 2.
 .TP
@@ -1866,7 +1866,7 @@ Heading temporary indent [0:2], default\ 1.
 2\ ->\ indent to line up with text part of preceding heading
 .TP
 .B Hps
-Numbervariable with the heading pre-space level.
+Number variable with the heading pre-space level.
 If the heading-level
 is less than or equal to \fBHps\fP, then two lines will precede the
 section heading instead of one.
diff --git a/contrib/groff/contrib/mm/m.tmac b/contrib/groff/contrib/mm/m.tmac
index 143867d..f785191 100644
--- a/contrib/groff/contrib/mm/m.tmac
+++ b/contrib/groff/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.15 2002/08/07 23:23:34 wlemb Exp $
-.@revision $Revision: 2.15 $
+.\" $Id: m.tmac,v 2.18 2003/04/02 04:44:59 jhaegg Exp $
+.@revision $Revision: 2.18 $
 .ig
 
 Copyright (C) 1991-2000 Free Software Foundation, Inc.
@@ -1130,8 +1130,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\"
 .\" last-pos points to the position of the footer and bottom 
 .\" block below foot-notes.
-.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u)
-.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u) = \\n[pg*last-pos]
+.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-size]u)
+.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-size]u) = \\n[pg*last-pos]
 ..
 .de pg@enable-trap
 .wh \\n[pg*foot-trap]u pg@footer
@@ -1246,7 +1246,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\" FOOTER
 .de pg@footer
 .ec
-.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.])
+.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.]) nl=\\n[nl]
 .pg@disable-trap
 .\".debug footer
 .tbl@bottom-hook
@@ -1254,7 +1254,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\" move to the exact start of footer.
 'sp |\\n[pg*foot-trap]u+1v
 .\"
-.if \\n[D]>3 .tm FOOTER after .sp
+.if \\n[D]>3 .tm FOOTER after .sp, nl=\\n[nl]
 .\" print footnotes
 .if d ft*div .ft@print
 .\"
@@ -1269,6 +1269,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .de pg@print-footer
 .\" jump to the position just below the foot-notes.
 'sp |\\n[pg*last-pos]u+1v
+.if \\n[D]>3 .tm print-footer nl=\\n[nl]
 .\" check if there are any bottom block
 .if d pg*block-div .pg@block
 .\"
@@ -1311,6 +1312,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .	vs \\n[pg*vs]u
 .\}
 .lt \\n[@ll]u
+.ll \\n[@ll]u
 ..
 .\"-------------------------
 .de PH
@@ -2959,7 +2961,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\"-------------------
 .de AF
 .cov@title-end
-.ds cov*firm \\$1
+.if !''\\$1' .ds cov*firm \\$1
 ..
 .de AST
 .ds cov*abs-name \\$1
diff --git a/contrib/groff/contrib/mm/mm/4.MT b/contrib/groff/contrib/mm/mm/4.MT
index c8b6f37..78c7766 100644
--- a/contrib/groff/contrib/mm/mm/4.MT
+++ b/contrib/groff/contrib/mm/mm/4.MT
@@ -1,11 +1,11 @@
 .\"------------
-.\" $Id: 4.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
+.\" $Id: 4.MT,v 2.2 2003/04/02 04:06:40 jhaegg Exp $
 .\" Cover sheet. Memorandum type 4
 .\"------------
 .de cov@print-title
 .if !d cov*title .@error title (.TL) not defined!
-.MOVE 2.4c
-.S +4
+.MOVE 2.8c
+.S +2
 .ad c
 .fi
 .B
@@ -14,27 +14,28 @@
 .S
 .R
 .ad b
-.PGFORM
 ..
 .\"------------
 .de cov@print-authors
 .SP 0.5
 .I
+.S +1
 .nr cov*i 0 1
 .while \\n+[cov*i]<=\\n[cov*au] \{\
 .ce
 \\*[cov*au!\\n[cov*i]!1]
 .br
 .\}
+.S
 .R
-.PGFORM
 ..
 .\"------------
 .de cov@print-firm
-.if !d cov*firm .@error firm (.AF) not defined!
-.SP 0.5
-.ce
+.if d cov*firm \{\
+.	SP 0.5
+.	ce
 \\*[cov*firm]
+.\}
 ..
 .\"------------
 .de cov@print-abstract
@@ -64,7 +65,7 @@
 .	if d cov*abstract \{\
 .		if !\n[cov*abs-arg] .cov@print-abstract
 .	\}
-.	SP 3
+.	SP 2
 .	nr hd*cur-bline \n[nl]
 .	ds cov*mt-printed
 .	pg@enable-top-trap
diff --git a/contrib/groff/contrib/mom/BUGS b/contrib/groff/contrib/mom/BUGS
index 92d4b47..a96c061 100644
--- a/contrib/groff/contrib/mom/BUGS
+++ b/contrib/groff/contrib/mom/BUGS
@@ -11,9 +11,27 @@ questions and suggestions, or contact me directly at:
 
 ========================================================================
 
-Version 1.1.3c
-==============
+Version 1.1.5
+=============
+
+Draft and revision not appearing in page headers.
+---Fixed---
+
+\*[RULE] not working properly with indents and justified copy.
+---Fixed---
+
+Post-epigraph spacing in TYPEWRITE causing some first pages to run too
+deep.
+---Fixed---
+
+Spacing of docheaders in TYPEWRITE not always consistent.
+---Fixed---
 
+Version 1.1.4
+=============
+
+Blockquotes that span pages running too deep.
+---Fixed---
 
 Version 1.1.3
 =============
diff --git a/contrib/groff/contrib/mom/ChangeLog b/contrib/groff/contrib/mom/ChangeLog
index d1e0fd1..ce93092 100644
--- a/contrib/groff/contrib/mom/ChangeLog
+++ b/contrib/groff/contrib/mom/ChangeLog
@@ -1,3 +1,43 @@
+*Sun Feb 16 2003
+
+o Added James Ramsey's proposed CHAPTER_TITLE macro, along with his
+  rewritten START macro and his utility macros to make START easier
+  to read.
+
+o Expanded handling of CHAPTER_TITLE to encompass TYPEWRITE, as well as
+  plugging it into the docheaders.  Made CHAPTER_TITLE backwardly
+  compatible so that pre-1.1.5 docs using CHAPTER_STRING to create a
+  chapter title remain unaffected when groffed with 1.1.5.
+
+o Created control macros for CHAPTER_TITLE FAMILY, FONT and SIZE.
+  Added defaults for handling of CHAPTER title to DEFAULTS.  Documented
+  CHAPTER_TITLE and everything that goes along with it.
+
+o Fixed broken draft and revision in headers/footers.
+
+o Fixed \*[RULE] so that it behaves properly with indents and justified
+  copy.
+
+o Fixed/tweaked handling of epigraph spacing in TYPEWRITE.
+
+o Fixed broken spacing of docheaders in TYPEWRITE.
+
+*Mon Feb 3 2003
+
+o Fixed an oversight in CLOSING for DOCTYPE LETTER (closing wasn't
+  being set flush left)
+
+*Sun Sep 29 2002
+
+o Changed .ne in .HEAD when PRINTSTYLE TYPESET from 5 to 4.  With 5,
+  heads required at least 2 lines of text underneath or they'd be
+  defered to the next page, which created too much whitespace at the
+  end of the page.  Heads will now be processed on the same page if the
+  head plus at least one line of text underneath fits.  I figure it's
+  easier for the user to break to a new page manually if this behaviour
+  is unsatisfactory than to massage the page to fix the excess
+  whitespace.
+
 *Sun Aug 25 2002
 
 o Changed .IX to .IQ.  The older form still works, but emits a message
diff --git a/contrib/groff/contrib/mom/Makefile.sub b/contrib/groff/contrib/mom/Makefile.sub
index 881c052..f066153 100644
--- a/contrib/groff/contrib/mom/Makefile.sub
+++ b/contrib/groff/contrib/mom/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
 # 
 # This file is part of groff.
@@ -17,20 +17,23 @@
 # with groff; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# These may be overridden if cross-compiling.
+GROFFBIN=$(top_builddir)/src/roff/groff/groff
+GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
+
 groff_bin_dirs=\
   $(top_builddir)/src/roff/groff \
   $(top_builddir)/src/roff/troff \
   $(top_builddir)/src/devices/grops
-groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
 
 FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
 TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir)
 
 GROFF=GROFF_COMMAND_PREFIX=''; \
       export GROFF_COMMAND_PREFIX; \
-      GROFF_BIN_PATH=$(groff_bin_path); \
+      GROFF_BIN_PATH=$(GROFF_BIN_PATH); \
       export GROFF_BIN_PATH; \
-      $(top_builddir)/src/roff/groff/groff $(FFLAG) $(TFLAG)
+      $(GROFFBIN) $(FFLAG) $(TFLAG)
 
 MAN7=\
   groff_mom.n
diff --git a/contrib/groff/contrib/mom/NEWS b/contrib/groff/contrib/mom/NEWS
index 0572603..d4ca87f 100644
--- a/contrib/groff/contrib/mom/NEWS
+++ b/contrib/groff/contrib/mom/NEWS
@@ -1,3 +1,29 @@
+Release 1.1.5
+-------------
+
+***NEW***
+
+Added James Ramsey's CHAPTER_TITLE macro as well as control macros to
+go with it.  Thanks James.  Also from James came a patch to handle
+START differenty which has been incorporated into om.tmac.  Thanks
+again, James.
+
+Some bits and pieces of the docs have been tweaked, but nothing
+changed.  Hopefully, the changes will make parts of the docs easier to
+read and navigate.
+
+***FIXES***
+
+o \*[RULE]
+
+o broken draft and revision in docheaders
+
+o post-epigraph spacing in TYPEWRITE
+
+o header spacing in TYPEWRITE
+
+------------------------------------------------------------------------
+
 Release 1.1.4
 -------------
 
diff --git a/contrib/groff/contrib/mom/examples/elvis_syntax b/contrib/groff/contrib/mom/examples/elvis_syntax
index 14f7049..02b91a4 100644
--- a/contrib/groff/contrib/mom/examples/elvis_syntax
+++ b/contrib/groff/contrib/mom/examples/elvis_syntax
@@ -7,8 +7,8 @@ keyword .ALD .ALIAS .ALWAYS_FULLSPACE_QUOTES .ATTRIBUTE_STRING
 keyword .AUTHOR .AUTHOR_FAMILY .AUTHOR_FONT .AUTHOR_SIZE .AUTOLEAD
 keyword .BLOCKQUOTE .BLOCKQUOTE_FAMILY .BLOCKQUOTE_FONT .BLOCKQUOTE_QUAD .BLOCKQUOTE_SIZE
 keyword .B_MARGIN .BR .BR_AT_LINE_KERN .BREAK_QUOTE
-keyword .CAPS .CENTER .CENTRE .CHAPTER
-keyword .CHAPTER_STRING .CITATION .CITE .CLOSING
+keyword .CAPS .CENTER .CENTRE
+keyword .CHAPTER .CHAPTER_TITLE CHAPTER_STRING .CITATION .CITE .CLOSING
 keyword .COLLATE .COL_BREAK .COL_BREAK .COL_NEXT .COLUMNS
 keyword .COMMENT .CONDENSE .COPYSTYLE
 keyword .DATE .DEFAULTS
diff --git a/contrib/groff/contrib/mom/examples/typeset.mom b/contrib/groff/contrib/mom/examples/typeset.mom
index 972acc5..98dd918 100644
--- a/contrib/groff/contrib/mom/examples/typeset.mom
+++ b/contrib/groff/contrib/mom/examples/typeset.mom
@@ -137,9 +137,10 @@ sit amet.  Accusam et justo duo do\%lo\%res et ea rebum
 \# a collated document, but if the page trap has already deposited one
 \# there, COLLATE can't undo it.  Hence, we turn the trap off
 \# (TRAP OFF), set the line, and put in an EL afterwards.
+\#
 \# Normally, all this isn't necessary when collating documents,
 \# but if you ever have the problem of a page header printing at the
-\# top of a collated document, this is how you get around it.
+\# top of a collated document, now you know how to get around it.
 \#
 .TRAP OFF
 .RIGHT
@@ -405,11 +406,11 @@ justo duo do\%lo\%res et ea rebum.
 Sanctus est lorem ipsum dolor sit amet, consetetur sadipscing.  Elitr,
 sed diam nonumy eirmod tempor, invidunt ut labore et do\%lo\%re magna
 ali\%quyam.  Erat sed diam voluptua, at vero eos et accusam et justo
-duo do\%lo\%res et ea rebum amet.  Consetetur sadipsc-
+duo do\%lo\%res et ea rebum amet.  Consetetur sadipsc\%
+ing elitr sed diam nonumy eirmod tempor invidunt ut
 .BREAK_QUOTE  \" Needed because blockquote crosses page AND contain footnotes
-ing elitr sed diam nonumy eirmod tempor invidunt ut labore.
-Et do\%lo\%re magna ali\%quyam erat, sed diam voluptua, at vero.
-Eos et accusam et justo duo.\c
+labore.  Et do\%lo\%re magna ali\%quyam erat, sed diam voluptua, at
+vero.  Eos et accusam et justo duo.\c
 .FOOTNOTE
 Labore et do\%lo\%re magna ali\%quyam erat sed diam voluptua.
 .FOOTNOTE OFF
diff --git a/contrib/groff/contrib/mom/momdoc/docelement.html b/contrib/groff/contrib/mom/momdoc/docelement.html
index 2b9a535..e1db2ab 100644
--- a/contrib/groff/contrib/mom/momdoc/docelement.html
+++ b/contrib/groff/contrib/mom/momdoc/docelement.html
@@ -763,7 +763,9 @@ in the string(s) you pass to <strong>HEAD</strong>
 For example,
 <p>
 <pre>
-	.HEAD "\[ALD3]Text of head
+	.HEAD "\[ALD3]Text of head"
+        or
+    .HEAD "\[DOWN 3p]Text of head"
 </pre>
 
 will lower the baseline of the head by three points.  Note that
@@ -774,6 +776,8 @@ the escape in the string for each line, like this:
 <p>
 <pre>
 	.HEAD "\[ALD3]First line" "\[ALD3]Next line" 
+        or
+    .HEAD "\[DOWN 3p]First line" "\[DOWN 3p]Next line" 
 </pre>
 
 
@@ -880,7 +884,7 @@ the next in ascending order (i.e. the last subhead number + 1), invoke
 Your next subhead will be numbered &quot;4&quot; and subsequent
 subheads will be numbered in ascending order from &quot;4&quot;.
 
-<a name="#SUBHEAD_INLINES"><h3><u>Vertical inline escapes inside subheads</u></h3></a>
+<a name="SUBHEAD_INLINES"><h3><u>Vertical inline escapes inside subheads</u></h3></a>
 See
 <a href="#HEAD_INLINES">Vertical inline escapes inside heads</a>.
 The information there applies equally to subheads.
diff --git a/contrib/groff/contrib/mom/momdoc/docprocessing.html b/contrib/groff/contrib/mom/momdoc/docprocessing.html
index 4c8b1f0..0447537 100644
--- a/contrib/groff/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/groff/contrib/mom/momdoc/docprocessing.html
@@ -675,7 +675,8 @@ She also puts the same thing in the middle of
 <p>
 If you're not using <strong>DOCTYPE CHAPTER</strong>, the macro serves
 no purpose and <strong>mom</strong> ignores it.
-<a name="CHAPTER_STRING"></a>
+<p>
+<a name="CHAPTER_STRING"><strong>CHAPTER_STRING<strong></a>
 <p>
 If you're not writing in English, you can ask <strong>mom</strong>
 to use the word for chapter in your own language by telling
@@ -688,8 +689,42 @@ like this:
 
 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.  (See also the
-<a href="#CHAPTER_NOTE">Special Note on CHAPTER</a>.)
+page-headers.
+<br>
+
+<!---CHAPTER_TITLE--->
+
+<hr width="66%" align="left">
+<p>
+<a name="CHAPTER_TITLE"></a>
+Macro: <strong>CHAPTER_TITLE</strong> <var>&quot;&lt;chapter title&gt;&quot;</var>
+
+<p>
+If, either in addition to or instead of &quot;Chapter #&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:
+<p>
+<pre>
+	.CHAPTER_TITLE "The DMCA Nazis"
+</pre>
+
+If you've used
+<a href="#CHAPTER">CHAPTER</a> to give the chapter a number,
+&quot;Chapter #&quot; and the title will appear at the top of the
+chapter, like this:
+<p>
+<pre>
+                       Chapter 1
+                    The DMCA Nazis
+</pre>
+
+In such a case, by default, only the chapter's title will appear in the
+page headers, not &quot;Chapter #&quot;.
+<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.
 <br>
 
 <!---DRAFT--->
@@ -710,13 +745,16 @@ default), <strong>mom</strong> ignores <strong>DRAFT</strong>.
 <strong>Mom</strong> prints the draft number beside the word
 &quot;Draft&quot; in the middle part of
 <a href="definitions.html#TERMS_HEADER">page headers</a>.
+<p>
+<a name="DRAFT_STRING"><strong>DRAFT STRING<strong></a>
+<p>
 If you're not writing in English, you can ask <strong>mom</strong>
 to use the word for draft in your own language by telling
 her what it is with the <strong>DRAFT_STRING</strong> macro,
 like this:
 <p>
 <pre>
-	.DRAFT_STRING "Ébauche"
+	.DRAFT_STRING "Jet"
 </pre>
 
 <!---REVISION--->
@@ -738,6 +776,9 @@ accepts a
 <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>.
+<p>
+<a name="REVISION_STRING"><strong>REVISION STRING</strong></a>
+<p>
 If you're not writing in English, you can ask <strong>mom</strong>
 to use the word for revision, or a shortform therof in your own language
 by telling her what it is with the <strong>REVISION_STRING</strong>
@@ -807,24 +848,30 @@ for how <strong>mom</strong>'s outputs each part of the page header.)
 <p>
 <strong>CHAPTER</strong> prints &quot;Chapter #&quot; in place of a
 <a href="definitions.html#TERMS_DOCHEADER">docheader</a>
-(# is what you gave to
-<a href="#CHAPTER">CHAPTER</a>),
-or, if you omit the <strong>CHAPTER</strong> macro and give the chapter
-a title with
-<a href="#CHAPTER_STRING">CHAPTER_STRING</a>,
-<strong>mom</strong> prints the chapter title.  Page headers contain the
-author, the title of the book (which you gave with
+(# is what you gave to the
+<a href="#REFERENCE_MACROS">reference macro</a>
+<a href="#CHAPTER">CHAPTER</a>).
+If you give the chapter a title with
+<a href="#CHAPTER_TITLE">CHAPTER TITLE</a>,
+<strong>mom</strong> prints &quot;Chapter #&quot; and the title
+underneath.  If you omit the <strong>CHAPTER</strong> reference
+macro but supply a
+<a href="#CHAPTER_TITLE">CHAPTER_TITLE</a>,
+<strong>mom</strong> prints only the chapter title. <em>(*For
+backward compatability with pre-1.1.5 versions of</em>
+<strong>mom</strong><em>, you can also supply a chapter title by
+ommitting the</em> <strong>CHAPTER</strong> <em>reference macro and
+supplying a chapter title with
+<a href="#CHAPTER_STRING">CHAPTER_STRING</a>.
+<p>
+The page headers in <strong>DOCTYPE CHAPTER</a> contain the author,
+the title of the book (which you gave with
 <a href="#TITLE">TITLE</a>),
 and &quot;Chapter #&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
 the page header.
 <p>
-<em>*See the
-<a href="#CHAPTER_NOTE">Special Note on CHAPTER</a>
-below for how you can make DOCTYPE CHAPTER print something
-other than &quot;Chapter #&quot; as its docheader.</em>
-<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.
@@ -841,35 +888,6 @@ for how <strong>mom</strong>'s outputs each part of the page header.)
 the section
 <a href="letters.html#INTRO">Writing Letters</a>
 for instructions on using <strong>mom</strong> to format letters.
-
-<a name="CHAPTER_NOTE"><h3><u>Special Note on CHAPTER</u></h3></a>
-In novels, new chapters are generally (but not always)
-introduced by &quot;Chapter #&quot;.  Other types of documents
-(reports and so on) often require specific titles for chapters.
-If your document is of this latter type, use <strong>DOCTYPE
-CHAPTER</strong> in the following way:
-<br>
-<ol>
-	<li>Omit the
-		<a href="#REFERENCE_MACROS">reference macro</a>
-		<a href="#CHAPTER">CHAPTER</a>
-	<li>Invoke
-		<a href="#CHAPTER_STRING">.CHAPTER_STRING</a>
-		with the title you'd like the chapter to have (enclosed
-		in double-quotes, of course).
-</ol>
-<p>
-Here's a recipe for setting up a chapter entitled &quot;The DMCA
-Nazis&quot;.
-<pre>
-	.AUTHOR &quot;Outraged Hacker&quot;
-	.TITLE  &quot;Limiting Copyright&quot;
-	\#
-	.DOCTYPE    CHAPTER
-	.PRINTSTYLE TYPESET
-	\#
-	.CHAPTER_STRING &quot;The DMCA Nazis&quot;
-</pre>
 <br>
 
 <!---PRINTSTYLE--->
@@ -1123,7 +1141,7 @@ adjusted to fill pages fully to the bottom margin.
 </ul>
 
 <hr width="66%" align="left">
-<a name="TYPE_BEFORE_START"><h2><u>Using typesetting macros prior to START</u></h2></a>
+<a name="TYPE_BEFORE_START"><h2><u>Using the typesetting macros prior to START</u></h2></a>
 
 When used before the
 <a href="#START">START</a>
@@ -1306,6 +1324,15 @@ compensate:
 	(Document type)   bold italic, underscored, 3 points larger than running text
 </pre>
 
+If the
+<a href="#DOCTYPE">DOCTYPE</a>
+is CHAPTER,
+<pre>
+	   Chapter #       bold, 4 points larger than running text
+	 Chapter Title     bold italic, 4 points larger than running text
+</pre>
+
+<p>
 The
 <a href="definitions.html#TERMS_FAMILY">family</a>
 is the prevailing family of the whole document.
@@ -1313,7 +1340,7 @@ is the prevailing family of the whole document.
 <h3><u>The docheader macros to:</u></h3>
 <ol>
 	<li><a href="#CHANGE_START">Change the starting position</a>
-	<li><a href="#ADJUST_LEADING">Adjust the leading</a>
+	<li><a href="#ADJUST_LEADING">Adjust the docheader leading</a>
 	<li><a href="#CHANGE_FAMILY">Change the family of docheader elements</a>
 	<li><a href="#CHANGE_FONT">Change the font of docheader elements</a>
 	<li><a href="#CHANGE_SIZE">Adjust the size of docheader elements</a>
@@ -1357,9 +1384,14 @@ to place them where you want.
 <a name="ADJUST_LEADING"><h3><u>2. Adjust the leading</u></h3></a>
 The
 <a href="definitions.html#TERMS_LEADING">leading</a> of
-docheaders is the same as running text.  If you'd like a
-different leading, say, 2 points more than the lead of running
-text, use:
+docheaders is the same as running text (except when
+<a href="#DOCTYPE">DOCTYPE</a>
+is <strong>CHAPTER</a> <em>and both</em> a chapter number and a
+chapter title have been supplied, in which case the default is 4 points
+more than running text.)
+<p>
+If you'd like your docheaders to have a different leading, say, 2
+points more than the lead of running text, use:
 <p>
 <pre>
 	.DOCHEADER_LEAD +2p
@@ -1378,6 +1410,7 @@ of each docheader element separately:
 <p>
 <ul>
 <li><strong>TITLE_FAMILY</strong> <var>&lt;family&gt;</var>
+<li><strong>CHAPTER_TITLE_FAMILY</strong> <var>&lt;family&gt;</var>
 <li><strong>SUBTITLE_FAMILY</strong> <var>&lt;family&gt;</var>
 <li><strong>AUTHOR_FAMILY</strong> <var>&lt;family&gt;</var>
 <li><strong>DOCTYPE_FAMILY</strong> <var>&lt;family&gt;</var> (if
@@ -1393,6 +1426,7 @@ of each docheader element separately:
 <p>
 <ul>
 <li><strong>TITLE_FONT</strong> <var>R | B | I | BI</var>
+<li><strong>CHAPTER_TITLE_FONT</strong> <var>R | B | I | BI</var>
 <li><strong>SUBTITLE_FONT</strong> <var>R | B | I | BI</var>
 <li><strong>AUTHOR_FONT</strong> <var>R | B | I | BI</var>
 <li><strong>DOCTYPE_FONT</strong> <var>R | B | I | BI</var> (if
@@ -1410,8 +1444,8 @@ The following macros let you adjust the point size of each docheader
 element separately.
 <p>
 <strong>Mom</strong> calculates the point size
-of docheader elements from the point size of paragraphs, so you
-must prepend a + or - sign to the argument.  Points is
+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
@@ -1421,6 +1455,9 @@ sizes are allowed.
 <li><strong>TITLE_SIZE</strong> <var>&lt;+/-points&gt;</var>
 <br>
 default = +3.5 (+4 if docheader title is &quot;Chapter #&quot;)
+<li><strong>CHAPTER_TITLE_SIZE</strong> <var>&lt;+/-points&gt;</var>
+<br>
+default = +4
 <li><strong>SUBTITLE_SIZE</strong> <var>&lt;+/-points&gt;</var>
 <br>
 default = +0
@@ -1436,6 +1473,7 @@ default = +3
 Simply pass the appropriate macro the size adjustment you want.
 
 <a name="CHANGE_ATTRIBUTE"><h3><u>6. Change the attribution string (&quot;by&quot;)</u></h3></a>
+<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,
@@ -1582,7 +1620,7 @@ or (god help us) an epigraph, you must do the following in order for
 <!========================================================================>
 
 <a name="START_MACRO">
-<h2><u>Initiate document processing</u></h2>
+<h2><u>Start document processing</u></h2>
 </a>
 
 In order to use <strong>mom</strong>'s document element macros
diff --git a/contrib/groff/contrib/mom/momdoc/goodies.html b/contrib/groff/contrib/mom/momdoc/goodies.html
index c95e733..8876966 100644
--- a/contrib/groff/contrib/mom/momdoc/goodies.html
+++ b/contrib/groff/contrib/mom/momdoc/goodies.html
@@ -552,6 +552,7 @@ When the line is output, the space remaining on the line, after
 account, is split into four (because there are four # signs).
 One quarter of the space is inserted between Date and Signature,
 the remainder is inserted after Signature.
+<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
diff --git a/contrib/groff/contrib/mom/momdoc/inlines.html b/contrib/groff/contrib/mom/momdoc/inlines.html
index 99cfaf7..2d8aa82 100644
--- a/contrib/groff/contrib/mom/momdoc/inlines.html
+++ b/contrib/groff/contrib/mom/momdoc/inlines.html
@@ -344,6 +344,22 @@ example:
 </pre>
 
 The above draws a rule the full measure of the 6-pica line length.
+Please note that <strong>\*[$RULE]</strong> should appear on a line by
+itself and that it 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:
+<p>
+<pre>
+	Signature__________________________________________
+</pre>
+
+If you wish to accomplish this effect, you have to use
+<strong>\*[RULE]</strong> in conjunction with the
+<a href="goodies.html#PAD"><strong>PAD</strong></a>
+macro and
+<a href="typesetting.html#STRING_TABS">string tabs</a>.
+(See the example provided with
+<a href="goodies.html#PAD_EXAMPLE"><strong>.PAD</strong></a>.
 <p>
 See groff's
 <a href="#INLINE_LINEDRAWING_GROFF">Horizontal line drawing function</a>
diff --git a/contrib/groff/contrib/mom/momdoc/intro.html b/contrib/groff/contrib/mom/momdoc/intro.html
index e21fa3c..40c306d 100644
--- a/contrib/groff/contrib/mom/momdoc/intro.html
+++ b/contrib/groff/contrib/mom/momdoc/intro.html
@@ -179,7 +179,7 @@ text editor as they are on the printed page.
 <p>
 Unfortunately, in computerland, &quot;easy,&quot;
 &quot;comprehensible,&quot; and &quot;readable&quot; often mean
-&quot;you're stuck with what you're get.&quot; No document formatting
+&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.
diff --git a/contrib/groff/contrib/mom/momdoc/reserved.html b/contrib/groff/contrib/mom/momdoc/reserved.html
index 029556d..193b56d 100644
--- a/contrib/groff/contrib/mom/momdoc/reserved.html
+++ b/contrib/groff/contrib/mom/momdoc/reserved.html
@@ -212,6 +212,7 @@ p                       Output line horiz position at end of $PAD_STRING
 #Q_AT_TOP               Does a quote start at the top of a new page? (toggle)
 #QUAD                   In autoquad mode? (toggle)
 #RESTORE_LEAD           Lead value in effect prior to AUTOLEAD
+#RESTORE_LINE_LENGTH    Restores actual line length in RULE
 #RESTORE_PT_SIZE        Stores current point size (in units) prior to underscore
 #R_INDENT               Value of right indent
 #RLD                    RLD value
@@ -242,6 +243,7 @@ u                       Horiz position of start of underscore
 +++STRINGS+++
 
 $COND_PERCENT        Percentage by which to pseudo-condense type
+$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
@@ -352,12 +354,13 @@ DOCUMENT PROCESSING
 
 Document info
 -------------
-AUTHOR    Author
-CHAPTER   Chapter number
-DRAFT     Draft number
-REVISION  Revision number
-SUBTITLE  Doc subtitle
-TITLE     Doc title
+AUTHOR          Author
+CHAPTER         Chapter number
+CHAPTER_TITLE   Chapter title
+DRAFT           Draft number
+REVISION        Revision number
+SUBTITLE        Doc subtitle
+TITLE           Doc title
 
 Document style
 --------------
@@ -408,6 +411,9 @@ BLOCKQUOTE_FONT          Font to use in blockquotes
 BLOCKQUOTE_QUAD          How to quad blockquotes
 BLOCKQUOTE_SIZE          How much to de/increase point size of bquotes
 CHAPTER_STRING           What to print whenever the word "chapter" is required
+CHAPTER_TITLE_FAMILY     Family to use for chapter title in doc header
+CHAPTER_TITLE_FONT       Font to use for chapter title in doc header
+CHAPTER_TITLE_SIZE       ps in/decrease of chapter title (relative to size of running text)
 COLUMNS                  Print in columns
 DOC_FAMILY               Overall doc family
 DOCHEADER_ADVANCE        Start position of docheader (relative to top of page)
@@ -608,7 +614,6 @@ TRAPS                Sets hdrftr traps; optionally adjusts #DOC_LEAD to fill pag
 #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 (toggle)
 #CENTER_CAP_HEIGHT         Cap height of center string in headers/footers
-#CHAPTER                   The chapter number
 #CLOSING                   Is there a closing (for letters)? 1=yes
 #COL_L_LENGTH              Line length of columns
 #COL_NEXT                  Was COL_NEXT invoked? (toggle; used in FOOTER)
@@ -801,12 +806,19 @@ $AUTHOR_1...9                   Document author(s)
 $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
 $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*
 $CENTER_TITLE                   What to put in the middle of header title
+$CHAPTER                        The chapter number
 $CHAPTER_STRING                 What to print whenever the word "chapter" is required
+$CHAPTER_TITLE                  Chapter title (if there is one)
+$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
 $COPY_STYLE                     DRAFT or FINAL
 $DOC_FAM                        Predominant font family used in the document
 $DOC_QUAD                       Quad used for body text (justified or left) 
@@ -814,6 +826,7 @@ $DOC_TYPE                       Document type (default, chapter, named, letter)
 $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
 $DRAFT_STRING                   What to print whenever the word "draft" is required
 $EN_FAMILY                      Family for endnotes
 $EN_FT                          Font for endnotes
@@ -880,11 +893,13 @@ $SH_SIZE_CHANGE                 ps in/decrease of subheads*
 $SUBTITLE                       Document subtitle
 $SUBTITLE_FAM                   Family to use for subtitle in doc header
 $SUBTITLE_FT                    Font to use for subtitle in doc header
-$SUBTITLE_SIZE_CHANGE           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                          Document 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*
 $USERDEF_HDRFTR_RECTO           User defined header/footer recto string
 $USERDEF_HDRFTR_VERSO           User defined header/footer verso string
diff --git a/contrib/groff/contrib/mom/momdoc/toc.html b/contrib/groff/contrib/mom/momdoc/toc.html
index e3dccf1..cd853e8 100644
--- a/contrib/groff/contrib/mom/momdoc/toc.html
+++ b/contrib/groff/contrib/mom/momdoc/toc.html
@@ -115,8 +115,9 @@
 				<li><a href="docprocessing.html#SUBTITLE">5.3.2.2 SUBTITLE</a>
 				<li><a href="docprocessing.html#AUTHOR">5.3.2.3 AUTHOR</a>
 				<li><a href="docprocessing.html#CHAPTER">5.3.2.4 CHAPTER</a>
-				<li><a href="docprocessing.html#DRAFT">5.3.2.5 DRAFT</a>
-				<li><a href="docprocessing.html#REVISION">5.3.2.6 REVISION</a>
+				<li><a href="docprocessing.html#CHAPTER_TITLE">5.3.2.5 CHAPTER_TITLE</a>
+				<li><a href="docprocessing.html#DRAFT">5.3.2.6 DRAFT</a>
+				<li><a href="docprocessing.html#REVISION">5.3.2.7 REVISION</a>
 			</ul>
 			<li><a href="docprocessing.html#DOCSTYLE_MACROS"><strong>5.3.3 The Docstyle Macros</strong></a>
 			<ul>
diff --git a/contrib/groff/contrib/mom/momdoc/typesetting.html b/contrib/groff/contrib/mom/momdoc/typesetting.html
index ad79b35..8ac345e 100644
--- a/contrib/groff/contrib/mom/momdoc/typesetting.html
+++ b/contrib/groff/contrib/mom/momdoc/typesetting.html
@@ -1085,14 +1085,21 @@ systems, where it stood for "End Line."  Conceptually,
 with no linefeed.
 
 <p>
-Every once in a while, the need arises for breaking a line without
-advancing on the page.  Imagine, for example, 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, rather than calculating the lead that needs
-to be added to 12.5 to get 24.  To demonstrate:
+<em>Note to groff jocks:</em> <strong>EL</strong> is
+unrelated to groff's <strong>.el</strong>.  If you find the
+similarity confusing, you may want to alias <strong>EL</strong> as
+<strong>EOL</strong>.
+
+<p>
+<strong>EL</strong>'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'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:
 <p>
 <pre>
 	.LS 12.5
diff --git a/contrib/groff/contrib/mom/om.tmac b/contrib/groff/contrib/mom/om.tmac
index 6862c82..5d43b50 100644
--- a/contrib/groff/contrib/mom/om.tmac
+++ b/contrib/groff/contrib/mom/om.tmac
@@ -2,7 +2,7 @@
 .\"
 .\" Mom -- a typesetting/document-processing macro set for groff.
 .\"
-.\" Copyright (C) 2002 Free Software Foundation, Inc.
+.\" Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 .\"      Written by Peter Schaffter (df191@ncf.ca)
 .\"
 .\" This file is part of groff.
@@ -23,7 +23,7 @@
 .\"
 .
 .
-\# Version 1.1.4
+\# Version 1.1.5
 \# -------------
 \#
 .if (\n[.x]\n[.y] < 118) \
@@ -442,10 +442,6 @@
 .ds PREV \EfP
 .ds S    \Es
 \#
-\# ADDITIONAL STRINGS
-\# ------------------
-.ds RULE \El'\En(.lu'
-\#
 \#
 \# =====================================================================
 \#
@@ -1629,7 +1625,7 @@
         \[`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
+        ' 1 2 3 4 5 6 7 8 9 0
 .    \}
 .END
 \#
@@ -1788,7 +1784,7 @@
      \[`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
+     ' 1 2 3 4 5 6 7 8 9 0
 .END
 \#
 \#
@@ -2282,6 +2278,35 @@
 .END
 \#
 \#
+\# RULE
+\# ----
+\# *Argument:
+\#   <none>
+\# *Function:
+\#   Draws a rule the length of the current measure.
+\# *Notes:
+\#
+.MAC RULE END
+.    if \\n(.j=1 \{\
+.       ds $CURRENT_QUAD \\*[$QUAD_VALUE]
+.       nf
+.    \}
+.    ie \\n[#INDENT_ACTIVE] \{\
+.       nr #RESTORE_L_LENGTH \\n(.l
+.       if \\n[#INDENT_BOTH_ACTIVE] \{ .ll \\n(.lu-\\n[#BL_INDENT]u \}
+.       if \\n[#INDENT_LEFT_ACTIVE] \{ .ll \\n(.lu-\\n[#L_INDENT]u \}
+.       PRINT \El'\En(.lu'
+.       ll \\n[#RESTORE_L_LENGTH]u
+.       rr #RESTORE_L_LENGTH]u
+.    \}
+.    el \{\
+.       PRINT \El'\En(.lu'
+.    \}
+.    QUAD \\*[$CURRENT_QUAD]
+.    rm $CURRENT_QUAD
+.    EL
+.END
+\#
 \# =====================================================================
 \#
 \# +++WORD AND SENTENCE SPACING+++
@@ -3201,7 +3226,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       nr #COPY_STYLE 1
 .       if !r#DRAFT \{ .DRAFT 1 \}
 .    \}
-.    if '\\*[$COPY_STYLE]'FINAL' \{ .nr #COPY_STYLE 2 \}
+.    if '\\*[$COPY_STYLE]'FINAL' \{ .nr #COPY_STYLE 2         \}
 .    if !d$CHAPTER_STRING        \{ .CHAPTER_STRING "Chapter" \}
 .    if !d$DRAFT_STRING          \{ .DRAFT_STRING "Draft"     \}
 .    if !d$REVISION_STRING       \{ .REVISION_STRING "Rev."   \}
@@ -3235,49 +3260,106 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    \}
 \# Chapter
 .    if \\n[#DOC_TYPE]=2 \{\
+\# Copystyle DRAFT
 .       ie \\n[#COPY_STYLE]=1 \{\
 .          ie \\n[#PAGENUM_STYLE_SET] \{ .PAGENUM_STYLE \\*[$PAGENUM_STYLE] \}
 .          el \{ .PAGENUM_STYLE roman \}
 .          if \\n[#USER_DEF_HDRFTR_CENTER]=0 \{\
 .             ie \\n[#DRAFT_WITH_PAGENUM] \{\
-.                ie '\\*[$CHAPTER]'' \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
-.                el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \}
+.                ie '\\*[$CHAPTER]'' \{\
+.                   ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                      ds $HDRFTR_CENTER \\*[$CHAPTER_TITLE]
+.                   \}
+.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \}
+.                \}
+.                el \{\
+.                   ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                      ds \\*[$CHAPTER_TITLE]
+.                   \}
+.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
+.                \}
 .             \}
 .             el \{\
 .                ie !\\n[#REVISION] \{\
 .                   ie '\\*[$CHAPTER]'' \{\
-.                      ds $HDRFTR_CENTER \
-                       \\*[$CHAPTER_STRING], \
-                       \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_TITLE], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      \}
+.                      el \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_STRING], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      \}
 .                   \}
 .                   el \{\
-.                      ds $HDRFTR_CENTER \
-                       \\*[$CHAPTER_STRING] \\*[$CHAPTER], \
-                       \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_TITLE], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      \}
+.                      el \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_STRING] \\*[$CHAPTER], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT]
+.                      \}
 .                   \}
 .                \}
 .                el \{\
 .                   ie '\\*[$CHAPTER]'' \{\
-.                   el \{\
-                       \\*[$CHAPTER_STRING], \
-                       \\*[$DRAFT_STRING] \\n[#DRAFT], \
-                       \\*[$REVISION_STRING] \\n[#REVISION]
+.                      ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_TITLE], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT], \
+                          \\*[$REVISION_STRING] \\n[#REVISION] 
+.                      \}
+.                      el \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_STRING], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT], \
+                          \\*[$REVISION_STRING] \\n[#REVISION] 
+.                      \}
 .                   \}
-.                   ds $HDRFTR_CENTER \
-                       \\*[$CHAPTER_STRING] \\*[$CHAPTER], \
-                       \\*[$DRAFT_STRING] \\n[#DRAFT], \
-                       \\*[$REVISION_STRING] \\n[#REVISION]
+.                   el \{\
+.                      ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_TITLE], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT], \
+                          \\*[$REVISION_STRING] \\n[#REVISION] 
+.                      \}
+.                      el \{\
+.                         ds $HDRFTR_CENTER \
+                          \\*[$CHAPTER_STRING] \\*[$CHAPTER], \
+                          \\*[$DRAFT_STRING] \\n[#DRAFT], \
+                          \\*[$REVISION_STRING] \\n[#REVISION] 
+.                      \}
 .                   \}
 .                \}
 .             \}
 .          \}
 .       \}
+\# Copystyle FINAL
 .       el \{\
 .          if \\n[#USER_DEF_HDRFTR_CENTER]=0 \{\
 .             ie \\n[#PAGENUM_STYLE_SET] \{ .PAGENUM_STYLE \\*[$PAGENUM_STYLE] \}
 .             el \{ .PAGENUM_STYLE DIGIT \}
-.             ie '\\*[$CHAPTER]'' \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \}
-.             el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
+.             ie '\\*[$CHAPTER]'' \{\
+.                ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                   ds $HDRFTR_CENTER \\*[$CHAPTER_TITLE]
+.                \}
+.                el \{\
+.                   ds $HDRFTR_CENTER \\*[$CHAPTER_STRING]
+.                \}
+.             \}
+.             el \{\
+.                ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                   ds $HDRFTR_CENTER \\*[$CHAPTER_TITLE]
+.                \}
+.                el \{\
+.                   ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER]
+.                \}
+.             \}
 .          \}
 .       \}
 .    \}
@@ -3339,6 +3421,11 @@ y\\R'#DESCENDER \\n[.cdp]'
 .END
 \#
 \#
+.MAC CHAPTER_TITLE END \" This defines what comes after Chapter #
+.    ds $CHAPTER_TITLE \\$1
+.END
+\#
+\#
 .MAC DRAFT END \"Draft number
 .    nr #DRAFT \\$1
 .END
@@ -3354,7 +3441,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 .END
 \#
 \#
-.MAC AUTHOR END \"Author.  Use "..." with this macro.
+.MAC AUTHOR END \"Author.  Enclose all args fully in double quotes.
 .    nr #AUTHOR_NUM -1 1
 .    while \\n[#NUM_ARGS]>\\n[#AUTHOR_NUM] \{\
 .       ds $AUTHOR_\\n+[#AUTHOR_NUM] \\$\\n[#AUTHOR_NUM]
@@ -3492,6 +3579,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    br
 .    nr #CLOSING 1
 .    di CLOSING
+.    LEFT
 .END
 \#
 \#
@@ -3662,13 +3750,24 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    \}
 \# Defaults for printstyle TYPESET
 .    if \\n[#PRINT_STYLE]=2 \{\
-.       if !#DOCHEADER_LEAD \{ .DOCHEADER_LEAD +0            \}
+.       if !r#DOCHEADER_LEAD_ADJ \{\
+.          ie !'\\*[$CHAPTER_TITLE]'' \{\
+.             ie !'\\*[$CHAPTER_STRING]'' \{\
+.                DOCHEADER_LEAD +4p
+.             \}
+.             el \{ .DOCHEADER_LEAD +0 \}
+.          \}
+.          el \{ .DOCHEADER_LEAD +0 \}
+.       \}
 .       if !d$TITLE_FAM     \{ .TITLE_FAMILY   \\*[$DOC_FAM] \}
 .       if !d$TITLE_FT      \{ .TITLE_FONT     B             \}
 .       if !d$TITLE_SIZE_CHANGE \{\
 .          ie \\n[#DOC_TYPE]=2 \{ .TITLE_SIZE +4 \}
 .          el \{ .TITLE_SIZE +3.5 \}
 .       \}
+.       if !d$CHAPTER_TITLE_FAM         \{ .CHAPTER_TITLE_FAMILY \\*[$DOC_FAM] \}
+.       if !d$CHAPTER_TITLE_FT          \{ .CHAPTER_TITLE_FONT   BI            \}
+.       if !d$CHAPTER_TITLE_SIZE_CHANGE \{ .CHAPTER_TITLE_SIZE  +4             \}
 .       if !d$SUBTITLE_FAM         \{ .SUBTITLE_FAMILY    \\*[$DOC_FAM] \}
 .       if !d$SUBTITLE_FT          \{ .SUBTITLE_FONT      R             \}
 .       if !d$SUBTITLE_SIZE_CHANGE \{ .SUBTITLE_SIZE      +0            \}
@@ -3762,6 +3861,113 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#   are stored in #DOC_L_LENGTH, $DOC_FAM, and #DOC_PT_SIZE for
 \#   use in the HEADER and FOOTER macros.
 \#
+.\"  First, define some strings for point sizes
+\#
+.ds $TITLE_PT_SIZE         \\n[#DOC_PT_SIZE]u\\*[$TITLE_SIZE_CHANGE]
+.ds $CHAPTER_TITLE_PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$CHAPTER_TITLE_SIZE_CHANGE]
+.ds $SUBTITLE_PT_SIZE      \\n[#DOC_PT_SIZE]u\\*[$SUBTITLE_SIZE_CHANGE]
+.ds $AUTHOR_PT_SIZE        \\n[#DOC_PT_SIZE]u\\*[$AUTHOR_SIZE_CHANGE]
+.ds $DOCTYPE_PT_SIZE       \\n[#DOC_PT_SIZE]u\\*[$DOCTYPE_SIZE_CHANGE]
+\#
+.\" Next, some utility macros for various routines to prevent repetition
+\#
+.MAC PRINT_AUTHORS END
+.   nr #AUTHORS \\n[#AUTHOR_NUM]
+.   nr #NEXT_AUTHOR 0 1
+.   while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
+.      PRINT \\*[$AUTHOR_\\n+[#NEXT_AUTHOR]]
+.   \}
+.END
+\#
+.MAC DEFAULT_DOCHEADER END
+.          CENTER
+.          FAMILY  \\*[$TITLE_FAM]
+.          FT      \\*[$TITLE_FT]
+.          PT_SIZE \\*[$TITLE_PT_SIZE]
+.          LS      \\n[#DOCHEADER_LEAD]u
+.          PRINT   \\*[$TITLE]
+.          if !'\\*[$SUBTITLE]'' \{\
+.             FAMILY  \\*[$SUBTITLE_FAM]
+.             FT      \\*[$SUBTITLE_FT]
+.             PT_SIZE \\*[$SUBTITLE_PT_SIZE]
+.             PRINT   \\*[$SUBTITLE]
+.          \}
+.          if !'\\*[$AUTHOR_1]'' \{\
+.             FAMILY  \\*[$AUTHOR_FAM]
+.             FT      \\*[$AUTHOR_FT]
+.             PT_SIZE \\*[$AUTHOR_PT_SIZE]
+.             PRINT   \\*[$ATTRIBUTE_STRING]
+.             PRINT_AUTHORS
+.          \}
+.END
+\#
+\#
+.MAC CHAPTER_DOCHEADER END
+.    CENTER
+.    FAMILY  \\*[$TITLE_FAM]
+.    FT      \\*[$TITLE_FT]
+.    PT_SIZE \\*[$TITLE_PT_SIZE]
+.    LS      \\n[#DOCHEADER_LEAD]u
+.    ie '\\*[$CHAPTER]'' \{\
+.       ie !'\\*[$CHAPTER_TITLE]'' \{\
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             FAMILY  \\*[$CHAPTER_TITLE_FAM]
+.             FT      \\*[$CHAPTER_TITLE_FT]
+.             PT_SIZE \\*[$CHAPTER_TITLE_PT_SIZE]
+.             LS      \\n[#DOCHEADER_LEAD]u
+.          \}
+.          PRINT \\*[$CHAPTER_TITLE]
+.       \}
+.       el \{\
+.          PRINT \\*[$CHAPTER_STRING]
+.       \}
+.    \}
+.    el \{\
+.       PRINT \\*[$CHAPTER_STRING] \\*[$CHAPTER]
+.       if !'\\*[$CHAPTER_TITLE]'' \{\
+.       if \\n[#PRINT_STYLE]=1 \{ .PRINT   \\*[$CHAPTER_TITLE] \}
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             FAMILY  \\*[$CHAPTER_TITLE_FAM]
+.             FT      \\*[$CHAPTER_TITLE_FT]
+.             PT_SIZE \\*[$CHAPTER_TITLE_PT_SIZE]
+.             LS      \\n[#DOCHEADER_LEAD]u
+.             PRINT   \\*[$CHAPTER_TITLE]
+.             RLD \\n[#DOC_LEAD]u \" Just looks better this way
+.          \}
+.       \}
+.    \}
+.END
+\#
+\#
+.MAC NAMED_DOCHEADER END
+.          CENTER
+.          FAMILY  \\*[$TITLE_FAM]
+.          FT      \\*[$TITLE_FT]
+.          PT_SIZE \\*[$TITLE_PT_SIZE]
+.          LS      \\n[#DOCHEADER_LEAD]u
+.          PRINT   \\*[$TITLE]
+.          if !'\\*[$SUBTITLE]'' \{\
+.             FAMILY  \\*[$SUBTITLE_FAM]
+.             FT      \\*[$SUBTITLE_FT]
+.             PT_SIZE \\*[$SUBTITLE_PT_SIZE]
+.             PRINT   \\*[$SUBTITLE]
+.          \}
+.          if !'\\*[$AUTHOR_1]'' \{\
+.             FAMILY  \\*[$AUTHOR_FAM]
+.             FT      \\*[$AUTHOR_FT]
+.             PT_SIZE \\*[$AUTHOR_PT_SIZE]
+.             PRINT   \\*[$ATTRIBUTE_STRING]
+.             PRINT_AUTHORS
+.          \}
+.          FAMILY  \\*[$DOCTYPE_FAM]
+.          FT      \\*[$DOCTYPE_FT]
+.          PT_SIZE \\*[$DOCTYPE_PT_SIZE]
+.          LS      \\n[#DOCHEADER_LEAD]u
+.          ALD     \\n[#DOCHEADER_LEAD]u
+.          UNDERSCORE "\\*[$DOC_TYPE]
+.END
+\#
+\#
 .MAC START END
 .    if !\\n[#PRINT_STYLE] \{\
 .       PRINTSTYLE TYPEWRITE
@@ -3805,7 +4011,6 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       if r#ADVANCE_FROM_TOP \{ .rr #ADVANCE_FROM_TOP \}
 .    \}
 .    el \{\
-.       nr #DOCHEADER_LINES 0 1
 .       if \\n[#PRINT_STYLE]=2 \{ .LS \\n[#DOC_LEAD]u+\\n[#DOCHEADER_LEAD_ADJ]u \}
 .       nr #DOCHEADER_LEAD \\n[#LEAD]
 \# Default
@@ -3813,11 +4018,11 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          PRINT \&
 .          sp |\\n[#DOCHEADER_ADVANCE]u-1v
 .          ev TITLE
-.          CENTER
 .          L_MARGIN \\n[#DOC_L_MARGIN]u
 .          LL       \\n[#DOC_L_LENGTH]u
 .          ta \\n(.lu
 .          if \\n[#PRINT_STYLE]=1 \{\
+.             CENTER
 .             fam C
 .             ft  R
 .             ps  12
@@ -3826,83 +4031,54 @@ y\\R'#DESCENDER \\n[.cdp]'
 .             CAPS
 .             if !'\\*[$TITLE]'' \{ .UNDERSCORE "\\*[$TITLE]\}
 .             CAPS OFF
-.          \}
-.          if \\n[#PRINT_STYLE]=2 \{\
-.             FAMILY  \\*[$TITLE_FAM]
-.             FT      \\*[$TITLE_FT]
-.             PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$TITLE_SIZE_CHANGE]
-.             LS      \\n[#DOCHEADER_LEAD]u
-.             PRINT   \\*[$TITLE]
-.             \\n+[#DOCHEADER_LINES]
-.             CAPS OFF
-.          \}
-.          ev
-.          ev SUBTITLE
-.          CENTER
-.          L_MARGIN \\n[#DOC_L_MARGIN]u
-.          LL       \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if !'\\*[$SUBTITLE]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
-.                fam C
-.                ft  R
-.                ps  12
+.             if !'\\*[$SUBTITLE]'' \{\
 .                ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u*2u \}
 .                el \{ .vs \\n[#DOC_LEAD]u \}
-.             \}
-.             if \\n[#PRINT_STYLE]=2 \{\
-.                FAMILY  \\*[$SUBTITLE_FAM]
-.                FT      \\*[$SUBTITLE_FT]
-.                PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$SUBTITLE_SIZE_CHANGE]
-.                LS      \\n[#DOCHEADER_LEAD]u
-.             \}
 .             PRINT \\*[$SUBTITLE]
-.             \\n+[#DOCHEADER_LINES]
-.          \}
-.          if '\\*[$SUBTITLE]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
+.             \}
+.             if '\\*[$SUBTITLE]'' \{\
 .                ALD \\n[#DOC_LEAD]u
 .             \}
-.          \}
-.          ev
-.          ev AUTHOR
-.          CENTER
-.          L_MARGIN \\n[#DOC_L_MARGIN]u
-.          LL       \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if !'\\*[$AUTHOR_1]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
-.                fam C
-.                ft  R
-.                ps  12
+.             ie !'\\*[$AUTHOR_1]'' \{\
 .                ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u \}
 .                el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .                if !d$SUBTITLE \{\
-.                ie \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
-.                el \{ .ALD \\n[#DOC_LEAD]u*2u \}
+.                   ie \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
+.                   el \{ .ALD \\n[#DOC_LEAD]u*2u \}
+.                \}
+.                PRINT \\*[$ATTRIBUTE_STRING]
+.                nr #AUTHORS \\n[#AUTHOR_NUM]
+.                nr #NEXT_AUTHOR 0 1
+.                while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
+.                   PRINT \\*[$AUTHOR_\\n+[#NEXT_AUTHOR]]
 .                \}
-.             \}
-.             if \\n[#PRINT_STYLE]=2 \{\
-.                FAMILY  \\*[$AUTHOR_FAM]
-.                FT      \\*[$AUTHOR_FT]
-.                PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$AUTHOR_SIZE_CHANGE]
-.                LS      \\n[#DOCHEADER_LEAD]u
-.             \}
-.             PRINT \\*[$ATTRIBUTE_STRING]
-.             \\n+[#DOCHEADER_LINES]
-.             nr #AUTHORS \\n[#AUTHOR_NUM]
-.             nr #NEXT_AUTHOR 0 1
-.             while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
-.                PRINT \\*[$AUTHOR_\\n+[#NEXT_AUTHOR]]
-.                \\n+[#DOCHEADER_LINES]
-.             \}
-.             if \\n[#PRINT_STYLE]=1 \{\
 .                if \\n[#AUTHOR_LINES]=1 \{\
 .                    ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u \}
-.                    el \{ .RLD \\n[#DOC_LEAD]u \}
-.                 \}
+.                    el \{ .ALD \\n[#DOC_LEAD]u/2u \}
+.                \}
+.             \}
+.             el \{\
+.                ie !d$SUBTITLE \{\
+.                   ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u*2u \}
+.                   el \{ .RLD \\n[#DOC_LEAD]u \}
+.                \}
+.                el \{\
+.                   ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u*2u \}
+.                   el \{ .ALD \\n[#DOC_LEAD]u \}
+.                \}
 .             \}
 .          \}
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             DEFAULT_DOCHEADER
+.             di DOCHEADER_DIVERSION \" This diversion is only
+.             br                     \" necessary to find the depth of the
+.             DEFAULT_DOCHEADER      \" docheader
+.             br
+.             di
+.             nr #DOCHEADER_DEPTH \\n(dn-\\n[#DOCHEADER_LEAD] \"Storing the depth (height) of the diversion
+.                                                             \"in #DOCHEADER_DEPTH
+.             rm DOCHEADER_DIVERSION                          \" Removing the diversion macro
+.          \}
 .          ev
 .       \}
 \# Chapter
@@ -3913,29 +4089,44 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          L_MARGIN \\n[#DOC_L_MARGIN]u
 .          LL       \\n[#DOC_L_LENGTH]u
 .          ta \\n(.lu
-.          CENTER
 .          if \\n[#PRINT_STYLE]=1 \{\
+.             CENTER
 .             fam C
 .             ft  R
 .             ps  12
-.             ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u*2u \}
-.             el \{ .vs \\n[#DOC_LEAD]u \}
-.          \}
-.          if \\n[#PRINT_STYLE]=2 \{\
-.             FAMILY  \\*[$TITLE_FAM]
-.             FT      \\*[$TITLE_FT]
-.             PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$TITLE_SIZE_CHANGE]
-.             LS      \\n[#DOC_LEAD]u
-.          \}
-.          if \\n[#PRINT_STYLE]=1 \{\
-.             CAPS
-.             ie '\\*[$CHAPTER]'' \{ .PRINT \\*[$CHAPTER_STRING] \}
-.             el \{ .PRINT \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
-.             CAPS OFF
+.             vs \\n[#DOC_LEAD]u
+.             ie '\\*[$CHAPTER]'' \{\
+.                CAPS
+.                ie !'\\*[$CHAPTER_TITLE]'' \{\
+.                   PRINT \\*[$CHAPTER_TITLE]
+.                \}
+.                el \{\
+.                   CAPS
+.                   PRINT \\*[$CHAPTER_STRING]
+.                \}
+.                CAPS OFF
+.             \}
+.             el \{\
+.                CAPS
+.                PRINT \\*[$CHAPTER_STRING] \\*[$CHAPTER]
+.                CAPS OFF
+.                if !'\\*[$CHAPTER_TITLE]'' \{\
+.                   if \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
+.                   UNDERSCORE "\\*[$CHAPTER_TITLE]
+.                \}
+.             \}
+.             if \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
 .          \}
 .          if \\n[#PRINT_STYLE]=2 \{\
-.             ie '\\*[$CHAPTER]'' \{ .PRINT \\*[$CHAPTER_STRING] \}
-.             el \{ .PRINT \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
+.             CHAPTER_DOCHEADER
+.             di DOCHEADER_DIVERSION \" This diversion is only
+.             br                     \" necessary to find the depth of the
+.             CHAPTER_DOCHEADER      \" docheader
+.             br
+.             di
+.             nr #DOCHEADER_DEPTH \\n(dn-\\n[#DOCHEADER_LEAD] \" Storing the depth (height) of the diversion
+.                                                             \" in #DOCHEADER_DEPTH
+.             rm DOCHEADER_DIVERSION                          \" Removing the diversion macro
 .          \}
 .          ev
 .       \}
@@ -3943,12 +4134,12 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       if \\n[#DOC_TYPE]=3 \{\
 .          PRINT \&
 .          sp |\\n[#DOCHEADER_ADVANCE]u-1v
-.          ev TITLE
-.          CENTER
+.          ev NAMED
 .          L_MARGIN \\n[#DOC_L_MARGIN]u
 .          LL       \\n[#DOC_L_LENGTH]u
 .          ta \\n(.lu
 .          if \\n[#PRINT_STYLE]=1 \{\
+.             CENTER
 .             fam C
 .             ft  R
 .             ps  12
@@ -3957,101 +4148,40 @@ y\\R'#DESCENDER \\n[.cdp]'
 .             CAPS
 .             if !'\\*[$TITLE]'' \{ .UNDERSCORE "\\*[$TITLE]\}
 .             CAPS OFF
-.          \}
-.          if \\n[#PRINT_STYLE]=2 \{\
-.             FAMILY  \\*[$TITLE_FAM]
-.             FT      \\*[$TITLE_FT]
-.             PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$TITLE_SIZE_CHANGE]
-.             LS      \\n[#DOCHEADER_LEAD]u
-.             PRINT \\*[$TITLE]
-.             \\n+[#DOCHEADER_LINES]
-.             CAPS OFF
-.          \}
-.          ev
-.          ev SUBTITLE
-.          CENTER
-.          L_MARGIN \\n[#DOC_L_MARGIN]u
-.          LL       \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if !'\\*[$SUBTITLE]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
-.                fam C
-.                ft  R
-.                ps  12
+.             if !'\\*[$SUBTITLE]'' \{\
 .                ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u*2u \}
 .                el \{ .vs \\n[#DOC_LEAD]u \}
+.                PRINT \\*[$SUBTITLE]
 .             \}
-.             if \\n[#PRINT_STYLE]=2 \{\
-.                FAMILY  \\*[$SUBTITLE_FAM]
-.                FT      \\*[$SUBTITLE_FT]
-.                PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$SUBTITLE_SIZE_CHANGE]
-.                LS      \\n[#DOCHEADER_LEAD]u
-.             \}
-.             PRINT \\*[$SUBTITLE]
-.             \\n+[#DOCHEADER_LINES]
-.          \}
-.          if '\\*[$SUBTITLE]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
+.             if '\\*[$SUBTITLE]'' \{\
 .                ALD \\n[#DOC_LEAD]u
 .             \}
-.          \}
-.          ev
-.          ev AUTHOR
-.          CENTER
-.          L_MARGIN \\n[#DOC_L_MARGIN]u
-.          LL       \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if !'\\*[$AUTHOR_1]'' \{\
-.             if \\n[#PRINT_STYLE]=1 \{\
-.                fam C
-.                ft  R
-.                ps  12
+.             ie !'\\*[$AUTHOR_1]'' \{\
 .                ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u \}
 .                el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .                if !d$SUBTITLE \{\
-.                ie \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
-.                el \{ .ALD \\n[#DOC_LEAD]u*2u \}
+.                   ie \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
+.                   el \{ .ALD \\n[#DOC_LEAD]u*2u \}
+.                \}
+.                PRINT \\*[$ATTRIBUTE_STRING]
+.                nr #AUTHORS \\n[#AUTHOR_NUM]
+.                nr #NEXT_AUTHOR 0 1
+.                while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
+.                   PRINT \\*[$AUTHOR_\\n+[#NEXT_AUTHOR]]
 .                \}
-.             \}
-.             if \\n[#PRINT_STYLE]=2 \{\
-.                FAMILY  \\*[$AUTHOR_FAM]
-.                FT      \\*[$AUTHOR_FT]
-.                PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$AUTHOR_SIZE_CHANGE]
-.                LS      \\n[#DOCHEADER_LEAD]u
-.             \}
-.             PRINT \\*[$ATTRIBUTE_STRING]
-.             \\n+[#DOCHEADER_LINES]
-.             nr #AUTHORS \\n[#AUTHOR_NUM]
-.             nr #NEXT_AUTHOR 0 1
-.             while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
-.                PRINT \\*[$AUTHOR_\\n+[#NEXT_AUTHOR]]
-.                \\n+[#DOCHEADER_LINES]
-.             \}
-.             if \\n[#PRINT_STYLE]=1 \{\
 .                if \\n[#AUTHOR_LINES]=1 \{\
 .                    ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u \}
-.                    el \{ .RLD \\n[#DOC_LEAD]u \}
+.                    el \{ .ALD \\n[#DOC_LEAD]u/2u \}
 .                 \}
 .             \}
-.          \}
-.          ev
-.          ev DOCTYPE
-.          CENTER
-.          L_MARGIN \\n[#DOC_L_MARGIN]u
-.          LL       \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if \\n[#PRINT_STYLE]=1 \{\
-.             fam C
-.             ft  R
-.             ps  12
 .             vs  \\n[#DOC_LEAD]u
-.             if '\\*[$AUTHOR_1]'' \{\
+.             el \{\
 .                ie !d$SUBTITLE \{\
 .                   ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u*2u \}
 .                   el \{ .RLD \\n[#DOC_LEAD]u \}
-.             \}
+.                \}
 .                el \{\
-.                   ie \\n[#SINGLE_SPACE] \{ .RLD \\n[#DOC_LEAD]u*2u \}
+.                   ie \\n[#SINGLE_SPACE] \{ . \}
 .                   el \{ .RLD \\n[#DOC_LEAD]u \}
 .                \}
 .             \}
@@ -4061,40 +4191,24 @@ y\\R'#DESCENDER \\n[.cdp]'
 .             if \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
 .          \}
 .          if \\n[#PRINT_STYLE]=2 \{\
-.             FAMILY  \\*[$DOCTYPE_FAM]
-.             FT      \\*[$DOCTYPE_FT]
-.             PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$DOCTYPE_SIZE_CHANGE]
-.             LS      \\n[#DOCHEADER_LEAD]u
-.             ALD \\n[#DOCHEADER_LEAD]u
-.             \\n+[#DOCHEADER_LINES]
-.             UNDERSCORE   "\\*[$DOC_TYPE]
-.             \\n+[#DOCHEADER_LINES]
+.             NAMED_DOCHEADER
+.             di DOCHEADER_DIVERSION \" This diversion is only
+.             br                     \" necessary to find the depth of the
+.             NAMED_DOCHEADER        \" docheader
+.             br
+.             di
+.             nr #DOCHEADER_DEPTH \\n(dn-\\n[#DOCHEADER_LEAD] \"Storing the depth (height) of the diversion
+.                                                             \"in #DOCHEADER_DEPTH
+.             rm DOCHEADER_DIVERSION                          \" Removing the diversion macro
 .          \}
 .          ev
 .       \}
 .       if !\\n[#DOC_TYPE]=4 \{\
-.          if \\n[#PRINT_STYLE]=2 \{\
-.             nr #DEPTH_1 \\n[#DOCHEADER_LINES]*\\n[#DOCHEADER_LEAD]
-.             nr #DEPTH_2 \\n[#DOCHEADER_LINES]*\\n[#DOC_LEAD]
-.             ie \\n[#DEPTH_1]<\\n[#DEPTH_2] \{\
-.                 nr #DOCHEADER_SPACE_ADJ \\n[#DEPTH_2]-\\n[#DEPTH_1]
-.             \}
-.             el \{\
-.                 nr #DOCHEADER_SPACE_ADJ \\n[#DEPTH_1]-\\n[#DEPTH_2]
-.             \}
-.             nr #DOCHEADER_EXTRA_SPACE \\n[#DOCHEADER_SPACE_ADJ] \\n[#DOC_LEAD]
-.             while \\n[#DOCHEADER_EXTRA_SPACE]>\\n[#DOC_LEAD] \{\
-.                \\n-[#DOCHEADER_EXTRA_SPACE]
-.             \}
-.             if \\n[#DOCHEADER_EXTRA_SPACE]>0 \{\
-.                ie \\n[#DOCHEADER_LEAD_ADJ]<0 \{\
-.                   ALD \\n[#DOCHEADER_EXTRA_SPACE]u
-.                \}
-.                el \{ .ALD \\n[#DOC_LEAD]u-\\n[#DOCHEADER_EXTRA_SPACE]u \}
-.             \}
-.          \}
-.          if \\n[#PRINT_STYLE]=1 \{ .ALD \\n[#DOC_LEAD]u    \}
-.          if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#DOC_LEAD]u*2u \}
+.          if \\n[#PRINT_STYLE]=1 \{ .ALD \\n[#DOC_LEAD]u \}
+.          nr #DOCHEADER_SPACE_ADJ \\n[#DOCHEADER_DEPTH]%\\n[#DOC_LEAD] \"Do we need the units?
+.          ie !\\n[#DOCHEADER_SPACE_ADJ]=0 \{ .nr #DOCHEADER_EXTRA_SPACE \\n[#DOC_LEAD]u-\\n[#DOCHEADER_SPACE_ADJ]u \}
+.          el \{ .nr #DOCHEADER_EXTRA_SPACE 0 \}
+.          if \\n[#PRINT_STYLE]=2 \{ .ALD (\\n[#DOC_LEAD]u*2u)+\\n[#DOCHEADER_EXTRA_SPACE]u \}
 .          if \\n[#COLUMNS] \{\
 .             nr #COL_NUM 0 1
 .             nr #L_LENGTH_FOR_EPI \\n[#L_LENGTH]
@@ -4112,7 +4226,6 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    rr #DOCHEADER_ADVANCE
 .    rr #ADVANCE_FROM_TOP
 .    rr #DOCHEADER_SPACE_ADJ
-.    rr #DOCHEADER_LINES
 .    rr #DOCHEADER_EXTRA_SPACE
 .    rr #AUTHORS
 .    rr #NEXT_AUTHOR
@@ -4224,6 +4337,53 @@ y\\R'#DESCENDER \\n[.cdp]'
 .END
 \#
 \#
+\# CHAPTER TITLE FAMILY
+\# --------------------
+\# *Argument:
+\#   <family to use for the chapter title, if there is one>
+\# *Function:
+\#   Creates or modifies string $CHAPTER_TITLE_FAM.
+\# *Notes:
+\#   Default isame as running text.
+\#
+.MAC CHAPTER_TITLE_FAMILY END
+.    ds $CHAPTER_TITLE_FAM \\$1
+.END
+\#
+\#
+\# CHAPTER TITLE FONT
+\# ------------------
+\# *Argument:
+\#   <font to use for the chapter title, if there is one>
+\# *Function:
+\#   Creates or modifies string $CHAPTER_TITLE_FT.
+\# *Notes:
+\#   Default is bold italic for TYPESET; varies in TYPEWRITE between
+\#   caps and underscored, depending on whether chapter title stands
+\#   alone or has CHAPTER # above it.
+\#
+.MAC CHAPTER_TITLE_FONT END
+.    ds $CHAPTER_TITLE_FT \\$1
+.END
+\#
+\#
+\# CHAPTER TITLE SIZE
+\# ------------------
+\# *Argument:
+\#   <+|- number of points by which to in/decrease title at start
+\#   of the document (relative to running text)>
+\# *Function:
+\#   Creates string $CHAPTER_TITLE_SIZE_CHANGE.
+\# *Notes:
+\#   Must be preceded by a +|- sign, with no space afterwards.
+\#   Fractional point sizes are allowed.
+\#   Default is +4 for printstyle TYPESET
+\#
+.MAC CHAPTER_TITLE_SIZE END
+.    ds $CHAPTER_TITLE_SIZE_CHANGE \\$1
+.END
+\#
+\#
 \# SUBTITLE FAMILY
 \# ---------------
 \# *Argument:
@@ -4850,11 +5010,8 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    ie \\n[#START] \{\
 .       nr #EPI_WHITESPACE (\\n[#DOC_LEAD]*\\n[#EPI_LINES])-\\n[#EPI_DEPTH]
 .       while \\n[#EPI_WHITESPACE]>\\n[#DOC_LEAD] \{ .nr #EPI_WHITESPACE -\\n[#DOC_LEAD] \}
-.       RLD \\n[#DOC_LEAD]u
-.       ie \\n[#PRINT_STYLE]=1 \{\
-.          if \\n[#EPI_WHITESPACE]=\\n[#DOC_LEAD] \{ .ALD \\n[#EPI_WHITESPACE]u/2u \}
-.       \}
-.       el \{\
+.       if \\n[#PRINT_STYLE]=2 \{\
+.          RLD \\n[#DOC_LEAD]u
 .          if \\n[#EPI_WHITESPACE]<\\n[#DOC_LEAD] \{\
 .             ALD \\n[#EPI_LEAD_DIFF]u+(\\n[#EPI_WHITESPACE]u/2u)
 .          \}
@@ -4905,11 +5062,19 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    EPI_TEXT
 .    br
 .    ie \\n[#START] \{\
-.       if \\n[#EPI_WHITESPACE]<\\n[#DOC_LEAD] \{\
-.          ALD \\n[#EPI_WHITESPACE]u/2u
+.       if \\n[#PRINT_STYLE]=1 \{\
+.          ie \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \}
+.          el \{\
+.             if \\n[#EPI_WHITESPACE]=\\n[#DOC_LEAD] \{ .ALD \\n[#DOC_LEAD]u/2u \}
+.          \}
 .       \}
-.       if \\n[#EPI_WHITESPACE]>\\n[#DOC_LEAD] \{\
-.          ALD (\\n[#EPI_WHITESPACE]u/2u)-\\n[#DOC_LEAD]u
+.       if \\n[#PRINT_STYLE]=2 \{\
+.          if \\n[#EPI_WHITESPACE]<\\n[#DOC_LEAD] \{\
+.             ALD \\n[#EPI_WHITESPACE]u/2u
+.          \}
+.          if \\n[#EPI_WHITESPACE]>\\n[#DOC_LEAD] \{\
+.             ALD (\\n[#EPI_WHITESPACE]u/2u)-\\n[#DOC_LEAD]u
+.          \}
 .       \}
 .    \}
 .    el \{\
@@ -6382,7 +6547,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    if r#EPIGRAPH          \{ .rr #EPIGRAPH \}
 .    if \\n[#PRINT_STYLE]=1 \{ .ne 3 \}
 .    if \\n[#PRINT_STYLE]=2 \{\
-.        ie \\n[#HEAD_SPACE] \{ .ne 5 \}
+.        ie \\n[#HEAD_SPACE] \{ .ne 4 \}
 .        el \{ .ne 3 \}
 .    \}
 .    ie \\n[#START] \{\
@@ -7492,9 +7657,13 @@ y\\R'#DESCENDER \\n[.cdp]'
 .                ie \\n[#START] \{ . \}
 .                el \{\
 .                   ie \\n[#FULLSPACE_QUOTES] \{\
-.                      ALD \\n[#DOC_LEAD]u
+.                      ie \\n[#ENDNOTE] \{ .ALD \\n[#EN_LEAD]u \}
+.                      el \{ .ALD \\n[#DOC_LEAD]u \}
+.                   \}
+.                   el \{\
+.                      ie \\n[#ENDNOTE] \{ .ALD \\n[#EN_LEAD]u/2u \}
+.                      el \{ .ALD \\n[#DOC_LEAD]u/2u \}
 .                   \}
-.                   el \{ .ALD \\n[#DOC_LEAD]u/2u \}
 .                \}
 .             \}
 .          \}
@@ -7503,7 +7672,10 @@ y\\R'#DESCENDER \\n[.cdp]'
 .             ie r#HEAD \{\
 .                if \\n[#HEAD]=1 \{ . \}
 .             \}
-.             el \{ .ALD \\n[#EN_LEAD]u \}
+.             el \{\
+.                ie \\n[#ENDNOTE] \{ .ALD \\n[#EN_LEAD]u \}
+.                el \{ .ALD \\n[#DOC_LEAD]u \}
+.             \}
 .          \}
 .       \}
 .    \}
diff --git a/contrib/groff/contrib/pic2graph/pic2graph.sh b/contrib/groff/contrib/pic2graph/pic2graph.sh
index 41b17f3..f447851 100644
--- a/contrib/groff/contrib/pic2graph/pic2graph.sh
+++ b/contrib/groff/contrib/pic2graph/pic2graph.sh
@@ -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.2 2002/07/17 04:55:46 wlemb Exp $
+# $Id: pic2graph.sh,v 1.3 2002/12/21 08:32:56 wlemb Exp $
 #
 groffpic_opts=""
 gs_opts=""
@@ -44,7 +44,7 @@ while [ "$1" ]
 do
     case $1 in
     -unsafe)
-	groffpic_opts="-U"
+	groffpic_opts="-U";;
     -format)
 	format=$2
 	shift;;
diff --git a/contrib/groff/doc/Makefile.in b/contrib/groff/doc/Makefile.in
index 97f75f9..313889d 100644
--- a/contrib/groff/doc/Makefile.in
+++ b/contrib/groff/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
 # 
 # This file is part of groff.
@@ -32,7 +32,12 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH=@srcdir@
 top_builddir=@groff_top_builddir@
+pnmtops=@pnmtops_nosetpage@
 
+# These may be overridden if cross-compiling.
+TROFFBIN=$(top_builddir)/src/roff/troff/troff
+GROFFBIN=$(top_builddir)/src/roff/groff/groff
+GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
 
 # Since info files are distributed within the groff package, no
 # autoconf test for the makeinfo binary is done.
@@ -58,7 +63,6 @@ groff_bin_dirs=\
   $(top_builddir)/src/devices/grolj4 \
   $(top_builddir)/src/devices/grolbp \
   $(top_builddir)/src/devices/grohtml
-groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
 
 version=`cat $(top_srcdir)/VERSION`
 # No additional number if revision is zero.
@@ -67,13 +71,13 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
 TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
 
-TROFF=$(top_builddir)/src/roff/troff/troff $(TFLAG) $(FFLAG) -ww
+TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww
 GROFF=GROFF_COMMAND_PREFIX=''; \
       export GROFF_COMMAND_PREFIX; \
-      GROFF_BIN_PATH=$(groff_bin_path); \
+      GROFF_BIN_PATH=$(GROFF_BIN_PATH); \
       export GROFF_BIN_PATH; \
       sed -e "s;@VERSION@;$(version)$(revision);" $< \
-      | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww
+      | $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
 
 imagedir=img
 
@@ -110,7 +114,7 @@ groff: groff.texinfo
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo
 
 gnu.eps: gnu.xpm
-	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtops -noturn >$@
+	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | $(pnmtops) -noturn >$@
 gnu.png: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
 
diff --git a/contrib/groff/doc/Makefile.sub b/contrib/groff/doc/Makefile.sub
index c72293f..b0111c6 100644
--- a/contrib/groff/doc/Makefile.sub
+++ b/contrib/groff/doc/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
 # 
 # This file is part of groff.
@@ -17,6 +17,10 @@
 # with groff; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# These may be overridden if cross-compiling.
+GROFFBIN=$(top_builddir)/src/roff/groff/groff
+GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
+
 # Since info files are distributed within the groff package, no
 # autoconf test for the makeinfo binary is done.
 MAKEINFO=makeinfo
@@ -33,7 +37,6 @@ groff_bin_dirs=\
   $(top_builddir)/src/preproc/html \
   $(top_builddir)/src/devices/grops \
   $(top_builddir)/src/devices/grohtml
-groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
 
 FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
 TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
@@ -41,10 +44,10 @@ TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
 GROFF=\
   GROFF_COMMAND_PREFIX=''; \
   export GROFF_COMMAND_PREFIX; \
-  GROFF_BIN_PATH=$(groff_bin_path); \
+  GROFF_BIN_PATH=$(GROFF_BIN_PATH); \
   export GROFF_BIN_PATH; \
   sed -e "s;@VERSION@;$(version)$(revision);" $< \
-  | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww
+  | $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
 
 DOCFILES=\
   meref.me \
@@ -122,7 +125,8 @@ groff: groff.texinfo
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo
 
 gnu.eps: gnu.xpm
-	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtops -noturn -rle >$@
+	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | \
+          $(pnmtops_nosetpage) -noturn -rle >$@
 gnu.png: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
 
diff --git a/contrib/groff/doc/groff b/contrib/groff/doc/groff
index 190fc84..c0cdcb5 100644
--- a/contrib/groff/doc/groff
+++ b/contrib/groff/doc/groff
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,282 +17,285 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
 Indirect:
-groff-1: 1001
-groff-2: 48538
-groff-3: 97766
-groff-4: 140652
-groff-5: 187441
-groff-6: 231433
-groff-7: 275695
-groff-8: 325582
-groff-9: 372274
-groff-10: 420373
-groff-11: 430355
+groff-1: 1006
+groff-2: 48734
+groff-3: 96786
+groff-4: 143635
+groff-5: 193057
+groff-6: 242522
+groff-7: 290092
+groff-8: 338472
+groff-9: 384440
+groff-10: 430986
+groff-11: 456663
 
 Tag Table:
 (Indirect)
-Node: Top1001
-Node: Introduction2290
-Node: What Is groff?2764
-Node: What Is groff?-Footnotes4270
-Ref: What Is groff?-Footnote-14339
-Node: History4376
-Node: groff Capabilities9327
-Node: Macro Package Intro10513
-Node: Preprocessor Intro11135
-Node: Output device intro12631
-Node: Credits13095
-Node: Invoking groff13599
-Node: Groff Options14876
-Node: Environment24383
-Node: Macro Directories26210
-Node: Font Directories27532
-Node: Invocation Examples29179
-Node: Invocation Examples-Footnotes30377
-Ref: Invocation Examples-Footnote-130456
-Node: grog30689
-Node: Tutorial for Macro Users31958
-Node: Basics32378
-Node: Basics-Footnotes37183
-Ref: Basics-Footnote-137236
-Ref: Basics-Footnote-237330
-Node: Common Features37444
-Node: Paragraphs38230
-Node: Sections and Chapters39728
-Node: Headers and Footers40219
-Node: Page Layout Adjustment41092
-Node: Displays41359
-Node: Footnotes and Annotations42617
-Node: Table of Contents43276
-Node: Indices43790
-Node: Paper Formats44192
-Node: Multiple Columns44565
-Node: Font and Size Changes44813
-Node: Predefined Strings45115
-Node: Preprocessor Support45451
-Node: Configuration and Customization46005
-Node: Macro Packages46372
-Node: man46632
-Node: Man options47036
-Node: Man usage48538
-Node: Man font macros53889
-Node: Miscellaneous man macros55415
-Node: Predefined man strings56246
-Node: Preprocessors in man pages56721
-Node: mdoc57303
-Node: ms57472
-Node: ms Intro57948
-Node: General ms Structure58617
-Node: General ms Structure-Footnotes61058
-Ref: General ms Structure-Footnote-161139
-Node: ms Document Control Registers61185
-Node: ms Cover Page Macros64241
-Node: ms Body Text67159
-Node: Paragraphs in ms67628
-Node: Headings in ms69181
-Node: Highlighting in ms69967
-Node: Lists in ms72429
-Node: Indents in ms75662
-Node: Tabstops in ms76228
-Node: ms Displays and Keeps76625
-Node: ms Insertions80077
-Node: Example multi-page table81628
-Node: ms Footnotes82071
-Node: ms Page Layout82943
-Node: ms Headers and Footers83460
-Node: ms Margins84483
-Node: ms Multiple Columns84724
-Node: ms TOC85525
-Node: ms Strings and Special Characters88230
-Node: ms Strings and Special Characters-Footnotes90886
-Ref: ms Strings and Special Characters-Footnote-190993
-Node: Differences from AT&T ms91080
-Node: Missing ms Macros91379
-Node: Additional ms Macros92123
-Node: me93375
-Node: mm93533
-Node: gtroff Reference93680
-Node: Text94608
-Node: Filling and Adjusting95130
-Node: Hyphenation95843
-Node: Sentences96626
-Node: Tab Stops97766
-Node: Implicit Line Breaks98660
-Node: Input Conventions99647
-Node: Measurements100431
-Node: Measurements-Footnotes102638
-Ref: Measurements-Footnote-1102703
-Node: Default Units102775
-Node: Expressions103821
-Node: Identifiers106535
-Node: Embedded Commands110391
-Node: Requests111138
-Node: Request Arguments112726
-Node: Request Arguments-Footnotes115077
-Ref: Request Arguments-Footnote-1115152
-Ref: Request Arguments-Footnote-2115280
-Node: Macros115634
-Node: Escapes115991
-Node: Comments118872
-Node: Comments-Footnotes121447
-Ref: Comments-Footnote-1121504
-Node: Registers121603
-Node: Setting Registers122106
-Node: Interpolating Registers124388
-Node: Auto-increment125192
-Node: Assigning Formats126722
-Node: Built-in Registers129630
-Node: Manipulating Filling and Adjusting132879
-Node: Manipulating Hyphenation140652
-Node: Manipulating Hyphenation-Footnotes150959
-Ref: Manipulating Hyphenation-Footnote-1151048
-Node: Manipulating Spacing151123
-Node: Tabs and Fields154514
-Node: Tabs and Fields-Footnotes160646
-Ref: Tabs and Fields-Footnote-1160717
-Node: Leaders160795
-Node: Leaders-Footnotes162386
-Ref: Leaders-Footnote-1162441
-Node: Fields162522
-Node: Character Translations163938
-Node: Troff and Nroff Mode173148
-Node: Line Layout175133
-Node: Line Control181040
-Node: Page Layout183713
-Node: Page Control187441
-Node: Fonts190921
-Node: Changing Fonts191458
-Node: Font Families193243
-Node: Font Positions197760
-Node: Using Symbols200875
-Node: Using Symbols-Footnotes208965
-Ref: Using Symbols-Footnote-1209032
-Ref: Using Symbols-Footnote-2209485
-Ref: Using Symbols-Footnote-3209556
-Ref: Using Symbols-Footnote-4209795
-Node: Special Fonts209858
-Node: Artificial Fonts210962
-Node: Ligatures and Kerning216170
-Node: Sizes221992
-Node: Sizes-Footnotes222809
-Ref: Sizes-Footnote-1222860
-Node: Changing Type Sizes223272
-Node: Fractional Type Sizes228416
-Node: Strings231433
-Node: Conditionals and Loops239418
-Node: Operators in Conditionals239635
-Node: Operators in Conditionals-Footnotes242271
-Ref: Operators in Conditionals-Footnote-1242362
-Ref: Operators in Conditionals-Footnote-2242441
-Node: if-else242540
-Node: while244074
-Node: Writing Macros246447
-Node: Copy-in Mode250343
-Node: Parameters251226
-Node: Page Motions253341
-Node: Drawing Requests260414
-Node: Traps268264
-Node: Page Location Traps268869
-Node: Diversion Traps273301
-Node: Input Line Traps273775
-Node: Blank Line Traps274765
-Node: End-of-input Traps275037
-Node: Diversions275695
-Node: Environments282393
-Node: Suppressing output286006
-Node: Colors287820
-Node: I/O290802
-Node: Postprocessor Access298807
-Node: Miscellaneous300362
-Node: Miscellaneous-Footnotes305422
-Ref: Miscellaneous-Footnote-1305489
-Node: Gtroff Internals305559
-Node: Gtroff Internals-Footnotes309281
-Ref: Gtroff Internals-Footnote-1309354
-Node: Debugging309488
-Node: Warnings315098
-Node: Warnings-Footnotes318024
-Ref: Warnings-Footnote-1318081
-Node: Implementation Differences318202
-Node: Implementation Differences-Footnotes322826
-Ref: Implementation Differences-Footnote-1322919
-Node: Preprocessors323054
-Node: geqn323355
-Node: Invoking geqn323481
-Node: gtbl323575
-Node: Invoking gtbl323692
-Node: gpic323786
-Node: Invoking gpic323903
-Node: ggrn323997
-Node: Invoking ggrn324114
-Node: grap324208
-Node: grefer324479
-Node: Invoking grefer324607
-Node: gsoelim324711
-Node: Invoking gsoelim324829
-Node: Output Devices324938
-Node: Special Characters325173
-Node: grotty325337
-Node: Invoking grotty325478
-Node: grops325582
-Node: Invoking grops325733
-Node: Embedding PostScript325861
-Node: grodvi325983
-Node: Invoking grodvi326112
-Node: grolj4326216
-Node: Invoking grolj4326346
-Node: grolbp326450
-Node: Invoking grolbp326581
-Node: grohtml326685
-Node: Invoking grohtml326865
-Node: grohtml specific registers and strings327021
-Node: gxditview327884
-Node: Invoking gxditview328012
-Node: File formats328131
-Node: gtroff Output328401
-Node: gtroff Output-Footnotes330237
-Ref: gtroff Output-Footnote-1330304
-Node: Language Concepts330438
-Node: Separation331175
-Node: Argument Units333413
-Node: Document Parts334553
-Node: Command Reference335942
-Node: Comment Command336344
-Node: Simple Commands336821
-Node: Simple Commands-Footnotes342728
-Ref: Simple Commands-Footnote-1342799
-Node: Graphics Commands342860
-Node: Device Control Commands350194
-Node: Obsolete Command354229
-Node: Intermediate Output Examples355497
-Node: Output Language Compatibility358310
-Node: Font Files360357
-Node: Font Files-Footnotes360966
-Ref: Font Files-Footnote-1361027
-Node: DESC File Format361088
-Node: Font File Format365330
-Node: Font File Format-Footnotes371553
-Ref: Font File Format-Footnote-1371626
-Ref: Font File Format-Footnote-2371717
-Node: Installation371936
-Node: Copying This Manual372058
-Node: GNU Free Documentation License372274
-Node: Request Index392134
-Node: Escape Index401929
-Node: Operator Index406157
-Node: Register Index407262
-Node: Macro Index414789
-Node: String Index420373
-Node: Glyph Name Index424697
-Node: Font File Keyword Index424983
-Node: Program and File Index427384
-Node: Concept Index430355
+Node: Top1006
+Node: Introduction2301
+Node: What Is groff?2775
+Node: What Is groff?-Footnotes4281
+Ref: What Is groff?-Footnote-14350
+Node: History4387
+Node: groff Capabilities9338
+Node: Macro Package Intro10524
+Node: Preprocessor Intro11147
+Node: Output device intro12643
+Node: Credits13107
+Node: Invoking groff13611
+Node: Groff Options14903
+Node: Environment24409
+Node: Macro Directories26236
+Node: Font Directories27562
+Node: Paper Size29204
+Node: Invocation Examples30549
+Node: Invocation Examples-Footnotes31741
+Ref: Invocation Examples-Footnote-131820
+Node: grog32053
+Node: Tutorial for Macro Users33322
+Node: Basics33742
+Node: Basics-Footnotes38557
+Ref: Basics-Footnote-138610
+Ref: Basics-Footnote-238704
+Node: Common Features38818
+Node: Paragraphs39604
+Node: Sections and Chapters41102
+Node: Headers and Footers41593
+Node: Page Layout Adjustment42466
+Node: Displays42733
+Node: Footnotes and Annotations43991
+Node: Table of Contents44650
+Node: Indices45164
+Node: Paper Formats45566
+Node: Multiple Columns45939
+Node: Font and Size Changes46187
+Node: Predefined Strings46489
+Node: Preprocessor Support46825
+Node: Configuration and Customization47379
+Node: Macro Packages47746
+Node: man48302
+Node: Man options48734
+Node: Man usage51159
+Node: Man font macros57184
+Node: Miscellaneous man macros58997
+Node: Predefined man strings60715
+Node: Preprocessors in man pages61267
+Node: Optional man extensions61881
+Node: mdoc65860
+Node: ms66029
+Node: ms Intro66505
+Node: General ms Structure67174
+Node: General ms Structure-Footnotes69615
+Ref: General ms Structure-Footnote-169696
+Node: ms Document Control Registers69742
+Node: ms Cover Page Macros72798
+Node: ms Body Text75716
+Node: Paragraphs in ms76185
+Node: Headings in ms77738
+Node: Highlighting in ms78524
+Node: Lists in ms80986
+Node: Indents in ms84219
+Node: Tabstops in ms84785
+Node: ms Displays and Keeps85182
+Node: ms Insertions88634
+Node: Example multi-page table90185
+Node: ms Footnotes90628
+Node: ms Page Layout91500
+Node: ms Headers and Footers92017
+Node: ms Margins93040
+Node: ms Multiple Columns93281
+Node: ms TOC94082
+Node: ms Strings and Special Characters96786
+Node: ms Strings and Special Characters-Footnotes99442
+Ref: ms Strings and Special Characters-Footnote-199549
+Node: Differences from AT&T ms99636
+Node: Missing ms Macros99935
+Node: Additional ms Macros100679
+Node: me101931
+Node: mm102089
+Node: gtroff Reference102236
+Node: Text103154
+Node: Filling and Adjusting103713
+Node: Hyphenation104426
+Node: Sentences105209
+Node: Tab Stops106349
+Node: Implicit Line Breaks107243
+Node: Input Conventions108256
+Node: Input Encodings109047
+Node: Measurements111008
+Node: Measurements-Footnotes113202
+Ref: Measurements-Footnote-1113267
+Node: Default Units113339
+Node: Expressions114385
+Node: Identifiers117109
+Node: Embedded Commands120965
+Node: Requests121712
+Node: Request and Macro Arguments123310
+Node: Request and Macro Arguments-Footnotes125787
+Ref: Request and Macro Arguments-Footnote-1125882
+Ref: Request and Macro Arguments-Footnote-2126010
+Node: Macros126364
+Node: Escapes126741
+Node: Comments129622
+Node: Comments-Footnotes132202
+Ref: Comments-Footnote-1132259
+Node: Registers132358
+Node: Setting Registers132861
+Node: Interpolating Registers135143
+Node: Auto-increment135948
+Node: Assigning Formats137478
+Node: Built-in Registers140386
+Node: Manipulating Filling and Adjusting143635
+Node: Manipulating Hyphenation152167
+Node: Manipulating Hyphenation-Footnotes162506
+Ref: Manipulating Hyphenation-Footnote-1162595
+Node: Manipulating Spacing162670
+Node: Tabs and Fields166677
+Node: Tabs and Fields-Footnotes172663
+Ref: Tabs and Fields-Footnote-1172734
+Node: Leaders172812
+Node: Leaders-Footnotes174403
+Ref: Leaders-Footnote-1174458
+Node: Fields174539
+Node: Character Translations175955
+Node: Troff and Nroff Mode185165
+Node: Line Layout187150
+Node: Line Control193057
+Node: Page Layout195730
+Node: Page Control199458
+Node: Fonts and Symbols203051
+Node: Changing Fonts203624
+Node: Font Families205433
+Node: Font Positions209962
+Node: Using Symbols213089
+Node: Using Symbols-Footnotes227673
+Ref: Using Symbols-Footnote-1227740
+Ref: Using Symbols-Footnote-2228193
+Ref: Using Symbols-Footnote-3228264
+Ref: Using Symbols-Footnote-4228503
+Node: Special Fonts228566
+Node: Artificial Fonts229738
+Node: Ligatures and Kerning235224
+Node: Sizes241230
+Node: Sizes-Footnotes242059
+Ref: Sizes-Footnote-1242110
+Node: Changing Type Sizes242522
+Node: Fractional Type Sizes247658
+Node: Strings250675
+Node: Conditionals and Loops258670
+Node: Operators in Conditionals258887
+Node: Operators in Conditionals-Footnotes261523
+Ref: Operators in Conditionals-Footnote-1261614
+Ref: Operators in Conditionals-Footnote-2261693
+Node: if-else261792
+Node: while263326
+Node: Writing Macros265699
+Node: Copy-in Mode269622
+Node: Parameters270505
+Node: Page Motions272640
+Node: Drawing Requests279907
+Node: Traps289487
+Node: Page Location Traps290092
+Node: Diversion Traps295934
+Node: Input Line Traps296407
+Node: Blank Line Traps297420
+Node: End-of-input Traps297692
+Node: Diversions298350
+Node: Environments305308
+Node: Suppressing output309178
+Node: Colors310992
+Node: I/O313974
+Node: Postprocessor Access321986
+Node: Miscellaneous323541
+Node: Miscellaneous-Footnotes328601
+Ref: Miscellaneous-Footnote-1328668
+Node: Gtroff Internals328738
+Node: Gtroff Internals-Footnotes332460
+Ref: Gtroff Internals-Footnote-1332533
+Node: Debugging332667
+Node: Warnings338472
+Node: Warnings-Footnotes341398
+Ref: Warnings-Footnote-1341455
+Node: Implementation Differences341576
+Node: Implementation Differences-Footnotes346197
+Ref: Implementation Differences-Footnote-1346290
+Node: Preprocessors346425
+Node: geqn346726
+Node: Invoking geqn346852
+Node: gtbl346946
+Node: Invoking gtbl347063
+Node: gpic347157
+Node: Invoking gpic347274
+Node: ggrn347368
+Node: Invoking ggrn347485
+Node: grap347579
+Node: grefer347850
+Node: Invoking grefer347978
+Node: gsoelim348082
+Node: Invoking gsoelim348200
+Node: Output Devices348309
+Node: Special Characters348544
+Node: grotty348708
+Node: Invoking grotty348849
+Node: grops348953
+Node: Invoking grops349104
+Node: Embedding PostScript349232
+Node: grodvi349354
+Node: Invoking grodvi349483
+Node: grolj4349587
+Node: Invoking grolj4349717
+Node: grolbp349821
+Node: Invoking grolbp349952
+Node: grohtml350056
+Node: Invoking grohtml350236
+Node: grohtml specific registers and strings350392
+Node: gxditview351255
+Node: Invoking gxditview351383
+Node: File formats351502
+Node: gtroff Output351772
+Node: gtroff Output-Footnotes353608
+Ref: gtroff Output-Footnote-1353675
+Node: Language Concepts353810
+Node: Separation354547
+Node: Argument Units356785
+Node: Document Parts357925
+Node: Command Reference359314
+Node: Comment Command359716
+Node: Simple Commands360193
+Node: Simple Commands-Footnotes366102
+Ref: Simple Commands-Footnote-1366173
+Node: Graphics Commands366234
+Node: Device Control Commands373543
+Node: Obsolete Command377579
+Node: Intermediate Output Examples378848
+Node: Output Language Compatibility381662
+Node: Font Files383709
+Node: Font Files-Footnotes384318
+Ref: Font Files-Footnote-1384379
+Node: DESC File Format384440
+Node: Font File Format388830
+Node: Font File Format-Footnotes395053
+Ref: Font File Format-Footnote-1395126
+Ref: Font File Format-Footnote-2395217
+Node: Installation395436
+Node: Copying This Manual395558
+Node: GNU Free Documentation License395774
+Node: Request Index415634
+Node: Escape Index425653
+Node: Operator Index429881
+Node: Register Index430986
+Node: Macro Index438803
+Node: String Index445907
+Node: Glyph Name Index450296
+Node: Font File Keyword Index450582
+Node: Program and File Index452983
+Node: Concept Index456663
 
 End Tag Table
diff --git a/contrib/groff/doc/groff-1 b/contrib/groff/doc/groff-1
index 0f13ab3..948cc6a 100644
--- a/contrib/groff/doc/groff-1
+++ b/contrib/groff/doc/groff-1
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,7 +17,7 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
@@ -27,9 +28,10 @@ File: groff,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 GNU troff
 *********
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -292,7 +294,7 @@ Macro Packages
    Since `groff' provides such low-level facilities, it can be quite
 difficult to use by itself.  However, `groff' provides a "macro"
 facility to specify how certain routine operations (e.g. starting
-paragraphs, printing headers and footers, etc.) should be done.  These
+paragraphs, printing headers and footers, etc.)  should be done.  These
 macros can be collected together into a "macro package".  There are a
 number of macro packages available; the most common (and the ones
 described in this manual) are `man', `mdoc', `me', `ms', and `mm'.
@@ -390,6 +392,7 @@ called AT&T `troff' which is the common origin of all `troff' derivates
 * Environment::
 * Macro Directories::
 * Font Directories::
+* Paper Size::
 * Invocation Examples::
 
 
@@ -665,7 +668,7 @@ to format a file.
 `-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
+     `gtroff' numeric expression.  All register assignments happen
      before loading any macro file (including the start-up file).
 
 `-FDIR'
@@ -764,14 +767,14 @@ files are (in that order):
 
           /usr/local/lib/groff/site-tmac
           /usr/local/share/groff/site-tmac
-          /usr/local/share/groff/1.18/tmac
+          /usr/local/share/groff/1.18.2/tmac
 
-     assuming that the version of `groff' is 1.18, 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.18.2, and the
+     installation prefix was `/usr/local'.  It is possible to fine-tune
+     those directories during the installation process.
 
 
-File: groff,  Node: Font Directories,  Next: Invocation Examples,  Prev: Macro Directories,  Up: Invoking groff
+File: groff,  Node: Font Directories,  Next: Paper Size,  Prev: Macro Directories,  Up: Invoking groff
 
 Font Directories
 ================
@@ -805,14 +808,47 @@ files for `grodvi' must be in `/foo/bar/devdvi'.
 
 
           /usr/local/share/groff/site-font
-          /usr/local/share/groff/1.18/font
+          /usr/local/share/groff/1.18.2/font
 
-     assuming that the version of `groff' is 1.18, 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.18.2, and the
+     installation prefix was `/usr/local'.  It is possible to fine-tune
+     those directories during the installation process.
 
 
-File: groff,  Node: Invocation Examples,  Prev: Font Directories,  Up: Invoking groff
+File: groff,  Node: Paper Size,  Next: Invocation Examples,  Prev: Font Directories,  Up: Invoking groff
+
+Paper Size
+==========
+
+   In groff, the page size for `gtroff' and for output devices are
+handled separately.  *Note Page Layout::, for vertical manipulation of
+the page size.  *Note Line Layout::, for horizontal changes.
+
+   A default paper size can be set in the device's `DESC' file.  Most
+output devices also have a command line option `-p' to override the
+default paper size and option `-l' to use landscape orientation.  *Note
+DESC File Format::, for a description of the `papersize' keyword which
+takes the same argument as `-p'.
+
+   A convenient shorthand to set a particular paper size for `gtroff'
+is command line option `-dpaper=SIZE'.  This defines string `paper'
+which is processed in file `papersize.tmac' (loaded in the start-up
+file `troffrc' by default).  Possible values for SIZE are the same as
+the predefined values for the `papersize' keyword (but only in
+lowercase) except `a7'-`d7'.  An appended `l' (ell) character denotes
+landscape orientation.
+
+   For example, use the following for PS output on A4 paper in landscape
+orientation:
+
+
+     groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+
+   Note that it is up to the particular macro package to respect default
+page dimensions set in this way (most do).
+
+
+File: groff,  Node: Invocation Examples,  Prev: Paper Size,  Up: Invoking groff
 
 Invocation Examples
 ===================
@@ -946,7 +982,7 @@ spaces one line, but
 spaces four lines.  The number 4 is an argument to the `sp' request
 which says to space four lines instead of one.  Arguments are separated
 from the request and from each other by spaces (_no_ tabs).  More
-details on this can be found in *Note Request Arguments::.
+details on this can be found in *Note Request and Macro Arguments::.
 
    The primary function of `gtroff' is to collect words from input
 lines, fill output lines with those words, justify the right-hand margin
@@ -1307,6 +1343,18 @@ Macro Packages
    This chapter documents the main macro packages that come with
 `groff'.
 
+   Different main macro packages can't be used at the same time; for
+example
+
+
+     groff -m man foo.man -m ms bar.doc
+
+doesn't work.  Note that option arguments are processed before
+non-option arguments; the above (failing) sample is thus reordered to
+
+
+     groff -m man -m ms foo.man bar.doc
+
 * Menu:
 
 * man::
@@ -1333,54 +1381,5 @@ pages are based on it.
 * Miscellaneous man macros::
 * Predefined man strings::
 * Preprocessors in man pages::
-
-
-File: groff,  Node: Man options,  Next: Man usage,  Prev: man,  Up: man
-
-Options
--------
-
-   The command line format for using the `man' macros with `groff' is:
-
-
-     groff -m man [ -rLL=LENGTH ] [ -rLT=LENGTH ]
-           [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rPNNN ]
-           [ -rSXX ] [ -rXNNN ] [ FILES... ]
-
-It is possible to use `-man' instead of `-m man'.
-
-`-rLL=LENGTH'
-     Set line length to LENGTH.  If not specified, the line length
-     defaults to 78 en in nroff mode (this is 78 characters per line)
-     and 6.5 inch otherwise.
-
-`-rLT=LENGTH'
-     Set title length to LENGTH.  If not specified, the title length
-     defaults to 78 en in nroff mode (this is 78 characters per line)
-     and 6.5 inch otherwise.
-
-`-rcR=1'
-     This option (the default if a TTY output device is used) creates a
-     single, very long page instead of multiple pages.  Use `-rcR=0' to
-     disable it.
-
-`-rC1'
-     If more than one manual page is given on the command line, number
-     the pages continuously, rather than starting each at 1.
-
-`-rD1'
-     Double-sided printing.  Footers for even and odd pages are
-     formatted differently.
-
-`-rPNNN'
-     Page numbering starts with NNN rather than with 1.
-
-`-rSXX'
-     Use XX (which can be 10, 11, or 12pt) as the base document font
-     size instead of the default value of 10pt.
-
-`-rXNNN'
-     After page NNN, number pages as NNNa, NNNb, NNNc, etc.  For
-     example, the option `-rX2' produces the following page numbers: 1,
-     2, 2a, 2b, 2c, etc.
+* Optional man extensions::
 
diff --git a/contrib/groff/doc/groff-10 b/contrib/groff/doc/groff-10
index 85971cf..c4a7d74 100644
--- a/contrib/groff/doc/groff-10
+++ b/contrib/groff/doc/groff-10
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,275 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Register Index,  Next: Macro Index,  Prev: Operator Index,  Up: Top
+
+Register Index
+**************
+
+   The macro package or program a specific register belongs to is
+appended in brackets.
+
+   A register name `x' consisting of exactly one character can be
+accessed as `\nx'.  A register name `xx' consisting of exactly two
+characters can be accessed as `\n(xx'.  Register names `xxx' of any
+length can be accessed as `\n[xxx]'.
+
+* Menu:
+
+* $$:                                    Built-in Registers.
+* %:                                     Page Layout.
+* .$:                                    Parameters.
+* .a:                                    Manipulating Spacing.
+* .A:                                    Built-in Registers.
+* .b:                                    Artificial Fonts.
+* .C:                                    Implementation Differences.
+* .c:                                    Built-in Registers.
+* .cdp:                                  Environments.
+* .ce:                                   Manipulating Filling and Adjusting.
+* .cht:                                  Environments.
+* .color:                                Colors.
+* .csk:                                  Environments.
+* .d:                                    Diversions.
+* .ev:                                   Environments.
+* .f:                                    Font Positions.
+* .F:                                    Built-in Registers.
+* .fam:                                  Font Families.
+* .fn:                                   Font Families.
+* .fp:                                   Font Positions.
+* .g:                                    Built-in Registers.
+* .h:                                    Diversions.
+* .H:                                    Built-in Registers.
+* .height:                               Artificial Fonts.
+* .hla:                                  Manipulating Hyphenation.
+* .hlc:                                  Manipulating Hyphenation.
+* .hlm:                                  Manipulating Hyphenation.
+* .hy:                                   Manipulating Hyphenation.
+* .hym:                                  Manipulating Hyphenation.
+* .hys:                                  Manipulating Hyphenation.
+* .i:                                    Line Layout.
+* .in:                                   Line Layout.
+* .int:                                  Line Control.
+* .j:                                    Manipulating Filling and Adjusting.
+* .k:                                    Page Motions.
+* .kern:                                 Ligatures and Kerning.
+* .l:                                    Line Layout.
+* .L:                                    Manipulating Spacing.
+* .lg:                                   Ligatures and Kerning.
+* .linetabs:                             Tabs and Fields.
+* .ll:                                   Line Layout.
+* .lt:                                   Page Layout.
+* .n:                                    Environments.
+* .ne:                                   Page Location Traps.
+* .ns:                                   Manipulating Spacing.
+* .o:                                    Line Layout.
+* .p:                                    Page Layout.
+* .P:                                    Built-in Registers.
+* .pe:                                   Page Location Traps.
+* .pn:                                   Page Layout.
+* .ps:                                   Fractional Type Sizes.
+* .psr:                                  Fractional Type Sizes.
+* .pvs:                                  Changing Type Sizes.
+* .rj:                                   Manipulating Filling and Adjusting.
+* .s:                                    Changing Type Sizes.
+* .slant:                                Artificial Fonts.
+* .sr:                                   Fractional Type Sizes.
+* .ss:                                   Manipulating Filling and Adjusting.
+* .sss:                                  Manipulating Filling and Adjusting.
+* .t:                                    Page Location Traps.
+* .T:                                    Built-in Registers.
+* .tabs:                                 Tabs and Fields.
+* .trunc:                                Page Location Traps.
+* .u:                                    Manipulating Filling and Adjusting.
+* .v:                                    Changing Type Sizes.
+* .V:                                    Built-in Registers.
+* .vpt:                                  Page Location Traps.
+* .w:                                    Environments.
+* .warn:                                 Debugging.
+* .x:                                    Built-in Registers.
+* .Y:                                    Built-in Registers.
+* .y:                                    Built-in Registers.
+* .z:                                    Diversions.
+* c.:                                    Built-in Registers.
+* ct:                                    Page Motions.
+* dl:                                    Diversions.
+* dn:                                    Diversions.
+* dw:                                    Built-in Registers.
+* dy:                                    Built-in Registers.
+* FF [ms]:                               ms Document Control Registers.
+* FI [ms]:                               ms Document Control Registers.
+* FL [ms]:                               ms Document Control Registers.
+* FM [ms]:                               ms Document Control Registers.
+* HM [ms]:                               ms Document Control Registers.
+* hours:                                 Built-in Registers.
+* hp:                                    Page Motions.
+* LL [ms]:                               ms Document Control Registers.
+* llx:                                   Miscellaneous.
+* lly:                                   Miscellaneous.
+* ln:                                    Built-in Registers.
+* LT [ms]:                               ms Document Control Registers.
+* MINGW [ms] <1>:                        Additional ms Macros.
+* MINGW [ms]:                            ms Document Control Registers.
+* minutes:                               Built-in Registers.
+* mo:                                    Built-in Registers.
+* nl:                                    Page Control.
+* opmaxx:                                Suppressing output.
+* opmaxy:                                Suppressing output.
+* opminx:                                Suppressing output.
+* opminy:                                Suppressing output.
+* PD [ms]:                               ms Document Control Registers.
+* PI [ms]:                               ms Document Control Registers.
+* PO [ms]:                               ms Document Control Registers.
+* PS [ms]:                               ms Document Control Registers.
+* ps4html [grohtml]:                     grohtml specific registers and strings.
+* QI [ms]:                               ms Document Control Registers.
+* rsb:                                   Page Motions.
+* rst:                                   Page Motions.
+* sb:                                    Page Motions.
+* seconds:                               Built-in Registers.
+* skw:                                   Page Motions.
+* slimit:                                Debugging.
+* ssc:                                   Page Motions.
+* st:                                    Page Motions.
+* systat:                                I/O.
+* urx:                                   Miscellaneous.
+* ury:                                   Miscellaneous.
+* VS [ms]:                               ms Document Control Registers.
+* year:                                  Built-in Registers.
+* yr:                                    Built-in Registers.
+
+
+File: groff,  Node: Macro Index,  Next: String Index,  Prev: Register Index,  Up: Top
+
+Macro Index
+***********
+
+   The macro package a specific macro belongs to is appended in
+brackets.  They appear without the leading control character (normally
+`.').
+
+* Menu:
+
+* 1C [ms]:                               ms Multiple Columns.
+* 2C [ms]:                               ms Multiple Columns.
+* [ [ms]:                                ms Insertions.
+* ] [ms]:                                ms Insertions.
+* AB [ms]:                               ms Cover Page Macros.
+* AE [ms]:                               ms Cover Page Macros.
+* AI [ms]:                               ms Cover Page Macros.
+* AM [ms] <1>:                           Additional ms Macros.
+* AM [ms]:                               ms Strings and Special Characters.
+* AT [man]:                              Miscellaneous man macros.
+* AU [ms]:                               ms Cover Page Macros.
+* B [man]:                               Man font macros.
+* B [ms]:                                Highlighting in ms.
+* B1 [ms]:                               ms Displays and Keeps.
+* B2 [ms]:                               ms Displays and Keeps.
+* BD [ms]:                               ms Displays and Keeps.
+* BI [man]:                              Man font macros.
+* BI [ms]:                               Highlighting in ms.
+* BR [man]:                              Man font macros.
+* BT [man]:                              Optional man extensions.
+* BX [ms]:                               Highlighting in ms.
+* CD [ms]:                               ms Displays and Keeps.
+* CT [man]:                              Optional man extensions.
+* CW [man]:                              Optional man extensions.
+* CW [ms] <1>:                           Additional ms Macros.
+* CW [ms]:                               Highlighting in ms.
+* DA [ms]:                               ms Cover Page Macros.
+* De [man]:                              Optional man extensions.
+* DE [ms]:                               ms Displays and Keeps.
+* Ds [man]:                              Optional man extensions.
+* DS [ms] <1>:                           Additional ms Macros.
+* DS [ms]:                               ms Displays and Keeps.
+* DT [man]:                              Miscellaneous man macros.
+* EE [man]:                              Optional man extensions.
+* EF [ms]:                               ms Headers and Footers.
+* EH [ms]:                               ms Headers and Footers.
+* EN [ms]:                               ms Insertions.
+* EQ [ms]:                               ms Insertions.
+* EX [man]:                              Optional man extensions.
+* FE [ms]:                               ms Footnotes.
+* FS [ms]:                               ms Footnotes.
+* G [man]:                               Optional man extensions.
+* GL [man]:                              Optional man extensions.
+* HB [man]:                              Optional man extensions.
+* HP [man]:                              Man usage.
+* I [man]:                               Man font macros.
+* I [ms]:                                Highlighting in ms.
+* IB [man]:                              Man font macros.
+* ID [ms]:                               ms Displays and Keeps.
+* IP [man]:                              Man usage.
+* IP [ms]:                               Lists in ms.
+* IR [man]:                              Man font macros.
+* IX [ms]:                               Additional ms Macros.
+* KE [ms]:                               ms Displays and Keeps.
+* KF [ms]:                               ms Displays and Keeps.
+* KS [ms]:                               ms Displays and Keeps.
+* LD [ms]:                               ms Displays and Keeps.
+* LG [ms]:                               Highlighting in ms.
+* LP [man]:                              Man usage.
+* LP [ms]:                               Paragraphs in ms.
+* MC [ms]:                               ms Multiple Columns.
+* MS [man]:                              Optional man extensions.
+* ND [ms]:                               ms Cover Page Macros.
+* NE [man]:                              Optional man extensions.
+* NH [ms]:                               Headings in ms.
+* NL [ms]:                               Highlighting in ms.
+* NT [man]:                              Optional man extensions.
+* OF [ms]:                               ms Headers and Footers.
+* OH [ms]:                               ms Headers and Footers.
+* P [man]:                               Man usage.
+* PD [man]:                              Miscellaneous man macros.
+* PE [ms]:                               ms Insertions.
+* Pn [man]:                              Optional man extensions.
+* PN [man]:                              Optional man extensions.
+* PP [man]:                              Man usage.
+* PP [ms]:                               Paragraphs in ms.
+* PS [ms]:                               ms Insertions.
+* PT [man]:                              Optional man extensions.
+* PX [ms]:                               ms TOC.
+* QP [ms]:                               Paragraphs in ms.
+* R [man]:                               Optional man extensions.
+* R [ms]:                                Highlighting in ms.
+* RB [man]:                              Man font macros.
+* RD [ms]:                               ms Displays and Keeps.
+* RE [man]:                              Man usage.
+* RE [ms]:                               Indents in ms.
+* RI [man]:                              Man font macros.
+* RN [man]:                              Optional man extensions.
+* RP [ms]:                               ms Cover Page Macros.
+* RS [man]:                              Man usage.
+* RS [ms]:                               Indents in ms.
+* SB [man]:                              Man font macros.
+* SH [man]:                              Man usage.
+* SH [ms]:                               Headings in ms.
+* SM [man]:                              Man font macros.
+* SM [ms]:                               Highlighting in ms.
+* SS [man]:                              Man usage.
+* TA [ms]:                               Tabstops in ms.
+* TB [man]:                              Optional man extensions.
+* TC [ms]:                               ms TOC.
+* TE [ms]:                               ms Insertions.
+* TH [man]:                              Man usage.
+* TL [ms]:                               ms Cover Page Macros.
+* TP [man]:                              Man usage.
+* TS [ms]:                               ms Insertions.
+* UC [man]:                              Miscellaneous man macros.
+* UL [ms]:                               Highlighting in ms.
+* VE [man]:                              Optional man extensions.
+* VS [man]:                              Optional man extensions.
+* XA [ms]:                               ms TOC.
+* XE [ms]:                               ms TOC.
+* XP [ms]:                               Paragraphs in ms.
+* XS [ms]:                               ms TOC.
+
+
 File: groff,  Node: String Index,  Next: Glyph Name Index,  Prev: Macro Index,  Up: Top
 
 String Index
@@ -48,8 +312,8 @@ length can be accessed as `\*[xxx]'.
 * .T:                                    Built-in Registers.
 * 3 [ms]:                                ms Strings and Special Characters.
 * 8 [ms]:                                ms Strings and Special Characters.
-* <colon> [ms]:                          ms Strings and Special Characters.
 * ? [ms]:                                ms Strings and Special Characters.
+* \*[<colon>] [ms]:                      ms Strings and Special Characters.
 * ^ [ms]:                                ms Strings and Special Characters.
 * _ [ms]:                                ms Strings and Special Characters.
 * ` [ms]:                                ms Strings and Special Characters.
@@ -60,6 +324,7 @@ length can be accessed as `\*[xxx]'.
 * CH [ms]:                               ms Headers and Footers.
 * d- [ms]:                               ms Strings and Special Characters.
 * D- [ms]:                               ms Strings and Special Characters.
+* HF [man]:                              Predefined man strings.
 * LF [ms]:                               ms Headers and Footers.
 * LH [ms]:                               ms Headers and Footers.
 * lq [man]:                              Predefined man strings.
@@ -158,6 +423,8 @@ Program and File Index
 
 * an.tmac:                               man.
 * changebar:                             Miscellaneous.
+* composite.tmac:                        Using Symbols.
+* cp1047.tmac:                           Input Encodings.
 * DESC <1>:                              Special Fonts.
 * DESC <2>:                              Using Symbols.
 * DESC <3>:                              Font Positions.
@@ -167,7 +434,9 @@ Program and File Index
 * DESC, and font mounting:               Font Positions.
 * DESC, and use_charnames_in_special:    Postprocessor Access.
 * ditroff:                               History.
+* ec.tmac:                               Input Encodings.
 * eqn:                                   ms Insertions.
+* freeeuro.pfa:                          Input Encodings.
 * geqn:                                  Groff Options.
 * geqn, invocation in manual pages:      Preprocessors in man pages.
 * ggrn:                                  Groff Options.
@@ -183,12 +452,19 @@ Program and File Index
 * gtbl, invocation in manual pages:      Preprocessors in man pages.
 * gtroff:                                Groff Options.
 * hyphen.us:                             Manipulating Hyphenation.
+* hyphenex.us:                           Manipulating Hyphenation.
+* latin1.tmac:                           Input Encodings.
+* latin2.tmac:                           Input Encodings.
+* latin9.tmac:                           Input Encodings.
 * makeindex:                             Indices.
 * man, invocation of preprocessors:      Preprocessors in man pages.
 * man-old.tmac:                          man.
+* man.local <1>:                         Optional man extensions.
 * man.local:                             Man usage.
 * man.tmac:                              man.
+* man.ultrix:                            Optional man extensions.
 * nrchbar:                               Miscellaneous.
+* papersize.tmac:                        Paper Size.
 * perl:                                  I/O.
 * pic:                                   ms Insertions.
 * post-grohtml:                          Groff Options.
@@ -200,6 +476,7 @@ Program and File Index
 * troffrc <1>:                           Line Layout.
 * troffrc <2>:                           Troff and Nroff Mode.
 * troffrc <3>:                           Manipulating Hyphenation.
+* troffrc <4>:                           Paper Size.
 * troffrc:                               Groff Options.
 * troffrc-end <1>:                       Troff and Nroff Mode.
 * troffrc-end <2>:                       Manipulating Hyphenation.
diff --git a/contrib/groff/doc/groff-11 b/contrib/groff/doc/groff-11
index d1e4c43..d3050a1 100644
--- a/contrib/groff/doc/groff-11
+++ b/contrib/groff/doc/groff-11
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,7 +17,7 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
@@ -31,7 +32,7 @@ Concept Index
 
 * ", at end of sentence <1>:             Using Symbols.
 * ", at end of sentence:                 Sentences.
-* ", in a macro argument:                Request Arguments.
+* ", in a macro argument:                Request and Macro Arguments.
 * %, as delimiter:                       Escapes.
 * &, as delimiter:                       Escapes.
 * ', as a comment:                       Comments.
@@ -105,7 +106,7 @@ Concept Index
 * \<colon>, in \X:                       Postprocessor Access.
 * \<colon>, used as delimiter:           Escapes.
 * \<RET>, when reading text for a macro: Copy-in Mode.
-* \<SP>, difference to \~:               Request Arguments.
+* \<SP>, difference to \~:               Request and Macro Arguments.
 * \<SP>, incompatibilities with AT&T troff: Implementation Differences.
 * \<SP>, used as delimiter:              Escapes.
 * \?, in top-level diversion:            Diversions.
@@ -135,6 +136,7 @@ Concept Index
 * \C, and translations:                  Character Translations.
 * \c, incompatibilities with AT&T troff: Implementation Differences.
 * \c, used as delimiter:                 Escapes.
+* \D'f ...' and horizontal resolution:   Drawing Requests.
 * \D, allowed delimiters:                Escapes.
 * \d, used as delimiter:                 Escapes.
 * \e, and glyph definitions:             Using Symbols.
@@ -196,7 +198,7 @@ Concept Index
 * \}, incompatibilities with AT&T troff: Implementation Differences.
 * \}, used as delimiter:                 Escapes.
 * \~, and translations:                  Character Translations.
-* \~, difference to \<SP>:               Request Arguments.
+* \~, difference to \<SP>:               Request and Macro Arguments.
 * \~, used as delimiter:                 Escapes.
 * ], as part of an identifier:           Identifiers.
 * ], at end of sentence <1>:             Using Symbols.
@@ -217,6 +219,8 @@ Concept Index
 * adjusting:                             Filling and Adjusting.
 * adjusting and filling, manipulating:   Manipulating Filling and Adjusting.
 * adjustment mode register (.j):         Manipulating Filling and Adjusting.
+* adobe glyph list (AGL):                Using Symbols.
+* AGL (adobe glyph list):                Using Symbols.
 * alias, diversion, creating (als):      Strings.
 * alias, macro, creating (als):          Strings.
 * alias, number register, creating (aln): Setting Registers.
@@ -230,7 +234,7 @@ Concept Index
 * appending to a string (as):            Strings.
 * arc, drawing (\D'a ...'):              Drawing Requests.
 * argument delimiting characters:        Escapes.
-* arguments to requests:                 Request Arguments.
+* arguments to requests and macros:      Request and Macro Arguments.
 * arguments, macro (\$):                 Parameters.
 * arguments, of strings:                 Strings.
 * arithmetic operators:                  Expressions.
@@ -239,7 +243,7 @@ Concept Index
 * as, as1 requests, and warnings:        Warnings.
 * ASCII approximation output register (.A) <1>: Built-in Registers.
 * ASCII approximation output register (.A): Groff Options.
-* ASCII, encoding:                       Groff Options.
+* ASCII, output encoding:                Groff Options.
 * asciify request, and writem:           I/O.
 * assigning formats (af):                Assigning Formats.
 * assignments, indirect:                 Interpolating Registers.
@@ -276,7 +280,9 @@ Concept Index
 * bounding box:                          Miscellaneous.
 * box rule glyph (\[br]):                Drawing Requests.
 * box, boxa requests, and warnings:      Warnings.
+* boxa request, and dn (dl):             Diversions.
 * bp request, and top-level diversion:   Page Control.
+* bp request, and traps (.pe):           Page Location Traps.
 * bp request, causing implicit linebreak: Manipulating Filling and Adjusting.
 * bp request, using + and -:             Expressions.
 * br glyph, and cflags:                  Using Symbols.
@@ -319,6 +325,7 @@ Concept Index
 * character, control (.):                Requests.
 * character, control, changing (cc):     Character Translations.
 * character, defining (char):            Using Symbols.
+* character, defining fallback (fchar, fschar, schar): Using Symbols.
 * character, escape, changing (ec):      Character Translations.
 * character, escape, while defining glyph: Using Symbols.
 * character, field delimiting (fc):      Fields.
@@ -361,6 +368,7 @@ Concept Index
 * code, hyphenation (hcode):             Manipulating Hyphenation.
 * color, default:                        Colors.
 * colors:                                Colors.
+* colors, fill, unnamed (\D'F...'):      Drawing Requests.
 * command prefix:                        Environment.
 * command-line options:                  Groff Options.
 * commands, embedded:                    Embedded Commands.
@@ -373,6 +381,7 @@ Concept Index
 * comparison operators:                  Expressions.
 * compatibility mode <1>:                Implementation Differences.
 * compatibility mode:                    Warnings.
+* composite glyph names:                 Using Symbols.
 * conditional block, begin (\{):         if-else.
 * conditional block, end (\}):           if-else.
 * conditional page break (ne):           Page Control.
@@ -401,7 +410,8 @@ Concept Index
 * correction, left italic (\,):          Ligatures and Kerning.
 * cover page macros, [ms]:               ms Cover Page Macros.
 * cp request, and glyph definitions:     Using Symbols.
-* cp1047:                                Groff Options.
+* cp1047, input encoding:                Input Encodings.
+* cp1047, output encoding:               Groff Options.
 * creating alias, for diversion (als):   Strings.
 * creating alias, for macro (als):       Strings.
 * creating alias, for number register (aln): Setting Registers.
@@ -418,6 +428,7 @@ Concept Index
 * current time, hours (hours):           Built-in Registers.
 * current time, minutes (minutes):       Built-in Registers.
 * current time, seconds (seconds):       Built-in Registers.
+* da request, and dn (dl):               Diversions.
 * da request, and warnings:              Warnings.
 * date, day of the month register (dy):  Built-in Registers.
 * date, day of the week register (dw):   Built-in Registers.
@@ -433,13 +444,16 @@ Concept Index
 * default indentation, resetting [man]:  Man usage.
 * default units:                         Default Units.
 * defining character (char):             Using Symbols.
+* defining fallback character (fchar, fschar, schar): Using Symbols.
 * defining glyph (char):                 Using Symbols.
 * defining symbol (char):                Using Symbols.
 * delayed text:                          Footnotes and Annotations.
 * delimited arguments, incompatibilities with AT&T troff: Implementation Differences.
 * delimiting character, for fields (fc): Fields.
 * delimiting characters for arguments:   Escapes.
+* depth, of last glyph (.cdp):           Environments.
 * DESC file, format:                     DESC File Format.
+* device resolution:                     DESC File Format.
 * devices for output <1>:                Output Devices.
 * devices for output:                    Output device intro.
 * dg glyph, at end of sentence <1>:      Using Symbols.
@@ -459,6 +473,8 @@ Concept Index
 * directory, site-specific:              Macro Directories.
 * disabling \ (eo):                      Character Translations.
 * disabling hyphenation (\%):            Manipulating Hyphenation.
+* discardable horizontal space:          Manipulating Filling and Adjusting.
+* discarded space in traps:              Manipulating Spacing.
 * displays:                              Displays.
 * displays [ms]:                         ms Displays and Keeps.
 * distance to next trap register (.t):   Page Location Traps.
@@ -481,10 +497,13 @@ Concept Index
 * diversion, unformatting (asciify):     Diversions.
 * diversion, vertical position in, register (.d): Diversions.
 * diversions:                            Diversions.
+* diversions, and traps:                 Page Location Traps.
 * diversions, shared name space with macros and strings: Strings.
+* dl register, and da (boxa):            Diversions.
+* dn register, and da (boxa):            Diversions.
 * documents, multi-file:                 Debugging.
 * documents, structuring the source code: Requests.
-* double quote, in a macro argument:     Request Arguments.
+* double quote, in a macro argument:     Request and Macro Arguments.
 * double-spacing (ls) <1>:               Manipulating Spacing.
 * double-spacing (ls):                   Basics.
 * double-spacing (vs, pvs):              Changing Type Sizes.
@@ -501,17 +520,18 @@ Concept Index
 * drawing requests:                      Drawing Requests.
 * drawing vertical lines (\L):           Drawing Requests.
 * ds request, and comments:              Strings.
-* ds request, and double quotes:         Request Arguments.
+* ds request, and double quotes:         Request and Macro Arguments.
 * ds request, and leading spaces:        Strings.
 * ds, ds1 requests, and comments:        Comments.
 * ds, ds1 requests, and warnings:        Warnings.
 * dumping number registers (pnr):        Debugging.
 * dumping symbol table (pm):             Debugging.
 * dumping traps (ptr):                   Debugging.
-* EBCDIC encoding <1>:                   Tab Stops.
-* EBCDIC encoding:                       Groff Options.
+* EBCDIC encoding:                       Tab Stops.
 * EBCDIC encoding of a tab:              Tabs and Fields.
 * EBCDIC encoding of backspace:          Identifiers.
+* EBCDIC, input encoding:                Input Encodings.
+* EBCDIC, output encoding:               Groff Options.
 * el request, and warnings:              Warnings.
 * ellipse, drawing (\D'e ...'):          Drawing Requests.
 * ellipse, solid, drawing (\D'E ...'):   Drawing Requests.
@@ -525,12 +545,17 @@ Concept Index
 * empty space before a paragraph [man]:  Miscellaneous man macros.
 * en unit (n):                           Measurements.
 * enabling vertical position traps (vpt): Page Location Traps.
-* encoding, ASCII:                       Groff Options.
-* encoding, cp1047:                      Groff Options.
-* encoding, EBCDIC <1>:                  Tab Stops.
-* encoding, EBCDIC:                      Groff Options.
-* encoding, latin-1:                     Groff Options.
-* encoding, utf-8:                       Groff Options.
+* encoding, EBCDIC:                      Tab Stops.
+* encoding, input, cp1047:               Input Encodings.
+* encoding, input, EBCDIC:               Input Encodings.
+* encoding, input, latin-1 (ISO 8859-1): Input Encodings.
+* encoding, input, latin-2 (ISO 8859-2): Input Encodings.
+* encoding, input, latin-9 (latin-0, ISO 8859-15): Input Encodings.
+* encoding, output, ASCII:               Groff Options.
+* encoding, output, cp1047:              Groff Options.
+* encoding, output, EBCDIC:              Groff Options.
+* encoding, output, latin-1 (ISO 8859-1): Groff Options.
+* encoding, output, utf-8:               Groff Options.
 * end of conditional block (\}):         if-else.
 * end-of-input macro (em):               End-of-input Traps.
 * end-of-input trap, setting (em):       End-of-input Traps.
@@ -540,7 +565,8 @@ Concept Index
 * environment number/name register (.ev): Environments.
 * environment variables:                 Environment.
 * environment, copying (evc):            Environments.
-* environment, last glyph:               Environments.
+* environment, dimensions of last glyph (.w, .cht, .cdp, .csk): Environments.
+* environment, previous line length (.n): Environments.
 * environment, switching (ev):           Environments.
 * environments:                          Environments.
 * eqn, the program:                      geqn.
@@ -570,6 +596,8 @@ Concept Index
 * extremum operators (>?, <?):           Expressions.
 * f unit:                                Measurements.
 * f unit, and colors:                    Colors.
+* fallback character, defining (fchar, fschar, schar): Using Symbols.
+* fallback glyph, removing definition (rchar, rfschar): Using Symbols.
 * fam request, and changing fonts:       Changing Fonts.
 * fam request, and font positions:       Font Positions.
 * families, font:                        Font Families.
@@ -590,6 +618,7 @@ Concept Index
 * file, writing to (write):              I/O.
 * files, font:                           Font Files.
 * files, macro, searching:               Macro Directories.
+* fill colors, unnamed (\D'F...'):       Drawing Requests.
 * fill mode <1>:                         Warnings.
 * fill mode <2>:                         Manipulating Filling and Adjusting.
 * fill mode:                             Implicit Line Breaks.
@@ -622,7 +651,7 @@ Concept Index
 * font, mounting (fp):                   Font Positions.
 * font, previous (ft, \f[], \fP):        Changing Fonts.
 * fonts <1>:                             Changing Fonts.
-* fonts:                                 Fonts.
+* fonts:                                 Fonts and Symbols.
 * fonts, artificial:                     Artificial Fonts.
 * fonts, changing (ft, \f):              Changing Fonts.
 * fonts, PostScript:                     Font Families.
@@ -649,15 +678,18 @@ Concept Index
 * french-spacing:                        Sentences.
 * fspecial request, and font styles:     Font Families.
 * fspecial request, and font translations: Changing Fonts.
+* fspecial request, and glyph search order: Using Symbols.
 * fspecial request, and imitating bold:  Artificial Fonts.
 * ft request, and font translations:     Changing Fonts.
 * geqn, invoking:                        Invoking geqn.
 * geqn, the program:                     geqn.
+* GGL (groff glyph list):                Using Symbols.
 * ggrn, invoking:                        Invoking ggrn.
 * ggrn, the program:                     ggrn.
 * glossary-style list, example markup [ms]: Lists in ms.
 * glyph:                                 Using Symbols.
 * glyph for line drawing:                Drawing Requests.
+* glyph names, composite:                Using Symbols.
 * glyph pile (\b):                       Drawing Requests.
 * glyph properties (cflags):             Using Symbols.
 * glyph, box rule (\[br]):               Drawing Requests.
@@ -666,11 +698,12 @@ Concept Index
 * glyph, for line drawing:               Drawing Requests.
 * glyph, for margins (mc):               Miscellaneous.
 * glyph, italic correction (\/):         Ligatures and Kerning.
+* glyph, last, dimensions (.w, .cht, .cdp, .csk): Environments.
 * glyph, leader repetition (lc):         Leaders.
 * glyph, left italic correction (\,):    Ligatures and Kerning.
 * glyph, numbered (\N) <1>:              Using Symbols.
 * glyph, numbered (\N):                  Character Translations.
-* glyph, removing definition (rchar):    Using Symbols.
+* glyph, removing definition (rchar, rfschar): Using Symbols.
 * glyph, soft hyphen (hy):               Manipulating Hyphenation.
 * glyph, tab repetition (tc):            Tabs and Fields.
 * glyph, underscore (\[ru]):             Drawing Requests.
@@ -691,6 +724,7 @@ Concept Index
 * grodvi, the program:                   grodvi.
 * groff - what is it?:                   What Is groff?.
 * groff capabilities:                    groff Capabilities.
+* groff glyph list (GGL):                Using Symbols.
 * groff invocation:                      Invoking groff.
 * groff, and pi request:                 I/O.
 * GROFF_BIN_PATH, environment variable:  Environment.
@@ -730,14 +764,17 @@ Concept Index
 * headers:                               Page Layout.
 * headers [ms]:                          ms Headers and Footers.
 * height, font, changing (\H):           Artificial Fonts.
+* height, of last glyph (.cht):          Environments.
 * high-water mark register (.h):         Diversions.
 * history:                               History.
 * home directory:                        Macro Directories.
+* horizontal discardable space:          Manipulating Filling and Adjusting.
 * horizontal input line position register (hp): Page Motions.
 * horizontal input line position, saving (\k): Page Motions.
 * horizontal line, drawing (\l):         Drawing Requests.
 * horizontal motion (\h):                Page Motions.
 * horizontal output line position register (.k): Page Motions.
+* horizontal resolution:                 DESC File Format.
 * horizontal resolution register (.H):   Built-in Registers.
 * horizontal space (\h):                 Page Motions.
 * horizontal space, unformatting:        Strings.
@@ -762,7 +799,8 @@ Concept Index
 * hyphenation, manipulating:             Manipulating Hyphenation.
 * i unit:                                Measurements.
 * i/o:                                   I/O.
-* IBM cp1047:                            Groff Options.
+* IBM cp1047 input encoding:             Input Encodings.
+* IBM cp1047 output encoding:            Groff Options.
 * identifiers:                           Identifiers.
 * identifiers, undefined:                Identifiers.
 * ie request, and warnings:              Warnings.
@@ -788,6 +826,11 @@ Concept Index
 * input characters and output glyphs, compatibility with AT&T troff: Implementation Differences.
 * input characters, invalid:             Identifiers.
 * input conventions:                     Input Conventions.
+* input encoding, cp1047:                Input Encodings.
+* input encoding, EBCDIC:                Input Encodings.
+* input encoding, latin-1 (ISO 8859-1):  Input Encodings.
+* input encoding, latin-2 (ISO 8859-2):  Input Encodings.
+* input encoding, latin-9 (latin-9, ISO 8859-15): Input Encodings.
 * input file name, current, register (.F): Built-in Registers.
 * input level in delimited arguments:    Implementation Differences.
 * input line continuation (\):           Line Control.
@@ -830,6 +873,10 @@ Concept Index
 * invoking gsoelim:                      Invoking gsoelim.
 * invoking gtbl:                         Invoking gtbl.
 * invoking gxditview:                    Invoking gxditview.
+* ISO 8859-1 (latin-1), input encoding:  Input Encodings.
+* ISO 8859-1 (latin-1), output encoding: Groff Options.
+* ISO 8859-15 (latin-9, latin-0), input encoding: Input Encodings.
+* ISO 8859-2 (latin-2), input encoding:  Input Encodings.
 * italic correction (\/):                Ligatures and Kerning.
 * italic fonts [man]:                    Man font macros.
 * italic glyph, correction after roman glyph (\,): Ligatures and Kerning.
@@ -843,8 +890,13 @@ Concept Index
 * kerning enabled register (.kern):      Ligatures and Kerning.
 * kerning, activating (kern):            Ligatures and Kerning.
 * kerning, track:                        Ligatures and Kerning.
+* landscape page orientation:            Paper Size.
+* last glyph, dimensions (.w, .cht, .cdp, .csk): Environments.
 * last-requested point size registers (.psr, .sr): Fractional Type Sizes.
-* latin-1, encoding:                     Groff Options.
+* latin-1 (ISO 8859-1), input encoding:  Input Encodings.
+* latin-1 (ISO 8859-1), output encoding: Groff Options.
+* latin-2 (ISO 8859-2), input encoding:  Input Encodings.
+* latin-9 (latin-0, ISO 8859-15), input encoding: Input Encodings.
 * layout, line:                          Line Layout.
 * layout, page:                          Page Layout.
 * lc request, and glyph definitions:     Using Symbols.
@@ -862,6 +914,7 @@ Concept Index
 * length of a string (length):           Strings.
 * length of line (ll):                   Line Layout.
 * length of page (pl):                   Page Layout.
+* length of previous line (.n):          Environments.
 * length of title line (lt):             Page Layout.
 * letters, form:                         I/O.
 * level of warnings (warn):              Debugging.
@@ -883,6 +936,7 @@ Concept Index
 * line layout:                           Line Layout.
 * line length (ll):                      Line Layout.
 * line length register (.l):             Line Layout.
+* line length, previous (.n):            Environments.
 * line number, input, register (.c, c.): Built-in Registers.
 * line number, output, register (ln):    Built-in Registers.
 * line numbers, printing (nm):           Miscellaneous.
@@ -923,6 +977,7 @@ Concept Index
 * M unit:                                Measurements.
 * m unit:                                Measurements.
 * machine unit (u):                      Measurements.
+* macro arguments:                       Request and Macro Arguments.
 * macro basics:                          Basics.
 * macro directories:                     Macro Directories.
 * macro files, searching:                Macro Directories.
@@ -948,6 +1003,7 @@ Concept Index
 * major version number register (.x):    Built-in Registers.
 * man macros:                            Man usage.
 * man macros, bold face:                 Man font macros.
+* man macros, custom headers and footers: Optional man extensions.
 * man macros, default indentation:       Miscellaneous man macros.
 * man macros, empty space before a paragraph: Miscellaneous man macros.
 * man macros, hanging indentation:       Man usage.
@@ -958,10 +1014,12 @@ Concept Index
 * man macros, moving left margin:        Man usage.
 * man macros, resetting default indentation: Man usage.
 * man macros, tab stops:                 Miscellaneous man macros.
+* man macros, Ultrix-specific:           Optional man extensions.
 * man pages:                             man.
 * manipulating filling and adjusting:    Manipulating Filling and Adjusting.
 * manipulating hyphenation:              Manipulating Hyphenation.
 * manipulating spacing:                  Manipulating Spacing.
+* manmacros, BSD compatibility:          Miscellaneous man macros.
 * manual pages:                          man.
 * margin for hyphenation (hym):          Manipulating Hyphenation.
 * margin glyph (mc):                     Miscellaneous.
@@ -1099,6 +1157,7 @@ Concept Index
 * operators, unary:                      Expressions.
 * options:                               Groff Options.
 * order of evaluation in expressions:    Expressions.
+* orientation, landscape:                Paper Size.
 * orphan lines, preventing with ne:      Page Control.
 * os request, and no-space mode:         Page Control.
 * output and input requests:             I/O.
@@ -1107,6 +1166,11 @@ Concept Index
 * output device usage number register (.T): Groff Options.
 * output devices <1>:                    Output Devices.
 * output devices:                        Output device intro.
+* output encoding, ASCII:                Groff Options.
+* output encoding, cp1047:               Groff Options.
+* output encoding, EBCDIC:               Groff Options.
+* output encoding, latin-1 (ISO 8859-1): Groff Options.
+* output encoding, utf-8:                Groff Options.
 * output glyphs, and input characters,compatibility with AT&T troff: Implementation Differences.
 * output line number register (ln):      Built-in Registers.
 * output line, continuation (\c):        Line Control.
@@ -1129,6 +1193,7 @@ Concept Index
 * padding character, for fields (fc):    Fields.
 * page break, conditional (ne):          Page Control.
 * page control:                          Page Control.
+* page ejecting register (.pe):          Page Location Traps.
 * page footers:                          Page Location Traps.
 * page headers:                          Page Location Traps.
 * page layout:                           Page Layout.
@@ -1144,8 +1209,10 @@ Concept Index
 * page number character, changing (pc):  Page Layout.
 * page number register (%):              Page Layout.
 * page offset (po):                      Line Layout.
+* page orientation, landscape:           Paper Size.
 * page, new (bp):                        Page Control.
 * paper formats:                         Paper Formats.
+* paper size:                            Paper Size.
 * paragraphs:                            Paragraphs.
 * parameters:                            Parameters.
 * parentheses:                           Expressions.
@@ -1190,6 +1257,7 @@ Concept Index
 * preprocessors <1>:                     Preprocessors.
 * preprocessors:                         Preprocessor Intro.
 * previous font (ft, \f[], \fP):         Changing Fonts.
+* previous line length (.n):             Environments.
 * print current page register (.P):      Groff Options.
 * printing backslash (\\, \e, \E, \[rs]) <1>: Implementation Differences.
 * printing backslash (\\, \e, \E, \[rs]): Escapes.
@@ -1208,6 +1276,7 @@ Concept Index
 * pvs request, using + and -:            Expressions.
 * quotes, major:                         Displays.
 * quotes, trailing:                      Strings.
+* radicalex glyph, and cflags:           Using Symbols.
 * ragged-left:                           Manipulating Filling and Adjusting.
 * ragged-right:                          Manipulating Filling and Adjusting.
 * rc request, and glyph definitions:     Using Symbols.
@@ -1228,7 +1297,7 @@ Concept Index
 * registers, interpolating (\n):         Interpolating Registers.
 * registers, setting (nr, \R):           Setting Registers.
 * removing diversion (rm):               Strings.
-* removing glyph definition (rchar):     Using Symbols.
+* removing glyph definition (rchar, rfschar): Using Symbols.
 * removing macro (rm):                   Strings.
 * removing number register (rr):         Setting Registers.
 * removing request (rm):                 Strings.
@@ -1238,14 +1307,17 @@ Concept Index
 * renaming number register (rnn):        Setting Registers.
 * renaming request (rn):                 Strings.
 * renaming string (rn):                  Strings.
-* request arguments:                     Request Arguments.
+* request arguments:                     Request and Macro Arguments.
 * request, removing (rm):                Strings.
 * request, renaming (rn):                Strings.
 * request, undefined:                    Comments.
 * requests:                              Requests.
 * requests for drawing:                  Drawing Requests.
 * requests for input and output:         I/O.
+* resolution, device:                    DESC File Format.
+* resolution, horizontal:                DESC File Format.
 * resolution, horizontal, register (.H): Built-in Registers.
+* resolution, vertical:                  DESC File Format.
 * resolution, vertical, register (.V):   Built-in Registers.
 * returning to marked vertical page location (rt): Page Motions.
 * revision number register (.Y):         Built-in Registers.
@@ -1290,9 +1362,11 @@ Concept Index
 * size of sentence space register (.sss): Manipulating Filling and Adjusting.
 * size of type:                          Sizes.
 * size of word space register (.ss):     Manipulating Filling and Adjusting.
+* size, paper:                           Paper Size.
 * sizes:                                 Sizes.
 * sizes, fractional <1>:                 Implementation Differences.
 * sizes, fractional:                     Fractional Type Sizes.
+* skew, of last glyph (.csk):            Environments.
 * slant, font, changing (\S):            Artificial Fonts.
 * soelim, the program:                   gsoelim.
 * soft hyphen character, setting (shc):  Manipulating Hyphenation.
@@ -1301,6 +1375,7 @@ Concept Index
 * solid ellipse, drawing (\D'E ...'):    Drawing Requests.
 * solid polygon, drawing (\D'P ...'):    Drawing Requests.
 * sp request, and no-space mode:         Manipulating Spacing.
+* sp request, and traps:                 Manipulating Spacing.
 * sp request, causing implicit linebreak: Manipulating Filling and Adjusting.
 * space between sentences:               Sentences.
 * space between sentences register (.sss): Manipulating Filling and Adjusting.
@@ -1310,12 +1385,15 @@ Concept Index
 * space character, zero width (\&) <2>:  Ligatures and Kerning.
 * space character, zero width (\&):      Requests.
 * space characters, in expressions:      Expressions.
+* space, discardable, horizontal:        Manipulating Filling and Adjusting.
+* space, discarded, in traps:            Manipulating Spacing.
 * space, horizontal (\h):                Page Motions.
 * space, horizontal, unformatting:       Strings.
 * space, unbreakable:                    Page Motions.
 * space, vertical, unit (v):             Measurements.
 * space, width of a digit (\0):          Page Motions.
 * spaces with ds:                        Strings.
+* spaces, in a macro argument:           Request and Macro Arguments.
 * spaces, leading and trailing:          Filling and Adjusting.
 * spacing:                               Basics.
 * spacing, manipulating:                 Manipulating Spacing.
@@ -1328,8 +1406,10 @@ Concept Index
 * special fonts:                         Using Symbols.
 * special fonts, emboldening:            Artificial Fonts.
 * special request, and font translations: Changing Fonts.
+* special request, and glyph search order: Using Symbols.
 * spline, drawing (\D'~ ...'):           Drawing Requests.
 * springing a trap:                      Traps.
+* sqrtex glyph, and cflags:              Using Symbols.
 * stacking glyphs (\b):                  Drawing Requests.
 * standard input, reading from (rd):     I/O.
 * stderr, printing to (tm, tm1, tmc):    Debugging.
@@ -1431,6 +1511,8 @@ Concept Index
 * trap, planting:                        Traps.
 * trap, springing:                       Traps.
 * traps:                                 Traps.
+* traps, and discarded space:            Manipulating Spacing.
+* traps, and diversions:                 Page Location Traps.
 * traps, blank line:                     Blank Line Traps.
 * traps, diversion:                      Diversion Traps.
 * traps, dumping (ptr):                  Debugging.
@@ -1438,6 +1520,7 @@ Concept Index
 * traps, input line:                     Input Line Traps.
 * traps, input line, and interrupted lines (itc): Input Line Traps.
 * traps, page location:                  Page Location Traps.
+* traps, sprung by bp request (.pe):     Page Location Traps.
 * trf request, and invalid characters:   I/O.
 * trf request, causing implicit linebreak: Manipulating Filling and Adjusting.
 * trin request, and asciify:             Diversions.
@@ -1454,6 +1537,7 @@ Concept Index
 * uf request, and font styles:           Font Families.
 * ul glyph, and cflags:                  Using Symbols.
 * ul request, and font translations:     Changing Fonts.
+* Ultrix-specific man macros:            Optional man extensions.
 * unary operators:                       Expressions.
 * unbreakable space:                     Page Motions.
 * undefined identifiers:                 Identifiers.
@@ -1483,6 +1567,7 @@ Concept Index
 * unit, z:                               Measurements.
 * units of measurement:                  Measurements.
 * units, default:                        Default Units.
+* unnamed fill colors (\D'F...'):        Drawing Requests.
 * unnamed glyphs:                        Using Symbols.
 * unnamed glyphs, accessing with \N:     Font File Format.
 * unsafe mode <1>:                       I/O.
@@ -1491,7 +1576,7 @@ Concept Index
 * user's macro tutorial:                 Tutorial for Macro Users.
 * user's tutorial for macros:            Tutorial for Macro Users.
 * using symbols:                         Using Symbols.
-* utf-8, encoding:                       Groff Options.
+* utf-8, output encoding:                Groff Options.
 * v unit:                                Measurements.
 * valid numeric expression:              Expressions.
 * value, incrementing without changing the register: Auto-increment.
@@ -1508,6 +1593,7 @@ Concept Index
 * vertical position in diversion register (.d): Diversions.
 * vertical position trap enable register (.vpt): Page Location Traps.
 * vertical position traps, enabling (vpt): Page Location Traps.
+* vertical resolution:                   DESC File Format.
 * vertical resolution register (.V):     Built-in Registers.
 * vertical space unit (v):               Measurements.
 * vertical spacing:                      Sizes.
@@ -1521,6 +1607,7 @@ Concept Index
 * while request, operators to use with:  Operators in Conditionals.
 * whitespace characters:                 Identifiers.
 * width escape (\w):                     Page Motions.
+* width, of last glyph (.w):             Environments.
 * word space size register (.ss):        Manipulating Filling and Adjusting.
 * writing macros:                        Writing Macros.
 * writing to file (write):               I/O.
diff --git a/contrib/groff/doc/groff-2 b/contrib/groff/doc/groff-2
index d1f7f99..052ac12 100644
--- a/contrib/groff/doc/groff-2
+++ b/contrib/groff/doc/groff-2
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,84 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Man options,  Next: Man usage,  Prev: man,  Up: man
+
+Options
+-------
+
+   The command line format for using the `man' macros with `groff' is:
+
+
+     groff -m man [ -rLL=LENGTH ] [ -rLT=LENGTH ] [ -rFT=DIST ]
+           [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [-rHY=FLAGS ]
+           [ -rPNNN ] [ -rSXX ] [ -rXNNN ]
+           [ -rIN=LENGTH ] [ -rSN=LENGTH ] [ FILES... ]
+
+It is possible to use `-man' instead of `-m man'.
+
+`-rcR=1'
+     This option (the default if a TTY output device is used) creates a
+     single, very long page instead of multiple pages.  Use `-rcR=0' to
+     disable it.
+
+`-rC1'
+     If more than one manual page is given on the command line, number
+     the pages continuously, rather than starting each at 1.
+
+`-rD1'
+     Double-sided printing.  Footers for even and odd pages are
+     formatted differently.
+
+`-rFT=DIST'
+     Set the position of the footer text to DIST.  If positive, the
+     distance is measured relative to the top of the page, otherwise it
+     is relative to the bottom.  The default is -0.5i.
+
+`-rHY=FLAGS'
+     Set hyphenation flags.  Possible values are 1 to hyphenate without
+     restrictions, 2  to not hyphenate the last word on a page, 4 to
+     not hyphenate the last two characters of a word, and 8 to not
+     hyphenate the first two characters of a word.  These values are
+     additive; the default is 14.
+
+`-rIN=LENGTH'
+     Set the body text indent to LENGTH.  If not specified, the indent
+     defaults to 7n (7 characters) in nroff mode and 7.2n otherwise.
+     For nroff, this value should always be an integer multiple of unit
+     `n' to get consistent indentation.
+
+`-rLL=LENGTH'
+     Set line length to LENGTH.  If not specified, the line length
+     defaults to 78 en in nroff mode (this is 78 characters per line)
+     and 6.5 inch otherwise.
+
+`-rLT=LENGTH'
+     Set title length to LENGTH.  If not specified, the title length
+     defaults to the line length.
+
+`-rPNNN'
+     Page numbering starts with NNN rather than with 1.
+
+`-rSXX'
+     Use XX (which can be 10, 11, or 12pt) as the base document font
+     size instead of the default value of 10pt.
+
+`-rSN=LENGTH'
+     Set the indent for sub-subheadings to LENGTH.  If not specified,
+     the indent defaults to 3n.
+
+`-rXNNN'
+     After page NNN, number pages as NNNa, NNNb, NNNc, etc.  For
+     example, the option `-rX2' produces the following page numbers: 1,
+     2, 2a, 2b, 2c, etc.
+
+
 File: groff,  Node: Man usage,  Next: Man font macros,  Prev: Man options,  Up: man
 
 Usage
@@ -56,34 +129,37 @@ further customization, put additional macros and requests into the file
      Set up an unnumbered section heading sticking out to the left.
      Prints out all the text following `SH' up to the end of the line
      (or the text in the next line if there is no argument to `SH') in
-     bold face, one size larger than the base document size.
-     Additionally, the left margin for the following text is reset to
-     its default value.
+     bold face (or the font specified by the string `HF'), one size
+     larger than the base document size.  Additionally, the left margin
+     and the indentation for the following text is reset to its default
+     value.
 
  - Macro: .SS [heading]
      Set up an unnumbered (sub)section heading.  Prints out all the text
      following `SS' up to the end of the line (or the text in the next
-     line if there is no argument to `SS') in bold face, at the same
-     size as the base document size.  Additionally, the left margin for
-     the following text is reset to its default value.
+     line if there is no argument to `SS') in bold face (or the font
+     specified by the string `HF'), at the same size as the base
+     document size.  Additionally, the left margin and the indentation
+     for the following text is reset to its default value.
 
  - Macro: .TP [nnn]
      Set up an indented paragraph with label.  The indentation is set to
      NNN if that argument is supplied (the default unit is `n' if
-     omitted), otherwise it is set to the default indentation value.
+     omitted), otherwise it is set to the previous indentation value
+     specified with `TP', `IP', or `HP' (or to the default value if
+     none of them have been used yet).
 
      The first line of text following this macro is interpreted as a
      string to be printed flush-left, as it is appropriate for a label.
      It is not interpreted as part of a paragraph, so there is no
      attempt to fill the first line with text from the following input
      lines.  Nevertheless, if the label is not as wide as the
-     indentation, then the paragraph starts at the same line (but
-     indented), continuing on the following lines.  If the label is
-     wider than the indentation, then the descriptive part of the
-     paragraph begins on the line following the label, entirely
-     indented.  Note that neither font shape nor font size of the label
-     is set to a default value; on the other hand, the rest of the text
-     has default font settings.
+     indentation the paragraph starts at the same line (but indented),
+     continuing on the following lines.  If the label is wider than the
+     indentation the descriptive part of the paragraph begins on the
+     line following the label, entirely indented.  Note that neither
+     font shape nor font size of the label is set to a default value;
+     on the other hand, the rest of the text has default font settings.
 
  - Macro: .LP
  - Macro: .PP
@@ -92,18 +168,21 @@ further customization, put additional macros and requests into the file
      at the current position, followed by a vertical space downwards by
      the amount specified by the `PD' macro.  The font size and shape
      are reset to the default value (10pt roman if no `-rS' option is
-     given on the command line).  Finally, the current left margin is
-     restored.
+     given on the command line).  Finally, the current left margin and
+     the indentation is restored.
 
  - Macro: .IP [designator [nnn]]
      Set up an indented paragraph, using DESIGNATOR as a tag to mark
      its beginning.  The indentation is set to NNN if that argument is
-     supplied (default unit is `n'), otherwise the default indentation
-     value is used.  Font size and face of the paragraph (but not the
-     designator) are reset to their default values.  To start an
-     indented paragraph with a particular indentation but without a
-     designator, use `""' (two double quotes) as the first argument of
-     `IP'.
+     supplied (default unit is `n'), otherwise it is set to the
+     previous indentation value specified with `TP', `IP', or `HP' (or
+     the default value if none of them have been used yet).  Font size
+     and face of the paragraph (but not the designator) are reset to
+     their default values.
+
+     To start an indented paragraph with a particular indentation but
+     without a designator, use `""' (two double quotes) as the first
+     argument of `IP'.
 
      For example, to start a paragraph with bullets as the designator
      and 4 en indentation, write
@@ -115,18 +194,25 @@ further customization, put additional macros and requests into the file
  - Macro: .HP [nnn]
      Set up a paragraph with hanging left indentation.  The indentation
      is set to NNN if that argument is supplied (default unit is `n'),
-     otherwise the default indentation value is used.  Font size and
-     face are reset to their default values.
+     otherwise it is set to the previous indentation value specified
+     with `TP', `IP', or `HP' (or the default value if non of them have
+     been used yet).  Font size and face are reset to their default
+     values.
 
  - Macro: .RS [nnn]
      Move the left margin to the right by the value NNN if specified
-     (default unit is `n'); otherwise the default indentation value is
-     used.  Calls to the `RS' macro can be nested.
+     (default unit is `n'); otherwise it is set to the previous
+     indentation value specified with `TP', `IP', or `HP' (or to the
+     default value if none of them have been used yet).  The
+     indentation value is then set to the default.
+
+     Calls to the `RS' macro can be nested.
 
  - Macro: .RE [nnn]
-     Move the left margin back to level NNN; if no argument is given,
-     it moves one level back.  The first level (i.e., no call to `RS'
-     yet) has number 1, and each call to `RS' increases the level by 1.
+     Move the left margin back to level NNN, restoring the previous left
+     margin.  If no argument is given, it moves one level back.  The
+     first level (i.e., no call to `RS' yet) has number 1, and each call
+     to `RS' increases the level by 1.
 
    To summarize, the following macros cause a line break with the
 insertion of vertical space (which amount can be changed with the `PD'
@@ -156,28 +242,34 @@ command line option `-rS=N' is given, use Npt as the default text size.
      face font, one point size smaller than the default font.
 
  - Macro: .BI text
-     Set its arguments alternately in bold face and italic.  Thus,
+     Set its arguments alternately in bold face and italic, without a
+     space between the arguments.  Thus,
 
 
           .BI this "word and" that
 
-     would set "this" and "that" in bold face, and "word and" in
-     italics.
+     produces "thisword andthat" with "this" and "that" in bold face,
+     and "word and" in italics.
 
  - Macro: .IB text
-     Set its arguments alternately in italic and bold face.
+     Set its arguments alternately in italic and bold face, without a
+     space between the arguments.
 
  - Macro: .RI text
-     Set its arguments alternately in roman and italic.
+     Set its arguments alternately in roman and italic, without a space
+     between the arguments.
 
  - Macro: .IR text
-     Set its arguments alternately in italic and roman.
+     Set its arguments alternately in italic and roman, without a space
+     between the arguments.
 
  - Macro: .BR text
-     Set its arguments alternately in bold face and roman.
+     Set its arguments alternately in bold face and roman, without a
+     space between the arguments.
 
  - Macro: .RB text
-     Set its arguments alternately in roman and bold face.
+     Set its arguments alternately in roman and bold face, without a
+     space between the arguments.
 
  - Macro: .B [text]
      Set TEXT in bold face.  If no text is present on the line where
@@ -194,8 +286,8 @@ File: groff,  Node: Miscellaneous man macros,  Next: Predefined man strings,  Pr
 Miscellaneous macros
 --------------------
 
-   The default indentation is 7.2 en for all output devices except for
-`grohtml' which ignores indentation.
+   The default indentation is 7.2n in troff mode and 7n in nroff mode
+except for `grohtml' which ignores indentation.
 
  - Macro: .DT
      Set tabs every 0.5 inches.  Since this macro is always executed
@@ -206,10 +298,48 @@ Miscellaneous macros
      Adjust the empty space before a new paragraph (or section).  The
      optional argument gives the amount of space (default unit is `v');
      without parameter, the value is reset to its default value (1 line
-     for TTY devices, 0.4v otherwise).
+     in nroff mode, 0.4v otherwise).
+
+     This affects the macros `SH', `SS', `TP', `LP' (as well as `PP'
+     and `P'), `IP', and `HP'.
+
+   The following two macros are included for BSD compatibility.
+
+ - Macro: .AT [system [release]]
+     Alter the footer for use with AT&T manpages.  This command exists
+     only for compatibility; don't use it.  The first argument SYSTEM
+     can be:
+
+    `3'
+          7th Edition (the default)
+
+    `4'
+          System III
+
+    `5'
+          System V
+
+     An optional second argument RELEASE to `AT' specifies the release
+     number (such as "System V Release 3").
+
+ - Macro: .UC [version]
+     Alters the footer for use with BSD manpages.  This command exists
+     only for compatibility; don't use it.  The argument can be:
+
+    `3'
+          3rd Berkeley Distribution (the default)
 
-   This affects the macros `SH', `SS', `TP', `LP' (as well as `PP' and
-`P'), `IP', and `HP'.
+    `4'
+          4th Berkeley Distribution
+
+    `5'
+          4.2 Berkeley Distribution
+
+    `6'
+          4.3 Berkeley Distribution
+
+    `7'
+          4.4 Berkeley Distribution
 
 
 File: groff,  Node: Predefined man strings,  Next: Preprocessors in man pages,  Prev: Miscellaneous man macros,  Up: man
@@ -222,6 +352,9 @@ Predefined strings
  - String: \*[S]
      Switch back to the default font size.
 
+ - String: \*[HF]
+     The typeface used for headings.  The default is `B'.
+
  - String: \*[R]
      The `registered' sign.
 
@@ -234,7 +367,7 @@ Predefined strings
      respectively.
 
 
-File: groff,  Node: Preprocessors in man pages,  Prev: Predefined man strings,  Up: man
+File: groff,  Node: Preprocessors in man pages,  Next: Optional man extensions,  Prev: Predefined man strings,  Up: man
 
 Preprocessors in `man' pages
 ----------------------------
@@ -251,6 +384,134 @@ of letters for the needed preprocessors: `e' for `geqn', `r' for
 read this first line and automatically call the right preprocessor(s).
 
 
+File: groff,  Node: Optional man extensions,  Prev: Preprocessors in man pages,  Up: man
+
+Optional `man' extensions
+-------------------------
+
+   Use the file `man.local' for local extensions to the `man' macros or
+for style changes.
+
+Custom headers and footers
+..........................
+
+   In groff versions 1.18.2 and later, you can specify custom headers
+and footers by redefining the following macros in `man.local'.
+
+ - Macro: .PT
+     Control the content of the headers.  Normally, the header prints
+     the command name and section number on either side, and the
+     optional fifth argument to `TH' in the center.
+
+ - Macro: .BT
+     Control the content of the footers.  Normally, the footer prints
+     the page number and the third and fourth arguments to `TH'.
+
+     Use the `FT' number register to specify the footer position.  The
+     default is -0.5i.
+
+Ultrix-specific man macros
+..........................
+
+   The `groff' source distribution includes a file named `man.ultrix',
+containing macros compatible with the Ultrix variant of `man'.  Copy
+this file into `man.local' (or use the `mso' request to load it) to
+enable the following macros.
+
+ - Macro: .CT key
+     Print `<CTRL/KEY>'.
+
+ - Macro: .CW
+     Print subsequent text using the constant width (Courier) typeface.
+
+ - Macro: .Ds
+     Begin a non-filled display.
+
+ - Macro: .De
+     End a non-filled display started with `Ds'.
+
+ - Macro: .EX [indent]
+     Begins a non-filled display using the constant width (Courier)
+     typeface.  Use the optional INDENT argument to indent the display.
+
+ - Macro: .EE
+     End a non-filled display started with `EX'.
+
+ - Macro: .G [text]
+     Sets TEXT in Helvetica.  If no text is present on the line where
+     the macro is called, then the text of the next line appears in
+     Helvetica.
+
+ - Macro: .GL [text]
+     Sets TEXT in Helvetica Oblique.  If no text is present on the line
+     where the macro is called, then the text of the next line appears
+     in Helvetica Oblique.
+
+ - Macro: .HB [text]
+     Sets TEXT in Helvetica Bold.  If no text is present on the line
+     where the macro is called, then all text up to the next `HB'
+     appears in Helvetica Bold.
+
+ - Macro: .TB [text]
+     Identical to `HB'.
+
+ - Macro: .MS title sect [punct]
+     Set a manpage reference in Ultrix format.  The TITLE is in Courier
+     instead of italic.  Optional punctuation follows the section
+     number without an intervening space.
+
+ - Macro: .NT [`C'] [title]
+     Begin a note.  Print the optional title, or the word "Note",
+     centered on the page.  Text following the macro makes up the body
+     of the note, and is indented on both sides.  If the first argument
+     is `C', the body of the note is printed centered (the second
+     argument replaces the word "Note" if specified).
+
+ - Macro: .NE
+     End a note begun with `NT'.
+
+ - Macro: .PN path [punct]
+     Set the path name in constant width (Courier), followed by
+     optional punctuation.
+
+ - Macro: .Pn [punct] path [punct]
+     When called with two arguments, identical to `PN'.  When called
+     with three arguments, set the second argument in constant width
+     (Courier), bracketed by the first and third arguments in the
+     current font.
+
+ - Macro: .R
+     Switch to roman font and turn off any underlining in effect.
+
+ - Macro: .RN
+     Print the string `<RETURN>'.
+
+ - Macro: .VS [`4']
+     Start printing a change bar in the margin if the number `4' is
+     specified.  Otherwise, this macro does nothing.
+
+ - Macro: .VE
+     End printing the change bar begun by `VS'.
+
+Simple example
+..............
+
+   The following example `man.local' file alters the `SH' macro to add
+some extra vertical space before printing the heading.  Headings are
+printed in Helvetica Bold.
+
+
+     .\" Make the heading fonts Helvetica
+     .ds HF HB
+     .
+     .\" Put more whitespace in front of headings.
+     .rn SH SH-orig
+     .de SH
+     .  if t .sp (u;\\n[PD]*2)
+     .  SH-orig \\$*
+     ..
+
+
 File: groff,  Node: mdoc,  Next: ms,  Prev: man,  Up: Macro Packages
 
 `mdoc'
@@ -1256,7 +1517,7 @@ those headings wrapped in `XS' and `XE' macros.
           .NH 2
           Methodology
           .XS
-          	Methodology
+          Methodology
           .XE
           .LP
           ...
@@ -1304,380 +1565,3 @@ a document.
 is perhaps initially more difficult, but would save a great deal of
 time in the long run if you use `ms' regularly.
 
-
-File: groff,  Node: ms Strings and Special Characters,  Prev: ms TOC,  Up: ms Page Layout
-
-Strings and Special Characters
-..............................
-
-   The `ms' macros provide the following predefined strings.  You can
-change the string definitions to help in creating documents in
-languages other than English.
-
- - String: \*[REFERENCES]
-     Contains the string printed at the beginning of the references
-     (bibliography) page.  The default is `References'.
-
- - String: \*[ABSTRACT]
-     Contains the string printed at the beginning of the abstract.  The
-     default is `ABSTRACT'.
-
- - String: \*[TOC]
-     Contains the string printed at the beginning of the table of
-     contents.
-
- - String: \*[MONTH1]
- - String: \*[MONTH2]
- - String: \*[MONTH3]
- - String: \*[MONTH4]
- - String: \*[MONTH5]
- - String: \*[MONTH6]
- - String: \*[MONTH7]
- - String: \*[MONTH8]
- - String: \*[MONTH9]
- - String: \*[MONTH10]
- - String: \*[MONTH11]
- - String: \*[MONTH12]
-     Prints the full name of the month in dates.  The default is
-     `January', `February', etc.
-
-   The following special characters are available(1) (*note ms Strings
-and Special Characters-Footnote-1::):
-
- - String: \*[-]
-     Prints an em dash.
-
- - String: \*[*Q]
- - String: \*[*U]
-     Prints typographer's quotes in troff, plain quotes in nroff.  `*Q'
-     is the left quote and `*U' is the right quote.
-
-   Improved accent marks are available in the `ms' macros.
-
- - Macro: .AM
-     Specify this macro at the beginning of your document to enable
-     extended accent marks and special characters.  This is a Berkeley
-     extension.
-
-     To use the accent marks, place them *after* the character being
-     accented.
-
-   The following accent marks are available after invoking the `AM'
-macro:
-
- - String: \*[']
-     Acute accent.
-
- - String: \*[`]
-     Grave accent.
-
- - String: \*[^]
-     Circumflex.
-
- - String: \*[,]
-     Cedilla.
-
- - String: \*[~]
-     Tilde.
-
- - String: \*[:]
-     Umlaut.
-
- - String: \*[v]
-     Hacek.
-
- - String: \*[_]
-     Macron (overbar).
-
- - String: \*[.]
-     Underdot.
-
- - String: \*[o]
-     Ring above.
-
-   The following are standalone characters available after invoking the
-`AM' macro:
-
- - String: \*[?]
-     Upside-down question mark.
-
- - String: \*[!]
-     Upside-down exclamation point.
-
- - String: \*[8]
-     German ss ligature.
-
- - String: \*[3]
-     Yogh.
-
- - String: \*[Th]
-     Uppercase thorn.
-
- - String: \*[th]
-     Lowercase thorn.
-
- - String: \*[D-]
-     Uppercase eth.
-
- - String: \*[d-]
-     Lowercase eth.
-
- - String: \*[q]
-     Hooked o.
-
- - String: \*[ae]
-     Lowercase ae ligature.
-
- - String: \*[Ae]
-     Uppercase AE ligature.
-
-
-File: groff,  Node: ms Strings and Special Characters-Footnotes,  Up: ms Strings and Special Characters
-
-   (1) For an explanation what special characters are see *Note Special
-Characters::.
-
-
-File: groff,  Node: Differences from AT&T ms,  Prev: ms Page Layout,  Up: ms
-
-Differences from AT&T `ms'
---------------------------
-
-   This section lists the (minor) differences between the `groff -ms'
-macros and AT&T `troff -ms' macros.
-
-* Menu:
-
-* Missing ms Macros::
-* Additional ms Macros::
-
-
-File: groff,  Node: Missing ms Macros,  Next: Additional ms Macros,  Prev: Differences from AT&T ms,  Up: Differences from AT&T ms
-
-`troff' macros not appearing in `groff'
-.......................................
-
-   Macros missing from `groff -ms' are cover page macros specific to
-Bell Labs.  The macros known to be missing are:
-
-`.TM'
-     Technical memorandum; a cover sheet style
-
-`.IM'
-     Internal memorandum; a cover sheet style
-
-`.MR'
-     Memo for record; a cover sheet style
-
-`.MF'
-     Memo for file; a cover sheet style
-
-`.EG'
-     Engineer's notes; a cover sheet style
-
-`.TR'
-     Computing Science Tech Report; a cover sheet style
-
-`.OK'
-     Other keywords
-
-`.CS'
-     Cover sheet information
-
-`.MH'
-     A cover sheet macro
-
-
-File: groff,  Node: Additional ms Macros,  Prev: Missing ms Macros,  Up: Differences from AT&T ms
-
-`groff' macros not appearing in AT&T `troff'
-............................................
-
-   The `groff -ms' macros have a few minor extensions compared to the
-AT&T `troff -ms' macros.
-
- - Macro: .AM
-     Improved accent marks.  *Note ms Strings and Special Characters::,
-     for details.
-
- - Macro: .DS I
-     Indented display.  The default behavior of AT&T `troff -ms' was to
-     indent; the `groff' default prints displays flush left with the
-     body text.
-
- - Macro: .CW
-     Print text in `constant width' (Courier) font.
-
- - Macro: .IX
-     Indexing term (printed on standard error).  You can write a script
-     to capture and process an index generated in this manner.
-
-
-   The following additional number registers appear in `groff -ms':
-
- - Register: \n[MINGW]
-     Specifies a minimum space between columns (for multi-column
-     output); this takes the place of the `GW' register that was
-     documented but apparently not implemented in AT&T `troff'.
-
-
-   Several new string registers are available as well.  You can change
-these to handle (for example) the local language.  *Note ms Strings and
-Special Characters::, for details.
-
-
-File: groff,  Node: me,  Next: mm,  Prev: ms,  Up: Macro Packages
-
-`me'
-====
-
-   See the `meintro.me' and `meref.me' documents in groff's `doc'
-directory.
-
-
-File: groff,  Node: mm,  Prev: me,  Up: Macro Packages
-
-`mm'
-====
-
-   See the `groff_mm(7)' man page (type `man groff_mm' at the command
-line).
-
-
-File: groff,  Node: gtroff Reference,  Next: Preprocessors,  Prev: Macro Packages,  Up: Top
-
-`gtroff' Reference
-******************
-
-   This chapter covers *all* of the facilities of `gtroff'.  Users of
-macro packages may skip it if not interested in details.
-
-* Menu:
-
-* Text::
-* Input Conventions::
-* Measurements::
-* Expressions::
-* Identifiers::
-* Embedded Commands::
-* Registers::
-* Manipulating Filling and Adjusting::
-* Manipulating Hyphenation::
-* Manipulating Spacing::
-* Tabs and Fields::
-* Character Translations::
-* Troff and Nroff Mode::
-* Line Layout::
-* Line Control::
-* Page Layout::
-* Page Control::
-* Fonts::
-* Sizes::
-* Strings::
-* Conditionals and Loops::
-* Writing Macros::
-* Page Motions::
-* Drawing Requests::
-* Traps::
-* Diversions::
-* Environments::
-* Suppressing output::
-* Colors::
-* I/O::
-* Postprocessor Access::
-* Miscellaneous::
-* Gtroff Internals::
-* Debugging::
-* Implementation Differences::
-
-
-File: groff,  Node: Text,  Next: Input Conventions,  Prev: gtroff Reference,  Up: gtroff Reference
-
-Text
-====
-
-   `gtroff' input files contain text with control commands interspersed
-throughout.  But, even without control codes, `gtroff' still does
-several things with the input text:
-
-   * filling and adjusting
-
-   * adding additional space after sentences
-
-   * hyphenating
-
-   * inserting implicit line breaks
-
-* Menu:
-
-* Filling and Adjusting::
-* Hyphenation::
-* Sentences::
-* Tab Stops::
-* Implicit Line Breaks::
-
-
-File: groff,  Node: Filling and Adjusting,  Next: Hyphenation,  Prev: Text,  Up: Text
-
-Filling and Adjusting
----------------------
-
-   When `gtroff' reads text, it collects words from the input and fits
-as many of them together on one output line as it can.  This is known as
-"filling".
-
-   Once `gtroff' has a "filled" line, it tries to "adjust" it.  This
-means it widens the spacing between words until the text reaches the
-right margin (in the default adjustment mode).  Extra spaces between
-words are preserved, but spaces at the end of lines are ignored.
-Spaces at the front of a line cause a "break" (breaks are explained in
-*Note Implicit Line Breaks::).
-
-   *Note Manipulating Filling and Adjusting::.
-
-
-File: groff,  Node: Hyphenation,  Next: Sentences,  Prev: Filling and Adjusting,  Up: Text
-
-Hyphenation
------------
-
-   Since the odds are not great for finding a set of words, for every
-output line, which fit nicely on a line without inserting excessive
-amounts of space between words, `gtroff' hyphenates words so that it
-can justify lines without inserting too much space between words.  It
-uses an internal hyphenation algorithm (a simplified version of the
-algorithm used within TeX) to indicate which words can be hyphenated
-and how to do so.  When a word is hyphenated, the first part of the
-word is added to the current filled line being output (with an attached
-hyphen), and the other portion is added to the next line to be filled.
-
-   *Note Manipulating Hyphenation::.
-
-
-File: groff,  Node: Sentences,  Next: Tab Stops,  Prev: Hyphenation,  Up: Text
-
-Sentences
----------
-
-   Although it is often debated, some typesetting rules say there
-should be different amounts of space after various punctuation marks.
-For example, the `Chicago typsetting manual' says that a period at the
-end of a sentence should have twice as much space following it as would
-a comma or a period as part of an abbreviation.
-
-   `gtroff' does this by flagging certain characters (normally `!',
-`?', and `.') as "end-of-sentence" characters.  When `gtroff'
-encounters one of these characters at the end of a line, it appends a
-normal space followed by a "sentence space" in the formatted output.
-(This justifies one of the conventions mentioned in *Note Input
-Conventions::.)
-
-   In addition, the following characters and symbols are treated
-transparently while handling end-of-sentence characters: `"', `'', `)',
-`]', `*', `\[dg]', and `\[rq]'.
-
-   See the `cflags' request in *Note Using Symbols::, for more details.
-
-   To prevent the insertion of extra space after an end-of-sentence
-character (at the end of a line), append `\&'.
-
diff --git a/contrib/groff/doc/groff-3 b/contrib/groff/doc/groff-3
index b808a39..a7b1cd2 100644
--- a/contrib/groff/doc/groff-3
+++ b/contrib/groff/doc/groff-3
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,390 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: ms Strings and Special Characters,  Prev: ms TOC,  Up: ms Page Layout
+
+Strings and Special Characters
+..............................
+
+   The `ms' macros provide the following predefined strings.  You can
+change the string definitions to help in creating documents in
+languages other than English.
+
+ - String: \*[REFERENCES]
+     Contains the string printed at the beginning of the references
+     (bibliography) page.  The default is `References'.
+
+ - String: \*[ABSTRACT]
+     Contains the string printed at the beginning of the abstract.  The
+     default is `ABSTRACT'.
+
+ - String: \*[TOC]
+     Contains the string printed at the beginning of the table of
+     contents.
+
+ - String: \*[MONTH1]
+ - String: \*[MONTH2]
+ - String: \*[MONTH3]
+ - String: \*[MONTH4]
+ - String: \*[MONTH5]
+ - String: \*[MONTH6]
+ - String: \*[MONTH7]
+ - String: \*[MONTH8]
+ - String: \*[MONTH9]
+ - String: \*[MONTH10]
+ - String: \*[MONTH11]
+ - String: \*[MONTH12]
+     Prints the full name of the month in dates.  The default is
+     `January', `February', etc.
+
+   The following special characters are available(1) (*note ms Strings
+and Special Characters-Footnote-1::):
+
+ - String: \*[-]
+     Prints an em dash.
+
+ - String: \*[*Q]
+ - String: \*[*U]
+     Prints typographer's quotes in troff, plain quotes in nroff.  `*Q'
+     is the left quote and `*U' is the right quote.
+
+   Improved accent marks are available in the `ms' macros.
+
+ - Macro: .AM
+     Specify this macro at the beginning of your document to enable
+     extended accent marks and special characters.  This is a Berkeley
+     extension.
+
+     To use the accent marks, place them *after* the character being
+     accented.
+
+   The following accent marks are available after invoking the `AM'
+macro:
+
+ - String: \*[']
+     Acute accent.
+
+ - String: \*[`]
+     Grave accent.
+
+ - String: \*[^]
+     Circumflex.
+
+ - String: \*[,]
+     Cedilla.
+
+ - String: \*[~]
+     Tilde.
+
+ - String: \*[:]
+     Umlaut.
+
+ - String: \*[v]
+     Hacek.
+
+ - String: \*[_]
+     Macron (overbar).
+
+ - String: \*[.]
+     Underdot.
+
+ - String: \*[o]
+     Ring above.
+
+   The following are standalone characters available after invoking the
+`AM' macro:
+
+ - String: \*[?]
+     Upside-down question mark.
+
+ - String: \*[!]
+     Upside-down exclamation point.
+
+ - String: \*[8]
+     German ss ligature.
+
+ - String: \*[3]
+     Yogh.
+
+ - String: \*[Th]
+     Uppercase thorn.
+
+ - String: \*[th]
+     Lowercase thorn.
+
+ - String: \*[D-]
+     Uppercase eth.
+
+ - String: \*[d-]
+     Lowercase eth.
+
+ - String: \*[q]
+     Hooked o.
+
+ - String: \*[ae]
+     Lowercase ae ligature.
+
+ - String: \*[Ae]
+     Uppercase AE ligature.
+
+
+File: groff,  Node: ms Strings and Special Characters-Footnotes,  Up: ms Strings and Special Characters
+
+   (1) For an explanation what special characters are see *Note Special
+Characters::.
+
+
+File: groff,  Node: Differences from AT&T ms,  Prev: ms Page Layout,  Up: ms
+
+Differences from AT&T `ms'
+--------------------------
+
+   This section lists the (minor) differences between the `groff -ms'
+macros and AT&T `troff -ms' macros.
+
+* Menu:
+
+* Missing ms Macros::
+* Additional ms Macros::
+
+
+File: groff,  Node: Missing ms Macros,  Next: Additional ms Macros,  Prev: Differences from AT&T ms,  Up: Differences from AT&T ms
+
+`troff' macros not appearing in `groff'
+.......................................
+
+   Macros missing from `groff -ms' are cover page macros specific to
+Bell Labs.  The macros known to be missing are:
+
+`.TM'
+     Technical memorandum; a cover sheet style
+
+`.IM'
+     Internal memorandum; a cover sheet style
+
+`.MR'
+     Memo for record; a cover sheet style
+
+`.MF'
+     Memo for file; a cover sheet style
+
+`.EG'
+     Engineer's notes; a cover sheet style
+
+`.TR'
+     Computing Science Tech Report; a cover sheet style
+
+`.OK'
+     Other keywords
+
+`.CS'
+     Cover sheet information
+
+`.MH'
+     A cover sheet macro
+
+
+File: groff,  Node: Additional ms Macros,  Prev: Missing ms Macros,  Up: Differences from AT&T ms
+
+`groff' macros not appearing in AT&T `troff'
+............................................
+
+   The `groff -ms' macros have a few minor extensions compared to the
+AT&T `troff -ms' macros.
+
+ - Macro: .AM
+     Improved accent marks.  *Note ms Strings and Special Characters::,
+     for details.
+
+ - Macro: .DS I
+     Indented display.  The default behavior of AT&T `troff -ms' was to
+     indent; the `groff' default prints displays flush left with the
+     body text.
+
+ - Macro: .CW
+     Print text in `constant width' (Courier) font.
+
+ - Macro: .IX
+     Indexing term (printed on standard error).  You can write a script
+     to capture and process an index generated in this manner.
+
+
+   The following additional number registers appear in `groff -ms':
+
+ - Register: \n[MINGW]
+     Specifies a minimum space between columns (for multi-column
+     output); this takes the place of the `GW' register that was
+     documented but apparently not implemented in AT&T `troff'.
+
+
+   Several new string registers are available as well.  You can change
+these to handle (for example) the local language.  *Note ms Strings and
+Special Characters::, for details.
+
+
+File: groff,  Node: me,  Next: mm,  Prev: ms,  Up: Macro Packages
+
+`me'
+====
+
+   See the `meintro.me' and `meref.me' documents in groff's `doc'
+directory.
+
+
+File: groff,  Node: mm,  Prev: me,  Up: Macro Packages
+
+`mm'
+====
+
+   See the `groff_mm(7)' man page (type `man groff_mm' at the command
+line).
+
+
+File: groff,  Node: gtroff Reference,  Next: Preprocessors,  Prev: Macro Packages,  Up: Top
+
+`gtroff' Reference
+******************
+
+   This chapter covers *all* of the facilities of `gtroff'.  Users of
+macro packages may skip it if not interested in details.
+
+* Menu:
+
+* Text::
+* Measurements::
+* Expressions::
+* Identifiers::
+* Embedded Commands::
+* Registers::
+* Manipulating Filling and Adjusting::
+* Manipulating Hyphenation::
+* Manipulating Spacing::
+* Tabs and Fields::
+* Character Translations::
+* Troff and Nroff Mode::
+* Line Layout::
+* Line Control::
+* Page Layout::
+* Page Control::
+* Fonts and Symbols::
+* Sizes::
+* Strings::
+* Conditionals and Loops::
+* Writing Macros::
+* Page Motions::
+* Drawing Requests::
+* Traps::
+* Diversions::
+* Environments::
+* Suppressing output::
+* Colors::
+* I/O::
+* Postprocessor Access::
+* Miscellaneous::
+* Gtroff Internals::
+* Debugging::
+* Implementation Differences::
+
+
+File: groff,  Node: Text,  Next: Measurements,  Prev: gtroff Reference,  Up: gtroff Reference
+
+Text
+====
+
+   `gtroff' input files contain text with control commands interspersed
+throughout.  But, even without control codes, `gtroff' still does
+several things with the input text:
+
+   * filling and adjusting
+
+   * adding additional space after sentences
+
+   * hyphenating
+
+   * inserting implicit line breaks
+
+* Menu:
+
+* Filling and Adjusting::
+* Hyphenation::
+* Sentences::
+* Tab Stops::
+* Implicit Line Breaks::
+* Input Conventions::
+* Input Encodings::
+
+
+File: groff,  Node: Filling and Adjusting,  Next: Hyphenation,  Prev: Text,  Up: Text
+
+Filling and Adjusting
+---------------------
+
+   When `gtroff' reads text, it collects words from the input and fits
+as many of them together on one output line as it can.  This is known as
+"filling".
+
+   Once `gtroff' has a "filled" line, it tries to "adjust" it.  This
+means it widens the spacing between words until the text reaches the
+right margin (in the default adjustment mode).  Extra spaces between
+words are preserved, but spaces at the end of lines are ignored.
+Spaces at the front of a line cause a "break" (breaks are explained in
+*Note Implicit Line Breaks::).
+
+   *Note Manipulating Filling and Adjusting::.
+
+
+File: groff,  Node: Hyphenation,  Next: Sentences,  Prev: Filling and Adjusting,  Up: Text
+
+Hyphenation
+-----------
+
+   Since the odds are not great for finding a set of words, for every
+output line, which fit nicely on a line without inserting excessive
+amounts of space between words, `gtroff' hyphenates words so that it
+can justify lines without inserting too much space between words.  It
+uses an internal hyphenation algorithm (a simplified version of the
+algorithm used within TeX) to indicate which words can be hyphenated
+and how to do so.  When a word is hyphenated, the first part of the
+word is added to the current filled line being output (with an attached
+hyphen), and the other portion is added to the next line to be filled.
+
+   *Note Manipulating Hyphenation::.
+
+
+File: groff,  Node: Sentences,  Next: Tab Stops,  Prev: Hyphenation,  Up: Text
+
+Sentences
+---------
+
+   Although it is often debated, some typesetting rules say there
+should be different amounts of space after various punctuation marks.
+For example, the `Chicago typsetting manual' says that a period at the
+end of a sentence should have twice as much space following it as would
+a comma or a period as part of an abbreviation.
+
+   `gtroff' does this by flagging certain characters (normally `!',
+`?', and `.') as "end-of-sentence" characters.  When `gtroff'
+encounters one of these characters at the end of a line, it appends a
+normal space followed by a "sentence space" in the formatted output.
+(This justifies one of the conventions mentioned in *Note Input
+Conventions::.)
+
+   In addition, the following characters and symbols are treated
+transparently while handling end-of-sentence characters: `"', `'', `)',
+`]', `*', `\[dg]', and `\[rq]'.
+
+   See the `cflags' request in *Note Using Symbols::, for more details.
+
+   To prevent the insertion of extra space after an end-of-sentence
+character (at the end of a line), append `\&'.
+
+
 File: groff,  Node: Tab Stops,  Next: Implicit Line Breaks,  Prev: Sentences,  Up: Text
 
 Tab Stops
@@ -49,7 +428,7 @@ produces
    *Note Tabs and Fields::.
 
 
-File: groff,  Node: Implicit Line Breaks,  Prev: Tab Stops,  Up: Text
+File: groff,  Node: Implicit Line Breaks,  Next: Input Conventions,  Prev: Tab Stops,  Up: Text
 
 Implicit Line Breaks
 --------------------
@@ -74,10 +453,10 @@ document may vanish!
 is discussed in *Note Manipulating Filling and Adjusting::.
 
 
-File: groff,  Node: Input Conventions,  Next: Measurements,  Prev: Text,  Up: gtroff Reference
+File: groff,  Node: Input Conventions,  Next: Input Encodings,  Prev: Implicit Line Breaks,  Up: Text
 
 Input Conventions
-=================
+-----------------
 
    Since `gtroff' does filling automatically, it is traditional in
 `groff' not to try and type things in as nicely formatted paragraphs.
@@ -95,7 +474,57 @@ These are some conventions commonly used when typing `gtroff' text:
      try using spaces to get proper indentation).
 
 
-File: groff,  Node: Measurements,  Next: Expressions,  Prev: Input Conventions,  Up: gtroff Reference
+File: groff,  Node: Input Encodings,  Prev: Input Conventions,  Up: Text
+
+Input Encodings
+---------------
+
+   Currently, the following input encodings are available.
+
+cp1047
+     This input encoding works only on EBCDIC platforms (and vice
+     versa, the other input encodings don't work with EBCDIC); the file
+     `cp1047.tmac' is by default loaded at start-up.
+
+latin-1
+     This is the default input encoding on non-EBCDIC platforms; the
+     file `latin1.tmac' is loaded at start-up.
+
+latin-2
+     To use this encoding, either say `.mso latin2.tmac' at the very
+     beginning of your document or use `-mlatin2' as a command line
+     argument for `groff'.
+
+latin-9 (latin-0)
+     This encoding is intended (at least in Europe) to replace latin-1
+     encoding.  The main difference to latin-1 is that latin-9 contains
+     the Euro character.  To use this encoding, either say
+     `.mso latin9.tmac' at the very beginning of your document or use
+     `-mlatin9' as a command line argument for `groff'.
+
+   Note that it can happen that some input encoding characters are not
+available for a particular output device.  For example, saying
+
+
+     groff -Tlatin1 -mlatin9 ...
+
+will fail if you use the Euro character in the input.  Usually, this
+limitation is present only for devices which have a limited set of
+output glyphs (e.g. `-Tascii' and `-Tlatin1'); for other devices it is
+usually sufficient to install proper fonts which contain the necessary
+glyphs.
+
+   Due to the importance of the Euro glyph in Europe, the groff package
+now comes with a POSTSCRIPT font called `freeeuro.pfa' which provides
+various glyph shapes for the Euro.  With other words, latin-9 encoding
+is supported for the `-Tps' device out of the box (latin-2 isn't).
+
+   By its very nature, `-Tutf8' supports all input encodings; `-Tdvi'
+has support for both latin-2 and latin-9 if the command line `-mec' is
+used also to load the file `ec.tmac' (which flips to the EC fonts).
+
+
+File: groff,  Node: Measurements,  Next: Expressions,  Prev: Text,  Up: gtroff Reference
 
 Measurements
 ============
@@ -259,14 +688,15 @@ signs indicate increments and decrements.
 
    *Note Setting Registers::, for some examples.
 
- - Escape: \B'ANYTHING'
+ - Escape: \B'anything'
      Return 1 if ANYTHING is a valid numeric expression; or 0 if
      ANYTHING is empty or not a valid numeric expression.
 
    Due to the way arguments are parsed, spaces are not allowed in
 expressions, unless the entire expression is surrounded by parentheses.
 
-   *Note Request Arguments::, and *Note Conditionals and Loops::.
+   *Note Request and Macro Arguments::, and *Note Conditionals and
+Loops::.
 
 
 File: groff,  Node: Identifiers,  Next: Embedded Commands,  Prev: Expressions,  Up: gtroff Reference
@@ -322,7 +752,7 @@ after `.[' and `.]' is handled as a special argument to `refer'.  For
 example, `.[foo' makes `refer' to start a reference, using `foo' as a
 parameter.
 
- - Escape: \A'IDENT'
+ - Escape: \A'ident'
      Test whether an identifier IDENT is valid in `gtroff'.  It expands
      to the character 1 or 0 according to whether its argument (usually
      delimited by quotes) is or is not acceptable as the name of a
@@ -466,21 +896,23 @@ character prevents this.
 
 * Menu:
 
-* Request Arguments::
+* Request and Macro Arguments::
 
 
-File: groff,  Node: Request Arguments,  Prev: Requests,  Up: Requests
+File: groff,  Node: Request and Macro Arguments,  Prev: Requests,  Up: Requests
 
-Request Arguments
-.................
+Request and Macro Arguments
+...........................
 
-   Arguments to requests (and macros) are processed much like the shell:
+   Arguments to requests and macros are processed much like the shell:
 The line is split into arguments according to spaces.(1) (*note Request
-Arguments-Footnote-1::)  An argument which is intended to contain
-spaces can either be enclosed in double quotes, or have the spaces
-"escaped" with backslashes.
+and Macro Arguments-Footnote-1::)
+
+   An argument to a macro which is intended to contain spaces can
+either be enclosed in double quotes, or have the spaces "escaped" with
+backslashes.  This is _not_ true for requests.
 
-   Here are a few examples:
+   Here are a few examples for a hypothetical macro `uh':
 
 
      .uh The Mouse Problem
@@ -490,7 +922,7 @@ spaces can either be enclosed in double quotes, or have the spaces
 The first line is the `uh' macro being called with 3 arguments, `The',
 `Mouse', and `Problem'.  The latter two have the same effect of calling
 the `uh' macro with one argument, `The Mouse Problem'.(2) (*note
-Request Arguments-Footnote-2::)
+Request and Macro Arguments-Footnote-2::)
 
    A double quote which isn't preceded by a space doesn't start a macro
 argument.  If not closing a string, it is printed literally.
@@ -543,7 +975,7 @@ obscure behaviour!
 Strings::, for more details.
 
 
-File: groff,  Node: Request Arguments-Footnotes,  Up: Request Arguments
+File: groff,  Node: Request and Macro Arguments-Footnotes,  Up: Request and Macro Arguments
 
    (1) Plan 9's `troff' implementation also allows tabs for argument
 separation - `gtroff' intentionally doesn't support this.
@@ -563,9 +995,9 @@ Macros
 
    `gtroff' has a "macro" facility for defining a series of lines which
 can be invoked by name.  They are called in the same manner as requests
-- arguments also may be passed in the same manner.
+- arguments also may be passed basically in the same manner.
 
-   *Note Writing Macros::, and *Note Request Arguments::.
+   *Note Writing Macros::, and *Note Request and Macro Arguments::.
 
 
 File: groff,  Node: Escapes,  Prev: Macros,  Up: Embedded Commands
@@ -723,9 +1155,9 @@ forms of escapes is the comment.
 
      as expected.
 
- - Request: .ig yy
-     Ignore all input until `gtroff' encounters the macro named `.'YY
-     on a line by itself (or `..' if YY is not specified).  This is
+ - Request: .ig [end]
+     Ignore all input until `gtroff' encounters the macro named `.'END
+     on a line by itself (or `..' if END is not specified).  This is
      useful for commenting out large blocks of text:
 
 
@@ -786,7 +1218,7 @@ Setting Registers
    Define or set registers using the `nr' request or the `\R' escape.
 
  - Request: .nr ident value
- - Escape: \R'IDENT VALUE'
+ - Escape: \R'ident value'
      Set number register IDENT to VALUE.  If IDENT doesn't exist,
      `gtroff' creates it.
 
@@ -809,8 +1241,8 @@ decrement a register.
 
  - Request: .nr ident +value
  - Request: .nr ident -value
- - Escape: \R'IDENT +VALUE'
- - Escape: \R'IDENT -VALUE'
+ - Escape: \R'ident +value'
+ - Escape: \R'ident -value'
      Increment (decrement) register IDENT by VALUE.
 
 
@@ -869,11 +1301,11 @@ Interpolating Registers
 
    Numeric registers can be accessed via the `\n' escape.
 
- - Escape: \nI
- - Escape: \n(ID
- - Escape: \n[IDENT]
+ - Escape: \ni
+ - Escape: \n(id
+ - Escape: \n[ident]
      Interpolate number register with name IDENT (one-character name I,
-     two-character name ID). This means that the value of the register
+     two-character name ID).  This means that the value of the register
      is expanded in-place while `gtroff' is parsing the input line.
      Nested assignments (also called indirect assignments) are possible.
 
@@ -912,16 +1344,16 @@ to the `nr' request or `\R' escape.
    To activate auto-incrementing, the escape `\n' has a special syntax
 form.
 
- - Escape: \n+I
- - Escape: \n-I
- - Escape: \n(+ID
- - Escape: \n(-ID
- - Escape: \n+(ID
- - Escape: \n-(ID
- - Escape: \n[+IDENT]
- - Escape: \n[-IDENT]
- - Escape: \n+[IDENT]
- - Escape: \n-[IDENT]
+ - Escape: \n+i
+ - Escape: \n-i
+ - Escape: \n(+id
+ - Escape: \n(-id
+ - Escape: \n+(id
+ - Escape: \n-(id
+ - Escape: \n[+ident]
+ - Escape: \n[-ident]
+ - Escape: \n+[ident]
+ - Escape: \n-[ident]
      Before interpolating, increment or decrement IDENT (one-character
      name I, two-character name ID) by the auto-increment value as
      specified with the `nr' request (or the `\R' escape).  If no
@@ -1027,9 +1459,9 @@ using the `af' request.
      writeable register, then apply the `af' request to this other
      register.
 
- - Escape: \gI
- - Escape: \g(ID
- - Escape: \g[IDENT]
+ - Escape: \gi
+ - Escape: \g(id
+ - Escape: \g[ident]
      Return the current format of the specified register IDENT
      (one-character name I, two-character name ID).  For example, `\ga'
      after the previous example would produce the string `000'.  If the
@@ -1115,12 +1547,12 @@ appendix *Note Register Index::.
      *Note Miscellaneous::, for more information about line numbering.
 
 `.x'
-     The major version number.  For example, if the version number
-     is 1.03 then `.x' contains `1'.
+     The major version number.  For example, if the version number is
+     1.03 then `.x' contains `1'.
 
 `.y'
-     The minor version number.  For example, if the version number
-     is 1.03 then `.y' contains `03'.
+     The minor version number.  For example, if the version number is
+     1.03 then `.y' contains `03'.
 
 `.Y'
      The revision number of `groff'.
@@ -1152,223 +1584,3 @@ appendix *Note Register Index::.
      register `.T' which contains the current output device (for
      example, `latin1' or `ps').
 
-
-File: groff,  Node: Manipulating Filling and Adjusting,  Next: Manipulating Hyphenation,  Prev: Registers,  Up: gtroff Reference
-
-Manipulating Filling and Adjusting
-==================================
-
-   Various ways of causing "breaks" were given in *Note Implicit Line
-Breaks::.  The `br' request likewise causes a break.  Several other
-requests also cause breaks, but implicitly.  These are `bp', `ce',
-`cf', `fi', `fl', `in', `nf', `rj', `sp', `ti', and `trf'.
-
- - Request: .br
-     Break the current line, i.e., the input collected so far is emitted
-     without adjustment.
-
-     If the no-break control character is used, `gtroff' suppresses the
-     break:
-
-
-          a
-          'br
-          b
-              => a b
-
-
-   Initially, `gtroff' fills and adjusts text to both margins.  Filling
-can be disabled via the `nf' request and re-enabled with the `fi'
-request.
-
- - Request: .fi
- - Register: \n[.u]
-     Activate fill mode (which is the default).  This request implicitly
-     enables adjusting; it also inserts a break in the text currently
-     being filled.  The read-only number register `.u' is set to 1.
-
-     The fill mode status is associated with the current environment
-     (*note Environments::).
-
-     See *Note Line Control::, for interaction with the `\c' escape.
-
- - Request: .nf
-     Activate no-fill mode.  Input lines are output as-is, retaining
-     line breaks and ignoring the current line length.  This command
-     implicitly disables adjusting; it also causes a break.  The number
-     register `.u' is set to 0.
-
-     The fill mode status is associated with the current environment
-     (*note Environments::).
-
-     See *Note Line Control::, for interaction with the `\c' escape.
-
- - Request: .ad [mode]
- - Register: \n[.j]
-     Set adjusting mode.
-
-     Activation and deactivation of adjusting is done implicitly with
-     calls to the `fi' or `nf' requests.
-
-     MODE can have one of the following values:
-
-    `l'
-          Adjust text to the left margin.  This produces what is
-          traditionally called ragged-right text.
-
-    `r'
-          Adjust text to the right margin, producing ragged-left text.
-
-    `c'
-          Center filled text.  This is different to the `ce' request
-          which only centers text without filling.
-
-    `b'
-    `n'
-          Justify to both margins.  This is the default used by
-          `gtroff'.
-
-     With no argument, `gtroff' adjusts lines in the same way it did
-     before adjusting was deactivated (with a call to `na', for
-     example).
-
-
-          text
-          .ad r
-          text
-          .ad c
-          text
-          .na
-          text
-          .ad  \" back to centering
-          text
-
-     The current adjustment mode is available in the read-only number
-     register `.j'; it can be stored and subsequently used to set
-     adjustment.
-
-     The adjustment mode status is associated with the current
-     environment (*note Environments::).
-
- - Request: .na
-     Disable adjusting.  This request won't change the current
-     adjustment mode: A subsequent call to `ad' uses the previous
-     adjustment setting.
-
-     The adjustment mode status is associated with the current
-     environment (*note Environments::).
-
- - Request: .brp
- - Escape: \p
-     Adjust the current line and cause a break.
-
-     In most cases this produces very ugly results since `gtroff'
-     doesn't have a sophisticated paragraph building algorithm (as TeX
-     have, for example); instead, `gtroff' fills and adjusts a paragraph
-     line by line:
-
-
-            This is an uninteresting sentence.
-            This is an uninteresting sentence.\p
-            This is an uninteresting sentence.
-
-     is formatted as
-
-
-            This is  an uninteresting  sentence.   This  is an
-            uninteresting                            sentence.
-            This is an uninteresting sentence.
-
-
- - Request: .ss word_space_size [sentence_space_size]
- - Register: \n[.ss]
- - Register: \n[.sss]
-     Change the minimum size of a space between filled words.  It takes
-     its units as one twelfth of the space width parameter for the
-     current font.  Initially both the WORD_SPACE_SIZE and
-     SENTENCE_SPACE_SIZE are 12.
-
-     If two arguments are given to the `ss' request, the second
-     argument sets the sentence space size.  If the second argument is
-     not given, sentence space size is set to WORD_SPACE_SIZE.  The
-     sentence space size is used in two circumstances: If the end of a
-     sentence occurs at the end of a line in fill mode, then both an
-     inter-word space and a sentence space are added; if two spaces
-     follow the end of a sentence in the middle of a line, then the
-     second space is a sentence space.  If a second argument is never
-     given to the `ss' request, the behaviour of UNIX `troff' is the
-     same as that exhibited by GNU `troff'.  In GNU `troff', as in UNIX
-     `troff', a sentence should always be followed by either a newline
-     or two spaces.
-
-     The read-only number registers `.ss' and `.sss' hold the values of
-     the parameters set by the first and second arguments of the `ss'
-     request.
-
-     The word space and sentence space values are associated with the
-     current environment (*note Environments::).
-
-     Contrary to AT&T `troff', this request is _not_ ignored if a TTY
-     output device is used; the given values are then rounded down to a
-     multiple of 12 (*note Implementation Differences::).
-
-     The request is ignored if there is no parameter.
-
- - Request: .ce [nnn]
- - Register: \n[.ce]
-     Center text.  While the `.ad c' request also centers text, it
-     fills the text as well.  `ce' does not fill the text it affects.
-     This request causes a break.  The number of lines still to be
-     centered is associated with the current environment (*note
-     Environments::).
-
-     The following example demonstrates the differences.  Here the
-     input:
-
-
-          .ll 4i
-          .ce 1000
-          This is a small text fragment which shows the differences
-          between the `.ce' and the `.ad c' request.
-          .ce 0
-          
-          .ad c
-          This is a small text fragment which shows the differences
-          between the `.ce' and the `.ad c' request.
-
-     And here the result:
-
-
-            This is a small text fragment which
-                   shows the differences
-          between the `.ce' and the `.ad c' request.
-          
-            This is a small text fragment which
-          shows the differences between the `.ce'
-                  and the `.ad c' request.
-
-     With no arguments, `ce' centers the next line of text.  NNN
-     specifies the number of lines to be centered.  If the argument is
-     zero or negative, centering is disabled.
-
-     The basic length for centering text is the line length (as set
-     with the `ll' request) minus the indentation (as set with the `in'
-     request).  Temporary indentation is ignored.
-
-     As can be seen in the previous example, it is a common idiom to
-     turn on centering for a large number of lines, and to turn off
-     centering after text to be centered.  This is useful for any
-     request which takes a number of lines as an argument.
-
-     The `.ce' read-only number register contains the number of lines
-     remaining to be centered, as set by the `ce' request.
-
- - Request: .rj [nnn]
- - Register: \n[.rj]
-     Justify unfilled text to the right margin.  Arguments are
-     identical to the `ce' request.  The `.rj' read-only number
-     register is the number of lines to be right-justified as set by
-     the `rj' request.  This request causes a break.  The number of
-     lines still to be right-justified is associated with the current
-     environment (*note Environments::).
-
diff --git a/contrib/groff/doc/groff-4 b/contrib/groff/doc/groff-4
index 8b6d91a..7591d12 100644
--- a/contrib/groff/doc/groff-4
+++ b/contrib/groff/doc/groff-4
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,258 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Manipulating Filling and Adjusting,  Next: Manipulating Hyphenation,  Prev: Registers,  Up: gtroff Reference
+
+Manipulating Filling and Adjusting
+==================================
+
+   Various ways of causing "breaks" were given in *Note Implicit Line
+Breaks::.  The `br' request likewise causes a break.  Several other
+requests also cause breaks, but implicitly.  These are `bp', `ce',
+`cf', `fi', `fl', `in', `nf', `rj', `sp', `ti', and `trf'.
+
+ - Request: .br
+     Break the current line, i.e., the input collected so far is emitted
+     without adjustment.
+
+     If the no-break control character is used, `gtroff' suppresses the
+     break:
+
+
+          a
+          'br
+          b
+              => a b
+
+
+   Initially, `gtroff' fills and adjusts text to both margins.  Filling
+can be disabled via the `nf' request and re-enabled with the `fi'
+request.
+
+ - Request: .fi
+ - Register: \n[.u]
+     Activate fill mode (which is the default).  This request implicitly
+     enables adjusting; it also inserts a break in the text currently
+     being filled.  The read-only number register `.u' is set to 1.
+
+     The fill mode status is associated with the current environment
+     (*note Environments::).
+
+     See *Note Line Control::, for interaction with the `\c' escape.
+
+ - Request: .nf
+     Activate no-fill mode.  Input lines are output as-is, retaining
+     line breaks and ignoring the current line length.  This command
+     implicitly disables adjusting; it also causes a break.  The number
+     register `.u' is set to 0.
+
+     The fill mode status is associated with the current environment
+     (*note Environments::).
+
+     See *Note Line Control::, for interaction with the `\c' escape.
+
+ - Request: .ad [mode]
+ - Register: \n[.j]
+     Set adjusting mode.
+
+     Activation and deactivation of adjusting is done implicitly with
+     calls to the `fi' or `nf' requests.
+
+     MODE can have one of the following values:
+
+    `l'
+          Adjust text to the left margin.  This produces what is
+          traditionally called ragged-right text.
+
+    `r'
+          Adjust text to the right margin, producing ragged-left text.
+
+    `c'
+          Center filled text.  This is different to the `ce' request
+          which only centers text without filling.
+
+    `b'
+    `n'
+          Justify to both margins.  This is the default used by
+          `gtroff'.
+
+     Finally, MODE can be the numeric argument returned by the `.j'
+     register.
+
+     With no argument, `gtroff' adjusts lines in the same way it did
+     before adjusting was deactivated (with a call to `na', for
+     example).
+
+
+          text
+          .ad r
+          .nr ad \n[.j]
+          text
+          .ad c
+          text
+          .na
+          text
+          .ad         \" back to centering
+          text
+          .ad \n[ad]  \" back to right justifying
+
+     The current adjustment mode is available in the read-only number
+     register `.j'; it can be stored and subsequently used to set
+     adjustment.
+
+     The adjustment mode status is associated with the current
+     environment (*note Environments::).
+
+ - Request: .na
+     Disable adjusting.  This request won't change the current
+     adjustment mode: A subsequent call to `ad' uses the previous
+     adjustment setting.
+
+     The adjustment mode status is associated with the current
+     environment (*note Environments::).
+
+ - Request: .brp
+ - Escape: \p
+     Adjust the current line and cause a break.
+
+     In most cases this produces very ugly results since `gtroff'
+     doesn't have a sophisticated paragraph building algorithm (as TeX
+     have, for example); instead, `gtroff' fills and adjusts a paragraph
+     line by line:
+
+
+            This is an uninteresting sentence.
+            This is an uninteresting sentence.\p
+            This is an uninteresting sentence.
+
+     is formatted as
+
+
+            This is  an uninteresting  sentence.   This  is an
+            uninteresting                            sentence.
+            This is an uninteresting sentence.
+
+
+ - Request: .ss word_space_size [sentence_space_size]
+ - Register: \n[.ss]
+ - Register: \n[.sss]
+     Change the size of a space between words.  It takes its units as
+     one twelfth of the space width parameter for the current font.
+     Initially both the WORD_SPACE_SIZE and SENTENCE_SPACE_SIZE are 12.
+     In fill mode, the values specify the minimum distance.
+
+     If two arguments are given to the `ss' request, the second
+     argument sets the sentence space size.  If the second argument is
+     not given, sentence space size is set to WORD_SPACE_SIZE.  The
+     sentence space size is used in two circumstances: If the end of a
+     sentence occurs at the end of a line in fill mode, then both an
+     inter-word space and a sentence space are added; if two spaces
+     follow the end of a sentence in the middle of a line, then the
+     second space is a sentence space.  If a second argument is never
+     given to the `ss' request, the behaviour of UNIX `troff' is the
+     same as that exhibited by GNU `troff'.  In GNU `troff', as in UNIX
+     `troff', a sentence should always be followed by either a newline
+     or two spaces.
+
+     The read-only number registers `.ss' and `.sss' hold the values of
+     the parameters set by the first and second arguments of the `ss'
+     request.
+
+     The word space and sentence space values are associated with the
+     current environment (*note Environments::).
+
+     Contrary to AT&T `troff', this request is _not_ ignored if a TTY
+     output device is used; the given values are then rounded down to a
+     multiple of 12 (*note Implementation Differences::).
+
+     The request is ignored if there is no parameter.
+
+     Another useful application of the `ss' request is to insert
+     discardable horizontal space, i.e., space which is discarded at a
+     line break.  For example, paragraph-style footnotes could be
+     separated this way:
+
+
+          .ll 4.5i
+          1.\ This is the first footnote.\c
+          .ss 48
+          .nop
+          .ss 12
+          2.\ This is the second footnote.
+
+     The result:
+
+
+          1. This is the first footnote.        2. This
+          is the second footnote.
+
+     Note that the `\h' escape produces unbreakable space.
+
+ - Request: .ce [nnn]
+ - Register: \n[.ce]
+     Center text.  While the `.ad c' request also centers text, it
+     fills the text as well.  `ce' does not fill the text it affects.
+     This request causes a break.  The number of lines still to be
+     centered is associated with the current environment (*note
+     Environments::).
+
+     The following example demonstrates the differences.  Here the
+     input:
+
+
+          .ll 4i
+          .ce 1000
+          This is a small text fragment which shows the differences
+          between the `.ce' and the `.ad c' request.
+          .ce 0
+          
+          .ad c
+          This is a small text fragment which shows the differences
+          between the `.ce' and the `.ad c' request.
+
+     And here the result:
+
+
+            This is a small text fragment which
+                   shows the differences
+          between the `.ce' and the `.ad c' request.
+          
+            This is a small text fragment which
+          shows the differences between the `.ce'
+                  and the `.ad c' request.
+
+     With no arguments, `ce' centers the next line of text.  NNN
+     specifies the number of lines to be centered.  If the argument is
+     zero or negative, centering is disabled.
+
+     The basic length for centering text is the line length (as set
+     with the `ll' request) minus the indentation (as set with the `in'
+     request).  Temporary indentation is ignored.
+
+     As can be seen in the previous example, it is a common idiom to
+     turn on centering for a large number of lines, and to turn off
+     centering after text to be centered.  This is useful for any
+     request which takes a number of lines as an argument.
+
+     The `.ce' read-only number register contains the number of lines
+     remaining to be centered, as set by the `ce' request.
+
+ - Request: .rj [nnn]
+ - Register: \n[.rj]
+     Justify unfilled text to the right margin.  Arguments are
+     identical to the `ce' request.  The `.rj' read-only number
+     register is the number of lines to be right-justified as set by
+     the `rj' request.  This request causes a break.  The number of
+     lines still to be right-justified is associated with the current
+     environment (*note Environments::).
+
+
 File: groff,  Node: Manipulating Hyphenation,  Next: Manipulating Spacing,  Prev: Manipulating Filling and Adjusting,  Up: gtroff Reference
 
 Manipulating Hyphenation
@@ -122,7 +369,7 @@ There are a number of ways to influence hyphenation.
           ... check the /var/log/\:httpd/\:access_log file ...
 
      Note that `\X' and `\Y' start a word, that is, the `\%' escape in
-     (say) ` \X'...'\%foobar' and ` \Y'...'\%foobar' no longer prevents
+     (say) `\X'...'\%foobar' and `\Y'...'\%foobar' no longer prevents
      hyphenation but inserts a hyphenation point at the beginning of
      `foobar'; most likely this isn't what you want to do.
 
@@ -186,8 +433,8 @@ There are a number of ways to influence hyphenation.
      The set of hyphenation patterns is associated with the current
      language set by the `hla' request.  The `hpf' request is usually
      invoked by the `troffrc' or `troffrc-end' file; by default,
-     `troffrc' loads hyphenation patterns for American English (in file
-     `hyphen.us').
+     `troffrc' loads hyphenation patterns and exceptions for American
+     English (in files `hyphen.us' and `hyphenex.us').
 
      A second call to `hpf' (for the same language) will replace the
      hyphenation patterns with the new ones.
@@ -286,6 +533,43 @@ Manipulating Spacing
      `gtroff' moves that distance from the top of the page.  This
      request causes a line break.  The default scaling indicator is `v'.
 
+     If a vertical trap is sprung during execution of `sp', the amount
+     of vertical space after the trap is discarded.  For example, this
+
+
+          .de xxx
+          ..
+          .
+          .wh 0 xxx
+          .
+          .pl 5v
+          foo
+          .sp 2
+          bar
+          .sp 50
+          baz
+
+     results in
+
+
+          foo
+          
+          
+          bar
+          
+          baz
+
+     The amount of discarded space is available in the number register
+     `.trunc'.
+
+     To protect `sp' against vertical traps, use the `vpt' request:
+
+
+          .vpt 0
+          .sp -3
+          .vpt 1
+
+
  - Request: .ls [nnn]
  - Register: \n[.L]
      Output NNN-1 blank lines after each line of text.  With no
@@ -306,7 +590,7 @@ Manipulating Spacing
    *Note Changing Type Sizes::, for the requests `vs' and `pvs' as
 alternatives to `ls'.
 
- - Escape: \x'SPACING'
+ - Escape: \x'spacing'
  - Register: \n[.a]
      Sometimes, extra vertical spacing is only needed occasionally, e.g.
      to allow space for a tall construct (like an equation).  The `\x'
@@ -488,9 +772,7 @@ movement to the next tab stop (much like it did on a typewriter).
 
         * Calling `ta' without an argument removes all tab stops.
 
-        * The start-up value of `gtroff' is `T 0.5i' in troff mode and
-          `T 0.8i' in nroff mode (the latter is done with an explicit
-          call to the `ta' request in the file `tty.tmac'.
+        * The start-up value of `gtroff' is `T 0.8i'.
 
      The read-only number register `.tabs' contains a string
      representation of the current tab settings suitable for use as an
@@ -741,7 +1023,7 @@ can be changed with the `cc' and `c2' requests, respectively.
      and end a superscript:
 
 
-          .ds { \v'-.3m'\s'\Es[.s]*60/100'
+          .ds { \v'-.3m'\s'\En[.s]*60/100'
           .ds } \s0\v'.3m'
 
      Another example to demonstrate the differences between the various
@@ -1122,195 +1404,3 @@ These dimensions are:
      is that the latter takes into account whether a partially
      collected line still uses the old line length value.
 
-
-File: groff,  Node: Line Control,  Next: Page Layout,  Prev: Line Layout,  Up: gtroff Reference
-
-Line Control
-============
-
-   It is important to understand how `gtroff' handles input and output
-lines.
-
-   Many escapes use positioning relative to the input line.  For
-example, this
-
-
-     This is a \h'|1.2i'test.
-     
-     This is a
-     \h'|1.2i'test.
-
-produces
-
-
-     This is a   test.
-     
-     This is a             test.
-
-   The main usage of this feature is to define macros which act exactly
-at the place where called.
-
-
-     .\" A simple macro to underline a word
-     .de underline
-     .  nop \\$1\l'|0\[ul]'
-     ..
-
-In the above example, `|0' specifies a negative distance from the
-current position (at the end of the just emitted argument `\$1') back
-to the beginning of the input line.  Thus, the `\l' escape draws a line
-from right to left.
-
-   `gtroff' makes a difference between input and output line
-continuation; the latter is also called "interrupting" a line.
-
- - Escape: \<RET>
- - Escape: \c
- - Register: \n[.int]
-     Continue a line.  `\<RET>' (this is a backslash at the end of a
-     line immediately followed by a newline) works on the input level,
-     suppressing the effects of the following newline in the input.
-
-
-          This is a \
-          .test
-              => This is a .test
-
-     The `|' operator is also affected.
-
-     `\c' works on the output level.  Anything after this escape on the
-     same line is ignored, except `\R' which works as usual.  Anything
-     before `\c' on the same line will be appended to the current
-     partial output line.  The next non-command line after an
-     interrupted line counts as a new input line.
-
-     The visual results depend on whether no-fill mode is active.
-
-        * If no-fill mode is active (using the `nf' request), the next
-          input text line after `\c' will be handled as a continuation
-          of the same input text line.
-
-
-               .nf
-               This is a \c
-               test.
-                   => This is a test.
-
-        * If fill mode is active (using the `fi' request), a word
-          interrupted with `\c' will be continued with the text on the
-          next input text line, without an intervening space.
-
-
-               This is a te\c
-               st.
-                   => This is a test.
-
-
-     Note that an intervening control line which causes a break is
-     stronger than `\c', flushing out the current partial line in the
-     usual way.
-
-     The `.int' register contains a positive value if the last output
-     line was interrupted with `\c'; this is associated with the
-     current environment (*note Environments::).
-
-
-
-File: groff,  Node: Page Layout,  Next: Page Control,  Prev: Line Control,  Up: gtroff Reference
-
-Page Layout
-===========
-
-   `gtroff' provides some very primitive operations for controlling
-page layout.
-
- - Request: .pl [length]
- - Request: .pl +length
- - Request: .pl -length
- - Register: \n[.p]
-     Set the "page length" to LENGTH (or increment or decrement the
-     current value by LENGTH).  This is the length of the physical
-     output page.  The default scaling indicator is `v'.
-
-     The current setting can be found in the read-only number register
-     `.p'.
-
-     Note that this only specifies the size of the page, not the top and
-     bottom margins.  Those are not set by `gtroff' directly.  *Note
-     Traps::, for further information on how to do this.
-
-     Negative `pl' values are possible also, but not very useful: No
-     trap is sprung, and each line is output on a single page (thus
-     suppressing all vertical spacing).
-
-     If no argument or an invalid argument is given, `pl' sets the page
-     length to 11i.
-
-   `gtroff' provides several operations which help in setting up top
-and bottom titles (or headers and footers).
-
- - Request: .tl 'left'center'right'
-     Print a "title line".  It consists of three parts: a left
-     justified portion, a centered portion, and a right justified
-     portion.  The argument separator `'' can be replaced with any
-     character not occurring in the title line.  The `%' character is
-     replaced with the current page number.  This character can be
-     changed with the `pc' request (see below).
-
-     Without argument, `tl' is ignored.
-
-     Some notes:
-
-        * A title line is not restricted to the top or bottom of a page.
-
-        * `tl' prints the title line immediately, ignoring a partially
-          filled line (which stays untouched).
-
-        * It is not an error to omit closing delimiters.  For example,
-          `.tl /foo' is equivalent to `.tl /foo///': It prints a title
-          line with the left justified word `foo'; the centered and
-          right justfied parts are empty.
-
-        * `tl' accepts the same parameter delimiting characters as the
-          `\A' escape; see *Note Escapes::.
-
- - Request: .lt [length]
- - Request: .lt +length
- - Request: .lt -length
- - Register: \n[.lt]
-     The title line is printed using its own line length, which is
-     specified (or incremented or decremented) with the `lt' request.
-     Initially, the title line length is set to 6.5i.  If a negative
-     line length is specified (which is not allowed), `gtroff' emits a
-     warning of type `range' and sets the title line length to zero.
-     The default scaling indicator is `m'.  If `lt' is called without
-     an argument, the title length is reset to the previous value
-     before the last call to `lt'.
-
-     The current setting of this is available in the `.lt' read-only
-     number register; it is associated with the current environment
-     (*note Environments::).
-
-
- - Request: .pn page
- - Request: .pn +page
- - Request: .pn -page
- - Register: \n[.pn]
-     Change (increase or decrease) the page number of the _next_ page.
-     The only argument is the page number; the request is ignored
-     without a parameter.
-
-     The read-only number register `.pn' contains the number of the next
-     page: either the value set by a `pn' request, or the number of the
-     current page plus 1.
-
- - Register: \n[%]
-     A read-write register holding the current page number.
-
- - Request: .pc [char]
-     Change the page number character (used by the `tl' request) to a
-     different character.  With no argument, this mechanism is disabled.
-     Note that this doesn't affect the number register `%'.
-
-   *Note Traps::.
-
diff --git a/contrib/groff/doc/groff-5 b/contrib/groff/doc/groff-5
index 3a93483..2130766 100644
--- a/contrib/groff/doc/groff-5
+++ b/contrib/groff/doc/groff-5
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,13 +17,205 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
-File: groff,  Node: Page Control,  Next: Fonts,  Prev: Page Layout,  Up: gtroff Reference
+File: groff,  Node: Line Control,  Next: Page Layout,  Prev: Line Layout,  Up: gtroff Reference
+
+Line Control
+============
+
+   It is important to understand how `gtroff' handles input and output
+lines.
+
+   Many escapes use positioning relative to the input line.  For
+example, this
+
+
+     This is a \h'|1.2i'test.
+     
+     This is a
+     \h'|1.2i'test.
+
+produces
+
+
+     This is a   test.
+     
+     This is a             test.
+
+   The main usage of this feature is to define macros which act exactly
+at the place where called.
+
+
+     .\" A simple macro to underline a word
+     .de underline
+     .  nop \\$1\l'|0\[ul]'
+     ..
+
+In the above example, `|0' specifies a negative distance from the
+current position (at the end of the just emitted argument `\$1') back
+to the beginning of the input line.  Thus, the `\l' escape draws a line
+from right to left.
+
+   `gtroff' makes a difference between input and output line
+continuation; the latter is also called "interrupting" a line.
+
+ - Escape: \<RET>
+ - Escape: \c
+ - Register: \n[.int]
+     Continue a line.  `\<RET>' (this is a backslash at the end of a
+     line immediately followed by a newline) works on the input level,
+     suppressing the effects of the following newline in the input.
+
+
+          This is a \
+          .test
+              => This is a .test
+
+     The `|' operator is also affected.
+
+     `\c' works on the output level.  Anything after this escape on the
+     same line is ignored, except `\R' which works as usual.  Anything
+     before `\c' on the same line will be appended to the current
+     partial output line.  The next non-command line after an
+     interrupted line counts as a new input line.
+
+     The visual results depend on whether no-fill mode is active.
+
+        * If no-fill mode is active (using the `nf' request), the next
+          input text line after `\c' will be handled as a continuation
+          of the same input text line.
+
+
+               .nf
+               This is a \c
+               test.
+                   => This is a test.
+
+        * If fill mode is active (using the `fi' request), a word
+          interrupted with `\c' will be continued with the text on the
+          next input text line, without an intervening space.
+
+
+               This is a te\c
+               st.
+                   => This is a test.
+
+
+     Note that an intervening control line which causes a break is
+     stronger than `\c', flushing out the current partial line in the
+     usual way.
+
+     The `.int' register contains a positive value if the last output
+     line was interrupted with `\c'; this is associated with the
+     current environment (*note Environments::).
+
+
+
+File: groff,  Node: Page Layout,  Next: Page Control,  Prev: Line Control,  Up: gtroff Reference
+
+Page Layout
+===========
+
+   `gtroff' provides some very primitive operations for controlling
+page layout.
+
+ - Request: .pl [length]
+ - Request: .pl +length
+ - Request: .pl -length
+ - Register: \n[.p]
+     Set the "page length" to LENGTH (or increment or decrement the
+     current value by LENGTH).  This is the length of the physical
+     output page.  The default scaling indicator is `v'.
+
+     The current setting can be found in the read-only number register
+     `.p'.
+
+     Note that this only specifies the size of the page, not the top and
+     bottom margins.  Those are not set by `gtroff' directly.  *Note
+     Traps::, for further information on how to do this.
+
+     Negative `pl' values are possible also, but not very useful: No
+     trap is sprung, and each line is output on a single page (thus
+     suppressing all vertical spacing).
+
+     If no argument or an invalid argument is given, `pl' sets the page
+     length to 11i.
+
+   `gtroff' provides several operations which help in setting up top
+and bottom titles (or headers and footers).
+
+ - Request: .tl 'left'center'right'
+     Print a "title line".  It consists of three parts: a left
+     justified portion, a centered portion, and a right justified
+     portion.  The argument separator `'' can be replaced with any
+     character not occurring in the title line.  The `%' character is
+     replaced with the current page number.  This character can be
+     changed with the `pc' request (see below).
+
+     Without argument, `tl' is ignored.
+
+     Some notes:
+
+        * A title line is not restricted to the top or bottom of a page.
+
+        * `tl' prints the title line immediately, ignoring a partially
+          filled line (which stays untouched).
+
+        * It is not an error to omit closing delimiters.  For example,
+          `.tl /foo' is equivalent to `.tl /foo///': It prints a title
+          line with the left justified word `foo'; the centered and
+          right justfied parts are empty.
+
+        * `tl' accepts the same parameter delimiting characters as the
+          `\A' escape; see *Note Escapes::.
+
+ - Request: .lt [length]
+ - Request: .lt +length
+ - Request: .lt -length
+ - Register: \n[.lt]
+     The title line is printed using its own line length, which is
+     specified (or incremented or decremented) with the `lt' request.
+     Initially, the title line length is set to 6.5i.  If a negative
+     line length is specified (which is not allowed), `gtroff' emits a
+     warning of type `range' and sets the title line length to zero.
+     The default scaling indicator is `m'.  If `lt' is called without
+     an argument, the title length is reset to the previous value
+     before the last call to `lt'.
+
+     The current setting of this is available in the `.lt' read-only
+     number register; it is associated with the current environment
+     (*note Environments::).
+
+
+ - Request: .pn page
+ - Request: .pn +page
+ - Request: .pn -page
+ - Register: \n[.pn]
+     Change (increase or decrease) the page number of the _next_ page.
+     The only argument is the page number; the request is ignored
+     without a parameter.
+
+     The read-only number register `.pn' contains the number of the next
+     page: either the value set by a `pn' request, or the number of the
+     current page plus 1.
+
+ - Register: \n[%]
+     A read-write register holding the current page number.
+
+ - Request: .pc [char]
+     Change the page number character (used by the `tl' request) to a
+     different character.  With no argument, this mechanism is disabled.
+     Note that this doesn't affect the number register `%'.
+
+   *Note Traps::.
+
+
+File: groff,  Node: Page Control,  Next: Fonts and Symbols,  Prev: Page Layout,  Up: gtroff Reference
 
 Page Control
 ============
@@ -47,6 +240,9 @@ Page Control
      `bp' has no effect if not called within the top-level diversion
      (*note Diversions::).
 
+     The number register `.pe' is set to 1 while `bp' is active.  *Note
+     Page Location Traps::.
+
  - Request: .ne [space]
      It is often necessary to force a certain amount of space before a
      new page occurs.  This is most useful to make sure that there is
@@ -125,10 +321,10 @@ Page Control
      registers.
 
 
-File: groff,  Node: Fonts,  Next: Sizes,  Prev: Page Control,  Up: gtroff Reference
+File: groff,  Node: Fonts and Symbols,  Next: Sizes,  Prev: Page Control,  Up: gtroff Reference
 
-Fonts
-=====
+Fonts and Symbols
+=================
 
    `gtroff' can switch fonts at any point in the text.
 
@@ -148,15 +344,15 @@ also at least one symbol font which contains various special symbols
 * Ligatures and Kerning::
 
 
-File: groff,  Node: Changing Fonts,  Next: Font Families,  Prev: Fonts,  Up: Fonts
+File: groff,  Node: Changing Fonts,  Next: Font Families,  Prev: Fonts and Symbols,  Up: Fonts and Symbols
 
 Changing Fonts
 --------------
 
  - Request: .ft [font]
- - Escape: \fF
- - Escape: \f(FN
- - Escape: \f[FONT]
+ - Escape: \ff
+ - Escape: \f(fn
+ - Escape: \f[font]
      The `ft' request and the `\f' escape change the current font to
      FONT (one-character name F, two-character name FN).
 
@@ -200,7 +396,7 @@ Changing Fonts
      used.  If G is missing or equal to F the translation is undone.
 
 
-File: groff,  Node: Font Families,  Next: Font Positions,  Prev: Changing Fonts,  Up: Fonts
+File: groff,  Node: Font Families,  Next: Font Positions,  Prev: Changing Fonts,  Up: Fonts and Symbols
 
 Font Families
 -------------
@@ -220,9 +416,9 @@ different font family on the command line (*note Groff Options::).
 
  - Request: .fam [family]
  - Register: \n[.fam]
- - Escape: \FF
- - Escape: \F(FM
- - Escape: \F[FAMILY]
+ - Escape: \Ff
+ - Escape: \F(fm
+ - Escape: \F[family]
  - Register: \n[.fn]
      Switch font family to FAMILY (one-character name F, two-character
      name FM).  If no argument is given, switch back to the previous
@@ -322,7 +518,7 @@ different font family on the command line (*note Groff Options::).
      *Note Font Positions::.
 
 
-File: groff,  Node: Font Positions,  Next: Using Symbols,  Prev: Font Families,  Up: Fonts
+File: groff,  Node: Font Positions,  Next: Using Symbols,  Prev: Font Families,  Up: Fonts and Symbols
 
 Font Positions
 --------------
@@ -379,9 +575,9 @@ which various fonts are mounted.
 forms to access font positions.
 
  - Request: .ft nnn
- - Escape: \fN
- - Escape: \f(NN
- - Escape: \f[NNN]
+ - Escape: \fn
+ - Escape: \f(nn
+ - Escape: \f[nnn]
      Change the current font position to NNN (one-digit position N,
      two-digit position NN), which must be a non-negative integer.
 
@@ -403,7 +599,7 @@ forms to access font positions.
      *Note Changing Fonts::, for the standard syntax form.
 
 
-File: groff,  Node: Using Symbols,  Next: Special Fonts,  Prev: Font Positions,  Up: Fonts
+File: groff,  Node: Using Symbols,  Next: Special Fonts,  Prev: Font Positions,  Up: Fonts and Symbols
 
 Using Symbols
 -------------
@@ -428,7 +624,7 @@ devices use different names for special fonts.  Fonts mounted with the
 additional special fonts locally (i.e. for a particular font), use the
 `fspecial' request.
 
-   In summary, `gtroff' tries the following to find a given symbol:
+   Here the exact rules how `gtroff' searches a given symbol:
 
    * If the symbol has been defined with the `char' request, use it.
      This hides a symbol with the same name in the current font.
@@ -437,52 +633,178 @@ additional special fonts locally (i.e. for a particular font), use the
 
    * If the symbol has been defined with the `fchar' request, use it.
 
-   * Check all fonts given with the `fspecial' request, in the order of
-     appearance in `fspecial' calls.
+   * Check whether the current font has a font-specific list of special
+     fonts; test all fonts in the order of appearance in the last
+     `fspecial' call if appropriate.
+
+   * If the symbol has been defined with the `fschar' request for the
+     current font, use it.
+
+   * Check all fonts in the order of appearance in the last `special'
+     call.
+
+   * If the symbol has been defined with the `schar' request, use it.
+
+   * As a last resort, consult all fonts loaded up to now for special
+     fonts and check them, starting with the lowest font number.  Note
+     that this can sometimes lead to surprising results since the
+     `fonts' line in the `DESC' file often contains empty positions
+     which are filled later on.  For example, consider the following:
+
+
+          fonts 3 0 0 FOO
 
-   * Check all fonts given with the `special' request, in the order of
-     appearance in `special' calls (inclusively the special fonts
-     defined in the `DESC' file, which come first).
+     This mounts font `foo' at font position 3.  We assume that `FOO'
+     is a special font, containing glyph `foo', and that no font has
+     been loaded yet.  The line
 
-   * As a last resort, consult all fonts loaded up to now (in the order
-     they have been called the first time) for special fonts and check
-     them.
+
+          .fspecial BAR BAZ
+
+     makes font `BAZ' special only if font `BAR' is active.  We further
+     assume that `BAZ' is really a special font, i.e., the font
+     description file contains the `special' keyword, and that it also
+     contains glyph `foo' with a special shape fitting to font `BAR'.
+     After executing `fspecial', font `BAR' is loaded at font
+     position 1, and `BAZ' at position 2.
+
+     We now switch to a new font `XXX', trying to access glyph `foo'
+     which is assumed to be missing.  There are neither font-specific
+     special fonts for `XXX' nor any other fonts made special with the
+     `special' request, so `gtroff' starts the search for special fonts
+     in the list of already mounted fonts, with increasing font
+     positions.  Consequently, it finds `BAZ' before `FOO' even for
+     `XXX' which is not the intended behaviour.
 
    *Note Font Files::, and *Note Special Fonts::, for more details.
 
- - Escape: \(NM
- - Escape: \[NAME]
-     Insert a symbol NAME (two-character name NM).  There is no special
-     syntax for one-character names - the natural form `\N' would
-     collide with escapes.(1) (*note Using Symbols-Footnote-1::)
+   The list of available symbols is device dependent; see the
+`groff_char(7)' man page for a complete list of all glyphs.  For
+example, say
+
+
+     man -Tdvi groff_char > groff_char.dvi
+
+for a list using the default DVI fonts (not all versions of the `man'
+program support the `-T' option).  If you want to use an additional
+macro package to change the used fonts, `groff' must be called directly:
+
+
+     groff -Tdvi -mec -man groff_char.7 > groff_char.dvi
+
+   Glyph names not listed in groff_char(7) are derived algorithmically,
+using a simplified version of the Adobe Glyph List (AGL) algorithm
+described in
+`http://partners.adobe.com/asn/developer/typeforum/unicodegn.html'.
+The (frozen) set of glyph names which can't be derived algorithmically
+is called "groff glyph list (GGL)".
+
+   * A glyph for Unicode character U+XXXX[X[X]] which is not a
+     composite character will be named `uXXXX[X[X]]'.  X must be an
+     uppercase hexadecimal digit.  Examples: `u1234', `u008E',
+     `u12DB8'.  The largest Unicode value is 0x10FFFF.  There must be at
+     least four `X' digits; if necessary, add leading zeroes (after the
+     `u').  No zero padding is allowed for character codes greater than
+     0xFFFF.  Surrogates (i.e., Unicode values greater than 0xFFFF
+     represented with character codes from the surrogate area
+     U+D800-U+DFFF) are not allowed too.
+
+   * A glyph representing more than a single input character will be
+     named
+
+          `u' COMPONENT1 `_' COMPONENT2 `_' COMPONENT3 ...
+
+     Example: `u0045_0302_0301'.
+
+     For simplicity, all Unicode characters which are composites must be
+     decomposed maximally (this is normalization form D in the Unicode
+     standard); for example, `u00CA_0301' is not a valid glyph name
+     since U+00CA (LATIN CAPITAL LETTER E WITH CIRCUMFLEX) can be
+     further decomposed into U+0045 (LATIN CAPITAL LETTER E) and U+0302
+     (COMBINING CIRCUMFLEX ACCENT).  `u0045_0302_0301' is thus the
+     glyph name for U+1EBE, LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND
+     ACUTE.
+
+   * groff maintains a table to decompose all algorithmically derived
+     glyph names which are composites itself.  For example, `u0100'
+     (LATIN LETTER A WITH MACRON) will be automatically decomposed into
+     `u0041_0304'.  Additionally, a glyph name of the GGL is preferred
+     to an algorithmically derived glyph name; groff also automatically
+     does the mapping.  Example: The glyph `u0045_0302' will be mapped
+     to `^E'.
+
+   * glyph names of the GGL can't be used in composite glyph names; for
+     example, `^E_u0301' is invalid.
+
+ - Escape: \(nm
+ - Escape: \[name]
+ - Escape: \[component1 component2 ...]
+     Insert a symbol NAME (two-character name NM) or a composite glyph
+     with component glyphs COMPONENT1, COMPONENT2, .... There is no
+     special syntax for one-character names - the natural form `\N'
+     would collide with escapes.(1) (*note Using Symbols-Footnote-1::)
 
      If NAME is undefined, a warning of type `char' is generated, and
      the escape is ignored.  *Note Debugging::, for information about
      warnings.
 
-     The list of available symbols is device dependent; see the
-     `groff_char(7)' man page for a complete list for the given output
-     device.  For example, say
+     groff resolves `\[...]' with more than a single component as
+     follows:
 
+        * Any component which is found in the GGL will be converted to
+          the `uXXXX' form.
 
-          man -Tdvi groff_char > groff_char.dvi
+        * Any component `uXXXX' which is found in the list of
+          decomposable glyphs will be decomposed.
 
-     for a list using the default DVI fonts (not all versions of the
-     `man' program support the `-T' option).  If you want to use an
-     additional macro package to change the used fonts, `groff' must be
-     called directly:
+        * The resulting elements are then concatenated with `_'
+          inbetween, dropping the leading `u' in all elements but the
+          first.
 
+     No check for the existence of any component (similar to `tr'
+     request) will be done.
 
-          groff -Tdvi -mec -man groff_char.7 > groff_char.dvi
+     Examples:
 
+    `\[A ho]'
+          `A' maps to `u0041', `ho' maps to `u02DB', thus the final
+          glyph name would be `u0041_02DB'.  Note this is not the
+          expected result: The ogonek glyph `ho' is a spacing ogonek,
+          but for a proper composite a non-spacing ogonek (U+0328) is
+          necessary.  Looking into the file `composite.tmac' one can
+          find `.composite ho u0328' which changes the mapping of `ho'
+          while a composite glyph name is constructed, causing the
+          final glyph name to be `u0041_0328'.
 
- - Escape: \C'XXX'
+    `\[^E u0301]'
+    `\[^E aa]'
+    `\[E a^ aa]'
+    `\[E ^ ']'
+          `^E' maps to `u0045_0302', thus the final glyph name is
+          `u0045_0302_0301' in all forms (assuming proper calls of the
+          `composite' request).
+
+     It is not possible to define glyphs with names like `A ho' within
+     a groff font file.  This is not really a limitation; instead, you
+     have to define `u0041_0328'.
+
+ - Escape: \C'xxx'
      Typeset the glyph named XXX.(2) (*note Using Symbols-Footnote-2::)
      Normally it is more convenient to use `\[XXX]', but `\C' has the
      advantage that it is compatible with newer versions of AT&T
      `troff' and is available in compatibility mode.
 
- - Escape: \N'N'
+ - Request: .composite from to
+     Map glyph name FROM to glyph name TO if it is used in `\[...]'
+     with more than one component.  See above for examples.
+
+     This mapping is based on glyph names only; no check for the
+     existence of either glyph is done.
+
+     A set of default mappings for many accents can be found in the file
+     `composite.tmac' which is loaded at start-up.
+
+ - Escape: \N'n'
      Typeset the glyph with code N in the current font (`n' is *not*
      the input character code).  The number N can be any non-negative
      decimal integer.  Most devices only have glyphs with codes between
@@ -500,6 +822,8 @@ additional special fonts locally (i.e. for a particular font), use the
      name of `---'; the `\N' escape sequence is the only way to use
      these.
 
+     No kerning is applied to glyphs accessed with `\N'.
+
    Some escape sequences directly map onto special glyphs.
 
  - Escape: \'
@@ -532,16 +856,17 @@ additional special fonts locally (i.e. for a particular font), use the
 
     `4'
           Lines can be broken after the character (initially the
-          character `-' and the symbols `\(hy' and `\(em' have this
+          character `-' and the symbols `\[hy]' and `\[em]' have this
           property).
 
     `8'
           The character overlaps horizontally (initially the symbols
-          `\(ul\(rn\(ru' have this property).
+          `\[ul]', `\[rn]', `\[ru]', `\[radicalex', and `\[sqrtex]'
+          have this property).
 
     `16'
-          The character overlaps vertically (initially symbol `\(br' has
-          this property).
+          The character overlaps vertically (initially symbol `\[br]'
+          has this property).
 
     `32'
           An end-of-sentence character followed by any number of
@@ -550,10 +875,12 @@ additional special fonts locally (i.e. for a particular font), use the
           words the character is "transparent" for the purposes of
           end-of-sentence recognition - this is the same as having a
           zero space factor in TeX (initially characters `"')]*' and
-          the symbols `\(dg\(rq' have this property).
+          the symbols `\[dg]' and `\[rq]' have this property).
 
  - Request: .char g [string]
  - Request: .fchar g [string]
+ - Request: .fschar f g [string]
+ - Request: .schar g [string]
      Define a new glyph G to be STRING (which can be empty).(4) (*note
      Using Symbols-Footnote-4::)  Every time glyph G needs to be
      printed, STRING is processed in a temporary environment and the
@@ -563,7 +890,7 @@ additional special fonts locally (i.e. for a particular font), use the
      kerning is applied to this object rather than to individual
      characters in STRING.
 
-     A glyph defined by this request can be used just like a normal
+     A glyph defined by these requests can be used just like a normal
      glyph provided by the output device.  In particular, other
      characters can be translated to it with the `tr' or `trin'
      requests; it can be made the leader character by the `lc' request;
@@ -595,12 +922,30 @@ additional special fonts locally (i.e. for a particular font), use the
      current font.  `gtroff' carries out this test before checking
      special fonts.
 
+     `fschar' defines a fallback glyph for font F: `gtroff' checks for
+     glyphs defined with `fschar' after the list of fonts declared as
+     font-specific special fonts with the `fspecial' request, but
+     before the list of fonts declared as global special fonts with the
+     `special' request.
+
+     Finally, the `schar' request defines a global fallback glyph:
+     `gtroff' checks for glyphs defined with `schar' after the list of
+     fonts declared as global special fonts with the `special' request,
+     but before the already mounted special fonts.
+
+     *Note Using Symbols::, for a detailed description of the glyph
+     searching mechanism in `gtroff'.
+
  - Request: .rchar c1 c2 ...
-     Remove the definitions of glyphs C1, C2, .... This undoes the
-     effect of a `char' or `fchar' request.
+ - Request: .rfschar f c1 c2 ...
+     Remove the definitions of glyphs C1, C2, ....  This undoes the
+     effect of a `char', `fchar', or `schar' request.
 
      It is possible to omit the whitespace between arguments.
 
+     The request `rfschar' removes glyph definitions defined with
+     `fschar' for glyph f.
+
    *Note Special Characters::.
 
 
@@ -624,7 +969,7 @@ width, depth, and height, nothing else.  All manipulations with the
    (4) `char' is a misnomer since an output glyph is defined.
 
 
-File: groff,  Node: Special Fonts,  Next: Artificial Fonts,  Prev: Using Symbols,  Up: Fonts
+File: groff,  Node: Special Fonts,  Next: Artificial Fonts,  Prev: Using Symbols,  Up: Fonts and Symbols
 
 Special Fonts
 -------------
@@ -639,20 +984,25 @@ searching mechanism in `gtroff'.
 
    Usually, only non-TTY devices have special fonts.
 
- - Request: .special s1 s2 ...
- - Request: .fspecial f s1 s2 ...
-     Use the `special' request to define special fonts.  They are
-     appended to the list of global special fonts in the given order.
-     The first entries in this list are the fonts defined with the
-     `fonts' command in the `DESC' file which are marked as special in
-     the corresponding font description files.
+ - Request: .special [s1 s2 ...]
+ - Request: .fspecial f [s1 s2 ...]
+     Use the `special' request to define special fonts.  Initially, this
+     list is empty.
 
      Use the `fspecial' request to designate special fonts only when
-     font F font is active.  They are appended to the list of special
-     fonts for F in the given order.  Initially, this list is empty.
+     font F is active.  Initially, this list is empty.
+
+     Previous calls to `special' or `fspecial' are overwritten; without
+     arguments, the particular list of special fonts is set to empty.
+     Special fonts are searched in the order they appear as arguments.
+
+     All fonts which appear in a call to `special' or `fspecial' are
+     loaded.
+
+     *Note Using Symbols::, for the exact search order of glyphs.
 
 
-File: groff,  Node: Artificial Fonts,  Next: Ligatures and Kerning,  Prev: Special Fonts,  Up: Fonts
+File: groff,  Node: Artificial Fonts,  Next: Ligatures and Kerning,  Prev: Special Fonts,  Up: Fonts and Symbols
 
 Artificial Fonts
 ----------------
@@ -663,13 +1013,17 @@ not have a wide variety of fonts, and when `nroff' and `troff' were
 separate programs.  Most of them are no longer necessary in GNU
 `troff'.  Nevertheless, they are supported.
 
- - Escape: \H'HEIGHT'
- - Escape: \H'+HEIGHT'
- - Escape: \H'-HEIGHT'
+ - Escape: \H'height'
+ - Escape: \H'+height'
+ - Escape: \H'-height'
+ - Register: \n[.height]
      Change (increment, decrement) the height of the current font, but
      not the width.  If HEIGHT is zero, restore the original height.
      Default scaling indicator is `z'.
 
+     The read-only number register `.height' contains the font height as
+     set by `\H'.
+
      Currently, only the `-Tps' device supports this feature.
 
      Note that `\H' doesn't produce an input token in `gtroff'.  As a
@@ -691,9 +1045,13 @@ separate programs.  Most of them are no longer necessary in GNU
      prints the word `test' twice with the same font height (five
      points larger than the current font size).
 
- - Escape: \S'SLANT'
+ - Escape: \S'slant'
+ - Register: \n[.slant]
      Slant the current font by SLANT degrees.  Positive values slant to
-     the right.
+     the right.  Only integer values are possible.
+
+     The read-only number register `.slant' contains the font slant as
+     set by `\S'.
 
      Currently, only the `-Tps' device supports this feature.
 
@@ -780,7 +1138,7 @@ separate programs.  Most of them are no longer necessary in GNU
      Default scaling indicator for EM-SIZE is `z'; WIDTH is an integer.
 
 
-File: groff,  Node: Ligatures and Kerning,  Prev: Artificial Fonts,  Up: Fonts
+File: groff,  Node: Ligatures and Kerning,  Prev: Artificial Fonts,  Up: Fonts and Symbols
 
 Ligatures and Kerning
 ---------------------
@@ -797,6 +1155,10 @@ typesetter that was the target of AT&T `troff' also supported `ff',
 include ligatures for `ft' and `ct', although GNU `troff' does not
 support these (yet).
 
+   Only the current font is checked for ligatures and kerns; neither
+special fonts nor entities defined with the `char' request (and its
+siblings) are taken into account.
+
  - Request: .lg [flag]
  - Register: \n[.lg]
      Switch the ligature mechanism on or off; if the parameter is
@@ -931,7 +1293,7 @@ with this.
 
 
 
-File: groff,  Node: Sizes,  Next: Strings,  Prev: Fonts,  Up: gtroff Reference
+File: groff,  Node: Sizes,  Next: Strings,  Prev: Fonts and Symbols,  Up: gtroff Reference
 
 Sizes
 =====
@@ -963,223 +1325,3 @@ Roman', `Helvetica', and `Courier' can't be used together at 10pt; to
 get acceptable output, the size of `Helvetica' has to be reduced by one
 point, and the size of `Courier' must be increased by one point.
 
-
-File: groff,  Node: Changing Type Sizes,  Next: Fractional Type Sizes,  Prev: Sizes,  Up: Sizes
-
-Changing Type Sizes
--------------------
-
- - Request: .ps [size]
- - Request: .ps +size
- - Request: .ps -size
- - Escape: \sSIZE
- - Register: \n[.s]
-     Use the `ps' request or the `\s' escape to change (increase,
-     decrease) the type size (in points).  Specify SIZE as either an
-     absolute point size, or as a relative change from the current size.
-     The size 0, or no argument, goes back to the previous size.
-
-     Default scaling indicator of `size' is `z'.  If `size' is zero or
-     negative, it is set to 1u.
-
-     The read-only number register `.s' returns the point size in
-     points as a decimal fraction.  This is a string.  To get the point
-     size in scaled points, use the `.ps' register instead.
-
-     `.s' is associated with the current environment (*note
-     Environments::).
-
-
-          snap, snap,
-          .ps +2
-          grin, grin,
-          .ps +2
-          wink, wink, \s+2nudge, nudge,\s+8 say no more!
-          .ps 10
-
-     The `\s' escape may be called in a variety of ways.  Much like
-     other escapes there must be a way to determine where the argument
-     ends and the text begins.  Any of the following forms are valid:
-
-    `\sN'
-          Set the point size to N points.  N must be either 0 or in the
-          range 4 to 39.
-
-    `\s+N'
-    `\s-N'
-          Increase or decrease the point size by N points.  N must be
-          exactly one digit.
-
-    `\s(NN'
-          Set the point size to NN points.  NN must be exactly two
-          digits.
-
-    `\s+(NN'
-    `\s-(NN'
-    `\s(+NN'
-    `\s(-NN'
-          Increase or decrease the point size by NN points.  NN must be
-          exactly two digits.
-
-     Note that `\s' doesn't produce an input token in `gtroff'.  As a
-     consequence, it can be used in requests like `mc' (which expects a
-     single character as an argument) to change the font on the fly:
-
-
-          .mc \s[20]x\s[0]
-
-     *Note Fractional Type Sizes::, for yet another syntactical form of
-     using the `\s' escape.
-
- - Request: .sizes s1 s2 ... sn [0]
-     Some devices may only have certain permissible sizes, in which case
-     `gtroff' rounds to the nearest permissible size.  The `DESC' file
-     specifies which sizes are permissible for the device.
-
-     Use the `sizes' request to change the permissible sizes for the
-     current output device.  Arguments are in scaled points; the
-     `sizescale' line in the `DESC' file for the output device provides
-     the scaling factor.  For example, if the scaling factor is 1000,
-     then the value 12000 is 12 points.
-
-     Each argument can be a single point size (such as `12000'), or a
-     range of sizes (such as `4000-72000').  You can optionally end the
-     list with a zero.
-
- - Request: .vs [space]
- - Request: .vs +space
- - Request: .vs -space
- - Register: \n[.v]
-     Change (increase, decrease) the vertical spacing by SPACE.  The
-     default scaling indicator is `p'.
-
-     If `vs' is called without an argument, the vertical spacing is
-     reset to the previous value before the last call to `vs'.
-
-     `gtroff' creates a warning of type `range' if SPACE is zero or
-     negative; the vertical spacing is then set to the vertical
-     resolution (as given in the `.V' register).
-
-     The read-only number register `.v' contains the current vertical
-     spacing; it is associated with the current environment (*note
-     Environments::).
-
-   The effective vertical line spacing consists of four components.
-
-   * The vertical line spacing as set with the `vs' request.
-
-   * The "post-vertical line spacing" as set with the `pvs' request.
-     This is vertical space which will be added after a line has been
-     output.
-
-   * The "extra pre-vertical line space" as set with the `\x' request,
-     using a negative value.  This is vertical space which will be
-     added once before the current line has been output.
-
-   * The "extra post-vertical line space" as set with the `\x' request,
-     using a positive value.  This is vertical space which will be
-     added once after the current line has been output.
-
-   It is usually better to use `vs' or `pvs' instead of `ls' to produce
-double-spaced documents: `vs' and `pvs' have a finer granularity for
-the inserted vertical space compared to `ls'; furthermore, certain
-preprocessors assume single-spacing.
-
-   *Note Manipulating Spacing::, for more details on the `\x' escape
-and the `ls' request.
-
- - Request: .pvs [space]
- - Request: .pvs +space
- - Request: .pvs -space
- - Register: \n[.pvs]
-     Change (increase, decrease) the post-vertical spacing by SPACE.
-     The default scaling indicator is `p'.
-
-     If `pvs' is called without an argument, the post-vertical spacing
-     is reset to the previous value before the last call to `pvs'.
-
-     `gtroff' creates a warning of type `range' if SPACE is zero or
-     negative; the vertical spacing is then set to zero.
-
-     The read-only number register `.pvs' contains the current
-     post-vertical spacing; it is associated with the current
-     environment (*note Environments::).
-
-
-File: groff,  Node: Fractional Type Sizes,  Prev: Changing Type Sizes,  Up: Sizes
-
-Fractional Type Sizes
----------------------
-
-   A "scaled point" is equal to 1/SIZESCALE points, where SIZESCALE is
-specified in the `DESC' file (1 by default).  There is a new scale
-indicator `z' which has the effect of multiplying by SIZESCALE.
-Requests and escape sequences in `gtroff' interpret arguments that
-represent a point size as being in units of scaled points, but they
-evaluate each such argument using a default scale indicator of `z'.
-Arguments treated in this way are the argument to the `ps' request, the
-third argument to the `cs' request, the second and fourth arguments to
-the `tkf' request, the argument to the `\H' escape sequence, and those
-variants of the `\s' escape sequence that take a numeric expression as
-their argument (see below).
-
-   For example, suppose SIZESCALE is 1000; then a scaled point is
-equivalent to a millipoint; the request `.ps 10.25' is equivalent to
-`.ps 10.25z' and thus sets the point size to 10250 scaled points, which
-is equal to 10.25 points.
-
-   `gtroff' disallows the use of the `z' scale indicator in instances
-where it would make no sense, such as a numeric expression whose
-default scale indicator was neither `u' nor `z'.  Similarly it would
-make no sense to use a scaling indicator other than `z' or `u' in a
-numeric expression whose default scale indicator was `z', and so
-`gtroff' disallows this as well.
-
-   There is also new scale indicator `s' which multiplies by the number
-of units in a scaled point.  So, for example, `\n[.ps]s' is equal to
-`1m'.  Be sure not to confuse the `s' and `z' scale indicators.
-
- - Register: \n[.ps]
-     A read-only number register returning the point size in scaled
-     points.
-
-     `.ps' is associated with the current environment (*note
-     Environments::).
-
- - Register: \n[.psr]
- - Register: \n[.sr]
-     The last-requested point size in scaled points is contained in the
-     `.psr' read-only number register.  The last requested point size
-     in points as a decimal fraction can be found in `.sr'.  This is a
-     string-valued read-only number register.
-
-     Note that the requested point sizes are device-independent, whereas
-     the values returned by the `.ps' and `.s' registers are not.  For
-     example, if a point size of 11pt is requested, and a `sizes'
-     request (or a `sizescale' line in a `DESC' file) specifies 10.95pt
-     instead, this value is actually used.
-
-     Both registers are associated with the current environment (*note
-     Environments::).
-
-   The `\s' escape has the following syntax for working with fractional
-type sizes:
-
-`\s[N]'
-`\s'N''
-     Set the point size to N scaled points; N is a numeric expression
-     with a default scale indicator of `z'.
-
-`\s[+N]'
-`\s[-N]'
-`\s+[N]'
-`\s-[N]'
-`\s'+N''
-`\s'-N''
-`\s+'N''
-`\s-'N''
-     Increase or or decrease the point size by N scaled points; N is a
-     numeric expression with a default scale indicator of `z'.
-
-   *Note Font Files::.
-
diff --git a/contrib/groff/doc/groff-6 b/contrib/groff/doc/groff-6
index c7d9b81..f7f01e1 100644
--- a/contrib/groff/doc/groff-6
+++ b/contrib/groff/doc/groff-6
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,232 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Changing Type Sizes,  Next: Fractional Type Sizes,  Prev: Sizes,  Up: Sizes
+
+Changing Type Sizes
+-------------------
+
+ - Request: .ps [size]
+ - Request: .ps +size
+ - Request: .ps -size
+ - Escape: \ssize
+ - Register: \n[.s]
+     Use the `ps' request or the `\s' escape to change (increase,
+     decrease) the type size (in points).  Specify SIZE as either an
+     absolute point size, or as a relative change from the current size.
+     The size 0, or no argument, goes back to the previous size.
+
+     Default scaling indicator of `size' is `z'.  If `size' is zero or
+     negative, it is set to 1u.
+
+     The read-only number register `.s' returns the point size in
+     points as a decimal fraction.  This is a string.  To get the point
+     size in scaled points, use the `.ps' register instead.
+
+     `.s' is associated with the current environment (*note
+     Environments::).
+
+
+          snap, snap,
+          .ps +2
+          grin, grin,
+          .ps +2
+          wink, wink, \s+2nudge, nudge,\s+8 say no more!
+          .ps 10
+
+     The `\s' escape may be called in a variety of ways.  Much like
+     other escapes there must be a way to determine where the argument
+     ends and the text begins.  Any of the following forms are valid:
+
+    `\sN'
+          Set the point size to N points.  N must be either 0 or in the
+          range 4 to 39.
+
+    `\s+N'
+    `\s-N'
+          Increase or decrease the point size by N points.  N must be
+          exactly one digit.
+
+    `\s(NN'
+          Set the point size to NN points.  NN must be exactly two
+          digits.
+
+    `\s+(NN'
+    `\s-(NN'
+    `\s(+NN'
+    `\s(-NN'
+          Increase or decrease the point size by NN points.  NN must be
+          exactly two digits.
+
+     Note that `\s' doesn't produce an input token in `gtroff'.  As a
+     consequence, it can be used in requests like `mc' (which expects a
+     single character as an argument) to change the font on the fly:
+
+
+          .mc \s[20]x\s[0]
+
+     *Note Fractional Type Sizes::, for yet another syntactical form of
+     using the `\s' escape.
+
+ - Request: .sizes s1 s2 ... sn [0]
+     Some devices may only have certain permissible sizes, in which case
+     `gtroff' rounds to the nearest permissible size.  The `DESC' file
+     specifies which sizes are permissible for the device.
+
+     Use the `sizes' request to change the permissible sizes for the
+     current output device.  Arguments are in scaled points; the
+     `sizescale' line in the `DESC' file for the output device provides
+     the scaling factor.  For example, if the scaling factor is 1000,
+     then the value 12000 is 12 points.
+
+     Each argument can be a single point size (such as `12000'), or a
+     range of sizes (such as `4000-72000').  You can optionally end the
+     list with a zero.
+
+ - Request: .vs [space]
+ - Request: .vs +space
+ - Request: .vs -space
+ - Register: \n[.v]
+     Change (increase, decrease) the vertical spacing by SPACE.  The
+     default scaling indicator is `p'.
+
+     If `vs' is called without an argument, the vertical spacing is
+     reset to the previous value before the last call to `vs'.
+
+     `gtroff' creates a warning of type `range' if SPACE is negative;
+     the vertical spacing is then set to the vertical resolution (as
+     given in the `.V' register).
+
+     The read-only number register `.v' contains the current vertical
+     spacing; it is associated with the current environment (*note
+     Environments::).
+
+   The effective vertical line spacing consists of four components.
+
+   * The vertical line spacing as set with the `vs' request.
+
+   * The "post-vertical line spacing" as set with the `pvs' request.
+     This is vertical space which will be added after a line has been
+     output.
+
+   * The "extra pre-vertical line space" as set with the `\x' request,
+     using a negative value.  This is vertical space which will be
+     added once before the current line has been output.
+
+   * The "extra post-vertical line space" as set with the `\x' request,
+     using a positive value.  This is vertical space which will be
+     added once after the current line has been output.
+
+   It is usually better to use `vs' or `pvs' instead of `ls' to produce
+double-spaced documents: `vs' and `pvs' have a finer granularity for
+the inserted vertical space compared to `ls'; furthermore, certain
+preprocessors assume single-spacing.
+
+   *Note Manipulating Spacing::, for more details on the `\x' escape
+and the `ls' request.
+
+ - Request: .pvs [space]
+ - Request: .pvs +space
+ - Request: .pvs -space
+ - Register: \n[.pvs]
+     Change (increase, decrease) the post-vertical spacing by SPACE.
+     The default scaling indicator is `p'.
+
+     If `pvs' is called without an argument, the post-vertical spacing
+     is reset to the previous value before the last call to `pvs'.
+
+     `gtroff' creates a warning of type `range' if SPACE is zero or
+     negative; the vertical spacing is then set to zero.
+
+     The read-only number register `.pvs' contains the current
+     post-vertical spacing; it is associated with the current
+     environment (*note Environments::).
+
+
+File: groff,  Node: Fractional Type Sizes,  Prev: Changing Type Sizes,  Up: Sizes
+
+Fractional Type Sizes
+---------------------
+
+   A "scaled point" is equal to 1/SIZESCALE points, where SIZESCALE is
+specified in the `DESC' file (1 by default).  There is a new scale
+indicator `z' which has the effect of multiplying by SIZESCALE.
+Requests and escape sequences in `gtroff' interpret arguments that
+represent a point size as being in units of scaled points, but they
+evaluate each such argument using a default scale indicator of `z'.
+Arguments treated in this way are the argument to the `ps' request, the
+third argument to the `cs' request, the second and fourth arguments to
+the `tkf' request, the argument to the `\H' escape sequence, and those
+variants of the `\s' escape sequence that take a numeric expression as
+their argument (see below).
+
+   For example, suppose SIZESCALE is 1000; then a scaled point is
+equivalent to a millipoint; the request `.ps 10.25' is equivalent to
+`.ps 10.25z' and thus sets the point size to 10250 scaled points, which
+is equal to 10.25 points.
+
+   `gtroff' disallows the use of the `z' scale indicator in instances
+where it would make no sense, such as a numeric expression whose
+default scale indicator was neither `u' nor `z'.  Similarly it would
+make no sense to use a scaling indicator other than `z' or `u' in a
+numeric expression whose default scale indicator was `z', and so
+`gtroff' disallows this as well.
+
+   There is also new scale indicator `s' which multiplies by the number
+of units in a scaled point.  So, for example, `\n[.ps]s' is equal to
+`1m'.  Be sure not to confuse the `s' and `z' scale indicators.
+
+ - Register: \n[.ps]
+     A read-only number register returning the point size in scaled
+     points.
+
+     `.ps' is associated with the current environment (*note
+     Environments::).
+
+ - Register: \n[.psr]
+ - Register: \n[.sr]
+     The last-requested point size in scaled points is contained in the
+     `.psr' read-only number register.  The last requested point size
+     in points as a decimal fraction can be found in `.sr'.  This is a
+     string-valued read-only number register.
+
+     Note that the requested point sizes are device-independent, whereas
+     the values returned by the `.ps' and `.s' registers are not.  For
+     example, if a point size of 11pt is requested, and a `sizes'
+     request (or a `sizescale' line in a `DESC' file) specifies 10.95pt
+     instead, this value is actually used.
+
+     Both registers are associated with the current environment (*note
+     Environments::).
+
+   The `\s' escape has the following syntax for working with fractional
+type sizes:
+
+`\s[N]'
+`\s'N''
+     Set the point size to N scaled points; N is a numeric expression
+     with a default scale indicator of `z'.
+
+`\s[+N]'
+`\s[-N]'
+`\s+[N]'
+`\s-[N]'
+`\s'+N''
+`\s'-N''
+`\s+'N''
+`\s-'N''
+     Increase or or decrease the point size by N scaled points; N is a
+     numeric expression with a default scale indicator of `z'.
+
+   *Note Font Files::.
+
+
 File: groff,  Node: Strings,  Next: Conditionals and Loops,  Prev: Sizes,  Up: gtroff Reference
 
 Strings
@@ -33,16 +254,16 @@ this is a read-write string variable).
 
  - Request: .ds name [string]
  - Request: .ds1 name [string]
- - Escape: \*N
- - Escape: \*(NM
- - Escape: \*[NAME ARG1 ARG2 ...]
+ - Escape: \*n
+ - Escape: \*(nm
+ - Escape: \*[name arg1 arg2 ...]
      Define and access a string variable NAME (one-character name N,
      two-character name NM).  If NAME already exists, `ds' overwrites
      the previous definition.  Only the syntax form using brackets can
      take arguments which are handled identically to macro arguments;
      the single exception is that a closing bracket as an argument must
-     be enclosed in double quotes.  *Note Request Arguments::, and
-     *Note Parameters::.
+     be enclosed in double quotes.  *Note Request and Macro
+     Arguments::, and *Note Parameters::.
 
      Example:
 
@@ -231,7 +452,7 @@ requests.
 
 
           .ds xxx abcd\h'3i'efgh
-          .length yyy \n[xxx]
+          .length yyy \*[xxx]
           \n[yyy]
               => 14
 
@@ -604,12 +825,12 @@ invoked multiple times.  Use macros to define common operations.
      Note that macro identifiers are shared with identifiers for
      strings and diversions.
 
- - Request: .am xx
- - Request: .am1 xx
- - Request: .ami xx yy
-     Works similarly to `de' except it appends onto the macro named XX.
-     So, to make the previously defined `P' macro actually do indented
-     instead of block paragraphs, add the necessary code to the
+ - Request: .am name [end]
+ - Request: .am1 name [end]
+ - Request: .ami 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:
 
 
@@ -623,7 +844,7 @@ invoked multiple times.  Use macros to define common operations.
      a "compatibility restore" input token at the end.
 
      The `ami' request appends indirectly, meaning that `gtroff'
-     expands strings whose names are XX or YY before performing the
+     expands strings whose names are NAME or END before performing the
      append.
 
      Using `trace.tmac', you can trace calls to `am' and `am1'.
@@ -689,9 +910,9 @@ escapes.
    Any individual argument can be retrieved with one of the following
 escapes:
 
- - Escape: \$N
- - Escape: \$(NN
- - Escape: \$[NNN]
+ - 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
@@ -714,7 +935,7 @@ escapes:
      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 Arguments::).
+     preserved (see *Note Request and Macro Arguments::).
 
  - Escape: \$0
      The name used to invoke the current macro.  The `als' request can
@@ -733,7 +954,7 @@ escapes:
           .als bar generic-macro
 
 
-   *Note Request Arguments::.
+   *Note Request and Macro Arguments::.
 
 
 File: groff,  Node: Page Motions,  Next: Drawing Requests,  Prev: Writing Macros,  Up: gtroff Reference
@@ -821,7 +1042,7 @@ for vertical motion, `sp'.
 
    The following escapes give fine control of movements about the page.
 
- - Escape: \v'E'
+ - Escape: \v'e'
      Move vertically, usually from the current location on the page (if
      no absolute position operator `|' is used).  The argument E
      specifies the distance to move; positive is downwards and negative
@@ -846,12 +1067,15 @@ for vertical motion, `sp'.
  - Escape: \d
      Move down .5v.
 
- - Escape: \h'E'
+ - Escape: \h'e'
      Move horizontally, usually from the current location (if no
      absolute position operator `|' is used).  The expression E
      indicates how far to move: positive is rightwards and negative
      leftwards.  The default scaling indicator for this escape is `m'.
 
+     This horizontal space is not discarded at the end of a line.  To
+     insert discardable space of a certain length use the `ss' request.
+
    There are a number of special-case escapes for horizontal motion.
 
  - Escape: \<SP>
@@ -878,7 +1102,7 @@ for vertical motion, `sp'.
 
      .ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 
- - Escape: \w'TEXT'
+ - Escape: \w'text'
  - Register: \n[st]
  - Register: \n[sb]
  - Register: \n[rst]
@@ -907,7 +1131,8 @@ for vertical motion, `sp'.
     `rsb'
           Like the `st' and `sb' registers, but takes account of the
           heights and depths of glyphs.  With other words, this gives
-          the highest and lowest point of TEXT.
+          the highest and lowest point of TEXT.  Values below the
+          baseline are negative.
 
     `ct'
           Defines the kinds of glyphs occurring in TEXT:
@@ -933,9 +1158,9 @@ for vertical motion, `sp'.
           argument, the center of an accent from a roman font should be
           placed over that glyph.
 
- - Escape: \kP
- - Escape: \k(PS
- - Escape: \k[POSITION]
+ - Escape: \kp
+ - Escape: \k(ps
+ - Escape: \k[position]
      Store the current horizontal position in the _input_ line in
      number register with name POSITION (one-character name P,
      two-character name PS).  Use this, for example, to return to the
@@ -948,15 +1173,15 @@ for vertical motion, `sp'.
      A read-only number register containing the current horizontal
      output position.
 
- - Escape: \o'ABC'
+ - Escape: \o'abc'
      Overstrike glyphs A, B, C, ...; the glyphs are centered, and the
      resulting spacing is the largest width of the affected glyphs.
 
- - Escape: \zG
+ - Escape: \zg
      Print glyph G with zero width, i.e., without spacing.  Use this to
      overstrike glyphs left-aligned.
 
- - Escape: \Z'ANYTHING'
+ - Escape: \Z'anything'
      Print ANYTHING, then restore the horizontal and vertical position.
      The argument may not contain tabs or leaders.
 
@@ -988,8 +1213,8 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
 
    All drawing is done via escapes.
 
- - Escape: \l'L'
- - Escape: \l'LG'
+ - Escape: \l'l'
+ - Escape: \l'lg'
      Draw a line horizontally.  L is the length of the line to be
      drawn.  If it is positive, start the line at the current location
      and draw to the right; its end point is the new current location.
@@ -1022,8 +1247,8 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
      location to the beginning of the _input_ line - this works because
      the line length is negative, not moving the current point.
 
- - Escape: \L'L'
- - Escape: \L'LG'
+ - Escape: \L'l'
+ - Escape: \L'lg'
      Draw vertical lines.  Its parameters are similar to the `\l'
      escape, except that the default scaling indicator is `v'.  The
      movement is downwards for positive values, and upwards for
@@ -1043,7 +1268,7 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
                     |test.
 
 
- - Escape: \D'COMMAND ARG ...'
+ - Escape: \D'command arg ...'
      The `\D' escape provides a variety of drawing functions.  Note
      that on character devices, only vertical and horizontal lines are
      supported within `grotty'; other devices may only support a subset
@@ -1051,7 +1276,9 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
 
      The default scaling indicator for all subcommands of `\D' is `m'
      for horizontal distances and `v' for vertical ones.  Exceptions
-     are `\D'f ...'' and `\D't ...'' which use `u' as the default.
+     are `\D'f ...'' and `\D't ...'' which use `u' as the default, and
+     `\D'FX ...'' which arguments are treated similar to the `defcolor'
+     request.
 
     `\D'l DX DY''
           Draw a line from the current location to the relative point
@@ -1083,30 +1310,35 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
 
     `\D'c D''
           Draw a circle with a diameter of D with the leftmost point at
-          the current position.
+          the current position.  After drawing, the current location is
+          positioned at the rightmost point of the circle.
 
     `\D'C D''
-          Draw a solid circle with the same parameters as an outlined
-          circle.  No outline is drawn.
+          Draw a solid circle with the same parameters and behaviour as
+          an outlined circle.  No outline is drawn.
 
     `\D'e X Y''
           Draw an ellipse with a horizontal diameter of X and a vertical
           diameter of Y with the leftmost point at the current position.
+          After drawing, the current location is positioned at the
+          rightmost point of the ellipse.
 
     `\D'E X Y''
-          Draw a solid ellipse with the same parameters as an outlined
-          ellipse.  No outline is drawn.
+          Draw a solid ellipse with the same parameters and behaviour
+          as an outlined ellipse.  No outline is drawn.
 
     `\D'a DX1 DY1 DX2 DY2''
           Draw an arc clockwise from the current location through the
           two specified relative locations (DX1,DY1) and (DX2,DY2).
           The coordinates of the first point are relative to the
           current position, and the coordinates of the second point are
-          relative to the first point.
+          relative to the first point.  After drawing, the current
+          position is moved to the final point of the arc.
 
     `\D'~ DX1 DY1 DX2 DY2 ...''
           Draw a spline from the current location to the relative point
-          (DX1,DY1) and then to (DX2,DY2), and so on.
+          (DX1,DY1) and then to (DX2,DY2), and so on.  The current
+          position is moved to the terminal point of the drawn curve.
 
     `\D'f N''
           Set the shade of gray to be used for filling solid objects
@@ -1116,15 +1348,27 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
           applies only to solid circles, solid ellipses, and solid
           polygons.  By default, a level of 1000 is used.
 
+          Despite of being silly, the current point is moved
+          horizontally to the right by N.
+
+          Don't use this command!  It has the serious drawback that it
+          will be always rounded to the next integer multiple of the
+          horizontal resolution (the value of the `hor' keyword in the
+          `DESC' file).  Use `\M' (*note Colors::) or `\D'Fg ...''
+          instead.
+
     `\D'p DX1 DY1 DX2 DY2 ...''
           Draw a polygon from the current location to the relative
           position (DX1,DY1) and then to (DX2,DY2) and so on.  When the
           specified data points are exhausted, a line is drawn back to
-          the starting point.
+          the starting point.  The current position is changed by
+          adding the sum of all arguments with odd index to the actual
+          horizontal position and the even ones to the vertical
+          position.
 
     `\D'P DX1 DY1 DX2 DY2 ...''
-          Draw a solid polygon with the same parameters as an outlined
-          polygon.  No outline is drawn.
+          Draw a solid polygon with the same parameters and behaviour
+          as an outlined polygon.  No outline is drawn.
 
           Here a better variant of the box macro to fill the box with
           some color.  Note that the box must be drawn before the text
@@ -1154,9 +1398,27 @@ or `ggrn'.  *Note gpic::, and *Note ggrn::, for more information.
           current point size (this is the default behaviour of AT&T
           `troff').
 
+          Despite of being silly, the current point is moved
+          horizontally to the right by N.
+
+    `\D'FSCHEME COLOR_COMPONENTS''
+          Change current fill color.  SCHEME is a single letter
+          denoting the color scheme: `r' (rgb), `c' (cmy), `k' (cmyk),
+          `g' (gray), or `d' (default color).  The color components use
+          exactly the same syntax as in the `defcolor' request (*note
+          Colors::); the command `\D'Fd'' doesn't take an argument.
+
+          _No_ position changing!
+
+          Examples:
+
+
+          \D'Fg .3'      \" same gray as \D'f 700' \D'Fr #0000ff' \"
+          blue
+
    *Note Graphics Commands::.
 
- - Escape: \b'STRING'
+ - Escape: \b'string'
      "Pile" a sequence of glyphs vertically, and center it vertically
      on the current line.  Use it to build large brackets and braces.
 
@@ -1198,218 +1460,3 @@ trap is "sprung" if the associated macro is executed.
 * Blank Line Traps::
 * End-of-input Traps::
 
-
-File: groff,  Node: Page Location Traps,  Next: Diversion Traps,  Prev: Traps,  Up: Traps
-
-Page Location Traps
--------------------
-
-   "Page location traps" perform an action when `gtroff' reaches or
-passes a certain vertical location on the page.  Page location traps
-have a variety of purposes, including:
-
-   * setting headers and footers
-
-   * setting body text in multiple columns
-
-   * setting footnotes
-
- - Request: .vpt flag
- - Register: \n[.vpt]
-     Enable vertical position traps if FLAG is non-zero, or disables
-     them otherwise.  Vertical position traps are traps set by the `wh'
-     or `dt' requests.  Traps set by the `it' request are not vertical
-     position traps.  The parameter that controls whether vertical
-     position traps are enabled is global.  Initially vertical position
-     traps are enabled.  The current setting of this is available in the
-     `.vpt' read-only number register.
-
- - Request: .wh dist [macro]
-     Set a page location trap.  Positive values for DIST set the trap
-     relative to the top of the page; negative values set the trap
-     relative to the bottom of the page.  Default scaling indicator is
-     `v'.
-
-     MACRO is the name of the macro to execute when the trap is sprung.
-     If MACRO is missing, remove the first trap (if any) at DIST.
-
-     The following is a simple example of how many macro packages set
-     headers and footers.
-
-
-          .de hd                \" Page header
-          '  sp .5i
-          .  tl 'Title''date'
-          '  sp .3i
-          ..
-          .
-          .de fo                \" Page footer
-          '  sp 1v
-          .  tl ''%''
-          '  bp
-          ..
-          .
-          .wh 0   hd            \" trap at top of the page
-          .wh -1i fo            \" trap one inch from bottom
-
-     A trap at or below the bottom of the page is ignored; it can be
-     made active by either moving it up or increasing the page length
-     so that the trap is on the page.
-
-     It is possible to have more than one trap at the same location; to
-     do so, the traps must be defined at different locations, then
-     moved together with the `ch' request; otherwise the second trap
-     would replace the first one.  Earlier defined traps hide later
-     defined traps if moved to the same position (the many empty lines
-     caused by the `bp' request are omitted):
-
-
-          .de a
-          .  nop a
-          ..
-          .de b
-          .  nop b
-          ..
-          .de c
-          .  nop c
-          ..
-          .
-          .wh 1i a
-          .wh 2i b
-          .wh 3i c
-          .bp
-              => a b c
-
-
-          .ch b 1i
-          .ch c 1i
-          .bp
-              => a
-
-
-          .ch a 0.5i
-          .bp
-              => a b
-
-
- - Register: \n[.t]
-     A read-only number register holding the distance to the next trap.
-
-     If there are no traps between the current position and the bottom
-     of the page, it contains the distance to the page bottom.  In a
-     diversion, the distance to the page bottom is infinite (the
-     returned value is the biggest integer which can be represented in
-     `groff') if there are no diversion traps.
-
- - Request: .ch macro dist
-     Change the location of a trap.  The first argument is the name of
-     the macro to be invoked at the trap, and the second argument is
-     the new location for the trap (note that the parameters are
-     specified the opposite of the `wh' request).  This is useful for
-     building up footnotes in a diversion to allow more space at the
-     bottom of the page for them.
-
-     Default scaling indicator for DIST is `v'.  If DIST is missing,
-     the trap is removed.
-
-
- - Register: \n[.ne]
-     The read-only number register `.ne' contains the amount of space
-     that was needed in the last `ne' request that caused a trap to be
-     sprung.  Useful in conjunction with the `.trunc' register.  *Note
-     Page Control::, for more information.
-
- - Register: \n[.trunc]
-     A read-only register containing the amount of vertical space
-     truncated by the most recently sprung vertical position trap, or,
-     if the trap was sprung by an `ne' request, minus the amount of
-     vertical motion produced by the `ne' request.  In other words, at
-     the point a trap is sprung, it represents the difference of what
-     the vertical position would have been but for the trap, and what
-     the vertical position actually is.
-
-
-File: groff,  Node: Diversion Traps,  Next: Input Line Traps,  Prev: Page Location Traps,  Up: Traps
-
-Diversion Traps
----------------
-
- - Request: .dt dist macro
-     Set a trap _within_ a diversion.  DIST is the location of the trap
-     (identical to the `.wh' request; default scaling indicator is `v')
-     and MACRO is the name of the macro to be invoked.  The number
-     register `.t' still works within diversions.  *Note Diversions::,
-     for more information.
-
-
-File: groff,  Node: Input Line Traps,  Next: Blank Line Traps,  Prev: Diversion Traps,  Up: Traps
-
-Input Line Traps
-----------------
-
- - Request: .it n macro
- - Request: .itc n macro
-     Set an input line trap.  N is the number of lines of input which
-     may be read before springing the trap, MACRO is the macro to be
-     invoked.  Request lines are not counted as input lines.
-
-     For example, one possible use is to have a macro which prints the
-     next N lines in a bold font.
-
-
-          .de B
-          .  it \\$1 B-end
-          .  ft B
-          ..
-          .
-          .de B-end
-          .  ft R
-          ..
-
-     The `itc' request is identical, except that a line interrupted
-     with `\c' counts as one input line.
-
-     Both requests are associated with the current environment (*note
-     Environments::); switching to another environment disables the
-     current input trap, and going back reactivates it, restoring the
-     number of already processed lines.
-
-
-File: groff,  Node: Blank Line Traps,  Next: End-of-input Traps,  Prev: Input Line Traps,  Up: Traps
-
-Blank Line Traps
-----------------
-
- - Request: .blm macro
-     Set a blank line trap.  `gtroff' executes MACRO when it encounters
-     a blank line in the input file.
-
-
-File: groff,  Node: End-of-input Traps,  Prev: Blank Line Traps,  Up: Traps
-
-End-of-input Traps
-------------------
-
- - Request: .em macro
-     Set a trap at the end of input.  MACRO is executed after the last
-     line of the input file has been processed.
-
-     For example, if the document had to have a section at the bottom
-     of the last page for someone to approve it, the `em' request could
-     be used.
-
-
-          .de approval
-          .  ne 5v
-          .  sp |(\\n[.t] - 6v)
-          .  in +4i
-          .  lc _
-          .  br
-          Approved:\t\a
-          .  sp
-          Date:\t\t\a
-          ..
-          .
-          .em approval
-
-
diff --git a/contrib/groff/doc/groff-7 b/contrib/groff/doc/groff-7
index 382e218..edf7290 100644
--- a/contrib/groff/doc/groff-7
+++ b/contrib/groff/doc/groff-7
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,268 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Page Location Traps,  Next: Diversion Traps,  Prev: Traps,  Up: Traps
+
+Page Location Traps
+-------------------
+
+   "Page location traps" perform an action when `gtroff' reaches or
+passes a certain vertical location on the page.  Page location traps
+have a variety of purposes, including:
+
+   * setting headers and footers
+
+   * setting body text in multiple columns
+
+   * setting footnotes
+
+ - Request: .vpt flag
+ - Register: \n[.vpt]
+     Enable vertical position traps if FLAG is non-zero, or disables
+     them otherwise.  Vertical position traps are traps set by the `wh'
+     or `dt' requests.  Traps set by the `it' request are not vertical
+     position traps.  The parameter that controls whether vertical
+     position traps are enabled is global.  Initially vertical position
+     traps are enabled.  The current setting of this is available in the
+     `.vpt' read-only number register.
+
+     Note that a page can't be ejected if `vpt' is set to zero.
+
+ - Request: .wh dist [macro]
+     Set a page location trap.  Non-negative values for DIST set the
+     trap relative to the top of the page; negative values set the trap
+     relative to the bottom of the page.  Default scaling indicator is
+     `v'.
+
+     MACRO is the name of the macro to execute when the trap is sprung.
+     If MACRO is missing, remove the first trap (if any) at DIST.
+
+     The following is a simple example of how many macro packages set
+     headers and footers.
+
+
+          .de hd                \" Page header
+          '  sp .5i
+          .  tl 'Title''date'
+          '  sp .3i
+          ..
+          .
+          .de fo                \" Page footer
+          '  sp 1v
+          .  tl ''%''
+          '  bp
+          ..
+          .
+          .wh 0   hd            \" trap at top of the page
+          .wh -1i fo            \" trap one inch from bottom
+
+     A trap at or below the bottom of the page is ignored; it can be
+     made active by either moving it up or increasing the page length
+     so that the trap is on the page.
+
+     It is possible to have more than one trap at the same location; to
+     do so, the traps must be defined at different locations, then
+     moved together with the `ch' request; otherwise the second trap
+     would replace the first one.  Earlier defined traps hide later
+     defined traps if moved to the same position (the many empty lines
+     caused by the `bp' request are omitted in the following example):
+
+
+          .de a
+          .  nop a
+          ..
+          .de b
+          .  nop b
+          ..
+          .de c
+          .  nop c
+          ..
+          .
+          .wh 1i a
+          .wh 2i b
+          .wh 3i c
+          .bp
+              => a b c
+
+
+          .ch b 1i
+          .ch c 1i
+          .bp
+              => a
+
+
+          .ch a 0.5i
+          .bp
+              => a b
+
+
+ - Register: \n[.t]
+     A read-only number register holding the distance to the next trap.
+
+     If there are no traps between the current position and the bottom
+     of the page, it contains the distance to the page bottom.  In a
+     diversion, the distance to the page bottom is infinite (the
+     returned value is the biggest integer which can be represented in
+     `groff') if there are no diversion traps.
+
+ - Request: .ch macro [dist]
+     Change the location of a trap.  The first argument is the name of
+     the macro to be invoked at the trap, and the second argument is
+     the new location for the trap (note that the parameters are
+     specified in opposite order as in the `wh' request).  This is
+     useful for building up footnotes in a diversion to allow more
+     space at the bottom of the page for them.
+
+     Default scaling indicator for DIST is `v'.  If DIST is missing,
+     the trap is removed.
+
+
+ - Register: \n[.ne]
+     The read-only number register `.ne' contains the amount of space
+     that was needed in the last `ne' request that caused a trap to be
+     sprung.  Useful in conjunction with the `.trunc' register.  *Note
+     Page Control::, for more information.
+
+     Since the `.ne' register is only set by traps it doesn't make much
+     sense to use it outside of trap macros.
+
+ - Register: \n[.trunc]
+     A read-only register containing the amount of vertical space
+     truncated by the most recently sprung vertical position trap, or,
+     if the trap was sprung by an `ne' request, minus the amount of
+     vertical motion produced by the `ne' request.  In other words, at
+     the point a trap is sprung, it represents the difference of what
+     the vertical position would have been but for the trap, and what
+     the vertical position actually is.
+
+     Since the `.trunc' register is only set by traps and it doesn't
+     make much sense to use it outside of trap macros.
+
+ - Register: \n[.pe]
+     A read-only register which is set to 1 while a page is ejected with
+     the `bp' request (or by the end of input).
+
+     Outside of traps this register is always zero.  In the following
+     example, only the second call to `x' is caused by `bp'.
+
+
+          .de x
+          \&.pe=\\n[.pe]
+          .br
+          ..
+          .wh 1v x
+          .wh 4v x
+          A line.
+          .br
+          Another line.
+          .br
+              => A line.
+                        .pe=0
+                        Another line.
+          
+                        .pe=1
+
+
+   An important fact to consider while designing macros is that
+diversions and traps do not interact normally.  For example, if a trap
+invokes a header macro (while outputting a diversion) which tries to
+change the font on the current page, the effect will not be visible
+before the diversion has completely been printed (except for input
+protected with `\!' or `\?') since the data in the diversion is already
+formatted.  In most cases, this is not the expected behaviour.
+
+
+File: groff,  Node: Diversion Traps,  Next: Input Line Traps,  Prev: Page Location Traps,  Up: Traps
+
+Diversion Traps
+---------------
+
+ - Request: .dt dist macro
+     Set a trap _within_ a diversion.  DIST is the location of the trap
+     (identical to the `wh' request; default scaling indicator is `v')
+     and MACRO is the name of the macro to be invoked.  The number
+     register `.t' still works within diversions.  *Note Diversions::,
+     for more information.
+
+
+File: groff,  Node: Input Line Traps,  Next: Blank Line Traps,  Prev: Diversion Traps,  Up: Traps
+
+Input Line Traps
+----------------
+
+ - Request: .it n macro
+ - Request: .itc n macro
+     Set an input line trap.  N is the number of lines of input which
+     may be read before springing the trap, MACRO is the macro to be
+     invoked.  Request lines are not counted as input lines.
+
+     For example, one possible use is to have a macro which prints the
+     next N lines in a bold font.
+
+
+          .de B
+          .  it \\$1 B-end
+          .  ft B
+          ..
+          .
+          .de B-end
+          .  ft R
+          ..
+
+     The `itc' request is identical except that an interrupted text
+     line (ending with `\c') is not counted as a separate line.
+
+     Both requests are associated with the current environment (*note
+     Environments::); switching to another environment disables the
+     current input trap, and going back reactivates it, restoring the
+     number of already processed lines.
+
+
+File: groff,  Node: Blank Line Traps,  Next: End-of-input Traps,  Prev: Input Line Traps,  Up: Traps
+
+Blank Line Traps
+----------------
+
+ - Request: .blm macro
+     Set a blank line trap.  `gtroff' executes MACRO when it encounters
+     a blank line in the input file.
+
+
+File: groff,  Node: End-of-input Traps,  Prev: Blank Line Traps,  Up: Traps
+
+End-of-input Traps
+------------------
+
+ - Request: .em macro
+     Set a trap at the end of input.  MACRO is executed after the last
+     line of the input file has been processed.
+
+     For example, if the document had to have a section at the bottom
+     of the last page for someone to approve it, the `em' request could
+     be used.
+
+
+          .de approval
+          .  ne 5v
+          .  sp |(\\n[.t] - 6v)
+          .  in +4i
+          .  lc _
+          .  br
+          Approved:\t\a
+          .  sp
+          Date:\t\t\a
+          ..
+          .
+          .em approval
+
+
+
 File: groff,  Node: Diversions,  Next: Environments,  Prev: Traps,  Up: gtroff Reference
 
 Diversions
@@ -87,7 +344,7 @@ output device).
      contains the name of the current diversion (this is a string-valued
      register).  The read-only number register `.d' contains the current
      vertical place in the diversion.  If not in a diversion it is the
-     same as the register `nl'.
+     same as register `nl'.
 
  - Register: \n[.h]
      The "high-water mark" on the current page.  It corresponds to the
@@ -110,6 +367,10 @@ output device).
  - Register: \n[dl]
      After completing a diversion, the read-write number registers `dn'
      and `dl' contain the vertical and horizontal size of the diversion.
+     Note that only the just processed lines are counted: For the
+     computation of `dn' and `dl', the requests `da' and `boxa' are
+     handled as if `di' and `box' had been used - lines which have been
+     already stored in a macro are not taken into account.
 
 
           .\" Center text both horizontally & vertically
@@ -150,16 +411,16 @@ output device).
 
 
  - Escape: \!
- - Escape: \?ANYTHING\?
+ - Escape: \?anything\?
      Prevent requests, macros, and escapes from being interpreted when
-     read into a diversion.  This takes the given text and
-     "transparently" embeds it into the diversion.  This is useful for
+     read into a diversion.  Both escapes take the given text and
+     "transparently" embed it into the diversion.  This is useful for
      macros which shouldn't be invoked until the diverted text is
      actually output.
 
      The `\!' escape transparently embeds text up to and including the
      end of the line.  The `\?' escape transparently embeds text until
-     the next occurrence of the `\?' escape.  For example:
+     the next occurrence of the `\?' escape.  Example:
 
 
           \?ANYTHING\?
@@ -198,7 +459,7 @@ output device).
 
  - Request: .output string
      Emit STRING directly to the `gtroff' intermediate output (subject
-     to copy-mode interpretation);  this is similar to `\!' used at the
+     to copy-mode interpretation); this is similar to `\!' used at the
      top level.  An initial double quote in STRING is stripped off to
      allow initial blanks.
 
@@ -209,7 +470,7 @@ output device).
 
      Use with caution!  It is normally only needed for mark-up used by a
      postprocessor which does something with the output before sending
-     it to the output device, filtering out `string' again.
+     it to the output device, filtering out STRING again.
 
  - Request: .asciify div
      "Unformat" the diversion specified by DIV in such a way that ASCII
@@ -333,26 +594,35 @@ environments named `0', `1', and `2'.
 
         * The number of consecutive hyphenated lines (set to zero).
 
+ - Register: \n[.w]
  - Register: \n[.cht]
  - Register: \n[.cdp]
  - Register: \n[.csk]
-     The `\n[.cht]' register contains the maximum extent (above the
-     baseline) of the last glyph added to the current environment.
+     The `\n[.w]' register contains the width of the last glyph added
+     to the current environment.
+
+     The `\n[.cht]' register contains the height of the last glyph
+     added to the current environment.
 
-     The `\n[.cdp]' register contains the maximum extent (below the
-     baseline) of the last glyph added to the current environment.
+     The `\n[.cdp]' register contains the depth of the last glyph added
+     to the current environment.  It is positive for glyphs extending
+     below the baseline.
 
      The `\n[.csk]' register contains the "skew" (how far to the right
-     of the glyph's center that `gtroff' shold place an accent) of the
+     of the glyph's center that `gtroff' should place an accent) of the
      last glyph added to the current environment.
 
+ - Register: \n[.n]
+     The `\n[.n]' register contains the length of the previous output
+     line in the current environment.
+
 
 File: groff,  Node: Suppressing output,  Next: Colors,  Prev: Environments,  Up: gtroff Reference
 
 Suppressing output
 ==================
 
- - Escape: \ONUM
+ - Escape: \Onum
      Disable or enable output depending on the value of NUM:
 
     `\O0'
@@ -423,7 +693,7 @@ Colors
 
  - Request: .defcolor ident scheme color_components
      Define color with name IDENT.  SCHEME can be one of  the following
-     values: `rgb' (three components), `cym' (three components), `cmyk'
+     values: `rgb' (three components), `cmy' (three components), `cmyk'
      (four components), and `gray' or `grey' (one component).
 
      Color components can be given either as a hexadecimal string or as
@@ -451,9 +721,9 @@ Colors
           .defcolor darkgreen rgb 0.1 0.5 0.2
 
 
- - Escape: \mC
- - Escape: \m(CO
- - Escape: \m[COLOR]
+ - Escape: \mc
+ - Escape: \m(co
+ - Escape: \m[color]
      Set drawing color.  The following example shows how to turn the
      next four words red.
 
@@ -473,9 +743,9 @@ Colors
           .mc \m[red]x\m[]
 
 
- - Escape: \MC
- - Escape: \M(CO
- - Escape: \M[COLOR]
+ - Escape: \Mc
+ - Escape: \M(co
+ - Escape: \M[color]
      Set background color for filled objects drawn with the `\D'...''
      commands.
 
@@ -661,7 +931,7 @@ was not there, `groff' would not know when to stop.
 
 
           .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\
-          	     (localtime(time))[2,1,0]' > /tmp/x\n[$$]
+                       (localtime(time))[2,1,0]' > /tmp/x\n[$$]
           .so /tmp/x\n[$$]
           .sy rm /tmp/x\n[$$]
           \nH:\nM:\nS
@@ -735,9 +1005,9 @@ was not there, `groff' would not know when to stop.
           .close idx
 
 
- - Escape: \VE
- - Escape: \V(EV
- - Escape: \V[ENV]
+ - Escape: \Ve
+ - Escape: \V(ev
+ - Escape: \V[env]
      Interpolate the contents of the specified environment variable ENV
      (one-character name E, two-character name EV) as returned by the
      function `getenv'.  `\V' is interpreted in copy-in mode.
@@ -752,7 +1022,7 @@ Postprocessor Access
 postprocessor.  This is particularly useful for embedding POSTSCRIPT
 into the final document.
 
- - Escape: \X'XXX'
+ - Escape: \X'xxx'
      Embeds its argument into the `gtroff' output preceded with `x X'.
 
      The escapes `\&', `\)', `\%', and `\:' are ignored within `\X',
@@ -766,9 +1036,9 @@ into the final document.
 
      `use_charnames_in_special' is currently used by `grohtml' only.
 
- - Escape: \YN
- - Escape: \Y(NM
- - Escape: \Y[NAME]
+ - Escape: \Yn
+ - Escape: \Y(nm
+ - Escape: \Y[name]
      This is approximately equivalent to `\X'\*[NAME]'' (one-character
      name N, two-character name NM).  However, the contents of the
      string or macro NAME are not interpreted; also it is permitted for
@@ -1028,10 +1298,10 @@ Debugging
    `gtroff' is not easy to debug, but there are some useful features
 and strategies for debugging.
 
- - Request: .lf line filename
-     Change the line number and the file name `gtroff' shall use for
-     error and warning messages.  LINE is the input line number of the
-     _next_ line.
+ - Request: .lf line [filename]
+     Change the line number and optionally the file name `gtroff' shall
+     use for error and warning messages.  LINE is the input line number
+     of the _next_ line.
 
      Without argument, the request is ignored.
 
@@ -1039,6 +1309,10 @@ and strategies for debugging.
      files, then put together with `soelim' and other preprocessors.
      Usually, it isn't invoked manually.
 
+     Note that other `troff' implementations (including the original
+     AT&T version) handle `lf' differently.  For them, LINE changes the
+     line number of the _current_ line.
+
  - Request: .tm string
  - Request: .tm1 string
  - Request: .tmc string
@@ -1184,425 +1458,3 @@ occurs.  The most verbose level of warnings is `-ww'.
 
 * Warnings::
 
-
-File: groff,  Node: Warnings,  Prev: Debugging,  Up: Debugging
-
-Warnings
---------
-
-   The warnings that can be given to `gtroff' are divided into the
-following categories.  The name associated with each warning is used by
-the `-w' and `-W' options; the number is used by the `warn' request and
-by the `.warn' register.
-
-`char'
-`1'
-     Non-existent glyphs.(1) (*note Warnings-Footnote-1::)  This is
-     enabled by default.
-
-`number'
-`2'
-     Invalid numeric expressions.  This is enabled by default.  *Note
-     Expressions::.
-
-`break'
-`4'
-     In fill mode, lines which could not be broken so that their length
-     was less than the line length.  This is enabled by default.
-
-`delim'
-`8'
-     Missing or mismatched closing delimiters.
-
-`el'
-`16'
-     Use of the `el' request with no matching `ie' request.  *Note
-     if-else::.
-
-`scale'
-`32'
-     Meaningless scaling indicators.
-
-`range'
-`64'
-     Out of range arguments.
-
-`syntax'
-`128'
-     Dubious syntax in numeric expressions.
-
-`di'
-`256'
-     Use of `di' or `da' without an argument when there is no current
-     diversion.
-
-`mac'
-`512'
-     Use of undefined strings, macros and diversions.  When an undefined
-     string, macro, or diversion is used, that string is automatically
-     defined as empty.  So, in most cases, at most one warning is given
-     for each name.
-
-`reg'
-`1024'
-     Use of undefined number registers.  When an undefined number
-     register is used, that register is automatically defined to have a
-     value of 0.  So, in most cases, at most one warning is given for
-     use of a particular name.
-
-`tab'
-`2048'
-     Use of a tab character where a number was expected.
-
-`right-brace'
-`4096'
-     Use of `\}' where a number was expected.
-
-`missing'
-`8192'
-     Requests that are missing non-optional arguments.
-
-`input'
-`16384'
-     Invalid input characters.
-
-`escape'
-`32768'
-     Unrecognized escape sequences.  When an unrecognized escape
-     sequence `\X' is encountered, the escape character is ignored, and
-     X is printed.
-
-`space'
-`65536'
-     Missing space between a request or macro and its argument.  This
-     warning is given when an undefined name longer than two characters
-     is encountered, and the first two characters of the name make a
-     defined name.  The request or macro is not invoked.  When this
-     warning is given, no macro is automatically defined.  This is
-     enabled by default.  This warning never occurs in compatibility
-     mode.
-
-`font'
-`131072'
-     Non-existent fonts.  This is enabled by default.
-
-`ig'
-`262144'
-     Invalid escapes in text ignored with the `ig' request.  These are
-     conditions that are errors when they do not occur in ignored text.
-
-`color'
-`524288'
-     Color related warnings.
-
-`all'
-     All warnings except `di', `mac' and `reg'.  It is intended that
-     this covers all warnings that are useful with traditional macro
-     packages.
-
-`w'
-     All warnings.
-
-
-File: groff,  Node: Warnings-Footnotes,  Up: Warnings
-
-   (1) `char' is a misnomer since it reports missing glyphs - there
-aren't missing input characters, only invalid ones.
-
-
-File: groff,  Node: Implementation Differences,  Prev: Debugging,  Up: gtroff Reference
-
-Implementation Differences
-==========================
-
-   GNU `troff' has a number of features which cause incompatibilities
-with documents written with old versions of `troff'.
-
-   Long names cause some incompatibilities.  UNIX `troff' interprets
-
-
-     .dsabcd
-
-as defining a string `ab' with contents `cd'.  Normally, GNU `troff'
-interprets this as a call of a macro named `dsabcd'.  Also UNIX `troff'
-interprets `\*[' or `\n[' as references to a string or number register
-called `['.  In GNU `troff', however, this is normally interpreted as
-the start of a long name.  In compatibility mode GNU `troff' interprets
-long names in the traditional way (which means that they are not
-recognized as names).
-
- - Request: .cp [n]
- - Request: .do cmd
- - Register: \n[.C]
-     If N is missing or non-zero, turn on compatibility mode;
-     otherwise, turn it off.
-
-     The read-only number register `.C' is 1 if compatibility mode is
-     on, 0 otherwise.
-
-     Compatibility mode can be also turned on with the `-C' command line
-     option.
-
-     The `do' request turns off compatibility mode while executing its
-     arguments as a `gtroff' command.
-
-
-          .do fam T
-
-     executes the `fam' request when compatibility mode is enabled.
-
-     `gtroff' restores the previous compatibility setting before
-     interpreting any files sourced by the CMD.
-
-   Two other features are controlled by `-C'.  If not in compatibility
-mode, GNU `troff' preserves the input level in delimited arguments:
-
-
-     .ds xx '
-     \w'abc\*(xxdef'
-
-In compatibility mode, the string `72def'' is returned; without `-C'
-the resulting string is `168' (assuming a TTY output device).
-
-   Finally, the escapes `\f', `\H', `\m', `\M', `\R', `\s', and `\S'
-are transparent for recognizing the beginning of a line only in
-compatibility mode (this is a rather obscure feature).  For example,
-the code
-
-
-     .de xx
-     Hallo!
-     ..
-     \fB.xx\fP
-
-   prints `Hallo!' in bold face if in compatibility mode, and `.xx' in
-bold face otherwise.
-
-   GNU `troff' does not allow the use of the escape sequences `\|',
-`\^', `\&', `\{', `\}', `\<SP>', `\'', `\`', `\-', `\_', `\!', `\%',
-and `\c' in names of strings, macros, diversions, number registers,
-fonts or environments; UNIX `troff' does.  The `\A' escape sequence
-(*note Identifiers::) may be helpful in avoiding use of these escape
-sequences in names.
-
-   Fractional point sizes cause one noteworthy incompatibility.  In
-UNIX `troff' the `ps' request ignores scale indicators and thus
-
-
-     .ps 10u
-
-sets the point size to 10 points, whereas in GNU `troff' it sets the
-point size to 10 scaled points.  *Note Fractional Type Sizes::, for
-more information.
-
-   In GNU `troff' there is a fundamental difference between
-(unformatted) input characters and (formatted) output glyphs.
-Everything that affects how a glyph is output is stored with the glyph
-node; once a glyph node has been constructed it is unaffected by any
-subsequent requests that are executed, including `bd', `cs', `tkf',
-`tr', or `fp' requests.  Normally glyphs are constructed from input
-characters at the moment immediately before the glyph is added to the
-current output line.  Macros, diversions and strings are all, in fact,
-the same type of object; they contain lists of input characters and
-glyph nodes in any combination.  A glyph node does not behave like an
-input character for the purposes of macro processing; it does not
-inherit any of the special properties that the input character from
-which it was constructed might have had.  For example,
-
-
-     .di x
-     \\\\
-     .br
-     .di
-     .x
-
-prints `\\' in GNU `troff'; each pair of input backslashes is turned
-into one output backslash and the resulting output backslashes are not
-interpreted as escape characters when they are reread.  UNIX `troff'
-would interpret them as escape characters when they were reread and
-would end up printing one `\'.  The correct way to obtain a printable
-backslash is to use the `\e' escape sequence: This always prints a
-single instance of the current escape character, regardless of whether
-or not it is used in a diversion; it also works in both GNU `troff' and
-UNIX `troff'.(1) (*note Implementation Differences-Footnote-1::)  To
-store, for some reason, an escape sequence in a diversion that will be
-interpreted when the diversion is reread, either use the traditional
-`\!' transparent output facility, or, if this is unsuitable, the new
-`\?' escape sequence.
-
-   *Note Diversions::, and *Note Gtroff Internals::, for more
-information.
-
-
-File: groff,  Node: Implementation Differences-Footnotes,  Up: Implementation Differences
-
-   (1) To be completely independent of the current escape character,
-use `\(rs' which represents a reverse solidus (backslash) glyph.
-
-
-File: groff,  Node: Preprocessors,  Next: Output Devices,  Prev: gtroff Reference,  Up: Top
-
-Preprocessors
-*************
-
-   This chapter describes all preprocessors that come with `groff' or
-which are freely available.
-
-* Menu:
-
-* geqn::
-* gtbl::
-* gpic::
-* ggrn::
-* grap::
-* grefer::
-* gsoelim::
-
-
-File: groff,  Node: geqn,  Next: gtbl,  Prev: Preprocessors,  Up: Preprocessors
-
-`geqn'
-======
-
-* Menu:
-
-* Invoking geqn::
-
-
-File: groff,  Node: Invoking geqn,  Prev: geqn,  Up: geqn
-
-Invoking `geqn'
----------------
-
-
-File: groff,  Node: gtbl,  Next: gpic,  Prev: geqn,  Up: Preprocessors
-
-`gtbl'
-======
-
-* Menu:
-
-* Invoking gtbl::
-
-
-File: groff,  Node: Invoking gtbl,  Prev: gtbl,  Up: gtbl
-
-Invoking `gtbl'
----------------
-
-
-File: groff,  Node: gpic,  Next: ggrn,  Prev: gtbl,  Up: Preprocessors
-
-`gpic'
-======
-
-* Menu:
-
-* Invoking gpic::
-
-
-File: groff,  Node: Invoking gpic,  Prev: gpic,  Up: gpic
-
-Invoking `gpic'
----------------
-
-
-File: groff,  Node: ggrn,  Next: grap,  Prev: gpic,  Up: Preprocessors
-
-`ggrn'
-======
-
-* Menu:
-
-* Invoking ggrn::
-
-
-File: groff,  Node: Invoking ggrn,  Prev: ggrn,  Up: ggrn
-
-Invoking `ggrn'
----------------
-
-
-File: groff,  Node: grap,  Next: grefer,  Prev: ggrn,  Up: Preprocessors
-
-`grap'
-======
-
-   A free implementation of `grap', written by Ted Faber, is available
-as an extra package from the following address:
-
-     <http://www.lunabase.org/~faber/Vault/software/grap/>
-
-
-File: groff,  Node: grefer,  Next: gsoelim,  Prev: grap,  Up: Preprocessors
-
-`grefer'
-========
-
-* Menu:
-
-* Invoking grefer::
-
-
-File: groff,  Node: Invoking grefer,  Prev: grefer,  Up: grefer
-
-Invoking `grefer'
------------------
-
-
-File: groff,  Node: gsoelim,  Prev: grefer,  Up: Preprocessors
-
-`gsoelim'
-=========
-
-* Menu:
-
-* Invoking gsoelim::
-
-
-File: groff,  Node: Invoking gsoelim,  Prev: gsoelim,  Up: gsoelim
-
-Invoking `gsoelim'
-------------------
-
-
-File: groff,  Node: Output Devices,  Next: File formats,  Prev: Preprocessors,  Up: Top
-
-Output Devices
-**************
-
-* Menu:
-
-* Special Characters::
-* grotty::
-* grops::
-* grodvi::
-* grolj4::
-* grolbp::
-* grohtml::
-* gxditview::
-
-
-File: groff,  Node: Special Characters,  Next: grotty,  Prev: Output Devices,  Up: Output Devices
-
-Special Characters
-==================
-
-   *Note Font Files::.
-
-
-File: groff,  Node: grotty,  Next: grops,  Prev: Special Characters,  Up: Output Devices
-
-`grotty'
-========
-
-* Menu:
-
-* Invoking grotty::
-
-
-File: groff,  Node: Invoking grotty,  Prev: grotty,  Up: grotty
-
-Invoking `grotty'
------------------
-
diff --git a/contrib/groff/doc/groff-8 b/contrib/groff/doc/groff-8
index 540f8fd..5217828 100644
--- a/contrib/groff/doc/groff-8
+++ b/contrib/groff/doc/groff-8
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,434 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: Warnings,  Prev: Debugging,  Up: Debugging
+
+Warnings
+--------
+
+   The warnings that can be given to `gtroff' are divided into the
+following categories.  The name associated with each warning is used by
+the `-w' and `-W' options; the number is used by the `warn' request and
+by the `.warn' register.
+
+`char'
+`1'
+     Non-existent glyphs.(1) (*note Warnings-Footnote-1::)  This is
+     enabled by default.
+
+`number'
+`2'
+     Invalid numeric expressions.  This is enabled by default.  *Note
+     Expressions::.
+
+`break'
+`4'
+     In fill mode, lines which could not be broken so that their length
+     was less than the line length.  This is enabled by default.
+
+`delim'
+`8'
+     Missing or mismatched closing delimiters.
+
+`el'
+`16'
+     Use of the `el' request with no matching `ie' request.  *Note
+     if-else::.
+
+`scale'
+`32'
+     Meaningless scaling indicators.
+
+`range'
+`64'
+     Out of range arguments.
+
+`syntax'
+`128'
+     Dubious syntax in numeric expressions.
+
+`di'
+`256'
+     Use of `di' or `da' without an argument when there is no current
+     diversion.
+
+`mac'
+`512'
+     Use of undefined strings, macros and diversions.  When an undefined
+     string, macro, or diversion is used, that string is automatically
+     defined as empty.  So, in most cases, at most one warning is given
+     for each name.
+
+`reg'
+`1024'
+     Use of undefined number registers.  When an undefined number
+     register is used, that register is automatically defined to have a
+     value of 0.  So, in most cases, at most one warning is given for
+     use of a particular name.
+
+`tab'
+`2048'
+     Use of a tab character where a number was expected.
+
+`right-brace'
+`4096'
+     Use of `\}' where a number was expected.
+
+`missing'
+`8192'
+     Requests that are missing non-optional arguments.
+
+`input'
+`16384'
+     Invalid input characters.
+
+`escape'
+`32768'
+     Unrecognized escape sequences.  When an unrecognized escape
+     sequence `\X' is encountered, the escape character is ignored, and
+     X is printed.
+
+`space'
+`65536'
+     Missing space between a request or macro and its argument.  This
+     warning is given when an undefined name longer than two characters
+     is encountered, and the first two characters of the name make a
+     defined name.  The request or macro is not invoked.  When this
+     warning is given, no macro is automatically defined.  This is
+     enabled by default.  This warning never occurs in compatibility
+     mode.
+
+`font'
+`131072'
+     Non-existent fonts.  This is enabled by default.
+
+`ig'
+`262144'
+     Invalid escapes in text ignored with the `ig' request.  These are
+     conditions that are errors when they do not occur in ignored text.
+
+`color'
+`524288'
+     Color related warnings.
+
+`all'
+     All warnings except `di', `mac' and `reg'.  It is intended that
+     this covers all warnings that are useful with traditional macro
+     packages.
+
+`w'
+     All warnings.
+
+
+File: groff,  Node: Warnings-Footnotes,  Up: Warnings
+
+   (1) `char' is a misnomer since it reports missing glyphs - there
+aren't missing input characters, only invalid ones.
+
+
+File: groff,  Node: Implementation Differences,  Prev: Debugging,  Up: gtroff Reference
+
+Implementation Differences
+==========================
+
+   GNU `troff' has a number of features which cause incompatibilities
+with documents written with old versions of `troff'.
+
+   Long names cause some incompatibilities.  UNIX `troff' interprets
+
+
+     .dsabcd
+
+as defining a string `ab' with contents `cd'.  Normally, GNU `troff'
+interprets this as a call of a macro named `dsabcd'.  Also UNIX `troff'
+interprets `\*[' or `\n[' as references to a string or number register
+called `['.  In GNU `troff', however, this is normally interpreted as
+the start of a long name.  In compatibility mode GNU `troff' interprets
+long names in the traditional way (which means that they are not
+recognized as names).
+
+ - Request: .cp [n]
+ - Request: .do cmd
+ - Register: \n[.C]
+     If N is missing or non-zero, turn on compatibility mode;
+     otherwise, turn it off.
+
+     The read-only number register `.C' is 1 if compatibility mode is
+     on, 0 otherwise.
+
+     Compatibility mode can be also turned on with the `-C' command line
+     option.
+
+     The `do' request turns off compatibility mode while executing its
+     arguments as a `gtroff' command.
+
+
+          .do fam T
+
+     executes the `fam' request when compatibility mode is enabled.
+
+     `gtroff' restores the previous compatibility setting before
+     interpreting any files sourced by the CMD.
+
+   Two other features are controlled by `-C'.  If not in compatibility
+mode, GNU `troff' preserves the input level in delimited arguments:
+
+
+     .ds xx '
+     \w'abc\*(xxdef'
+
+In compatibility mode, the string `72def'' is returned; without `-C'
+the resulting string is `168' (assuming a TTY output device).
+
+   Finally, the escapes `\f', `\H', `\m', `\M', `\R', `\s', and `\S'
+are transparent for recognizing the beginning of a line only in
+compatibility mode (this is a rather obscure feature).  For example,
+the code
+
+
+     .de xx
+     Hallo!
+     ..
+     \fB.xx\fP
+
+prints `Hallo!' in bold face if in compatibility mode, and `.xx' in
+bold face otherwise.
+
+   GNU `troff' does not allow the use of the escape sequences `\|',
+`\^', `\&', `\{', `\}', `\<SP>', `\'', `\`', `\-', `\_', `\!', `\%',
+and `\c' in names of strings, macros, diversions, number registers,
+fonts or environments; UNIX `troff' does.  The `\A' escape sequence
+(*note Identifiers::) may be helpful in avoiding use of these escape
+sequences in names.
+
+   Fractional point sizes cause one noteworthy incompatibility.  In
+UNIX `troff' the `ps' request ignores scale indicators and thus
+
+
+     .ps 10u
+
+sets the point size to 10 points, whereas in GNU `troff' it sets the
+point size to 10 scaled points.  *Note Fractional Type Sizes::, for
+more information.
+
+   In GNU `troff' there is a fundamental difference between
+(unformatted) input characters and (formatted) output glyphs.
+Everything that affects how a glyph is output is stored with the glyph
+node; once a glyph node has been constructed it is unaffected by any
+subsequent requests that are executed, including `bd', `cs', `tkf',
+`tr', or `fp' requests.  Normally glyphs are constructed from input
+characters at the moment immediately before the glyph is added to the
+current output line.  Macros, diversions and strings are all, in fact,
+the same type of object; they contain lists of input characters and
+glyph nodes in any combination.  A glyph node does not behave like an
+input character for the purposes of macro processing; it does not
+inherit any of the special properties that the input character from
+which it was constructed might have had.  For example,
+
+
+     .di x
+     \\\\
+     .br
+     .di
+     .x
+
+prints `\\' in GNU `troff'; each pair of input backslashes is turned
+into one output backslash and the resulting output backslashes are not
+interpreted as escape characters when they are reread.  UNIX `troff'
+would interpret them as escape characters when they were reread and
+would end up printing one `\'.  The correct way to obtain a printable
+backslash is to use the `\e' escape sequence: This always prints a
+single instance of the current escape character, regardless of whether
+or not it is used in a diversion; it also works in both GNU `troff' and
+UNIX `troff'.(1) (*note Implementation Differences-Footnote-1::)  To
+store, for some reason, an escape sequence in a diversion that will be
+interpreted when the diversion is reread, either use the traditional
+`\!' transparent output facility, or, if this is unsuitable, the new
+`\?' escape sequence.
+
+   *Note Diversions::, and *Note Gtroff Internals::, for more
+information.
+
+
+File: groff,  Node: Implementation Differences-Footnotes,  Up: Implementation Differences
+
+   (1) To be completely independent of the current escape character,
+use `\(rs' which represents a reverse solidus (backslash) glyph.
+
+
+File: groff,  Node: Preprocessors,  Next: Output Devices,  Prev: gtroff Reference,  Up: Top
+
+Preprocessors
+*************
+
+   This chapter describes all preprocessors that come with `groff' or
+which are freely available.
+
+* Menu:
+
+* geqn::
+* gtbl::
+* gpic::
+* ggrn::
+* grap::
+* grefer::
+* gsoelim::
+
+
+File: groff,  Node: geqn,  Next: gtbl,  Prev: Preprocessors,  Up: Preprocessors
+
+`geqn'
+======
+
+* Menu:
+
+* Invoking geqn::
+
+
+File: groff,  Node: Invoking geqn,  Prev: geqn,  Up: geqn
+
+Invoking `geqn'
+---------------
+
+
+File: groff,  Node: gtbl,  Next: gpic,  Prev: geqn,  Up: Preprocessors
+
+`gtbl'
+======
+
+* Menu:
+
+* Invoking gtbl::
+
+
+File: groff,  Node: Invoking gtbl,  Prev: gtbl,  Up: gtbl
+
+Invoking `gtbl'
+---------------
+
+
+File: groff,  Node: gpic,  Next: ggrn,  Prev: gtbl,  Up: Preprocessors
+
+`gpic'
+======
+
+* Menu:
+
+* Invoking gpic::
+
+
+File: groff,  Node: Invoking gpic,  Prev: gpic,  Up: gpic
+
+Invoking `gpic'
+---------------
+
+
+File: groff,  Node: ggrn,  Next: grap,  Prev: gpic,  Up: Preprocessors
+
+`ggrn'
+======
+
+* Menu:
+
+* Invoking ggrn::
+
+
+File: groff,  Node: Invoking ggrn,  Prev: ggrn,  Up: ggrn
+
+Invoking `ggrn'
+---------------
+
+
+File: groff,  Node: grap,  Next: grefer,  Prev: ggrn,  Up: Preprocessors
+
+`grap'
+======
+
+   A free implementation of `grap', written by Ted Faber, is available
+as an extra package from the following address:
+
+     `http://www.lunabase.org/~faber/Vault/software/grap/'
+
+
+File: groff,  Node: grefer,  Next: gsoelim,  Prev: grap,  Up: Preprocessors
+
+`grefer'
+========
+
+* Menu:
+
+* Invoking grefer::
+
+
+File: groff,  Node: Invoking grefer,  Prev: grefer,  Up: grefer
+
+Invoking `grefer'
+-----------------
+
+
+File: groff,  Node: gsoelim,  Prev: grefer,  Up: Preprocessors
+
+`gsoelim'
+=========
+
+* Menu:
+
+* Invoking gsoelim::
+
+
+File: groff,  Node: Invoking gsoelim,  Prev: gsoelim,  Up: gsoelim
+
+Invoking `gsoelim'
+------------------
+
+
+File: groff,  Node: Output Devices,  Next: File formats,  Prev: Preprocessors,  Up: Top
+
+Output Devices
+**************
+
+* Menu:
+
+* Special Characters::
+* grotty::
+* grops::
+* grodvi::
+* grolj4::
+* grolbp::
+* grohtml::
+* gxditview::
+
+
+File: groff,  Node: Special Characters,  Next: grotty,  Prev: Output Devices,  Up: Output Devices
+
+Special Characters
+==================
+
+   *Note Font Files::.
+
+
+File: groff,  Node: grotty,  Next: grops,  Prev: Special Characters,  Up: Output Devices
+
+`grotty'
+========
+
+* Menu:
+
+* Invoking grotty::
+
+
+File: groff,  Node: Invoking grotty,  Prev: grotty,  Up: grotty
+
+Invoking `grotty'
+-----------------
+
+
 File: groff,  Node: grops,  Next: grodvi,  Prev: grotty,  Up: Output Devices
 
 `grops'
@@ -215,7 +638,7 @@ File: groff,  Node: gtroff Output-Footnotes,  Up: gtroff Output
 
    (1) The parser and postprocessor for intermediate output can be
 found in the file
-`GROFF-SOURCE-DIR/src/libs/libdriver/input.cc'.
+`GROFF-SOURCE-DIR/src/libs/libdriver/input.cpp'.
 
 
 File: groff,  Node: Language Concepts,  Next: Command Reference,  Prev: gtroff Output,  Up: gtroff Output
@@ -446,6 +869,7 @@ string argument.
           Set color using the RGB color scheme, having the 3 color
           components RED, GREEN, and BLUE.
 
+
 `N N'
      Print glyph with index N (a non-negative integer) of the current
      font.  This command is a `gtroff' extension.
@@ -509,6 +933,7 @@ string argument.
      Informs about a paddable white space to increase readability.  The
      spacing itself must be performed explicitly by a move command.
 
+
 
 File: groff,  Node: Simple Commands-Footnotes,  Up: Simple Commands
 
@@ -542,9 +967,8 @@ called V1, V2, ..., VN stand for vertical distances where positive
 means down, negative up.  All these distances are offsets relative to
 the current location.
 
-   Unless indicated otherwise, each graphics command directly
-corresponds to a similar `gtroff' `\D' escape sequence.  *Note Drawing
-Requests::.
+   Each graphics command directly corresponds to a similar `gtroff'
+`\D' escape sequence.  *Note Drawing Requests::.
 
    Unknown `D' commands are assumed to be device-specific.  Its
 arguments are parsed as strings; the whole information is then sent to
@@ -625,6 +1049,7 @@ means a syntactical line break as defined above.
           Set fill color for solid drawing objects using the RGB color
           scheme, having the 3 color components RED, GREEN, and BLUE.
 
+
 `Df N<line break>'
      The argument N must be an integer in the range -32767 to 32767.
 
@@ -634,7 +1059,7 @@ means a syntactical line break as defined above.
           to solid black, and values in between to intermediate shades
           of gray; this is obsoleted by command `DFg'.
 
-    N < 0 or N < 1000
+    N < 0 or N > 1000
           Set the filling color to the color that is currently being
           used for the text and the outline, see command `m'.  For
           example, the command sequence
@@ -645,6 +1070,7 @@ means a syntactical line break as defined above.
 
           sets all colors to blue.
 
+
      No position changing.  This command is a `gtroff' extension.
 
 `Dl H V<line break>'
@@ -675,6 +1101,7 @@ means a syntactical line break as defined above.
      position is not changed.  Although this doesn't make sense it is
      kept for compatibility.  This command is a `gtroff' extension.
 
+
 
 File: groff,  Node: Device Control Commands,  Next: Obsolete Command,  Prev: Graphics Commands,  Up: Command Reference
 
@@ -785,6 +1212,7 @@ syntactical line break (*note Separation::).
      escape sequence `\X'.  The line-continuing feature is a `gtroff'
      extension.
 
+
 
 File: groff,  Node: Obsolete Command,  Prev: Device Control Commands,  Up: Command Reference
 
@@ -808,6 +1236,7 @@ DDG
      of these and other commands are used, mostly without spaces; this
      made such output almost unreadable.
 
+
    For modern high-resolution devices, this command does not make sense
 because the width of the glyphs can become much larger than two decimal
 digits.  In `gtroff', this is only used for the devices `X75',
@@ -917,6 +1346,7 @@ AT&T `troff' output
      Due to the obsolete jump-and-write command, the text clusters in
      the AT&T `troff' output are almost unreadable.
 
+
 
 File: groff,  Node: Output Language Compatibility,  Prev: Intermediate Output Examples,  Up: gtroff Output
 
@@ -984,285 +1414,3 @@ File: groff,  Node: Font Files-Footnotes,  Up: Font Files
 
    (1) Plan 9 `troff' has also abandoned the binary format.
 
-
-File: groff,  Node: DESC File Format,  Next: Font File Format,  Prev: Font Files,  Up: Font Files
-
-`DESC' File Format
-------------------
-
-   The `DESC' file can contain the following types of line.  Except for
-the `charset' keyword which must comes last (if at all), the order of
-the lines is not important.
-
-`res N'
-     There are N machine units per inch.
-
-`hor N'
-     The horizontal resolution is N machine units.
-
-`vert N'
-     The vertical resolution is N machine units.
-
-`sizescale N'
-     The scale factor for point sizes.  By default this has a value
-     of 1.  One scaled point is equal to one point/N.  The arguments to
-     the `unitwidth' and `sizes' commands are given in scaled points.
-     *Note Fractional Type Sizes::, for more information.
-
-`unitwidth N'
-     Quantities in the font files are given in machine units for fonts
-     whose point size is N scaled points.
-
-`prepro PROGRAM'
-     Call PROGRAM as a preprocessor.  Currently, this keyword is used
-     by `groff' with option `-Thtml' only.
-
-`postpro PROGRAM'
-     Call PROGRAM as a postprocessor.  For example, the line
-
-
-          postpro grodvi
-
-     in the file `devdvi/DESC' makes `groff' call `grodvi' if option
-     `-Tdvi' is given (and `-Z' isn't used).
-
-`tcommand'
-     This means that the postprocessor can handle the `t' and `u'
-     intermediate output commands.
-
-`sizes S1 S2 ... SN 0'
-     This means that the device has fonts at S1, S2, ...  SN scaled
-     points.  The list of sizes must be terminated by 0 (this is digit
-     zero).  Each SI can also be a range of sizes M-N.  The list can
-     extend over more than one line.
-
-`styles S1 S2 ... SM'
-     The first M font positions are associated with styles S1 ... SM.
-
-`fonts N F1 F2 F3 ... FN'
-     Fonts F1 ... FN are mounted in the font positions M+1, ..., M+N
-     where M is the number of styles.  This command may extend over
-     more than one line.  A font name of 0 means no font is mounted on
-     the corresponding font position.
-
-`family FAM'
-     The default font family is FAM.
-
-`use_charnames_in_special'
-     This command indicates that `gtroff' should encode special
-     characters inside special commands.  Currently, this is only used
-     by the HTML output device.  *Note Postprocessor Access::.
-
-`papersize STRING ...'
-     Select a paper size.  Valid values for STRING are the ISO paper
-     types `A0'-`A7', `B0'-`B7', `C0'-`C7', `D0'-`D7', `DL', and the US
-     paper types `letter', `legal', `tabloid', `ledger', `statement',
-     `executive', `com10', and `monarch'.  Case is not significant for
-     STRING if it holds predefined paper types.  Alternatively, STRING
-     can be a file name (e.g. `/etc/papersize'); if the file can be
-     opened, `groff' reads the first line and tests for the above paper
-     sizes.  Finally, STRING can be a custom paper size in the format
-     `LENGTH,WIDTH' (no spaces before and after the comma).  Both
-     LENGTH and WIDTH must have a unit appended; valid values are `i'
-     for inches, `C' for centimeters, `p' for points, and `P' for
-     picas.  Example: `12c,235p'.  An argument which starts with a
-     digit is always treated as a custom paper format.  `papersize'
-     sets both the vertical and horizontal dimension of the output
-     medium.
-
-     More than one argument can be specified; `groff' scans from left to
-     right and uses the first valid paper specification.
-
-`pass_filenames'
-     Tell `gtroff' to emit the name of the source file currently being
-     processed.  This is achieved by the intermediate output command
-     `F'.  Currently, this is only used by the HTML output device.
-
-`print PROGRAM'
-     Use PROGRAM as a spooler program for printing.  If omitted, the
-     `-l' and `-L' options of `groff' are ignored.
-
-`charset'
-     This line and everything following in the file are ignored.  It is
-     allowed for the sake of backwards compatibility.
-
-   The `res', `unitwidth', `fonts', and `sizes' lines are mandatory.
-Other commands are ignored by `gtroff' but may be used by
-postprocessors to store arbitrary information about the device in the
-`DESC' file.
-
-   Here a list of obsolete keywords which are recognized by `groff' but
-completely ignored: `spare1', `spare2', `biggestfont'.
-
-
-File: groff,  Node: Font File Format,  Prev: DESC File Format,  Up: Font Files
-
-Font File Format
-----------------
-
-   A "font file", also (and probably better) called a "font description
-file", has two sections.  The first section is a sequence of lines each
-containing a sequence of blank delimited words; the first word in the
-line is a key, and subsequent words give a value for that key.
-
-`name F'
-     The name of the font is F.
-
-`spacewidth N'
-     The normal width of a space is N.
-
-`slant N'
-     The glyphs of the font have a slant of N degrees.  (Positive means
-     forward.)
-
-`ligatures LIG1 LIG2 ... LIGN [0]'
-     Glyphs LIG1, LIG2, ..., LIGN are ligatures; possible ligatures are
-     `ff', `fi', `fl', `ffi' and `ffl'.  For backwards compatibility,
-     the list of ligatures may be terminated with a 0.  The list of
-     ligatures may not extend over more than one line.
-
-`special'
-     The font is "special"; this means that when a glyph is requested
-     that is not present in the current font, it is searched for in any
-     special fonts that are mounted.
-
-   Other commands are ignored by `gtroff' but may be used by
-postprocessors to store arbitrary information about the font in the font
-file.
-
-   The first section can contain comments which start with the `#'
-character and extend to the end of a line.
-
-   The second section contains one or two subsections.  It must contain
-a `charset' subsection and it may also contain a `kernpairs'
-subsection.  These subsections can appear in any order.  Each
-subsection starts with a word on a line by itself.
-
-   The word `charset' starts the character set subsection.(1) (*note
-Font File Format-Footnote-1::)  The `charset' line is followed by a
-sequence of lines.  Each line gives information for one glyph.  A line
-comprises a number of fields separated by blanks or tabs.  The format is
-
-     NAME METRICS TYPE CODE [ENTITY-NAME] [`--' COMMENT]
-
-NAME identifies the glyph name(2) (*note Font File Format-Footnote-2::):
-If NAME is a single character C then it corresponds to the `gtroff'
-input character C; if it is of the form `\C' where C is a single
-character, then it corresponds to the special character `\[C]';
-otherwise it corresponds to the special character `\[NAME]'.  If it is
-exactly two characters XX it can be entered as `\(XX'.  Note that
-single-letter special characters can't be accessed as `\C'; the only
-exception is `\-' which is identical to `\[-]'.
-
-   `gtroff' supports 8-bit input characters; however some utilities
-have difficulties with eight-bit characters.  For this reason, there is
-a convention that the entity name `charN' is equivalent to the single
-input character whose code is N.  For example, `char163' would be
-equivalent to the character with code 163 which is the pounds sterling
-sign in the ISO Latin-1 character set.  You shouldn't use `charN'
-entities in font description files since they are related to input, not
-output.  Otherwise, you get hard-coded connections between input and
-output encoding which prevents use of different (input) character sets.
-
-   The name `---' is special and indicates that the glyph is unnamed;
-such glyphs can only be used by means of the `\N' escape sequence in
-`gtroff'.
-
-   The TYPE field gives the glyph type:
-
-`1'
-     the glyph has a descender, for example, `p';
-
-`2'
-     the glyph has an ascender, for example, `b';
-
-`3'
-     the glyph has both an ascender and a descender, for example, `('.
-
-   The CODE field gives the code which the postprocessor uses to print
-the glyph.  The glyph can also be input to `gtroff' using this code by
-means of the `\N' escape sequence.  CODE can be any integer.  If it
-starts with `0' it is interpreted as octal; if it starts with `0x' or
-`0X' it is interpreted as hexadecimal.  Note, however, that the `\N'
-escape sequence only accepts a decimal integer.
-
-   The ENTITY-NAME field gives an ASCII string identifying the glyph
-which the postprocessor uses to print the `gtroff' glyph NAME.  This
-field is optional and has been introduced so that the HTML device
-driver can encode its character set.  For example, the glyph `\[Po]' is
-represented as `&pound;' in HTML 4.0.
-
-   Anything on the line after the ENTITY-NAME field resp. after `--'
-will be ignored.
-
-   The METRICS field has the form:
-
-     WIDTH[`,'HEIGHT[`,'DEPTH[`,'ITALIC-CORRECTION
-       [`,'LEFT-ITALIC-CORRECTION[`,'SUBSCRIPT-CORRECTION]]]]]
-
-There must not be any spaces between these subfields (it has been split
-here into two lines for better legibility only).  Missing subfields are
-assumed to be 0.  The subfields are all decimal integers.  Since there
-is no associated binary format, these values are not required to fit
-into a variable of type `char' as they are in `ditroff'.  The WIDTH
-subfield gives the width of the glyph.  The HEIGHT subfield gives the
-height of the glyph (upwards is positive); if a glyph does not extend
-above the baseline, it should be given a zero height, rather than a
-negative height.  The DEPTH subfield gives the depth of the glyph, that
-is, the distance from the baseline to the lowest point below the
-baseline to which the glyph extends (downwards is positive); if a glyph
-does not extend below the baseline, it should be given a zero depth,
-rather than a negative depth.  The ITALIC-CORRECTION subfield gives the
-amount of space that should be added after the glyph when it is
-immediately to be followed by a glyph from a roman font.  The
-LEFT-ITALIC-CORRECTION subfield gives the amount of space that should
-be added before the glyph when it is immediately to be preceded by a
-glyph from a roman font.  The SUBSCRIPT-CORRECTION gives the amount of
-space that should be added after a glyph before adding a subscript.
-This should be less than the italic correction.
-
-   A line in the `charset' section can also have the format
-
-
-     NAME "
-
-This indicates that NAME is just another name for the glyph mentioned
-in the preceding line.
-
-   The word `kernpairs' starts the kernpairs section.  This contains a
-sequence of lines of the form:
-
-
-     C1 C2 N
-
-This means that when glyph C1 appears next to glyph C2 the space
-between them should be increased by N.  Most entries in the kernpairs
-section have a negative value for N.
-
-
-File: groff,  Node: Font File Format-Footnotes,  Up: Font File Format
-
-   (1) This keyword is misnamed since it starts a list of ordered
-glyphs, not characters.
-
-   (2) The distinction between input, characters, and output, glyphs,
-is not clearly separated in the terminology of `groff'; for example,
-the `char' request should be called `glyph' since it defines an output
-entity.
-
-
-File: groff,  Node: Installation,  Next: Copying This Manual,  Prev: File formats,  Up: Top
-
-Installation
-************
-
-
-File: groff,  Node: Copying This Manual,  Next: Request Index,  Prev: Installation,  Up: Top
-
-Copying This Manual
-*******************
-
-* Menu:
-
-* GNU Free Documentation License::  License for copying this manual.
-
diff --git a/contrib/groff/doc/groff-9 b/contrib/groff/doc/groff-9
index 4f4cc68..3f653d3 100644
--- a/contrib/groff/doc/groff-9
+++ b/contrib/groff/doc/groff-9
@@ -1,8 +1,9 @@
-This is groff, produced by makeinfo version 4.2 from ./groff.texinfo.
+This is groff, produced by makeinfo version 4.3d from ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.18.
+This manual documents GNU `troff' version 1.19.
 
-   Copyright (C) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001, 2002, 2003 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -16,12 +17,296 @@ This manual documents GNU `troff' version 1.18.
      modify this GNU Manual, like GNU software.  Copies published by
      the Free Software Foundation raise funds for GNU development."
    
-INFO-DIR-SECTION Miscellaneous
+INFO-DIR-SECTION Typesetting
 START-INFO-DIR-ENTRY
 * Groff: (groff).               The GNU troff document formatting system.
 END-INFO-DIR-ENTRY
 
 
+File: groff,  Node: DESC File Format,  Next: Font File Format,  Prev: Font Files,  Up: Font Files
+
+`DESC' File Format
+------------------
+
+   The `DESC' file can contain the following types of line.  Except for
+the `charset' keyword which must comes last (if at all), the order of
+the lines is not important.
+
+`res N'
+     There are N machine units per inch.
+
+`hor N'
+     The horizontal resolution is N machine units.  All horizontal
+     quantities are rounded to be multiples of this value.
+
+`vert N'
+     The vertical resolution is N machine units.  All vertical
+     quantities are rounded to be multiples of this value.
+
+`sizescale N'
+     The scale factor for point sizes.  By default this has a value
+     of 1.  One scaled point is equal to one point/N.  The arguments to
+     the `unitwidth' and `sizes' commands are given in scaled points.
+     *Note Fractional Type Sizes::, for more information.
+
+`unitwidth N'
+     Quantities in the font files are given in machine units for fonts
+     whose point size is N scaled points.
+
+`prepro PROGRAM'
+     Call PROGRAM as a preprocessor.  Currently, this keyword is used
+     by `groff' with option `-Thtml' only.
+
+`postpro PROGRAM'
+     Call PROGRAM as a postprocessor.  For example, the line
+
+
+          postpro grodvi
+
+     in the file `devdvi/DESC' makes `groff' call `grodvi' if option
+     `-Tdvi' is given (and `-Z' isn't used).
+
+`tcommand'
+     This means that the postprocessor can handle the `t' and `u'
+     intermediate output commands.
+
+`sizes S1 S2 ... SN 0'
+     This means that the device has fonts at S1, S2, ...  SN scaled
+     points.  The list of sizes must be terminated by 0 (this is digit
+     zero).  Each SI can also be a range of sizes M-N.  The list can
+     extend over more than one line.
+
+`styles S1 S2 ... SM'
+     The first M font positions are associated with styles S1 ... SM.
+
+`fonts N F1 F2 F3 ... FN'
+     Fonts F1 ... FN are mounted in the font positions M+1, ..., M+N
+     where M is the number of styles.  This command may extend over
+     more than one line.  A font name of 0 means no font is mounted on
+     the corresponding font position.
+
+`family FAM'
+     The default font family is FAM.
+
+`use_charnames_in_special'
+     This command indicates that `gtroff' should encode special
+     characters inside special commands.  Currently, this is only used
+     by the HTML output device.  *Note Postprocessor Access::.
+
+`papersize STRING ...'
+     Select a paper size.  Valid values for STRING are the ISO paper
+     types `A0'-`A7', `B0'-`B7', `C0'-`C7', `D0'-`D7', `DL', and the US
+     paper types `letter', `legal', `tabloid', `ledger', `statement',
+     `executive', `com10', and `monarch'.  Case is not significant for
+     STRING if it holds predefined paper types.  Alternatively, STRING
+     can be a file name (e.g. `/etc/papersize'); if the file can be
+     opened, `groff' reads the first line and tests for the above paper
+     sizes.  Finally, STRING can be a custom paper size in the format
+     `LENGTH,WIDTH' (no spaces before and after the comma).  Both
+     LENGTH and WIDTH must have a unit appended; valid values are `i'
+     for inches, `C' for centimeters, `p' for points, and `P' for
+     picas.  Example: `12c,235p'.  An argument which starts with a
+     digit is always treated as a custom paper format.  `papersize'
+     sets both the vertical and horizontal dimension of the output
+     medium.
+
+     More than one argument can be specified; `groff' scans from left to
+     right and uses the first valid paper specification.
+
+`pass_filenames'
+     Tell `gtroff' to emit the name of the source file currently being
+     processed.  This is achieved by the intermediate output command
+     `F'.  Currently, this is only used by the HTML output device.
+
+`print PROGRAM'
+     Use PROGRAM as a spooler program for printing.  If omitted, the
+     `-l' and `-L' options of `groff' are ignored.
+
+`charset'
+     This line and everything following in the file are ignored.  It is
+     allowed for the sake of backwards compatibility.
+
+   The `res', `unitwidth', `fonts', and `sizes' lines are mandatory.
+Other commands are ignored by `gtroff' but may be used by
+postprocessors to store arbitrary information about the device in the
+`DESC' file.
+
+   Here a list of obsolete keywords which are recognized by `groff' but
+completely ignored: `spare1', `spare2', `biggestfont'.
+
+
+File: groff,  Node: Font File Format,  Prev: DESC File Format,  Up: Font Files
+
+Font File Format
+----------------
+
+   A "font file", also (and probably better) called a "font description
+file", has two sections.  The first section is a sequence of lines each
+containing a sequence of blank delimited words; the first word in the
+line is a key, and subsequent words give a value for that key.
+
+`name F'
+     The name of the font is F.
+
+`spacewidth N'
+     The normal width of a space is N.
+
+`slant N'
+     The glyphs of the font have a slant of N degrees.  (Positive means
+     forward.)
+
+`ligatures LIG1 LIG2 ... LIGN [0]'
+     Glyphs LIG1, LIG2, ..., LIGN are ligatures; possible ligatures are
+     `ff', `fi', `fl', `ffi' and `ffl'.  For backwards compatibility,
+     the list of ligatures may be terminated with a 0.  The list of
+     ligatures may not extend over more than one line.
+
+`special'
+     The font is "special"; this means that when a glyph is requested
+     that is not present in the current font, it is searched for in any
+     special fonts that are mounted.
+
+   Other commands are ignored by `gtroff' but may be used by
+postprocessors to store arbitrary information about the font in the font
+file.
+
+   The first section can contain comments which start with the `#'
+character and extend to the end of a line.
+
+   The second section contains one or two subsections.  It must contain
+a `charset' subsection and it may also contain a `kernpairs'
+subsection.  These subsections can appear in any order.  Each
+subsection starts with a word on a line by itself.
+
+   The word `charset' starts the character set subsection.(1) (*note
+Font File Format-Footnote-1::)  The `charset' line is followed by a
+sequence of lines.  Each line gives information for one glyph.  A line
+comprises a number of fields separated by blanks or tabs.  The format is
+
+     NAME METRICS TYPE CODE [ENTITY-NAME] [`--' COMMENT]
+
+NAME identifies the glyph name(2) (*note Font File Format-Footnote-2::):
+If NAME is a single character C then it corresponds to the `gtroff'
+input character C; if it is of the form `\C' where C is a single
+character, then it corresponds to the special character `\[C]';
+otherwise it corresponds to the special character `\[NAME]'.  If it is
+exactly two characters XX it can be entered as `\(XX'.  Note that
+single-letter special characters can't be accessed as `\C'; the only
+exception is `\-' which is identical to `\[-]'.
+
+   `gtroff' supports 8-bit input characters; however some utilities
+have difficulties with eight-bit characters.  For this reason, there is
+a convention that the entity name `charN' is equivalent to the single
+input character whose code is N.  For example, `char163' would be
+equivalent to the character with code 163 which is the pounds sterling
+sign in the ISO Latin-1 character set.  You shouldn't use `charN'
+entities in font description files since they are related to input, not
+output.  Otherwise, you get hard-coded connections between input and
+output encoding which prevents use of different (input) character sets.
+
+   The name `---' is special and indicates that the glyph is unnamed;
+such glyphs can only be used by means of the `\N' escape sequence in
+`gtroff'.
+
+   The TYPE field gives the glyph type:
+
+`1'
+     the glyph has a descender, for example, `p';
+
+`2'
+     the glyph has an ascender, for example, `b';
+
+`3'
+     the glyph has both an ascender and a descender, for example, `('.
+
+   The CODE field gives the code which the postprocessor uses to print
+the glyph.  The glyph can also be input to `gtroff' using this code by
+means of the `\N' escape sequence.  CODE can be any integer.  If it
+starts with `0' it is interpreted as octal; if it starts with `0x' or
+`0X' it is interpreted as hexadecimal.  Note, however, that the `\N'
+escape sequence only accepts a decimal integer.
+
+   The ENTITY-NAME field gives an ASCII string identifying the glyph
+which the postprocessor uses to print the `gtroff' glyph NAME.  This
+field is optional and has been introduced so that the HTML device
+driver can encode its character set.  For example, the glyph `\[Po]' is
+represented as `&pound;' in HTML 4.0.
+
+   Anything on the line after the ENTITY-NAME field resp. after `--'
+will be ignored.
+
+   The METRICS field has the form:
+
+     WIDTH[`,'HEIGHT[`,'DEPTH[`,'ITALIC-CORRECTION
+       [`,'LEFT-ITALIC-CORRECTION[`,'SUBSCRIPT-CORRECTION]]]]]
+
+There must not be any spaces between these subfields (it has been split
+here into two lines for better legibility only).  Missing subfields are
+assumed to be 0.  The subfields are all decimal integers.  Since there
+is no associated binary format, these values are not required to fit
+into a variable of type `char' as they are in `ditroff'.  The WIDTH
+subfield gives the width of the glyph.  The HEIGHT subfield gives the
+height of the glyph (upwards is positive); if a glyph does not extend
+above the baseline, it should be given a zero height, rather than a
+negative height.  The DEPTH subfield gives the depth of the glyph, that
+is, the distance from the baseline to the lowest point below the
+baseline to which the glyph extends (downwards is positive); if a glyph
+does not extend below the baseline, it should be given a zero depth,
+rather than a negative depth.  The ITALIC-CORRECTION subfield gives the
+amount of space that should be added after the glyph when it is
+immediately to be followed by a glyph from a roman font.  The
+LEFT-ITALIC-CORRECTION subfield gives the amount of space that should
+be added before the glyph when it is immediately to be preceded by a
+glyph from a roman font.  The SUBSCRIPT-CORRECTION gives the amount of
+space that should be added after a glyph before adding a subscript.
+This should be less than the italic correction.
+
+   A line in the `charset' section can also have the format
+
+
+     NAME "
+
+This indicates that NAME is just another name for the glyph mentioned
+in the preceding line.
+
+   The word `kernpairs' starts the kernpairs section.  This contains a
+sequence of lines of the form:
+
+
+     C1 C2 N
+
+This means that when glyph C1 appears next to glyph C2 the space
+between them should be increased by N.  Most entries in the kernpairs
+section have a negative value for N.
+
+
+File: groff,  Node: Font File Format-Footnotes,  Up: Font File Format
+
+   (1) This keyword is misnamed since it starts a list of ordered
+glyphs, not characters.
+
+   (2) The distinction between input, characters, and output, glyphs,
+is not clearly separated in the terminology of `groff'; for example,
+the `char' request should be called `glyph' since it defines an output
+entity.
+
+
+File: groff,  Node: Installation,  Next: Copying This Manual,  Prev: File formats,  Up: Top
+
+Installation
+************
+
+
+File: groff,  Node: Copying This Manual,  Next: Request Index,  Prev: Installation,  Up: Top
+
+Copying This Manual
+*******************
+
+* Menu:
+
+* GNU Free Documentation License::  License for copying this manual.
+
+
 File: groff,  Node: GNU Free Documentation License,  Up: Copying This Manual
 
 GNU Free Documentation License
@@ -447,6 +732,7 @@ either `.' or `'').
 * chop:                                  Strings.
 * close:                                 I/O.
 * color:                                 Colors.
+* composite:                             Using Symbols.
 * continue:                              while.
 * cp:                                    Implementation Differences.
 * cs:                                    Artificial Fonts.
@@ -476,6 +762,7 @@ either `.' or `'').
 * fi:                                    Manipulating Filling and Adjusting.
 * fl:                                    Debugging.
 * fp:                                    Font Positions.
+* fschar:                                Using Symbols.
 * fspecial:                              Special Fonts.
 * ft <1>:                                Font Positions.
 * ft:                                    Changing Fonts.
@@ -540,6 +827,7 @@ either `.' or `'').
 * rchar:                                 Using Symbols.
 * rd:                                    I/O.
 * return:                                Writing Macros.
+* rfschar:                               Using Symbols.
 * rj:                                    Manipulating Filling and Adjusting.
 * rm:                                    Strings.
 * rn:                                    Strings.
@@ -547,6 +835,7 @@ either `.' or `'').
 * rr:                                    Setting Registers.
 * rs:                                    Manipulating Spacing.
 * rt:                                    Page Motions.
+* schar:                                 Using Symbols.
 * shc:                                   Manipulating Hyphenation.
 * shift:                                 Parameters.
 * sizes:                                 Changing Type Sizes.
@@ -596,7 +885,6 @@ warning, printing glyph X.
 
 * Menu:
 
-* <colon>:                               Manipulating Hyphenation.
 * \:                                     Using Symbols.
 * \!:                                    Diversions.
 * \":                                    Comments.
@@ -615,6 +903,7 @@ warning, printing glyph X.
 * \.:                                    Character Translations.
 * \/:                                    Ligatures and Kerning.
 * \0:                                    Page Motions.
+* \<colon>:                              Manipulating Hyphenation.
 * \<RET>:                                Line Control.
 * \<SP>:                                 Page Motions.
 * \?:                                    Diversions.
@@ -694,238 +983,3 @@ Operator Index
 * >=:                                    Expressions.
 * >?:                                    Expressions.
 
-
-File: groff,  Node: Register Index,  Next: Macro Index,  Prev: Operator Index,  Up: Top
-
-Register Index
-**************
-
-   The macro package or program a specific register belongs to is
-appended in brackets.
-
-   A register name `x' consisting of exactly one character can be
-accessed as `\nx'.  A register name `xx' consisting of exactly two
-characters can be accessed as `\n(xx'.  Register names `xxx' of any
-length can be accessed as `\n[xxx]'.
-
-* Menu:
-
-* $$:                                    Built-in Registers.
-* %:                                     Page Layout.
-* .$:                                    Parameters.
-* .a:                                    Manipulating Spacing.
-* .A:                                    Built-in Registers.
-* .b:                                    Artificial Fonts.
-* .C:                                    Implementation Differences.
-* .c:                                    Built-in Registers.
-* .cdp:                                  Environments.
-* .ce:                                   Manipulating Filling and Adjusting.
-* .cht:                                  Environments.
-* .color:                                Colors.
-* .csk:                                  Environments.
-* .d:                                    Diversions.
-* .ev:                                   Environments.
-* .f:                                    Font Positions.
-* .F:                                    Built-in Registers.
-* .fam:                                  Font Families.
-* .fn:                                   Font Families.
-* .fp:                                   Font Positions.
-* .g:                                    Built-in Registers.
-* .h:                                    Diversions.
-* .H:                                    Built-in Registers.
-* .hla:                                  Manipulating Hyphenation.
-* .hlc:                                  Manipulating Hyphenation.
-* .hlm:                                  Manipulating Hyphenation.
-* .hy:                                   Manipulating Hyphenation.
-* .hym:                                  Manipulating Hyphenation.
-* .hys:                                  Manipulating Hyphenation.
-* .i:                                    Line Layout.
-* .in:                                   Line Layout.
-* .int:                                  Line Control.
-* .j:                                    Manipulating Filling and Adjusting.
-* .k:                                    Page Motions.
-* .kern:                                 Ligatures and Kerning.
-* .l:                                    Line Layout.
-* .L:                                    Manipulating Spacing.
-* .lg:                                   Ligatures and Kerning.
-* .linetabs:                             Tabs and Fields.
-* .ll:                                   Line Layout.
-* .lt:                                   Page Layout.
-* .ne:                                   Page Location Traps.
-* .ns:                                   Manipulating Spacing.
-* .o:                                    Line Layout.
-* .p:                                    Page Layout.
-* .P:                                    Built-in Registers.
-* .pn:                                   Page Layout.
-* .ps:                                   Fractional Type Sizes.
-* .psr:                                  Fractional Type Sizes.
-* .pvs:                                  Changing Type Sizes.
-* .rj:                                   Manipulating Filling and Adjusting.
-* .s:                                    Changing Type Sizes.
-* .sr:                                   Fractional Type Sizes.
-* .ss:                                   Manipulating Filling and Adjusting.
-* .sss:                                  Manipulating Filling and Adjusting.
-* .t:                                    Page Location Traps.
-* .T:                                    Built-in Registers.
-* .tabs:                                 Tabs and Fields.
-* .trunc:                                Page Location Traps.
-* .u:                                    Manipulating Filling and Adjusting.
-* .v:                                    Changing Type Sizes.
-* .V:                                    Built-in Registers.
-* .vpt:                                  Page Location Traps.
-* .warn:                                 Debugging.
-* .x:                                    Built-in Registers.
-* .Y:                                    Built-in Registers.
-* .y:                                    Built-in Registers.
-* .z:                                    Diversions.
-* c.:                                    Built-in Registers.
-* ct:                                    Page Motions.
-* dl:                                    Diversions.
-* dn:                                    Diversions.
-* dw:                                    Built-in Registers.
-* dy:                                    Built-in Registers.
-* FF [ms]:                               ms Document Control Registers.
-* FI [ms]:                               ms Document Control Registers.
-* FL [ms]:                               ms Document Control Registers.
-* FM [ms]:                               ms Document Control Registers.
-* HM [ms]:                               ms Document Control Registers.
-* hours:                                 Built-in Registers.
-* hp:                                    Page Motions.
-* LL [ms]:                               ms Document Control Registers.
-* llx:                                   Miscellaneous.
-* lly:                                   Miscellaneous.
-* ln:                                    Built-in Registers.
-* LT [ms]:                               ms Document Control Registers.
-* MINGW [ms] <1>:                        Additional ms Macros.
-* MINGW [ms]:                            ms Document Control Registers.
-* minutes:                               Built-in Registers.
-* mo:                                    Built-in Registers.
-* nl:                                    Page Control.
-* opmaxx:                                Suppressing output.
-* opmaxy:                                Suppressing output.
-* opminx:                                Suppressing output.
-* opminy:                                Suppressing output.
-* PD [ms]:                               ms Document Control Registers.
-* PI [ms]:                               ms Document Control Registers.
-* PO [ms]:                               ms Document Control Registers.
-* PS [ms]:                               ms Document Control Registers.
-* ps4html [grohtml]:                     grohtml specific registers and strings.
-* QI [ms]:                               ms Document Control Registers.
-* rsb:                                   Page Motions.
-* rst:                                   Page Motions.
-* sb:                                    Page Motions.
-* seconds:                               Built-in Registers.
-* skw:                                   Page Motions.
-* slimit:                                Debugging.
-* ssc:                                   Page Motions.
-* st:                                    Page Motions.
-* systat:                                I/O.
-* urx:                                   Miscellaneous.
-* ury:                                   Miscellaneous.
-* VS [ms]:                               ms Document Control Registers.
-* year:                                  Built-in Registers.
-* yr:                                    Built-in Registers.
-
-
-File: groff,  Node: Macro Index,  Next: String Index,  Prev: Register Index,  Up: Top
-
-Macro Index
-***********
-
-   The macro package a specific macro belongs to is appended in
-brackets.  They appear without the leading control character (normally
-`.').
-
-* Menu:
-
-* 1C [ms]:                               ms Multiple Columns.
-* 2C [ms]:                               ms Multiple Columns.
-* [ [ms]:                                ms Insertions.
-* ] [ms]:                                ms Insertions.
-* AB [ms]:                               ms Cover Page Macros.
-* AE [ms]:                               ms Cover Page Macros.
-* AI [ms]:                               ms Cover Page Macros.
-* AM [ms] <1>:                           Additional ms Macros.
-* AM [ms]:                               ms Strings and Special Characters.
-* AU [ms]:                               ms Cover Page Macros.
-* B [man]:                               Man font macros.
-* B [ms]:                                Highlighting in ms.
-* B1 [ms]:                               ms Displays and Keeps.
-* B2 [ms]:                               ms Displays and Keeps.
-* BD [ms]:                               ms Displays and Keeps.
-* BI [man]:                              Man font macros.
-* BI [ms]:                               Highlighting in ms.
-* BR [man]:                              Man font macros.
-* BX [ms]:                               Highlighting in ms.
-* CD [ms]:                               ms Displays and Keeps.
-* CW [ms] <1>:                           Additional ms Macros.
-* CW [ms]:                               Highlighting in ms.
-* DA [ms]:                               ms Cover Page Macros.
-* DE [ms]:                               ms Displays and Keeps.
-* DS [ms] <1>:                           Additional ms Macros.
-* DS [ms]:                               ms Displays and Keeps.
-* DT [man]:                              Miscellaneous man macros.
-* EF [ms]:                               ms Headers and Footers.
-* EH [ms]:                               ms Headers and Footers.
-* EN [ms]:                               ms Insertions.
-* EQ [ms]:                               ms Insertions.
-* FE [ms]:                               ms Footnotes.
-* FS [ms]:                               ms Footnotes.
-* HP [man]:                              Man usage.
-* I [man]:                               Man font macros.
-* I [ms]:                                Highlighting in ms.
-* IB [man]:                              Man font macros.
-* ID [ms]:                               ms Displays and Keeps.
-* IP [man]:                              Man usage.
-* IP [ms]:                               Lists in ms.
-* IR [man]:                              Man font macros.
-* IX [ms]:                               Additional ms Macros.
-* KE [ms]:                               ms Displays and Keeps.
-* KF [ms]:                               ms Displays and Keeps.
-* KS [ms]:                               ms Displays and Keeps.
-* LD [ms]:                               ms Displays and Keeps.
-* LG [ms]:                               Highlighting in ms.
-* LP [man]:                              Man usage.
-* LP [ms]:                               Paragraphs in ms.
-* MC [ms]:                               ms Multiple Columns.
-* ND [ms]:                               ms Cover Page Macros.
-* NH [ms]:                               Headings in ms.
-* NL [ms]:                               Highlighting in ms.
-* OF [ms]:                               ms Headers and Footers.
-* OH [ms]:                               ms Headers and Footers.
-* P [man]:                               Man usage.
-* PD [man]:                              Miscellaneous man macros.
-* PE [ms]:                               ms Insertions.
-* PP [man]:                              Man usage.
-* PP [ms]:                               Paragraphs in ms.
-* PS [ms]:                               ms Insertions.
-* PX [ms]:                               ms TOC.
-* QP [ms]:                               Paragraphs in ms.
-* R [ms]:                                Highlighting in ms.
-* RB [man]:                              Man font macros.
-* RD [ms]:                               ms Displays and Keeps.
-* RE [man]:                              Man usage.
-* RE [ms]:                               Indents in ms.
-* RI [man]:                              Man font macros.
-* RP [ms]:                               ms Cover Page Macros.
-* RS [man]:                              Man usage.
-* RS [ms]:                               Indents in ms.
-* SB [man]:                              Man font macros.
-* SH [man]:                              Man usage.
-* SH [ms]:                               Headings in ms.
-* SM [man]:                              Man font macros.
-* SM [ms]:                               Highlighting in ms.
-* SS [man]:                              Man usage.
-* TA [ms]:                               Tabstops in ms.
-* TC [ms]:                               ms TOC.
-* TE [ms]:                               ms Insertions.
-* TH [man]:                              Man usage.
-* TL [ms]:                               ms Cover Page Macros.
-* TP [man]:                              Man usage.
-* TS [ms]:                               ms Insertions.
-* UL [ms]:                               Highlighting in ms.
-* XA [ms]:                               ms TOC.
-* XE [ms]:                               ms TOC.
-* XP [ms]:                               Paragraphs in ms.
-* XS [ms]:                               ms TOC.
-
diff --git a/contrib/groff/doc/groff.texinfo b/contrib/groff/doc/groff.texinfo
index 410a9d5..d3f9f63 100644
--- a/contrib/groff/doc/groff.texinfo
+++ b/contrib/groff/doc/groff.texinfo
@@ -1,10 +1,10 @@
 \input texinfo   @c -*-texinfo-*-
 
 @c
-@c Please convert this manual with `texi2dvi -e groff.texinfo' due to a bug
-@c in texinfo regarding expansion of user-defined macros.
+@c Please convert this manual with `texi2dvi -e groff.texinfo' due to
+@c problems in texinfo regarding expansion of user-defined macros.
 @c
-@c You need texinfo 4.2 or newer to format this document!
+@c You need texinfo 4.3 or newer to format this document!
 @c
 
 @c %**start of header (This is for running Texinfo on a region.)
@@ -21,9 +21,10 @@
 
 
 @copying
-This manual documents GNU @code{troff} version 1.18.
+This manual documents GNU @code{troff} version 1.19.
 
-Copyright @copyright{} 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-2000, 2001, 2002, 2003
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -64,12 +65,12 @@ Software Foundation raise funds for GNU development.''
 @syncodeindex tp cp
 
 
-@c to avoid uppercasing in @deffn while converting to info, we define
-@c our special @Var{}
+@c To avoid uppercasing in @deffn while converting to info, we define
+@c our special @Var{}.
 @c
-@c due to a (not officially documented) `feature' in makeinfo 4.0,
+@c Due to a (not officially documented) `feature' in makeinfo 4.0,
 @c macros are not expanded in @deffn (but the macro definition is
-@c properly removed), so we have to define @Var{} directly in TeX also
+@c properly removed), so we have to define @Var{} directly in TeX also.
 
 @macro Var{arg}
 \arg\
@@ -108,7 +109,7 @@ Software Foundation raise funds for GNU development.''
 @c
 @c   @endDef...
 @c
-@c The above is valid for texinfo 4.0f.
+@c The above is valid for texinfo 4.0f and above.
 
 
 @c a dummy macro to assure the `@def...'
@@ -149,24 +150,24 @@ Software Foundation raise funds for GNU development.''
 @c definition of escapes
 
 @macro Defesc{name, delimI, arg, delimII}
-@deffn Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\}
+@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\}
 @esindex \name\
 @end macro
 
 @macro DefescList{name, delimI, arg, delimII}
-@deffn Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\}
+@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\}
 @defdummy
 @esindex \name\
 @end macro
 
 @macro DefescItem{name, delimI, arg, delimII}
-@deffnx Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\}
+@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\}
 @defdummy
 @esindex \name\
 @end macro
 
 @macro DefescListEnd{name, delimI, arg, delimII}
-@deffnx Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\}
+@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\}
 @esindex \name\
 @end macro
 
@@ -326,21 +327,10 @@ Software Foundation raise funds for GNU development.''
 @end macro
 
 
-@c due to a bug in texinfo 4.2, the spacing of `<' is bad in @item
-
-@tex
-\gdef\LT{\string<}
-@end tex
-
-@macro LT
-<
-@end macro
-
-
 @c We need special parentheses and brackets:
 @c
 @c . Real parentheses in @deffn produce an error while compiling with
-@c   TeX
+@c   TeX.
 @c . Real brackets use the wrong font in @deffn, overriding @t{}.
 @c
 @c Since macros aren't expanded in @deffn during -E, the following
@@ -371,7 +361,7 @@ Software Foundation raise funds for GNU development.''
 @c Note: We say `Roman numerals' but `roman font'.
 
 
-@dircategory Miscellaneous
+@dircategory Typesetting
 @direntry
 * Groff: (groff).               The GNU troff document formatting system.
 @end direntry
@@ -380,9 +370,9 @@ Software Foundation raise funds for GNU development.''
 @titlepage
 @title groff
 @subtitle The GNU implementation of @code{troff}
-@subtitle Edition 1.18
-@subtitle Spring 2002
-@author by Trent A.@w{ }Fisher
+@subtitle Edition 1.19
+@subtitle Spring 2003
+@author by Trent A.@tie{}Fisher
 @author and Werner Lemberg (@email{bug-groff@@gnu.org})
 
 @page
@@ -441,7 +431,7 @@ Software Foundation raise funds for GNU development.''
 
 GNU @code{troff} (or @code{groff}) is a system for typesetting
 documents.  @code{troff} is very flexible and has been in existence (and
-use) for about 3@w{ }decades.  It is quite widespread and firmly
+use) for about 3@tie{}decades.  It is quite widespread and firmly
 entrenched in the @acronym{UNIX} community.
 
 @menu
@@ -514,7 +504,7 @@ impossible to accomplish complex actions.''  --Doug Gwyn (22/Jun/91 in
 @cindex @code{runoff}, the program
 @cindex @code{rf}, the program
 @code{troff} can trace its origins back to a formatting program called
-@code{runoff}, written by J.@w{ }E.@w{ }Saltzer, which ran on MIT's CTSS
+@code{runoff}, written by J.@tie{}E.@tie{}Saltzer, which ran on MIT's CTSS
 operating system in the mid-sixties.  This name came from the common
 phrase of the time ``I'll run off a document.''  Bob Morris ported it to
 the 635 architecture and called the program @code{roff} (an abbreviation
@@ -530,7 +520,7 @@ was sitting around Bell Labs.  In 1971 the developers wanted to get a
 justify the cost for this system, they proposed that they would
 implement a document formatting system for the @acronym{AT&T} patents
 division.  This first formatting program was a reimplementation of
-McIllroy's @code{roff}, written by J.@w{ }F.@w{ }Ossanna.
+McIllroy's @code{roff}, written by J.@tie{}F.@tie{}Ossanna.
 
 @cindex @code{nroff}, the program
 When they needed a more flexible language, a new version of @code{roff}
@@ -562,7 +552,7 @@ according to a bibliographic database.
 
 Unfortunately, Ossanna's @code{troff} was written in @w{PDP-11} assembly
 language and produced output specifically for the CAT phototypesetter.
-He rewrote it in C, although it was now 7000@w{ }lines of uncommented
+He rewrote it in C, although it was now 7000@tie{}lines of uncommented
 code and still dependent on the CAT.  As the CAT became less common, and
 was no longer supported by the manufacturer, the need to make it support
 other devices became a priority.  However, before this could be done,
@@ -585,8 +575,8 @@ preprocessor did the same, although via a much different paradigm.  The
 other preprocessors, produced @code{pic} code.
 
 James Clark began work on a GNU implementation of @code{ditroff} in
-early@w{ }1989.  The first version, @code{groff}@w{ }0.3.1, was released
-June@w{ }1990.  @code{groff} included:
+early@tie{}1989.  The first version, @code{groff}@tie{}0.3.1, was released
+June@tie{}1990.  @code{groff} included:
 
 @itemize @bullet
 @item
@@ -597,7 +587,7 @@ The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors.
 
 @item
 Postprocessors for character devices, @sc{PostScript}, @TeX{} DVI, and
-X@w{ }Windows.  GNU @code{troff} also eliminated the need for a
+X@tie{}Windows.  GNU @code{troff} also eliminated the need for a
 separate @code{nroff} program with a postprocessor which would produce
 @acronym{ASCII} output.
 
@@ -615,9 +605,9 @@ additions of a replacement for @code{refer}, an implementation of the
 document (@code{grog}).
 
 It was declared a stable (i.e.@: non-beta) package with the release of
-version@w{ }1.04 around November@w{ }1991.
+version@tie{}1.04 around November@tie{}1991.
 
-Beginning in@w{ }1999, @code{groff} has new maintainers (the package was
+Beginning in@tie{}1999, @code{groff} has new maintainers (the package was
 an orphan for a few years).  As a result, new features and programs like
 @code{grn}, a preprocessor for gremlin images, and an output device to
 produce @acronym{HTML} output have been added.
@@ -704,9 +694,9 @@ output and error messages
 
 Since @code{groff} provides such low-level facilities, it can be quite
 difficult to use by itself.  However, @code{groff} provides a
-@dfn{macro} facility to specify how certain routine operations (e.g.@w{
-}starting paragraphs, printing headers and footers, etc.)@: should be
-done.  These macros can be collected together into a @dfn{macro
+@dfn{macro} facility to specify how certain routine operations
+(e.g.@tie{}starting paragraphs, printing headers and footers, etc.)@:
+should be done.  These macros can be collected together into a @dfn{macro
 package}.  There are a number of macro packages available; the most
 common (and the ones described in this manual) are @file{man},
 @file{mdoc}, @file{me}, @file{ms}, and @file{mm}.
@@ -759,8 +749,8 @@ mathematical pictures (@code{ideal}) and chemical structures
 @code{groff} actually produces device independent code which may be
 fed into a postprocessor to produce output for a particular device.
 Currently, @code{groff} has postprocessors for @sc{PostScript}
-devices, character terminals, X@w{ }Windows (for previewing), @TeX{}
-DVI format, HP LaserJet@w{ }4 and Canon LBP printers (which use
+devices, character terminals, X@tie{}Windows (for previewing), @TeX{}
+DVI format, HP LaserJet@tie{}4 and Canon LBP printers (which use
 @acronym{CAPSL}), and @acronym{HTML}.
 
 
@@ -774,9 +764,9 @@ Large portions of this manual were taken from existing documents, most
 notably, the manual pages for the @code{groff} package by James Clark,
 and Eric Allman's papers on the @file{me} macro package.
 
-The section on the @file{man} macro package is partly based on Susan@w{
-}G.@: Kleinmann's @file{groff_man} manual page written for the Debian
-GNU/Linux system.
+The section on the @file{man} macro package is partly based on
+Susan@tie{}G.@: Kleinmann's @file{groff_man} manual page written for the
+Debian GNU/Linux system.
 
 Larry Kollar contributed the section in the @file{ms} macro package.
 
@@ -815,6 +805,7 @@ Similarly, we say @samp{gpic}, @samp{geqn}, etc.
 * Environment::
 * Macro Directories::
 * Font Directories::
+* Paper Size::
 * Invocation Examples::
 @end menu
 
@@ -872,8 +863,8 @@ gtroff [ -abcivzCERU ] [ -w@var{name} ] [ -W@var{name} ] [ -d@var{cs} ]
 Obviously, many of the options to @code{groff} are actually passed on to
 @code{gtroff}.
 
-Options without an argument can be grouped behind a single@w{ }@option{-}.
-A filename of@w{ }@file{-} denotes the standard input.  It is possible to
+Options without an argument can be grouped behind a single@tie{}@option{-}.
+A filename of@tie{}@file{-} denotes the standard input.  It is possible to
 have whitespace between an option and its parameter.
 
 The @code{grog} command can be used to guess the correct @code{groff}
@@ -977,29 +968,35 @@ For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the
 document.
 
 @item ascii
-@cindex encoding, @acronym{ASCII}
-@cindex @acronym{ASCII}, encoding
+@cindex encoding, output, @acronym{ASCII}
+@cindex @acronym{ASCII}, output encoding
+@cindex output encoding, @acronym{ASCII}
 For typewriter-like devices using the (7-bit) @acronym{ASCII}
 character set.
 
 @item latin1
-@cindex encoding, latin-1
-@cindex latin-1, encoding
-For typewriter-like devices that support the @w{Latin-1} (@w{ISO
-8859-1}) character set.
+@cindex encoding, output, @w{latin-1} (ISO @w{8859-1})
+@cindex @w{latin-1} (ISO @w{8859-1}), output encoding
+@cindex ISO @w{8859-1} (@w{latin-1}), output encoding
+@cindex output encoding, @w{latin-1} (ISO @w{8859-1})
+For typewriter-like devices that support the @w{Latin-1}
+(ISO@tie{}@w{8859-1}) character set.
 
 @item utf8
-@cindex encoding, utf-8
-@cindex utf-8, encoding
-For typewriter-like devices which use the Unicode (@w{ISO 10646})
+@cindex encoding, output, @w{utf-8}
+@cindex @w{utf-8}, output encoding
+@cindex output encoding, @w{utf-8}
+For typewriter-like devices which use the Unicode (ISO@tie{}10646)
 character set with @w{UTF-8} encoding.
 
 @item cp1047
-@cindex @acronym{EBCDIC} encoding
-@cindex encoding, @acronym{EBCDIC}
-@cindex encoding, cp1047
-@cindex cp1047
-@cindex IBM cp1047
+@cindex encoding, output, @acronym{EBCDIC}
+@cindex @acronym{EBCDIC}, output encoding
+@cindex output encoding, @acronym{EBCDIC}
+@cindex encoding, output, cp1047
+@cindex cp1047, output encoding
+@cindex output encoding, cp1047
+@cindex IBM cp1047 output encoding
 For typewriter-like devices which use the @acronym{EBCDIC} encoding IBM
 cp1047.
 
@@ -1023,7 +1020,7 @@ postprocessor (@code{post-grohtml}).
 @cindex output device usage number register (@code{.T})
 The predefined @code{gtroff} string register @code{.T} contains the
 current output device; the read-only number register @code{.T} is set
-to@w{ }1 if this option is used (which is always true if @code{groff} is
+to@tie{}1 if this option is used (which is always true if @code{groff} is
 used to call @code{gtroff}).  @xref{Built-in Registers}.
 
 The postprocessor to be used for a device is specified by the
@@ -1065,7 +1062,7 @@ Unsafe mode.  This enables the @code{open}, @code{opena}, @code{pso},
 @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@w{ }1.  @xref{Built-in
+read-only register @code{.A} is then set to@tie{}1.  @xref{Built-in
 Registers}.  A typical example is
 
 @Example
@@ -1104,7 +1101,7 @@ list of incompatibilities between @code{groff} and @acronym{AT&T}
 
 @item -d@var{c}@var{s}
 @itemx -d@var{name}=@var{s}
-Define @var{c} or @var{name} to be a string@w{ }@var{s}.  @var{c}@w{ }must
+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).
@@ -1123,10 +1120,10 @@ 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@w{ }@var{n}, @samp{@var{m}-@var{n}}
-means print every page between @var{m} and@w{ }@var{n}, @samp{-@var{n}}
-means print every page up to@w{ }@var{n}, @samp{@var{n}-} means print every
-page beginning with@w{ }@var{n}.  @code{gtroff} exits after printing the
+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
@@ -1138,10 +1135,10 @@ chapter.
 
 @item -r@var{c}@var{n}
 @itemx -r@var{name}=@var{n}
-Set number register@w{ }@var{c} or @var{name} to the value@w{ }@var{n}.
-@var{c}@w{ }must be a one-letter name; @var{name} can be of arbitrary
-length.  @var{n}@w{ }can be any @code{gtroff} numeric expression.  All
-register  assignments happen before loading any macro file (including
+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}
@@ -1176,7 +1173,7 @@ not within @code{gtroff}) which can modify the behavior of @code{groff}.
 @tindex GROFF_COMMAND_PREFIX@r{, environment variable}
 @cindex command prefix
 @cindex prefix, for commands
-If this is set to@w{ }@var{X}, then @code{groff} runs @code{@var{X}troff}
+If this is set to@tie{}@var{X}, then @code{groff} runs @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},
@@ -1284,11 +1281,11 @@ directory, and the main tmac directory; the default locations are
 @Example
 /usr/local/lib/groff/site-tmac
 /usr/local/share/groff/site-tmac
-/usr/local/share/groff/1.18/tmac
+/usr/local/share/groff/1.18.2/tmac
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.18, and the installation
+assuming that the version of @code{groff} is 1.18.2, and the installation
 prefix was @file{/usr/local}.  It is possible to fine-tune those
 directories during the installation process.
 @end itemize
@@ -1296,7 +1293,7 @@ directories during the installation process.
 
 @c =====================================================================
 
-@node Font Directories, Invocation Examples, Macro Directories, Invoking groff
+@node Font Directories, Paper Size, Macro Directories, Invoking groff
 @section Font Directories
 @cindex font directories
 @cindex directories for fonts
@@ -1342,11 +1339,11 @@ locations are
 
 @Example
 /usr/local/share/groff/site-font
-/usr/local/share/groff/1.18/font
+/usr/local/share/groff/1.18.2/font
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.18, and the installation
+assuming that the version of @code{groff} is 1.18.2, and the installation
 prefix was @file{/usr/local}.  It is possible to fine-tune those
 directories during the installation process.
 @end itemize
@@ -1354,7 +1351,49 @@ directories during the installation process.
 
 @c =====================================================================
 
-@node Invocation Examples,  , Font Directories, Invoking groff
+@node Paper Size, Invocation Examples, Font Directories, Invoking groff
+@section Paper Size
+@cindex paper size
+@cindex size, paper
+@cindex landscape page orientation
+@cindex orientation, landscape
+@cindex page orientation, landscape
+
+In groff, the page size for @code{gtroff} and for output devices are
+handled separately.  @xref{Page Layout}, for vertical manipulation of
+the page size.  @xref{Line Layout}, for horizontal changes.
+
+A default paper size can be set in the device's @file{DESC} file.  Most
+output devices also have a command line option @option{-p} to override
+the default paper size and option @option{-l} to use landscape
+orientation.  @xref{DESC File Format}, for a description of the
+@code{papersize} keyword which takes the same argument as @option{-p}.
+
+@pindex papersize.tmac
+@pindex troffrc
+A convenient shorthand to set a particular paper size for @code{gtroff}
+is command line option @option{-dpaper=@var{size}}.  This defines string
+@code{paper} which is processed in file @file{papersize.tmac} (loaded in
+the start-up file @file{troffrc} by default).  Possible values for
+@var{size} are the same as the predefined values for the
+@code{papersize} keyword (but only in lowercase) except
+@code{a7}-@code{d7}.  An appended @samp{l} (ell) character denotes
+landscape orientation.
+
+For example, use the following for PS output on A4 paper in landscape
+orientation:
+
+@Example
+groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+@endExample
+
+Note that it is up to the particular macro package to respect default
+page dimensions set in this way (most do).
+
+
+@c =====================================================================
+
+@node Invocation Examples,  , Paper Size, Invoking groff
 @section Invocation Examples
 @cindex invocation examples
 @cindex examples of invocation
@@ -1424,7 +1463,7 @@ generates one or more of the options @option{-e}, @option{-man},
 @option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G},
 @option{-s}, and @option{-t}.
 
-A special file name@w{ }@file{-} refers to the standard input.  Specifying
+A special file name@tie{}@file{-} refers to the standard input.  Specifying
 no files also means to read the standard input.  Any specified options
 are included in the printed command.  No space is allowed between
 options and their arguments.  The only options recognized are
@@ -1484,7 +1523,7 @@ macro package.
 
 This section covers some of the basic concepts necessary to understand
 how to use a macro package.@footnote{This section is derived from
-@cite{Writing Papers with nroff using -me} by Eric P.@w{ }Allman.}
+@cite{Writing Papers with nroff using -me} by Eric P.@tie{}Allman.}
 References are made throughout to more detailed information, if desired.
 
 @code{gtroff} reads an input file prepared by the user and outputs a
@@ -1510,10 +1549,11 @@ spaces one line, but
 @endExample
 
 @noindent
-spaces four lines.  The number@w{ }4 is an argument to the @code{sp}
+spaces four lines.  The number@tie{}4 is an argument to the @code{sp}
 request which says to space four lines instead of one.  Arguments are
 separated from the request and from each other by spaces (@emph{no}
-tabs).  More details on this can be found in @ref{Request Arguments}.
+tabs).  More details on this can be found in @ref{Request and Macro
+Arguments}.
 
 The primary function of @code{gtroff} is to collect words from input
 lines, fill output lines with those words, justify the right-hand margin
@@ -1598,10 +1638,10 @@ The @code{bp} request starts a new page, causing a line break.
 @cindex blank line (@code{sp})
 @cindex empty line (@code{sp})
 @cindex line, empty (@code{sp})
-The request @w{@samp{.sp @var{N}}} leaves @var{N}@w{ }lines of blank
-space.  @var{N}@w{ }can be omitted (meaning skip a single line) or can
-be of the form @var{N}i (for @var{N}@w{ }inches) or @var{N}c (for
-@var{N}@w{ }centimeters).  For example, the input:
+The request @w{@samp{.sp @var{N}}} leaves @var{N}@tie{}lines of blank
+space.  @var{N}@tie{}can be omitted (meaning skip a single line) or can
+be of the form @var{N}i (for @var{N}@tie{}inches) or @var{N}c (for
+@var{N}@tie{}centimeters).  For example, the input:
 
 @Example
 .sp 1.5i
@@ -1619,7 +1659,7 @@ measurement units are available, see @ref{Measurements}).
 Text lines can be centered by using the @code{ce} request.  The line
 after @code{ce} is centered (horizontally) on the page.  To center more
 than one line, use @w{@samp{.ce @var{N}}} (where @var{N} is the number
-of lines to center), followed by the @var{N}@w{ }lines.  To center many
+of lines to center), followed by the @var{N}@tie{}lines.  To center many
 lines without counting them, type:
 
 @Example
@@ -1716,7 +1756,6 @@ A variation of this is a bulleted list.
       is used instead of a real bullet.
 @endExample
 
-
 @c ---------------------------------------------------------------------
 
 @node Sections and Chapters, Headers and Footers, Paragraphs, Common Features
@@ -1784,7 +1823,7 @@ not.
 @cindex keep, floating
 @cindex floating keep
 @dfn{Floating keeps} move relative to the text.  Hence, they are good for
-things which are referred to by name, such as ``See figure@w{ }3''.  A
+things which are referred to by name, such as ``See figure@tie{}3''.  A
 floating keep appears at the bottom of the current page if it fits;
 otherwise, it appears at the top of the next page.  Meanwhile, the
 surrounding text `flows' around the keep, thus leaving no blank areas.
@@ -1883,7 +1922,7 @@ extend their functionality.
 
 For example, all macro packages mark tables (which are processed with
 @code{gtbl}) by placing them between @code{TS} and @code{TE} macros.
-The @file{ms} macro package has an option, @samp{.TS@w{ }H}, that prints
+The @file{ms} macro package has an option, @samp{.TS@tie{}H}, that prints
 a caption at the top of a new page (when the table is too long to fit on
 a single page).
 
@@ -1909,6 +1948,20 @@ to changing the appearance of section headers.
 This chapter documents the main macro packages that come with
 @code{groff}.
 
+Different main macro packages can't be used at the same time; for example
+
+@Example
+groff -m man foo.man -m ms bar.doc
+@endExample
+
+@noindent
+doesn't work.  Note that option arguments are processed before non-option
+arguments; the above (failing) sample is thus reordered to
+
+@Example
+groff -m man -m ms foo.man bar.doc
+@endExample
+
 @menu
 * man::
 * mdoc::
@@ -1939,6 +1992,7 @@ are based on it.
 * Miscellaneous man macros::
 * Predefined man strings::
 * Preprocessors in man pages::
+* Optional man extensions::
 @end menu
 
 @c ---------------------------------------------------------------------
@@ -1950,25 +2004,16 @@ The command line format for using the @file{man} macros with
 @code{groff} is:
 
 @Example
-groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ]
-      [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ]
-      [ -rS@var{xx} ] [ -rX@var{nnn} ] [ @var{files}@dots{} ]
+groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ] [ -rFT=@var{dist} ]
+      [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [-rHY=@var{flags} ]
+      [ -rP@var{nnn} ] [ -rS@var{xx} ] [ -rX@var{nnn} ]
+      [ -rIN=@var{length} ] [ -rSN=@var{length} ] [ @var{files}@dots{} ]
 @endExample
 
 @noindent
 It is possible to use @samp{-man} instead of @w{@samp{-m man}}.
 
 @table @code
-@item -rLL=@var{length}
-Set line length to @var{length}.  If not specified, the line length
-defaults to 78@w{ }en in nroff mode (this is 78@w{ }characters per
-line) and 6.5@w{ }inch otherwise.
-
-@item -rLT=@var{length}
-Set title length to @var{length}.  If not specified, the title length
-defaults to 78@w{ }en in nroff mode (this is 78@w{ }characters per
-line) and 6.5@w{ }inch otherwise.
-
 @item -rcR=1
 This option (the default if a TTY output device is used) creates a
 single, very long page instead of multiple pages.  Use @code{-rcR=0}
@@ -1976,18 +2021,50 @@ to disable it.
 
 @item -rC1
 If more than one manual page is given on the command line, number the
-pages continuously, rather than starting each at@w{ }1.
+pages continuously, rather than starting each at@tie{}1.
 
 @item -rD1
 Double-sided printing.  Footers for even and odd pages are formatted
 differently.
 
+@item -rFT=@var{dist}
+Set the position of the footer text to @var{dist}.  If positive, the
+distance is measured relative to the top of the page, otherwise it is
+relative to the bottom.  The default is @minus{}0.5@dmn{i}.
+
+@item -rHY=@var{flags}
+Set hyphenation flags.  Possible values are 1@tie{}to hyphenate without
+restrictions, 2@tie{} to not hyphenate the last word on a page,
+4@tie{}to not hyphenate the last two characters of a word, and
+8@tie{}to not hyphenate the first two characters of a word.  These
+values are additive; the default is@tie{}14.
+
+@item -rIN=@var{length}
+Set the body text indent to @var{length}.
+If not specified, the indent defaults to 7@dmn{n}
+(7@tie{}characters) in nroff mode and 7.2@dmn{n} otherwise.
+For nroff, this value should always be an integer multiple of unit @samp{n}
+to get consistent indentation.
+
+@item -rLL=@var{length}
+Set line length to @var{length}.  If not specified, the line length
+defaults to 78@tie{}en in nroff mode (this is 78@tie{}characters per
+line) and 6.5@tie{}inch otherwise.
+
+@item -rLT=@var{length}
+Set title length to @var{length}.  If not specified, the title length
+defaults to the line length.
+
 @item -rP@var{nnn}
-Page numbering starts with @var{nnn} rather than with@w{ }1.
+Page numbering starts with @var{nnn} rather than with@tie{}1.
 
 @item -rS@var{xx}
-Use @var{xx} (which can be 10, 11, or@w{ }12@dmn{pt}) as the base
-document font size instead of the default value of@w{ }10@dmn{pt}.
+Use @var{xx} (which can be 10, 11, or@tie{}12@dmn{pt}) as the base
+document font size instead of the default value of@tie{}10@dmn{pt}.
+
+@item -rSN=@var{length}
+Set the indent for sub-subheadings to @var{length}.
+If not specified, the indent defaults to 3@dmn{n}.
 
 @item -rX@var{nnn}
 After page @var{nnn}, number pages as @var{nnn}a, @var{nnn}b,
@@ -2010,7 +2087,7 @@ package.
 
 @Defmac {TH, title section [@Var{extra1} [@Var{extra2} [@Var{extra3}]]], man}
 Set the title of the man page to @var{title} and the section to
-@var{section}, which must have a value between 1 and@w{ }8.  The value
+@var{section}, which must have a value between 1 and@tie{}8.  The value
 of @var{section} may also have a string appended, e.g.@: @samp{.pm},
 to indicate a specific subsection of the man pages.
 
@@ -2024,7 +2101,7 @@ header line.
 
 For @acronym{HTML} output, headers and footers are completely suppressed.
 
-Additionally, this macro starts a new page; the new line number is@w{ }1
+Additionally, this macro starts a new page; the new line number is@tie{}1
 again (except if the @option{-rC1} option is given on the command line)
 -- this feature is intended only for formatting multiple man pages; a
 single man page should contain exactly one @code{TH} macro at the
@@ -2035,30 +2112,34 @@ beginning of the file.
 Set up an unnumbered section heading sticking out to the left.  Prints
 out all the text following @code{SH} up to the end of the line (or the
 text in the next line if there is no argument to @code{SH}) in bold
-face, one size larger than the base document size.  Additionally, the
-left margin for the following text is reset to its default value.
+face (or the font specified by the string @code{HF}), one size larger than
+the base document size.  Additionally, the left margin and the indentation
+for the following text is reset to its default value.
 @endDefmac
 
 @Defmac {SS, [@Var{heading}], man}
 Set up an unnumbered (sub)section heading.  Prints out all the text
 following @code{SS} up to the end of the line (or the text in the next
-line if there is no argument to @code{SS}) in bold face, at the same
-size as the base document size.  Additionally, the left margin for the
+line if there is no argument to @code{SS}) in bold face (or the font
+specified by the string @code{HF}), at the same size as the base document
+size.  Additionally, the left margin and the indentation for the
 following text is reset to its default value.
 @endDefmac
 
 @Defmac {TP, [@Var{nnn}], man}
 Set up an indented paragraph with label.  The indentation is set to
 @var{nnn} if that argument is supplied (the default unit is @samp{n}
-if omitted), otherwise it is set to the default indentation value.
+if omitted), otherwise it is set to the previous indentation value
+specified with @code{TP}, @code{IP}, or @code{HP} (or to the default
+value if none of them have been used yet).
 
 The first line of text following this macro is interpreted as a string
 to be printed flush-left, as it is appropriate for a label.  It is not
 interpreted as part of a paragraph, so there is no attempt to fill the
 first line with text from the following input lines.  Nevertheless, if
-the label is not as wide as the indentation, then the paragraph starts
+the label is not as wide as the indentation the paragraph starts
 at the same line (but indented), continuing on the following lines.
-If the label is wider than the indentation, then the descriptive part
+If the label is wider than the indentation the descriptive part
 of the paragraph begins on the line following the label, entirely
 indented.  Note that neither font shape nor font size of the label is
 set to a default value; on the other hand, the rest of the text has
@@ -2072,22 +2153,25 @@ These macros are mutual aliases.  Any of them causes a line break at
 the current position, followed by a vertical space downwards by the
 amount specified by the @code{PD} macro.  The font size and shape are
 reset to the default value (10@dmn{pt} roman if no @option{-rS} option
-is given on the command line).  Finally, the current left margin is
-restored.
+is given on the command line).  Finally, the current left margin and the
+indentation is restored.
 @endDefmac
 
 @Defmac {IP, [@Var{designator} [@Var{nnn}]], man}
 Set up an indented paragraph, using @var{designator} as a tag to mark
 its beginning.  The indentation is set to @var{nnn} if that argument
-is supplied (default unit is @samp{n}), otherwise the default
-indentation value is used.  Font size and face of the paragraph (but
-not the designator) are reset to their default values.  To start an
-indented paragraph with a particular indentation but without a
-designator, use @samp{""} (two double quotes) as the first argument of
+is supplied (default unit is @samp{n}), otherwise it is set to the
+previous indentation value specified with @code{TP}, @code{IP}, or
+@code{HP} (or the default value if none of them have been used yet).
+Font size and face of the paragraph (but not the designator) are reset
+to their default values.
+
+To start an indented paragraph with a particular indentation but without
+a designator, use @samp{""} (two double quotes) as the first argument of
 @code{IP}.
 
 For example, to start a paragraph with bullets as the designator and
-4@w{ }en indentation, write
+4@tie{}en indentation, write
 
 @Example
 .IP \(bu 4
@@ -2099,23 +2183,29 @@ For example, to start a paragraph with bullets as the designator and
 @cindex @code{man} macros, hanging indentation
 Set up a paragraph with hanging left indentation.  The indentation is
 set to @var{nnn} if that argument is supplied (default unit is
-@samp{n}), otherwise the default indentation value is used.  Font size
-and face are reset to their default values.
+@samp{n}), otherwise it is set to the previous indentation value
+specified with @code{TP}, @code{IP}, or @code{HP} (or the default
+value if non of them have been used yet).  Font size and face are reset
+to their default values.
 @endDefmac
 
 @Defmac {RS, [@Var{nnn}], man}
 @cindex left margin, how to move [@code{man}]
 @cindex @code{man} macros, moving left margin
 Move the left margin to the right by the value @var{nnn} if specified
-(default unit is @samp{n}); otherwise the default indentation value
-is used.  Calls to the @code{RS} macro can be nested.
+(default unit is @samp{n}); otherwise it is set to the previous
+indentation value specified with @code{TP}, @code{IP}, or @code{HP}
+(or to the default value if none of them have been used yet).  The
+indentation value is then set to the default.
+
+Calls to the @code{RS} macro can be nested.
 @endDefmac
 
 @Defmac {RE, [@Var{nnn}], man}
-Move the left margin back to level @var{nnn}; if no argument is given,
-it moves one level back.  The first level (i.e., no call to @code{RS}
-yet) has number@w{ }1, and each call to @code{RS} increases the level
-by@w{ }1.
+Move the left margin back to level @var{nnn}, restoring the previous left
+margin.  If no argument is given, it moves one level back.  The first
+level (i.e., no call to @code{RS} yet) has number@tie{}1, and each call
+to @code{RS} increases the level by@tie{}1.
 @endDefmac
 
 @cindex line breaks, with vertical space [@code{man}]
@@ -2143,7 +2233,7 @@ and @code{RS} reset the indentation to its default value.
 @cindex font selection [@code{man}]
 @cindex @code{man} macros, how to set fonts
 
-The standard font is roman; the default text size is 10@w{ }point.
+The standard font is roman; the default text size is 10@tie{}point.
 If command line option @option{-rS=@var{n}} is given, use
 @var{n}@dmn{pt} as the default text size.
 
@@ -2160,35 +2250,41 @@ font, one point size smaller than the default font.
 @endDefmac
 
 @Defmac {BI, text, man}
-Set its arguments alternately in bold face and italic.  Thus,
+Set its arguments alternately in bold face and italic, without a space
+between the arguments.  Thus,
 
 @Example
 .BI this "word and" that
 @endExample
 
 @noindent
-would set ``this'' and ``that'' in bold face, and ``word and'' in
-italics.
+produces ``thisword andthat'' with ``this'' and ``that'' in bold face,
+and ``word and'' in italics.
 @endDefmac
 
 @Defmac {IB, text, man}
-Set its arguments alternately in italic and bold face.
+Set its arguments alternately in italic and bold face, without a space
+between the arguments.
 @endDefmac
 
 @Defmac {RI, text, man}
-Set its arguments alternately in roman and italic.
+Set its arguments alternately in roman and italic, without a space between
+the arguments.
 @endDefmac
 
 @Defmac {IR, text, man}
-Set its arguments alternately in italic and roman.
+Set its arguments alternately in italic and roman, without a space between
+the arguments.
 @endDefmac
 
 @Defmac {BR, text, man}
-Set its arguments alternately in bold face and roman.
+Set its arguments alternately in bold face and roman, without a space
+between the arguments.
 @endDefmac
 
 @Defmac {RB, text, man}
-Set its arguments alternately in roman and bold face.
+Set its arguments alternately in roman and bold face, without a space
+between the arguments.
 @endDefmac
 
 @Defmac {B, [@Var{text}], man}
@@ -2212,13 +2308,13 @@ macro is called, then the text of the next line appears in italic.
 @pindex grohtml
 @cindex @code{man} macros, default indentation
 @cindex default indentation [@code{man}]
-The default indentation is 7.2@w{ }en for all output devices except for
-@code{grohtml} which ignores indentation.
+The default indentation is 7.2@dmn{n} in troff mode and 7@dmn{n} in
+nroff mode except for @code{grohtml} which ignores indentation.
 
 @Defmac {DT, , man}
 @cindex tab stops [@code{man}]
 @cindex @code{man} macros, tab stops
-Set tabs every 0.5@w{ }inches.  Since this macro is always executed
+Set tabs every 0.5@tie{}inches.  Since this macro is always executed
 during a call to the @code{TH} macro, it makes sense to call it only if
 the tab positions have been changed.
 @endDefmac
@@ -2229,11 +2325,59 @@ the tab positions have been changed.
 Adjust the empty space before a new paragraph (or section).  The
 optional argument gives the amount of space (default unit is
 @samp{v}); without parameter, the value is reset to its default value
-(1@w{ }line for TTY devices, 0.4@dmn{v}@w{ }otherwise).
-@endDefmac
+(1@tie{}line in nroff mode, 0.4@dmn{v}@tie{}otherwise).
 
 This affects the macros @code{SH}, @code{SS}, @code{TP}, @code{LP} (as
 well as @code{PP} and @code{P}), @code{IP}, and @code{HP}.
+@endDefmac
+
+The following two macros are included for
+BSD compatibility.
+
+@Defmac {AT, [@Var{system} [@Var{release}]], man}
+@cindex @code{man}macros, BSD compatibility
+Alter the footer for use with @acronym{AT&T} manpages.
+This command exists only for compatibility; don't use it.
+The first argument @var{system} can be:
+
+@table @code
+@item 3
+7th Edition (the default)
+
+@item 4
+System III
+
+@item 5
+System V
+@end table
+
+An optional second argument @var{release} to @code{AT} specifies the
+release number (such as ``System V Release 3'').
+@endDefmac
+
+@Defmac {UC, [@Var{version}], man}
+@cindex @code{man}macros, BSD compatibility
+Alters the footer for use with @acronym{BSD} manpages.
+This command exists only for compatibility; don't use it.
+The argument can be:
+
+@table @code
+@item 3
+3rd Berkeley Distribution (the default)
+
+@item 4
+4th Berkeley Distribution
+
+@item 5
+4.2 Berkeley Distribution
+
+@item 6
+4.3 Berkeley Distribution
+
+@item 7
+4.4 Berkeley Distribution
+@end table
+@endDefmac
 
 @c ---------------------------------------------------------------------
 
@@ -2246,6 +2390,11 @@ The following strings are defined:
 Switch back to the default font size.
 @endDefstr
 
+@Defstr {HF, man}
+The typeface used for headings.
+The default is @samp{B}.
+@endDefstr
+
 @Defstr {R, man}
 The `registered' sign.
 @endDefstr
@@ -2264,7 +2413,7 @@ respectively.
 
 @c ---------------------------------------------------------------------
 
-@node Preprocessors in man pages,  , Predefined man strings, man
+@node Preprocessors in man pages, Optional man extensions, Predefined man strings, man
 @subsection Preprocessors in @file{man} pages
 
 @cindex preprocessor, calling convention
@@ -2288,6 +2437,173 @@ consists of letters for the needed preprocessors: @samp{e} for
 Modern implementations of the @code{man} program read this first line
 and automatically call the right preprocessor(s).
 
+@c ---------------------------------------------------------------------
+
+@node Optional man extensions,  , Preprocessors in man pages, man
+@subsection Optional @file{man} extensions
+
+@pindex man.local
+Use the file @file{man.local} for local extensions
+to the @code{man} macros or for style changes.
+
+@unnumberedsubsubsec Custom headers and footers
+@cindex @code{man} macros, custom headers and footers
+
+In groff versions 1.18.2 and later, you can specify custom
+headers and footers by redefining the following macros in
+@file{man.local}.
+
+@Defmac {PT, , man}
+Control the content of the headers.
+Normally, the header prints the command name
+and section number on either side, and the
+optional fifth argument to @code{TH} in the center.
+@endDefmac
+
+@Defmac {BT, , man}
+Control the content of the footers.
+Normally, the footer prints the page number
+and the third and fourth arguments to @code{TH}.
+
+Use the @code{FT} number register to specify the
+footer position.
+The default is @minus{}0.5@dmn{i}.
+@endDefmac
+
+@unnumberedsubsubsec Ultrix-specific man macros
+@cindex Ultrix-specific @code{man} macros
+@cindex @code{man} macros, Ultrix-specific
+
+@pindex man.ultrix
+The @code{groff} source distribution includes
+a file named @file{man.ultrix}, containing
+macros compatible with the Ultrix variant of
+@code{man}.
+Copy this file into @file{man.local} (or use the @code{mso} request to
+load it) to enable the following macros.
+
+@Defmac {CT, @Var{key}, man}
+Print @samp{<CTRL/@var{key}>}.
+@endDefmac
+
+@Defmac {CW, , man}
+Print subsequent text using the constant width (Courier) typeface.
+@endDefmac
+
+@Defmac {Ds, , man}
+Begin a non-filled display.
+@endDefmac
+
+@Defmac {De, , man}
+End a non-filled display started with @code{Ds}.
+@endDefmac
+
+@Defmac {EX, [@Var{indent}], man}
+Begins a non-filled display
+using the constant width (Courier) typeface.
+Use the optional @var{indent} argument to
+indent the display.
+@endDefmac
+
+@Defmac {EE, , man}
+End a non-filled display started with @code{EX}.
+@endDefmac
+
+@Defmac {G, [@Var{text}], man}
+Sets @var{text} in Helvetica.
+If no text is present on the line where
+the macro is called, then the text of the
+next line appears in Helvetica.
+@endDefmac
+
+@Defmac {GL, [@Var{text}], man}
+Sets @var{text} in Helvetica Oblique.
+If no text is present on the line where
+the macro is called, then the text of the
+next line appears in Helvetica Oblique.
+@endDefmac
+
+@Defmac {HB, [@Var{text}], man}
+Sets @var{text} in Helvetica Bold.
+If no text is present on the line where
+the macro is called, then all text up to
+the next @code{HB} appears in Helvetica Bold.
+@endDefmac
+
+@Defmac {TB, [@Var{text}], man}
+Identical to @code{HB}.
+@endDefmac
+
+@Defmac {MS, @Var{title} @Var{sect} [@Var{punct}], man}
+Set a manpage reference in Ultrix format.
+The @var{title} is in Courier instead of italic.
+Optional punctuation follows the section number without
+an intervening space.
+@endDefmac
+
+@Defmac {NT, [@code{C}] [@Var{title}], man}
+Begin a note.
+Print the optional @Var{title}, or the word ``Note'',
+centered on the page.
+Text following the macro makes up the body of the note,
+and is indented on both sides.
+If the first argument is @code{C}, the body of the
+note is printed centered (the second argument replaces
+the word ``Note'' if specified).
+@endDefmac
+
+@Defmac {NE, , man}
+End a note begun with @code{NT}.
+@endDefmac
+
+@Defmac {PN, @Var{path} [@Var{punct}], man}
+Set the path name in constant width (Courier),
+followed by optional punctuation.
+@endDefmac
+
+@Defmac {Pn, [@Var{punct}] @Var{path} [@Var{punct}], man}
+When called with two arguments, identical to @code{PN}.
+When called with three arguments,
+set the second argument in constant width (Courier),
+bracketed by the first and third arguments in the current font.
+@endDefmac
+
+@Defmac {R, , man}
+Switch to roman font and turn off any underlining in effect.
+@endDefmac
+
+@Defmac {RN, , man}
+Print the string @samp{<RETURN>}.
+@endDefmac
+
+@Defmac {VS, [@code{4}], man}
+Start printing a change bar in the margin if
+the number @code{4} is specified.
+Otherwise, this macro does nothing.
+@endDefmac
+
+@Defmac {VE, , man}
+End printing the change bar begun by @code{VS}.
+@endDefmac
+
+@unnumberedsubsubsec Simple example
+
+The following example @file{man.local} file
+alters the @code{SH} macro to add some extra
+vertical space before printing the heading.
+Headings are printed in Helvetica Bold.
+
+@Example
+.\" Make the heading fonts Helvetica
+.ds HF HB
+.
+.\" Put more whitespace in front of headings.
+.rn SH SH-orig
+.de SH
+.  if t .sp (u;\\n[PD]*2)
+.  SH-orig \\$*
+..
+@endExample
 
 @c =====================================================================
 
@@ -2780,7 +3096,7 @@ The following describes the heading macros:
 @DefmacListEnd {NH, @t{S} @Var{level0} @dots{}, ms}
 Numbered heading.
 The argument is either a numeric argument to indicate the
-level of the heading, or the letter@w{ }@code{S} followed by numeric
+level of the heading, or the letter@tie{}@code{S} followed by numeric
 arguments to set the heading level explicitly.
 
 If you specify heading levels out of sequence, such as invoking
@@ -2824,22 +3140,22 @@ the next highlighting, paragraph, or heading macro.
 
 @Defmac {R, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in roman (or regular) type.
-It operates similarly to the @code{B}@w{ }macro otherwise.
+It operates similarly to the @code{B}@tie{}macro otherwise.
 @endDefmac
 
 @Defmac {I, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in @emph{italic type}.
-It operates similarly to the @code{B}@w{ }macro otherwise.
+It operates similarly to the @code{B}@tie{}macro otherwise.
 @endDefmac
 
 @Defmac {CW, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in a @code{constant width face}.
-It operates similarly to the @code{B}@w{ }macro otherwise.
+It operates similarly to the @code{B}@tie{}macro otherwise.
 @endDefmac
 
 @Defmac {BI, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
 Sets its first argument in bold italic type.
-It operates similarly to the @code{B}@w{ }macro otherwise.
+It operates similarly to the @code{B}@tie{}macro otherwise.
 @endDefmac
 
 @Defmac {BX, [@Var{txt}], ms}
@@ -3242,7 +3558,7 @@ in pairs of tags as follows.
 @DefmacList {TS, [@code{H}], ms}
 @DefmacListEnd {TE, , ms}
 Denotes a table, to be processed by the @code{tbl} preprocessor.
-The optional argument@w{ }@code{H} to @code{TS} instructs @code{groff}
+The optional argument@tie{}@code{H} to @code{TS} instructs @code{groff}
 to create a running header with the information
 up to the @code{TH} macro.
 @code{groff} prints the header at the beginning of the
@@ -3261,8 +3577,9 @@ a graphics program such as @code{xfig}.
 @DefmacList {EQ, [@Var{align}], ms}
 @DefmacListEnd {EN, , ms}
 Denotes an equation, to be processed by the @code{eqn} preprocessor.
-The optional @var{align} argument can be @code{C}, @code{L}, or@w{
-}@code{I} to center (the default), left-justify, or indent the equation.
+The optional @var{align} argument can be @code{C}, @code{L},
+or@tie{}@code{I} to center (the default), left-justify, or indent the
+equation.
 @endDefmac
 
 @DefmacList {[, , ms}
@@ -3475,7 +3792,7 @@ Introduction
 .NH 2
 Methodology
 .XS
-	Methodology
+Methodology
 .XE
 .LP
 ...
@@ -3505,7 +3822,7 @@ Details of Galactic Formation
 
 @Defmac {TC, [@code{no}], ms}
 Prints the table of contents on a new page,
-setting the page number to@w{ }@strong{i} (Roman numeral one).
+setting the page number to@tie{}@strong{i} (Roman numeral one).
 You should usually place this macro at the end of the
 file, since @code{groff} is a single-pass formatter and
 can only print what has been collected up to the point
@@ -3632,7 +3949,7 @@ Tilde.
 @stindex : @r{[}ms@r{]}
 @end ifnotinfo
 @ifinfo
-@stindex @r{<colon>} @r{[}ms@r{]}
+@stindex \*[@r{<colon>}] @r{[}ms@r{]}
 @end ifinfo
 Umlaut.
 @end deffn
@@ -3839,7 +4156,6 @@ Users of macro packages may skip it if not interested in details.
 
 @menu
 * Text::
-* Input Conventions::
 * Measurements::
 * Expressions::
 * Identifiers::
@@ -3855,7 +4171,7 @@ Users of macro packages may skip it if not interested in details.
 * Line Control::
 * Page Layout::
 * Page Control::
-* Fonts::
+* Fonts and Symbols::
 * Sizes::
 * Strings::
 * Conditionals and Loops::
@@ -3878,7 +4194,7 @@ Users of macro packages may skip it if not interested in details.
 
 @c =====================================================================
 
-@node Text, Input Conventions, gtroff Reference, gtroff Reference
+@node Text, Measurements, gtroff Reference, gtroff Reference
 @section Text
 @cindex text, @code{gtroff} processing
 
@@ -3906,6 +4222,8 @@ inserting implicit line breaks
 * Sentences::
 * Tab Stops::
 * Implicit Line Breaks::
+* Input Conventions::
+* Input Encodings::
 @end menu
 
 @c ---------------------------------------------------------------------
@@ -4036,7 +4354,7 @@ produces
 
 @c ---------------------------------------------------------------------
 
-@node Implicit Line Breaks,  , Tab Stops, Text
+@node Implicit Line Breaks, Input Conventions, Tab Stops, Text
 @subsection Implicit Line Breaks
 @cindex implicit line breaks
 @cindex implicit breaks of lines
@@ -4071,11 +4389,10 @@ the document may vanish!
 Certain requests also cause breaks, implicitly or explicitly.  This is
 discussed in @ref{Manipulating Filling and Adjusting}.
 
+@c ---------------------------------------------------------------------
 
-@c =====================================================================
-
-@node Input Conventions, Measurements, Text, gtroff Reference
-@section Input Conventions
+@node Input Conventions, Input Encodings, Implicit Line Breaks, Text
+@subsection Input Conventions
 @cindex input conventions
 @cindex conventions for input
 
@@ -4091,7 +4408,7 @@ and in other logical places.  Keep separate phrases on lines by
 themselves, as entire phrases are often added or deleted when editing.
 
 @item
-Try to keep lines less than 40-60@w{ }characters, to allow space for
+Try to keep lines less than 40-60@tie{}characters, to allow space for
 inserting more text.
 
 @item
@@ -4099,10 +4416,90 @@ Do not try to do any formatting in a @acronym{WYSIWYG} manner (i.e.,
 don't try using spaces to get proper indentation).
 @end itemize
 
+@c ---------------------------------------------------------------------
+
+@node Input Encodings,  , Input Conventions, Text
+@subsection Input Encodings
+
+Currently, the following input encodings are available.
+
+@table @asis
+@item cp1047
+@cindex encoding, input, @acronym{EBCDIC}
+@cindex @acronym{EBCDIC}, input encoding
+@cindex input encoding, @acronym{EBCDIC}
+@cindex encoding, input, cp1047
+@cindex cp1047, input encoding
+@cindex input encoding, cp1047
+@cindex IBM cp1047 input encoding
+@pindex cp1047.tmac
+This input encoding works only on @acronym{EBCDIC} platforms (and vice
+versa, the other input encodings don't work with @acronym{EBCDIC}); the
+file @file{cp1047.tmac} is by default loaded at start-up.
+
+@item latin-1
+@cindex encoding, input, @w{latin-1} (ISO @w{8859-1})
+@cindex @w{latin-1} (ISO @w{8859-1}), input encoding
+@cindex ISO @w{8859-1} (@w{latin-1}), input encoding
+@cindex input encoding, @w{latin-1} (ISO @w{8859-1})
+@pindex latin1.tmac
+This is the default input encoding on non-@acronym{EBCDIC} platforms;
+the file @file{latin1.tmac} is loaded at start-up.
+
+@item latin-2
+@cindex encoding, input, @w{latin-2} (ISO @w{8859-2})
+@cindex @w{latin-2} (ISO @w{8859-2}), input encoding
+@cindex ISO @w{8859-2} (@w{latin-2}), input encoding
+@cindex input encoding, @w{latin-2} (ISO @w{8859-2})
+@pindex latin2.tmac
+To use this encoding, either say @w{@samp{.mso latin2.tmac}} at the very
+beginning of your document or use @samp{-mlatin2} as a command line
+argument for @code{groff}.
+
+@item latin-9 (latin-0)
+@cindex encoding, input, @w{latin-9} (@w{latin-0}, ISO @w{8859-15})
+@cindex @w{latin-9} (@w{latin-0}, ISO @w{8859-15}), input encoding
+@cindex ISO @w{8859-15} (@w{latin-9}, @w{latin-0}), input encoding
+@cindex input encoding, @w{latin-9} (@w{latin-9}, ISO @w{8859-15})
+@pindex latin9.tmac
+This encoding is intended (at least in Europe) to replace @w{latin-1}
+encoding.  The main difference to @w{latin-1} is that @w{latin-9}
+contains the Euro character.  To use this encoding, either say
+@w{@samp{.mso latin9.tmac}} at the very beginning of your document or
+use @samp{-mlatin9} as a command line argument for @code{groff}.
+@end table
+
+Note that it can happen that some input encoding characters are not
+available for a particular output device.  For example, saying
+
+@Example
+groff -Tlatin1 -mlatin9 ...
+@endExample
+
+@noindent
+will fail if you use the Euro character in the input.  Usually, this
+limitation is present only for devices which have a limited set of
+output glyphs (e.g.@: @option{-Tascii} and @option{-Tlatin1}); for other
+devices it is usually sufficient to install proper fonts which contain
+the necessary glyphs.
+
+@pindex freeeuro.pfa
+@pindex ec.tmac
+Due to the importance of the Euro glyph in Europe, the groff package now
+comes with a @sc{PostScript} font called @file{freeeuro.pfa} which
+provides various glyph shapes for the Euro.  With other words,
+@w{latin-9} encoding is supported for the @option{-Tps} device out of
+the box (@w{latin-2} isn't).
+
+By its very nature, @option{-Tutf8} supports all input encodings;
+@option{-Tdvi} has support for both @w{latin-2} and @w{latin-9} if the
+command line @option{-mec} is used also to load the file @file{ec.tmac}
+(which flips to the EC fonts).
+
 
 @c =====================================================================
 
-@node Measurements, Expressions, Input Conventions, gtroff Reference
+@node Measurements, Expressions, Text, gtroff Reference
 @section Measurements
 @cindex measurements
 
@@ -4135,27 +4532,27 @@ current settings (e.g.@: type size) of @code{gtroff}.
 @cindex unit, @code{i}
 Inches.  An antiquated measurement unit still in use in certain
 backwards countries with incredibly low-cost computer equipment.  One
-inch is equal to@w{ }2.54@dmn{cm}.
+inch is equal to@tie{}2.54@dmn{cm}.
 
 @item c
 @cindex centimeter unit (@code{c})
 @cindex @code{c} unit
 @cindex unit, @code{c}
-Centimeters.  One centimeter is equal to@w{ }0.3937@dmn{in}.
+Centimeters.  One centimeter is equal to@tie{}0.3937@dmn{in}.
 
 @item p
 @cindex point unit (@code{p})
 @cindex @code{p} unit
 @cindex unit, @code{p}
 Points.  This is a typesetter's measurement used for measure type size.
-It is 72@w{ }points to an inch.
+It is 72@tie{}points to an inch.
 
 @item P
 @cindex pica unit (@code{P})
 @cindex @code{P} unit
 @cindex unit, @code{P}
-Pica.  Another typesetting measurement.  6@w{ }Picas to an inch (and
-12@w{ }points to a pica).
+Pica.  Another typesetting measurement.  6@tie{}Picas to an inch (and
+12@tie{}points to a pica).
 
 @item s
 @itemx z
@@ -4183,7 +4580,7 @@ text.
 @cindex @code{m} unit
 @cindex unit, @code{m}
 Ems.  This unit is equal to the current font size in points.  So called
-because it is @emph{approximately} the width of the letter@w{ }@samp{m}
+because it is @emph{approximately} the width of the letter@tie{}@samp{m}
 in the current font.
 
 @item n
@@ -4220,7 +4617,7 @@ Vertical space.  This is equivalent to the current line spacing.
 Many requests take a default unit.  While this can be helpful at times,
 it can cause strange errors in some expressions.  For example, the line
 length request expects em units.  Here are several attempts to get a
-line length of 3.5@w{ }inches and their results:
+line length of 3.5@tie{}inches and their results:
 
 @Example
 3.5i      @result{}   3.5i
@@ -4233,9 +4630,9 @@ line length of 3.5@w{ }inches and their results:
 
 @noindent
 Everything is converted to basic units first.  In the above example it
-is assumed that 1@dmn{i} equals@w{ }240@dmn{u}, and 1@dmn{m} equals@w{
-}10@dmn{p} (thus 1@dmn{m} equals@w{ }33@dmn{u}).  The value 7@dmn{i}/2
-is first handled as 7@dmn{i}/2@dmn{m}, then converted to
+is assumed that 1@dmn{i} equals@tie{}240@dmn{u}, and 1@dmn{m}
+equals@tie{}10@dmn{p} (thus 1@dmn{m} equals@tie{}33@dmn{u}).  The value
+7@dmn{i}/2 is first handled as 7@dmn{i}/2@dmn{m}, then converted to
 1680@dmn{u}/66@dmn{u} which is 25@dmn{u}, and this is approximately
 0.1@dmn{i}.  As can be seen, a scaling indicator after a closing
 parenthesis is simply ignored.
@@ -4324,14 +4721,14 @@ Example:
 @endExample
 
 @noindent
-The register@w{ }@code{z} now contains@w{ }5.
+The register@tie{}@code{z} now contains@tie{}5.
 
 @item
 @cindex scaling operator
 @cindex operator, scaling
-Scaling: @code{(@var{c};@var{e})}.  Evaluate@w{ }@var{e} using@w{ }@var{c}
+Scaling: @code{(@var{c};@var{e})}.  Evaluate@tie{}@var{e} using@tie{}@var{c}
 as the default scaling indicator.  If @var{c} is missing, ignore scaling
-indicators in the evaluation of@w{ }@var{e}.
+indicators in the evaluation of@tie{}@var{e}.
 @end itemize
 
 @cindex parentheses
@@ -4363,22 +4760,22 @@ For vertical movements, it specifies the distance from the top of the
 page; for horizontal movements, it gives the distance from the beginning
 of the @emph{input} line.
 
-@cindex @code{bp} request, using @code{+} and@w{ }@code{-}
-@cindex @code{in} request, using @code{+} and@w{ }@code{-}
-@cindex @code{ll} request, using @code{+} and@w{ }@code{-}
-@cindex @code{lt} request, using @code{+} and@w{ }@code{-}
-@cindex @code{nm} request, using @code{+} and@w{ }@code{-}
-@cindex @code{nr} request, using @code{+} and@w{ }@code{-}
-@cindex @code{pl} request, using @code{+} and@w{ }@code{-}
-@cindex @code{pn} request, using @code{+} and@w{ }@code{-}
-@cindex @code{po} request, using @code{+} and@w{ }@code{-}
-@cindex @code{ps} request, using @code{+} and@w{ }@code{-}
-@cindex @code{pvs} request, using @code{+} and@w{ }@code{-}
-@cindex @code{rt} request, using @code{+} and@w{ }@code{-}
-@cindex @code{ti} request, using @code{+} and@w{ }@code{-}
-@cindex @code{\H}, using @code{+} and@w{ }@code{-}
-@cindex @code{\R}, using @code{+} and@w{ }@code{-}
-@cindex @code{\s}, using @code{+} and@w{ }@code{-}
+@cindex @code{bp} request, using @code{+} and@tie{}@code{-}
+@cindex @code{in} request, using @code{+} and@tie{}@code{-}
+@cindex @code{ll} request, using @code{+} and@tie{}@code{-}
+@cindex @code{lt} request, using @code{+} and@tie{}@code{-}
+@cindex @code{nm} request, using @code{+} and@tie{}@code{-}
+@cindex @code{nr} request, using @code{+} and@tie{}@code{-}
+@cindex @code{pl} request, using @code{+} and@tie{}@code{-}
+@cindex @code{pn} request, using @code{+} and@tie{}@code{-}
+@cindex @code{po} request, using @code{+} and@tie{}@code{-}
+@cindex @code{ps} request, using @code{+} and@tie{}@code{-}
+@cindex @code{pvs} request, using @code{+} and@tie{}@code{-}
+@cindex @code{rt} request, using @code{+} and@tie{}@code{-}
+@cindex @code{ti} request, using @code{+} and@tie{}@code{-}
+@cindex @code{\H}, using @code{+} and@tie{}@code{-}
+@cindex @code{\R}, using @code{+} and@tie{}@code{-}
+@cindex @code{\s}, using @code{+} and@tie{}@code{-}
 @samp{+} and @samp{-} are also treated differently by the following
 requests and escapes: @code{bp}, @code{in}, @code{ll}, @code{lt},
 @code{nm}, @code{nr}, @code{pl}, @code{pn}, @code{po}, @code{ps},
@@ -4390,8 +4787,8 @@ Here, leading plus and minus signs indicate increments and decrements.
 @Defesc {\\B, ', anything, '}
 @cindex numeric expression, valid
 @cindex valid numeric expression
-Return@w{ }1 if @var{anything} is a valid numeric expression;
-or@w{ }0 if @var{anything} is empty or not a valid numeric expression.
+Return@tie{}1 if @var{anything} is a valid numeric expression;
+or@tie{}0 if @var{anything} is empty or not a valid numeric expression.
 @endDefesc
 
 @cindex space characters, in expressions
@@ -4399,7 +4796,7 @@ or@w{ }0 if @var{anything} is empty or not a valid numeric expression.
 Due to the way arguments are parsed, spaces are not allowed in
 expressions, unless the entire expression is surrounded by parentheses.
 
-@xref{Request Arguments}, and @ref{Conditionals and Loops}.
+@xref{Request and Macro Arguments}, and @ref{Conditionals and Loops}.
 
 
 @c =====================================================================
@@ -4424,8 +4821,8 @@ Whitespace characters (spaces, tabs, and newlines).
 @cindex character, backspace
 @cindex backspace character
 @cindex @acronym{EBCDIC} encoding of backspace
-Backspace (@acronym{ASCII}@w{ }@code{0x08} or @acronym{EBCDIC}@w{
-}@code{0x16}) and character code @code{0x01}.
+Backspace (@acronym{ASCII}@tie{}@code{0x08} or
+@acronym{EBCDIC}@tie{}@code{0x16}) and character code @code{0x01}.
 
 @item
 @cindex invalid input characters
@@ -4482,10 +4879,10 @@ a special argument to @code{refer}.  For example, @samp{.[foo} makes
 
 @Defesc {\\A, ', ident, '}
 Test whether an identifier @var{ident} is valid in @code{gtroff}.  It
-expands to the character@w{ }1 or@w{ }0 according to whether its
+expands to the character@tie{}1 or@tie{}0 according to whether its
 argument (usually delimited by quotes) is or is not acceptable as the
 name of a string, macro, diversion, number register, environment, or
-font.  It returns@w{ }0 if no argument is given.  This is useful for
+font.  It returns@tie{}0 if no argument is given.  This is useful for
 looking up user input in some sort of associative table.
 
 @Example
@@ -4512,7 +4909,7 @@ Two characters.  Must be prefixed with @samp{(} in some situations.
 @cindex @code{]}, ending an identifier
 @item
 Arbitrary length (@code{gtroff} only).  Must be bracketed with @samp{[}
-and@w{ }@samp{]} in some situations.  Any length identifier can be put
+and@tie{}@samp{]} in some situations.  Any length identifier can be put
 in brackets.
 @end itemize
 
@@ -4530,7 +4927,7 @@ If the identifier is a string, macro, or diversion,
 
 @item
 If the identifier is a number register, @code{gtroff}
-defines it with a value of@w{ }0.
+defines it with a value of@tie{}0.
 @end itemize
 
 @xref{Warnings}., @ref{Interpolating Registers}, and @ref{Strings}.
@@ -4659,23 +5056,27 @@ requests cause a break implicitly; using the single quote control
 character prevents this.
 
 @menu
-* Request Arguments::
+* Request and Macro Arguments::
 @end menu
 
-@node Request Arguments,  , Requests, Requests
-@subsubsection Request Arguments
+@node Request and Macro Arguments,  , Requests, Requests
+@subsubsection Request and Macro Arguments
 @cindex request arguments
-@cindex arguments to requests
+@cindex macro arguments
+@cindex arguments to requests and macros
 
-Arguments to requests (and macros) are processed much like the shell:
+Arguments to requests and macros are processed much like the shell:
 The line is split into arguments according to
-spaces.@footnote{Plan@w{ }9's @code{troff} implementation also allows
+spaces.@footnote{Plan@tie{}9's @code{troff} implementation also allows
 tabs for argument separation -- @code{gtroff} intentionally doesn't
-support this.}  An argument which is intended to contain spaces can
-either be enclosed in double quotes, or have the spaces @dfn{escaped}
-with backslashes.
+support this.}
 
-Here are a few examples:
+@cindex spaces, in a macro argument
+An argument to a macro which is intended to contain spaces can either be
+enclosed in double quotes, or have the spaces @dfn{escaped} with
+backslashes.  This is @emph{not} true for requests.
+
+Here are a few examples for a hypothetical macro @code{uh}:
 
 @Example
 .uh The Mouse Problem
@@ -4766,9 +5167,9 @@ Double quotes in the @code{ds} request are handled differently.
 
 @code{gtroff} has a @dfn{macro} facility for defining a series of lines
 which can be invoked by name.  They are called in the same manner as
-requests -- arguments also may be passed in the same manner.
+requests -- arguments also may be passed basically in the same manner.
 
-@xref{Writing Macros}, and @ref{Request Arguments}.
+@xref{Writing Macros}, and @ref{Request and Macro Arguments}.
 
 @c ---------------------------------------------------------------------
 
@@ -5068,9 +5469,9 @@ Test Test
 as expected.
 @endDefesc
 
-@Defreq {ig, yy}
+@Defreq {ig, [@Var{end}]}
 Ignore all input until @code{gtroff} encounters the macro named
-@code{.}@var{yy} on a line by itself (or @code{..} if @var{yy} is not
+@code{.}@var{end} on a line by itself (or @code{..} if @var{end} is not
 specified).  This is useful for commenting out large blocks of text:
 
 @Example
@@ -5159,8 +5560,8 @@ increment or decrement a register.
 
 @DefreqList {nr, ident @t{+}@Var{value}}
 @DefreqItem {nr, ident @t{-}@Var{value}}
-@DefescItem {\\R, ', ident @t{+}@Var{value}, '}
-@DefescListEnd {\\R, ', ident @t{-}@Var{value}, '}
+@DefescItem {\\R, ', ident @t{+}value, '}
+@DefescListEnd {\\R, ', ident @t{-}value, '}
 Increment (decrement) register @var{ident} by @var{value}.
 
 @Example
@@ -5245,10 +5646,11 @@ Numeric registers can be accessed via the @code{\n} escape.
 @cindex assignments, nested
 @cindex indirect assignments
 @cindex assignments, indirect
-Interpolate number register with name @var{ident} (one-character name@w{
-}@var{i}, two-character name @var{id}). This means that the value of the
-register is expanded in-place while @code{gtroff} is parsing the input line.
-Nested assignments (also called indirect assignments) are possible.
+Interpolate number register with name @var{ident} (one-character
+name@tie{}@var{i}, two-character name @var{id}).  This means that the value
+of the register is expanded in-place while @code{gtroff} is parsing the
+input line.  Nested assignments (also called indirect assignments) are
+possible.
 
 @Example
 .nr a 5
@@ -5301,7 +5703,7 @@ syntax form.
 @DefescItem {\\n, +@lbrack{}, ident, @rbrack{}}
 @DefescListEnd {\\n, -@lbrack{}, ident, @rbrack{}}
 Before interpolating, increment or decrement @var{ident}
-(one-character name@w{ }@var{i}, two-character name @var{id}) by the
+(one-character name@tie{}@var{i}, two-character name @var{id}) by the
 auto-increment value as specified with the @code{nr} request (or the
 @code{\R} escape).  If no auto-increment value has been specified,
 these syntax forms are identical to @code{\n}.
@@ -5359,12 +5761,12 @@ output formats are available:
 
 @table @code
 @item 1
-Decimal arabic numbers.  This is the default format: 0, 1, 2, 3,@w{
-}@enddots{}
+Decimal arabic numbers.  This is the default format: 0, 1, 2,
+3,@tie{}@enddots{}
 
 @item 0@dots{}0
 Decimal numbers with as many digits as specified.  So, @samp{00} would
-result in printing numbers as 01, 02, 03,@w{ }@enddots{}
+result in printing numbers as 01, 02, 03,@tie{}@enddots{}
 
 In fact, any digit instead of zero will do; @code{gtroff} only counts
 how many digits are specified.  As a consequence, @code{af}'s default
@@ -5374,16 +5776,16 @@ returned by the @code{\g} escape, see below).
 @item I
 @cindex Roman numerals
 @cindex numerals, Roman
-Upper-case Roman numerals: 0, I, II, III, IV,@w{ }@enddots{}
+Upper-case Roman numerals: 0, I, II, III, IV,@tie{}@enddots{}
 
 @item i
-Lower-case Roman numerals: 0, i, ii, iii, iv,@w{ }@enddots{}
+Lower-case Roman numerals: 0, i, ii, iii, iv,@tie{}@enddots{}
 
 @item A
-Upper-case letters: 0, A, B, C, @dots{},@w{ }Z, AA, AB,@w{ }@enddots{}
+Upper-case letters: 0, A, B, C, @dots{},@tie{}Z, AA, AB,@tie{}@enddots{}
 
 @item a
-Lower-case letters: 0, a, b, c, @dots{},@w{ }z, aa, ab,@w{ }@enddots{}
+Lower-case letters: 0, a, b, c, @dots{},@tie{}z, aa, ab,@tie{}@enddots{}
 @end table
 
 Omitting the number register format causes a warning of type
@@ -5429,7 +5831,7 @@ then apply the @code{af} request to this other register.
 @cindex format of register (@code{\g})
 @cindex register, format (@code{\g})
 Return the current format of the specified register @var{ident}
-(one-character name@w{ }@var{i}, two-character name @var{id}).  For
+(one-character name@tie{}@var{i}, two-character name @var{id}).  For
 example, @samp{\ga} after the previous example would produce the
 string @samp{000}.  If the register hasn't been defined yet, nothing
 is returned.
@@ -5445,7 +5847,7 @@ is returned.
 The following lists some built-in registers which are not described
 elsewhere in this manual.  Any register which begins with a @samp{.} is
 read-only.  A complete listing of all built-in registers can be found in
-appendix@w{ }@ref{Register Index}.
+appendix@tie{}@ref{Register Index}.
 
 @table @code
 @item .F
@@ -5471,8 +5873,8 @@ Vertical resolution in basic units.
 @cindex time, current, seconds (@code{seconds})
 @cindex current time, seconds (@code{seconds})
 @vindex seconds
-The number of seconds after the minute, normally in the range@w{ }0
-to@w{ }59, but can be up to@w{ }61 to allow for leap seconds.  Initialized
+The number of seconds after the minute, normally in the range@tie{}0
+to@tie{}59, but can be up to@tie{}61 to allow for leap seconds.  Initialized
 at start-up of @code{gtroff}.
 
 @item minutes
@@ -5480,7 +5882,7 @@ at start-up of @code{gtroff}.
 @cindex time, current, minutes (@code{minutes})
 @cindex current time, minutes (@code{minutes})
 @vindex minutes
-The number of minutes after the hour, in the range@w{ }0 to@w{ }59.
+The number of minutes after the hour, in the range@tie{}0 to@tie{}59.
 Initialized at start-up of @code{gtroff}.
 
 @item hours
@@ -5488,7 +5890,7 @@ Initialized at start-up of @code{gtroff}.
 @cindex time, current, hours (@code{hours})
 @cindex current time, hours (@code{hours})
 @vindex hours
-The number of hours past midnight, in the range@w{ }0 to@w{ }23.
+The number of hours past midnight, in the range@tie{}0 to@tie{}23.
 Initialized at start-up of @code{gtroff}.
 
 @item dw
@@ -5517,8 +5919,8 @@ The current year.
 
 @item yr
 @vindex yr
-The current year minus@w{ }1900.  Unfortunately, the documentation of
-@acronym{UNIX} Version@w{ }7's @code{troff} had a year@w{ }2000 bug: It
+The current year minus@tie{}1900.  Unfortunately, the documentation of
+@acronym{UNIX} Version@tie{}7's @code{troff} had a year@tie{}2000 bug: It
 incorrectly claimed that @code{yr} contains the last two digits of the
 year.  That claim has never been true of either @acronym{AT&T}
 @code{troff} or GNU @code{troff}.  Old @code{troff} input that looks
@@ -5567,15 +5969,15 @@ request to activate line numbering.
 @vindex .x
 @cindex major version number register (@code{.x})
 @cindex version number, major, register (@code{.x})
-The major version number.  For example, if the version number is@w{
-}1.03 then @code{.x} contains@w{ }@samp{1}.
+The major version number.  For example, if the version number
+is 1.03 then @code{.x} contains@tie{}@samp{1}.
 
 @item .y
 @vindex .y
 @cindex minor version number register (@code{.y})
 @cindex version number, minor, register (@code{.y})
-The minor version number.  For example, if the version number is@w{
-}1.03 then @code{.y} contains@w{ }@samp{03}.
+The minor version number.  For example, if the version number
+is 1.03 then @code{.y} contains@tie{}@samp{03}.
 
 @item .Y
 @vindex .Y
@@ -5592,19 +5994,19 @@ The process ID of @code{gtroff}.
 @vindex .g
 @cindex @code{gtroff}, identification register (@code{.g})
 @cindex GNU-specific register (@code{.g})
-Always@w{ }1.  Macros should use this to determine whether they are
+Always@tie{}1.  Macros should use this to determine whether they are
 running under GNU @code{troff}.
 
 @item .A
 @vindex .A
 @cindex @acronym{ASCII} approximation output register (@code{.A})
 If the command line option @option{-a} is used to produce an
-@acronym{ASCII} approximation of the output, this is set to@w{ }1, zero
+@acronym{ASCII} approximation of the output, this is set to@tie{}1, zero
 otherwise.  @xref{Groff Options}.
 
 @item .P
 @vindex .P
-This register is set to@w{ }1 (and to@w{ }0 otherwise) if the current
+This register is set to@tie{}1 (and to@tie{}0 otherwise) if the current
 page is actually being printed, i.e., if the @option{-o} option is being
 used to only print selected pages.  @xref{Groff Options}, for more
 information.
@@ -5612,7 +6014,7 @@ information.
 @item .T
 @vindex .T
 If @code{gtroff} is called with the @option{-T} command line option, the
-number register @code{.T} is set to@w{ }1, and zero otherwise.
+number register @code{.T} is set to@tie{}1, and zero otherwise.
 @xref{Groff Options}.
 
 @stindex .T
@@ -5677,7 +6079,7 @@ the @code{fi} request.
 @cindex mode, fill (@code{fi})
 Activate fill mode (which is the default).  This request implicitly
 enables adjusting; it also inserts a break in the text currently being
-filled.  The read-only number register @code{.u} is set to@w{ }1.
+filled.  The read-only number register @code{.u} is set to@tie{}1.
 
 The fill mode status is associated with the current environment
 (@pxref{Environments}).
@@ -5691,7 +6093,7 @@ See @ref{Line Control}, for interaction with the @code{\c} escape.
 Activate no-fill mode.  Input lines are output as-is, retaining line
 breaks and ignoring the current line length.  This command implicitly
 disables adjusting; it also causes a break.  The number register
-@code{.u} is set to@w{ }0.
+@code{.u} is set to@tie{}0.
 
 The fill mode status is associated with the current environment
 (@pxref{Environments}).
@@ -5720,7 +6122,7 @@ Adjust text to the right margin, producing ragged-left text.
 
 @item c
 @cindex centered text
-@cindex @code{ce} request, difference to @samp{.ad@w{ }c}
+@cindex @code{ce} request, difference to @samp{.ad@tie{}c}
 Center filled text.  This is different to the @code{ce} request which
 only centers text without filling.
 
@@ -5729,6 +6131,9 @@ only centers text without filling.
 Justify to both margins.  This is the default used by @code{gtroff}.
 @end table
 
+Finally, @var{mode} can be the numeric argument returned by the @code{.j}
+register.
+
 With no argument, @code{gtroff} adjusts lines in the same way it did
 before adjusting was deactivated (with a call to @code{na}, for
 example).
@@ -5736,13 +6141,15 @@ example).
 @Example
 text
 .ad r
+.nr ad \n[.j]
 text
 .ad c
 text
 .na
 text
-.ad  \" back to centering
+.ad         \" back to centering
 text
+.ad \n[ad]  \" back to right justifying
 @endExample
 
 @cindex adjustment mode register (@code{.j})
@@ -5797,10 +6204,10 @@ is formatted as
 @cindex sentence space size register (@code{.sss})
 @cindex size of sentence space register (@code{.sss})
 @cindex space between sentences register (@code{.sss})
-Change the minimum size of a space between filled words.  It takes its
-units as one twelfth of the space width parameter for the current
-font.  Initially both the @var{word_space_size} and
-@var{sentence_space_size} are@w{ }12.
+Change the size of a space between words.  It takes its units as one
+twelfth of the space width parameter for the current font.
+Initially both the @var{word_space_size} and @var{sentence_space_size}
+are@tie{}12.  In fill mode, the values specify the minimum distance.
 
 @cindex fill mode
 @cindex mode, fill
@@ -5826,9 +6233,37 @@ environment (@pxref{Environments}).
 
 Contrary to @acronym{AT&T} @code{troff}, this request is @emph{not}
 ignored if a TTY output device is used; the given values are then
-rounded down to a multiple of@w{ }12 (@pxref{Implementation Differences}).
+rounded down to a multiple of@tie{}12 (@pxref{Implementation Differences}).
 
 The request is ignored if there is no parameter.
+
+@cindex discardable horizontal space
+@cindex space, discardable, horizontal
+@cindex horizontal discardable space
+Another useful application of the @code{ss} request is to insert
+discardable horizontal space, i.e., space which is discarded at a line
+break.  For example, paragraph-style footnotes could be separated this
+way:
+
+@Example
+.ll 4.5i
+1.\ This is the first footnote.\c
+.ss 48
+.nop
+.ss 12
+2.\ This is the second footnote.
+@endExample
+
+@noindent
+The result:
+
+@Example
+1. This is the first footnote.        2. This
+is the second footnote.
+@endExample
+
+@noindent
+Note that the @code{\h} escape produces unbreakable space.
 @endDefreq
 
 @DefreqList {ce, [@Var{nnn}]}
@@ -5930,9 +6365,9 @@ Do not hyphenate the last two characters of a word.
 Do not hyphenate the first two characters of a word.
 @end table
 
-Values in the previous table are additive.  For example, the value@w{
-}12 causes @code{gtroff} to neither hyphenate the last two nor the first
-two characters of a word.
+Values in the previous table are additive.  For example, the
+value@tie{}12 causes @code{gtroff} to neither hyphenate the last
+two nor the first two characters of a word.
 
 @cindex hyphenation restrictions register (@code{.hy})
 The current hyphenation restrictions can be found in the read-only
@@ -5961,7 +6396,7 @@ The hyphenation mode is associated with the current environment
 @cindex hyphenated lines, consecutive (@code{hlm})
 Set the maximum number of consecutive hyphenated lines to @var{nnn}.
 If this number is negative, there is no maximum.  The default value
-is@w{ }@minus{}1 if @var{nnn} is omitted.  This value is associated
+is@tie{}@minus{}1 if @var{nnn} is omitted.  This value is associated
 with the current environment (@pxref{Environments}).  Only lines
 output from a given environment count towards the maximum associated
 with that environment.  Hyphens resulting from @code{\%} are counted;
@@ -6005,7 +6440,7 @@ longer a restriction.
 @esindex \:
 @end ifnotinfo
 @ifinfo
-@esindex @r{<colon>}
+@esindex \@r{<colon>}
 @end ifinfo
 @cindex hyphenation character (@code{\%})
 @cindex character, hyphenation (@code{\%})
@@ -6031,8 +6466,8 @@ The @code{\:} escape inserts a zero-width break point
 @cindex @code{\Y}, followed by @code{\%}
 @cindex @code{\%}, following @code{\X} or @code{\Y}
 Note that @code{\X} and @code{\Y} start a word, that is, the @code{\%}
-escape in (say) @w{@samp{ \X'...'\%foobar}} and
-@w{@samp{ \Y'...'\%foobar}} no longer prevents hyphenation but inserts
+escape in (say) @w{@samp{\X'...'\%foobar}} and
+@w{@samp{\Y'...'\%foobar}} no longer prevents hyphenation but inserts
 a hyphenation point at the beginning of @samp{foobar}; most likely
 this isn't what you want to do.
 @endDefesc
@@ -6103,18 +6538,19 @@ The @code{hpfcode} request defines mapping values for character codes in
 hyphenation patterns.  @code{hpf} or @code{hpfa} then apply the mapping
 (after reading the patterns) before replacing or appending them to
 the current list of patterns.  Its arguments are pairs of character codes
--- integers from 0 to@w{ }255.  The request maps character code@w{ }@var{a}
-to code@w{ }@var{b}, code@w{ }@var{c} to code@w{ }@var{d}, and so on.  You
+-- 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.
 
 @pindex troffrc
 @pindex troffrc-end
 @pindex hyphen.us
+@pindex hyphenex.us
 The set of hyphenation patterns is associated with the current language
 set by the @code{hla} request.  The @code{hpf} request is usually
 invoked by the @file{troffrc} or @file{troffrc-end} file; by default,
-@file{troffrc} loads hyphenation patterns for American English (in file
-@file{hyphen.us}).
+@file{troffrc} loads hyphenation patterns and exceptions for American
+English (in files @file{hyphen.us} and @file{hyphenex.us}).
 
 A second call to @code{hpf} (for the same language) will replace the
 hyphenation patterns with the new ones.
@@ -6145,7 +6581,7 @@ This request is ignored if it has no parameter.
 Set the (right) hyphenation margin to @var{length}.  If the current
 adjustment mode is not @samp{b} or @samp{n}, the line is not
 hyphenated if it is shorter than @var{length}.  Without an argument,
-the hyphenation margin is reset to its default value, which is@w{ }0.
+the hyphenation margin is reset to its default value, which is@tie{}0.
 The default scaling indicator for this request is @samp{m}.  The
 hyphenation margin is associated with the current environment
 (@pxref{Environments}).
@@ -6166,7 +6602,7 @@ Set the hyphenation space to @var{hyphenation_space}.  If the current
 adjustment mode is @samp{b} or @samp{n}, don't hyphenate the line
 if it can be justified by adding no more than @var{hyphenation_space}
 extra space to each word space.  Without argument, the hyphenation
-space is set to its default value, which is@w{ }0.  The default
+space is set to its default value, which is@tie{}0.  The default
 scaling indicator for this request is @samp{m}.  The hyphenation
 space is associated with the current environment
 (@pxref{Environments}).
@@ -6233,11 +6669,55 @@ read-only number register @samp{.hla}.
 @cindex spacing, manipulating
 
 @Defreq {sp, [@Var{distance}]}
-Space downwards @var{distance}.  With no argument it advances 1@w{
-}line.  A negative argument causes @code{gtroff} to move up the page
+Space downwards @var{distance}.  With no argument it advances
+1@tie{}line.  A negative argument causes @code{gtroff} to move up the page
 the specified distance.  If the argument is preceded by a @samp{|}
 then @code{gtroff} moves that distance from the top of the page.  This
 request causes a line break.  The default scaling indicator is @samp{v}.
+
+If a vertical trap is sprung during execution of @code{sp}, the amount of
+vertical space after the trap is discarded.  For example, this
+
+@Example
+.de xxx
+..
+.
+.wh 0 xxx
+.
+.pl 5v
+foo
+.sp 2
+bar
+.sp 50
+baz
+@endExample
+
+@noindent
+results in
+
+@Example
+foo
+
+
+bar
+
+baz
+@endExample
+
+@cindex @code{sp} request, and traps
+@cindex discarded space in traps
+@cindex space, discarded, in traps
+@cindex traps, and discarded space
+The amount of discarded space is available in the number register
+@code{.trunc}.
+
+To protect @code{sp} against vertical traps, use the @code{vpt} request:
+
+@Example
+.vpt 0
+.sp -3
+.vpt 1
+@endExample
 @endDefreq
 
 @DefreqList {ls, [@Var{nnn}]}
@@ -6324,7 +6804,7 @@ advance to the next page is also disabled, except if it is accompanied
 by a page number (see @ref{Page Control}, for more information).  This
 mode ends when actual text is output or the @code{rs} request is
 encountered which ends no-space mode.  The read-only number register
-@code{.ns} is set to@w{ }1 as long as no-space mode is active.
+@code{.ns} is set to@tie{}1 as long as no-space mode is active.
 
 This request is useful for macros that conditionally
 insert vertical space before the text starts
@@ -6341,8 +6821,8 @@ except when it is the first paragraph after a section header).
 @cindex fields, and tabs
 
 @cindex @acronym{EBCDIC} encoding of a tab
-A tab character (@acronym{ASCII} char@w{ }9, @acronym{EBCDIC} char@w{
-}5) causes a horizontal movement to the next tab stop (much
+A tab character (@acronym{ASCII} char@tie{}9, @acronym{EBCDIC}
+char@tie{}5) causes a horizontal movement to the next tab stop (much
 like it did on a typewriter).
 
 @Defesc {\\t, , , }
@@ -6360,7 +6840,7 @@ letter @samp{T}) which indicate where each tab stop is to be
 (overriding any previous settings).
 
 Tab stops can be specified absolutely, i.e., as the distance from the
-left margin.  For example, the following sets 6@w{ }tab stops every
+left margin.  For example, the following sets 6@tie{}tab stops every
 one inch.
 
 @Example
@@ -6421,7 +6901,7 @@ can be neither stretched nor squeezed.  For example,
 @endExample
 
 @noindent
-creates a single line which is a bit longer than 10@w{ }inches (a string
+creates a single line which is a bit longer than 10@tie{}inches (a string
 is used to show exactly where the tab characters are).  Now consider the
 following:
 
@@ -6480,9 +6960,7 @@ Calling @code{ta} without an argument removes all tab stops.
 
 @item
 @cindex tab stops, for TTY output devices
-The start-up value of @code{gtroff} is @w{@samp{T 0.5i}} in troff mode
-and @w{@samp{T 0.8i}} in nroff mode (the latter is done with an
-explicit call to the @code{ta} request in the file @file{tty.tmac}.
+The start-up value of @code{gtroff} is @w{@samp{T 0.8i}}.
 @end itemize
 
 @cindex tab settings register (@code{.tabs})
@@ -6496,9 +6974,9 @@ argument to the @code{ta} request.
     @result{} T120u
 @endExample
 
-@cindex @code{.S} register, Plan@w{ }9 alias for @code{.tabs}
-@cindex @code{.tabs} register, Plan@w{ }9 alias (@code{.S})
-The @code{troff} version of the Plan@w{ }9 operating system uses
+@cindex @code{.S} register, Plan@tie{}9 alias for @code{.tabs}
+@cindex @code{.tabs} register, Plan@tie{}9 alias (@code{.S})
+The @code{troff} version of the Plan@tie{}9 operating system uses
 register @code{.S} for the same purpose.
 @endDefreq
 
@@ -6552,7 +7030,7 @@ a         b                   c
 @endExample
 
 Line-tabs mode is associated with the current environment.
-The read-only register @code{.linetabs} is set to@w{ }1 if in line-tabs
+The read-only register @code{.linetabs} is set to@tie{}1 if in line-tabs
 mode, and 0 in normal mode.
 @endDefreq
 
@@ -6574,7 +7052,7 @@ this @code{gtroff} provides an alternate tab mechanism, called
 @dfn{leaders} which does just that.
 
 @cindex leader character
-A leader character (character code@w{ }1) behaves similarly to a tab
+A leader character (character code@tie{}1) behaves similarly to a tab
 character: It moves to the next tab stop.  The only difference is that
 for this movement, the fill glyph defaults to a period character and
 not to space.
@@ -6688,14 +7166,14 @@ The control character (@samp{.}) and the no-break control character
 respectively.
 
 @Defreq {cc, [@Var{c}]}
-Set the control character to@w{ }@var{c}.  With no argument the default
+Set the control character to@tie{}@var{c}.  With no argument the default
 control character @samp{.} is restored.  The value of the control
 character is associated with the current environment
 (@pxref{Environments}).
 @endDefreq
 
 @Defreq {c2, [@Var{c}]}
-Set the no-break control character to@w{ }@var{c}.  With no argument the
+Set the no-break control character to@tie{}@var{c}.  With no argument the
 default control character @samp{'} is restored.  The value of the
 no-break control character is associated with the current environment
 (@pxref{Environments}).
@@ -6732,7 +7210,7 @@ necessary then to double the escape character.  Here an example:
 @Defreq {ec, [@Var{c}]}
 @cindex escape character, changing (@code{ec})
 @cindex character, escape, changing (@code{ec})
-Set the escape character to@w{ }@var{c}.  With no argument the default
+Set the escape character to@tie{}@var{c}.  With no argument the default
 escape character @samp{\} is restored.  It can be also used to
 re-enable the escape mechanism after an @code{eo} request.
 
@@ -6782,7 +7260,7 @@ The following example defines strings to begin and end
 a superscript:
 
 @Example
-.ds @{ \v'-.3m'\s'\Es[.s]*60/100'
+.ds @{ \v'-.3m'\s'\En[.s]*60/100'
 .ds @} \s0\v'.3m'
 @endExample
 
@@ -6850,8 +7328,8 @@ Internals}, for more on this process).
 
 @DefreqList {tr, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}}
 @DefreqListEnd {trin, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}}
-Translate character @var{a} to glyph@w{ }@var{b}, character @var{c} to
-glyph@w{ }@var{d}, etc.  If there is an odd number of arguments, the
+Translate character @var{a} to glyph@tie{}@var{b}, character @var{c} to
+glyph@tie{}@var{d}, etc.  If there is an odd number of arguments, the
 last one is translated to an unstretchable space (@w{@samp{\ }}).
 
 The @code{trin} request is identical to @code{tr},
@@ -6913,9 +7391,8 @@ set with the @code{shc} request.
 
 @item
 @cindex @code{\&}, and translations
-The pair @samp{@var{c}\&} (this is an arbitrary character@w{
-}@var{c} followed by the zero width space character) maps this
-character to nothing.
+The pair @samp{@var{c}\&} (this is an arbitrary character@tie{}@var{c}
+followed by the zero width space character) maps this character to nothing.
 
 @Example
 .tr a\&
@@ -7497,7 +7974,7 @@ parameter.
 
 The read-only number register @code{.pn} contains the number of the next
 page: either the value set by a @code{pn} request, or the number of the
-current page plus@w{ }1.
+current page plus@tie{}1.
 @endDefreq
 
 @Defreg {%}
@@ -7511,7 +7988,7 @@ A read-write register holding the current page number.
 @vindex %
 Change the page number character (used by the @code{tl} request) to a
 different character.  With no argument, this mechanism is disabled.
-Note that this doesn't affect the number register@w{ }@code{%}.
+Note that this doesn't affect the number register@tie{}@code{%}.
 @endDefreq
 
 @xref{Traps}.
@@ -7519,7 +7996,7 @@ Note that this doesn't affect the number register@w{ }@code{%}.
 
 @c =====================================================================
 
-@node Page Control, Fonts, Page Layout, gtroff Reference
+@node Page Control, Fonts and Symbols, Page Layout, gtroff Reference
 @section Page Control
 @cindex page control
 @cindex control, page
@@ -7549,6 +8026,9 @@ cause a break or actually eject a page.
 @cindex diversion, top-level, and @code{bp}
 @code{bp} has no effect if not called within the top-level diversion
 (@pxref{Diversions}).
+
+The number register @code{.pe} is set to@tie{}1 while @code{bp} is
+active.  @xref{Page Location Traps}.
 @endDefreq
 
 @Defreq {ne, [@Var{space}]}
@@ -7561,10 +8041,10 @@ single @dfn{orphan} line left at the bottom of a page.  The @code{ne}
 request ensures that there is a certain distance, specified by the
 first argument, before the next page is triggered (see @ref{Traps},
 for further information).  The default scaling indicator for @code{ne}
-is @samp{v}; the default value of @var{space} is@w{ }1@dmn{v} if no
+is @samp{v}; the default value of @var{space} is@tie{}1@dmn{v} if no
 argument is given.
 
-For example, to make sure that no fewer than 2@w{ }lines get orphaned,
+For example, to make sure that no fewer than 2@tie{}lines get orphaned,
 do the following before each paragraph:
 
 @Example
@@ -7584,7 +8064,7 @@ specified amount of vertical space.  If the desired amount of space
 exists before the next trap (or the bottom page boundary if no trap is
 set), the space is output immediately (ignoring a partially filled line
 which stays untouched).  If there is not enough space, it is stored for
-later output via the @code{os} request.  The default value is@w{ }1@dmn{v}
+later output via the @code{os} request.  The default value is@tie{}1@dmn{v}
 if no argument is given; the default scaling indicator is @samp{v}.
 
 @cindex @code{sv} request, and no-space mode
@@ -7644,8 +8124,8 @@ registers.
 
 @c =====================================================================
 
-@node Fonts, Sizes, Page Control, gtroff Reference
-@section Fonts
+@node Fonts and Symbols, Sizes, Page Control, gtroff Reference
+@section Fonts and Symbols
 @cindex fonts
 
 @code{gtroff} can switch fonts at any point in the text.
@@ -7667,7 +8147,7 @@ special symbols (Greek, mathematics).
 
 @c ---------------------------------------------------------------------
 
-@node Changing Fonts, Font Families, Fonts, Fonts
+@node Changing Fonts, Font Families, Fonts and Symbols, Fonts and Symbols
 @subsection Changing Fonts
 @cindex fonts
 
@@ -7684,7 +8164,7 @@ special symbols (Greek, mathematics).
 @kindex family
 @pindex DESC
 The @code{ft} request and the @code{\f} escape change the current font
-to @var{font} (one-character name@w{ }@var{f}, two-character name
+to @var{font} (one-character name@tie{}@var{f}, two-character name
 @var{fn}).
 
 If @var{font} is a style name (as set with the @code{sty} request or
@@ -7699,7 +8179,7 @@ to the previous font.  Use @code{\f[]} to do this with the escape.  The
 old syntax forms @code{\fP} or @code{\f[P]} are also supported.
 
 Fonts are generally specified as upper-case strings, which are usually
-1@w{ }to 4 characters representing an abbreviation or acronym of the
+1@tie{}to 4 characters representing an abbreviation or acronym of the
 font name.  This is no limitation, just a convention.
 
 The example below produces two identical lines.
@@ -7737,17 +8217,17 @@ the fly:
 @cindex @code{fspecial} request, and font translations
 @cindex @code{fp} request, and font translations
 @cindex @code{sty} request, and font translations
-Translate font@w{ }@var{f} to font@w{ }@var{g}.  Whenever a font named@w{
-}@var{f} is referred to in a @code{\f} escape sequence, or in the
+Translate font@tie{}@var{f} to font@tie{}@var{g}.  Whenever a font
+named@tie{}@var{f} is referred to in a @code{\f} escape sequence, or in the
 @code{ft}, @code{ul}, @code{bd}, @code{cs}, @code{tkf},
 @code{special}, @code{fspecial}, @code{fp}, or @code{sty} requests,
-font@w{ }@var{g} is used.  If @var{g} is missing or equal to@w{ }@var{f}
+font@tie{}@var{g} is used.  If @var{g} is missing or equal to@tie{}@var{f}
 the translation is undone.
 @endDefreq
 
 @c ---------------------------------------------------------------------
 
-@node Font Families, Font Positions, Changing Fonts, Fonts
+@node Font Families, Font Positions, Changing Fonts, Fonts and Symbols
 @subsection Font Families
 @cindex font families
 @cindex families, font
@@ -7778,7 +8258,7 @@ different font family on the command line (@pxref{Groff Options}).
 @DefregListEnd {.fn}
 @cindex changing font family (@code{fam}, @code{\F})
 @cindex font family, changing (@code{fam}, @code{\F})
-Switch font family to @var{family} (one-character name@w{ }@var{f},
+Switch font family to @var{family} (one-character name@tie{}@var{f},
 two-character name @var{fm}).  If no argument is given, switch
 back to the previous font family.  Use @code{\F[]} to do this with the
 escape.  Note that @code{\FP} doesn't work; it selects font family
@@ -7827,13 +8307,13 @@ is the proper concatenation of family and style name.
 @cindex @code{tkf} request, and font styles
 @cindex @code{uf} request, and font styles
 @cindex @code{fspecial} request, and font styles
-Associate @var{style} with font position@w{ }@var{n}.  A font position
+Associate @var{style} with font position@tie{}@var{n}.  A font position
 can be associated either with a font or with a style.  The current
 font is the index of a font position and so is also either a font or a
 style.  If it is a style, the font that is actually used is the font
 which name is the concatenation of the name of the current
 family and the name of the current style.  For example, if the current
-font is@w{ }1 and font position@w{ }1 is associated with style
+font is@tie{}1 and font position@tie{}1 is associated with style
 @samp{R} and the current font family is @samp{T}, then font
 @samp{TR} will be used.  If the current font is not a style, then the
 current family is ignored.  If the requests @code{cs}, @code{bd},
@@ -7841,7 +8321,7 @@ current family is ignored.  If the requests @code{cs}, @code{bd},
 they will instead be applied to the member of the current family
 corresponding to that style.
 
-@var{n}@w{ }must be a non-negative integer value.
+@var{n}@tie{}must be a non-negative integer value.
 
 @pindex DESC
 @kindex styles
@@ -7879,7 +8359,7 @@ In the following example, we want to access the @sc{PostScript} font
 @endExample
 
 @noindent
-The default font position at start-up is@w{ }1; for the
+The default font position at start-up is@tie{}1; for the
 @sc{PostScript} device, this is associated with style @samp{R}, so
 @code{gtroff} tries to open @code{FooR}.
 
@@ -7898,7 +8378,7 @@ A solution to this problem is to use a dummy font like the following:
 
 @c ---------------------------------------------------------------------
 
-@node Font Positions, Using Symbols, Font Families, Fonts
+@node Font Positions, Using Symbols, Font Families, Fonts and Symbols
 @subsection Font Positions
 @cindex font positions
 @cindex positions, font
@@ -7915,7 +8395,7 @@ on which various fonts are mounted.
 Mount font @var{font} at position @var{pos} (which must be a
 non-negative integer).  This numeric position can then be referred to
 with font changing commands.  When @code{gtroff} starts it is using
-font position@w{ }1 (which must exist; position@w{ }0 is unused
+font position@tie{}1 (which must exist; position@tie{}0 is unused
 usually at start-up).
 
 @cindex font position register (@code{.f})
@@ -7974,9 +8454,9 @@ syntax forms to access font positions.
 @kindex styles
 @kindex family
 @pindex DESC
-Change the current font position to @var{nnn} (one-digit position@w{
-}@var{n}, two-digit position @var{nn}), which must be a non-negative
-integer.
+Change the current font position to @var{nnn} (one-digit
+position@tie{}@var{n}, two-digit position @var{nn}), which must be a
+non-negative integer.
 
 If @var{nnn} is associated with a style (as set with the @code{sty}
 request or with the @code{styles} command in the @file{DESC} file), use
@@ -8000,7 +8480,7 @@ this is font 1 again
 
 @c ---------------------------------------------------------------------
 
-@node Using Symbols, Special Fonts, Font Positions, Fonts
+@node Using Symbols, Special Fonts, Font Positions, Fonts and Symbols
 @subsection Using Symbols
 @cindex using symbols
 @cindex symbols, using
@@ -8021,6 +8501,8 @@ sometimes more than one character maps to a single glyph (this is a
 @cindex special fonts
 @kindex fonts
 @pindex DESC
+@cindex @code{special} request, and glyph search order
+@cindex @code{fspecial} request, and glyph search order
 A @dfn{symbol} is simply a named glyph.  Within @code{gtroff}, all
 glyph names of a particular font are defined in its font file.  If the
 user requests a glyph not available in this font, @code{gtroff} looks
@@ -8033,7 +8515,7 @@ special fonts.  Fonts mounted with the @code{fonts} keyword in the
 special fonts locally (i.e.@: for a particular font), use the
 @code{fspecial} request.
 
-In summary, @code{gtroff} tries the following to find a given symbol:
+Here the exact rules how @code{gtroff} searches a given symbol:
 
 @itemize @bullet
 @item
@@ -8047,45 +8529,66 @@ Check the current font.
 If the symbol has been defined with the @code{fchar} request, use it.
 
 @item
-Check all fonts given with the @code{fspecial} request, in the order
-of appearance in @code{fspecial} calls.
+Check whether the current font has a font-specific list of special fonts;
+test all fonts in the order of appearance in the last @code{fspecial}
+call if appropriate.
 
 @item
-Check all fonts given with the @code{special} request, in the order
-of appearance in @code{special} calls (inclusively the special fonts
-defined in the @file{DESC} file, which come first).
+If the symbol has been defined with the @code{fschar} request for the
+current font, use it.
 
 @item
-As a last resort, consult all fonts loaded up to now (in the order they
-have been called the first time) for special fonts and check them.
-@end itemize
+Check all fonts in the order of appearance in the last @code{special}
+call.
 
-@xref{Font Files}, and @ref{Special Fonts}, for more details.
+@item
+If the symbol has been defined with the @code{schar} request, use it.
 
-@DefescList {\\, @lparen{}, nm, }
-@DefescListEnd {\\, @lbrack{}, name, @rbrack}
-Insert a symbol @var{name} (two-character name @var{nm}).  There is no
-special syntax for one-character names -- the natural form
-@samp{\@var{n}} would collide with escapes.@footnote{Note that a
-one-character symbol is not the same as an input character, i.e., the
-character @code{a} is not the same as @code{\[a]}.  By default,
-@code{groff} defines only a single one-character symbol, @code{\[-]};
-it is usually accessed as @code{\-}.  On the other hand, @code{gtroff}
-has the special feature that @code{\[char@var{XXX}]} is the same as the
-input character with character code @var{XXX}.  For example,
-@code{\[char97]} is identical to the letter @code{a} if @acronym{ASCII}
-encoding is active.}
+@item
+As a last resort, consult all fonts loaded up to now for special fonts
+and check them, starting with the lowest font number.  Note that this can
+sometimes lead to surprising results since the @code{fonts} line in the
+@file{DESC} file often contains empty positions which are filled later
+on.  For example, consider the following:
 
-If @var{name} is undefined, a warning of type @samp{char} is generated,
-and the escape is ignored.  @xref{Debugging}, for information about
-warnings.
+@Example
+fonts 3 0 0 FOO
+@endExample
+
+@noindent
+This mounts font @code{foo} at font position@tie{}3.  We assume that
+@code{FOO} is a special font, containing glyph @code{foo},
+and that no font has been loaded yet.  The line
+
+@Example
+.fspecial BAR BAZ
+@endExample
+
+@noindent
+makes font @code{BAZ} special only if font @code{BAR} is active.  We
+further assume that @code{BAZ} is really a special font, i.e., the font
+description file contains the @code{special} keyword, and that it
+also contains glyph @code{foo} with a special shape fitting to font
+@code{BAR}.  After executing @code{fspecial}, font @code{BAR} is loaded at
+font position@tie{}1, and @code{BAZ} at position@tie{}2.
+
+We now switch to a new font @code{XXX}, trying to access glyph @code{foo}
+which is assumed to be missing.  There are neither font-specific special
+fonts for @code{XXX} nor any other fonts made special with the
+@code{special} request, so @code{gtroff} starts the search for special
+fonts in the list of already mounted fonts, with increasing font
+positions.  Consequently, it finds @code{BAZ} before @code{FOO} even for
+@code{XXX} which is not the intended behaviour.
+@end itemize
+
+@xref{Font Files}, and @ref{Special Fonts}, for more details.
 
 @cindex list of available glyphs (@cite{groff_char(7)} man page)
 @cindex available glyphs, list (@cite{groff_char(7)} man page)
 @cindex glyphs, available, list (@cite{groff_char(7)} man page)
 The list of available symbols is device dependent; see the
-@cite{groff_char(7)} man page for a complete list for the given output
-device.  For example, say
+@cite{groff_char(7)} man page for a complete list of all glyphs.  For
+example, say
 
 @Example
 man -Tdvi groff_char > groff_char.dvi
@@ -8101,7 +8604,130 @@ must be called directly:
 groff -Tdvi -mec -man groff_char.7 > groff_char.dvi
 @endExample
 
-@c XXX list of common symbols
+@cindex composite glyph names
+@cindex glyph names, composite
+@cindex groff glyph list (GGL)
+@cindex GGL (groff glyph list)
+@cindex adobe glyph list (AGL)
+@cindex AGL (adobe glyph list)
+Glyph names not listed in groff_char(7) are derived algorithmically,
+using a simplified version of the Adobe Glyph List (AGL) algorithm
+described in
+@uref{http://partners.adobe.com/asn/developer/typeforum/unicodegn.html}.
+The (frozen) set of glyph names which can't be derived algorithmically
+is called @dfn{groff glyph list (GGL)}.
+
+@itemize @bullet
+@item
+A glyph for Unicode character U+@var{XXXX}[@var{X}[@var{X}]] which is
+not a composite character will be named
+@code{u@var{XXXX}@r{[}@var{X}@r{[}@var{X}@r{]]}}.  @var{X} must be an
+uppercase hexadecimal digit.  Examples: @code{u1234}, @code{u008E},
+@code{u12DB8}.  The largest Unicode value is 0x10FFFF.  There must be at
+least four @code{X} digits; if necessary, add leading zeroes (after the
+@samp{u}).  No zero padding is allowed for character codes greater than
+0xFFFF.  Surrogates (i.e., Unicode values greater than 0xFFFF
+represented with character codes from the surrogate area U+D800-U+DFFF)
+are not allowed too.
+
+@item
+A glyph representing more than a single input character will be named
+
+@display
+@samp{u} @var{component1} @samp{_} @var{component2} @samp{_} @var{component3} @dots{}
+@end display
+
+@noindent
+Example: @code{u0045_0302_0301}.
+
+For simplicity, all Unicode characters which are composites must be
+decomposed maximally (this is normalization form@tie{}D in the Unicode
+standard); for example, @code{u00CA_0301} is not a valid glyph name
+since U+00CA (@sc{latin capital letter e with circumflex}) can be
+further decomposed into U+0045 (@sc{latin capital letter e}) and U+0302
+(@sc{combining circumflex accent}).  @code{u0045_0302_0301} is thus the
+glyph name for U+1EBE, @sc{latin capital letter e with circumflex and
+acute}.
+
+@item
+groff maintains a table to decompose all algorithmically derived glyph
+names which are composites itself.  For example, @code{u0100} (@sc{latin
+letter a with macron}) will be automatically decomposed into
+@code{u0041_0304}.  Additionally, a glyph name of the GGL is preferred
+to an algorithmically derived glyph name; groff also automatically does
+the mapping.  Example: The glyph @code{u0045_0302} will be mapped to
+@code{^E}.
+
+@item
+glyph names of the GGL can't be used in composite glyph names; for
+example, @code{^E_u0301} is invalid.
+@end itemize
+
+@DefescList {\\, @lparen{}, nm, }
+@DefescItem {\\, @lbrack{}, name, @rbrack}
+@DefescListEnd {\\, @lbrack{}, component1 component2 @dots{}, @rbrack}
+Insert a symbol @var{name} (two-character name @var{nm}) or a composite
+glyph with component glyphs @var{component1}, @var{component2},
+@enddots{} There is no special syntax for one-character names -- the
+natural form @samp{\@var{n}} would collide with escapes.@footnote{Note
+that a one-character symbol is not the same as an input character, i.e.,
+the character @code{a} is not the same as @code{\[a]}.  By default,
+@code{groff} defines only a single one-character symbol, @code{\[-]}; it
+is usually accessed as @code{\-}.  On the other hand, @code{gtroff} has
+the special feature that @code{\[char@var{XXX}]} is the same as the
+input character with character code @var{XXX}.  For example,
+@code{\[char97]} is identical to the letter @code{a} if @acronym{ASCII}
+encoding is active.}
+
+If @var{name} is undefined, a warning of type @samp{char} is generated,
+and the escape is ignored.  @xref{Debugging}, for information about
+warnings.
+
+groff resolves @code{\[...]} with more than a single component as
+follows:
+
+@itemize @bullet
+@item
+Any component which is found in the GGL will be converted to the
+@code{u@var{XXXX}} form.
+
+@item
+Any component @code{u@var{XXXX}} which is found in the list of
+decomposable glyphs will be decomposed.
+
+@item
+The resulting elements are then concatenated with @samp{_} inbetween,
+dropping the leading @samp{u} in all elements but the first.
+@end itemize
+
+No check for the existence of any component (similar to @code{tr}
+request) will be done.
+
+Examples:
+
+@table @code
+@item \[A ho]
+@samp{A} maps to @code{u0041}, @samp{ho} maps to @code{u02DB}, thus the
+final glyph name would be @code{u0041_02DB}.  Note this is not the
+expected result: The ogonek glyph @samp{ho} is a spacing ogonek, but for
+a proper composite a non-spacing ogonek (U+0328) is necessary.  Looking
+into the file @file{composite.tmac} one can find @w{@samp{.composite ho
+u0328}} which changes the mapping of @samp{ho} while a composite glyph
+name is constructed, causing the final glyph name to be
+@code{u0041_0328}.
+
+@item \[^E u0301]
+@itemx \[^E aa]
+@itemx \[E a^ aa]
+@itemx \[E ^ ']
+@samp{^E} maps to @code{u0045_0302}, thus the final glyph name is
+@code{u0045_0302_0301} in all forms (assuming proper calls of the
+@code{composite} request).
+@end table
+
+It is not possible to define glyphs with names like @w{@samp{A ho}}
+within a groff font file.  This is not really a limitation; instead, you
+have to define @code{u0041_0328}.
 @endDefesc
 
 @Defesc {\\C, ', xxx, '}
@@ -8114,15 +8740,27 @@ that it is compatible with newer versions of @acronym{AT&T}
 @code{troff} and is available in compatibility mode.
 @endDefesc
 
+@Defreq {composite, from to}
+@pindex composite.tmac
+Map glyph name @var{from} to glyph name @var{to} if it is used in
+@code{\[...]} with more than one component.  See above for examples.
+
+This mapping is based on glyph names only; no check for the existence of
+either glyph is done.
+
+A set of default mappings for many accents can be found in the file
+@file{composite.tmac} which is loaded at start-up.
+@endDefreq
+
 @Defesc {\\N, ', n, '}
 @cindex numbered glyph (@code{\N})
 @cindex glyph, numbered (@code{\N})
 @cindex @code{char} request, used with @code{\N}
 @cindex Unicode
-Typeset the glyph with code@w{ }@var{n} in the current font
-(@code{n}@w{ }is @strong{not} the input character code).  The
-number @var{n}@w{ }can be any non-negative decimal integer.  Most devices
-only have glyphs with codes between 0 and@w{ }255; the Unicode
+Typeset the glyph with code@tie{}@var{n} in the current font
+(@code{n}@tie{}is @strong{not} the input character code).  The
+number @var{n}@tie{}can be any non-negative decimal integer.  Most devices
+only have glyphs with codes between 0 and@tie{}255; the Unicode
 output device uses codes in the range 0--65535.  If the current
 font does not contain a glyph with that code, special fonts are
 @emph{not} searched.  The @code{\N} escape sequence can be
@@ -8141,6 +8779,8 @@ description file after the @code{charset} command.  It is possible to
 include unnamed glyphs in the font description file by using a
 name of @samp{---}; the @code{\N} escape sequence is the only way to
 use these.
+
+No kerning is applied to glyphs accessed with @code{\N}.
 @endDefesc
 
 Some escape sequences directly map onto special glyphs.
@@ -8193,7 +8833,7 @@ this property).
 @cindex @code{hy} glyph, and @code{cflags}
 @cindex @code{em} glyph, and @code{cflags}
 Lines can be broken after the character (initially the character
-@samp{-} and the symbols @samp{\(hy} and @samp{\(em} have this property).
+@samp{-} and the symbols @samp{\[hy]} and @samp{\[em]} have this property).
 
 @item 8
 @cindex overlapping characters
@@ -8201,12 +8841,15 @@ Lines can be broken after the character (initially the character
 @cindex @code{ul} glyph, and @code{cflags}
 @cindex @code{rn} glyph, and @code{cflags}
 @cindex @code{ru} glyph, and @code{cflags}
+@cindex @code{radicalex} glyph, and @code{cflags}
+@cindex @code{sqrtex} glyph, and @code{cflags}
 The character overlaps horizontally (initially the symbols
-@samp{\(ul\(rn\(ru} have this property).
+@samp{\[ul]}, @samp{\[rn]}, @samp{\[ru]}, @samp{\[radicalex}, and
+@samp{\[sqrtex]} have this property).
 
 @item 16
 @cindex @code{br} glyph, and @code{cflags}
-The character overlaps vertically (initially symbol @samp{\(br} has
+The character overlaps vertically (initially symbol @samp{\[br]} has
 this property).
 
 @item 32
@@ -8224,15 +8867,20 @@ this property is treated as the end of a sentence if followed by a
 newline or two spaces; in other words the character is
 @dfn{transparent} for the purposes of end-of-sentence recognition --
 this is the same as having a zero space factor in @TeX{} (initially
-characters @samp{"')]*} and the symbols @samp{\(dg\(rq} have this
-property).
+characters @samp{"')]*} and the symbols @samp{\[dg]} and @samp{\[rq]} have
+this property).
 @end table
 @endDefreq
 
 @DefreqList {char, g [@Var{string}]}
-@DefreqListEnd {fchar, g [@Var{string}]}
+@DefreqItem {fchar, g [@Var{string}]}
+@DefreqItem {fschar, f g [@Var{string}]}
+@DefreqListEnd {schar, g [@Var{string}]}
 @cindex defining character (@code{char})
+@cindex defining fallback character (@code{fchar}, @code{fschar}, @code{schar})
 @cindex character, defining (@code{char})
+@cindex character, defining fallback (@code{fchar}, @code{fschar}, @code{schar})
+@cindex fallback character, defining (@code{fchar}, @code{fschar}, @code{schar})
 @cindex creating new characters (@code{char})
 @cindex defining symbol (@code{char})
 @cindex symbol, defining (@code{char})
@@ -8249,9 +8897,9 @@ property).
 @cindex @code{\&}, and glyph definitions
 @cindex @code{\e}, and glyph definitions
 @cindex @code{hcode} request, and glyph definitions
-Define a new glyph@w{ }@var{g} to be @var{string} (which can be
+Define a new glyph@tie{}@var{g} to be @var{string} (which can be
 empty).@footnote{@code{char} is a misnomer since an output glyph is
-defined.}  Every time glyph@w{ }@var{g} needs to be printed,
+defined.}  Every time glyph@tie{}@var{g} needs to be printed,
 @var{string} is processed in a temporary environment and the result is
 wrapped up into a single object.  Compatibility mode is turned off and
 the escape character is set to @samp{\} while @var{string} is being
@@ -8259,7 +8907,7 @@ processed.  Any emboldening, constant spacing or track kerning is
 applied to this object rather than to individual characters in
 @var{string}.
 
-A glyph defined by this request can be used just
+A glyph defined by these requests can be used just
 like a normal glyph provided by the output device.  In particular,
 other characters can be translated to it with the @code{tr} or
 @code{trin} requests; it can be made the leader character by the
@@ -8291,23 +8939,42 @@ The @code{fchar} request defines a fallback glyph:
 @code{gtroff} only checks for glyphs defined with @code{fchar}
 if it cannot find the glyph in the current font.
 @code{gtroff} carries out this test before checking special fonts.
+
+@code{fschar} defines a fallback glyph for font@tie{}@var{f}: @code{gtroff}
+checks for glyphs defined with @code{fschar} after the list of fonts
+declared as font-specific special fonts with the @code{fspecial} request,
+but before the list of fonts declared as global special fonts with the
+@code{special} request.
+
+Finally, the @code{schar} request defines a global fallback glyph:
+@code{gtroff} checks for glyphs defined with @code{schar} after the list
+of fonts declared as global special fonts with the @code{special} request,
+but before the already mounted special fonts.
+
+@xref{Using Symbols}, for a detailed description of the glyph
+searching mechanism in @code{gtroff}.
 @endDefreq
 
-@Defreq {rchar, c1 c2 @dots{}}
-@cindex removing glyph definition (@code{rchar})
-@cindex glyph, removing definition (@code{rchar})
-Remove the definitions of glyphs @var{c1}, @var{c2},@w{
-}@enddots{} This undoes the effect of a @code{char} or @code{fchar}
-request.
+@DefreqList {rchar, c1 c2 @dots{}}
+@DefreqListEnd {rfschar, f c1 c2 @dots{}}
+@cindex removing glyph definition (@code{rchar}, @code{rfschar})
+@cindex glyph, removing definition (@code{rchar}, @code{rfschar})
+@cindex fallback glyph, removing definition (@code{rchar}, @code{rfschar})
+Remove the definitions of glyphs @var{c1}, @var{c2},@tie{}@enddots{}
+This undoes the effect of a @code{char}, @code{fchar}, or
+@code{schar} request.
 
 It is possible to omit the whitespace between arguments.
+
+The request @code{rfschar} removes glyph definitions defined with
+@code{fschar} for glyph@tie{}f.
 @endDefreq
 
 @xref{Special Characters}.
 
 @c ---------------------------------------------------------------------
 
-@node Special Fonts, Artificial Fonts, Using Symbols, Fonts
+@node Special Fonts, Artificial Fonts, Using Symbols, Fonts and Symbols
 @subsection Special Fonts
 @cindex special fonts
 @cindex fonts, special
@@ -8322,25 +8989,29 @@ searching mechanism in @code{gtroff}.
 
 Usually, only non-TTY devices have special fonts.
 
-@DefreqList {special, s1 s2 @dots{}}
-@DefreqListEnd {fspecial, f s1 s2 @dots{}}
+@DefreqList {special, [@Var{s1} @Var{s2} @dots{}]}
+@DefreqListEnd {fspecial, f [@Var{s1} @Var{s2} @dots{}]}
 @kindex fonts
 @pindex DESC
-Use the @code{special} request to define special fonts.  They are
-appended to the list of global special fonts in the given order.
-The first entries in this list are the fonts defined with the
-@code{fonts} command in the @file{DESC} file which are marked as
-special in the corresponding font description files.
-
-Use the @code{fspecial} request to designate special fonts
-only when font@w{ }@var{f} font is active.  They are appended to the
-list of special fonts for @var{f} in the given order.  Initially, this
+Use the @code{special} request to define special fonts.  Initially, this
 list is empty.
+
+Use the @code{fspecial} request to designate special fonts only when
+font@tie{}@var{f} is active.  Initially, this list is empty.
+
+Previous calls to @code{special} or @code{fspecial} are overwritten;
+without arguments, the particular list of special fonts is set to empty.
+Special fonts are searched in the order they appear as arguments.
+
+All fonts which appear in a call to @code{special} or @code{fspecial} are
+loaded.
+
+@xref{Using Symbols}, for the exact search order of glyphs.
 @endDefreq
 
 @c ---------------------------------------------------------------------
 
-@node Artificial Fonts, Ligatures and Kerning, Special Fonts, Fonts
+@node Artificial Fonts, Ligatures and Kerning, Special Fonts, Fonts and Symbols
 @subsection Artificial Fonts
 @cindex artificial fonts
 @cindex fonts, artificial
@@ -8352,8 +9023,9 @@ did not have a wide variety of fonts, and when @code{nroff} and
 necessary in GNU @code{troff}.  Nevertheless, they are supported.
 
 @DefescList {\\H, ', height, '}
-@DefescItem {\\H, ', @t{+}@Var{height}, '}
-@DefescListEnd {\\H, ', @t{-}@Var{height}, '}
+@DefescItem {\\H, ', @t{+}height, '}
+@DefescItem {\\H, ', @t{-}height, '}
+@DefregListEnd {.height}
 @cindex changing the font height (@code{\H})
 @cindex font height, changing (@code{\H})
 @cindex height, font, changing (@code{\H})
@@ -8361,6 +9033,9 @@ Change (increment, decrement) the height of the current font, but not
 the width.  If @var{height} is zero, restore the original height.
 Default scaling indicator is @samp{z}.
 
+The read-only number register @code{.height} contains the font height as
+set by @code{\H}.
+
 Currently, only the @option{-Tps} device supports this feature.
 
 Note that @code{\H} doesn't produce an input token in @code{gtroff}.
@@ -8388,11 +9063,15 @@ points larger than the current font size).
 @endDefesc
 
 @DefescList {\\S, ', slant, '}
+@DefregListEnd {.slant}
 @cindex changing the font slant (@code{\S})
 @cindex font slant, changing (@code{\S})
 @cindex slant, font, changing (@code{\S})
 Slant the current font by @var{slant} degrees.  Positive values slant
-to the right.
+to the right.  Only integer values are possible.
+
+The read-only number register @code{.slant} contains the font slant as
+set by @code{\S}.
 
 Currently, only the @option{-Tps} device supports this feature.
 
@@ -8449,7 +9128,7 @@ well (if a TTY output device is used).
 @cindex underline font (@code{uf})
 @cindex font for underlining (@code{uf})
 Set the underline font (globally) used by @code{ul} and @code{cu}.  By
-default, this is the font at position@w{ }2.  @var{font} can be either
+default, this is the font at position@tie{}2.  @var{font} can be either
 a non-negative font position or the name of a font.
 @endDefreq
 
@@ -8511,7 +9190,7 @@ an integer.
 
 @c ---------------------------------------------------------------------
 
-@node Ligatures and Kerning,  , Artificial Fonts, Fonts
+@node Ligatures and Kerning,  , Artificial Fonts, Fonts and Symbols
 @subsection Ligatures and Kerning
 @cindex ligatures and kerning
 @cindex kerning and ligatures
@@ -8528,6 +9207,10 @@ supported `ff', `ffi', and `ffl' ligatures.  Advanced typesetters or
 `expert' fonts may include ligatures for `ft' and `ct', although GNU
 @code{troff} does not support these (yet).
 
+Only the current font is checked for ligatures and kerns; neither special
+fonts nor entities defined with the @code{char} request (and its siblings)
+are taken into account.
+
 @DefreqList {lg, [@Var{flag}]}
 @DefregListEnd {.lg}
 @cindex activating ligatures (@code{lg})
@@ -8536,9 +9219,9 @@ supported `ff', `ffi', and `ffl' ligatures.  Advanced typesetters or
 Switch the ligature mechanism on or off; if the parameter is non-zero
 or missing, ligatures are enabled, otherwise disabled.  Default is on.
 The current ligature mode can be found in the read-only number register
-@code{.lg} (set to 1 or@w{ }2 if ligatures are enabled, 0@w{ }otherwise).
+@code{.lg} (set to 1 or@tie{}2 if ligatures are enabled, 0@tie{}otherwise).
 
-Setting the ligature mode to@w{ }2 enables the two-character ligatures
+Setting the ligature mode to@tie{}2 enables the two-character ligatures
 (fi, fl, and ff) and disables the three-character ligatures (ffi and
 ffl).
 @endDefreq
@@ -8560,8 +9243,8 @@ have the same width don't use kerning.
 @cindex kerning enabled register (@code{.kern})
 Switch kerning on or off.  If the parameter is non-zero or missing,
 enable pairwise kerning, otherwise disable it.  The read-only number
-register @code{.kern} is set to@w{ }1 if pairwise kerning is enabled,
-0@w{ }otherwise.
+register @code{.kern} is set to@tie{}1 if pairwise kerning is enabled,
+0@tie{}otherwise.
 
 @cindex zero width space character (@code{\&})
 @cindex character, zero width space (@code{\&})
@@ -8584,8 +9267,8 @@ typography if the reader notices the effect.
 @Defreq {tkf, f s1 n1 s2 n2}
 @cindex activating track kerning (@code{tkf})
 @cindex track kerning, activating (@code{tkf})
-Enable track kerning for font@w{ }@var{f}.  If the current font is@w{
-}@var{f} the width of every glyph is increased by an amount
+Enable track kerning for font@tie{}@var{f}.  If the current font
+is@tie{}@var{f} the width of every glyph is increased by an amount
 between @var{n1} and @var{n2} (@var{n1}, @var{n2} can be negative); if
 the current point size is less than or equal to @var{s1} the width is
 increased by @var{n1}; if it is greater than or equal to @var{s2} the
@@ -8615,8 +9298,8 @@ with this.
 Increase the width of the preceding glyph so that the spacing
 between that glyph and the following glyph is correct if the
 following glyph is a roman glyph.  For example, if an
-italic@w{ }@code{f} is immediately followed by a roman right
-parenthesis, then in many fonts the top right portion of the@w{ }@code{f}
+italic@tie{}@code{f} is immediately followed by a roman right
+parenthesis, then in many fonts the top right portion of the@tie{}@code{f}
 overlaps the top left of the right parenthesis.  Use this escape
 sequence whenever an italic glyph is immediately followed by a
 roman glyph without any intervening space.  This small amount of
@@ -8738,7 +9421,7 @@ This is a test.
 
 @c =====================================================================
 
-@node Sizes, Strings, Fonts, gtroff Reference
+@node Sizes, Strings, Fonts and Symbols, gtroff Reference
 @section Sizes
 @cindex sizes
 
@@ -8757,11 +9440,11 @@ are @emph{not} related to its type size!  For example, the standard
 output, the size of `Helvetica' has to be reduced by one point, and
 the size of `Courier' must be increased by one point.}  @dfn{Vertical
 spacing} is the amount of space @code{gtroff} allows for a line of
-text; normally, this is about 20%@w{ }larger than the current type
+text; normally, this is about 20%@tie{}larger than the current type
 size.  Ratios smaller than this can result in hard-to-read text;
 larger than this, it spreads the text out more vertically (useful for
-term papers).  By default, @code{gtroff} uses 10@w{ }point type on
-12@w{ }point spacing.
+term papers).  By default, @code{gtroff} uses 10@tie{}point type on
+12@tie{}point spacing.
 
 @cindex leading
 The difference between type size and vertical spacing is known, by
@@ -8788,7 +9471,7 @@ typesetters, as @dfn{leading} (this is pronounced `ledding').
 Use the @code{ps} request or the @code{\s} escape to change (increase,
 decrease) the type size (in points).  Specify @var{size} as either an
 absolute point size, or as a relative change from the current size.
-The size@w{ }0, or no argument, goes back to the previous size.
+The size@tie{}0, or no argument, goes back to the previous size.
 
 Default scaling indicator of @code{size} is @samp{z}.  If @code{size}
 is zero or negative, it is set to 1@dmn{u}.
@@ -8817,23 +9500,23 @@ and the text begins.  Any of the following forms are valid:
 
 @table @code
 @item \s@var{n}
-Set the point size to @var{n}@w{ }points.  @var{n}@w{ }must be either
-0 or in the range 4 to@w{ }39.
+Set the point size to @var{n}@tie{}points.  @var{n}@tie{}must be either
+0 or in the range 4 to@tie{}39.
 
 @item \s+@var{n}
 @itemx \s-@var{n}
-Increase or decrease the point size by @var{n}@w{ }points.  @var{n}@w{
-}must be exactly one digit.
+Increase or decrease the point size by @var{n}@tie{}points.
+@var{n}@tie{}must be exactly one digit.
 
 @item \s(@var{nn}
-Set the point size to @var{nn}@w{ }points.  @var{nn} must be exactly
+Set the point size to @var{nn}@tie{}points.  @var{nn} must be exactly
 two digits.
 
 @item \s+(@var{nn}
 @itemx \s-(@var{nn}
 @itemx \s(+@var{nn}
 @itemx \s(-@var{nn}
-Increase or decrease the point size by @var{nn}@w{ }points.  @var{nn}
+Increase or decrease the point size by @var{nn}@tie{}points.  @var{nn}
 must be exactly two digits.
 @end table
 
@@ -8862,7 +9545,7 @@ the @code{sizescale} line in the
 @file{DESC} file for the output device
 provides the scaling factor.
 For example, if the scaling factor is 1000,
-then the value 12000 is 12@w{ }points.
+then the value 12000 is 12@tie{}points.
 
 Each argument can be a single point size (such as @samp{12000}),
 or a range of sizes (such as @samp{4000-72000}).
@@ -8884,7 +9567,7 @@ reset to the previous value before the last call to @code{vs}.
 
 @cindex @code{.V} register, and @code{vs}
 @code{gtroff} creates a warning of type @samp{range} if @var{space} is
-zero or negative; the vertical spacing is then set to the vertical
+negative; the vertical spacing is then set to the vertical
 resolution (as given in the @code{.V} register).
 
 The read-only number register @code{.v} contains the current vertical
@@ -8951,7 +9634,6 @@ post-vertical spacing; it is associated with the current environment
 (@pxref{Environments}).
 @endDefreq
 
-
 @c ---------------------------------------------------------------------
 
 @node Fractional Type Sizes,  , Changing Type Sizes, Sizes
@@ -8972,7 +9654,7 @@ post-vertical spacing; it is associated with the current environment
 @cindex @code{\H}, with fractional type sizes
 @cindex @code{\s}, with fractional type sizes
 A @dfn{scaled point} is equal to @math{1/@var{sizescale}} points,
-where @var{sizescale} is specified in the @file{DESC} file (1@w{ }by
+where @var{sizescale} is specified in the @file{DESC} file (1@tie{}by
 default).  There is a new scale indicator @samp{z} which has the
 effect of multiplying by @var{sizescale}.  Requests and escape
 sequences in @code{gtroff} interpret arguments that represent a point
@@ -8984,10 +9666,10 @@ arguments to the @code{tkf} request, the argument to the @code{\H}
 escape sequence, and those variants of the @code{\s} escape sequence
 that take a numeric expression as their argument (see below).
 
-For example, suppose @var{sizescale} is@w{ }1000; then a scaled point
+For example, suppose @var{sizescale} is@tie{}1000; then a scaled point
 is equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is
 equivalent to @w{@samp{.ps 10.25z}} and thus sets the point size to
-10250@w{ }scaled points, which is equal to 10.25@w{ }points.
+10250@tie{}scaled points, which is equal to 10.25@tie{}points.
 
 @code{gtroff} disallows the use of the @samp{z} scale indicator in
 instances where it would make no sense, such as a numeric
@@ -9036,7 +9718,7 @@ fractional type sizes:
 @table @code
 @item \s[@var{n}]
 @itemx \s'@var{n}'
-Set the point size to @var{n}@w{ }scaled points; @var{n}@w{ }is a numeric
+Set the point size to @var{n}@tie{}scaled points; @var{n}@tie{}is a numeric
 expression with a default scale indicator of @samp{z}.
 
 @item \s[+@var{n}]
@@ -9047,8 +9729,8 @@ expression with a default scale indicator of @samp{z}.
 @itemx \s'-@var{n}'
 @itemx \s+'@var{n}'
 @itemx \s-'@var{n}'
-Increase or or decrease the point size by @var{n}@w{ }scaled points;
-@var{n}@w{ }is a numeric expression with a default scale indicator of
+Increase or or decrease the point size by @var{n}@tie{}scaled points;
+@var{n}@tie{}is a numeric expression with a default scale indicator of
 @samp{z}.
 @end table
 
@@ -9076,13 +9758,13 @@ even this is a read-write string variable).
 @cindex expansion of strings (@code{\*})
 @cindex string arguments
 @cindex arguments, of strings
-Define and access a string variable @var{name} (one-character name@w{
-}@var{n}, two-character name @var{nm}).  If @var{name} already exists,
-@code{ds} overwrites the previous definition.  Only the syntax form
+Define and access a string variable @var{name} (one-character
+name@tie{}@var{n}, two-character name @var{nm}).  If @var{name} already
+exists, @code{ds} overwrites the previous definition.  Only the syntax form
 using brackets can take arguments which are handled identically to
 macro arguments; the single exception is that a closing bracket as an
-argument must be enclosed in double quotes.  @xref{Request Arguments},
-and @ref{Parameters}.
+argument must be enclosed in double quotes.  @xref{Request and Macro
+Arguments}, and @ref{Parameters}.
 
 Example:
 
@@ -9290,12 +9972,12 @@ requests.
 @Defreq {substring, str n1 [@Var{n2}]}
 @cindex substring (@code{substring})
 Replace the string named @var{str} with the substring
-defined by the indices @var{n1} and@w{ }@var{n2}.  The first character
-in the string has index@w{ }0.  If @var{n2} is omitted, it is taken to
+defined by the indices @var{n1} and@tie{}@var{n2}.  The first character
+in the string has index@tie{}0.  If @var{n2} is omitted, it is taken to
 be equal to the string's length.  If the index value @var{n1} or
 @var{n2} is negative, it is counted from the end of the
-string, going backwards: The last character has index@w{ }@minus{}1, the
-character before the last character has index@w{ }@minus{}2, etc.
+string, going backwards: The last character has index@tie{}@minus{}1, the
+character before the last character has index@tie{}@minus{}2, etc.
 
 @Example
 .ds xxx abcdefgh
@@ -9314,7 +9996,7 @@ number register @var{reg}.  If @var{reg} doesn't exist, it is created.
 
 @Example
 .ds xxx abcd\h'3i'efgh
-.length yyy \n[xxx]
+.length yyy \*[xxx]
 \n[yyy]
     @result{} 14
 @endExample
@@ -9434,7 +10116,7 @@ match,@footnote{The created output nodes must be identical.
 font requests.  In the previous example, @samp{|} and @samp{\fR|\fP}
 both result in a roman @samp{|} glyph with the same point size and
 at the same location on the page, so the strings are equal.  If
-@samp{.ft@w{ }I} had been added before the @samp{.ie}, the result
+@samp{.ft@tie{}I} had been added before the @samp{.ie}, the result
 would be ``false'' because (the first) @samp{|} produces an italic
 @samp{|} rather than a roman one.
 
@@ -9512,7 +10194,7 @@ more info.
 
 @Defreq{nop, anything}
 Executes @var{anything}.
-This is similar to @code{.if@w{ }1}.
+This is similar to @code{.if@tie{}1}.
 @endDefreq
 
 @DefreqList {ie, expr anything}
@@ -9575,7 +10257,7 @@ request, which is used much like the @code{if} (and related) requests.
 @Defreq {while, expr anything}
 Evaluate the expression @var{expr}, and repeatedly execute
 @var{anything} (the remainder of the line) until @var{expr} evaluates
-to@w{ }0.
+to@tie{}0.
 
 @Example
 .nr a 0 1
@@ -9631,7 +10313,7 @@ instead which is parsed only once during its definition.
 @endExample
 
 @noindent
-Note that the number of available recursion levels is set to@w{ }1000
+Note that the number of available recursion levels is set to@tie{}1000
 (this is a compile-time constant value of @code{gtroff}).
 
 @item
@@ -9769,13 +10451,13 @@ Note that macro identifiers are shared with identifiers for strings and
 diversions.
 @endDefreq
 
-@DefreqList {am, xx}
-@DefreqItem {am1, xx}
-@DefreqListEnd {ami, xx yy}
+@DefreqList {am, name [@Var{end}]}
+@DefreqItem {am1, name [@Var{end}]}
+@DefreqListEnd {ami, name [@Var{end}]}
 @cindex appending to a macro (@code{am})
 @cindex macro, appending (@code{am})
 Works similarly to @code{de} except it appends onto the macro named
-@var{xx}.  So, to make the previously defined @samp{P} macro actually
+@var{name}.  So, to make the previously defined @samp{P} macro actually
 do indented instead of block paragraphs, add the necessary code to the
 existing macro like this:
 
@@ -9793,7 +10475,7 @@ the end.
 
 The @code{ami} request appends indirectly,
 meaning that @code{gtroff} expands strings whose names
-are @var{xx} or @var{yy} before performing the append.
+are @var{name} or @var{end} before performing the append.
 
 @pindex trace.tmac
 Using @file{trace.tmac}, you can trace calls to @code{am} and @code{am1}.
@@ -9841,7 +10523,7 @@ evaluated (either at copy-in time or at the time of use) by insulating
 the escapes with an extra backslash.  Compare this to the @code{\def}
 and @code{\edef} commands in @TeX{}.
 
-The following example prints the numbers 20 and@w{ }10:
+The following example prints the numbers 20 and@tie{}10:
 
 @Example
 .nr x 20
@@ -9880,17 +10562,17 @@ escapes:
 Retrieve the @var{n}@dmn{th}, @var{nn}@dmn{th} or @var{nnn}@dmn{th}
 argument.  As usual, the first form only accepts a single number
 (larger than zero), the second a two-digit number (larger or equal
-to@w{ }10), and the third any positive integer value (larger
+to@tie{}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.
 @endDefesc
 
 @Defreq {shift, [@Var{n}]}
-Shift the arguments 1@w{ }position, or as
+Shift the arguments 1@tie{}position, or as
 many positions as specified by its argument.  After executing this
-request, argument@w{ }@var{i} becomes argument @math{@var{i}-@var{n}};
-arguments 1 to@w{ }@var{n} are no longer available.  Shifting by
+request, argument@tie{}@var{i} becomes argument @math{@var{i}-@var{n}};
+arguments 1 to@tie{}@var{n} are no longer available.  Shifting by
 negative amounts is currently undefined.
 @endDefreq
 
@@ -9902,7 +10584,7 @@ escape concatenates all the arguments separated by spaces.  A
 similar escape is @code{\$@@}, 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 @ref{Request Arguments}).
+is preserved (see @ref{Request and Macro Arguments}).
 @endDefesc
 
 @Defesc {\\$0, , , }
@@ -9925,7 +10607,7 @@ The @code{als} request can make a macro have more than one name.
 @endExample
 @endDefesc
 
-@xref{Request Arguments}.
+@xref{Request and Macro Arguments}.
 
 
 @c =====================================================================
@@ -10030,7 +10712,7 @@ The following escapes give fine control of movements about the page.
 @cindex motion, vertical (@code{\v})
 Move vertically, usually from the current location on the page (if no
 absolute position operator @samp{|} is used).  The
-argument@w{ }@var{e} specifies the distance to move; positive is
+argument@tie{}@var{e} specifies the distance to move; positive is
 downwards and negative upwards.  The default scaling indicator for this
 escape is @samp{v}.  Beware, however, that @code{gtroff} continues text
 processing at the point where the motion ends, so you should always
@@ -10044,15 +10726,15 @@ indicate continuation of a footnote or something similar.
 There are some special-case escapes for vertical motion.
 
 @Defesc {\\r, , , }
-Move upwards@w{ }1@dmn{v}.
+Move upwards@tie{}1@dmn{v}.
 @endDefesc
 
 @Defesc {\\u, , , }
-Move upwards@w{ }.5@dmn{v}.
+Move upwards@tie{}.5@dmn{v}.
 @endDefesc
 
 @Defesc {\\d, , , }
-Move down@w{ }.5@dmn{v}.
+Move down@tie{}.5@dmn{v}.
 @endDefesc
 
 @Defesc {\\h, ', e, '}
@@ -10062,9 +10744,12 @@ Move down@w{ }.5@dmn{v}.
 @cindex horizontal motion (@code{\h})
 @cindex motion, horizontal (@code{\h})
 Move horizontally, usually from the current location (if no absolute
-position operator @samp{|} is used).  The expression@w{ }@var{e}
+position operator @samp{|} is used).  The expression@tie{}@var{e}
 indicates how far to move: positive is rightwards and negative
 leftwards.  The default scaling indicator for this escape is @samp{m}.
+
+This horizontal space is not discarded at the end of a line.  To insert
+discardable space of a certain length use the @code{ss} request.
 @endDefesc
 
 There are a number of special-case escapes for horizontal motion.
@@ -10135,7 +10820,8 @@ The highest and lowest point of the baseline, respectively, in @var{text}.
 @itemx rsb
 Like the @code{st} and @code{sb} registers, but takes account of the
 heights and depths of glyphs.  With other words, this gives the
-highest and lowest point of @var{text}.
+highest and lowest point of @var{text}.  Values below the baseline are
+negative.
 
 @item ct
 Defines the kinds of glyphs occurring in @var{text}:
@@ -10174,7 +10860,7 @@ over that glyph.
 @cindex position, horizontal input line, saving (@code{\k})
 @cindex line, input, horizontal position, saving (@code{\k})
 Store the current horizontal position in the @emph{input} line in
-number register with name @var{position} (one-character name@w{ }@var{p},
+number register with name @var{position} (one-character name@tie{}@var{p},
 two-character name @var{ps}).  Use this, for example, to return to the
 beginning of a string for highlighting or other decoration.
 @endDefesc
@@ -10196,7 +10882,7 @@ A read-only number register containing the current horizontal output
 position.
 @endDefreg
 
-@Defesc {\\o, ', @Var{a}@Var{b}@Var{c}, '}
+@Defesc {\\o, ', abc, '}
 @cindex overstriking glyphs (@code{\o})
 @cindex glyphs, overstriking (@code{\o})
 Overstrike glyphs @var{a}, @var{b}, @var{c}, @dots{}; the glyphs
@@ -10249,8 +10935,8 @@ information.
 
 All drawing is done via escapes.
 
-@DefescList {\\l, ', @Var{l}, '}
-@DefescListEnd {\\l, ', @Var{l}@Var{g}, '}
+@DefescList {\\l, ', l, '}
+@DefescListEnd {\\l, ', lg, '}
 @cindex drawing horizontal lines (@code{\l})
 @cindex horizontal line, drawing (@code{\l})
 @cindex line, horizontal, drawing (@code{\l})
@@ -10268,7 +10954,7 @@ Default scaling indicator is @samp{m}.
 @cindex glyph, underscore (@code{\[ru]})
 @cindex line drawing glyph
 @cindex glyph, for line drawing
-The optional second parameter@w{ }@var{g} is a glyph to draw the line
+The optional second parameter@tie{}@var{g} is a glyph to draw the line
 with.  If this second argument is not specified, @code{gtroff} uses
 the underscore glyph, @code{\[ru]}.
 
@@ -10295,8 +10981,8 @@ beginning of the @emph{input} line -- this works because the line
 length is negative, not moving the current point.
 @endDefesc
 
-@DefescList {\\L, ', @Var{l}, '}
-@DefescListEnd {\\L, ', @Var{l}@Var{g}, '}
+@DefescList {\\L, ', l, '}
+@DefescListEnd {\\L, ', lg, '}
 @cindex drawing vertical lines (@code{\L})
 @cindex vertical line drawing (@code{\L})
 @cindex line, vertical, drawing (@code{\L})
@@ -10335,7 +11021,8 @@ of the available drawing functions.
 The default scaling indicator for all subcommands of @code{\D} is
 @samp{m} for horizontal distances and @samp{v} for vertical ones.
 Exceptions are @w{@code{\D'f @dots{}'}} and @w{@code{\D't @dots{}'}}
-which use @code{u} as the default.
+which use @code{u} as the default, and @w{@code{\D'F@var{x} @dots{}'}}
+which arguments are treated similar to the @code{defcolor} request.
 
 @table @code
 @item \D'l @var{dx} @var{dy}'
@@ -10371,28 +11058,31 @@ containing the largest height and depth of the whole string.
 @item \D'c @var{d}'
 @cindex circle, drawing (@w{@code{\D'c @dots{}'}})
 @cindex drawing a circle (@w{@code{\D'c @dots{}'}})
-Draw a circle with a diameter of@w{ }@var{d} with the leftmost point at the
-current position.
+Draw a circle with a diameter of@tie{}@var{d} with the leftmost point at the
+current position.  After drawing, the current location is positioned at the
+rightmost point of the circle.
 
 @item \D'C @var{d}'
 @cindex circle, solid, drawing (@w{@code{\D'C @dots{}'}})
 @cindex drawing a solid circle (@w{@code{\D'C @dots{}'}})
 @cindex solid circle, drawing (@w{@code{\D'C @dots{}'}})
-Draw a solid circle with the same parameters as an outlined circle.  No
-outline is drawn.
+Draw a solid circle with the same parameters and behaviour as an outlined
+circle.  No outline is drawn.
 
 @item \D'e @var{x} @var{y}'
 @cindex drawing an ellipse (@w{@code{\D'e @dots{}'}})
 @cindex ellipse, drawing (@w{@code{\D'e @dots{}'}})
 Draw an ellipse with a horizontal diameter of @var{x} and a vertical
 diameter of @var{y} with the leftmost point at the current position.
+After drawing, the current location is positioned at the rightmost point of
+the ellipse.
 
 @item \D'E @var{x} @var{y}'
 @cindex ellipse, solid, drawing (@w{@code{\D'E @dots{}'}})
 @cindex drawing a solid ellipse (@w{@code{\D'E @dots{}'}})
 @cindex solid ellipse, drawing (@w{@code{\D'E @dots{}'}})
-Draw a solid ellipse with the same parameters as an outlined ellipse.
-No outline is drawn.
+Draw a solid ellipse with the same parameters and behaviour as an
+outlined ellipse.  No outline is drawn.
 
 @item \D'a @var{dx1} @var{dy1} @var{dx2} @var{dy2}'
 @cindex arc, drawing (@w{@code{\D'a @dots{}'}})
@@ -10401,38 +11091,51 @@ Draw an arc clockwise from the current location through the two
 specified relative locations (@var{dx1},@var{dy1}) and
 (@var{dx2},@var{dy2}).  The coordinates of the first point are relative
 to the current position, and the coordinates of the second point are
-relative to the first point.
+relative to the first point.  After drawing, the current position is moved
+to the final point of the arc.
 
 @item \D'~ @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}'
 @cindex drawing a spline (@w{@code{\D'~ @dots{}'}})
 @cindex spline, drawing (@w{@code{\D'~ @dots{}'}})
 Draw a spline from the current location to the relative point
 (@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}), and so on.
+The current position is moved to the terminal point of the drawn curve.
 
 @item \D'f @var{n}'
 @cindex gray shading (@w{@code{\D'f @dots{}'}})
 @cindex shading filled objects (@w{@code{\D'f @dots{}'}})
-Set the shade of gray to be used for filling solid objects to@w{
-}@var{n}; @var{n}@w{ }must be an integer between 0 and@w{ }1000, where 0
+Set the shade of gray to be used for filling solid objects to@tie{}@var{n};
+@var{n}@tie{}must be an integer between 0 and@tie{}1000, where 0
 corresponds solid white and 1000 to solid black, and values in between
 correspond to intermediate shades of gray.  This applies only to solid
 circles, solid ellipses, and solid polygons.  By default, a level of
 1000 is used.
 
+Despite of being silly, the current point is moved horizontally to the
+right by@tie{}@var{n}.
+
+@cindex @w{@code{\D'f @dots{}'}} and horizontal resolution
+Don't use this command!  It has the serious drawback that it will be
+always rounded to the next integer multiple of the horizontal resolution
+(the value of the @code{hor} keyword in the @file{DESC} file).  Use
+@code{\M} (@pxref{Colors}) or @w{@code{\D'Fg @dots{}'}} instead.
+
 @item \D'p @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}'
 @cindex drawing a polygon (@w{@code{\D'p @dots{}'}})
 @cindex polygon, drawing (@w{@code{\D'p @dots{}'}})
 Draw a polygon from the current location to the relative position
 (@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}) and so on.
 When the specified data points are exhausted, a line is drawn back
-to the starting point.
+to the starting point.  The current position is changed by adding the
+sum of all arguments with odd index to the actual horizontal position and
+the even ones to the vertical position.
 
 @item \D'P @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}'
 @cindex polygon, solid, drawing (@w{@code{\D'P @dots{}'}})
 @cindex drawing a solid polygon (@w{@code{\D'P @dots{}'}})
 @cindex solid polygon, drawing (@w{@code{\D'P @dots{}'}})
-Draw a solid polygon with the same parameters as an outlined polygon.
-No outline is drawn.
+Draw a solid polygon with the same parameters and behaviour as an
+outlined polygon.  No outline is drawn.
 
 Here a better variant of the box macro to fill the box with some color.
 Note that the box must be drawn before the text since colors in
@@ -10459,10 +11162,32 @@ text completely.
 @item \D't @var{n}'
 @cindex line thickness (@w{@code{\D't @dots{}'}})
 @cindex thickness of lines (@w{@code{\D't @dots{}'}})
-Set the current line thickness to @var{n}@w{ }machine units.  A value of
+Set the current line thickness to @var{n}@tie{}machine units.  A value of
 zero selects the smallest available line thickness.  A negative value
 makes the line thickness proportional to the current point size (this is
 the default behaviour of @acronym{AT&T} @code{troff}).
+
+Despite of being silly, the current point is moved horizontally to the
+right by@tie{}@var{n}.
+
+@item \D'F@var{scheme} @var{color_components}'
+@cindex unnamed fill colors (@code{\D'F@dots{}'})
+@cindex fill colors, unnamed (@code{\D'F@dots{}'})
+@cindex colors, fill, unnamed (@code{\D'F@dots{}'})
+Change current fill color.  @var{scheme} is a single letter denoting the
+color scheme: @samp{r} (rgb), @samp{c} (cmy), @samp{k} (cmyk), @samp{g}
+(gray), or @samp{d} (default color).  The color components use exactly
+the same syntax as in the @code{defcolor} request (@pxref{Colors}); the
+command @code{\D'Fd'} doesn't take an argument.
+
+@emph{No} position changing!
+
+Examples:
+
+@Example
+@endExample
+\D'Fg .3'      \" same gray as \D'f 700'
+\D'Fr #0000ff' \" blue
 @end table
 @endDefesc
 
@@ -10557,10 +11282,12 @@ vertical position traps.  The parameter that controls whether vertical
 position traps are enabled is global.  Initially vertical position traps
 are enabled.  The current setting of this is available in the
 @code{.vpt} read-only number register.
+
+Note that a page can't be ejected if @code{vpt} is set to zero.
 @endDefreq
 
 @Defreq {wh, dist [@Var{macro}]}
-Set a page location trap.  Positive values for @var{dist} set
+Set a page location trap.  Non-negative values for @var{dist} set
 the trap relative to the top of the page; negative values set
 the trap relative to the bottom of the page.  Default scaling
 indicator is @samp{v}.
@@ -10601,7 +11328,8 @@ It is possible to have more than one trap at the same location; to do so,
 the traps must be defined at different locations, then moved together with
 the @code{ch} request; otherwise the second trap would replace the first
 one.  Earlier defined traps hide later defined traps if moved to the same
-position (the many empty lines caused by the @code{bp} request are omitted):
+position (the many empty lines caused by the @code{bp} request are omitted
+in the following example):
 
 @Example
 .de a
@@ -10645,15 +11373,15 @@ integer which can be represented in @code{groff}) if there are no diversion
 traps.
 @endDefreg
 
-@Defreq {ch, macro dist}
+@Defreq {ch, macro [@Var{dist}]}
 @cindex changing trap location (@code{ch})
 @cindex trap, changing location (@code{ch})
 Change the location of a trap.
 The first argument is the name of the macro to be invoked at
 the trap, and the second argument is the new location for the trap
-(note that the parameters are specified the opposite of the @code{wh}
-request).  This is useful for building up footnotes in a diversion to
-allow more space at the bottom of the page for them.
+(note that the parameters are specified in opposite order as in the
+@code{wh} request).  This is useful for building up footnotes in a
+diversion to allow more space at the bottom of the page for them.
 
 Default scaling indicator for @var{dist} is @samp{v}.  If @var{dist}
 is missing, the trap is removed.
@@ -10672,6 +11400,9 @@ The read-only number register @code{.ne} contains the amount of space
 that was needed in the last @code{ne} request that caused a trap to be
 sprung.  Useful in conjunction with the @code{.trunc} register.
 @xref{Page Control}, for more information.
+
+Since the @code{.ne} register is only set by traps it doesn't make
+much sense to use it outside of trap macros.
 @endDefreg
 
 @Defreg {.trunc}
@@ -10684,8 +11415,50 @@ produced by the @code{ne} request.  In other words, at the point a trap
 is sprung, it represents the difference of what the vertical position
 would have been but for the trap, and what the vertical position
 actually is.
+
+Since the @code{.trunc} register is only set by traps and it doesn't make
+much sense to use it outside of trap macros.
+@endDefreg
+
+@Defreg {.pe}
+@cindex @code{bp} request, and traps (@code{.pe})
+@cindex traps, sprung by @code{bp} request (@code{.pe})
+@cindex page ejecting register (@code{.pe})
+A read-only register which is set to@tie{}1 while a page is ejected with
+the @code{bp} request (or by the end of input).
+
+Outside of traps this register is always zero.  In the following example,
+only the second call to@tie{}@code{x} is caused by @code{bp}.
+
+@Example
+.de x
+\&.pe=\\n[.pe]
+.br
+..
+.wh 1v x
+.wh 4v x
+A line.
+.br
+Another line.
+.br
+    @result{} A line.
+              .pe=0
+              Another line.
+
+              .pe=1
+@endExample
 @endDefreg
 
+@cindex diversions, and traps
+@cindex traps, and diversions
+An important fact to consider while designing macros is that diversions and
+traps do not interact normally.  For example, if a trap invokes a header
+macro (while outputting a diversion) which tries to change the font on the
+current page, the effect will not be visible before the diversion has
+completely been printed (except for input protected with @code{\!} or
+@code{\?}) since the data in the diversion is already formatted.  In most
+cases, this is not the expected behaviour.
+
 @c ---------------------------------------------------------------------
 
 @node Diversion Traps, Input Line Traps, Page Location Traps, Traps
@@ -10700,7 +11473,7 @@ actually is.
 @cindex trap, diversion, setting (@code{dt})
 Set a trap @emph{within} a diversion.
 @var{dist} is the location of the trap
-(identical to the @code{.wh} request; default scaling indicator is
+(identical to the @code{wh} request; default scaling indicator is
 @samp{v}) and @var{macro} is the name of the macro to be invoked.  The
 number register @code{.t} still works within diversions.
 @xref{Diversions}, for more information.
@@ -10719,12 +11492,12 @@ number register @code{.t} still works within diversions.
 @cindex input line trap, setting (@code{it})
 @cindex trap, input line, setting (@code{it})
 Set an input line trap.
-@var{n}@w{ }is the number of lines of input which may be read before
+@var{n}@tie{}is the number of lines of input which may be read before
 springing the trap, @var{macro} is the macro to be invoked.
 Request lines are not counted as input lines.
 
 For example, one possible use is to have a macro which prints the
-next @var{n}@w{ }lines in a bold font.
+next @var{n}@tie{}lines in a bold font.
 
 @Example
 .de B
@@ -10741,9 +11514,9 @@ next @var{n}@w{ }lines in a bold font.
 @cindex interrupted lines and input line traps (@code{itc})
 @cindex traps, input line, and interrupted lines (@code{itc})
 @cindex lines, interrupted, and input line traps (@code{itc})
-The @code{itc} request is identical,
-except that a line interrupted with @code{\c}
-counts as one input line.
+The @code{itc} request is identical
+except that an interrupted text line (ending with @code{\c})
+is not counted as a separate line.
 
 Both requests are associated with the current environment
 (@pxref{Environments}); switching to another environment disables the
@@ -10889,7 +11662,7 @@ Diversions may be nested.  The read-only number register @code{.z}
 contains the name of the current diversion (this is a string-valued
 register).  The read-only number register @code{.d} contains the current
 vertical place in the diversion.  If not in a diversion it is the same
-as the register @code{nl}.
+as register @code{nl}.
 @endDefreg
 
 @Defreg {.h}
@@ -10920,8 +11693,16 @@ in the return value of the @code{.h} register.
 
 @DefregList {dn}
 @DefregListEnd {dl}
+@cindex @code{dn} register, and @code{da} (@code{boxa})
+@cindex @code{dl} register, and @code{da} (@code{boxa})
+@cindex @code{da} request, and @code{dn} (@code{dl})
+@cindex @code{boxa} request, and @code{dn} (@code{dl})
 After completing a diversion, the read-write number registers @code{dn}
 and @code{dl} contain the vertical and horizontal size of the diversion.
+Note that only the just processed lines are counted: For the computation
+of @code{dn} and @code{dl}, the requests @code{da} and @code{boxa} are
+handled as if @code{di} and @code{box} had been used -- lines which have
+been already stored in a macro are not taken into account.
 
 @Example
 .\" Center text both horizontally & vertically
@@ -10963,19 +11744,19 @@ and @code{dl} contain the vertical and horizontal size of the diversion.
 @endDefreg
 
 @DefescList {\\!, , , }
-@DefescListEnd {\\?, , @Var{anything}, \\?}
+@DefescListEnd {\\?, , anything, \\?}
 @cindex transparent output (@code{\!}, @code{\?})
 @cindex output, transparent (@code{\!}, @code{\?})
 Prevent requests, macros, and escapes from being
-interpreted when read into a diversion.  This takes the given text
-and @dfn{transparently} embeds it into the diversion.  This is useful for
+interpreted when read into a diversion.  Both escapes take the given text
+and @dfn{transparently} embed it into the diversion.  This is useful for
 macros which shouldn't be invoked until the diverted text is actually
 output.
 
 The @code{\!} escape transparently embeds text up to
 and including the end of the line.
 The @code{\?} escape transparently embeds text until the next
-occurrence of the @code{\?} escape.  For example:
+occurrence of the @code{\?} escape.  Example:
 
 @Example
 \?@var{anything}\?
@@ -10986,7 +11767,7 @@ occurrence of the @code{\?} escape.  For example:
 newlines in a diversion.  The escape sequence @code{\?} is also
 recognized in copy mode and turned into a single internal code; it is
 this code that terminates @var{anything}.  Thus the following example
-prints@w{ }4.
+prints@tie{}4.
 
 @Example
 .nr x 1
@@ -11027,7 +11808,7 @@ at all; its argument is simply ignored.
 @cindex @code{output} request, and @code{\!}
 @Defreq {output, string}
 Emit @var{string} directly to the @code{gtroff} intermediate output
-(subject to copy-mode interpretation);  this is similar to @code{\!} used
+(subject to copy-mode interpretation); this is similar to @code{\!} used
 at the top level.  An initial double quote in @var{string} is stripped off
 to allow initial blanks.
 
@@ -11038,7 +11819,7 @@ Without argument, @code{output} is ignored.
 
 Use with caution!  It is normally only needed for mark-up used by a
 postprocessor which does something with the output before sending it to
-the output device, filtering out @code{string} again.
+the output device, filtering out @var{string} again.
 @endDefreq
 
 @Defreq {asciify, div}
@@ -11050,7 +11831,7 @@ in such a way that @acronym{ASCII} characters, characters translated with
 the @code{trin} request, space characters, and some escape sequences that
 were formatted and diverted are treated like ordinary input
 characters when the diversion is reread.  It can be also used for gross
-hacks; for example, the following sets register@w{ }@code{n} to@w{ }1.
+hacks; for example, the following sets register@tie{}@code{n} to@tie{}1.
 
 @Example
 .tr @@.
@@ -11090,7 +11871,7 @@ a trap invoked macro to print headers and footers.  To solve this
 @code{gtroff} processes text in @dfn{environments}.  An
 environment contains most of the parameters that control text
 processing.  It is possible to switch amongst these environments; by
-default @code{gtroff} processes text in environment@w{ }0.  The
+default @code{gtroff} processes text in environment@tie{}0.  The
 following is the information kept in an environment.
 
 @itemize @bullet
@@ -11194,24 +11975,42 @@ The number of consecutive hyphenated lines (set to zero).
 @end itemize
 @endDefreq
 
-@DefregList {.cht}
+@DefregList {.w}
+@DefregItem {.cht}
 @DefregItem {.cdp}
 @DefregListEnd {.csk}
-@cindex environment, last glyph
+@cindex environment, dimensions of last glyph (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk})
+@cindex width, of last glyph (@code{.w})
+@cindex height, of last glyph (@code{.cht})
+@cindex depth, of last glyph (@code{.cdp})
+@cindex skew, of last glyph (@code{.csk})
+@cindex last glyph, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk})
+@cindex glyph, last, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk})
+The @code{\n[.w]} register contains the
+width of the last glyph added to the current environment.
+
 The @code{\n[.cht]} register contains the
-maximum extent (above the baseline)
-of the last glyph added to the current environment.
+height of the last glyph added to the current environment.
 
 The @code{\n[.cdp]} register contains the
-maximum extent (below the baseline)
-of the last glyph added to the current environment.
+depth of the last glyph added to the current environment.
+It is positive for glyphs extending below the baseline.
 
 The @code{\n[.csk]} register contains the
 @dfn{skew} (how far to the right of the glyph's center
-that @code{gtroff} shold place an accent)
+that @code{gtroff} should place an accent)
 of the last glyph added to the current environment.
 @endDefreg
 
+@Defreg {.n}
+@cindex environment, previous line length (@code{.n})
+@cindex line length, previous (@code{.n})
+@cindex length of previous line (@code{.n})
+@cindex previous line length (@code{.n})
+The @code{\n[.n]} register contains the
+length of the previous output line in the current environment.
+@endDefreg
+
 
 @c =====================================================================
 
@@ -11273,7 +12072,7 @@ End a nesting level.
 This escape is @code{grohtml} specific.  Provided that this escape
 occurs at the outer nesting level write the @code{filename} to
 @code{stderr}.  The position of the image, @var{P}, must be specified
-and must be one of @code{l}, @code{r}, @code{c}, or@w{ }@code{i} (left,
+and must be one of @code{l}, @code{r}, @code{c}, or@tie{}@code{i} (left,
 right, centered, inline).  @var{filename} will be associated with the
 production of the next inline image.
 @end table
@@ -11290,8 +12089,8 @@ production of the next inline image.
 If @var{n} is missing or non-zero, activate colors (this is the default);
 otherwise, turn it off.
 
-The read-only number register @code{.color} is@w{ }1 if colors are active,
-0@w{ }otherwise.
+The read-only number register @code{.color} is@tie{}1 if colors are active,
+0@tie{}otherwise.
 
 Internally, @code{color} sets a global flag; it does not produce a token.
 Similar to the @code{cp} request, you should use it at the beginning of
@@ -11302,7 +12101,7 @@ Colors can be also turned off with the @option{-c} command line option.
 
 @Defreq {defcolor, ident scheme color_components}
 Define color with name @var{ident}.  @var{scheme} can be one of  the
-following values: @code{rgb} (three components), @code{cym} (three
+following values: @code{rgb} (three components), @code{cmy} (three
 components), @code{cmyk} (four components), and @code{gray} or
 @code{grey} (one component).
 
@@ -11312,7 +12111,7 @@ Color components can be given either as a hexadecimal string or as
 positive decimal integers in the range 0--65535.  A hexadecimal string
 contains all color components concatenated.  It must start with either
 @code{#} or @code{##}; the former specifies hex values in the range
-0--255 (which are internally multiplied by@w{ }257), the latter in the
+0--255 (which are internally multiplied by@tie{}257), the latter in the
 range 0--65535.  Examples: @code{#FFC0CB} (pink), @code{##ffff0000ffff}
 (magenta).  The default color name @c{default} can't be redefined; its
 value is device-specific (usually black).  It is possible that the
@@ -11320,9 +12119,9 @@ default color for @code{\m} and @code{\M} is not identical.
 
 @cindex @code{f} unit, and colors
 @cindex unit, @code{f}, and colors
-A new scaling indicator@w{ }@code{f} has been introduced which multiplies
+A new scaling indicator@tie{}@code{f} has been introduced which multiplies
 its value by 65536; this makes it convenient to specify color components
-as fractions in the range 0 to@w{ }1 (1f equals 65536u).  Example:
+as fractions in the range 0 to@tie{}1 (1f equals 65536u).  Example:
 
 @Example
 .defcolor darkgreen rgb 0.1f 0.5f 0.2f
@@ -11448,7 +12247,7 @@ Transparently output the contents of @var{file}.  Each line is output
 as if it were preceded by @code{\!}; however, the lines are not subject
 to copy mode interpretation.  If the file does not end with a newline,
 then a newline is added (@code{trf} only).  For example, to define a
-macro@w{ }@code{x} containing the contents of file@w{ }@file{f}, use
+macro@tie{}@code{x} containing the contents of file@tie{}@file{f}, use
 
 @Example
 .di x
@@ -11605,7 +12404,7 @@ document:
 @pindex perl
 @Example
 .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\
-	     (localtime(time))[2,1,0]' > /tmp/x\n[$$]
+             (localtime(time))[2,1,0]' > /tmp/x\n[$$]
 .so /tmp/x\n[$$]
 .sy rm /tmp/x\n[$$]
 \nH:\nM:\nS
@@ -11708,7 +12507,7 @@ Here a simple macro to write an index entry.
 @DefescItem {\\V, @lparen{}, ev, }
 @DefescListEnd {\\V, @lbrack{}, env, @rbrack}
 Interpolate the contents of the specified environment variable
-@var{env} (one-character name@w{ }@var{e}, two-character name @var{ev})
+@var{env} (one-character name@tie{}@var{e}, two-character name @var{ev})
 as returned by the function @code{getenv}.  @code{\V} is interpreted
 in copy-in mode.
 @endDefesc
@@ -11758,7 +12557,7 @@ Additionally, the backslash is represented as @code{\\}.
 @DefescItem {\\Y, @lparen{}, nm, }
 @DefescListEnd {\\Y, @lbrack{}, name, @rbrack}
 This is approximately equivalent to @samp{\X'\*[@var{name}]'}
-(one-character name@w{ }@var{n}, two-character name @var{nm}).
+(one-character name@tie{}@var{n}, two-character name @var{nm}).
 However, the contents of the string or macro @var{name} are not
 interpreted; also it is permitted for @var{name} to have been defined
 as a macro and thus contain newlines (it is not permitted for the
@@ -11786,8 +12585,8 @@ categorized elsewhere in this manual.
 Print line numbers.
 @var{start} is the line number of the @emph{next}
 output line.  @var{inc} indicates which line numbers are printed.
-For example, the value@w{ }5 means to emit only line numbers which
-are multiples of@w{ }5; this defaults to@w{ }1.  @var{space} is the
+For example, the value@tie{}5 means to emit only line numbers which
+are multiples of@tie{}5; this defaults to@tie{}1.  @var{space} is the
 space to be left between the number and the text; this defaults to
 one digit space.  The fourth argument is the indentation of the line
 numbers, defaulting to zero.  Both @var{space} and @var{indent} are
@@ -11850,7 +12649,7 @@ And here the result:
 
 @Defreq {nn, [@Var{skip}]}
 Temporarily turn off line numbering.  The argument is the number
-of lines not to be numbered; this defaults to@w{ }1.
+of lines not to be numbered; this defaults to@tie{}1.
 @endDefreq
 
 @Defreq {mc, glyph [@Var{dist}]}
@@ -11953,7 +12752,7 @@ are valid input.  @xref{Identifiers}, for more on this topic.
 
 For example, the input string @samp{fi\[:u]} is converted into a
 character token @samp{f}, a character token @samp{i}, and a special
-token @samp{:u} (representing u@w{ }umlaut).  Later on, the character
+token @samp{:u} (representing u@tie{}umlaut).  Later on, the character
 tokens @samp{f} and @samp{i} are merged to a single output node
 representing the ligature glyph @samp{fi} (provided the current font
 has a glyph for this ligature); the same happens with @samp{:u}.  All
@@ -11994,7 +12793,7 @@ It contains these elements.
 
 @cindex @code{\v}, internal representation
 @noindent
-Elements 1, 7, and@w{ }8 are inserted by @code{gtroff}; the latter two
+Elements 1, 7, and@tie{}8 are inserted by @code{gtroff}; the latter two
 (which are always present) specify the vertical extent of the last
 line, possibly modified by @code{\x}.  The @code{br} request finishes
 the current partial line, inserting a newline input token which is
@@ -12049,22 +12848,26 @@ of the fallback glyph.  Anyway, the translation is still active;
 @code{gtroff} is not easy to debug, but there are some useful features
 and strategies for debugging.
 
-@Defreq {lf, line filename}
+@Defreq {lf, line [@Var{filename}]}
 @pindex soelim
 @cindex multi-file documents
 @cindex documents, multi-file
 @cindex setting input line number (@code{lf})
 @cindex input line number, setting (@code{lf})
 @cindex number, input line, setting (@code{lf})
-Change the line number and the file name @code{gtroff} shall use for
-error and warning messages.  @var{line} is the input line number of the
-@emph{next} line.
+Change the line number and optionally the file name @code{gtroff} shall
+use for error and warning messages.  @var{line} is the input line number
+of the @emph{next} line.
 
 Without argument, the request is ignored.
 
 This is a debugging aid for documents which are split into many files,
 then put together with @code{soelim} and other preprocessors.  Usually,
 it isn't invoked manually.
+
+Note that other @code{troff} implementations (including the original
+@acronym{AT&T} version) handle @code{lf} differently.  For them,
+@var{line} changes the line number of the @emph{current} line.
 @endDefreq
 
 @DefreqList {tm, string}
@@ -12196,7 +12999,7 @@ this request on each error and warning.
 @cindex input stack, setting limit
 Use the @code{slimit} number register
 to set the maximum number of objects on the input stack.
-If @code{slimit} is less than or equal to@w{ }0,
+If @code{slimit} is less than or equal to@tie{}0,
 there is no limit set.
 With no limit, a buggy recursive macro can exhaust virtual memory.
 
@@ -12336,7 +13139,7 @@ for each name.
 @cindex @code{\R}, and warnings
 @cindex @code{\n}, and warnings
 Use of undefined number registers.  When an undefined number register is
-used, that register is automatically defined to have a value of@w{ }0.
+used, that register is automatically defined to have a value of@tie{}0.
 So, in most cases, at most one warning is given for use of a particular
 name.
 
@@ -12437,8 +13240,8 @@ interpreted as the start of a long name.  In compatibility mode GNU
 If @var{n} is missing or non-zero, turn on compatibility mode;
 otherwise, turn it off.
 
-The read-only number register @code{.C} is@w{ }1 if compatibility mode is
-on, 0@w{ }otherwise.
+The read-only number register @code{.C} is@tie{}1 if compatibility mode is
+on, 0@tie{}otherwise.
 
 Compatibility mode can be also turned on with the @option{-C} command line
 option.
@@ -12490,6 +13293,7 @@ Hallo!
 \fB.xx\fP
 @endExample
 
+@noindent
 prints @samp{Hallo!} in bold face if in compatibility mode, and
 @samp{.xx} in bold face otherwise.
 
@@ -12530,8 +13334,8 @@ indicators and thus
 @endExample
 
 @noindent
-sets the point size to 10@w{ }points, whereas in GNU @code{troff} it
-sets the point size to 10@w{ }scaled points.  @xref{Fractional Type
+sets the point size to 10@tie{}points, whereas in GNU @code{troff} it
+sets the point size to 10@tie{}scaled points.  @xref{Fractional Type
 Sizes}, for more information.
 
 @cindex @code{bd} request, incompatibilities with @acronym{AT&T} @code{troff}
@@ -12716,7 +13520,7 @@ A free implementation of @code{grap}, written by Ted Faber,
 is available as an extra package from the following address:
 
 @display
-@url{http://www.lunabase.org/~faber/Vault/software/grap/}
+@uref{http://www.lunabase.org/~faber/Vault/software/grap/}
 @end display
 
 
@@ -13065,7 +13869,7 @@ postprocessors.  This parser is smarter on whitespace and implements
 obsolete elements for compatibility, otherwise both formats are the
 same.@footnote{The parser and postprocessor for intermediate output
 can be found in the file@*
-@file{@var{groff-source-dir}/src/libs/libdriver/input.cc}.}
+@file{@var{groff-source-dir}/src/libs/libdriver/input.cpp}.}
 
 The main purpose of the intermediate output concept is to facilitate
 the development of postprocessors by providing a common programming
@@ -13279,15 +14083,15 @@ position; the glyph's size is read from the font file.  The print
 position is not changed.
 
 @item c @var{g}
-Print glyph@w{ }@var{g} at the current print position;@footnote{@samp{c}
+Print glyph@tie{}@var{g} at the current print position;@footnote{@samp{c}
 is actually a misnomer since it outputs a glyph.} the glyph's size is
 read from the font file.  The print position is not changed.
 
 @item f @var{n}
-Set font to font number@w{ }@var{n} (a non-negative integer).
+Set font to font number@tie{}@var{n} (a non-negative integer).
 
 @item H @var{n}
-Move right to the absolute vertical position@w{ }@var{n} (a
+Move right to the absolute vertical position@tie{}@var{n} (a
 non-negative integer in basic units @samp{u} relative to left edge
 of current page.
 
@@ -13308,7 +14112,7 @@ These commands are a @code{gtroff} extension.
 
 @table @code
 @item mc @var{cyan} @var{magenta} @var{yellow}
-Set color using the CMY color scheme, having the 3@w{ }color components
+Set color using the CMY color scheme, having the 3@tie{}color components
 @var{cyan}, @var{magenta}, and @var{yellow}.
 
 @item md
@@ -13320,37 +14124,37 @@ Set color to the shade of gray given by the argument, an integer
 between 0 (black) and 65536 (white).
 
 @item mk @var{cyan} @var{magenta} @var{yellow} @var{black}
-Set color using the CMYK color scheme, having the 4@w{ }color components
+Set color using the CMYK color scheme, having the 4@tie{}color components
 @var{cyan}, @var{magenta}, @var{yellow}, and @var{black}.
 
 @item mr @var{red} @var{green} @var{blue}
-Set color using the RGB color scheme, having the 3@w{ }color components
+Set color using the RGB color scheme, having the 3@tie{}color components
 @var{red}, @var{green}, and @var{blue}.
 
 @end table
 
 @item N @var{n}
-Print glyph with index@w{ }@var{n} (a non-negative integer) of the
+Print glyph with index@tie{}@var{n} (a non-negative integer) of the
 current font.  This command is a @code{gtroff} extension.
 
 @item n @var{b} @var{a}
 Inform the device about a line break, but no positioning is done by
 this command.  In @acronym{AT&T} @code{troff}, the integer arguments
-@var{b} and@w{ }@var{a} informed about the space before and after the
+@var{b} and@tie{}@var{a} informed about the space before and after the
 current line to make the intermediate output more human readable
 without performing any action.  In @code{groff}, they are just ignored, but
 they must be provided for compatibility reasons.
 
 @item p @var{n}
 Begin a new page in the outprint.  The page number is set
-to@w{ }@var{n}.  This page is completely independent of pages formerly
+to@tie{}@var{n}.  This page is completely independent of pages formerly
 processed even if those have the same page number.  The vertical
-position on the outprint is automatically set to@w{ }0.  All
+position on the outprint is automatically set to@tie{}0.  All
 positioning, writing, and drawing is always done relative to a page,
 so a @samp{p} command must be issued before any of these commands.
 
 @item s @var{n}
-Set point size to @var{n}@w{ }scaled points (this is unit @samp{z}).
+Set point size to @var{n}@tie{}scaled points (this is unit @samp{z}).
 @acronym{AT&T} @code{troff} used the unit points (@samp{p}) instead.
 @xref{Output Language Compatibility}.
 
@@ -13374,18 +14178,18 @@ file contains the @code{tcommand} keyword (@pxref{DESC File Format}).
 Print word with track kerning.  This is the same as the @samp{t}
 command except that after printing each glyph, the current
 horizontal position is increased by the sum of the width of that
-glyph and@w{ }@var{n} (an integer in basic units @samp{u}).
+glyph and@tie{}@var{n} (an integer in basic units @samp{u}).
 This command is a @code{gtroff} extension; it is only used for devices
 whose @file{DESC} file contains the @code{tcommand} keyword
 (@pxref{DESC File Format}).
 
 @item V @var{n}
-Move down to the absolute vertical position@w{ }@var{n} (a
+Move down to the absolute vertical position@tie{}@var{n} (a
 non-negative integer in basic units @samp{u}) relative to upper edge
 of current page.
 
 @item v @var{n}
-Move @var{n}@w{ }basic units @samp{u} down (@var{n} is a non-negative
+Move @var{n}@tie{}basic units @samp{u} down (@var{n} is a non-negative
 integer).  The original @acronym{UNIX} troff manual allows negative
 values for @var{n} also, but @code{gtroff} doesn't use this.
 
@@ -13422,9 +14226,8 @@ negative left.  The arguments called @var{v1}, @var{v2}, @dots{},
 negative up.  All these distances are offsets relative to the current
 location.
 
-Unless indicated otherwise, each graphics command directly corresponds
-to a similar @code{gtroff} @code{\D} escape sequence.  @xref{Drawing
-Requests}.
+Each graphics command directly corresponds to a similar @code{gtroff}
+@code{\D} escape sequence.  @xref{Drawing Requests}.
 
 Unknown @samp{D} commands are assumed to be device-specific.
 Its arguments are parsed as strings; the whole information is then
@@ -13450,27 +14253,27 @@ of the arc.
 @item DC @var{d}@angles{line break}
 @itemx DC @var{d} @var{dummy-arg}@angles{line break}
 Draw a solid circle using the current fill color with
-diameter@w{ }@var{d} (integer in basic units @samp{u}) with leftmost
+diameter@tie{}@var{d} (integer in basic units @samp{u}) with leftmost
 point at the current position; then move the current position to the
 rightmost point of the circle.  An optional second integer argument is
 ignored (this allows the formatter to generate an even number of
 arguments).  This command is a @code{gtroff} extension.
 
 @item Dc @var{d}@angles{line break}
-Draw circle line with diameter@w{ }@var{d} (integer in basic units
+Draw circle line with diameter@tie{}@var{d} (integer in basic units
 @samp{u}) with leftmost point at the current position; then move the
 current position to the rightmost point of the circle.
 
 @item DE @var{h} @var{v}@angles{line break}
 Draw a solid ellipse in the current fill color with a horizontal
-diameter of@w{ }@var{h} and a vertical diameter of@w{ }@var{v} (both
+diameter of@tie{}@var{h} and a vertical diameter of@tie{}@var{v} (both
 integers in basic units @samp{u}) with the leftmost point at the
 current position; then move to the rightmost point of the ellipse.
 This command is a @code{gtroff} extension.
 
 @item De @var{h} @var{v}@angles{line break}
-Draw an outlined ellipse with a horizontal diameter of@w{ }@var{h}
-and a vertical diameter of@w{ }@var{v} (both integers in basic units
+Draw an outlined ellipse with a horizontal diameter of@tie{}@var{h}
+and a vertical diameter of@tie{}@var{v} (both integers in basic units
 @samp{u}) with the leftmost point at current position; then move to
 the rightmost point of the ellipse.
 
@@ -13488,7 +14291,7 @@ is a @code{gtroff} extension.
 @table @code
 @item DFc @var{cyan} @var{magenta} @var{yellow}@angles{line break}
 Set fill color for solid drawing objects using the CMY color scheme,
-having the 3@w{ }color components @var{cyan}, @var{magenta}, and
+having the 3@tie{}color components @var{cyan}, @var{magenta}, and
 @var{yellow}.
 
 @item DFd@angles{line break}
@@ -13501,17 +14304,17 @@ the argument, an integer between 0 (black) and 65536 (white).
 
 @item DFk @var{cyan} @var{magenta} @var{yellow} @var{black}@angles{line break}
 Set fill color for solid drawing objects using the CMYK color scheme,
-having the 4@w{ }color components @var{cyan}, @var{magenta}, @var{yellow},
+having the 4@tie{}color components @var{cyan}, @var{magenta}, @var{yellow},
 and @var{black}.
 
 @item DFr @var{red} @var{green} @var{blue}@angles{line break}
 Set fill color for solid drawing objects using the RGB color scheme,
-having the 3@w{ }color components @var{red}, @var{green}, and @var{blue}.
+having the 3@tie{}color components @var{red}, @var{green}, and @var{blue}.
 
 @end table
 
 @item Df @var{n}@angles{line break}
-The argument@w{ }@var{n} must be an integer in the range @math{-32767}
+The argument@tie{}@var{n} must be an integer in the range @math{-32767}
 to 32767.
 
 @table @asis
@@ -13521,7 +14324,7 @@ where 0 corresponds to solid white, 1000 (the default) to solid black,
 and values in between to intermediate shades of gray; this is
 obsoleted by command @samp{DFg}.
 
-@item @math{@var{n} @LT 0} or @math{@var{n} @LT 1000}
+@item @math{@var{n} < 0} or @math{@var{n} > 1000}
 Set the filling color to the color that is currently being used for
 the text and the outline, see command @samp{m}.  For example, the
 command sequence
@@ -13568,7 +14371,7 @@ No position changing.
 This command is a @code{gtroff} extension.
 
 @item Dt @var{n}@angles{line break}
-Set the current line thickness to@w{ }@var{n} (an integer in basic
+Set the current line thickness to@tie{}@var{n} (an integer in basic
 units @samp{u}) if @math{@var{n}>0}; if @math{@var{n}=0} select the
 smallest available line thickness; if @math{@var{n}<0} set the line
 thickness proportional to the point size (this is the default before
@@ -13616,13 +14419,13 @@ not changed by this command.  This command is a @code{gtroff} extension.
 @item xf @var{n} @var{s}@angles{line break}
 The @samp{f} stands for @var{font}.
 
-Mount font position@w{ }@var{n} (a non-negative integer) with font
-named@w{ }@var{s} (a text word).  @xref{Font Positions}.
+Mount font position@tie{}@var{n} (a non-negative integer) with font
+named@tie{}@var{s} (a text word).  @xref{Font Positions}.
 
 @item xH @var{n}@angles{line break}
 The @samp{H} stands for @var{Height}.
 
-Set glyph height to@w{ }@var{n} (a positive integer in scaled
+Set glyph height to@tie{}@var{n} (a positive integer in scaled
 points @samp{z}).  @acronym{AT&T} @code{troff} uses the unit points
 (@samp{p}) instead.  @xref{Output Language Compatibility}.
 
@@ -13643,7 +14446,7 @@ pause device, can be restarted
 @item xr @var{n} @var{h} @var{v}@angles{line break}
 The @samp{r} stands for @var{resolution}.
 
-Resolution is@w{ }@var{n}, while @var{h} is the minimal horizontal
+Resolution is@tie{}@var{n}, while @var{h} is the minimal horizontal
 motion, and @var{v} the minimal vertical motion possible with this
 device; all arguments are positive integers in basic units @samp{u}
 per inch.  This is the second command of the prologue.
@@ -13651,7 +14454,7 @@ per inch.  This is the second command of the prologue.
 @item xS @var{n}@angles{line break}
 The @samp{S} stands for @var{Slant}.
 
-Set slant to@w{ }@var{n} (an integer in basic units @samp{u}).
+Set slant to@tie{}@var{n} (an integer in basic units @samp{u}).
 
 @item xs@angles{line break}
 The @samp{s} stands for @var{stop}.
@@ -13676,8 +14479,8 @@ command of the prologue.
 @item xu @var{n}@angles{line break}
 The @samp{u} stands for @var{underline}.
 
-Configure underlining of spaces.  If @var{n} is@w{ }1, start
-underlining of spaces; if @var{n} is@w{ }0, stop underlining of spaces.
+Configure underlining of spaces.  If @var{n} is@tie{}1, start
+underlining of spaces; if @var{n} is@tie{}0, stop underlining of spaces.
 This is needed for the @code{cu} request in nroff mode and is ignored
 otherwise.  This command is a @code{gtroff} extension.
 
@@ -13702,12 +14505,12 @@ In @acronym{AT&T} @code{troff} output, the writing of a single
 glyph is mostly done by a very strange command that combines a
 horizontal move and a single character giving the glyph name.  It
 doesn't have a command code, but is represented by a 3-character
-argument consisting of exactly 2@w{ }digits and a character.
+argument consisting of exactly 2@tie{}digits and a character.
 
 @table @asis
 @item @var{dd}@var{g}
 Move right @var{dd} (exactly two decimal digits) basic units @samp{u},
-then print glyph@w{ }@var{g} (represented as a single character).
+then print glyph@tie{}@var{g} (represented as a single character).
 
 In @code{gtroff}, arbitrary syntactical space around and within this
 command is allowed to be added.  Only when a preceding command on the
@@ -13818,7 +14621,7 @@ document.
 
 @item @acronym{AT&T} @code{troff} output
 Since a computer monitor has a very low resolution compared to modern
-printers the intermediate output for the X@w{ }Window devices can use
+printers the intermediate output for the X@tie{}Window devices can use
 the jump-and-write command with its 2-digit displacements.
 
 @example
@@ -13847,7 +14650,7 @@ x stop
 
 @noindent
 This output can be fed into @code{xditview} or @code{gxditview}
-for displaying in@w{ }X.
+for displaying in@tie{}X.
 
 Due to the obsolete jump-and-write command, the text clusters in the
 @acronym{AT&T} @code{troff} output are almost unreadable.
@@ -13934,11 +14737,11 @@ The @code{gtroff} font format is roughly a superset of the
 @code{ditroff} font format (as used in later versions of @acronym{AT&T}
 @code{troff} and its descendants).  Unlike the @code{ditroff} font
 format, there is no associated binary format; all files are text
-files.@footnote{Plan@w{ }9 @code{troff} has also abandoned the binary
+files.@footnote{Plan@tie{}9 @code{troff} has also abandoned the binary
 format.}  The font files for device @var{name} are stored in a directory
 @file{dev@var{name}}.  There are two types of file: a device description
-file called @file{DESC} and for each font@w{ }@var{f} a font file
-called@w{ }@file{@var{f}}.
+file called @file{DESC} and for each font@tie{}@var{f} a font file
+called@tie{}@file{@var{f}}.
 
 @menu
 * DESC File Format::
@@ -13961,19 +14764,27 @@ order of the lines is not important.
 @table @code
 @item res @var{n}
 @kindex res
-There are @var{n}@w{ }machine units per inch.
+@cindex device resolution
+@cindex resolution, device
+There are @var{n}@tie{}machine units per inch.
 
 @item hor @var{n}
 @kindex hor
-The horizontal resolution is @var{n}@w{ }machine units.
+@cindex horizontal resolution
+@cindex resolution, horizontal
+The horizontal resolution is @var{n}@tie{}machine units.  All horizontal
+quantities are rounded to be multiples of this value.
 
 @item vert @var{n}
 @kindex vert
-The vertical resolution is @var{n}@w{ }machine units.
+@cindex vertical resolution
+@cindex resolution, vertical
+The vertical resolution is @var{n}@tie{}machine units.  All vertical
+quantities are rounded to be multiples of this value.
 
 @item sizescale @var{n}
 @kindex sizescale
-The scale factor for point sizes.  By default this has a value of@w{ }1.
+The scale factor for point sizes.  By default this has a value of@tie{}1.
 One scaled point is equal to one point/@var{n}.  The arguments to the
 @code{unitwidth} and @code{sizes} commands are given in scaled points.
 @xref{Fractional Type Sizes}, for more information.
@@ -13981,7 +14792,7 @@ One scaled point is equal to one point/@var{n}.  The arguments to the
 @item unitwidth @var{n}
 @kindex unitwidth
 Quantities in the font files are given in machine units for fonts whose
-point size is @var{n}@w{ }scaled points.
+point size is @var{n}@tie{}scaled points.
 
 @item prepro @var{program}
 @kindex prepro
@@ -14008,13 +14819,13 @@ intermediate output commands.
 @item sizes @var{s1} @var{s2} @dots{} @var{sn} 0
 @kindex sizes
 This means that the device has fonts at @var{s1}, @var{s2}, @dots{}
-@var{sn} scaled points.  The list of sizes must be terminated by@w{ }0
+@var{sn} scaled points.  The list of sizes must be terminated by@tie{}0
 (this is digit zero).  Each @var{si} can also be a range of sizes
 @var{m}-@var{n}.  The list can extend over more than one line.
 
 @item styles @var{S1} @var{S2} @dots{} @var{Sm}
 @kindex styles
-The first @var{m}@w{ }font positions are associated with styles
+The first @var{m}@tie{}font positions are associated with styles
 @var{S1} @dots{} @var{Sm}.
 
 @item fonts @var{n} @var{F1} @var{F2} @var{F3} @dots{} @var{Fn}
@@ -14022,7 +14833,7 @@ The first @var{m}@w{ }font positions are associated with styles
 Fonts @var{F1} @dots{} @var{Fn} are mounted in the font positions
 @var{m}+1, @dots{}, @var{m}+@var{n} where @var{m} is the number of
 styles.  This command may extend over more than one line.  A font name
-of@w{ }0 means no font is mounted on the corresponding font position.
+of@tie{}0 means no font is mounted on the corresponding font position.
 
 @item family @var{fam}
 @kindex family
@@ -14085,7 +14896,6 @@ Here a list of obsolete keywords which are recognized by @code{groff}
 but completely ignored: @code{spare1}, @code{spare2},
 @code{biggestfont}.
 
-
 @c ---------------------------------------------------------------------
 
 @node Font File Format,  , DESC File Format, Font Files
@@ -14104,15 +14914,15 @@ key.
 @table @code
 @item name @var{f}
 @kindex name
-The name of the font is@w{ }@var{f}.
+The name of the font is@tie{}@var{f}.
 
 @item spacewidth @var{n}
 @kindex spacewidth
-The normal width of a space is@w{ }@var{n}.
+The normal width of a space is@tie{}@var{n}.
 
 @item slant @var{n}
 @kindex slant
-The glyphs of the font have a slant of @var{n}@w{ }degrees.
+The glyphs of the font have a slant of @var{n}@tie{}degrees.
 (Positive means forward.)
 
 @item ligatures @var{lig1} @var{lig2} @dots{} @var{lign} [0]
@@ -14120,7 +14930,7 @@ The glyphs of the font have a slant of @var{n}@w{ }degrees.
 Glyphs @var{lig1}, @var{lig2}, @dots{}, @var{lign} are ligatures;
 possible ligatures are @samp{ff}, @samp{fi}, @samp{fl}, @samp{ffi} and
 @samp{ffl}.  For backwards compatibility, the list of ligatures may be
-terminated with a@w{ }0.  The list of ligatures may not extend over more
+terminated with a@tie{}0.  The list of ligatures may not extend over more
 than one line.
 
 @item special
@@ -14171,8 +14981,8 @@ tabs.  The format is
 input, characters, and output, glyphs, is not clearly separated in the
 terminology of @code{groff}; for example, the @code{char} request
 should be called @code{glyph} since it defines an output entity.}:
-If @var{name} is a single character@w{ }@var{c} then it corresponds
-to the @code{gtroff} input character@w{ }@var{c}; if it is of the form
+If @var{name} is a single character@tie{}@var{c} then it corresponds
+to the @code{gtroff} input character@tie{}@var{c}; if it is of the form
 @samp{\@var{c}} where @var{c} is a single character, then it
 corresponds to the special character @code{\[@var{c}]}; otherwise it
 corresponds to the special character @samp{\[@var{name}]}.  If it
@@ -14184,9 +14994,9 @@ is identical to @code{\[-]}.
 @code{gtroff} supports 8-bit input characters; however some utilities
 have difficulties with eight-bit characters.  For this reason, there is
 a convention that the entity name @samp{char@var{n}} is equivalent to
-the single input character whose code is@w{ }@var{n}.  For example,
-@samp{char163} would be equivalent to the character with code@w{ }163
-which is the pounds sterling sign in the @w{ISO Latin-1} character set.
+the single input character whose code is@tie{}@var{n}.  For example,
+@samp{char163} would be equivalent to the character with code@tie{}163
+which is the pounds sterling sign in the ISO@tie{}@w{Latin-1} character set.
 You shouldn't use @samp{char@var{n}} entities in font description files
 since they are related to input, not output.  Otherwise, you get
 hard-coded connections between input and output encoding which
@@ -14239,7 +15049,7 @@ The @var{metrics} field has the form:
 @noindent
 There must not be any spaces between these subfields (it has been split
 here into two lines for better legibility only).  Missing subfields are
-assumed to be@w{ }0.  The subfields are all decimal integers.  Since
+assumed to be@tie{}0.  The subfields are all decimal integers.  Since
 there is no associated binary format, these values are not required to
 fit into a variable of type @samp{char} as they are in @code{ditroff}.
 The @var{width} subfield gives the width of the glyph.  The @var{height}
@@ -14279,8 +15089,8 @@ sequence of lines of the form:
 
 @noindent
 This means that when glyph @var{c1} appears next to glyph @var{c2}
-the space between them should be increased by@w{ }@var{n}.  Most
-entries in the kernpairs section have a negative value for@w{ }@var{n}.
+the space between them should be increased by@tie{}@var{n}.  Most
+entries in the kernpairs section have a negative value for@tie{}@var{n}.
 
 
 
@@ -14354,7 +15164,7 @@ emits a warning, printing glyph @var{X}.
 The macro package or program a specific register belongs to is appended in
 brackets.
 
-A register name@w{ }@code{x} consisting of exactly one character can be
+A register name@tie{}@code{x} consisting of exactly one character can be
 accessed as @samp{\nx}.  A register name @code{xx} consisting of exactly
 two characters can be accessed as @samp{\n(xx}.  Register names @code{xxx}
 of any length can be accessed as @samp{\n[xxx]}.
@@ -14385,7 +15195,7 @@ They appear without the leading control character (normally @samp{.}).
 The macro package or program a specific string belongs to is appended in
 brackets.
 
-A string name@w{ }@code{x} consisting of exactly one character can be
+A string name@tie{}@code{x} consisting of exactly one character can be
 accessed as @samp{\*x}.  A string name @code{xx} consisting of exactly
 two characters can be accessed as @samp{\*(xx}.  String names @code{xxx}
 of any length can be accessed as @samp{\*[xxx]}.
diff --git a/contrib/groff/doc/pic.ms b/contrib/groff/doc/pic.ms
index 9206526..aa29be3 100644
--- a/contrib/groff/doc/pic.ms
+++ b/contrib/groff/doc/pic.ms
@@ -10,11 +10,17 @@
 .\" This document was written for free use and redistribution by
 .\" Eric S. Raymond <esr@thyrsus.com> in August 1995.
 .\"
-.\"	$Id: pic.ms,v 1.19 2002/09/20 12:14:56 wlemb Exp $	
+.\"	$Id: pic.ms,v 1.23 2003/04/27 00:07:43 wlemb Exp $	
 .\"
-.\" Set a proper TeX
-.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
-.el .ds tx TeX
+.\" Set a proper TeX and LaTeX
+.ie t \{\
+.  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X\"
+.  ds lx L\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\*(tx\"
+.\}
+.el \{\
+.  ds tx TeX\"
+.  ds lx LaTeX\"
+.\}
 .\"
 .de CE\"	Centered caption for figure.  Assumes previous .KS
 .ce 1
@@ -37,6 +43,8 @@ to and reference for \fIgpic\/\fP(1), the implementation distributed by
 the Free Software Foundation for use with \fIgroff\/\fP(1).
 .AE
 .\"%%TUTORIAL%%
+.
+.
 .NH 1
 Introduction to PIC
 .NH 2
@@ -68,6 +76,8 @@ Where differences between Documenter's Work Bench (1991) \fBpic\fP and GNU
 end of this document.
 .PP
 In this document, the \fIgpic\/\fP(1) extensions will be marked as such.
+.
+.
 .NH 1
 Invoking PIC
 .PP
@@ -98,6 +108,8 @@ pic:pic.ms:<nnn>: giving up on this picture
 .LP
 where \[la]nnn\[ra] is a line number, and \[la]token\[ra] is a token near (usually
 just after) the error location.
+.
+.
 .NH 1
 Basic PIC Concepts
 .PP
@@ -293,6 +305,8 @@ surrounded by an invisible box of a size either specified by width
 and height attributes or by the defaults \fBtextwid\fR and
 \fBtextht\fR.  Both are initially zero (because we don't know the
 default font size).
+.
+.
 .NH 1 
 Sizes and Spacing
 .PP
@@ -412,6 +426,8 @@ box; box wid 1 ht 1; box same; box
 .PE
 .CE "5: The \fBsame\fP keyword"
 
+.
+.
 .NH 1
 Generalized Lines and Splines
 .NH 2
@@ -506,6 +522,8 @@ move up 0.2;
 Note the arrow decorations.  Arrowheads can be applied naturally to
 any path-based object, line or spline.  We'll see how in the next
 section.
+.
+.
 .NH 1
 Decorating Objects
 .NH 2
@@ -683,6 +701,8 @@ request (see the manual page of GNU \fItroff\/\fP(1) for more details).
 .PP
 \fBpic\fP assumes that at the beginning of a picture both glyph and fill
 color are set to the default value.
+.
+.
 .NH 1
 More About Text Placement
 .PP
@@ -723,6 +743,8 @@ so that it is aligned in the direction from the start point
 to the end point of the object.
 Note that this attribute will have no effect for objects whose start and
 end points are coincident.
+.
+.
 .NH 1
 More About Direction Changes
 .PP
@@ -808,6 +830,8 @@ object to be joined to the right.
 The meaning of the command \fBmove to last circle .s\fP should be obvious.
 In order to see how it generalizes, we'll need to go into detail on two
 important topics; locations and object names.
+.
+.
 .NH 1
 Naming Objects
 .PP
@@ -894,6 +918,8 @@ Labels are not constants but variables (you can view colon as a sort
 of assignment).  You can say something like \fBA: A + (1,0);\fP
 and the effect will be to reassign the label \fBA\fR to designate a
 position one inch to the right of its old value. 
+.
+.
 .NH 1
 Describing locations
 .PP
@@ -1200,6 +1226,8 @@ If you say \fBline .\|.\|.\& chop \fIr1\fP chop \fIr2\fP\fR with \fIr1\fP
 and \fIr2\fP both numbers, you can vary the amount of chopping at both
 ends.  You can use this in combination with trigonometric functions
 to write code that will deal with more complex intersections.
+.
+.
 .NH 1
 Object Groups
 .PP
@@ -1337,6 +1365,8 @@ The combination of block variable scoping, assignability of labels and
 the macro facility that we'll describe later on can be used to
 simulate functions with local variables (just wrap the macro body in
 block braces).
+.
+.
 .NH 1
 Style Variables
 .PP
@@ -1395,6 +1425,8 @@ You can give it a list of variable names as arguments (optionally
 separated by commas), in which case it resets only those.
 .PP
 State variables retain their values across pictures until reset.
+.
+.
 .NH 1
 Expressions, Variables, and Assignment
 .PP
@@ -1476,6 +1508,8 @@ version.
 .PP
 The function \fBsprintf()\fP behaves like a C \fIsprintf\/\fP(3)
 function that only takes %, %e, %f, and %g format strings.
+.
+.
 .NH 1
 Macros
 .PP
@@ -1614,6 +1648,8 @@ Macros persist through pictures.  To undefine a macro, say \fBundef\fP
 .DE
 .LP
 would undefine the two macros in the jumper block example.
+.
+.
 .NH 1
 Import/Export Commands
 .PP
@@ -1628,7 +1664,7 @@ The statement
 .DE
 .LP
 inserts the contents of \fIfilename\fR in the \fBpic\fP input stream.
-Any \fB.PS\fP/\fB.PE\fP pair in the file will be ignored.  This, you
+Any \fB.PS\fP/\fB.PE\fP pair in the file will be ignored.  You
 can use this to include pre-generated images.
 .PP
 A variant of this statement replicates the \fBcopy thru\fP feature of
@@ -1728,6 +1764,8 @@ inclusion.  The delimiters shown as {} here may also be two copies of
 any one character not present in the shell command text.  In either
 case, the body may contain balanced {} pairs.  Strings in the body
 may contain balanced or unbalanced braces in any case.
+.
+.
 .NH 1
 Control-flow constructs
 .PP
@@ -1828,6 +1866,8 @@ All the usual relational operators my be used in conditional expressions;
 String comparison is also supported using \fB==\fP and \fB!=\fP.  String
 comparisons may need to be parenthesized to avoid syntactic
 ambiguities.
+.
+.
 .NH 1
 Interface To [gt]roff
 .PP
@@ -1933,6 +1973,8 @@ box "@space 0 {H( omega )} over {1 - H( omega )}@"
 arrow
 .PE
 .CE "1: Equations within pictures"
+.
+.
 .NH 1
 Interface to TeX
 .PP
@@ -1942,7 +1984,9 @@ Interface to TeX
 option.
 In \*[tx] mode, pic will define a vbox called
 .B \egraph
-for each picture.
+for each picture; the name can be changed with the pseudo-variable
+.B figname
+(which is actually a specially parsed command).
 You must yourself print that vbox using, for example, the command
 .RS
 .LP
@@ -1950,8 +1994,9 @@ You must yourself print that vbox using, for example, the command
 \ecenterline{\ebox\egraph}
 .RE
 .LP
-Actually, since the vbox has a height of zero this will produce
-slightly more vertical space above the picture than below it;
+Actually, since the vbox has a height of zero (it is defined with \evtop)
+this will produce slightly more vertical space above the picture than
+below it;
 .RS
 .LP
 .CW
@@ -1960,6 +2005,22 @@ slightly more vertical space above the picture than below it;
 .LP
 would avoid this.
 .PP
+To make the vbox having a positive height and a depth of zero (as used
+e.g.\& by \*(lx's \f(CW\%graphics.sty\fP), define the following macro in
+your document:
+.KS
+.DS
+.CW
+\edef\egpicbox#1{%
+  \evbox{\eunvbox\ecsname #1\eendcsname\ekern 0pt}}
+.R
+.DE
+.KE
+.LP
+Now you can simply say
+.B \egpicbox{graph}
+instead of \ebox\egraph.
+.PP
 You must use a \*[tx] driver that supports the
 .B tpic
 specials, version\~2.
@@ -1976,6 +2037,27 @@ Lines beginning with a period are not given any special treatment.
 .PP
 The \*[tx] mode of \fIpic\/\fP(1) will \fInot\fP translate \fBtroff\fP
 font and size changes included in text strings!
+.PP
+Here an example how to use \fBfigname\fP.
+.KS
+.DS
+.CW
+\&.PS
+figname = foo;
+\&...
+\&.PE
+
+\&.PS
+figname = bar;
+\&...
+\&.PE
+
+\ecenterline{\ebox\efoo \ehss \ebox\ebar}
+.DE
+.R
+.KE
+.
+.
 .NH 1
 Obsolete Commands
 .PP
@@ -1997,6 +2079,8 @@ Be very careful that you specify an appropriate format string;
 \fBpic\fP does only very limited checking of the string.
 This is deprecated in favour of
 \fBsprintf\fP.
+.
+.
 .NH 1
 Some Larger Examples
 .PP
@@ -2210,6 +2294,8 @@ arrow from Top.D.end to Anchor.ne
 .CE "2: Hypothetical production flow for dual-mode publishing"
 .LP
 .\"%%REFERENCE%%
+.
+.
 .NH 1
 PIC Reference
 .PP
@@ -2328,6 +2414,7 @@ In the following, either `|' or a new line starts an alternative.
   LABEL : [;] <command> [<position>]
   { <command> ... }
   VARIABLE [:] = <any-expr>
+  figname = MACRONAME
   up | down | left | right
   COMMAND-LINE
   command <print-arg> ...
@@ -2377,6 +2464,13 @@ if {
 .PP
 This restriction doesn't hold for the body after the `do' in a `for'
 construction.
+.PP
+At the beginning of each picture, `figname' is reset to the vbox name
+`graph'; this command has only a meaning in \*[tx] mode.  While the grammar
+rules allow digits and the underscore in the value of `figname', \*[tx]
+normally accepts uppercase and lowercase letters only as box names
+(you have to use `\ecsname' if you really need to circumvent this
+limitation).
 .DS
 .CW
 <any-expr> ::=
@@ -2488,7 +2582,7 @@ box.
 .PP
 A text item consists of a string or sprintf-expression, optionally
 followed by positioning information.  Text (or strings specified with
-`sprintf' may contain [gtn]roff font changes, size changes, and local
+`sprintf') may contain [gtn]roff font changes, size changes, and local
 motions, provided those changes are undone before the end of the current
 item.
 .PP
@@ -2550,8 +2644,8 @@ ways to specify positions:
 .DE
 .DS
 .CW
-<xxx-of> ::=
-  xxx                   \fR# followed by `of'\fP
+<\,\f(CIxxx\/\fP-of> ::=
+  \f(CIxxx\fP                   \fR# followed by `of'\fP
 .R
 .DE
 .DS
@@ -2593,7 +2687,7 @@ The \[lq]'th\[rq] form (which allows you to select a previous object with
 an expression, as opposed to a numeric literal) is not documented in DWB's
 \fIpic\/\fR(1).
 .PP
-The \[la]\|\fIxxx\fP-of\|\[ra] rule is special: The lexical parser checks whether
+The \[la]\,\fIxxx\/\fP-of\|\[ra] rule is special: The lexical parser checks whether
 \fIxxx\fP is followed by the token `of' without eliminating it so that
 the grammar parser can still see `of'.  Valid examples of specifying a
 place with corner and label are thus
@@ -2739,6 +2833,8 @@ The arguments (if any) will be substituted for tokens $1, $2 .\|.\|.\& $n
 appearing in the replacement text.  To undefine a macro, say \fBundef\fP
 \fIname\fR, specifying the name to be undefined.
 .\"%%POSTLUDE%%
+.
+.
 .NH 1
 History and Acknowledgements
 .PP
@@ -2775,6 +2871,8 @@ integrate in descriptions of the GNU \fIgpic\/\fP(1) features.
 The GNU \fBgpic\fR implementation was written by James Clark
 \[la]\,\fIjjc@jclark.com\/\fP\[ra].  It is currently maintained by Werner
 Lemberg \[la]\,\fIwl@gnu.org\/\fP\[ra].
+.
+.
 .NH 1
 Bibliography
 .IP 1.
diff --git a/contrib/groff/doc/texinfo.tex b/contrib/groff/doc/texinfo.tex
index c83af30..e161ac4 100644
--- a/contrib/groff/doc/texinfo.tex
+++ b/contrib/groff/doc/texinfo.tex
@@ -3,10 +3,10 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2002-03-26.08-wl}
+\def\texinfoversion{2003-02-11.06}
 %
-% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-%               2000, 01, 02 Free Software Foundation, Inc.
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 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
@@ -29,19 +29,17 @@
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   ftp://ftp.gnu.org/gnu/texinfo.tex
+%   ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
 %     (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
-%   ftp://texinfo.org/texinfo/texinfo.tex
 %   ftp://tug.org/tex/texinfo.tex
 %     (and all CTAN mirrors, see http://www.ctan.org),
 %   and /home/gd/gnu/doc/texinfo.tex on the GNU machines.
 % 
+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+% 
 % The texinfo.tex in any given Texinfo distribution could well be out
 % of date, so if that's what you're using, please check.
 % 
-% Texinfo has a small home page at http://texinfo.org/ and also
-% http://www.gnu.org/software/texinfo.
-%
 % Send bug reports to bug-texinfo@gnu.org.  Please include including a
 % complete document in each bug report with which we can reproduce the
 % problem.  Patches are, of course, greatly appreciated.
@@ -57,9 +55,10 @@
 % The extra TeX runs get the cross-reference information correct.
 % Sometimes one run after texindex suffices, and sometimes you need more
 % than two; texi2dvi does it as many times as necessary.
-%
-% It is possible to adapt texinfo.tex for other languages.  You can get
-% the existing language-specific files from the full Texinfo distribution.
+% 
+% It is possible to adapt texinfo.tex for other languages, to some
+% extent.  You can get the existing language-specific files from the
+% full Texinfo distribution.
 
 \message{Loading texinfo [version \texinfoversion]:}
 
@@ -69,6 +68,13 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
+\message{Basics,}
+\chardef\other=12
+
+% We never want plain's outer \+ definition in Texinfo.
+% For @tex, we can use \tabalign.
+\let\+ = \relax
+
 % Save some parts of plain tex whose names we will redefine.
 \let\ptexb=\b
 \let\ptexbullet=\bullet
@@ -79,19 +85,16 @@
 \let\ptexend=\end
 \let\ptexequiv=\equiv
 \let\ptexexclam=\!
+\let\ptexgtr=>
+\let\ptexhat=^
 \let\ptexi=\i
 \let\ptexlbrace=\{
+\let\ptexless=<
+\let\ptexplus=+
 \let\ptexrbrace=\}
 \let\ptexstar=\*
 \let\ptext=\t
 
-% We never want plain's outer \+ definition in Texinfo.
-% For @tex, we can use \tabalign.
-\let\+ = \relax
-
-\message{Basics,}
-\chardef\other=12
-
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
 \newlinechar = `^^J
@@ -138,40 +141,64 @@
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 \ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
 
+% In some macros, we cannot use the `\? notation---the left quote is
+% in some cases the escape char.
+\chardef\colonChar = `\:
+\chardef\commaChar = `\,
+\chardef\dotChar   = `\.
+\chardef\equalChar = `\=
+\chardef\exclamChar= `\!
+\chardef\questChar = `\?
+\chardef\semiChar  = `\;
+\chardef\spaceChar = `\ %
+\chardef\underChar = `\_
+
 % Ignore a token.
 %
 \def\gobble#1{}
 
+% True if #1 is the empty string, i.e., called like `\ifempty{}'.
+%
+\def\ifempty#1{\ifemptyx #1\emptymarkA\emptymarkB}%
+\def\ifemptyx#1#2\emptymarkB{\ifx #1\emptymarkA}%
+
+% Hyphenation fixes.
 \hyphenation{ap-pen-dix}
 \hyphenation{mini-buf-fer mini-buf-fers}
 \hyphenation{eshell}
 \hyphenation{white-space}
 
 % Margin to add to right of even pages, to left of odd pages.
-\newdimen \bindingoffset
-\newdimen \normaloffset
+\newdimen\bindingoffset
+\newdimen\normaloffset
 \newdimen\pagewidth \newdimen\pageheight
 
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
-% since that produces some useless output on the terminal.
+% since that produces some useless output on the terminal.  We also make
+% some effort to order the tracing commands to reduce output in the log
+% file; cf. trace.sty in LaTeX.
 %
 \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
-\ifx\eTeXversion\undefined
-\def\loggingall{\tracingcommands2 \tracingstats2
-   \tracingpages1 \tracingoutput1 \tracinglostchars1
-   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
-   \showboxbreadth\maxdimen\showboxdepth\maxdimen
-}%
-\else
-\def\loggingall{\tracingcommands3 \tracingstats2
-   \tracingpages1 \tracingoutput1 \tracinglostchars1
-   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
-   \tracingscantokens1 \tracingassigns1 \tracingifs1
-   \tracinggroups1 \tracingnesting2
-   \showboxbreadth\maxdimen\showboxdepth\maxdimen
+\def\loggingall{%
+  \tracingstats2
+  \tracingpages1
+  \tracinglostchars2  % 2 gives us more in etex
+  \tracingparagraphs1
+  \tracingoutput1
+  \tracingmacros2
+  \tracingrestores1
+  \showboxbreadth\maxdimen \showboxdepth\maxdimen
+  \ifx\eTeXversion\undefined\else % etex gives us more logging
+    \tracingscantokens1
+    \tracingifs1
+    \tracinggroups1
+    \tracingnesting2
+    \tracingassigns1
+  \fi
+  \tracingcommands3  % 3 gives us more in etex
+  \errorcontextlines\maxdimen
 }%
-\fi
 
 % add check for \lastpenalty to plain's definitions.  If the last thing
 % we did was a \nobreak, we don't want to insert more space.
@@ -276,7 +303,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \turnoffactive
+  }% end of group with \normalturnoffactive
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -436,17 +463,6 @@
 }
 
 
-% Single-spacing is done by various environments (specifically, in
-% \nonfillstart and \quotations).
-\newskip\singlespaceskip \singlespaceskip = 12.5pt
-\def\singlespace{%
-  % Why was this kern here?  It messes up equalizing space above and below
-  % environments.  --karl, 6may93
-  %{\advance \baselineskip by -\singlespaceskip
-  %\kern \baselineskip}%
-  \setleading\singlespaceskip
-}
-
 %% Simple single-character @ commands
 
 % @@ prints an @
@@ -466,16 +482,19 @@
 \let\{=\mylbrace
 \let\}=\myrbrace
 \begingroup
-  % Definitions to produce actual \{ & \} command in an index.
-  \catcode`\{ = 12 \catcode`\} = 12
+  % Definitions to produce \{ and \} commands for indices,
+  % and @{ and @} for the aux file.
+  \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
-  \catcode`\@ = 0 \catcode`\\ = 12
-  @gdef@lbracecmd[\{]%
-  @gdef@rbracecmd[\}]%
-@endgroup
+  \catcode`\! = 0 \catcode`\\ = \other
+  !gdef!lbracecmd[\{]%
+  !gdef!rbracecmd[\}]%
+  !gdef!lbraceatcmd[@{]%
+  !gdef!rbraceatcmd[@}]%
+!endgroup
 
 % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @v @H.
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
 \let\, = \c
 \let\dotaccent = \.
 \def\ringaccent#1{{\accent23 #1}}
@@ -484,7 +503,7 @@
 \let\udotaccent = \d
 
 % Other special characters: @questiondown @exclamdown
-% Plain TeX defines: @AA @AE @O @OE @L (and lowercase versions) @ss.
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
 \def\questiondown{?`}
 \def\exclamdown{!`}
 
@@ -539,6 +558,16 @@
 % therefore, no glue is inserted, and the space between the headline and
 % the text is small, which looks bad.
 %
+% Another complication is that the group might be very large.  This can
+% cause the glue on the previous page to be unduly stretched, because it
+% does not have much material.  In this case, it's better to add an
+% explicit \vfill so that the extra space is at the bottom.  The
+% threshold for doing this is if the group is more than \vfilllimit
+% percent of a page (\vfilllimit can be changed inside of @tex).
+% 
+\newbox\groupbox
+\def\vfilllimit{0.7}
+%
 \def\group{\begingroup
   \ifnum\catcode13=\active \else
     \errhelp = \groupinvalidhelp
@@ -552,10 +581,22 @@
   % above.  But it's pretty close.
   \def\Egroup{%
     \egroup           % End the \vtop.
+    % \dimen0 is the vertical size of the group's box.
+    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
+    % \dimen2 is how much space is left on the page (more or less).
+    \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
+    % if the group doesn't fit on the current page, and it's a big big
+    % group, force a page break.
+    \ifdim \dimen0 > \dimen2
+      \ifdim \pagetotal < \vfilllimit\pageheight
+        \page
+      \fi
+    \fi
+    \copy\groupbox
     \endgroup         % End the \group.
   }%
   %
-  \vtop\bgroup
+  \setbox\groupbox = \vtop\bgroup
     % We have to put a strut on the last line in case the @group is in
     % the midst of an example, rather than completely enclosing it.
     % Otherwise, the interline space between the last line of the group
@@ -680,8 +721,7 @@ where each line of input produces a line of output.}
   \spacefactor=3000
 }
 
-
-% @page    forces the start of a new page
+% @page forces the start of a new page.
 %
 \def\page{\par\vfill\supereject}
 
@@ -753,30 +793,36 @@ where each line of input produces a line of output.}
 % @include file    insert text of that file as input.
 % Allow normal characters that  we make active in the argument (a file name).
 \def\include{\begingroup
-  \catcode`\\=12
-  \catcode`~=12
-  \catcode`^=12
-  \catcode`_=12
-  \catcode`|=12
-  \catcode`<=12
-  \catcode`>=12
-  \catcode`+=12
+  \catcode`\\=\other
+  \catcode`~=\other
+  \catcode`^=\other
+  \catcode`_=\other
+  \catcode`|=\other
+  \catcode`<=\other
+  \catcode`>=\other
+  \catcode`+=\other
   \parsearg\includezzz}
 % Restore active chars for included file.
 \def\includezzz#1{\endgroup\begingroup
   % Read the included file in a group so nested @include's work.
   \def\thisfile{#1}%
+  \let\value=\expandablevalue
   \input\thisfile
 \endgroup}
 
 \def\thisfile{}
 
-% @center line   outputs that line, centered
-
-\def\center{\parsearg\centerzzz}
-\def\centerzzz #1{{\advance\hsize by -\leftskip
-\advance\hsize by -\rightskip
-\centerline{#1}}}
+% @center line
+% outputs that line, centered.
+%
+\def\center{\parsearg\docenter}
+\def\docenter#1{{%
+  \ifhmode \hfil\break \fi
+  \advance\hsize by -\leftskip
+  \advance\hsize by -\rightskip
+  \line{\hfil \ignorespaces#1\unskip \hfil}%
+  \ifhmode \break \fi
+}}
 
 % @sp n   outputs n lines of vertical space
 
@@ -841,11 +887,6 @@ where each line of input produces a line of output.}
 % to set catcodes according to plain TeX first, to allow for subscripts,
 % superscripts, special math chars, etc.
 % 
-% @math does not do math typesetting in section titles, index
-% entries, and other such contexts where the catcodes are set before
-% @math gets a chance to work.  This could perhaps be fixed, but for now
-% at least we can have real math in the main text, where it's needed most.
-%
 \let\implicitmath = $%$ font-lock fix
 %
 % One complication: _ usually means subscripts, but it could also mean
@@ -853,9 +894,9 @@ where each line of input produces a line of output.}
 % _ within @math be active (mathcode "8000), and distinguish by seeing
 % if the current family is \slfam, which is what @var uses.
 % 
-{\catcode95 = \active  % 95 = _
+{\catcode\underChar = \active
 \gdef\mathunderscore{%
-  \catcode95=\active
+  \catcode\underChar=\active
   \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
 }}
 %
@@ -871,9 +912,27 @@ where each line of input produces a line of output.}
   \tex
   \mathcode`\_="8000 \mathunderscore
   \let\\ = \mathbackslash
+  \mathactive
   \implicitmath\finishmath}
 \def\finishmath#1{#1\implicitmath\Etex}
 
+% 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 set the catcodes (such as @item or @section).
+% 
+{
+  \catcode`^ = \active
+  \catcode`< = \active
+  \catcode`> = \active
+  \catcode`+ = \active
+  \gdef\mathactive{%
+    \let^ = \ptexhat
+    \let< = \ptexless
+    \let> = \ptexgtr
+    \let+ = \ptexplus
+  }
+}
+
 % @bullet and @minus need the same treatment as @math, just above.
 \def\bullet{\implicitmath\ptexbullet\implicitmath}
 \def\minus{\implicitmath-\implicitmath}
@@ -965,7 +1024,7 @@ where each line of input produces a line of output.}
       \ifx\empty\imagewidth\else width \imagewidth \fi
       \ifx\empty\imageheight\else height \imageheight \fi
       \ifnum\pdftexversion<13
-	 #1.pdf%
+         #1.pdf%
        \else
          {#1.pdf}%
        \fi
@@ -987,40 +1046,39 @@ where each line of input produces a line of output.}
     \openin 1 \jobname.toc
     \ifeof 1\else\begingroup
       \closein 1 
-      \indexnofonts
-      \def\tt{}
-      \let\_ = \normalunderscore
       % Thanh's hack / proper braces in bookmarks  
       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
       \def\chapentry ##1##2##3{}
-      \let\appendixentry = \chapentry
-      \def\unnumbchapentry ##1##2{}
       \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
-      \def\unnumbsecentry ##1##2##3{\advancenumber{chap##2}}
       \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
-      \def\unnumbsubsecentry ##1##2##3##4{\advancenumber{sec##2.##3}}
       \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
-      \def\unnumbsubsubsecentry ##1##2##3##4##5{\advancenumber{subsec##2.##3.##4}}
+      \let\appendixentry = \chapentry
+      \let\unnumbchapentry = \chapentry
+      \let\unnumbsecentry = \secentry
+      \let\unnumbsubsecentry = \subsecentry
+      \let\unnumbsubsubsecentry = \subsubsecentry
       \input \jobname.toc
       \def\chapentry ##1##2##3{%
         \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
-      \let\appendixentry = \chapentry
-      \def\unnumbchapentry ##1##2{%
-        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \def\secentry ##1##2##3##4{%
         \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
-      \def\unnumbsecentry ##1##2##3{%
-        \pdfoutline goto name{\pdfmkpgn{##3}}{##1}}
       \def\subsecentry ##1##2##3##4##5{%
         \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
-      \def\unnumbsubsecentry ##1##2##3##4{%
-        \pdfoutline goto name{\pdfmkpgn{##4}}{##1}}
       \def\subsubsecentry ##1##2##3##4##5##6{%
         \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
-      \def\unnumbsubsubsecentry ##1##2##3##4##5{%
-        \pdfoutline goto name{\pdfmkpgn{##5}}{##1}}
+      \let\appendixentry = \chapentry
+      \let\unnumbchapentry = \chapentry
+      \let\unnumbsecentry = \secentry
+      \let\unnumbsubsecentry = \subsecentry
+      \let\unnumbsubsubsecentry = \subsubsecentry
+      %
+      % Make special characters normal for writing to the pdf file.
+      % 
+      \indexnofonts
+      \let\tt=\relax
+      \turnoffactive
       \input \jobname.toc
     \endgroup\fi
   }}
@@ -1170,7 +1228,7 @@ where each line of input produces a line of output.}
 \newcount\mainmagstep
 \ifx\bigger\relax
   % not really supported.
-  \let\mainmagstep=\magstep1
+  \mainmagstep=\magstep1
   \setfont\textrm\rmshape{12}{1000}
   \setfont\texttt\ttshape{12}{1000}
 \else
@@ -1178,9 +1236,10 @@ where each line of input produces a line of output.}
   \setfont\textrm\rmshape{10}{\mainmagstep}
   \setfont\texttt\ttshape{10}{\mainmagstep}
 \fi
-% Instead of cmb10, you many want to use cmbx10.
+% Instead of cmb10, you may want to use cmbx10.
 % cmbx10 is a prettier font on its own, but cmb10
-% looks better when embedded in a line with cmr10.
+% looks better when embedded in a line with cmr10
+% (in Bob's opinion).
 \setfont\textbf\bfshape{10}{\mainmagstep}
 \setfont\textit\itshape{10}{\mainmagstep}
 \setfont\textsl\slshape{10}{\mainmagstep}
@@ -1329,7 +1388,25 @@ where each line of input produces a line of output.}
   \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
   \let\tenttsl=\smallerttsl
   \resetmathfonts \setleading{9.5pt}}
-\let\smallexamplefonts = \smallerfonts
+
+% Set the fonts to use with the @small... environments.
+\let\smallexamplefonts = \smallfonts
+
+% About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
+% can fit this many characters:
+%   8.5x11=86   smallbook=72  a4=90  a5=69
+% If we use \smallerfonts (8pt), then we can fit this many characters:
+%   8.5x11=90+  smallbook=80  a4=90+  a5=77
+% For me, subjectively, the few extra characters that fit aren't worth
+% the additional smallness of 8pt.  So I'm making the default 9pt.
+% 
+% By the way, for comparison, here's what fits with @example (10pt):
+%   8.5x11=71  smallbook=60  a4=75  a5=58
+% 
+% I wish we used A4 paper on this side of the Atlantic.
+% 
+% --karl, 24jan03.
+
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
@@ -1354,8 +1431,8 @@ where each line of input produces a line of output.}
 % \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\/\fi\fi\fi}
-\def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx}
+\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
+\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
 
 \let\i=\smartitalic
 \let\var=\smartslanted
@@ -1373,6 +1450,17 @@ where each line of input produces a line of output.}
 \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
 \def\restorehyphenation{\hyphenchar\font = `- }
 
+% Set sfcode to normal for the chars that usually have another value.
+% Can't use plain's \frenchspacing because it uses the `\x notation, and
+% sometimes \x has an active definition that messes things up.
+% 
+\catcode`@=11
+  \def\frenchspacing{%
+    \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
+    \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+  }
+\catcode`@=\other
+
 \def\t#1{%
   {\tt \rawbackslash \frenchspacing #1}%
   \null
@@ -1472,15 +1560,17 @@ where each line of input produces a line of output.}
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
   \else\ifx\arg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @kbdinputstyle `\arg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
 \def\wordexample{example}
 \def\wordcode{code}
 
-% Default is kbdinputdistinct.  (Too much of a hassle to call the macro,
-% the catcodes are wrong for parsearg to work.)
-\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}
+% Default is `distinct.'
+\kbdinputstyle distinct
 
 \def\xkey{\key}
 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
@@ -1568,6 +1658,16 @@ where each line of input produces a line of output.}
 % @pounds{} is a sterling sign.
 \def\pounds{{\it\$}}
 
+% @registeredsymbol - R in a circle.  For now, only works in text size;
+% we'd have to redo the font mechanism to change the \scriptstyle and
+% \scriptscriptstyle font sizes to make it look right in headings.
+% Adapted from the plain.tex definition of \copyright.
+% 
+\def\registeredsymbol{%
+  $^{{\ooalign{\hfil\raise.07ex\hbox{$\scriptstyle\rm R$}\hfil\crcr\Orb}}%
+    }$%
+}
+
 
 \message{page headings,}
 
@@ -1876,10 +1976,18 @@ where each line of input produces a line of output.}
     % \parskip glue -- logically it's part of the @item we just started.
     \nobreak \vskip-\parskip
     %
-    % Stop a page break at the \parskip glue coming up.  Unfortunately
+    % Stop a page break at the \parskip glue coming up.  (Unfortunately
     % we can't prevent a possible page break at the following
-    % \baselineskip glue.
-    \nobreak
+    % \baselineskip glue.)  However, if what follows is an environment
+    % such as @example, there will be no \parskip glue; then
+    % the negative vskip we just would 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.
+    % (Possibly there are other commands that could be followed by
+    % @example which need the same treatment, but not section titles; or
+    % maybe section titles are the only special case and they should be
+    % penalty 10001...)
+    \penalty 10001
     \endgroup
     \itemxneedsnegativevskipfalse
   \else
@@ -1985,11 +2093,6 @@ where each line of input produces a line of output.}
 \def\itemcontents{#1}%
 \let\item=\itemizeitem}
 
-% Set sfcode to normal for the chars that usually have another value.
-% These are `.?!:;,'
-\def\frenchspacing{\sfcode46=1000 \sfcode63=1000 \sfcode33=1000
-  \sfcode58=1000 \sfcode59=1000 \sfcode44=1000 }
-
 % \splitoff TOKENS\endmark defines \first to be the first token in
 % TOKENS, and \rest to be the remainder.
 %
@@ -2211,8 +2314,8 @@ where each line of input produces a line of output.}
          \let\go\pickupwholefraction
       \else
          \global\advance\colcount by 1
-         \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator;
-                            % typically that is always in the input, anyway.
+         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
+                   % separator; typically that is always in the input, anyway.
          \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
       \fi
     \fi
@@ -2227,18 +2330,18 @@ where each line of input produces a line of output.}
   \go
 }
 
-% This used to have \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.
-% --karl, nathan@acm.org, 20apr99.
-\def\tab{&}
-
 % @multitable ... @end multitable definitions:
 %
 \def\multitable{\parsearg\dotable}
 \def\dotable#1{\bgroup
   \vskip\parskip
-  \let\item\crcr
+  \let\item=\crcrwithfootnotes
+  % 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.  --karl,
+  % nathan@acm.org, 20apr99.
+  \let\tab=&%
+  \let\startfootins=\startsavedfootnote
   \tolerance=9500
   \hbadness=9500
   \setmultitablespacing
@@ -2246,7 +2349,11 @@ where each line of input produces a line of output.}
   \parindent=\multitableparindent
   \overfullrule=0pt
   \global\colcount=0
-  \def\Emultitable{\global\setpercentfalse\cr\egroup\egroup}%
+  \def\Emultitable{%
+    \global\setpercentfalse
+    \crcrwithfootnotes\crcr
+    \egroup\egroup
+  }%
   %
   % To parse everything between @multitable and @item:
   \setuptable#1 \endsetuptable
@@ -2335,6 +2442,25 @@ width0pt\relax} \fi
                                       %% than skip between lines in the table.
 \fi}
 
+% In case a @footnote appears inside an alignment, save the footnote
+% text to a box and make the \insert when a row of the table is
+% finished.  Otherwise, the insertion is lost, it never migrates to the
+% main vertical list.  --kasal, 22jan03.
+%
+\newbox\savedfootnotes
+%
+% \dotable \let's \startfootins to this, so that \dofootnote will call
+% it instead of starting the insertion right away.
+\def\startsavedfootnote{%
+  \global\setbox\savedfootnotes = \vbox\bgroup
+    \unvbox\savedfootnotes
+}
+\def\crcrwithfootnotes{%
+  \crcr
+  \ifvoid\savedfootnotes \else
+    \noalign{\insert\footins{\box\savedfootnotes}}%
+  \fi
+}
 
 \message{conditionals,}
 % Prevent errors for section commands.
@@ -2370,65 +2496,117 @@ width0pt\relax} \fi
 % and so want to turn off most commands, in case they are used
 % incorrectly.
 %
+% We use \empty instead of \relax for the @def... commands, so that \end
+% doesn't throw an error.  For instance:
+% @ignore
+% @deffn ...
+% @end deffn
+% @end ignore
+% 
+% The @end deffn is going to get expanded, because we're trying to allow
+% nested conditionals.  But we don't want to expand the actual @deffn,
+% since it might be syntactically correct and intended to be ignored.
+% Since \end checks for \relax, using \empty does not cause an error.
+% 
 \def\ignoremorecommands{%
   \let\defcodeindex = \relax
-  \let\defcv = \relax
-  \let\deffn = \relax
-  \let\deffnx = \relax
+  \let\defcv = \empty
+  \let\defcvx = \empty
+  \let\Edefcv = \empty
+  \let\deffn = \empty
+  \let\deffnx = \empty
+  \let\Edeffn = \empty
   \let\defindex = \relax
-  \let\defivar = \relax
-  \let\defmac = \relax
-  \let\defmethod = \relax
-  \let\defop = \relax
-  \let\defopt = \relax
-  \let\defspec = \relax
-  \let\deftp = \relax
-  \let\deftypefn = \relax
-  \let\deftypefun = \relax
-  \let\deftypeivar = \relax
-  \let\deftypeop = \relax
-  \let\deftypevar = \relax
-  \let\deftypevr = \relax
-  \let\defun = \relax
-  \let\defvar = \relax
-  \let\defvr = \relax
-  \let\ref = \relax
-  \let\xref = \relax
-  \let\printindex = \relax
-  \let\pxref = \relax
-  \let\settitle = \relax
-  \let\setchapternewpage = \relax
-  \let\setchapterstyle = \relax
-  \let\everyheading = \relax
+  \let\defivar = \empty
+  \let\defivarx = \empty
+  \let\Edefivar = \empty
+  \let\defmac = \empty
+  \let\defmacx = \empty
+  \let\Edefmac = \empty
+  \let\defmethod = \empty
+  \let\defmethodx = \empty
+  \let\Edefmethod = \empty
+  \let\defop = \empty
+  \let\defopx = \empty
+  \let\Edefop = \empty
+  \let\defopt = \empty
+  \let\defoptx = \empty
+  \let\Edefopt = \empty
+  \let\defspec = \empty
+  \let\defspecx = \empty
+  \let\Edefspec = \empty
+  \let\deftp = \empty
+  \let\deftpx = \empty
+  \let\Edeftp = \empty
+  \let\deftypefn = \empty
+  \let\deftypefnx = \empty
+  \let\Edeftypefn = \empty
+  \let\deftypefun = \empty
+  \let\deftypefunx = \empty
+  \let\Edeftypefun = \empty
+  \let\deftypeivar = \empty
+  \let\deftypeivarx = \empty
+  \let\Edeftypeivar = \empty
+  \let\deftypemethod = \empty
+  \let\deftypemethodx = \empty
+  \let\Edeftypemethod = \empty
+  \let\deftypeop = \empty
+  \let\deftypeopx = \empty
+  \let\Edeftypeop = \empty
+  \let\deftypevar = \empty
+  \let\deftypevarx = \empty
+  \let\Edeftypevar = \empty
+  \let\deftypevr = \empty
+  \let\deftypevrx = \empty
+  \let\Edeftypevr = \empty
+  \let\defun = \empty
+  \let\defunx = \empty
+  \let\Edefun = \empty
+  \let\defvar = \empty
+  \let\defvarx = \empty
+  \let\Edefvar = \empty
+  \let\defvr = \empty
+  \let\defvrx = \empty
+  \let\Edefvr = \empty
+  \let\clear = \relax
+  \let\down = \relax
+  \let\evenfooting = \relax
   \let\evenheading = \relax
-  \let\oddheading = \relax
   \let\everyfooting = \relax
-  \let\evenfooting = \relax
-  \let\oddfooting = \relax
+  \let\everyheading = \relax
   \let\headings = \relax
   \let\include = \relax
+  \let\item = \relax
   \let\lowersections = \relax
-  \let\down = \relax
+  \let\oddfooting = \relax
+  \let\oddheading = \relax
+  \let\printindex = \relax
+  \let\pxref = \relax
   \let\raisesections = \relax
-  \let\up = \relax
+  \let\ref = \relax
   \let\set = \relax
-  \let\clear = \relax
-  \let\item = \relax
+  \let\setchapternewpage = \relax
+  \let\setchapterstyle = \relax
+  \let\settitle = \relax
+  \let\up = \relax
+  \let\verbatiminclude = \relax
+  \let\xref = \relax
 }
 
-% Ignore @ignore, @ifhtml, @ifinfo, @ifplaintext, @ifnottex, @html, @menu,
-% @direntry, and @documentdescription.
+% Ignore @ignore, @ifhtml, @ifinfo, and the like.
 %
-\def\ignore{\doignore{ignore}}
+\def\direntry{\doignore{direntry}}
+\def\documentdescriptionword{documentdescription}
+\def\documentdescription{\doignore{documentdescription}}
+\def\html{\doignore{html}}
 \def\ifhtml{\doignore{ifhtml}}
 \def\ifinfo{\doignore{ifinfo}}
-\def\ifplaintext{\doignore{ifplaintext}}
 \def\ifnottex{\doignore{ifnottex}}
-\def\html{\doignore{html}}
+\def\ifplaintext{\doignore{ifplaintext}}
+\def\ifxml{\doignore{ifxml}}
+\def\ignore{\doignore{ignore}}
 \def\menu{\doignore{menu}}
-\def\direntry{\doignore{direntry}}
-\def\documentdescription{\doignore{documentdescription}}
-\def\documentdescriptionword{documentdescription}
+\def\xml{\doignore{xml}}
 
 % @dircategory CATEGORY  -- specify a category of the dir file
 % which this file should belong to.  Ignore this in TeX.
@@ -2446,7 +2624,7 @@ width0pt\relax} \fi
   \long\def\doignoretext##1@end #1{\enddoignore}%
   %
   % Make sure that spaces turn into tokens that match what \doignoretext wants.
-  \catcode32 = 10
+  \catcode\spaceChar = 10
   %
   % Ignore braces, too, so mismatched braces don't cause trouble.
   \catcode`\{ = 9
@@ -2488,7 +2666,7 @@ width0pt\relax} \fi
     \immediate\write16{If you are running another version of TeX, relax.}
     \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
     \immediate\write16{  Then upgrade your TeX installation if you can.}
-    \immediate\write16{  (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)}
+    \immediate\write16{  (See ftp://ftp.gnu.org/non-gnu/TeX.README.)}
     \immediate\write16{If you are stuck with version 3.0, run the}
     \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
     \immediate\write16{  to use a workaround.}
@@ -2510,8 +2688,8 @@ width0pt\relax} \fi
   % We must actually expand the ignored text to look for the @end
   % command, so that nested ignore constructs work.  Thus, we put the
   % text into a \vbox and then do nothing with the result.  To minimize
-  % the change of memory overflow, we follow the approach outlined on
-  % page 401 of the TeXbook: make the current font be a dummy font.
+  % the chance of memory overflow, we follow the approach outlined on
+  % page 401 of the TeXbook.
   %
   \setbox0 = \vbox\bgroup
     % Don't complain about control sequences we have declared \outer.
@@ -2532,8 +2710,8 @@ width0pt\relax} \fi
     %
     % Set the current font to be \nullfont, a TeX primitive, and define
     % all the font commands to also use \nullfont.  We don't use
-    % dummy.tfm, as suggested in the TeXbook, because not all sites
-    % might have that installed.  Therefore, math mode will still
+    % dummy.tfm, as suggested in the TeXbook, because some sites
+    % might not have that installed.  Therefore, math mode will still
     % produce output, but that should be an extremely small amount of
     % stuff compared to the main input.
     %
@@ -2562,7 +2740,7 @@ width0pt\relax} \fi
     % Do minimal line-breaking.
     \pretolerance = 10000
     %
-    % Do not execute instructions in @tex
+    % Do not execute instructions in @tex.
     \def\tex{\doignore{tex}}%
     % Do not execute macro definitions.
     % `c' is a comment character, so the word `macro' will get cut off.
@@ -2607,7 +2785,7 @@ width0pt\relax} \fi
   % we're called from @code, as @code{@value{foo-bar_}}.  So \let any
   % such active characters to their normal equivalents.
   \gdef\value{\begingroup
-    \catcode`\-=12 \catcode`\_=12
+    \catcode`\-=\other \catcode`\_=\other
     \indexbreaks \let_\normalunderscore
     \valuexxx}
 }
@@ -2616,15 +2794,17 @@ width0pt\relax} \fi
 % We have this subroutine so that we can handle at least some @value's
 % properly in indexes (we \let\value to this in \indexdummies).  Ones
 % whose names contain - or _ still won't work, but we can't do anything
-% about that.  The command has to be fully expandable, since the result
-% winds up in the index file.  This means that if the variable's value
-% contains other Texinfo commands, it's almost certain it will fail
-% (although perhaps we could fix that with sufficient work to do a
-% one-level expansion on the result, instead of complete).
+% about that.  The command has to be fully expandable (if the variable
+% is set), since the result winds up in the index file.  This means that
+% if the variable's value contains other Texinfo commands, it's almost
+% certain it will fail (although perhaps we could fix that with
+% sufficient work to do a one-level expansion on the result, instead of
+% complete).
 %
 \def\expandablevalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
     {[No value for ``#1'']}%
+    \message{Variable `#1', used in @value, is not set.}%
   \else
     \csname SET#1\endcsname
   \fi
@@ -2633,13 +2813,14 @@ width0pt\relax} \fi
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 %
-\def\ifset{\parsearg\ifsetxxx}
-\def\ifsetxxx #1{%
+\def\ifset{\parsearg\doifset}
+\def\doifset#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
-    \expandafter\ifsetfail
+    \let\next=\ifsetfail
   \else
-    \expandafter\ifsetsucceed
+    \let\next=\ifsetsucceed
   \fi
+  \next
 }
 \def\ifsetsucceed{\conditionalsucceed{ifset}}
 \def\ifsetfail{\nestedignore{ifset}}
@@ -2648,13 +2829,14 @@ width0pt\relax} \fi
 % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
-\def\ifclear{\parsearg\ifclearxxx}
-\def\ifclearxxx #1{%
+\def\ifclear{\parsearg\doifclear}
+\def\doifclear#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
-    \expandafter\ifclearsucceed
+    \let\next=\ifclearsucceed
   \else
-    \expandafter\ifclearfail
+    \let\next=\ifclearfail
   \fi
+  \next
 }
 \def\ifclearsucceed{\conditionalsucceed{ifclear}}
 \def\ifclearfail{\nestedignore{ifclear}}
@@ -2673,28 +2855,13 @@ width0pt\relax} \fi
 \defineunmatchedend{ifnotinfo}
 \defineunmatchedend{ifnotplaintext}
 
-% We can't just want to start a group at @iftex (etc.) and end it at
-% @end iftex, since then @set commands inside the conditional have no
-% effect (they'd get reverted at the end of the group).  So we must
-% define \Eiftex to redefine itself to be its previous value.  (We can't
-% just define it to fail again with an ``unmatched end'' error, since
-% the @ifset might be nested.)
-%
-\def\conditionalsucceed#1{%
-  \edef\temp{%
-    % Remember the current value of \E#1.
-    \let\nece{prevE#1} = \nece{E#1}%
-    %
-    % At the `@end #1', redefine \E#1 to be its previous value.
-    \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
-  }%
-  \temp
-}
-
-% We need to expand lots of \csname's, but we don't want to expand the
-% control sequences after we've constructed them.
+% True conditional.  Since \set globally defines its variables, we can
+% just start and end a group (to keep the @end definition undefined at
+% the outer level).
 %
-\def\nece#1{\expandafter\noexpand\csname#1\endcsname}
+\def\conditionalsucceed#1{\begingroup
+  \expandafter\def\csname E#1\endcsname{\endgroup}%
+}
 
 % @defininfoenclose.
 \let\definfoenclose=\comment
@@ -2787,104 +2954,166 @@ width0pt\relax} \fi
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
 \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
 
-% Take care of texinfo commands likely to appear in an index entry.
-% (Must be a way to avoid doing expansion at all, and thus not have to
-% laboriously list every single command here.)
+% Take care of Texinfo commands that can appear in an index entry.
+% Since there are some commands we want to expand, and others we don't,
+% we have to laboriously prevent expansion for those that we don't.
 % 
 \def\indexdummies{%
-\def\ { }%
-\def\@{@}% change to @@ when we switch to @ as escape char in aux files.
-% 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
-\def\_{{\realbackslash _}}%
-\normalturnoffactive
-%
-% Take care of the plain tex accent commands.
-\def\,##1{\realbackslash ,{##1}}%
-\def\"{\realbackslash "}%
-\def\`{\realbackslash `}%
-\def\'{\realbackslash '}%
-\def\^{\realbackslash ^}%
-\def\~{\realbackslash ~}%
-\def\={\realbackslash =}%
-\def\b{\realbackslash b}%
-\def\c{\realbackslash c}%
-\def\d{\realbackslash d}%
-\def\u{\realbackslash u}%
-\def\v{\realbackslash v}%
-\def\H{\realbackslash H}%
-\def\dotless##1{\realbackslash dotless {##1}}%
-% Take care of the plain tex special European modified letters.
-\def\AA{\realbackslash AA}%
-\def\AE{\realbackslash AE}%
-\def\L{\realbackslash L}%
-\def\OE{\realbackslash OE}%
-\def\O{\realbackslash O}%
-\def\aa{\realbackslash aa}%
-\def\ae{\realbackslash ae}%
-\def\l{\realbackslash l}%
-\def\oe{\realbackslash oe}%
-\def\o{\realbackslash o}%
-\def\ss{\realbackslash ss}%
-%
-% Although these internals commands shouldn't show up, sometimes they do.
-\def\bf{\realbackslash bf }%
-\def\gtr{\realbackslash gtr}%
-\def\hat{\realbackslash hat}%
-\def\less{\realbackslash less}%
-%\def\rm{\realbackslash rm }%
-\def\sf{\realbackslash sf}%
-\def\sl{\realbackslash sl }%
-\def\tclose##1{\realbackslash tclose {##1}}%
-\def\tt{\realbackslash tt}%
-%
-\def\b##1{\realbackslash b {##1}}%
-\def\i##1{\realbackslash i {##1}}%
-\def\sc##1{\realbackslash sc {##1}}%
-\def\t##1{\realbackslash t {##1}}%
-\def\r##1{\realbackslash r {##1}}%
-%
-\def\TeX{\realbackslash TeX}%
-\def\acronym##1{\realbackslash acronym {##1}}%
-\def\cite##1{\realbackslash cite {##1}}%
-\def\code##1{\realbackslash code {##1}}%
-\def\command##1{\realbackslash command {##1}}%
-\def\dfn##1{\realbackslash dfn {##1}}%
-\def\dots{\realbackslash dots }%
-\def\emph##1{\realbackslash emph {##1}}%
-\def\env##1{\realbackslash env {##1}}%
-\def\file##1{\realbackslash file {##1}}%
-\def\kbd##1{\realbackslash kbd {##1}}%
-\def\key##1{\realbackslash key {##1}}%
-\def\math##1{\realbackslash math {##1}}%
-\def\option##1{\realbackslash option {##1}}%
-\def\samp##1{\realbackslash samp {##1}}%
-\def\strong##1{\realbackslash strong {##1}}%
-\def\uref##1{\realbackslash uref {##1}}%
-\def\url##1{\realbackslash url {##1}}%
-\def\var##1{\realbackslash var {##1}}%
-\def\w{\realbackslash w }%
-%
-% These math commands don't seem likely to be used in index entries.
-\def\copyright{\realbackslash copyright}%
-\def\equiv{\realbackslash equiv}%
-\def\error{\realbackslash error}%
-\def\expansion{\realbackslash expansion}%
-\def\point{\realbackslash point}%
-\def\print{\realbackslash print}%
-\def\result{\realbackslash result}%
-%
-% Handle some cases of @value -- where the variable name does not
-% contain - or _, and the value does not contain any
-% (non-fully-expandable) commands.
-\let\value = \expandablevalue
-%
-\unsepspaces
-% Turn off macro expansion
-\turnoffmacros
+  \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
+  %
+  % \definedummyword defines \#1 as \realbackslash #1\space, thus
+  % effectively 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.
+  % 
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
+  % 
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
+  % 
+  \def\definedummyword##1{%
+    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
+  }%
+  \def\definedummyletter##1{%
+    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
+  }%
+  %
+  % Do the redefinitions.
+  \commondummies
+}
+
+% For the aux file, @ is the escape character.  So we want to redefine
+% everything using @ instead of \realbackslash.  When everything uses 
+% @, this will be simpler.
+% 
+\def\atdummies{%
+  \def\@{@@}%
+  \def\ {@ }%
+  \let\{ = \lbraceatcmd
+  \let\} = \rbraceatcmd
+  %
+  % (See comments in \indexdummies.)
+  \def\definedummyword##1{%
+    \expandafter\def\csname ##1\endcsname{@##1\space}%
+  }%
+  \def\definedummyletter##1{%
+    \expandafter\def\csname ##1\endcsname{@##1}%
+  }%
+  %
+  % Do the redefinitions.
+  \commondummies
+}
+
+% Called from \indexdummies and \atdummies.  \definedummyword and
+% \definedummyletter must be defined first.
+% 
+\def\commondummies{%
+  %
+  \normalturnoffactive
+  %
+  % Control letters and accents.
+  \definedummyletter{_}%
+  \definedummyletter{,}%
+  \definedummyletter{"}%
+  \definedummyletter{`}%
+  \definedummyletter{'}%
+  \definedummyletter{^}%
+  \definedummyletter{~}%
+  \definedummyletter{=}%
+  \definedummyword{u}%
+  \definedummyword{v}%
+  \definedummyword{H}%
+  \definedummyword{dotaccent}%
+  \definedummyword{ringaccent}%
+  \definedummyword{tieaccent}%
+  \definedummyword{ubaraccent}%
+  \definedummyword{udotaccent}%
+  \definedummyword{dotless}%
+  %
+  % Other non-English letters.
+  \definedummyword{AA}%
+  \definedummyword{AE}%
+  \definedummyword{L}%
+  \definedummyword{OE}%
+  \definedummyword{O}%
+  \definedummyword{aa}%
+  \definedummyword{ae}%
+  \definedummyword{l}%
+  \definedummyword{oe}%
+  \definedummyword{o}%
+  \definedummyword{ss}%
+  %
+  % Although these internal commands shouldn't show up, sometimes they do.
+  \definedummyword{bf}%
+  \definedummyword{gtr}%
+  \definedummyword{hat}%
+  \definedummyword{less}%
+  \definedummyword{sf}%
+  \definedummyword{sl}%
+  \definedummyword{tclose}%
+  \definedummyword{tt}%
+  %
+  % Texinfo font commands.
+  \definedummyword{b}%
+  \definedummyword{i}%
+  \definedummyword{r}%
+  \definedummyword{sc}%
+  \definedummyword{t}%
+  %
+  \definedummyword{TeX}%
+  \definedummyword{acronym}%
+  \definedummyword{cite}%
+  \definedummyword{code}%
+  \definedummyword{command}%
+  \definedummyword{dfn}%
+  \definedummyword{dots}%
+  \definedummyword{emph}%
+  \definedummyword{env}%
+  \definedummyword{file}%
+  \definedummyword{kbd}%
+  \definedummyword{key}%
+  \definedummyword{math}%
+  \definedummyword{option}%
+  \definedummyword{samp}%
+  \definedummyword{strong}%
+  \definedummyword{uref}%
+  \definedummyword{url}%
+  \definedummyword{var}%
+  \definedummyword{w}%
+  %
+  % Assorted special characters.
+  \definedummyword{bullet}%
+  \definedummyword{copyright}%
+  \definedummyword{dots}%
+  \definedummyword{enddots}%
+  \definedummyword{equiv}%
+  \definedummyword{error}%
+  \definedummyword{expansion}%
+  \definedummyword{minus}%
+  \definedummyword{pounds}%
+  \definedummyword{point}%
+  \definedummyword{print}%
+  \definedummyword{result}%
+  %
+  % Handle some cases of @value -- where the variable name does not
+  % contain - or _, and the value does not contain any
+  % (non-fully-expandable) commands.
+  \let\value = \expandablevalue
+  %
+  % Normal spaces, not active ones.
+  \unsepspaces
+  %
+  % No macro expansion.
+  \turnoffmacros
 }
 
 % If an index command is used in an @example environment, any spaces
@@ -2893,83 +3122,86 @@ width0pt\relax} \fi
 {\obeyspaces
  \gdef\unsepspaces{\obeyspaces\let =\space}}
 
-% \indexnofonts no-ops all font-change commands.
-% This is used when outputting the strings to sort the index by.
-\def\indexdummyfont#1{#1}
+
+% \indexnofonts is used when outputting the strings to sort the index
+% by, and when constructing control sequence names.  It eliminates all
+% control sequences and just writes whatever the best ASCII sort string
+% would be for a given command (usually its argument).
+%
 \def\indexdummytex{TeX}
 \def\indexdummydots{...}
-
+%
 \def\indexnofonts{%
-\def\@{@}%
-% how to handle braces?
-\def\_{\normalunderscore}%
-%
-\let\,=\indexdummyfont
-\let\"=\indexdummyfont
-\let\`=\indexdummyfont
-\let\'=\indexdummyfont
-\let\^=\indexdummyfont
-\let\~=\indexdummyfont
-\let\==\indexdummyfont
-\let\b=\indexdummyfont
-\let\c=\indexdummyfont
-\let\d=\indexdummyfont
-\let\u=\indexdummyfont
-\let\v=\indexdummyfont
-\let\H=\indexdummyfont
-\let\dotless=\indexdummyfont
-% Take care of the plain tex special European modified letters.
-\def\AA{AA}%
-\def\AE{AE}%
-\def\L{L}%
-\def\OE{OE}%
-\def\O{O}%
-\def\aa{aa}%
-\def\ae{ae}%
-\def\l{l}%
-\def\oe{oe}%
-\def\o{o}%
-\def\ss{ss}%
-%
-% Don't no-op \tt, since it isn't a user-level command
-% and is used in the definitions of the active chars like <, >, |, etc.
-% Likewise with the other plain tex font commands.
-%\let\tt=\indexdummyfont
-%
-\let\b=\indexdummyfont
-\let\i=\indexdummyfont
-\let\r=\indexdummyfont
-\let\sc=\indexdummyfont
-\let\t=\indexdummyfont
-%
-\let\TeX=\indexdummytex
-\let\acronym=\indexdummyfont
-\let\cite=\indexdummyfont
-\let\code=\indexdummyfont
-\let\command=\indexdummyfont
-\let\dfn=\indexdummyfont
-\let\dots=\indexdummydots
-\let\emph=\indexdummyfont
-\let\env=\indexdummyfont
-\let\file=\indexdummyfont
-\let\kbd=\indexdummyfont
-\let\key=\indexdummyfont
-\let\math=\indexdummyfont
-\let\option=\indexdummyfont
-\let\samp=\indexdummyfont
-\let\strong=\indexdummyfont
-\let\uref=\indexdummyfont
-\let\url=\indexdummyfont
-\let\var=\indexdummyfont
-\let\w=\indexdummyfont
-}
-
-% To define \realbackslash, we must make \ not be an escape.
-% We must first make another character (@) an escape
-% so we do not become unable to do a definition.
-
-{\catcode`\@=0 \catcode`\\=\other
- @gdef@realbackslash{\}}
+  \def\ { }%
+  \def\@{@}%
+  % how to handle braces?
+  \def\_{\normalunderscore}%
+  %
+  \let\,=\asis
+  \let\"=\asis
+  \let\`=\asis
+  \let\'=\asis
+  \let\^=\asis
+  \let\~=\asis
+  \let\==\asis
+  \let\u=\asis
+  \let\v=\asis
+  \let\H=\asis
+  \let\dotaccent=\asis
+  \let\ringaccent=\asis
+  \let\tieaccent=\asis
+  \let\ubaraccent=\asis
+  \let\udotaccent=\asis
+  \let\dotless=\asis
+  %
+  % Other non-English letters.
+  \def\AA{AA}%
+  \def\AE{AE}%
+  \def\L{L}%
+  \def\OE{OE}%
+  \def\O{O}%
+  \def\aa{aa}%
+  \def\ae{ae}%
+  \def\l{l}%
+  \def\oe{oe}%
+  \def\o{o}%
+  \def\ss{ss}%
+  \def\exclamdown{!}%
+  \def\questiondown{?}%
+  %
+  % Don't no-op \tt, since it isn't a user-level command
+  % and is used in the definitions of the active chars like <, >, |, etc.
+  % Likewise with the other plain tex font commands.
+  %\let\tt=\asis
+  %
+  % Texinfo font commands.
+  \let\b=\asis
+  \let\i=\asis
+  \let\r=\asis
+  \let\sc=\asis
+  \let\t=\asis
+  %
+  \let\TeX=\indexdummytex
+  \let\acronym=\asis
+  \let\cite=\asis
+  \let\code=\asis
+  \let\command=\asis
+  \let\dfn=\asis
+  \let\dots=\indexdummydots
+  \let\emph=\asis
+  \let\env=\asis
+  \let\file=\asis
+  \let\kbd=\asis
+  \let\key=\asis
+  \let\math=\asis
+  \let\option=\asis
+  \let\samp=\asis
+  \let\strong=\asis
+  \let\uref=\asis
+  \let\url=\asis
+  \let\var=\asis
+  \let\w=\asis
+}
 
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
@@ -3001,28 +3233,24 @@ width0pt\relax} \fi
         \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
         % so it will be output as is; and it will print as backslash.
         %
-        \def\thirdarg{#3}%
-        %
-        % If third arg is present, precede it with space in sort key.
-        \ifx\thirdarg\emptymacro
-          \let\subentry = \empty
-        \else
-          \def\subentry{ #3}%
-        \fi
-        %
-        % First process the index entry with all font commands turned
-        % off to get the string to sort by.
-        {\indexnofonts \xdef\indexsorttmp{#2\subentry}}%
-        %
-        % Now the real index entry with the fonts.
+        % The main index entry text.
         \toks0 = {#2}%
         %
-        % If the third (subentry) arg is present, add it to the index
-        % line to write.
+        % If third arg is present, precede it with space in sort key.
+        \def\thirdarg{#3}%
         \ifx\thirdarg\emptymacro \else
-          \toks0 = \expandafter{\the\toks0{#3}}%
+           % If the third (subentry) arg is present, add it to the index
+           % line to write.
+          \toks0 = \expandafter{\the\toks0 \space #3}%
         \fi
         %
+        % Process the index entry with all font commands turned off, to
+        % get the string to sort by.
+        {\indexnofonts
+         \edef\temp{\the\toks0}% need full expansion
+         \xdef\indexsorttmp{\temp}%
+        }%
+        %
         % Set up the complete index entry, with both the sort key and
         % the original text, including any font commands.  We write
         % three arguments to \entry to the .?? file (four in the
@@ -3053,12 +3281,11 @@ width0pt\relax} \fi
         \iflinks
           \ifvmode
             \skip0 = \lastskip
-            \ifdim\lastskip = 0pt \else \nobreak\vskip-\lastskip \fi
+            \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi
           \fi
           %
           \temp % do the write
           %
-          %
           \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
         \fi
       }%
@@ -3534,22 +3761,19 @@ width0pt\relax} \fi
 \outer\def\chapter{\parsearg\chapteryyy}
 \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
 \def\chapterzzz #1{%
-\secno=0 \subsecno=0 \subsubsecno=0
-\global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
-\chapmacro {#1}{\the\chapno}%
-\gdef\thissection{#1}%
-\gdef\thischaptername{#1}%
-% We don't substitute the actual chapter name into \thischapter
-% because we don't want its macros evaluated now.
-\xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
-                                  {\the\chapno}}}%
-\temp
-\donoderef
-\global\let\section = \numberedsec
-\global\let\subsection = \numberedsubsec
-\global\let\subsubsection = \numberedsubsubsec
+  \secno=0 \subsecno=0 \subsubsecno=0
+  \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
+  \chapmacro {#1}{\the\chapno}%
+  \gdef\thissection{#1}%
+  \gdef\thischaptername{#1}%
+  % We don't substitute the actual chapter name into \thischapter
+  % because we don't want its macros evaluated now.
+  \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
+  \writetocentry{chap}{#1}{{\the\chapno}}
+  \donoderef
+  \global\let\section = \numberedsec
+  \global\let\subsection = \numberedsubsec
+  \global\let\subsubsection = \numberedsubsubsec
 }
 
 % we use \chapno to avoid indenting back
@@ -3560,21 +3784,18 @@ width0pt\relax} \fi
 \outer\def\appendix{\parsearg\appendixyyy}
 \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
 \def\appendixzzz #1{%
-\secno=0 \subsecno=0 \subsubsecno=0
-\global\advance \appendixno by 1
-\message{\putwordAppendix\space \appendixletter}%
-\chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}%
-\gdef\thissection{#1}%
-\gdef\thischaptername{#1}%
-\xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash appendixentry{\the\toks0}%
-                       {\appendixletter}}}%
-\temp
-\appendixnoderef
-\global\let\section = \appendixsec
-\global\let\subsection = \appendixsubsec
-\global\let\subsubsection = \appendixsubsubsec
+  \secno=0 \subsecno=0 \subsubsecno=0
+  \global\advance \appendixno by 1
+  \message{\putwordAppendix\space \appendixletter}%
+  \chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}%
+  \gdef\thissection{#1}%
+  \gdef\thischaptername{#1}%
+  \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
+  \writetocentry{appendix}{#1}{{\appendixletter}}
+  \appendixnoderef
+  \global\let\section = \appendixsec
+  \global\let\subsection = \appendixsubsec
+  \global\let\subsubsection = \appendixsubsubsec
 }
 
 % @centerchap is like @unnumbered, but the heading is centered.
@@ -3587,150 +3808,121 @@ width0pt\relax} \fi
 \outer\def\unnumbered{\parsearg\unnumberedyyy}
 \def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
 \def\unnumberedzzz #1{%
-\secno=0 \subsecno=0 \subsubsecno=0
-%
-% This used to be simply \message{#1}, but TeX fully expands the
-% argument to \message.  Therefore, if #1 contained @-commands, TeX
-% expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
-% expanded @cite (which turns out to cause errors because \cite is meant
-% to be executed, not expanded).
-%
-% Anyway, we don't want the fully-expanded definition of @cite to appear
-% as a result of the \message, we just want `@cite' itself.  We use
-% \the<toks register> to achieve this: TeX expands \the<toks> only once,
-% simply yielding the contents of <toks register>.  (We also do this for
-% the toc entries.)
-\toks0 = {#1}\message{(\the\toks0)}%
-%
-\unnumbchapmacro {#1}%
-\gdef\thischapter{#1}\gdef\thissection{#1}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}}}%
-\temp
-\unnumbnoderef
-\global\let\section = \unnumberedsec
-\global\let\subsection = \unnumberedsubsec
-\global\let\subsubsection = \unnumberedsubsubsec
+  \secno=0 \subsecno=0 \subsubsecno=0
+  %
+  % This used to be simply \message{#1}, but TeX fully expands the
+  % argument to \message.  Therefore, if #1 contained @-commands, TeX
+  % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
+  % expanded @cite (which turns out to cause errors because \cite is meant
+  % to be executed, not expanded).
+  %
+  % Anyway, we don't want the fully-expanded definition of @cite to appear
+  % as a result of the \message, we just want `@cite' itself.  We use
+  % \the<toks register> to achieve this: TeX expands \the<toks> only once,
+  % simply yielding the contents of <toks register>.  (We also do this for
+  % the toc entries.)
+  \toks0 = {#1}\message{(\the\toks0)}%
+  %
+  \unnumbchapmacro {#1}%
+  \gdef\thischapter{#1}\gdef\thissection{#1}%
+  \writetocentry{unnumbchap}{#1}{{\the\chapno}}
+  \unnumbnoderef
+  \global\let\section = \unnumberedsec
+  \global\let\subsection = \unnumberedsubsec
+  \global\let\subsubsection = \unnumberedsubsubsec
 }
 
 % Sections.
 \outer\def\numberedsec{\parsearg\secyyy}
 \def\secyyy #1{\numhead1{#1}} % normally calls seczzz
 \def\seczzz #1{%
-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-\gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
-                                  {\the\chapno}{\the\secno}}}%
-\temp
-\donoderef
-\nobreak
+  \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+  \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
+  \writetocentry{sec}{#1}{{\the\chapno}{\the\secno}}
+  \donoderef
+  \nobreak
 }
 
 \outer\def\appendixsection{\parsearg\appendixsecyyy}
 \outer\def\appendixsec{\parsearg\appendixsecyyy}
 \def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
 \def\appendixsectionzzz #1{%
-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-\gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
-                                  {\appendixletter}{\the\secno}}}%
-\temp
-\appendixnoderef
-\nobreak
+  \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+  \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
+  \writetocentry{sec}{#1}{{\appendixletter}{\the\secno}}
+  \appendixnoderef
+  \nobreak
 }
 
 \outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
 \def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
 \def\unnumberedseczzz #1{%
-\plainsecheading {#1}\gdef\thissection{#1}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry%
-  {\the\toks0}{\the\chapno}}}%
-\temp
-\unnumbnoderef
-\nobreak
+  \plainsecheading {#1}\gdef\thissection{#1}%
+  \writetocentry{unnumbsec}{#1}{{\the\chapno}{\the\secno}}
+  \unnumbnoderef
+  \nobreak
 }
 
 % Subsections.
 \outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
 \def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
 \def\numberedsubseczzz #1{%
-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-\subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
-                                    {\the\chapno}{\the\secno}{\the\subsecno}}}%
-\temp
-\donoderef
-\nobreak
+  \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+  \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
+  \writetocentry{subsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
+  \donoderef
+  \nobreak
 }
 
 \outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
 \def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
 \def\appendixsubseczzz #1{%
-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-\subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
-                                {\appendixletter}{\the\secno}{\the\subsecno}}}%
-\temp
-\appendixnoderef
-\nobreak
+  \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+  \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
+  \writetocentry{subsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}}
+  \appendixnoderef
+  \nobreak
 }
 
 \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
 \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
 \def\unnumberedsubseczzz #1{%
-\plainsubsecheading {#1}\gdef\thissection{#1}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsecentry%
-  {\the\toks0}{\the\chapno}{\the\secno}}}%
-\temp
-\unnumbnoderef
-\nobreak
+  \plainsubsecheading {#1}\gdef\thissection{#1}%
+  \writetocentry{unnumbsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
+  \unnumbnoderef
+  \nobreak
 }
 
 % Subsubsections.
 \outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
 \def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
 \def\numberedsubsubseczzz #1{%
-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-\subsubsecheading {#1}
-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
-\temp
-\donoderef
-\nobreak
+  \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+  \subsubsecheading {#1}
+    {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+  \writetocentry{subsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+  \donoderef
+  \nobreak
 }
 
 \outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
 \def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
 \def\appendixsubsubseczzz #1{%
-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-\subsubsecheading {#1}
-  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
-  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
-\temp
-\appendixnoderef
-\nobreak
+  \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+  \subsubsecheading {#1}
+    {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+  \writetocentry{subsubsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+  \appendixnoderef
+  \nobreak
 }
 
 \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
 \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
 \def\unnumberedsubsubseczzz #1{%
-\plainsubsubsecheading {#1}\gdef\thissection{#1}%
-\toks0 = {#1}%
-\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsubsecentry%
-  {\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}}}%
-\temp
-\unnumbnoderef
-\nobreak
+  \plainsubsubsecheading {#1}\gdef\thissection{#1}%
+  \writetocentry{unnumbsubsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+  \unnumbnoderef
+  \nobreak
 }
 
 % These are variants which are not "outer", so they can appear in @ifinfo.
@@ -3771,16 +3963,16 @@ width0pt\relax} \fi
 
 \def\majorheading{\parsearg\majorheadingzzz}
 \def\majorheadingzzz #1{%
-{\advance\chapheadingskip by 10pt \chapbreak }%
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 200}
+  {\advance\chapheadingskip by 10pt \chapbreak }%
+  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                    \parindent=0pt\raggedright
+                    \rm #1\hfill}}\bigskip \par\penalty 200}
 
 \def\chapheading{\parsearg\chapheadingzzz}
 \def\chapheadingzzz #1{\chapbreak %
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 200}
+  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                    \parindent=0pt\raggedright
+                    \rm #1\hfill}}\bigskip \par\penalty 200}
 
 % @heading, @subheading, @subsubheading.
 \def\heading{\parsearg\plainsecheading}
@@ -3926,7 +4118,16 @@ width0pt\relax} \fi
           \hangindent = \wd0 % zero if no section number
           \unhbox0 #3}%
   }%
-  \ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak
+  % Add extra space after the heading -- either a line space or a
+  % paragraph space, whichever is more.  (Some people like to set
+  % \parskip to large values for some reason.)  Don't allow stretch, though.
+  \nobreak
+  \ifdim\parskip>\normalbaselineskip
+    \kern\parskip
+  \else
+    \kern\normalbaselineskip
+  \fi
+  \nobreak
 }
 
 
@@ -3938,16 +4139,22 @@ width0pt\relax} \fi
 % Called from @chapter, etc.  We supply {\folio} at the end of the
 % argument, which will end up as the last argument to the \...entry macro.
 %
-% We open the .toc file here instead of at @setfilename or any other
-% fixed time so that @contents can be put in the document anywhere.
+% Usage: \writetocentry{chap}{The Name of The Game}{{\the\chapno}}
+% We open the .toc file for writing here instead of at @setfilename (or
+% any other fixed time) so that @contents can be anywhere in the document.
 %
 \newif\iftocfileopened
-\def\writetocentry#1{%
+\def\writetocentry#1#2#3{%
   \iftocfileopened\else
     \immediate\openout\tocfile = \jobname.toc
     \global\tocfileopenedtrue
   \fi
-  \iflinks \write\tocfile{#1{\folio}}\fi
+  %
+  \iflinks
+    \toks0 = {#2}%
+    \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}#3{\folio}}}%
+    \temp
+  \fi
   %
   % Tell \shipout to create a page destination if we're doing pdf, which
   % will be the target of the links in the table of contents.  We can't
@@ -3986,7 +4193,7 @@ width0pt\relax} \fi
       \advance\hsize by -\contentsrightmargin % Don't use the full line length.
       %
       % Roman numerals for page numbers.
-      \ifnum \pageno>0 \pageno = \lastnegativepageno \fi
+      \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
 
@@ -4003,7 +4210,7 @@ width0pt\relax} \fi
      \pdfmakeoutlines
    \endgroup
    \lastnegativepageno = \pageno
-   \pageno = \savepageno
+   \global\pageno = \savepageno
 }
 
 % And just the chapters.
@@ -4021,11 +4228,11 @@ width0pt\relax} \fi
       \hyphenpenalty = 10000
       \advance\baselineskip by 1pt % Open it up a little.
       \def\secentry ##1##2##3##4{}
-      \def\unnumbsecentry ##1##2##3{}
       \def\subsecentry ##1##2##3##4##5{}
-      \def\unnumbsubsecentry ##1##2##3##4{}
       \def\subsubsecentry ##1##2##3##4##5##6{}
-      \def\unnumbsubsubsecentry ##1##2##3##4##5{}
+      \let\unnumbsecentry = \secentry
+      \let\unnumbsubsecentry = \subsecentry
+      \let\unnumbsubsubsecentry = \subsubsecentry
       \openin 1 \jobname.toc
       \ifeof 1 \else
         \closein 1
@@ -4035,7 +4242,7 @@ width0pt\relax} \fi
      \contentsalignmacro % in case @setchapternewpage odd is in effect
    \endgroup
    \lastnegativepageno = \pageno
-   \pageno = \savepageno
+   \global\pageno = \savepageno
 }
 \let\shortcontents = \summarycontents
 
@@ -4083,21 +4290,21 @@ width0pt\relax} \fi
 }
 
 % Unnumbered chapters.
-\def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
-\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
+\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}}
+\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}}
 
 % Sections.
 \def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
-\def\unnumbsecentry#1#2#3{\dosecentry{#1}{#3}}
+\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}}
 
 % Subsections.
 \def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
-\def\unnumbsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
+\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}}
 
 % And subsubsections.
 \def\subsubsecentry#1#2#3#4#5#6{%
   \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
-\def\unnumbsubsubsecentry#1#2#3#4#5{\dosubsubsecentry{#1}{#5}}
+\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}}
 
 % This parameter controls the indentation of the various levels.
 \newdimen\tocindent \tocindent = 3pc
@@ -4199,14 +4406,14 @@ width0pt\relax} \fi
 \def\tex{\begingroup
   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-  \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
+  \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
   \catcode `\%=14
-  \catcode 43=12 % plus
-  \catcode`\"=12
-  \catcode`\==12
-  \catcode`\|=12
-  \catcode`\<=12
-  \catcode`\>=12
+  \catcode `\+=\other
+  \catcode `\"=\other
+  \catcode `\==\other
+  \catcode `\|=\other
+  \catcode `\<=\other
+  \catcode `\>=\other
   \escapechar=`\\
   %
   \let\b=\ptexb
@@ -4260,15 +4467,18 @@ width0pt\relax} \fi
 % Make spacing and below environment symmetrical.  We use \parskip here
 % to help in doing that, since in @example-like environments \parskip
 % is reset to zero; thus the \afterenvbreak inserts no space -- but the
-% start of the next paragraph will insert \parskip
+% start of the next paragraph will insert \parskip.
 %
 \def\aboveenvbreak{{%
-  \ifnum\lastpenalty < 10000
+  % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
+  \ifnum \lastpenalty=10000 \else
     \advance\envskipamount by \parskip
     \endgraf
     \ifdim\lastskip<\envskipamount
       \removelastskip
-      \penalty-50
+      % it's not a good place to break if the last penalty was \nobreak
+      % or better ...
+      \ifnum\lastpenalty>10000 \else \penalty-50 \fi
       \vskip\envskipamount
     \fi
   \fi
@@ -4300,7 +4510,8 @@ width0pt\relax} \fi
 %
 \newskip\lskip\newskip\rskip
 
-\long\def\cartouche{%
+\def\cartouche{%
+\par  % can't be in the midst of a paragraph.
 \begingroup
         \lskip=\leftskip \rskip=\rightskip
         \leftskip=0pt\rightskip=0pt %we want these *outside*.
@@ -4347,7 +4558,6 @@ width0pt\relax} \fi
   \inENV % This group ends at the end of the body
   \hfuzz = 12pt % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
-  \singlespace
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
   \parskip = 0pt
@@ -4386,27 +4596,16 @@ width0pt\relax} \fi
 % @example: Same as @lisp.
 \def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
 
-% @small... is usually equivalent to the non-small (@smallbook
-% redefines).  We must call \example (or whatever) last in the
-% definition, since it reads the return following the @example (or
-% whatever) command.
-%
-% This actually allows (for example) @end display inside an
-% @smalldisplay.  Too bad, but makeinfo will catch the error anyway.
-%
-\def\smalldisplay{\begingroup\def\Esmalldisplay{\nonfillfinish\endgroup}\display}
-\def\smallexample{\begingroup\def\Esmallexample{\nonfillfinish\endgroup}\lisp}
-\def\smallformat{\begingroup\def\Esmallformat{\nonfillfinish\endgroup}\format}
-\def\smalllisp{\begingroup\def\Esmalllisp{\nonfillfinish\endgroup}\lisp}
-
-% Real @smallexample and @smalllisp (when @smallbook): use smaller fonts.
+% @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
-\def\smalllispx{\begingroup
+\def\smalllisp{\begingroup
   \def\Esmalllisp{\nonfillfinish\endgroup}%
   \def\Esmallexample{\nonfillfinish\endgroup}%
   \smallexamplefonts
   \lisp
 }
+\let\smallexample = \smalllisp
+
 
 % @display: same as @lisp except keep current font.
 %
@@ -4416,9 +4615,9 @@ width0pt\relax} \fi
   \gobble
 }
 %
-% @smalldisplay (when @smallbook): @display plus smaller fonts.
+% @smalldisplay: @display plus smaller fonts.
 %
-\def\smalldisplayx{\begingroup
+\def\smalldisplay{\begingroup
   \def\Esmalldisplay{\nonfillfinish\endgroup}%
   \smallexamplefonts \rm
   \display
@@ -4433,9 +4632,9 @@ width0pt\relax} \fi
   \gobble
 }
 %
-% @smallformat (when @smallbook): @format plus smaller fonts.
+% @smallformat: @format plus smaller fonts.
 %
-\def\smallformatx{\begingroup
+\def\smallformat{\begingroup
   \def\Esmallformat{\nonfillfinish\endgroup}%
   \smallexamplefonts \rm
   \format
@@ -4462,7 +4661,6 @@ width0pt\relax} \fi
 \def\quotation{%
   \begingroup\inENV %This group ends at the end of the @quotation body
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \singlespace
   \parindent=0pt
   % We have retained a nonzero parskip for the environment, since we're
   % doing normal filling. So to avoid extra space below the environment...
@@ -4485,10 +4683,14 @@ width0pt\relax} \fi
 %
 % [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
 %
-% [Knuth] p. 344; only we need to do '@' too
+% [Knuth] p.344; only we need to do the other characters Texinfo sets
+% active too.  Otherwise, they get lost as the first character on a
+% verbatim line.
 \def\dospecials{%
-  \do\ \do\\\do\@\do\{\do\}\do\$\do\&%
-  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~}
+  \do\ \do\\\do\{\do\}\do\$\do\&%
+  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
+  \do\<\do\>\do\|\do\@\do+\do\"%
+}
 %
 % [Knuth] p. 380
 \def\uncatcodespecials{%
@@ -4575,7 +4777,7 @@ width0pt\relax} \fi
 %
 % For Texinfo it's a lot easier than for LaTeX, 
 % because texinfo's \verbatim doesn't stop at '\end{verbatim}':
-% we need not redefine '\', '{' and '}'
+% we need not redefine '\', '{' and '}'.
 %
 % Inspired by LaTeX's verbatim command set [latex.ltx]
 %% Include LaTeX hack for completeness -- never know
@@ -4585,9 +4787,14 @@ width0pt\relax} \fi
 %% \catcode`\\=12|gdef|doverbatim#1@end verbatim[
 %% #1|endgroup|def|Everbatim[]|end[verbatim]]
 %% |endgroup
+%
 \begingroup
   \catcode`\ =\active
-  \gdef\doverbatim#1@end verbatim{#1\end{verbatim}}
+  \obeylines %
+  % ignore everything up to the first ^^M, that's the newline at the end
+  % of the @verbatim input line itself.  Otherwise we get an extra blank
+  % line in the output.
+  \gdef\doverbatim#1^^M#2@end verbatim{#2\end{verbatim}}%
 \endgroup
 %
 \def\verbatim{%
@@ -4603,14 +4810,14 @@ width0pt\relax} \fi
 % Allow normal characters that we make active in the argument (a file name).
 \def\verbatiminclude{%
   \begingroup
-    \catcode`\\=12
-    \catcode`~=12
-    \catcode`^=12
-    \catcode`_=12
-    \catcode`|=12
-    \catcode`<=12
-    \catcode`>=12
-    \catcode`+=12
+    \catcode`\\=\other
+    \catcode`~=\other
+    \catcode`^=\other
+    \catcode`_=\other
+    \catcode`|=\other
+    \catcode`<=\other
+    \catcode`>=\other
+    \catcode`+=\other
     \parsearg\doverbatiminclude
 }
 \def\setupverbatiminclude{%
@@ -4624,44 +4831,102 @@ width0pt\relax} \fi
      % Restore active chars for included file.
   \endgroup
   \begingroup
-  \def\thisfile{#1}%
-  \expandafter\expandafter\setupverbatiminclude\input\thisfile
-  \endgroup\nonfillfinish\endgroup
+    \let\value=\expandablevalue
+    \def\thisfile{#1}%
+    \expandafter\expandafter\setupverbatiminclude\input\thisfile
+  \endgroup
+  \nonfillfinish
+  \endgroup
 }
 
 % @copying ... @end copying.
-% Save the text away for @insertcopying later.
+% Save the text away for @insertcopying later.  Many commands won't be
+% allowed in this context, but that's ok.
+% 
+% We save the uninterpreted tokens, rather than creating a box.
+% Saving the text in a box would be much easier, but then all the
+% typesetting commands (@smallbook, font changes, etc.) have to be done
+% beforehand -- and a) we want @copying to be done first in the source
+% file; b) letting users define the frontmatter in as flexible order as
+% possible is very desirable.
 % 
-\newbox\copyingbox
-%
 \def\copying{\begingroup
-  \parindent = 0pt  % looks wrong on title page
-  \def\Ecopying{\egroup\endgroup}%
-  \global\setbox\copyingbox = \vbox\bgroup
+  % Define a command to swallow text until we reach `@end copying'.
+  % \ is the escape char in this texinfo.tex file, so it is the
+  % delimiter for the command; @ will be the escape char when we read
+  % it, but that doesn't matter.
+  \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}%
+  %
+  % We must preserve ^^M's in the input file; see \insertcopying below.
+  \catcode`\^^M = \active
+  \docopying
 }
 
-% @insertcopying.
-% 
-\def\insertcopying{\unvcopy\copyingbox}
+% What we do to finish off the copying text.
+%
+\def\enddocopying{\endgroup\ignorespaces}
 
+% @insertcopying.  Here we must play games with ^^M's.  On the one hand,
+% we need them to delimit commands such as `@end quotation', so they
+% must be active.  On the other hand, we certainly don't want every
+% end-of-line to be a \par, as would happen with the normal active
+% definition of ^^M.  On the third hand, two ^^M's in a row should still
+% generate a \par.
+% 
+% Our approach is to make ^^M insert a space and a penalty1 normally;
+% then it can also check if \lastpenalty=1.  If it does, then manually
+% do \par.
+% 
+% This messes up the normal definitions of @c[omment], so we redefine
+% it.  Similarly for @ignore.  (These commands are used in the gcc
+% manual for man page generation.)
+% 
+% Seems pretty fragile, most line-oriented commands will presumably
+% fail, but for the limited use of getting the copying text (which
+% should be quite simple) inserted, we can hope it's ok.
+%
+{\catcode`\^^M=\active %
+\gdef\insertcopying{\begingroup %
+  \parindent = 0pt  % looks wrong on title page
+  \def^^M{%
+    \ifnum \lastpenalty=1 %
+      \par %
+    \else %
+      \space \penalty 1 %
+    \fi %
+  }%
+  %
+  % Fix @c[omment] for catcode 13 ^^M's.
+  \def\c##1^^M{\ignorespaces}%
+  \let\comment = \c %
+  %
+  % Don't bother jumping through all the hoops that \doignore does, it
+  % would be very hard since the catcodes are already set.
+  \long\def\ignore##1\end ignore{\ignorespaces}%
+  %
+  \copyingtext %
+\endgroup}%
+}
 
 \message{defuns,}
 % @defun etc.
 
 % Allow user to change definition object font (\df) internally
-\def\setdeffont #1 {\csname DEF#1\endcsname}
+\def\setdeffont#1 {\csname DEF#1\endcsname}
 
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
-\newskip\deftypemargin \deftypemargin=12pt
 \newskip\deflastargmargin \deflastargmargin=18pt
 
 \newcount\parencount
-% define \functionparens, which makes ( and ) and & do special things.
-% \functionparens affects the group it is contained in.
+
+% We want ()&[] to print specially on the defun line.
+% 
 \def\activeparens{%
-\catcode`\(=\active \catcode`\)=\active \catcode`\&=\active
-\catcode`\[=\active \catcode`\]=\active}
+  \catcode`\(=\active \catcode`\)=\active
+  \catcode`\&=\active
+  \catcode`\[=\active \catcode`\]=\active
+}
 
 % Make control sequences which act like normal parenthesis chars.
 \let\lparen = ( \let\rparen = )
@@ -4708,88 +4973,124 @@ width0pt\relax} \fi
 
 % Active &'s sneak into the index arguments, so make sure it's defined.
 {
-  \catcode`& = 13
+  \catcode`& = \active
   \global\let& = \ampnr
 }
 
-% First, defname, which formats the header line itself.
-% #1 should be the function name.
-% #2 should be the type of definition, such as "Function".
-
-\def\defname #1#2{%
-% Get the values of \leftskip and \rightskip as they were
-% outside the @def...
-\dimen2=\leftskip
-\advance\dimen2 by -\defbodyindent
-\noindent
-\setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}%
-\dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line
-\dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations
-\parshape 2 0in \dimen0 \defargsindent \dimen1
-% Now output arg 2 ("Function" or some such)
-% ending at \deftypemargin from the right margin,
-% but stuck inside a box of width 0 so it does not interfere with linebreaking
-{% Adjust \hsize to exclude the ambient margins,
-% so that \rightline will obey them.
-\advance \hsize by -\dimen2
-\rlap{\rightline{{\rm #2}\hskip -1.25pc }}}%
-% Make all lines underfull and no complaints:
-\tolerance=10000 \hbadness=10000
-\advance\leftskip by -\defbodyindent
-\exdentamount=\defbodyindent
-{\df #1}\enskip        % Generate function name
-}
-
-% Actually process the body of a definition
-% #1 should be the terminating control sequence, such as \Edefun.
-% #2 should be the "another name" control sequence, such as \defunx.
-% #3 should be the control sequence that actually processes the header,
-%    such as \defunheader.
-
-\def\defparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2{\begingroup\obeylines\activeparens\spacesplit#3}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup %
-\catcode 61=\active % 61 is `='
-\obeylines\activeparens\spacesplit#3}
+% \defname, which formats the name of the @def (not the args).
+% #1 is the function name.
+% #2 is the type of definition, such as "Function".
+%
+\def\defname#1#2{%
+  % How we'll output the type name.  Putting it in brackets helps
+  % distinguish it from the body text that may end up on the next line
+  % just below it.
+  \ifempty{#2}%
+    \def\defnametype{}%
+  \else
+    \def\defnametype{[\rm #2]}%
+  \fi
+  %
+  % Get the values of \leftskip and \rightskip as they were outside the @def...
+  \dimen2=\leftskip
+  \advance\dimen2 by -\defbodyindent
+  %
+  % Figure out values for the paragraph shape.
+  \setbox0=\hbox{\hskip \deflastargmargin{\defnametype}}%
+  \dimen0=\hsize \advance \dimen0 by -\wd0  % compute size for first line
+  \dimen1=\hsize \advance \dimen1 by -\defargsindent  % size for continuations
+  \parshape 2 0in \dimen0 \defargsindent \dimen1
+  %
+  % Output arg 2 ("Function" or some such) but stuck inside a box of
+  % width 0 so it does not interfere with linebreaking.
+  \noindent
+  %
+  {% Adjust \hsize to exclude the ambient margins,
+   % so that \rightline will obey them.
+   \advance \hsize by -\dimen2
+   \dimen3 = 0pt  % was -1.25pc
+   \rlap{\rightline{\defnametype\kern\dimen3}}%
+  }%
+  %
+  % Allow all lines to be underfull without complaint:
+  \tolerance=10000 \hbadness=10000
+  \advance\leftskip by -\defbodyindent
+  \exdentamount=\defbodyindent
+  {\df #1}\enskip        % output function name
+  % \defunargs will be called next to output the arguments, if any.
+}
 
+% Common pieces to start any @def...
 % #1 is the \E... control sequence to end the definition (which we define).
-% #2 is the \...x control sequence for consecutive fns (which we define).
-% #3 is the control sequence to call to resume processing.
+% #2 is the \...x control sequence (which our caller defines).
+% #3 is the control sequence to process the header, such as \defunheader.
+% 
+\def\parsebodycommon#1#2#3{%
+  \begingroup\inENV
+  % If there are two @def commands in a row, we'll have a \nobreak,
+  % which is there to keep the function description together with its
+  % header.  But if there's nothing but headers, we want to allow a
+  % break after all.  Check for penalty 10002 (inserted by
+  % \defargscommonending) instead of 10000, since the sectioning
+  % commands insert a \penalty10000, and we don't want to allow a break
+  % between a section heading and a defun.
+  \ifnum\lastpenalty=10002 \penalty0 \fi
+  \medbreak
+  %
+  % Define the \E... end token that this defining construct specifies
+  % so that it will exit this group.
+  \def#1{\endgraf\endgroup\medbreak}%
+  %
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+}
+
+% Common part of the \...x definitions.
+% 
+\def\defxbodycommon{%
+  % As with \parsebodycommon above, allow line break if we have multiple
+  % x headers in a row.  It's not a great place, though.
+  \ifnum\lastpenalty=10000 \penalty1000 \fi
+  %
+  \begingroup\obeylines
+}
+
+% Process body of @defun, @deffn, @defmac, etc.
+%
+\def\defparsebody#1#2#3{%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2{\defxbodycommon \activeparens \spacesplit#3}%
+  \catcode\equalChar=\active
+  \begingroup\obeylines\activeparens
+  \spacesplit#3%
+}
+
+% #1, #2, #3 are the common arguments (see \parsebodycommon above).
 % #4, delimited by the space, is the class name.
 %
-\def\defmethparsebody#1#2#3#4 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\activeparens\spacesplit{#3{#4}}}
+\def\defmethparsebody#1#2#3#4 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 {\defxbodycommon \activeparens \spacesplit{#3{##1}}}%
+  \begingroup\obeylines\activeparens
+  % The \empty here prevents misinterpretation of a construct such as
+  %   @deffn {whatever} {Enharmonic comma}
+  % See comments at \deftpparsebody, although in our case we don't have
+  % to remove the \empty afterwards, since it is empty.
+  \spacesplit{#3{#4}}\empty
+}
 
 % Used for @deftypemethod and @deftypeivar.
-% #1 is the \E... control sequence to end the definition (which we define).
-% #2 is the \...x control sequence for consecutive fns (which we define).
-% #3 is the control sequence to call to resume processing.
+% #1, #2, #3 are the common arguments (see \defparsebody).
 % #4, delimited by a space, is the class name.
 % #5 is the method's return type.
 %
-\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV
-  \medbreak
-  \def#1{\endgraf\endgroup\medbreak}%
-  \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}%
-  \parindent=0in
-  \advance\leftskip by \defbodyindent
-  \exdentamount=\defbodyindent
-  \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}}
+\def\deftypemethparsebody#1#2#3#4 #5 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 ##2 {\defxbodycommon \activeparens \spacesplit{#3{##1}{##2}}}%
+  \begingroup\obeylines\activeparens
+  \spacesplit{#3{#4}{#5}}%
+}
 
 % Used for @deftypeop.  The change from \deftypemethparsebody is an
 % extra argument at the beginning which is the `category', instead of it
@@ -4798,64 +5099,48 @@ width0pt\relax} \fi
 % input at hand.  Thus also need a control sequence (passed as #5) for
 % the \E... definition to assign the category name to.
 % 
-\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV
-  \medbreak
-  \def#1{\endgraf\endgroup\medbreak}%
-  \def#2##1 ##2 ##3 {%
-    \def#4{##1}%
-    \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}%
-  \parindent=0in
-  \advance\leftskip by \defbodyindent
-  \exdentamount=\defbodyindent
-  \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}}
-
-\def\defopparsebody #1#2#3#4#5 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 ##2 {\def#4{##1}%
-\begingroup\obeylines\activeparens\spacesplit{#3{##2}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\activeparens\spacesplit{#3{#5}}}
+\def\deftypeopparsebody#1#2#3#4#5 #6 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 ##2 ##3 {\def#4{##1}%
+    \defxbodycommon \activeparens \spacesplit{#3{##2}{##3}}}%
+  \begingroup\obeylines\activeparens
+  \spacesplit{#3{#5}{#6}}%
+}
+
+% For @defop.
+\def\defopparsebody #1#2#3#4#5 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 ##2 {\def#4{##1}%
+    \defxbodycommon \activeparens \spacesplit{#3{##2}}}%
+  \begingroup\obeylines\activeparens
+  \spacesplit{#3{#5}}%
+}
 
 % These parsing functions are similar to the preceding ones
 % except that they do not make parens into active characters.
 % These are used for "variables" since they have no arguments.
-
-\def\defvarparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2{\begingroup\obeylines\spacesplit#3}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup %
-\catcode 61=\active %
-\obeylines\spacesplit#3}
-
-% This is used for \def{tp,vr}parsebody.  It could probably be used for
-% some of the others, too, with some judicious conditionals.
 %
-\def\parsebodycommon#1#2#3{%
-  \begingroup\inENV %
-  \medbreak %
-  % Define the end token that this defining construct specifies
-  % so that it will exit this group.
-  \def#1{\endgraf\endgroup\medbreak}%
-  \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}%
-  \parindent=0in
-  \advance\leftskip by \defbodyindent
-  \exdentamount=\defbodyindent
+\def\defvarparsebody #1#2#3{%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2{\defxbodycommon \spacesplit#3}%
+  \catcode\equalChar=\active
+  \begingroup\obeylines
+  \spacesplit#3%
+}
+
+% @defopvar.
+\def\defopvarparsebody #1#2#3#4#5 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 ##2 {\def#4{##1}%
+    \defxbodycommon \spacesplit{#3{##2}}}%
   \begingroup\obeylines
+  \spacesplit{#3{#5}}%
 }
 
 \def\defvrparsebody#1#2#3#4 {%
   \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
+  \begingroup\obeylines
   \spacesplit{#3{#4}}%
 }
 
@@ -4870,6 +5155,8 @@ width0pt\relax} \fi
 %
 \def\deftpparsebody #1#2#3#4 {%
   \parsebodycommon{#1}{#2}{#3}%
+  \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
+  \begingroup\obeylines
   \spacesplit{\parsetpheaderline{#3{#4}}}\empty
 }
 
@@ -4886,38 +5173,37 @@ width0pt\relax} \fi
   #1{\removeemptybraces#2\relax}{#3}%
 }%
 
-\def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 ##2 {\def#4{##1}%
-\begingroup\obeylines\spacesplit{#3{##2}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\spacesplit{#3{#5}}}
-
-% Split up #2 at the first space token.
+% Split up #2 (the rest of the input line) at the first space token.
 % call #1 with two arguments:
 %  the first is all of #2 before the space token,
 %  the second is all of #2 after that space token.
 % If #2 contains no space token, all of it is passed as the first arg
 % and the second is passed as empty.
-
-{\obeylines
-\gdef\spacesplit#1#2^^M{\endgroup\spacesplitfoo{#1}#2 \relax\spacesplitfoo}%
-\long\gdef\spacesplitfoo#1#2 #3#4\spacesplitfoo{%
-\ifx\relax #3%
-#1{#2}{}\else #1{#2}{#3#4}\fi}}
-
-% So much for the things common to all kinds of definitions.
+%
+{\obeylines %
+ \gdef\spacesplit#1#2^^M{\endgroup\spacesplitx{#1}#2 \relax\spacesplitx}%
+ \long\gdef\spacesplitx#1#2 #3#4\spacesplitx{%
+   \ifx\relax #3%
+     #1{#2}{}%
+   \else %
+     #1{#2}{#3#4}%
+   \fi}%
+}
 
 % Define @defun.
 
-% First, define the processing that is wanted for arguments of \defun
-% Use this to expand the args and terminate the paragraph they make up
+% This is called to end the arguments processing for all the @def... commands.
+%
+\def\defargscommonending{%
+  \interlinepenalty = 10000
+  \advance\rightskip by 0pt plus 1fil
+  \endgraf
+  \nobreak\vskip -\parskip
+  \penalty 10002  % signal to \parsebodycommon.
+}
 
+% This expands the args and terminates the paragraph they comprise.
+% 
 \def\defunargs#1{\functionparens \sl
 % Expand, preventing hyphenation at `-' chars.
 % Note that groups don't affect changes in \hyphenchar.
@@ -4926,9 +5212,7 @@ width0pt\relax} \fi
 #1%
 {\tensl\hyphenchar\font=45}%
 \ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
-\interlinepenalty=10000
-\advance\rightskip by 0pt plus 1fil
-\endgraf\nobreak\vskip -\parskip\nobreak
+  \defargscommonending
 }
 
 \def\deftypefunargs #1{%
@@ -4937,9 +5221,7 @@ width0pt\relax} \fi
 % Use \boldbraxnoamp, not \functionparens, so that & is not special.
 \boldbraxnoamp
 \tclose{#1}% avoid \code because of side effects on active chars
-\interlinepenalty=10000
-\advance\rightskip by 0pt plus 1fil
-\endgraf\nobreak\vskip -\parskip\nobreak
+  \defargscommonending
 }
 
 % Do complete processing of one @defun or @defunx line already parsed.
@@ -4950,7 +5232,7 @@ width0pt\relax} \fi
 
 \def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
 \begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @defun == @deffn Function
@@ -4960,7 +5242,7 @@ width0pt\relax} \fi
 \def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
 \begingroup\defname {#1}{\putwordDeffunc}%
 \defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @deftypefun int foobar (int @var{foo}, float @var{bar})
@@ -4974,7 +5256,7 @@ width0pt\relax} \fi
 \doind {fn}{\code{#2}}% Make entry in function index
 \begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}%
 \deftypefunargs {#3}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
@@ -4995,7 +5277,7 @@ width0pt\relax} \fi
 %               at least some C++ text from working
 \defname {\defheaderxcond#2\relax$.$#3}{#1}%
 \deftypefunargs {#4}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @defmac == @deffn Macro
@@ -5005,7 +5287,7 @@ width0pt\relax} \fi
 \def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
 \begingroup\defname {#1}{\putwordDefmac}%
 \defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @defspec == @deffn Special Form
@@ -5015,7 +5297,7 @@ width0pt\relax} \fi
 \def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
 \begingroup\defname {#1}{\putwordDefspec}%
 \defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
+\catcode\equalChar=\other % Turn off change made in \defparsebody
 }
 
 % @defop CATEGORY CLASS OPERATION ARG...
@@ -5024,9 +5306,11 @@ width0pt\relax} \fi
 \defopparsebody\Edefop\defopx\defopheader\defoptype}
 %
 \def\defopheader#1#2#3{%
-\dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index
-\begingroup\defname {#2}{\defoptype\ \putwordon\ #1}%
-\defunargs {#3}\endgroup %
+  \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% function index entry
+  \begingroup
+    \defname{#2}{\defoptype\ \putwordon\ #1}%
+    \defunargs{#3}%
+  \endgroup
 }
 
 % @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
@@ -5093,9 +5377,11 @@ width0pt\relax} \fi
 \defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
 
 \def\defcvarheader #1#2#3{%
-\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index
-\begingroup\defname {#2}{\defcvtype\ \putwordof\ #1}%
-\defvarargs {#3}\endgroup %
+  \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% variable index entry
+  \begingroup
+    \defname{#2}{\defcvtype\ \putwordof\ #1}%
+    \defvarargs{#3}%
+  \endgroup
 }
 
 % @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
@@ -5103,7 +5389,7 @@ width0pt\relax} \fi
 \def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
 %
 \def\defivarheader#1#2#3{%
-  \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index
+  \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% entry in var index
   \begingroup
     \defname{#2}{\putwordInstanceVariableof\ #1}%
     \defvarargs{#3}%
@@ -5115,8 +5401,8 @@ width0pt\relax} \fi
 % This is actually simple: just print them in roman.
 % This must expand the args and terminate the paragraph they make up
 \def\defvarargs #1{\normalparens #1%
-\interlinepenalty=10000
-\endgraf\nobreak\vskip -\parskip\nobreak}
+  \defargscommonending
+}
 
 % @defvr Counter foo-count
 
@@ -5152,8 +5438,7 @@ width0pt\relax} \fi
 \def\deftypevarheader #1#2{%
 \dovarind#2 \relax% Make entry in variables index
 \begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}%
-\interlinepenalty=10000
-\endgraf\nobreak\vskip -\parskip\nobreak
+  \defargscommonending
 \endgroup}
 \def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
 
@@ -5163,8 +5448,7 @@ width0pt\relax} \fi
 
 \def\deftypevrheader #1#2#3{\dovarind#3 \relax%
 \begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1}
-\interlinepenalty=10000
-\endgraf\nobreak\vskip -\parskip\nobreak
+  \defargscommonending
 \endgroup}
 
 % Now define @deftp
@@ -5213,7 +5497,7 @@ width0pt\relax} \fi
  \def\scanmacro#1{%
    \begingroup \newlinechar`\^^M
    % Undo catcode changes of \startcontents and \doprintindex
-   \catcode`\@=0 \catcode`\\=12 \escapechar=`\@
+   \catcode`\@=0 \catcode`\\=\other \escapechar=`\@
    % Append \endinput to make sure that TeX does not see the ending newline.
    \toks0={#1\endinput}%
    \immediate\openout\macscribble=\jobname.tmp
@@ -5227,7 +5511,7 @@ width0pt\relax} \fi
 \def\scanmacro#1{%
 \begingroup \newlinechar`\^^M
 % Undo catcode changes of \startcontents and \doprintindex
-\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
+\catcode`\@=0 \catcode`\\=\other \escapechar=`\@
 \let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
 \fi
 
@@ -5257,7 +5541,7 @@ width0pt\relax} \fi
 }
 
 % Trim a single trailing ^^M off a string.
-{\catcode`\^^M=12\catcode`\Q=3%
+{\catcode`\^^M=\other \catcode`\Q=3%
 \gdef\eatcr #1{\eatcra #1Q^^MQ}%
 \gdef\eatcra#1^^MQ{\eatcrb#1Q}%
 \gdef\eatcrb#1Q#2Q{#1}%
@@ -5272,29 +5556,29 @@ width0pt\relax} \fi
 % body, and then making it the \newlinechar in \scanmacro.
 
 \def\macrobodyctxt{%
-  \catcode`\~=12
-  \catcode`\^=12
-  \catcode`\_=12
-  \catcode`\|=12
-  \catcode`\<=12
-  \catcode`\>=12
-  \catcode`\+=12
-  \catcode`\{=12
-  \catcode`\}=12
-  \catcode`\@=12
-  \catcode`\^^M=12
+  \catcode`\~=\other
+  \catcode`\^=\other
+  \catcode`\_=\other
+  \catcode`\|=\other
+  \catcode`\<=\other
+  \catcode`\>=\other
+  \catcode`\+=\other
+  \catcode`\{=\other
+  \catcode`\}=\other
+  \catcode`\@=\other
+  \catcode`\^^M=\other
   \usembodybackslash}
 
 \def\macroargctxt{%
-  \catcode`\~=12
-  \catcode`\^=12
-  \catcode`\_=12
-  \catcode`\|=12
-  \catcode`\<=12
-  \catcode`\>=12
-  \catcode`\+=12
-  \catcode`\@=12
-  \catcode`\\=12}
+  \catcode`\~=\other
+  \catcode`\^=\other
+  \catcode`\_=\other
+  \catcode`\|=\other
+  \catcode`\<=\other
+  \catcode`\>=\other
+  \catcode`\+=\other
+  \catcode`\@=\other
+  \catcode`\\=\other}
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
@@ -5335,32 +5619,33 @@ width0pt\relax} \fi
   \else \expandafter\parsemacbody
   \fi}
 
-\def\unmacro{\parsearg\unmacroxxx}
-\def\unmacroxxx#1{%
+\def\unmacro{\parsearg\dounmacro}
+\def\dounmacro#1{%
   \if1\csname ismacro.#1\endcsname
     \global\cslet{#1}{macsave.#1}%
     \global\expandafter\let \csname ismacro.#1\endcsname=0%
-    % Remove the macro name from \macrolist
+    % Remove the macro name from \macrolist:
     \begingroup
-      \edef\tempa{\expandafter\noexpand\csname#1\endcsname}%
-      \def\do##1{%
-        \def\tempb{##1}%
-        \ifx\tempa\tempb
-          % remove this
-        \else
-          \toks0 = \expandafter{\newmacrolist\do}%
-          \edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}%
-        \fi}%
-      \def\newmacrolist{}%
-      % Execute macro list to define \newmacrolist
-      \macrolist
-      \global\let\macrolist\newmacrolist
+      \expandafter\let\csname#1\endcsname \relax
+      \let\do\unmacrodo
+      \xdef\macrolist{\macrolist}%
     \endgroup
   \else
     \errmessage{Macro #1 not defined}%
   \fi
 }
 
+% Called by \do from \dounmacro on each macro.  The idea is to omit any
+% macro definitions that have been changed to \relax.
+% 
+\def\unmacrodo#1{%
+  \ifx#1\relax
+    % remove this
+  \else
+    \noexpand\do \noexpand #1%
+  \fi
+}
+
 % This makes use of the obscure feature that if the last token of a
 % <parameter list> is #, then the preceding argument is delimited by
 % an opening brace, and that opening brace is not consumed.
@@ -5543,15 +5828,23 @@ width0pt\relax} \fi
 \gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
 \gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
 
-% \setref{NAME}{SNT} defines a cross-reference point NAME, namely
-% NAME-title, NAME-pg, and NAME-SNT.  Called from \foonoderef.  We have
-% to set \indexdummies so commands such as @code in a section title
-% aren't expanded.  It would be nicer not to expand the titles in the
-% first place, but there's so many layers that that is hard to do.
+% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
+% anchor), namely NAME-title (the corresponding @chapter/etc. name),
+% NAME-pg (the page number), and NAME-snt (section number and type).
+% Called from \foonoderef.
+% 
+% We have to set \indexdummies so commands such as @code in a section
+% title aren't expanded.  It would be nicer not to expand the titles in
+% the first place, but there's so many layers that that is hard to do.
 %
+% Likewise, use \turnoffactive so that punctuation chars such as underscore
+% and backslash work in node names.
+% 
 \def\setref#1#2{{%
-  \indexdummies
+  \atdummies
   \pdfmkdest{#1}%
+  %
+  \turnoffactive
   \dosetq{#1-title}{Ytitle}%
   \dosetq{#1-pg}{Ypagenumber}%
   \dosetq{#1-snt}{#2}%
@@ -5603,7 +5896,7 @@ width0pt\relax} \fi
   \ifpdf
     \leavevmode
     \getfilename{#4}%
-    {\normalturnoffactive
+    {\turnoffactive \otherbackslash
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
          goto file{\the\filename.pdf} name{#1}%
@@ -5623,7 +5916,7 @@ width0pt\relax} \fi
     % into the usual \leavevmode...\vrule stuff for purposes of
     % printing. So we \turnoffactive for the \refx-snt, back on for the
     % printing, back off for the \refx-pg.
-    {\normalturnoffactive
+    {\turnoffactive \otherbackslash
      % Only output a following space if the -snt ref is nonempty; for
      % @unnumbered and @anchor, it won't be.
      \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
@@ -5632,73 +5925,74 @@ width0pt\relax} \fi
     % [mynode],
     [\printednodename],\space
     % page 3
-    \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
+    \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
   \fi
   \endlink
 \endgroup}
 
-% \dosetq is the interface for calls from other macros
-
-% Use \normalturnoffactive so that punctuation chars such as underscore
-% and backslash work in node names.  (\turnoffactive doesn't do \.)
+% \dosetq is called from \setref to do the actual \write (\iflinks).
+%
 \def\dosetq#1#2{%
   {\let\folio=0%
-   \normalturnoffactive
    \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
-   \iflinks
-     \next
-   \fi
+   \iflinks \next \fi
   }%
 }
 
-% \internalsetq {foo}{page} expands into
-% CHARACTERS 'xrdef {foo}{...expansion of \Ypage...}
-% When the aux file is read, ' is the escape character
-
-\def\internalsetq #1#2{'xrdef {#1}{\csname #2\endcsname}}
-
-% Things to be expanded by \internalsetq
+% \internalsetq{foo}{page} expands into
+%   CHARACTERS @xrdef{foo}{...expansion of \page...}
+\def\internalsetq#1#2{@xrdef{#1}{\csname #2\endcsname}}
 
+% Things to be expanded by \internalsetq.
+% 
 \def\Ypagenumber{\folio}
-
 \def\Ytitle{\thissection}
-
 \def\Ynothing{}
-
 \def\Ysectionnumberandtype{%
-\ifnum\secno=0 \putwordChapter\xreftie\the\chapno %
-\else \ifnum \subsecno=0 \putwordSection\xreftie\the\chapno.\the\secno %
-\else \ifnum \subsubsecno=0 %
-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno %
-\else %
-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno %
-\fi \fi \fi }
+  \ifnum\secno=0
+    \putwordChapter@tie \the\chapno
+  \else \ifnum\subsecno=0
+    \putwordSection@tie \the\chapno.\the\secno
+  \else \ifnum\subsubsecno=0
+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
+  \else
+    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
+  \fi\fi\fi
+}
 
 \def\Yappendixletterandtype{%
-\ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
-\else \ifnum \subsecno=0 \putwordSection\xreftie'char\the\appendixno.\the\secno %
-\else \ifnum \subsubsecno=0 %
-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno %
-\else %
-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
-\fi \fi \fi }
-
-\gdef\xreftie{'tie}
+  \ifnum\secno=0
+     \putwordAppendix@tie @char\the\appendixno{}%
+  \else \ifnum\subsecno=0
+     \putwordSection@tie @char\the\appendixno.\the\secno
+  \else \ifnum\subsubsecno=0
+    \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
+  \else
+    \putwordSection@tie
+      @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
+  \fi\fi\fi
+}
 
 % Use TeX 3.0's \inputlineno to get the line number, for better error
 % messages, but if we're using an old version of TeX, don't do anything.
 %
 \ifx\inputlineno\thisisundefined
-  \let\linenumber = \empty % Non-3.0.
+  \let\linenumber = \empty % Pre-3.0.
 \else
   \def\linenumber{\the\inputlineno:\space}
 \fi
 
 % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
 % If its value is nonempty, SUFFIX is output afterward.
-
+%
 \def\refx#1#2{%
-  \expandafter\ifx\csname X#1\endcsname\relax
+  {%
+    \indexnofonts
+    \otherbackslash
+    \expandafter\global\expandafter\let\expandafter\thisrefX
+      \csname X#1\endcsname
+  }%
+  \ifx\thisrefX\relax
     % If not defined, say something at least.
     \angleleft un\-de\-fined\angleright
     \iflinks
@@ -5713,19 +6007,14 @@ width0pt\relax} \fi
     \fi
   \else
     % It's defined, so just use it.
-    \csname X#1\endcsname
+    \thisrefX
   \fi
   #2% Output the suffix in any case.
 }
 
 % This is the macro invoked by entries in the aux file.
 %
-\def\xrdef#1{\begingroup
-  % Reenable \ as an escape while reading the second argument.
-  \catcode`\\ = 0
-  \afterassignment\endgroup
-  \expandafter\gdef\csname X#1\endcsname
-}
+\def\xrdef#1{\expandafter\gdef\csname X#1\endcsname}
 
 % Read the last existing aux file, if any.  No error if none exists.
 \def\readauxfile{\begingroup
@@ -5756,9 +6045,7 @@ width0pt\relax} \fi
   \catcode`\^^]=\other
   \catcode`\^^^=\other
   \catcode`\^^_=\other
-  \catcode`\@=\other
-  \catcode`\^=\other
-  % It was suggested to define this as 7, which would allow ^^e4 etc.
+  % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
   % in xref tags, i.e., node names.  But since ^^e4 notation isn't
   % supported in the main text, it doesn't seem desirable.  Furthermore,
   % that is not enough: for node names that actually contain a ^
@@ -5771,6 +6058,9 @@ width0pt\relax} \fi
   % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
   % and then to call \auxhat in \setq.
   %
+  \catcode`\^=\other
+  %
+  % Special characters.  Should be turned off anyway, but...
   \catcode`\~=\other
   \catcode`\[=\other
   \catcode`\]=\other
@@ -5782,7 +6072,9 @@ width0pt\relax} \fi
   \catcode`\$=\other
   \catcode`\#=\other
   \catcode`\&=\other
+  \catcode`\%=\other
   \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
+  %
   % Make the characters 128-255 be printing characters
   {%
     \count 1=128
@@ -5792,17 +6084,18 @@ width0pt\relax} \fi
       \ifnum \count 1<256 \loop \fi
     }%
   }%
-  % The aux file uses ' as the escape (for now).
+  %
   % Turn off \ as an escape so we do not lose on
   % entries which were dumped with control sequences in their names.
-  % For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
+  % For example, @xrdef{$\leq $-fun}{page ...} made by @defun ^^
   % Reference to such entries still does not work the way one would wish,
   % but at least they do not bomb out when the aux file is read in.
+  \catcode`\\=\other
+  %
+  % @ is our escape character in .aux files.
   \catcode`\{=1
   \catcode`\}=2
-  \catcode`\%=\other
-  \catcode`\'=0
-  \catcode`\\=\other
+  \catcode`\@=0
   %
   \openin 1 \jobname.aux
   \ifeof 1 \else
@@ -5847,7 +6140,7 @@ width0pt\relax} \fi
   % Remove inadvertent blank space before typesetting the footnote number.
   \unskip
   \thisfootno\@sf
-  \footnotezzz
+  \dofootnote
 }%
 
 % Don't bother with the trickery in plain.tex to not require the
@@ -5857,10 +6150,17 @@ width0pt\relax} \fi
 % \parseargline fail inside footnotes because the tokens are fixed when
 % the footnote is read.  --karl, 16nov96.
 %
-\long\gdef\footnotezzz{\insert\footins\bgroup
+% The start of the footnote looks usually like this:
+\gdef\startfootins{\insert\footins\bgroup}
+%
+% ... but this macro is redefined inside @multitable.
+%
+\gdef\dofootnote{%
+  \startfootins
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
+  \hsize=\pagewidth
   \interlinepenalty\interfootnotelinepenalty
   \splittopskip\ht\strutbox % top baseline for broken footnotes
   \splitmaxdepth\dp\strutbox
@@ -5890,12 +6190,6 @@ width0pt\relax} \fi
   \footstrut
   \futurelet\next\fo@t
 }
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-  \else\let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f@t#1{#1\@foot}
-\def\@foot{\strut\par\egroup}
-
 }%end \catcode `\@=11
 
 % @| inserts a changebar to the left of the current line.  It should
@@ -5942,8 +6236,8 @@ width0pt\relax} \fi
 \openin 1 = epsf.tex
 \ifeof 1 \else
   \closein 1
-  % Do not bother showing banner with post-v2.7 epsf.tex (available in
-  % doc/epsf.tex until it shows up on ctan).
+  % Do not bother showing banner with epsf.tex v2.7k (available in
+  % doc/epsf.tex and on ctan).
   \def\epsfannounce{\toks0 = }%
   \input epsf.tex
 \fi
@@ -6068,10 +6362,11 @@ should work if nowhere else does.}
 }
 
 % Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip, 7) pdf pageheight;
-% 8) pdf pagewidth.  We also call \setleading{\textleading}, so
-% the caller should define \textleading.  The caller should also
-% set \parskip.
+% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
+% physical page width.
+% 
+% We also call \setleading{\textleading}, so the caller should define
+% \textleading.  The caller should also set \parskip.
 %
 \def\internalpagesizes#1#2#3#4#5#6#7#8{%
   \voffset = #3\relax
@@ -6092,24 +6387,15 @@ should work if nowhere else does.}
   \normaloffset = #4\relax
   \bindingoffset = #5\relax
   %
-  \setleading{\textleading}
-  %
-  \parindent = \defaultparindent
-  \setemergencystretch
-  %
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
   \fi
-}
-
-% Use `small' versions.
-% 
-\def\smallenvironments{%
-  \let\smalldisplay = \smalldisplayx
-  \let\smallexample = \smalllispx
-  \let\smallformat = \smallformatx
-  \let\smalllisp = \smalllispx
+  %
+  \setleading{\textleading}
+  %
+  \parindent = \defaultparindent
+  \setemergencystretch
 }
 
 % @letterpaper (the default).
@@ -6129,7 +6415,7 @@ should work if nowhere else does.}
   \parskip = 2pt plus 1pt
   \textleading = 12pt
   %
-  \internalpagesizes{7.5in}{5.in}%
+  \internalpagesizes{7.5in}{5in}%
                     {\voffset}{.25in}%
                     {\bindingoffset}{16pt}%
                     {9.25in}{7in}%
@@ -6138,23 +6424,33 @@ should work if nowhere else does.}
   \tolerance = 700
   \hfuzz = 1pt
   \contentsrightmargin = 0pt
-  \deftypemargin = 0pt
   \defbodyindent = .5cm
-  \smallenvironments
 }}
 
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
-  \textleading = 12pt
+  \textleading = 13.2pt
   %
-  \internalpagesizes{53\baselineskip}{160mm}%
-                    {\voffset}{4mm}%
+  % Double-side printing via postscript on Laserjet 4050 
+  % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
+  % To change the settings for a different printer or situation, adjust
+  % \normaloffset until the front-side and back-side texts align.  Then
+  % do the same for \bindingoffset.  You can set these for testing in
+  % your texinfo source file like this:
+  % @tex
+  % \global\normaloffset = -6mm
+  % \global\bindingoffset = 10mm
+  % @end tex
+  \internalpagesizes{51\baselineskip}{160mm}
+                    {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
   %
   \tolerance = 700
   \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = 5mm
 }}
 
 % Use @afivepaper to print on European A5 paper.
@@ -6164,53 +6460,45 @@ should work if nowhere else does.}
   \parskip = 2pt plus 1pt minus 0.1pt
   \textleading = 12.5pt
   %
-  \internalpagesizes{166mm}{120mm}%
-                    {\voffset}{-8mm}%
+  \internalpagesizes{160mm}{120mm}%
+                    {\voffset}{\hoffset}%
                     {\bindingoffset}{8pt}%
                     {210mm}{148mm}%
   %
   \lispnarrowing = 0.2in
   \tolerance = 800
   \hfuzz = 1.2pt
-  \contentsrightmargin = 0mm
-  \deftypemargin = 0pt
+  \contentsrightmargin = 0pt
   \defbodyindent = 2mm
   \tableindent = 12mm
-  %
-  \smallenvironments
 }}
 
-% A specific text layout, 24x15cm overall, intended for A4 paper.  Top margin
-% 29mm, hence bottom margin 28mm, nominal side margin 3cm.
+% A specific text layout, 24x15cm overall, intended for A4 paper.  
 \def\afourlatex{{\globaldefs = 1
-  \textleading = 13.6pt
-  %
   \afourpaper
   \internalpagesizes{237mm}{150mm}%
-                    {3.6mm}{3.6mm}%
-                    {3mm}{7mm}%
+                    {\voffset}{4.6mm}%
+                    {\bindingoffset}{7mm}%
                     {297mm}{210mm}%
   %
-  % Must explicitly reset to 0 because we call \afourpaper, apparently,
-  % although this does not entirely make sense.
+  % Must explicitly reset to 0 because we call \afourpaper.
   \globaldefs = 0
 }}
 
-% Use @afourwide to print on European A4 paper in wide format.
-\def\afourwide{%
+% Use @afourwide to print on A4 paper in landscape format.
+\def\afourwide{{\globaldefs = 1
   \afourpaper
-  \internalpagesizes{6.5in}{9.5in}%
-                    {\hoffset}{\normaloffset}%
+  \internalpagesizes{241mm}{165mm}%
+                    {\voffset}{-2.95mm}%
                     {\bindingoffset}{7mm}%
                     {297mm}{210mm}%
-}
+  \globaldefs = 0
+}}
 
 % @pagesizes TEXTHEIGHT[,TEXTWIDTH]
 % Perhaps we should allow setting the margins, \topskip, \parskip,
 % and/or leading, also. Or perhaps we should compute them somehow.
 %
-\newdimen \tempdima
-\newdimen \tempdimb
 \def\pagesizes{\parsearg\pagesizesxxx}
 \def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
 \def\pagesizesyyy#1,#2,#3\finish{{%
@@ -6220,14 +6508,16 @@ should work if nowhere else does.}
   \parskip = 3pt plus 2pt minus 1pt
   \setleading{\textleading}%
   %
-  \tempdima #1\relax
-  \advance\tempdima by 1in
-  \tempdimb #2\relax
-  \advance\tempdimb by 1in
+  \dimen0 = #1
+  \advance\dimen0 by \voffset
+  %
+  \dimen2 = \hsize
+  \advance\dimen2 by \normaloffset
+  %
   \internalpagesizes{#1}{\hsize}%
                     {\voffset}{\normaloffset}%
                     {\bindingoffset}{44pt}%
-                    {\tempdima}{\tempdimb}%
+                    {\dimen0}{\dimen2}%
 }}
 
 % Set default to letter.
@@ -6291,7 +6581,7 @@ should work if nowhere else does.}
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
 % Subroutine for the previous macro.
-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}
+\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
 
 \catcode`\|=\active
 \def|{{\tt\char124}}
@@ -6305,8 +6595,6 @@ should work if nowhere else does.}
 \def+{{\tt \char 43}}
 \catcode`\$=\active
 \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
-%\catcode 27=\active
-%\def^^[{$\diamondsuit$}
 
 % Set up an active definition for =, but don't enable it most of the time.
 {\catcode`\==\active
@@ -6323,44 +6611,46 @@ should work if nowhere else does.}
 
 \catcode`\@=0
 
-% \rawbackslashxx output one backslash character in current font
+% \rawbackslashxx outputs one backslash character in current font,
+% as in \char`\\.
 \global\chardef\rawbackslashxx=`\\
-%{\catcode`\\=\other
-%@gdef@rawbackslashxx{\}}
 
-% \rawbackslash redefines \ as input to do \rawbackslashxx.
+% \rawbackslash defines an active \ to do \rawbackslashxx.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
 {\catcode`\\=\active
-@gdef@rawbackslash{@let\=@rawbackslashxx }}
+ @gdef@rawbackslash{@let\=@rawbackslashxx}
+ @gdef@otherbackslash{@let\=@realbackslash}
+}
+
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
 
 % \normalbackslash outputs one backslash in fixed width font.
 \def\normalbackslash{{\tt\rawbackslashxx}}
 
-% \catcode 17=0   % Define control-q
 \catcode`\\=\active
 
 % Used sometimes to turn off (effectively) the active characters
 % even after parsing them.
-@def@turnoffactive{@let"=@normaldoublequote
-@let\=@realbackslash
-@let~=@normaltilde
-@let^=@normalcaret
-@let_=@normalunderscore
-@let|=@normalverticalbar
-@let<=@normalless
-@let>=@normalgreater
-@let+=@normalplus
-@let$=@normaldollar}%$ font-lock fix
-
-@def@normalturnoffactive{@let"=@normaldoublequote
-@let\=@normalbackslash
-@let~=@normaltilde
-@let^=@normalcaret
-@let_=@normalunderscore
-@let|=@normalverticalbar
-@let<=@normalless
-@let>=@normalgreater
-@let+=@normalplus
-@let$=@normaldollar}%$ font-lock fix
+@def@turnoffactive{%
+  @let"=@normaldoublequote
+  @let\=@realbackslash
+  @let~=@normaltilde
+  @let^=@normalcaret
+  @let_=@normalunderscore
+  @let|=@normalverticalbar
+  @let<=@normalless
+  @let>=@normalgreater
+  @let+=@normalplus
+  @let$=@normaldollar %$ font-lock fix
+}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.  (Thus, \ is not expandable when this is in
+% effect.)
+% 
+@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
 
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
diff --git a/contrib/groff/doc/webpage.ms b/contrib/groff/doc/webpage.ms
index f40b29b..0287787 100644
--- a/contrib/groff/doc/webpage.ms
+++ b/contrib/groff/doc/webpage.ms
@@ -42,9 +42,9 @@ Home of Groff (GNU Troff).
 .HnS 1
 .HR
 GNU Troff
-.URL http://\:groff.ffii.org/ (Groff) 
+.URL http://\:groff.ffii.org/ (Groff)
 \[em] a
-.URL http://\:www.gnu.org/ GNU 
+.URL http://\:www.gnu.org/ GNU
 project.
 Hosted by
 .URL http://\:ffii.org/ FFII .
@@ -62,15 +62,26 @@ Groff now supports HTML.
 .SH
 Download
 
-.URL "ftp://\:groff.ffii.org/\:pub/\:groff/" Germany 
-|
-.URL "ftp://\:ftp.gnu.org/\:gnu/\:groff/" USA 
+The source code of the currently released versions of groff is
+available at the 
+.URL "ftp://\:groff.ffii.org/\:pub/\:groff/" "FFII host (Germany)" ,
+.URL "ftp://\:ftp.gnu.org/\:gnu/\:groff/" "GNU host (USA)" ,
+and its mirrors.
+.
+The USA site also contains more old, obsolete versions.
+
+The most actual pre-release, development version is available from a
+CVS repository, see below.
+.
+Development snapshots (produced twice a day from the CVS repository)
+can be downloaded with FTP from
+.URL "ftp://\:groff.ffii.org/\:pub/\:groff/devel" here .
 
-.URL http://\:www.gnu.org/\:copyleft/\:gpl.html License 
-|
-.URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ "Mailing list" 
-|
-.URL "http://\:gnuwin32.sf.net/\:packages/\:groffl.htm" "Groff for Windows" 
+For a special version of groff on the Microsoft operating systems, see
+.URL "http://\:gnuwin32.sf.net/\:packages/\:groffl.htm" "Groff for Windows" .
+
+GNU troff is released under the
+.URL http://\:www.gnu.org/\:copyleft/\:gpl.html "GNU Copyright License" .
 
 User issues lead:
 .MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding"
@@ -115,7 +126,7 @@ A CVS repository is now available, containing the current development
 version of groff.
 You can access it with the commands
 
-.RS
+.in 2m
 .nf
 .ft C
 export CVSROOT=:pserver:anoncvs@anoncvs.ffii.org:/var/cvs
@@ -123,17 +134,17 @@ cvs login
 cvs -z9 co groff
 .ft P
 .fi
-.RE
+.in
 
 (if the prompt for the password appears, just press the enter key).
 After a successful login you no longer need the first two commands; an
 update of a checked out repository should be done with
 
-.RS
+.in 2m
 .ft C
 cvs -z9 update -dP
 .ft P
-.RE
+.in
 
 Please read the info pages of cvs for further details.
 
@@ -142,17 +153,17 @@ from
 .URL ftp://\:ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz here
 or a diff file relative to the latest official groff release as:
 
-.RS
+.in 2m
 .ft C
 ftp://ftp.ffii.org/pub/groff/devel/groff-\[la]version\[ra]-current.diff.gz
 .ft P
-.RE
+.in
 
 Assuming that groff-\[la]version\[ra].tar.gz and
 groff-\[la]version\[ra]-current.diff.gz are in the same directory, do the
 following to apply the diff file:
 
-.RS
+.in 2m
 .nf
 .ft C
 tar xzvf groff-\[la]version\[ra].tar.gz
@@ -160,7 +171,7 @@ cd groff-\[la]version\[ra]
 gunzip -c ../groff-\[la]version\[ra]-current.diff.gz | patch -p1
 .ft P
 .fi
-.RE
+.in
 
 Please report bugs using the form in the file BUG-REPORT; the idea of this
 is to make sure that FSF has all the information it needs to fix the bug.
@@ -194,7 +205,10 @@ To subscribe, send e-mail to \[la]list\[ra]-request@\[la]domain\[ra]
 (example:
 .MTO groff-request@\:ffii.org groff-request@\:ffii.org )
 with the word `subscribe' in either the
-subject or body of the e-mail (don't include the quotes).
+subject or body of the e-mail (don't include the quotes) or have a look
+at the
+.URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ \
+     "groff mailing list webpage" .
 
 GNU groff was written by
 .MTO jjc@\:jclark.com "James Clark" .
@@ -205,6 +219,335 @@ and
 .
 .
 .SH
+NEWS VERSION 1.19
+.
+.SH 2
+troff
+
+.ULS
+.LI
+Input encoding files for \%latin-9 (a.k.a.\& \%latin-0 and ISO \%8859-15)
+and \%latin-2 (ISO \%8859-2) have been added.
+Example use:
+
+.in 2m
+.ft C
+groff -Tdvi -mlatin9 my_file > my_file.dvi
+.ft P
+.in
+
+You still need proper fonts with the necessary glyphs.
+Out of the box, the groff package supports \%latin-9 only for \-Tps,
+\-Tdvi, and \-Tutf8, and \%latin-2 only for \-Tdvi and \-Tutf8.
+
+.LI
+Composite glyphs are now supported.
+To do this, a subset of the Adobe Glyph List (AGL) Algorithm as described in
+.URL http://partners.adobe.com/asn/developer/typeforum/unicodegn.html \
+     http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+is used to construct glyph names based on Unicode character codes.
+The existing groff glyph names are frozen; no glyph names which can't be
+constructed algorithmically will be added in the future.
+
+The \e[...] escape sequence has been extended to specify multiple glyph
+components.
+Example:
+
+.in 2m
+.ft C
+\e[A ho]
+.ft R
+.in
+
+this accesses a glyph with the name `u0041_0328'.
+
+Some groff glyphs which are useful as composites map to `wrong' Unicode
+code points.
+For example, `ho' maps to U+02DB which is a spacing ogonek, whereas a
+non-spacing ogonek U+0328 is needed for composite glyphs.
+The new request
+
+.in 2m
+.ft C
+\&.composite from to
+.ft R
+.in
+
+will change the mapping while a composite glyph name is constructed.
+To make \e[A ho] yield the expected result,
+
+.in 2m
+.ft C
+\&.composite ho u0328
+.ft R
+.in
+
+is needed.
+[The new file `composite.tmac' loaded at start-up already
+contains proper calls to `.composite'.]
+
+Please refer to the info pages of groff and to the groff_char man page
+for more details.
+
+.LI
+A new request `fschar' has been added to define font-specific fallback
+characters.
+They are searched after the list of fonts declared with the
+`fspecial' request but before the list of fonts declared with `special'.
+
+.LI
+Fallback characters defined with `fschar' can be removed with the
+new `rfschar' request.
+
+.LI
+A new request `schar' has been added to define global fallback
+characters.
+They are searched after the list of fonts declared with the
+`special' request but before the already mounted special fonts.
+
+.LI
+In groff versions 1.18 and 1.18.1, \eD'f ...' didn't move the current
+point horizontally.
+Despite of being silly, this change has been reverted for backwards
+compatibility.
+Consequently, the intermediate output command `Df' also moves the 
+position horizontally again.
+
+\eD'f ...' is deprecated since it depends on the horizontal resolution of
+the output device (given with the `hor' parameter in the DESC file).
+Use the new \eD'Fg ...' escape instead.
+
+.LI
+For orthogonality, new \eD subcommands to change the fill color are
+available:
+
+.in 2m
+.ft C
+\eD'Fr ...' \f[R](rgb)\f[]
+.br
+\eD'Fc ...' \f[R](cmy)\f[]
+.br
+\eD'Fg ...' \f[R](gray)\f[]
+.br
+\eD'Fk ...' \f[R](cmyk)\f[]
+.br
+\eD'Fd' \f[R](default color)\f[]
+.ft R
+.in
+
+The arguments are the same as with the `defcolor' request.
+The current position is \f[I]not\f[] changed.
+
+.LI
+The values set with \eH and \eS are now available in number registers
+\en[.height] and \en[.slant], respectively.
+
+.LI
+The `.pe' number register isn't new but hasn't been documented before.
+It is set to 1 during a page ejection caused by the `bp' request.
+
+.LI
+The new glyph symbol `tno' is a textual variant of `no'.
+
+.LI
+The new glyph symbol `+e' represents U+03F5, GREEK LUNATE EPSILON SYMBOL.
+(Well, it is not really new since it has been previously supported by
+grolj4.)
+The mapping for both the dvi and lj4 symbol font has been
+changed accordingly so that Greek small letter epsilon, `*e', has the
+same glyph shape as with other devices.
+.ULE
+.
+.
+.SH 2
+grops
+
+.ULS
+.LI
+The font `freeeuro.pfa' has been added to provide various default glyph
+shapes for `eu' and `Eu'.
+
+.LI
+It is now possible to access all glyphs in a Type\~1 font, not only 256
+(provided the font file created by afmtodit has proper entries).
+grops constructs additional encoding vectors on the fly if necessary.
+
+.LI
+The paper size is now emitted via the %%DocumentMedia and PageSize
+mechanisms so that it is no longer required to tell `gv' or `ps2pdf'
+about the paper size.
+The `broken' flag value\~16 omits this feature
+(the used PostScript command `setpagedevice' is a LanguageLevel\~2
+extension).
+Patch by
+.MTO egil@\:kvaleberg.no "Egil Kvaleberg" .
+
+.LI
+Non-slanted PostScript metrics have been changed again; they no longer
+contain negative left italic correction values.
+This assures correct spacing with eqn.
+.ULE
+.
+.
+.SH 2
+grodvi
+
+.ULS
+.LI
+The font cmtex10 has been added as the special font `SC' to the DVI fonts.
+It is used as a font-specific special font for CW and CWI.
+
+.LI
+New options \-l and \-p to set landscape orientation and the paper size.
+grodvi now emits a `papersize' special which is understood by DVI drivers
+like dvips.
+
+Consequently, the DESC file should contain a `papersize' keyword.
+
+.LI
+The glyph shapes for \e[*f] and \e[*e] have been exchanged with \e[+f] and
+\e[+e], respectively, to be in sync with all other devices.
+
+.LI
+Glyphs \e[HE] and \e[DI] have been replaced with \e[u2662] and \e[u2661],
+respectively, since the former two glyphs have a black (filled) shape
+which grodvi doesn't provide by default (it never has actually).
+.ULE
+.
+.
+.SH 2
+grolj4
+
+.ULS
+.LI
+The glyphs \e[*e] and \e[+e] have been exchanged to be in sync with
+all other devices.
+
+.LI
+The glyph \e[~=] is now called \e[|=].  Similar to other devices, \e[~=]
+is now another name for glyph \e[~~].
+.ULE
+.
+.
+.SH 2
+grotty
+
+.ULS
+.LI
+New option `\-r'.
+It is similar to the \-i option except it tells grotty to
+use the `reverse video' attribute to render italic fonts.
+.ULE
+.
+.
+.SH 2
+pic
+
+.ULS
+.LI
+New command `figname' to set the name of a picture's output box in TeX
+mode.
+.ULE
+.
+.
+.SH 2
+refer
+
+.ULS
+.LI
+The environment variable `REFER' to override the name of the default
+database isn't new but hasn't been documented before.
+.ULE
+.
+.
+.SH 2
+soelim
+
+.ULS
+.LI
+New option `\-r' to avoid emission of `.lf' lines.
+
+.LI
+New option `\-t' to emit TeX comment lines (giving current file and the
+line number) instead of `.lf' lines.
+.ULE
+.
+.
+.SH 2
+afmtodit
+
+.ULS
+.LI
+Unencoded glyphs in an AFM file are output also (since grops can now emit
+multiple encoding vectors for a single font).
+
+.LI
+New option `\-m' to prevent negative left italic correction values.
+
+.LI
+The mapping and encoding file together with file `DESC' are now searched
+in the default font directory also.
+Please refer to the man page of afmtodit for more details.
+.ULE
+.
+.
+.SH 2
+macro packages
+
+.ULS
+.LI
+.MTO kollar@\:alltel.net "Larry Kollar"
+and others made the man macros more customizable.
+
+.ULS
+.LI
+New command line options \-rFT, \-rIN, and \-rSN to set the vertical
+location of the footer line, the body text indentation, and the
+sub-subheading indentation.
+
+.LI
+New command line option \-rHY (similar to the ms macros) to control
+hyphenation.
+
+.LI
+New macros `.PT' and `.BT' to print the header and footer strings.
+They can be replaced with a customized version in `man.local'.
+
+.LI
+The string `HF' now holds the typeface to print headings and
+subheadings.
+
+.LI
+Similar to the ms macros, the LT register now defaults to LL if not
+explicitly specified on the command line.
+.ULE
+
+.LI
+troff's start-up file `troffrc' now includes `papersize.tmac' to set
+the paper size with the command line option `-dpaper=<size>'.
+
+Possible values for `<size>' are the same as the predefined `papersize'
+values in the DESC file (only lowercase; see the groff_font man page)
+except \%a7-d7.
+An appended `l' (ell) character denotes landscape orientation.
+Examples: `a4', `c3l', `letterl'.
+
+Most output drivers need additional command line switches `\-p' and
+`\-l' to override the default paper length and orientation as set in
+the driver specific DESC file.
+
+For example, use the following for PS output on A4 paper in landscape
+orientation:
+
+.in 2m
+.ft C
+groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+.ft R
+.in
+.ULE
+.
+.
+.SH
 NEWS VERSION 1.18.1
 .
 .SH 2
@@ -293,23 +636,24 @@ It is scanned from left to the right, and the first valid argument is used.
 This makes it possible to provide a fallback paper size.
 
 Example:
-.RS
+
+.in 2m
 .ft C
 papersize /etc/papersize a4
 .ft P
-.RE
+.in
 
 .LI
 A local font directory has been prepended to the default font path; it
 defaults to /usr/local/share/groff/site-font.  Similar to the normal
-font searching process, files must be placed into a dev\fIXXX\fP
+font searching process, files must be placed into a dev\f[I]XXX\f[]
 subdirectory, e.g.
 
-.RS
+.in 2m
 .ft C
 /usr/local/share/groff/site-font/devps/FOO
 .ft P
-.RE
+.in
 
 for a PostScript font definition file FOO.
 .ULE
@@ -402,20 +746,22 @@ got the troff glyph name `mc'.
 .LI
 Strings can take arguments, using this syntax: \e*[foo\~arg1\~arg2\~.\|.\|.].
 Example:
-.RS
+
+.in 2m
 .nf
 .ft C
 \&.ds xxx This is a \e\e$1 test.
 \e*[xxx nice]
 .ft P
 .fi
-.RE
+.in
 
 .LI
 It is now possible to have whitespace between the first and second dot (or
 the name of the ending macro) to end a macro definition.
 Example:
-.RS
+
+.in 2m
 .nf
 .ft C
 \&.de !
@@ -430,7 +776,7 @@ Example:
 \&..
 .ft P
 .fi
-.RE
+.in
 
 .LI
 `.fn' is a new string-valued register which returns the (internal) real
@@ -505,7 +851,8 @@ final `0' can be omitted.
 the exception that the `asciify' request will use the character code (if
 any) before the character translation.
 Example:
-.RS
+
+.in 2m
 .nf
 .ft C
 \&.trin ax
@@ -519,7 +866,7 @@ a
 \&.xxx
 .ft P
 .fi
-.RE
+.in
 
 The result is `x\~a'.  Using `tr', the result would be `x\~x'.
 
@@ -535,21 +882,22 @@ post-vertical line space.
 For compatibility with plan 9's troff, multiple `pi' requests are
 supported:
 
-.RS
+.in 2m
 .nf
 .ft C
 \&.pi foo
 \&.pi bar
 .ft P
 .fi
-.RE
+.in
 
 is now equivalent to
-.RS
+
+.in 2m
 .ft C
 \&.pi foo | bar
 .ft P
-.RE
+.in
 
 .LI
 A new escape sequence `\eO' is available to disable and enable glyph
@@ -645,13 +993,14 @@ documented properly before.
 .ULS
 .LI
 The following macros have been renamed:
-.RS
+
+.in 2m
 .nf
 MAILTO -> MTO
 IMAGE  -> IMG
 LINE   -> HR
 .fi
-.RE
+.in
 
 .LI
 For consistency, the macros `URL', `FTL', and `MTO' now all have the
@@ -733,11 +1082,12 @@ New keywords `color' (or `colour', `colored', `coloured'), `outline' (or
 `outline' sets the color of the outline, `shaded' the fill color, and
 `color' sets both.
 Example:
-.RS
+
+.in 2m
 .ft C
 circle shaded "green" outline "black" ;
 .ft P
-.RE
+.in
 
 Filled arrows always use the outline color for filling.
 
@@ -814,7 +1164,8 @@ By default, font sizes are now available in the range 5\-10000pt, similar
 to PS fonts.
 If you want the old behaviour (i.e., font sizes at discrete values only),
 insert the following at the start of your document:
-.RS
+
+.in 2m
 .nf
 .ft C
 \&.if '\e*[.T]'dvi' \e
@@ -822,7 +1173,7 @@ insert the following at the start of your document:
 \&         1728 1800 2000 2074 2200 2400 2488 2800 3600
 .ft P
 .fi
-.RE
+.in
 
 .LI
 A new font file HBI (using cmssbxo10; this is slanted sans serif bold
@@ -939,17 +1290,17 @@ of examples.
 A new keyword `papersize' has been added to the DESC file format.
 Its argument is either
 
-.RS
-.IP \[bu]
+.ULS
+.LI
 a predefined paper format (e.g. `A4' or `letter')
 
-.IP \[bu]
+.LI
 a file name pointing to a file which must contain a paper size
 specification in its first line (e.g. `/etc/papersize')
 
-.IP \[bu]
+.LI
 a custom paper size definition like `35c,4i'
-.RE
+.ULE
 
 See groff_font(5) for more details.
 This keyword only affects the physical dimensions of the output medium;
@@ -959,7 +1310,7 @@ troff completely ignores it.
 .
 .HR
 .
-\s-2\fIThis document was produced using
+\s[-2]\f[I]This document was produced using
 .URL http://groff.ffii.org/ groff-\n[.x].\n[.y].\n[.Y] .
 .br
 The image at the top has been contributed by Imogen Mulley (born 1991),
diff --git a/contrib/groff/font/devX100-12/CB b/contrib/groff/font/devX100-12/CB
index 13c25dc..7d0a0bb 100644
--- a/contrib/groff/font/devX100-12/CB
+++ b/contrib/groff/font/devX100-12/CB
@@ -37,7 +37,6 @@ sl	"
 ;	10,7,3	0	073
 <	10,9	0	074
 =	10,7	0	075
-eq	"
 >	10,9	0	076
 ?	10,10	0	077
 @	10,11,1	0	0100
@@ -109,13 +108,11 @@ z	10,7	0	0172
 {	10,11,2	0	0173
 lC	"
 |	10,11,2	0	0174
-or	"
 ba	"
 }	10,11,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	10,1	0	0240
 r!	10,7,3	0	0241
@@ -129,7 +126,7 @@ ad	10,10	0	0250
 co	10,10	0	0251
 Of	10,10	0	0252
 Fo	10,7	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	10,6	0	0255
 hy	"
 rg	10,10	0	0256
diff --git a/contrib/groff/font/devX100-12/CBI b/contrib/groff/font/devX100-12/CBI
index b0d2ba6..4f3853d 100644
--- a/contrib/groff/font/devX100-12/CBI
+++ b/contrib/groff/font/devX100-12/CBI
@@ -37,7 +37,6 @@ sl	"
 ;	10,7,3	0	073
 <	10,9	0	074
 =	10,7	0	075
-eq	"
 >	10,9	0	076
 ?	10,10	0	077
 @	10,11,1	0	0100
@@ -109,13 +108,11 @@ z	10,7	0	0172
 {	10,11,2	0	0173
 lC	"
 |	10,11,2	0	0174
-or	"
 ba	"
 }	10,11,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	10,1	0	0240
 r!	10,7,4	0	0241
@@ -129,7 +126,7 @@ ad	10,10	0	0250
 co	10,10	0	0251
 Of	10,10	0	0252
 Fo	10,7	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	10,6	0	0255
 hy	"
 rg	10,10	0	0256
diff --git a/contrib/groff/font/devX100-12/CI b/contrib/groff/font/devX100-12/CI
index bacffb1..d4cc234 100644
--- a/contrib/groff/font/devX100-12/CI
+++ b/contrib/groff/font/devX100-12/CI
@@ -37,7 +37,6 @@ sl	"
 ;	10,7,2	0	073
 <	10,9	0	074
 =	10,7	0	075
-eq	"
 >	10,9	0	076
 ?	10,10	0	077
 @	10,11,1	0	0100
@@ -109,13 +108,11 @@ z	10,7	0	0172
 {	10,11,2	0	0173
 lC	"
 |	10,10,2	0	0174
-or	"
 ba	"
 }	10,11,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	10,1	0	0240
 r!	10,7,4	0	0241
@@ -129,7 +126,7 @@ ad	10,10	0	0250
 co	10,10	0	0251
 Of	10,10	0	0252
 Fo	10,7	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	10,5	0	0255
 hy	"
 rg	10,10	0	0256
diff --git a/contrib/groff/font/devX100-12/CR b/contrib/groff/font/devX100-12/CR
index 33f1454..3908ef5 100644
--- a/contrib/groff/font/devX100-12/CR
+++ b/contrib/groff/font/devX100-12/CR
@@ -37,7 +37,6 @@ sl	"
 ;	10,7,2	0	073
 <	10,9	0	074
 =	10,7	0	075
-eq	"
 >	10,9	0	076
 ?	10,10	0	077
 @	10,11,1	0	0100
@@ -109,13 +108,11 @@ z	10,7	0	0172
 {	10,11,2	0	0173
 lC	"
 |	10,10,2	0	0174
-or	"
 ba	"
 }	10,11,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	10,1	0	0240
 r!	10,7,3	0	0241
@@ -129,7 +126,7 @@ ad	10,10	0	0250
 co	10,10	0	0251
 Of	10,10	0	0252
 Fo	10,7	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	10,5	0	0255
 hy	"
 rg	10,10	0	0256
diff --git a/contrib/groff/font/devX100-12/HB b/contrib/groff/font/devX100-12/HB
index 23aedb4..f38c623 100644
--- a/contrib/groff/font/devX100-12/HB
+++ b/contrib/groff/font/devX100-12/HB
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,3	0	073
 <	10,8	0	074
 =	10,7	0	075
-eq	"
 >	10,8	0	076
 ?	10,12	0	077
 @	16,12,2	0	0100
@@ -109,13 +108,11 @@ z	8,9	0	0172
 {	6,12,3	0	0173
 lC	"
 |	4,12,4	0	0174
-or	"
 ba	"
 }	6,12,3	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	5,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	6,12	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	9,8	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/HBI b/contrib/groff/font/devX100-12/HBI
index c26bc33..e1b5832 100644
--- a/contrib/groff/font/devX100-12/HBI
+++ b/contrib/groff/font/devX100-12/HBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,3	0	073
 <	10,8	0	074
 =	10,7	0	075
-eq	"
 >	10,8	0	076
 ?	10,12	0	077
 @	16,12,2	0	0100
@@ -109,13 +108,11 @@ z	8,9	0	0172
 {	6,12,3	0	0173
 lC	"
 |	3,12,4	0	0174
-or	"
 ba	"
 }	6,12,3	0	0175
 rC	"
 ~	10,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	5,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	6,12	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	9,8	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/HI b/contrib/groff/font/devX100-12/HI
index 532a7e6..0364fc4 100644
--- a/contrib/groff/font/devX100-12/HI
+++ b/contrib/groff/font/devX100-12/HI
@@ -37,7 +37,6 @@ sl	"
 ;	4,9,2	0	073
 <	10,9	0	074
 =	10,6	0	075
-eq	"
 >	10,9	0	076
 ?	9,12	0	077
 @	17,12,1	0	0100
@@ -109,13 +108,11 @@ z	8,9	0	0172
 {	6,12,3	0	0173
 lC	"
 |	3,12,4	0	0174
-or	"
 ba	"
 }	6,12,3	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	5,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	5,12	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	9,8	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/HR b/contrib/groff/font/devX100-12/HR
index b09ff12..9ef0cd1 100644
--- a/contrib/groff/font/devX100-12/HR
+++ b/contrib/groff/font/devX100-12/HR
@@ -37,7 +37,6 @@ sl	"
 ;	4,9,2	0	073
 <	10,9	0	074
 =	10,6	0	075
-eq	"
 >	10,9	0	076
 ?	9,12	0	077
 @	17,12,2	0	0100
@@ -109,13 +108,11 @@ z	8,9	0	0172
 {	6,12,4	0	0173
 lC	"
 |	4,12,4	0	0174
-or	"
 ba	"
 }	6,12,4	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	5,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	5,12	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	9,8	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/NB b/contrib/groff/font/devX100-12/NB
index 6e20749..2c79900 100644
--- a/contrib/groff/font/devX100-12/NB
+++ b/contrib/groff/font/devX100-12/NB
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,3	0	073
 <	10,9	0	074
 =	10,7	0	075
-eq	"
 >	10,9	0	076
 ?	8,12	0	077
 @	12,12,1	0	0100
@@ -109,13 +108,11 @@ z	9,8	0	0172
 {	6,12,2	0	0173
 lC	"
 |	10,12	0	0174
-or	"
 ba	"
 }	6,12,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,9,3	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	8,7	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/NBI b/contrib/groff/font/devX100-12/NBI
index f4e3b4c..a394aab 100644
--- a/contrib/groff/font/devX100-12/NBI
+++ b/contrib/groff/font/devX100-12/NBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,3	0	073
 <	10,8	0	074
 =	10,7	0	075
-eq	"
 >	10,8	0	076
 ?	8,12	0	077
 @	12,12	0	0100
@@ -109,13 +108,11 @@ z	9,8	0	0172
 {	7,12,2	0	0173
 lC	"
 |	10,12	0	0174
-or	"
 ba	"
 }	7,12,2	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	12,12	0	0251
 Of	7,12	0	0252
 Fo	8,7	0	0253
-no	10,7	0	0254
+tno	10,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/NI b/contrib/groff/font/devX100-12/NI
index 58b233d..f24cb79 100644
--- a/contrib/groff/font/devX100-12/NI
+++ b/contrib/groff/font/devX100-12/NI
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,3	0	073
 <	10,9	0	074
 =	10,6	0	075
-eq	"
 >	10,9	0	076
 ?	7,12	0	077
 @	12,12	0	0100
@@ -109,13 +108,11 @@ z	8,8	0	0172
 {	6,12,2	0	0173
 lC	"
 |	10,12	0	0174
-or	"
 ba	"
 }	6,12,2	0	0175
 rC	"
 ~	10,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	6,9,3	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	12,12	0	0251
 Of	7,12	0	0252
 Fo	7,6	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/NR b/contrib/groff/font/devX100-12/NR
index 6f02389..38f903f 100644
--- a/contrib/groff/font/devX100-12/NR
+++ b/contrib/groff/font/devX100-12/NR
@@ -37,7 +37,6 @@ sl	"
 ;	4,8,3	0	073
 <	10,8	0	074
 =	10,6	0	075
-eq	"
 >	10,8	0	076
 ?	7,12	0	077
 @	12,12,1	0	0100
@@ -109,13 +108,11 @@ z	8,8	0	0172
 {	6,12,2	0	0173
 lC	"
 |	10,12	0	0174
-or	"
 ba	"
 }	6,12,2	0	0175
 rC	"
 ~	10,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,9,3	0	0241
@@ -129,7 +126,7 @@ ad	5,11	0	0250
 co	12,12	0	0251
 Of	6,12	0	0252
 Fo	7,6	0	0253
-no	10,6	0	0254
+tno	10,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	12,12	0	0256
diff --git a/contrib/groff/font/devX100-12/S b/contrib/groff/font/devX100-12/S
index 2f03400..c898a48 100644
--- a/contrib/groff/font/devX100-12/S
+++ b/contrib/groff/font/devX100-12/S
@@ -104,7 +104,6 @@ radicalex	8,13	0	0140
 lC	8,12,2	0	0173
 {	"
 ba	3,11,3	0	0174
-or	"
 |	"
 rC	8,12,2	0	0175
 }	"
@@ -166,6 +165,7 @@ co	13,11	0	0323
 tm	14,11	0	0324
 ---	13,13,2	0	0325
 sr	9,13,3	0	0326
+sqrt	"
 md	4,5	0	0327
 no	12,5	0	0330
 AN	10,8	0	0331
@@ -197,9 +197,11 @@ braceleftbt	8,13,4	0	0356
 lb	"
 bracerightex	8,13,4	0	0357
 braceleftex	"
+braceex	"
 bv	"
 ra	5,13,2	0	0361
 is	5,13,4	0	0362
+integral	"
 ---	11,13,4	0	0363
 ---	11,13,4	0	0364
 ---	11,13,4	0	0365
diff --git a/contrib/groff/font/devX100-12/TB b/contrib/groff/font/devX100-12/TB
index 58468cd..52635cf 100644
--- a/contrib/groff/font/devX100-12/TB
+++ b/contrib/groff/font/devX100-12/TB
@@ -37,7 +37,6 @@ sl	"
 ;	5,7,3	0	073
 <	9,8	0	074
 =	9,7	0	075
-eq	"
 >	9,8	0	076
 ?	8,11	0	077
 @	16,11,2	0	0100
@@ -109,13 +108,11 @@ z	7,8	0	0172
 {	7,11,3	0	0173
 lC	"
 |	4,11,3	0	0174
-or	"
 ba	"
 }	7,11,3	0	0175
 rC	"
 ~	9,8	0	0176
 a~	"
-ap	"
 ti	"
 ---	5,1	0	0240
 r!	6,8,4	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	12,11	0	0251
 Of	5,11	0	0252
 Fo	8,7	0	0253
-no	9,7	0	0254
+tno	9,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100-12/TBI b/contrib/groff/font/devX100-12/TBI
index c909962..03f035c 100644
--- a/contrib/groff/font/devX100-12/TBI
+++ b/contrib/groff/font/devX100-12/TBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,7,3	0	073
 <	10,8	0	074
 =	10,7	0	075
-eq	"
 >	10,8	0	076
 ?	8,11	0	077
 @	14,11,2	0	0100
@@ -109,13 +108,11 @@ z	6,8,1	0	0172
 {	6,12,3	0	0173
 lC	"
 |	4,12	0	0174
-or	"
 ba	"
 }	6,12,3	0	0175
 rC	"
 ~	10,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	6,8,4	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	12,11	0	0251
 Of	4,11	0	0252
 Fo	8,7	0	0253
-no	10,5	0	0254
+tno	10,5	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100-12/TI b/contrib/groff/font/devX100-12/TI
index 7e00aab..0f2e2e9 100644
--- a/contrib/groff/font/devX100-12/TI
+++ b/contrib/groff/font/devX100-12/TI
@@ -37,7 +37,6 @@ sl	"
 ;	5,7,2	0	073
 <	11,9	0	074
 =	11,6	0	075
-eq	"
 >	11,9	0	076
 ?	8,11	0	077
 @	15,11,3	0	0100
@@ -109,13 +108,11 @@ z	6,8	0	0172
 {	7,11,3	0	0173
 lC	"
 |	5,11,3	0	0174
-or	"
 ba	"
 }	7,11,3	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	6,8,3	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	13,11	0	0251
 Of	5,11	0	0252
 Fo	8,6	0	0253
-no	11,6	0	0254
+tno	11,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	13,11	0	0256
diff --git a/contrib/groff/font/devX100-12/TR b/contrib/groff/font/devX100-12/TR
index e95e2f4..ae83687 100644
--- a/contrib/groff/font/devX100-12/TR
+++ b/contrib/groff/font/devX100-12/TR
@@ -37,7 +37,6 @@ sl	"
 ;	4,8,1	0	073
 <	9,9	0	074
 =	9,6	0	075
-eq	"
 >	9,9	0	076
 ?	7,11	0	077
 @	15,11,3	0	0100
@@ -109,13 +108,11 @@ z	7,8	0	0172
 {	8,11,3	0	0173
 lC	"
 |	3,11	0	0174
-or	"
 ba	"
 }	8,11,3	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,8,3	0	0241
@@ -129,7 +126,7 @@ ad	6,11	0	0250
 co	13,11	0	0251
 Of	5,11	0	0252
 Fo	8,7	0	0253
-no	9,5	0	0254
+tno	9,5	0	0254
 -	5,5	0	0255
 hy	"
 rg	13,11	0	0256
diff --git a/contrib/groff/font/devX100/CB b/contrib/groff/font/devX100/CB
index 54e3124..04b75cb 100644
--- a/contrib/groff/font/devX100/CB
+++ b/contrib/groff/font/devX100/CB
@@ -37,7 +37,6 @@ sl	"
 ;	9,7,2	0	073
 <	9,8	0	074
 =	9,6	0	075
-eq	"
 >	9,8	0	076
 ?	9,9	0	077
 @	9,9	0	0100
@@ -109,13 +108,11 @@ z	9,7	0	0172
 {	9,9,2	0	0173
 lC	"
 |	9,9,2	0	0174
-or	"
 ba	"
 }	9,9,2	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	9,1	0	0240
 r!	9,7,2	0	0241
@@ -129,7 +126,7 @@ ad	9,10	0	0250
 co	9,9	0	0251
 Of	9,9	0	0252
 Fo	9,6	0	0253
-no	9,5	0	0254
+tno	9,5	0	0254
 -	9,5	0	0255
 hy	"
 rg	9,9	0	0256
diff --git a/contrib/groff/font/devX100/CBI b/contrib/groff/font/devX100/CBI
index 6139361..82aae17 100644
--- a/contrib/groff/font/devX100/CBI
+++ b/contrib/groff/font/devX100/CBI
@@ -37,7 +37,6 @@ sl	"
 ;	9,7,2	0	073
 <	9,8	0	074
 =	9,6	0	075
-eq	"
 >	9,8	0	076
 ?	9,9	0	077
 @	9,9	0	0100
@@ -109,13 +108,11 @@ z	9,7	0	0172
 {	9,9,2	0	0173
 lC	"
 |	9,9,2	0	0174
-or	"
 ba	"
 }	9,9,2	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	9,1	0	0240
 r!	9,7,3	0	0241
@@ -129,7 +126,7 @@ ad	9,10	0	0250
 co	9,9	0	0251
 Of	9,9	0	0252
 Fo	9,6	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	9,5	0	0255
 hy	"
 rg	9,9	0	0256
diff --git a/contrib/groff/font/devX100/CI b/contrib/groff/font/devX100/CI
index 578c7b3..2068685 100644
--- a/contrib/groff/font/devX100/CI
+++ b/contrib/groff/font/devX100/CI
@@ -37,7 +37,6 @@ sl	"
 ;	9,7,2	0	073
 <	9,8	0	074
 =	9,6	0	075
-eq	"
 >	9,8	0	076
 ?	9,9	0	077
 @	9,9	0	0100
@@ -109,13 +108,11 @@ z	9,7	0	0172
 {	9,10,3	0	0173
 lC	"
 |	9,9,2	0	0174
-or	"
 ba	"
 }	9,10,3	0	0175
 rC	"
 ~	9,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	9,1	0	0240
 r!	9,7,2	0	0241
@@ -129,7 +126,7 @@ ad	9,9	0	0250
 co	9,9	0	0251
 Of	9,9	0	0252
 Fo	9,7	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	9,5	0	0255
 hy	"
 rg	9,9	0	0256
diff --git a/contrib/groff/font/devX100/CR b/contrib/groff/font/devX100/CR
index c268312..9c0ef09 100644
--- a/contrib/groff/font/devX100/CR
+++ b/contrib/groff/font/devX100/CR
@@ -37,7 +37,6 @@ sl	"
 ;	9,7,2	0	073
 <	9,8	0	074
 =	9,6	0	075
-eq	"
 >	9,8	0	076
 ?	9,9	0	077
 @	9,9,1	0	0100
@@ -109,13 +108,11 @@ z	9,7	0	0172
 {	9,10,2	0	0173
 lC	"
 |	9,9,2	0	0174
-or	"
 ba	"
 }	9,10,2	0	0175
 rC	"
 ~	9,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	9,1	0	0240
 r!	9,7,2	0	0241
@@ -129,7 +126,7 @@ ad	9,9	0	0250
 co	9,9	0	0251
 Of	9,9	0	0252
 Fo	9,7	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	9,5	0	0255
 hy	"
 rg	9,9	0	0256
diff --git a/contrib/groff/font/devX100/HB b/contrib/groff/font/devX100/HB
index b4a5982..e08449b 100644
--- a/contrib/groff/font/devX100/HB
+++ b/contrib/groff/font/devX100/HB
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,1	0	073
 <	8,7	0	074
 =	9,6	0	075
-eq	"
 >	8,7	0	076
 ?	9,11	0	077
 @	14,11,1	0	0100
@@ -109,13 +108,11 @@ z	6,8	0	0172
 {	6,11,3	0	0173
 lC	"
 |	4,11,3	0	0174
-or	"
 ba	"
 }	6,11,3	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,8,3	0	0241
@@ -129,7 +126,7 @@ ad	5,11	0	0250
 co	12,11	0	0251
 Of	6,11	0	0252
 Fo	9,7	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	4,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/HBI b/contrib/groff/font/devX100/HBI
index a259d29..eee7804 100644
--- a/contrib/groff/font/devX100/HBI
+++ b/contrib/groff/font/devX100/HBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,8,2	0	073
 <	8,7	0	074
 =	9,6	0	075
-eq	"
 >	9,7	0	076
 ?	9,11	0	077
 @	14,11,2	0	0100
@@ -109,13 +108,11 @@ z	6,8	0	0172
 {	6,11,3	0	0173
 lC	"
 |	4,11,3	0	0174
-or	"
 ba	"
 }	6,11,3	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,8,3	0	0241
@@ -129,7 +126,7 @@ ad	5,11	0	0250
 co	12,11	0	0251
 Of	6,11	0	0252
 Fo	11,7	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/HI b/contrib/groff/font/devX100/HI
index 34371e4..498612a 100644
--- a/contrib/groff/font/devX100/HI
+++ b/contrib/groff/font/devX100/HI
@@ -37,7 +37,6 @@ sl	"
 ;	4,8,2	0	073
 <	9,7	0	074
 =	9,6	0	075
-eq	"
 >	9,7	0	076
 ?	8,11	0	077
 @	13,11,1	0	0100
@@ -109,13 +108,11 @@ z	7,8	0	0172
 {	5,11,3	0	0173
 lC	"
 |	4,11,3	0	0174
-or	"
 ba	"
 }	5,11,3	0	0175
 rC	"
 ~	8,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,8,3	0	0241
@@ -129,7 +126,7 @@ ad	5,10	0	0250
 co	12,11	0	0251
 Of	5,11	0	0252
 Fo	8,6	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/HR b/contrib/groff/font/devX100/HR
index c11485a..1b6aa84 100644
--- a/contrib/groff/font/devX100/HR
+++ b/contrib/groff/font/devX100/HR
@@ -37,7 +37,6 @@ sl	"
 ;	4,8,2	0	073
 <	8,7	0	074
 =	9,6	0	075
-eq	"
 >	8,7	0	076
 ?	8,11	0	077
 @	13,11,1	0	0100
@@ -109,13 +108,11 @@ z	7,8	0	0172
 {	5,11,3	0	0173
 lC	"
 |	3,11,3	0	0174
-or	"
 ba	"
 }	5,11,3	0	0175
 rC	"
 ~	8,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,8,3	0	0241
@@ -129,7 +126,7 @@ ad	5,10	0	0250
 co	12,11	0	0251
 Of	6,11	0	0252
 Fo	8,7	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	4,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/NB b/contrib/groff/font/devX100/NB
index 80be698..ccb4bc0a 100644
--- a/contrib/groff/font/devX100/NB
+++ b/contrib/groff/font/devX100/NB
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	8,8	0	074
 =	8,6	0	075
-eq	"
 >	8,8	0	076
 ?	7,11	0	077
 @	14,11	0	0100
@@ -109,13 +108,11 @@ z	7,7	0	0172
 {	6,11,2	0	0173
 lC	"
 |	8,11	0	0174
-or	"
 ba	"
 }	6,11,2	0	0175
 rC	"
 ~	8,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,8,3	0	0241
@@ -129,7 +126,7 @@ ad	7,10	0	0250
 co	12,11	0	0251
 Of	6,11	0	0252
 Fo	8,6	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/NBI b/contrib/groff/font/devX100/NBI
index e1b13d0..954457a 100644
--- a/contrib/groff/font/devX100/NBI
+++ b/contrib/groff/font/devX100/NBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,7,3	0	073
 <	9,9	0	074
 =	9,7	0	075
-eq	"
 >	9,9	0	076
 ?	7,11	0	077
 @	13,11	0	0100
@@ -109,13 +108,11 @@ z	9,7	0	0172
 {	6,11,2	0	0173
 lC	"
 |	9,11	0	0174
-or	"
 ba	"
 }	6,11,2	0	0175
 rC	"
 ~	11,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,8,3	0	0241
@@ -129,7 +126,7 @@ ad	6,10	0	0250
 co	12,11	0	0251
 Of	8,11	0	0252
 Fo	10,7	0	0253
-no	9,7	0	0254
+tno	9,7	0	0254
 -	5,5	0	0255
 hy	"
 rg	12,11	0	0256
diff --git a/contrib/groff/font/devX100/NI b/contrib/groff/font/devX100/NI
index 1213564..72cdad3 100644
--- a/contrib/groff/font/devX100/NI
+++ b/contrib/groff/font/devX100/NI
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	9,8	0	074
 =	8,6	0	075
-eq	"
 >	9,8	0	076
 ?	6,11	0	077
 @	12,11	0	0100
@@ -109,13 +108,11 @@ z	8,7	0	0172
 {	6,11,2	0	0173
 lC	"
 |	9,11	0	0174
-or	"
 ba	"
 }	6,11,2	0	0175
 rC	"
 ~	9,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,8,3	0	0241
@@ -129,7 +126,7 @@ ad	7,10	0	0250
 co	13,11	0	0251
 Of	6,11	0	0252
 Fo	8,7	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	5,5	0	0255
 hy	"
 rg	13,11	0	0256
diff --git a/contrib/groff/font/devX100/NR b/contrib/groff/font/devX100/NR
index 86def3e..8b6b3f0 100644
--- a/contrib/groff/font/devX100/NR
+++ b/contrib/groff/font/devX100/NR
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	10,7	0	074
 =	9,6	0	075
-eq	"
 >	10,7	0	076
 ?	6,11	0	077
 @	13,11	0	0100
@@ -109,13 +108,11 @@ z	7,7	0	0172
 {	4,11,2	0	0173
 lC	"
 |	9,11	0	0174
-or	"
 ba	"
 }	5,11,2	0	0175
 rC	"
 ~	9,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,8,3	0	0241
@@ -129,7 +126,7 @@ ad	6,10	0	0250
 co	14,11	0	0251
 Of	6,11	0	0252
 Fo	7,6	0	0253
-no	9,5	0	0254
+tno	9,5	0	0254
 -	5,4	0	0255
 hy	"
 rg	14,11	0	0256
diff --git a/contrib/groff/font/devX100/S b/contrib/groff/font/devX100/S
index 2669ba1..ebf37c9 100644
--- a/contrib/groff/font/devX100/S
+++ b/contrib/groff/font/devX100/S
@@ -104,7 +104,6 @@ radicalex	7,12	0	0140
 lC	7,10,3	0	0173
 {	"
 ba	3,10,3	0	0174
-or	"
 |	"
 rC	7,10,3	0	0175
 }	"
@@ -166,6 +165,7 @@ co	12,10	0	0323
 tm	11,10	0	0324
 ---	12,11,1	0	0325
 sr	8,12	0	0326
+sqrt	"
 md	4,5	0	0327
 no	10,5	0	0330
 AN	9,7	0	0331
@@ -197,9 +197,11 @@ braceleftbt	7,12,3	0	0356
 lb	"
 bracerightex	7,12,3	0	0357
 braceleftex	"
+braceex	"
 bv	"
 ra	5,12,3	0	0361
 is	4,12,1	0	0362
+integral	"
 ---	10,12,3	0	0363
 ---	10,12,3	0	0364
 ---	10,12,3	0	0365
diff --git a/contrib/groff/font/devX100/TB b/contrib/groff/font/devX100/TB
index cc40c0b..f2d18da 100644
--- a/contrib/groff/font/devX100/TB
+++ b/contrib/groff/font/devX100/TB
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	8,7	0	074
 =	8,5	0	075
-eq	"
 >	8,7	0	076
 ?	7,10	0	077
 @	14,10,2	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	7,10,3	0	0173
 lC	"
 |	3,10,2	0	0174
-or	"
 ba	"
 }	7,10,3	0	0175
 rC	"
 ~	8,7	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,7,3	0	0241
@@ -129,7 +126,7 @@ ad	5,10	0	0250
 co	12,10	0	0251
 Of	5,10	0	0252
 Fo	9,6	0	0253
-no	9,5	0	0254
+tno	9,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	12,10	0	0256
diff --git a/contrib/groff/font/devX100/TBI b/contrib/groff/font/devX100/TBI
index d892249..a1d3329 100644
--- a/contrib/groff/font/devX100/TBI
+++ b/contrib/groff/font/devX100/TBI
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	8,6	0	074
 =	10,5	0	075
-eq	"
 >	8,6	0	076
 ?	8,10	0	077
 @	15,10,2	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	7,10,3	0	0173
 lC	"
 |	4,10	0	0174
-or	"
 ba	"
 }	7,10,3	0	0175
 rC	"
 ~	10,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	7,7,3	0	0241
@@ -129,7 +126,7 @@ ad	6,9	0	0250
 co	12,10	0	0251
 Of	6,10	0	0252
 Fo	8,6	0	0253
-no	9,5	0	0254
+tno	9,5	0	0254
 -	5,4	0	0255
 hy	"
 rg	12,10	0	0256
diff --git a/contrib/groff/font/devX100/TI b/contrib/groff/font/devX100/TI
index 12fec44..9cd74e6 100644
--- a/contrib/groff/font/devX100/TI
+++ b/contrib/groff/font/devX100/TI
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,1	0	073
 <	10,7,1	0	074
 =	10,5	0	075
-eq	"
 >	10,7,1	0	076
 ?	7,10	0	077
 @	13,10,3	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	6,10,3	0	0173
 lC	"
 |	4,10,3	0	0174
-or	"
 ba	"
 }	6,10,3	0	0175
 rC	"
 ~	8,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	6,7,3	0	0241
@@ -129,7 +126,7 @@ ad	5,10	0	0250
 co	12,10	0	0251
 Of	5,10	0	0252
 Fo	7,6	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	12,10	0	0256
diff --git a/contrib/groff/font/devX100/TR b/contrib/groff/font/devX100/TR
index f27ea9d..02d7ef4 100644
--- a/contrib/groff/font/devX100/TR
+++ b/contrib/groff/font/devX100/TR
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	8,7	0	074
 =	8,5	0	075
-eq	"
 >	8,7	0	076
 ?	6,10	0	077
 @	13,10,2	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	7,10,3	0	0173
 lC	"
 |	3,10	0	0174
-or	"
 ba	"
 }	7,10,3	0	0175
 rC	"
 ~	8,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	5,7,3	0	0241
@@ -129,7 +126,7 @@ ad	5,10	0	0250
 co	12,10	0	0251
 Of	4,10	0	0252
 Fo	7,6	0	0253
-no	9,6	0	0254
+tno	9,6	0	0254
 -	4,4	0	0255
 hy	"
 rg	12,10	0	0256
diff --git a/contrib/groff/font/devX75-12/CB b/contrib/groff/font/devX75-12/CB
index e1ea460..9fd4418 100644
--- a/contrib/groff/font/devX75-12/CB
+++ b/contrib/groff/font/devX75-12/CB
@@ -37,7 +37,6 @@ sl	"
 ;	7,6,1	0	073
 <	7,7	0	074
 =	7,5	0	075
-eq	"
 >	7,7	0	076
 ?	7,8	0	077
 @	7,8	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	7,9,2	0	0173
 lC	"
 |	7,8,2	0	0174
-or	"
 ba	"
 }	7,9,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	7,1	0	0240
 r!	7,6,3	0	0241
@@ -129,7 +126,7 @@ ad	7,9	0	0250
 co	7,8	0	0251
 Of	7,9	0	0252
 Fo	7,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	7,4	0	0255
 hy	"
 rg	7,8	0	0256
diff --git a/contrib/groff/font/devX75-12/CBI b/contrib/groff/font/devX75-12/CBI
index cd6af97..131bbee 100644
--- a/contrib/groff/font/devX75-12/CBI
+++ b/contrib/groff/font/devX75-12/CBI
@@ -37,7 +37,6 @@ sl	"
 ;	7,6,1	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	7,8	0	077
 @	7,8,1	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	7,9,2	0	0173
 lC	"
 |	7,8,1	0	0174
-or	"
 ba	"
 }	7,9,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	7,1	0	0240
 r!	7,6,2	0	0241
@@ -129,7 +126,7 @@ ad	7,9	0	0250
 co	7,8	0	0251
 Of	7,8	0	0252
 Fo	7,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	7,4	0	0255
 hy	"
 rg	7,8	0	0256
diff --git a/contrib/groff/font/devX75-12/CI b/contrib/groff/font/devX75-12/CI
index a87b13a..5770928 100644
--- a/contrib/groff/font/devX75-12/CI
+++ b/contrib/groff/font/devX75-12/CI
@@ -37,7 +37,6 @@ sl	"
 ;	7,5,1	0	073
 <	7,7	0	074
 =	7,5	0	075
-eq	"
 >	7,7	0	076
 ?	7,8	0	077
 @	7,8	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	7,9,2	0	0173
 lC	"
 |	7,8,1	0	0174
-or	"
 ba	"
 }	7,9,2	0	0175
 rC	"
 ~	7,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	7,1	0	0240
 r!	7,6,3	0	0241
@@ -129,7 +126,7 @@ ad	7,8	0	0250
 co	7,8	0	0251
 Of	7,8	0	0252
 Fo	7,6	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	7,4	0	0255
 hy	"
 rg	7,8	0	0256
diff --git a/contrib/groff/font/devX75-12/CR b/contrib/groff/font/devX75-12/CR
index fcd9876..dc9ab15 100644
--- a/contrib/groff/font/devX75-12/CR
+++ b/contrib/groff/font/devX75-12/CR
@@ -37,7 +37,6 @@ sl	"
 ;	7,5,1	0	073
 <	7,7	0	074
 =	7,5	0	075
-eq	"
 >	7,7	0	076
 ?	7,8	0	077
 @	7,8	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	7,8,2	0	0173
 lC	"
 |	7,8,2	0	0174
-or	"
 ba	"
 }	7,8,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	7,1	0	0240
 r!	7,6,3	0	0241
@@ -129,7 +126,7 @@ ad	7,8	0	0250
 co	7,8	0	0251
 Of	7,8	0	0252
 Fo	7,6	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	7,4	0	0255
 hy	"
 rg	7,8	0	0256
diff --git a/contrib/groff/font/devX75-12/HB b/contrib/groff/font/devX75-12/HB
index d98123a..abc64f7 100644
--- a/contrib/groff/font/devX75-12/HB
+++ b/contrib/groff/font/devX75-12/HB
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	8,9	0	077
 @	12,9,1	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	5,9,3	0	0173
 lC	"
 |	4,9,3	0	0174
-or	"
 ba	"
 }	5,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,7,3	0	0241
@@ -129,7 +126,7 @@ ad	5,9	0	0250
 co	11,9	0	0251
 Of	6,9	0	0252
 Fo	8,6	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/HBI b/contrib/groff/font/devX75-12/HBI
index 1efb56b..9409aa0 100644
--- a/contrib/groff/font/devX75-12/HBI
+++ b/contrib/groff/font/devX75-12/HBI
@@ -37,7 +37,6 @@ sl	"
 ;	4,7,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	8,9	0	077
 @	11,9,1	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	5,9,3	0	0173
 lC	"
 |	4,9,3	0	0174
-or	"
 ba	"
 }	5,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,7,3	0	0241
@@ -129,7 +126,7 @@ ad	5,9	0	0250
 co	11,9	0	0251
 Of	6,9	0	0252
 Fo	10,6	0	0253
-no	8,5	0	0254
+tno	8,5	0	0254
 -	5,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/HI b/contrib/groff/font/devX75-12/HI
index 47bd713..de99f2e 100644
--- a/contrib/groff/font/devX75-12/HI
+++ b/contrib/groff/font/devX75-12/HI
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	8,6	0	074
 =	7,5	0	075
-eq	"
 >	8,6	0	076
 ?	7,9	0	077
 @	12,9,1	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	5,9,3	0	0173
 lC	"
 |	4,9,3	0	0174
-or	"
 ba	"
 }	5,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,6,3	0	0241
@@ -129,7 +126,7 @@ ad	3,9	0	0250
 co	11,9	0	0251
 Of	5,9	0	0252
 Fo	7,6	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/HR b/contrib/groff/font/devX75-12/HR
index ea1c779..013e7b2 100644
--- a/contrib/groff/font/devX75-12/HR
+++ b/contrib/groff/font/devX75-12/HR
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	7,9	0	077
 @	12,9,1	0	0100
@@ -109,13 +108,11 @@ z	6,7	0	0172
 {	4,9,3	0	0173
 lC	"
 |	3,9,3	0	0174
-or	"
 ba	"
 }	4,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	3,7,3	0	0241
@@ -129,7 +126,7 @@ ad	3,9	0	0250
 co	11,9	0	0251
 Of	5,9	0	0252
 Fo	7,6	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	5,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/NB b/contrib/groff/font/devX75-12/NB
index 4efa02c..5b23c8a 100644
--- a/contrib/groff/font/devX75-12/NB
+++ b/contrib/groff/font/devX75-12/NB
@@ -37,7 +37,6 @@ sl	"
 ;	4,6,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	7,9	0	077
 @	11,9	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	5,9,2	0	0173
 lC	"
 |	8,9	0	0174
-or	"
 ba	"
 }	5,9,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	4,6,3	0	0241
@@ -129,7 +126,7 @@ ad	5,9	0	0250
 co	10,9	0	0251
 Of	6,9	0	0252
 Fo	8,6	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/NBI b/contrib/groff/font/devX75-12/NBI
index 28d82e9..b7c038c 100644
--- a/contrib/groff/font/devX75-12/NBI
+++ b/contrib/groff/font/devX75-12/NBI
@@ -37,7 +37,6 @@ sl	"
 ;	4,6,2	0	073
 <	7,7	0	074
 =	7,5	0	075
-eq	"
 >	7,7	0	076
 ?	6,9	0	077
 @	11,9	0	0100
@@ -109,13 +108,11 @@ z	7,6	0	0172
 {	6,9,2	0	0173
 lC	"
 |	8,9	0	0174
-or	"
 ba	"
 }	6,9,2	0	0175
 rC	"
 ~	8,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	4,1	0	0240
 r!	5,6,3	0	0241
@@ -129,7 +126,7 @@ ad	4,9	0	0250
 co	10,9	0	0251
 Of	6,9	0	0252
 Fo	9,6	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	10,9	0	0256
diff --git a/contrib/groff/font/devX75-12/NI b/contrib/groff/font/devX75-12/NI
index 55b9060..d7ac74f 100644
--- a/contrib/groff/font/devX75-12/NI
+++ b/contrib/groff/font/devX75-12/NI
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,1	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	5,9	0	077
 @	11,9	0	0100
@@ -109,13 +108,11 @@ z	6,6	0	0172
 {	5,9,2	0	0173
 lC	"
 |	6,9	0	0174
-or	"
 ba	"
 }	5,9,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,7,2	0	0241
@@ -129,7 +126,7 @@ ad	5,9	0	0250
 co	10,9	0	0251
 Of	5,9	0	0252
 Fo	7,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	10,9	0	0256
diff --git a/contrib/groff/font/devX75-12/NR b/contrib/groff/font/devX75-12/NR
index be49439..2658838 100644
--- a/contrib/groff/font/devX75-12/NR
+++ b/contrib/groff/font/devX75-12/NR
@@ -37,7 +37,6 @@ sl	"
 ;	4,6,1	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	5,9	0	077
 @	10,9	0	0100
@@ -109,13 +108,11 @@ z	6,6	0	0172
 {	4,9,2	0	0173
 lC	"
 |	8,9	0	0174
-or	"
 ba	"
 }	4,9,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,7,2	0	0241
@@ -129,7 +126,7 @@ ad	4,9	0	0250
 co	11,9	0	0251
 Of	5,9	0	0252
 Fo	7,6	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/S b/contrib/groff/font/devX75-12/S
index 6c479c6..ad70dc6 100644
--- a/contrib/groff/font/devX75-12/S
+++ b/contrib/groff/font/devX75-12/S
@@ -104,7 +104,6 @@ radicalex	6,12	0	0140
 lC	6,9,3	0	0173
 {	"
 ba	3,9,3	0	0174
-or	"
 |	"
 rC	6,9,3	0	0175
 }	"
@@ -166,6 +165,7 @@ co	10,9	0	0323
 tm	11,9	0	0324
 ---	10,10,1	0	0325
 sr	7,12	0	0326
+sqrt	"
 md	3,4	0	0327
 no	9,4	0	0330
 AN	8,6	0	0331
@@ -197,9 +197,11 @@ braceleftbt	6,12,3	0	0356
 lb	"
 bracerightex	6,12,4	0	0357
 braceleftex	"
+braceex	"
 bv	"
 ra	4,10,2	0	0361
 is	4,12,3	0	0362
+integral	"
 ---	9,12,4	0	0363
 ---	9,12,4	0	0364
 ---	9,12,3	0	0365
diff --git a/contrib/groff/font/devX75-12/TB b/contrib/groff/font/devX75-12/TB
index fd987a9..4344108 100644
--- a/contrib/groff/font/devX75-12/TB
+++ b/contrib/groff/font/devX75-12/TB
@@ -37,7 +37,6 @@ sl	"
 ;	4,6,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	8,6	0	076
 ?	7,9	0	077
 @	12,9,2	0	0100
@@ -109,13 +108,11 @@ z	6,6	0	0172
 {	5,9,3	0	0173
 lC	"
 |	3,9,3	0	0174
-or	"
 ba	"
 }	5,9,3	0	0175
 rC	"
 ~	7,6	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,3	0	0241
@@ -129,7 +126,7 @@ ad	4,9	0	0250
 co	11,9	0	0251
 Of	4,9	0	0252
 Fo	8,6	0	0253
-no	8,5	0	0254
+tno	8,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/TBI b/contrib/groff/font/devX75-12/TBI
index 4ce7275..85e2ad6 100644
--- a/contrib/groff/font/devX75-12/TBI
+++ b/contrib/groff/font/devX75-12/TBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,6,1	0	073
 <	9,7	0	074
 =	8,5	0	075
-eq	"
 >	9,7	0	076
 ?	6,9	0	077
 @	12,9,1	0	0100
@@ -109,13 +108,11 @@ z	6,6,1	0	0172
 {	6,9,2	0	0173
 lC	"
 |	4,9	0	0174
-or	"
 ba	"
 }	6,9,2	0	0175
 rC	"
 ~	9,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,3	0	0241
@@ -129,7 +126,7 @@ ad	5,9	0	0250
 co	11,9	0	0251
 Of	6,9	0	0252
 Fo	9,6	0	0253
-no	8,6	0	0254
+tno	8,6	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/TI b/contrib/groff/font/devX75-12/TI
index 55c2aa7..598bbac 100644
--- a/contrib/groff/font/devX75-12/TI
+++ b/contrib/groff/font/devX75-12/TI
@@ -37,7 +37,6 @@ sl	"
 ;	4,6,2	0	073
 <	8,7	0	074
 =	8,5	0	075
-eq	"
 >	8,7	0	076
 ?	6,9	0	077
 @	12,9,1	0	0100
@@ -109,13 +108,11 @@ z	5,6	0	0172
 {	5,9,3	0	0173
 lC	"
 |	4,9,3	0	0174
-or	"
 ba	"
 }	5,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	5,6,3	0	0241
@@ -129,7 +126,7 @@ ad	4,8	0	0250
 co	11,9	0	0251
 Of	4,9	0	0252
 Fo	6,6	0	0253
-no	8,5	0	0254
+tno	8,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75-12/TR b/contrib/groff/font/devX75-12/TR
index 390292e..a62bb37 100644
--- a/contrib/groff/font/devX75-12/TR
+++ b/contrib/groff/font/devX75-12/TR
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	7,6	0	074
 =	7,5	0	075
-eq	"
 >	7,6	0	076
 ?	5,9	0	077
 @	11,9,2	0	0100
@@ -109,13 +108,11 @@ z	6,6	0	0172
 {	6,9,3	0	0173
 lC	"
 |	3,9	0	0174
-or	"
 ba	"
 }	6,9,3	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,3	0	0241
@@ -129,7 +126,7 @@ ad	3,8	0	0250
 co	10,9	0	0251
 Of	5,9	0	0252
 Fo	7,5	0	0253
-no	8,5	0	0254
+tno	8,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	11,9	0	0256
diff --git a/contrib/groff/font/devX75/CB b/contrib/groff/font/devX75/CB
index 1a6b6a0..1169f5b 100644
--- a/contrib/groff/font/devX75/CB
+++ b/contrib/groff/font/devX75/CB
@@ -37,7 +37,6 @@ sl	"
 ;	6,4,2	0	073
 <	6,6	0	074
 =	6,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,6	0	077
 @	6,7,1	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	6,7,1	0	0173
 lC	"
 |	6,7,2	0	0174
-or	"
 ba	"
 }	6,7,1	0	0175
 rC	"
 ~	6,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	6,1	0	0240
 r!	6,5,2	0	0241
@@ -129,7 +126,7 @@ ad	6,7	0	0250
 co	6,7	0	0251
 Of	6,7	0	0252
 Fo	6,5	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	6,4	0	0255
 hy	"
 rg	6,7	0	0256
diff --git a/contrib/groff/font/devX75/CBI b/contrib/groff/font/devX75/CBI
index c55f142..e644b30 100644
--- a/contrib/groff/font/devX75/CBI
+++ b/contrib/groff/font/devX75/CBI
@@ -37,7 +37,6 @@ sl	"
 ;	6,4,2	0	073
 <	6,6	0	074
 =	6,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,7	0	077
 @	6,7,1	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	6,7,2	0	0173
 lC	"
 |	6,7,1	0	0174
-or	"
 ba	"
 }	6,7,2	0	0175
 rC	"
 ~	6,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	6,1	0	0240
 r!	6,5,2	0	0241
@@ -129,7 +126,7 @@ ad	6,7	0	0250
 co	6,7	0	0251
 Of	6,6	0	0252
 Fo	6,4	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	6,4	0	0255
 hy	"
 rg	6,7	0	0256
diff --git a/contrib/groff/font/devX75/CI b/contrib/groff/font/devX75/CI
index a429cd0..8d0fe7b 100644
--- a/contrib/groff/font/devX75/CI
+++ b/contrib/groff/font/devX75/CI
@@ -37,7 +37,6 @@ sl	"
 ;	6,4,2	0	073
 <	6,6	0	074
 =	6,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,6	0	077
 @	6,7	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	6,7,1	0	0173
 lC	"
 |	6,7,1	0	0174
-or	"
 ba	"
 }	6,7,1	0	0175
 rC	"
 ~	6,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	6,1	0	0240
 r!	6,5,2	0	0241
@@ -129,7 +126,7 @@ ad	6,7	0	0250
 co	6,7	0	0251
 Of	6,7	0	0252
 Fo	6,4	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	6,4	0	0255
 hy	"
 rg	6,7	0	0256
diff --git a/contrib/groff/font/devX75/CR b/contrib/groff/font/devX75/CR
index d5b65f5..75689d5 100644
--- a/contrib/groff/font/devX75/CR
+++ b/contrib/groff/font/devX75/CR
@@ -37,7 +37,6 @@ sl	"
 ;	6,4,2	0	073
 <	6,6	0	074
 =	6,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,6	0	077
 @	6,7,1	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	6,7,2	0	0173
 lC	"
 |	6,7,2	0	0174
-or	"
 ba	"
 }	6,7,2	0	0175
 rC	"
 ~	6,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	6,1	0	0240
 r!	6,5,2	0	0241
@@ -129,7 +126,7 @@ ad	6,7	0	0250
 co	6,7	0	0251
 Of	6,6	0	0252
 Fo	6,4	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	6,4	0	0255
 hy	"
 rg	6,7	0	0256
diff --git a/contrib/groff/font/devX75/HB b/contrib/groff/font/devX75/HB
index e7011919..38a1d38 100644
--- a/contrib/groff/font/devX75/HB
+++ b/contrib/groff/font/devX75/HB
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	5,6	0	074
 =	6,5	0	075
-eq	"
 >	5,6	0	076
 ?	6,8	0	077
 @	11,7,2	0	0100
@@ -109,13 +108,11 @@ z	6,6	0	0172
 {	5,8,2	0	0173
 lC	"
 |	3,8,2	0	0174
-or	"
 ba	"
 }	5,8,2	0	0175
 rC	"
 ~	6,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	3,8	0	0250
 co	10,8	0	0251
 Of	5,8	0	0252
 Fo	7,4	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	5,4	0	0255
 hy	"
 rg	10,8	0	0256
diff --git a/contrib/groff/font/devX75/HBI b/contrib/groff/font/devX75/HBI
index a80630e..a4f308e 100644
--- a/contrib/groff/font/devX75/HBI
+++ b/contrib/groff/font/devX75/HBI
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	6,6	0	074
 =	6,5	0	075
-eq	"
 >	7,6	0	076
 ?	6,8	0	077
 @	10,7,2	0	0100
@@ -109,13 +108,11 @@ z	5,6	0	0172
 {	5,8,2	0	0173
 lC	"
 |	4,8,2	0	0174
-or	"
 ba	"
 }	5,8,2	0	0175
 rC	"
 ~	6,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	4,8	0	0250
 co	10,8	0	0251
 Of	5,8	0	0252
 Fo	8,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	5,4	0	0255
 hy	"
 rg	10,8	0	0256
diff --git a/contrib/groff/font/devX75/HI b/contrib/groff/font/devX75/HI
index 6f13410..9a83699 100644
--- a/contrib/groff/font/devX75/HI
+++ b/contrib/groff/font/devX75/HI
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	6,6	0	074
 =	7,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,8	0	077
 @	11,8,2	0	0100
@@ -109,13 +108,11 @@ z	5,6	0	0172
 {	4,8,2	0	0173
 lC	"
 |	3,8,2	0	0174
-or	"
 ba	"
 }	4,8,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	3,8	0	0250
 co	10,8	0	0251
 Of	5,8	0	0252
 Fo	8,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	6,4	0	0255
 hy	"
 rg	10,8	0	0256
diff --git a/contrib/groff/font/devX75/HR b/contrib/groff/font/devX75/HR
index b13ca36..1e9466b 100644
--- a/contrib/groff/font/devX75/HR
+++ b/contrib/groff/font/devX75/HR
@@ -37,7 +37,6 @@ sl	"
 ;	3,6,2	0	073
 <	6,6	0	074
 =	5,5	0	075
-eq	"
 >	6,6	0	076
 ?	6,8	0	077
 @	11,8,2	0	0100
@@ -109,13 +108,11 @@ z	5,6	0	0172
 {	3,8,2	0	0173
 lC	"
 |	3,8,2	0	0174
-or	"
 ba	"
 }	3,8,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	3,6,2	0	0241
@@ -129,7 +126,7 @@ ad	3,8	0	0250
 co	9,7	0	0251
 Of	4,8	0	0252
 Fo	6,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	9,7	0	0256
diff --git a/contrib/groff/font/devX75/NB b/contrib/groff/font/devX75/NB
index be515b5..8dbe017 100644
--- a/contrib/groff/font/devX75/NB
+++ b/contrib/groff/font/devX75/NB
@@ -37,7 +37,6 @@ sl	"
 ;	3,5,2	0	073
 <	7,6	0	074
 =	6,5	0	075
-eq	"
 >	7,6	0	076
 ?	6,8	0	077
 @	10,8	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	5,8,2	0	0173
 lC	"
 |	6,8	0	0174
-or	"
 ba	"
 }	5,8,2	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	3,6,2	0	0241
@@ -129,7 +126,7 @@ ad	4,8	0	0250
 co	9,8	0	0251
 Of	4,8	0	0252
 Fo	7,5	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	9,8	0	0256
diff --git a/contrib/groff/font/devX75/NBI b/contrib/groff/font/devX75/NBI
index b0bd22e..89c769c 100644
--- a/contrib/groff/font/devX75/NBI
+++ b/contrib/groff/font/devX75/NBI
@@ -37,7 +37,6 @@ sl	"
 ;	4,5,2	0	073
 <	7,6	0	074
 =	6,5	0	075
-eq	"
 >	7,6	0	076
 ?	6,8	0	077
 @	11,8	0	0100
@@ -109,13 +108,11 @@ z	5,5	0	0172
 {	5,8,1	0	0173
 lC	"
 |	6,8	0	0174
-or	"
 ba	"
 }	5,8,1	0	0175
 rC	"
 ~	7,5	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	4,8	0	0250
 co	9,8	0	0251
 Of	6,8	0	0252
 Fo	8,5	0	0253
-no	6,5	0	0254
+tno	6,5	0	0254
 -	4,4	0	0255
 hy	"
 rg	9,8	0	0256
diff --git a/contrib/groff/font/devX75/NI b/contrib/groff/font/devX75/NI
index a5893a3..70b989c 100644
--- a/contrib/groff/font/devX75/NI
+++ b/contrib/groff/font/devX75/NI
@@ -37,7 +37,6 @@ sl	"
 ;	3,5,1	0	073
 <	7,5	0	074
 =	6,4	0	075
-eq	"
 >	7,5	0	076
 ?	6,8	0	077
 @	9,8	0	0100
@@ -109,13 +108,11 @@ z	6,5	0	0172
 {	5,8,1	0	0173
 lC	"
 |	6,8	0	0174
-or	"
 ba	"
 }	5,8,1	0	0175
 rC	"
 ~	7,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	4,7	0	0250
 co	9,8	0	0251
 Of	5,8	0	0252
 Fo	6,5	0	0253
-no	6,4	0	0254
+tno	6,4	0	0254
 -	4,3	0	0255
 hy	"
 rg	9,8	0	0256
diff --git a/contrib/groff/font/devX75/NR b/contrib/groff/font/devX75/NR
index d2d2256..87f9518 100644
--- a/contrib/groff/font/devX75/NR
+++ b/contrib/groff/font/devX75/NR
@@ -37,7 +37,6 @@ sl	"
 ;	4,5,1	0	073
 <	7,5	0	074
 =	6,4	0	075
-eq	"
 >	7,5	0	076
 ?	5,8	0	077
 @	9,8	0	0100
@@ -109,13 +108,11 @@ z	5,5	0	0172
 {	4,8,1	0	0173
 lC	"
 |	6,8	0	0174
-or	"
 ba	"
 }	4,8,1	0	0175
 rC	"
 ~	7,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	3,1	0	0240
 r!	4,6,2	0	0241
@@ -129,7 +126,7 @@ ad	4,7	0	0250
 co	10,8	0	0251
 Of	5,8	0	0252
 Fo	6,4	0	0253
-no	6,4	0	0254
+tno	6,4	0	0254
 -	4,3	0	0255
 hy	"
 rg	10,8	0	0256
diff --git a/contrib/groff/font/devX75/S b/contrib/groff/font/devX75/S
index c42dc79..324bb42 100644
--- a/contrib/groff/font/devX75/S
+++ b/contrib/groff/font/devX75/S
@@ -104,7 +104,6 @@ radicalex	5,10	0	0140
 lC	5,7,2	0	0173
 {	"
 ba	2,7,2	0	0174
-or	"
 |	"
 rC	5,7,2	0	0175
 }	"
@@ -166,6 +165,7 @@ co	8,7,1	0	0323
 tm	10,7	0	0324
 ---	9,8,1	0	0325
 sr	6,10	0	0326
+sqrt	"
 md	3,3	0	0327
 no	7,3	0	0330
 AN	6,5	0	0331
@@ -197,9 +197,11 @@ braceleftbt	5,10,2	0	0356
 lb	"
 bracerightex	5,10,4	0	0357
 braceleftex	"
+braceex	"
 bv	"
 ra	3,7,2	0	0361
 is	3,10,2	0	0362
+integral	"
 ---	7,10,4	0	0363
 ---	7,10,4	0	0364
 ---	7,10,2	0	0365
diff --git a/contrib/groff/font/devX75/TB b/contrib/groff/font/devX75/TB
index 07c0ba0..42802e3 100644
--- a/contrib/groff/font/devX75/TB
+++ b/contrib/groff/font/devX75/TB
@@ -37,7 +37,6 @@ sl	"
 ;	4,5,1	0	073
 <	6,5	0	074
 =	6,4	0	075
-eq	"
 >	6,5	0	076
 ?	6,7	0	077
 @	11,7,2	0	0100
@@ -109,13 +108,11 @@ z	5,5	0	0172
 {	4,7,3	0	0173
 lC	"
 |	3,7,2	0	0174
-or	"
 ba	"
 }	4,7,3	0	0175
 rC	"
 ~	6,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	4,4,3	0	0241
@@ -129,7 +126,7 @@ ad	4,8	0	0250
 co	9,7	0	0251
 Of	4,7	0	0252
 Fo	6,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	3,3	0	0255
 hy	"
 rg	9,7	0	0256
diff --git a/contrib/groff/font/devX75/TBI b/contrib/groff/font/devX75/TBI
index 3655a25..3e13236 100644
--- a/contrib/groff/font/devX75/TBI
+++ b/contrib/groff/font/devX75/TBI
@@ -37,7 +37,6 @@ sl	"
 ;	5,5,1	0	073
 <	6,5	0	074
 =	7,4	0	075
-eq	"
 >	6,5	0	076
 ?	5,7	0	077
 @	11,7,2	0	0100
@@ -109,13 +108,11 @@ z	4,5	0	0172
 {	5,7,2	0	0173
 lC	"
 |	3,7	0	0174
-or	"
 ba	"
 }	5,7,2	0	0175
 rC	"
 ~	6,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	5,5,3	0	0241
@@ -129,7 +126,7 @@ ad	5,7	0	0250
 co	9,7	0	0251
 Of	5,7	0	0252
 Fo	8,5	0	0253
-no	7,5	0	0254
+tno	7,5	0	0254
 -	3,3	0	0255
 hy	"
 rg	9,7	0	0256
diff --git a/contrib/groff/font/devX75/TI b/contrib/groff/font/devX75/TI
index a151e9b..b8cae55 100644
--- a/contrib/groff/font/devX75/TI
+++ b/contrib/groff/font/devX75/TI
@@ -37,7 +37,6 @@ sl	"
 ;	3,5,2	0	073
 <	5,5	0	074
 =	7,4	0	075
-eq	"
 >	5,5	0	076
 ?	5,7	0	077
 @	10,7,2	0	0100
@@ -109,13 +108,11 @@ z	4,5	0	0172
 {	4,7,2	0	0173
 lC	"
 |	3,7,2	0	0174
-or	"
 ba	"
 }	4,7,2	0	0175
 rC	"
 ~	6,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	4,5,2	0	0241
@@ -129,7 +126,7 @@ ad	3,7	0	0250
 co	9,7	0	0251
 Of	4,7	0	0252
 Fo	5,5	0	0253
-no	7,4	0	0254
+tno	7,4	0	0254
 -	4,3	0	0255
 hy	"
 rg	9,7	0	0256
diff --git a/contrib/groff/font/devX75/TR b/contrib/groff/font/devX75/TR
index 900a3f3..4465c5a 100644
--- a/contrib/groff/font/devX75/TR
+++ b/contrib/groff/font/devX75/TR
@@ -37,7 +37,6 @@ sl	"
 ;	3,5,2	0	073
 <	5,5	0	074
 =	6,4	0	075
-eq	"
 >	5,5	0	076
 ?	4,7	0	077
 @	9,7,2	0	0100
@@ -109,13 +108,11 @@ z	5,5	0	0172
 {	4,7,2	0	0173
 lC	"
 |	2,7,2	0	0174
-or	"
 ba	"
 }	4,7,2	0	0175
 rC	"
 ~	7,4	0	0176
 a~	"
-ap	"
 ti	"
 ---	2,1	0	0240
 r!	3,5,2	0	0241
@@ -129,7 +126,7 @@ ad	5,7	0	0250
 co	9,7	0	0251
 Of	4,7	0	0252
 Fo	5,5	0	0253
-no	7,4	0	0254
+tno	7,4	0	0254
 -	4,3	0	0255
 hy	"
 rg	9,7	0	0256
diff --git a/contrib/groff/font/devascii/R.proto b/contrib/groff/font/devascii/R.proto
index 9223e46..7144dae 100644
--- a/contrib/groff/font/devascii/R.proto
+++ b/contrib/groff/font/devascii/R.proto
@@ -2,6 +2,38 @@ name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0000
+---	24	0	0001
+---	24	0	0002
+---	24	0	0003
+---	24	0	0004
+---	24	0	0005
+---	24	0	0006
+---	24	0	0007
+---	24	0	0010
+---	24	0	0011
+---	24	0	0012
+---	24	0	0013
+---	24	0	0014
+---	24	0	0015
+---	24	0	0016
+---	24	0	0017
+---	24	0	0020
+---	24	0	0021
+---	24	0	0022
+---	24	0	0023
+---	24	0	0024
+---	24	0	0025
+---	24	0	0026
+---	24	0	0027
+---	24	0	0030
+---	24	0	0031
+---	24	0	0032
+---	24	0	0033
+---	24	0	0034
+---	24	0	0035
+---	24	0	0036
+---	24	0	0037
 !	24	0	0041
 "	24	0	0042
 dq	"
@@ -122,7 +154,6 @@ f	24	0	0146
 g	24	0	0147
 h	24	0	0150
 i	24	0	0151
-.i	"
 j	24	0	0152
 k	24	0	0153
 l	24	0	0154
@@ -150,19 +181,10 @@ or	"
 bv	"
 br	"
 |	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
 rC	24	0	0175
 }	"
 a~	24	0	0176
 ~	"
 ap	"
 ti	"
+---	24	0	0177
diff --git a/contrib/groff/font/devcp1047/R.proto b/contrib/groff/font/devcp1047/R.proto
index 3dc50a7..866ad87 100644
--- a/contrib/groff/font/devcp1047/R.proto
+++ b/contrib/groff/font/devcp1047/R.proto
@@ -2,6 +2,72 @@ name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0000
+---	24	0	0001
+---	24	0	0002
+---	24	0	0003
+---	24	0	0004
+---	24	0	0005
+---	24	0	0006
+---	24	0	0007
+---	24	0	0010
+---	24	0	0011
+---	24	0	0012
+---	24	0	0013
+---	24	0	0014
+---	24	0	0015
+---	24	0	0016
+---	24	0	0017
+---	24	0	0020
+---	24	0	0021
+---	24	0	0022
+---	24	0	0023
+---	24	0	0024
+---	24	0	0025
+---	24	0	0026
+---	24	0	0027
+---	24	0	0030
+---	24	0	0031
+---	24	0	0032
+---	24	0	0033
+---	24	0	0034
+---	24	0	0035
+---	24	0	0036
+---	24	0	0037
+---	24	0	0040
+---	24	0	0041
+---	24	0	0042
+---	24	0	0043
+---	24	0	0044
+---	24	0	0045
+---	24	0	0046
+---	24	0	0047
+---	24	0	0050
+---	24	0	0051
+---	24	0	0052
+---	24	0	0053
+---	24	0	0054
+---	24	0	0055
+---	24	0	0056
+---	24	0	0057
+---	24	0	0060
+---	24	0	0061
+---	24	0	0062
+---	24	0	0063
+---	24	0	0064
+---	24	0	0065
+---	24	0	0066
+---	24	0	0067
+---	24	0	0070
+---	24	0	0071
+---	24	0	0072
+---	24	0	0073
+---	24	0	0074
+---	24	0	0075
+---	24	0	0076
+---	24	0	0077
+---	24	0	0100
+---	24	0	0101
 ^a	24	0	0102
 :a	24	0	0103
 `a	24	0	0104
@@ -22,17 +88,7 @@ pl	"
 ba	"
 br	"
 bv	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
 or	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
 &	24	0	0120
 'e	24	0	0121
 ^e	24	0	0122
@@ -116,7 +172,6 @@ f	24	0	0206
 g	24	0	0207
 h	24	0	0210
 i	24	0	0211
-.i	"
 Fo	24	0	0212
 Fc	24	0	0213
 Sd	24	0	0214
@@ -163,6 +218,7 @@ lB	"
 TP	24	0	0256
 rg	24	0	0257
 no	24	0	0260
+tno	"
 Po	24	0	0261
 Ye	24	0	0262
 md	24	0	0263
@@ -263,3 +319,4 @@ S3	24	0	0372
 :U	24	0	0374
 `U	24	0	0375
 'U	24	0	0376
+---	24	0	0377
diff --git a/contrib/groff/font/devdvi/CW b/contrib/groff/font/devdvi/CW
index 8a01912..99d5df9 100644
--- a/contrib/groff/font/devdvi/CW
+++ b/contrib/groff/font/devdvi/CW
@@ -37,7 +37,7 @@ oe	550498,451470	0	0033
 AE	550498,640797	2	0035
 OE	550498,640797	2	0036
 /O	550498,699051,58254	3	0037
----	550498,230104,116509	1	0040
+u2423	550498,230104,116509	1	0040
 !	550498,640797	2	0041
 dq	550498,640797	2	0042
 "	"
@@ -149,4 +149,4 @@ ba	"
 rC	"
 ~	550498,640797	2	0176
 a~	"
----	550498,640797	2	0177
+ad	550498,640797	2	0177
diff --git a/contrib/groff/font/devdvi/CWEC b/contrib/groff/font/devdvi/CWEC
index 9a3d588..d777901 100644
--- a/contrib/groff/font/devdvi/CWEC
+++ b/contrib/groff/font/devdvi/CWEC
@@ -36,8 +36,9 @@ fi	550368,640640	2	0034
 fl	550368,640640	2	0035
 Fi	550368,640640	2	0036
 Fl	550368,640640	2	0037
----	550368,451360,116480	1	0040
-!	550368,640640	2	0041
+u2423	550368,451360,116480	1	0040
+u01C3	550368,640640	2	0041
+!	"
 dq	550368,640640	2	0042
 "	"
 sh	550368,640640	2	0043
@@ -51,8 +52,7 @@ cq	550368,640640	2	0047
 (	550368,728000,87360	3	0050
 )	550368,728000,87360	3	0051
 *	550368,546000	2	0052
-pl	550368,556192,-84448	2	0053
-+	"
++	550368,556192,-84448	2	0053
 ,	550368,131040,145600	1	0054
 -	550368,451360	0	0055
 .	550368,131040	0	0056
@@ -71,8 +71,7 @@ sl	550368,728000,87360	3	0057
 :	550368,451360	0	0072
 ;	550368,451360,145600	1	0073
 <	550368,581362,-58240	2	0074
-eq	550368,435706,-204934	0	0075
-=	"
+=	550368,435706,-204934	0	0075
 >	550368,581362,-58240	2	0076
 ?	550368,640640	2	0077
 at	550368,640640	2	0100
@@ -142,74 +141,73 @@ y	550368,451360,232960	1	0171
 z	550368,451360	0	0172
 lC	550368,728000,87360	3	0173
 {	"
-ba	550368,728000,87360	3	0174
-bv	"
-or	"
+u01C0	550368,728000,87360	3	0174
+ba	"
 |	"
 rC	550368,728000,87360	3	0175
 }	"
 ~	550368,640640	2	0176
 hy	550368,451360	0	0177
----	550368,859040	2	0200
----	550368,640640,232960	3	0201
+u0041_0306	550368,859040	2	0200
+u0041_0328	550368,640640,232960	3	0201
 'C	550368,816227	2	0202
----	550368,859040	2	0203
----	550368,859040	2	0204
----	550368,859040	2	0205
----	550368,640640,232960	3	0206
----	550368,859040	2	0207
----	550368,816227	2	0210
----	550368,859040	2	0211
+u0043_030C	550368,859040	2	0203
+u0044_030C	550368,859040	2	0204
+u0045_030C	550368,859040	2	0205
+u0045_0328	550368,640640,232960	3	0206
+u0047_0306	550368,859040	2	0207
+u004C_0301	550368,816227	2	0210
+u004C_030C	550368,859040	2	0211
 /L	550368,640640	2	0212
----	550368,816227	2	0213
----	550368,859040	2	0214
----	550368,640640	2	0215
----	550368,816227	2	0216
----	550368,816227	2	0217
----	550368,859040	2	0220
----	550368,816227	2	0221
+u004E_0301	550368,816227	2	0213
+u004E_030C	550368,859040	2	0214
+u014A	550368,640640	2	0215
+u004F_030B	550368,816227	2	0216
+u0052_0301	550368,816227	2	0217
+u0052_030C	550368,859040	2	0220
+u0053_0301	550368,816227	2	0221
 vS	550368,859040	2	0222
----	550368,640640,203840	3	0223
----	550368,859040	2	0224
----	550368,640640,203840	3	0225
----	550368,816227	2	0226
----	550368,859040	2	0227
+u0053_0327	550368,640640,203840	3	0223
+u0054_030C	550368,859040	2	0224
+u0054_0327	550368,640640,203840	3	0225
+u0055_030B	550368,816227	2	0226
+u0055_030A	550368,859040	2	0227
 :Y	550368,859040	2	0230
----	550368,816227	2	0231
+u005A_0301	550368,816227	2	0231
 vZ	550368,859040	2	0232
----	550368,816227	2	0233
+u005A_0307	550368,816227	2	0233
 IJ	550368,640640	2	0234
----	550368,816227	2	0235
----	550368,640640	2	0236
+u0049_0307	550368,816227	2	0235
+u0111	550368,640640	2	0236
 sc	550368,640640,232960	3	0237
----	550368,669760	2	0240
----	550368,451360,232960	1	0241
+u0061_0306	550368,669760	2	0240
+u0061_0328	550368,451360,232960	1	0241
 'c	550368,640640	2	0242
----	550368,669760	2	0243
----	550368,640640	2	0244
----	550368,669760	2	0245
----	550368,451360,232960	1	0246
----	550368,669760,232960	3	0247
----	550368,816227	2	0250
----	550368,640640	2	0251
+u0063_030C	550368,669760	2	0243
+u0064_030C	550368,640640	2	0244
+u0065_030C	550368,669760	2	0245
+u0065_0328	550368,451360,232960	1	0246
+u0067_0306	550368,669760,232960	3	0247
+u006C_0301	550368,816227	2	0250
+u006C_030C	550368,640640	2	0251
 /l	550368,640640	2	0252
----	550368,640640	2	0253
----	550368,669760	2	0254
----	550368,451360,232960	1	0255
----	550368,640640	2	0256
----	550368,640640	2	0257
----	550368,669760	2	0260
----	550368,640640	2	0261
+u006E_0301	550368,640640	2	0253
+u006E_030C	550368,669760	2	0254
+u016A	550368,451360,232960	1	0255
+u006F_030B	550368,640640	2	0256
+u0072_0301	550368,640640	2	0257
+u0072_030C	550368,669760	2	0260
+u0073_0301	550368,640640	2	0261
 vs	550368,669760	2	0262
----	550368,451360,203840	1	0263
----	550368,640640	2	0264
----	550368,581362,203840	3	0265
----	550368,640640	2	0266
----	550368,669760	2	0267
+u0073_0327	550368,451360,203840	1	0263
+u0074_030C	550368,640640	2	0264
+u0074_0327	550368,581362,203840	3	0265
+u0075_030B	550368,640640	2	0266
+u0075_030A	550368,669760	2	0267
 :y	550368,640640,232960	3	0270
----	550368,640640	2	0271
+u007A_0301	550368,640640	2	0271
 vz	550368,669760	2	0272
----	550368,640640	2	0273
+u007A_0307	550368,640640	2	0273
 ij	550368,640640,232960	3	0274
 r!	550368,407680,232960	1	0275
 r?	550368,407680,232960	1	0276
@@ -230,7 +228,9 @@ AE	550368,640640	2	0306
 'I	550368,816227	2	0315
 ^I	550368,859040	2	0316
 :I	550368,859040	2	0317
--D	550368,640640	2	0320
+u0189	550368,640640	2	0320
+u0110	"
+-D	"
 ~N	550368,859040	2	0321
 `O	550368,816227	2	0322
 'O	550368,816227	2	0323
diff --git a/contrib/groff/font/devdvi/CWI b/contrib/groff/font/devdvi/CWI
index d241754..e39575d 100644
--- a/contrib/groff/font/devdvi/CWI
+++ b/contrib/groff/font/devdvi/CWI
@@ -37,7 +37,7 @@ oe	550498,451470,0,182045	0	0033
 AE	550498,640797,0,182045	2	0035
 OE	550498,640797,0,182045	2	0036
 /O	550498,699051,58254,182045	3	0037
----	550498,230104,116509,182045	1	0040
+u2423	550498,230104,116509,182045	1	0040
 !	550498,640797,0,182045	2	0041
 dq	550498,640797,0,182045	2	0042
 "	"
@@ -149,4 +149,4 @@ ba	"
 rC	"
 ~	550498,640797,0,182045	2	0176
 a~	"
----	550498,640797,0,182045	2	0177
+ad	550498,640797,0,182045	2	0177
diff --git a/contrib/groff/font/devdvi/CWIEC b/contrib/groff/font/devdvi/CWIEC
index 8d8fb9d..5e2356b 100644
--- a/contrib/groff/font/devdvi/CWIEC
+++ b/contrib/groff/font/devdvi/CWIEC
@@ -37,8 +37,9 @@ fi	550368,640640,232960,182000	3	0034
 fl	550368,640640,232960,182000	3	0035
 Fi	550368,640640,232960,182000	3	0036
 Fl	550368,640640,232960,182000	3	0037
----	550368,451360,116480,182000	1	0040
-!	550368,640640,0,182000	2	0041
+u2423	550368,451360,116480,182000	1	0040
+u01C3	550368,640640,0,182000	2	0041
+!	"
 dq	550368,640640,0,182000	2	0042
 "	"
 sh	550368,640640,0,182000	2	0043
@@ -52,8 +53,7 @@ cq	550368,640640,0,182000	2	0047
 (	550368,728000,87360,182000	3	0050
 )	550368,728000,87360,182000	3	0051
 *	550368,546000,0,182000	2	0052
-pl	550368,556192,-84448,182000	2	0053
-+	"
++	550368,556192,-84448,182000	2	0053
 ,	550368,131040,145600,182000	1	0054
 -	550368,451360,0,182000	0	0055
 .	550368,131040,0,182000	0	0056
@@ -72,8 +72,7 @@ sl	550368,728000,87360,182000	3	0057
 :	550368,451360,0,182000	0	0072
 ;	550368,451360,145600,182000	1	0073
 <	550368,582400,-58240,182000	2	0074
-eq	550368,435706,-204934,182000	0	0075
-=	"
+=	550368,435706,-204934,182000	0	0075
 >	550368,582400,-58240,182000	2	0076
 ?	550368,640640,0,182000	2	0077
 at	550368,640640,0,182000	2	0100
@@ -143,74 +142,73 @@ y	550368,451360,232960,182000	1	0171
 z	550368,451360,0,182000	0	0172
 lC	550368,728000,87360,182000	3	0173
 {	"
-ba	550368,728000,87360,182000	3	0174
-bv	"
-or	"
+u01C0	550368,728000,87360,182000	3	0174
+ba	"
 |	"
 rC	550368,728000,87360,182000	3	0175
 }	"
 ~	550368,640640,0,182000	2	0176
 hy	550368,451360,0,182000	0	0177
----	550368,859040,0,182000	2	0200
----	550368,640640,232960,182000	3	0201
+u0041_0306	550368,859040,0,182000	2	0200
+u0041_0328	550368,640640,232960,182000	3	0201
 'C	550368,816379,0,182000	2	0202
----	550368,859040,0,182000	2	0203
----	550368,859040,0,182000	2	0204
----	550368,859040,0,182000	2	0205
----	550368,640640,232960,182000	3	0206
----	550368,859040,0,182000	2	0207
----	550368,816379,0,182000	2	0210
----	550368,859040,0,182000	2	0211
+u0043_030C	550368,859040,0,182000	2	0203
+u0044_030C	550368,859040,0,182000	2	0204
+u0045_030C	550368,859040,0,182000	2	0205
+u0045_0328	550368,640640,232960,182000	3	0206
+u0047_0306	550368,859040,0,182000	2	0207
+u004C_0301	550368,816379,0,182000	2	0210
+u004C_030C	550368,859040,0,182000	2	0211
 /L	550368,640640,0,182000	2	0212
----	550368,816379,0,182000	2	0213
----	550368,859040,0,182000	2	0214
----	550368,640640,0,160160	2	0215
----	550368,816379,0,182000	2	0216
----	550368,816379,0,182000	2	0217
----	550368,859040,0,182000	2	0220
----	550368,816379,0,182000	2	0221
+u004E_0301	550368,816379,0,182000	2	0213
+u004E_030C	550368,859040,0,182000	2	0214
+u014A	550368,640640,0,160160	2	0215
+u004F_030B	550368,816379,0,182000	2	0216
+u0052_0301	550368,816379,0,182000	2	0217
+u0052_030C	550368,859040,0,182000	2	0220
+u0053_0301	550368,816379,0,182000	2	0221
 vS	550368,859040,0,182000	2	0222
----	550368,640640,203840,182000	3	0223
----	550368,859040,0,182000	2	0224
----	550368,640640,203840,182000	3	0225
----	550368,816379,0,182000	2	0226
----	550368,859040,0,182000	2	0227
+u0053_0327	550368,640640,203840,182000	3	0223
+u0054_030C	550368,859040,0,182000	2	0224
+u0054_0327	550368,640640,203840,182000	3	0225
+u0055_030B	550368,816379,0,182000	2	0226
+u0055_030A	550368,859040,0,182000	2	0227
 :Y	550368,859040,0,182000	2	0230
----	550368,816379,0,182000	2	0231
+u005A_0301	550368,816379,0,182000	2	0231
 vZ	550368,859040,0,182000	2	0232
----	550368,816379,0,182000	2	0233
+u005A_0307	550368,816379,0,182000	2	0233
 IJ	550368,640640,0,182000	2	0234
----	550368,816379,0,182000	2	0235
----	550368,640640,0,182000	2	0236
+u0049_0307	550368,816379,0,182000	2	0235
+u0111	550368,640640,0,182000	2	0236
 sc	550368,640640,232960,182000	3	0237
----	550368,669760,0,182000	2	0240
----	550368,451360,232960,182000	1	0241
+u0061_0306	550368,669760,0,182000	2	0240
+u0061_0328	550368,451360,232960,182000	1	0241
 'c	550368,640640,0,182000	2	0242
----	550368,669760,0,182000	2	0243
----	550368,640640,0,182000	2	0244
----	550368,669760,0,182000	2	0245
----	550368,451360,232960,182000	1	0246
----	550368,669760,232960,182000	3	0247
----	550368,816379,0,182000	2	0250
----	550368,640640,0,182000	2	0251
+u0063_030C	550368,669760,0,182000	2	0243
+u0064_030C	550368,640640,0,182000	2	0244
+u0065_030C	550368,669760,0,182000	2	0245
+u0065_0328	550368,451360,232960,182000	1	0246
+u0067_0306	550368,669760,232960,182000	3	0247
+u006C_0301	550368,816379,0,182000	2	0250
+u006C_030C	550368,640640,0,182000	2	0251
 /l	550368,640640,0,182000	2	0252
----	550368,640640,0,182000	2	0253
----	550368,669760,0,182000	2	0254
----	550368,451360,232960,182000	1	0255
----	550368,669760,0,182000	2	0256
----	550368,640640,0,182000	2	0257
----	550368,669760,0,182000	2	0260
----	550368,640640,0,182000	2	0261
+u006E_0301	550368,640640,0,182000	2	0253
+u006E_030C	550368,669760,0,182000	2	0254
+u016A	550368,451360,232960,182000	1	0255
+u006F_030B	550368,669760,0,182000	2	0256
+u0072_0301	550368,640640,0,182000	2	0257
+u0072_030C	550368,669760,0,182000	2	0260
+u0073_0301	550368,640640,0,182000	2	0261
 vs	550368,669760,0,182000	2	0262
----	550368,451360,203840,182000	1	0263
----	550368,640640,0,182000	2	0264
----	550368,640640,203840,182000	3	0265
----	550368,640640,0,182000	2	0266
----	550368,669760,0,182000	2	0267
+u0073_0327	550368,451360,203840,182000	1	0263
+u0074_030C	550368,640640,0,182000	2	0264
+u0074_0327	550368,640640,203840,182000	3	0265
+u0075_030B	550368,640640,0,182000	2	0266
+u0075_030A	550368,669760,0,182000	2	0267
 :y	550368,669760,232960,182000	3	0270
----	550368,640640,0,182000	2	0271
+u007A_0301	550368,640640,0,182000	2	0271
 vz	550368,669760,0,182000	2	0272
----	550368,640640,0,182000	2	0273
+u007A_0307	550368,640640,0,182000	2	0273
 ij	550368,640640,232960,182000	3	0274
 r!	550368,407680,232960,182000	1	0275
 r?	550368,407680,232960,182000	1	0276
@@ -231,7 +229,9 @@ AE	550368,640640,0,182000	2	0306
 'I	550368,816379,0,182000	2	0315
 ^I	550368,859040,0,182000	2	0316
 :I	550368,859040,0,182000	2	0317
--D	550368,640640,0,182000	2	0320
+u0189	550368,640640,0,182000	2	0320
+u0110	"
+-D	"
 ~N	550368,859040,0,182000	2	0321
 `O	550368,816379,0,182000	2	0322
 'O	550368,816379,0,182000	2	0323
diff --git a/contrib/groff/font/devdvi/CWITC b/contrib/groff/font/devdvi/CWITC
index bf4aa1b..65d6ddb 100644
--- a/contrib/groff/font/devdvi/CWITC
+++ b/contrib/groff/font/devdvi/CWITC
@@ -31,11 +31,11 @@ charset
 ---	550368,640640,0,182000	2	0034
 ---	550368,640640,0,182000	2	0035
 ---	0,640640	2	0037
----	550368,640640,0,182000	2	0040
+u2422	550368,640640,0,182000	2	0040
 Do	550368,728000,87360,182000	3	0044
 $	"
 aq	550368,640640,0,182000	2	0047
-**	550368,551096,-94640,182000	2	0052
+---	550368,551096,-94640,182000	2	0052
 ,	550368,130000,145600,182000	1	0054
 ---	550368,435706,-204934,182000	0	0055
 .	550368,130000,0,182000	0	0056
@@ -51,14 +51,13 @@ f/	550368,728000,87360,182000	3	0057
 8	550368,640640,0,182000	2	0070
 9	550368,451360,232960,182000	1	0071
 la	550368,728000,87360,182000	3	0074
-mi	550368,551096,-84448,182000	2	0075
-\-	"
+\-	550368,551096,-84448,182000	2	0075
 ra	550368,728000,87360,182000	3	0076
----	550368,640640,0,182000	2	0115
+u2127	550368,640640,0,182000	2	0115
 ci	550368,728000,232960,182000	3	0117
----	550368,640640,0,182000	2	0127
----	550368,728000,87360,182000	3	0133
----	550368,728000,87360,182000	3	0135
+u03A9	550368,640640,0,182000	2	0127
+u301A	550368,728000,87360,182000	3	0133
+u301B	550368,728000,87360,182000	3	0135
 ua	550368,640640,0,182000	2	0136
 da	550368,640640,0,182000	2	0137
 ---	550368,640640,0,182000	2	0140
@@ -67,7 +66,7 @@ da	550368,640640,0,182000	2	0137
 ---	550368,571115,18930,182000	3	0144
 ---	550368,640640,0,182000	2	0154
 ---	550368,551096,-94640,182000	2	0155
----	672672,640640	2	0156
+u266A	672672,640640	2	0156
 ti	550368,130000,0,182000	0	0176
 ~	"
 ---	550368,435706,-204934,182000	0	0177
@@ -77,34 +76,34 @@ ti	550368,130000,0,182000	0	0176
 ---	550368,640640,0,182000	2	0203
 dg	550368,640640,232960,182000	3	0204
 dd	550368,640640,232960,182000	3	0205
----	550368,728000,87360,182000	3	0206
-%O	550368,728000,87360,182000	3	0207
+u2016	550368,728000,87360,182000	3	0206
+%0	550368,728000,87360,182000	3	0207
 bu	550368,534352,-106288,182000	2	0210
----	550368,640640,0,182000	2	0211
+u2103	550368,640640,0,182000	2	0211
 ---	550368,728000,87360,182000	3	0212
 ---	550368,571115,116480,182000	3	0213
 Fn	550368,640640,232960,182000	3	0214
----	550368,728000,87360,182000	3	0215
----	550368,640640,0,182000	2	0216
----	550368,640640,0,182000	2	0217
+u20A1	550368,728000,87360,182000	3	0215
+u20A9	550368,640640,0,182000	2	0216
+u20A6	550368,640640,0,182000	2	0217
 ---	550368,728000,87360,182000	3	0220
----	550368,640640,0,182000	2	0221
----	550368,640640,0,182000	2	0222
----	550368,640640,0,182000	2	0223
----	550368,640640,0,182000	2	0224
+u20B1	550368,640640,0,182000	2	0221
+u20A4	550368,640640,0,182000	2	0222
+u211E	550368,640640,0,182000	2	0223
+u203D	550368,640640,0,182000	2	0224
 ---	550368,407680,232960,182000	1	0225
----	550368,728000,0,182000	2	0226
+u20AB	550368,728000,0,182000	2	0226
 tm	550368,728000,0,182000	2	0227
----	550368,728000,87360,182000	3	0230
+u2031	550368,728000,87360,182000	3	0230
 ---	550368,640640,232960,182000	3	0231
----	550368,728000,87360,182000	3	0232
----	550368,640640,0,182000	2	0233
----	550368,728000,0,182000	2	0234
----	550368,640640,0,182000	2	0235
----	550368,534352,-106288,182000	2	0236
----	550368,728000,0,182000	2	0237
----	550368,728000,87360,182000	3	0240
----	550368,728000,87360,182000	3	0241
+u0E3F	550368,728000,87360,182000	3	0232
+u2116	550368,640640,0,182000	2	0233
+u2052	550368,728000,0,182000	2	0234
+u212E	550368,640640,0,182000	2	0235
+u25E6	550368,534352,-106288,182000	2	0236
+u2120	550368,728000,0,182000	2	0237
+u2045	550368,728000,87360,182000	3	0240
+u2046	550368,728000,87360,182000	3	0241
 ct	550368,571115,116480,182000	3	0242
 Po	550368,640640,0,182000	2	0243
 Cs	550368,580323,0,182000	2	0244
@@ -115,10 +114,10 @@ sc	550368,640640,232960,182000	3	0247
 co	550368,728000,232960,182000	3	0251
 Of	550368,728000,0,182000	2	0252
 ---	550368,728000,232960,182000	3	0253
-no	550368,451360,0,182000	0	0254
----	550368,728000,232960,182000	3	0255
+tno	550368,451360,0,182000	0	0254
+u2117	550368,728000,232960,182000	3	0255
 rg	550368,728000,232960,182000	3	0256
-rn	550368,640640,0,182000	2	0257
+---	550368,640640,0,182000	2	0257
 de	550368,640640,0,182000	2	0260
 t+-	550368,551096,-84448,182000	2	0261
 S2	550368,728000,0,182000	2	0262
@@ -127,13 +126,13 @@ S3	550368,728000,0,182000	2	0263
 mc	550368,451360,232960,182000	1	0265
 ps	550368,640640,232960,182000	3	0266
 pc	550368,451360,0,182000	0	0267
----	550368,514453,0,182000	2	0270
+u203B	550368,514453,0,182000	2	0270
 S1	550368,728000,0,182000	2	0271
 Om	550368,728000,0,182000	2	0272
 ---	550368,728000,14560,182000	3	0273
-14	550368,728000,232960,182000	3	0274
-12	550368,728000,232960,182000	3	0275
-34	550368,728000,232960,182000	3	0276
+---	550368,728000,232960,182000	3	0274
+---	550368,728000,232960,182000	3	0275
+---	550368,728000,232960,182000	3	0276
 Eu	550368,640640,0,182000	2	0277
 tmu	550368,551096,-84448,182000	2	0326
 tdi	550368,551096,-84448,182000	2	0366
diff --git a/contrib/groff/font/devdvi/CWTC b/contrib/groff/font/devdvi/CWTC
index 2c6d028..4e2eea3 100644
--- a/contrib/groff/font/devdvi/CWTC
+++ b/contrib/groff/font/devdvi/CWTC
@@ -30,11 +30,11 @@ charset
 ---	550368,640640	2	0034
 ---	550368,640640	2	0035
 ---	0,640640	2	0037
----	550368,640640	2	0040
+u2422	550368,640640	2	0040
 Do	550368,728000,87360	3	0044
 $	"
 aq	550368,640640	2	0047
-**	550368,551096,-94640	2	0052
+---	550368,551096,-94640	2	0052
 ,	550368,130000,145600	1	0054
 ---	550368,435706,-204934	0	0055
 .	550368,130000	0	0056
@@ -50,14 +50,13 @@ f/	550368,728000,87360	3	0057
 8	550368,640640	2	0070
 9	550368,451360,232960	1	0071
 la	550368,728000,87360	3	0074
-mi	550368,551096,-84448	2	0075
-\-	"
+\-	550368,551096,-84448	2	0075
 ra	550368,728000,87360	3	0076
----	550368,640640	2	0115
+u2127	550368,640640	2	0115
 ci	550368,728000,232960	3	0117
----	550368,640640	2	0127
----	550368,728000,87360	3	0133
----	550368,728000,87360	3	0135
+u03A9	550368,640640	2	0127
+u301A	550368,728000,87360	3	0133
+u301B	550368,728000,87360	3	0135
 ua	550368,640640	2	0136
 da	550368,640640	2	0137
 ---	550368,640640	2	0140
@@ -66,7 +65,7 @@ da	550368,640640	2	0137
 ---	550368,571115,18930	3	0144
 ---	550368,640640	2	0154
 ---	550368,551096,-94640	2	0155
----	672672,640640	2	0156
+u266A	672672,640640	2	0156
 ti	550368,130000	0	0176
 ~	"
 ---	550368,435706,-204934	0	0177
@@ -76,34 +75,34 @@ ti	550368,130000	0	0176
 ---	550368,640640	2	0203
 dg	550368,640640,232960	3	0204
 dd	550368,640640,232960	3	0205
----	550368,728000,87360	3	0206
-%O	550368,728000,87360	3	0207
+u2016	550368,728000,87360	3	0206
+%0	550368,728000,87360	3	0207
 bu	550368,534352,-106288	2	0210
----	550368,640640	2	0211
+u2103	550368,640640	2	0211
 ---	550368,728000,87360	3	0212
 ---	550368,571115,116480	3	0213
 Fn	550368,640640	2	0214
----	550368,728000,87360	3	0215
----	550368,640640	2	0216
----	550368,640640	2	0217
+u20A1	550368,728000,87360	3	0215
+u20A9	550368,640640	2	0216
+u20A6	550368,640640	2	0217
 ---	550368,728000,87360	3	0220
----	550368,640640	2	0221
----	550368,640640	2	0222
----	550368,640640	2	0223
----	550368,640640	2	0224
+u20B1	550368,640640	2	0221
+u20A4	550368,640640	2	0222
+u211E	550368,640640	2	0223
+u203D	550368,640640	2	0224
 ---	550368,407680,232960	1	0225
----	550368,728000	2	0226
+u20AB	550368,728000	2	0226
 tm	550368,728000	2	0227
----	550368,728000,87360	3	0230
+u2031	550368,728000,87360	3	0230
 ---	550368,640640,232960	3	0231
----	550368,728000,87360	3	0232
----	550368,640640	2	0233
----	550368,728000	2	0234
----	550368,640640	2	0235
----	550368,534352,-106288	2	0236
----	550368,728000	2	0237
----	550368,728000,87360	3	0240
----	550368,728000,87360	3	0241
+u0E3F	550368,728000,87360	3	0232
+u2116	550368,640640	2	0233
+u2052	550368,728000	2	0234
+u212E	550368,640640	2	0235
+u25E6	550368,534352,-106288	2	0236
+u2120	550368,728000	2	0237
+u2045	550368,728000,87360	3	0240
+u2046	550368,728000,87360	3	0241
 ct	550368,571115,116480	3	0242
 Po	550368,640640	2	0243
 Cs	550368,580323	2	0244
@@ -114,10 +113,10 @@ sc	550368,640640,232960	3	0247
 co	550368,728000,232960	3	0251
 Of	550368,728000	2	0252
 ---	550368,728000,232960	3	0253
-no	550368,451360	0	0254
----	550368,728000,232960	3	0255
+tno	550368,451360	0	0254
+u2117	550368,728000,232960	3	0255
 rg	550368,728000,232960	3	0256
-rn	550368,640640	2	0257
+---	550368,640640	2	0257
 de	550368,640640	2	0260
 t+-	550368,551096,-84448	2	0261
 S2	550368,728000	2	0262
@@ -126,13 +125,13 @@ S3	550368,728000	2	0263
 mc	550368,451360,232960	1	0265
 ps	550368,640640,232960	3	0266
 pc	550368,451360	0	0267
----	550368,514453	2	0270
+u203B	550368,514453	2	0270
 S1	550368,728000	2	0271
 Om	550368,728000	2	0272
 ---	550368,728000,14560	3	0273
-14	550368,728000,232960	3	0274
-12	550368,728000,232960	3	0275
-34	550368,728000,232960	3	0276
+---	550368,728000,232960	3	0274
+---	550368,728000,232960	3	0275
+---	550368,728000,232960	3	0276
 Eu	550368,640640	2	0277
 tmu	550368,551096,-84448	2	0326
 tdi	550368,551096,-84448	2	0366
diff --git a/contrib/groff/font/devdvi/EX b/contrib/groff/font/devdvi/EX
index 6e83d02..a410984 100644
--- a/contrib/groff/font/devdvi/EX
+++ b/contrib/groff/font/devdvi/EX
@@ -104,7 +104,6 @@ bigcirclemultiply	1584520,104859,1572877	1	0117
 sum	1514614,104859,1572877	1	0130
 product	1339851,104859,1572877	1	0131
 integral	582544,0,2330194,466035	1	0132
-is	"
 bigunion	1165088,104859,1572877	1	0133
 bigintersection	1165088,104859,1572877	1	0134
 bigunionplus	1165088,104859,1572877	1	0135
@@ -126,10 +125,10 @@ ceilingleft1	553418,41942,1845514	1	0154
 ceilingright1	553418,41942,1845514	1	0155
 braceleft1	699053,41942,1845514	1	0156
 braceright1	699053,41942,1845514	1	0157
-sr0	1048579,41942,1216362	1	0160
-sr1	1048579,41942,1845514	1	0161
-sr2	1048579,41942,2474666	1	0162
-sr3	1048579,41942,3103818	1	0163
+sqrt0	1048579,41942,1216362	1	0160
+sqrt1	1048579,41942,1845514	1	0161
+sqrt2	1048579,41942,2474666	1	0162
+sqrt3	1048579,41942,3103818	1	0163
 ---	1106834,0,1887456	1	0164
 ---	1106834,0,629152	1	0165
 ---	1106834,41942,587210	1	0166
diff --git a/contrib/groff/font/devdvi/HB b/contrib/groff/font/devdvi/HB
index bd91584..7d9847b 100644
--- a/contrib/groff/font/devdvi/HB
+++ b/contrib/groff/font/devdvi/HB
@@ -12,6 +12,8 @@ ff ! 80101
 ff ) 80101
 ff rB 80101
 ff ] 80101
+slash@for@l l -267971
+slash@for@l L -307293
 cq ? 128160
 ' ? 128160
 cq ! 128160
@@ -185,7 +187,7 @@ oe	897120,480597	0	0033
 AE	993240,728178	2	0035
 OE	1121400,728178	2	0036
 /O	897120,779150,50973	3	0037
----	267971,480597	0	0040
+slash@for@l	267971,480597	0	0040
 !	384480,728178	2	0041
 rq	585458,728178	2	0042
 sh	961200,728178,203888	3	0043
diff --git a/contrib/groff/font/devdvi/HBEC b/contrib/groff/font/devdvi/HBEC
index c0365dd..8347193 100644
--- a/contrib/groff/font/devdvi/HBEC
+++ b/contrib/groff/font/devdvi/HBEC
@@ -9,6 +9,7 @@ bq Bq 128128
 bq j 128128
 bq .j 128128
 bq g 64064
+bq u0067_0306 64064
 bq y 64064
 bq :y 64064
 bq 'y 64064
@@ -20,6 +21,7 @@ bq Y -96096
 bq :Y -96096
 bq 'Y -96096
 bq O -32032
+bq u004F_030B -32032
 bq `O -32032
 bq 'O -32032
 bq ^O -32032
@@ -30,6 +32,8 @@ bq /O -32032
 bq C -32032
 bq G -32032
 bq 'C -32032
+bq u0043_030C -32032
+bq u0047_0306 -32032
 bq ,C -32032
 bq Q -32032
 lq oq 128128
@@ -44,6 +48,7 @@ Bq Bq 128128
 Bq j 128128
 Bq .j 128128
 Bq g 64064
+Bq u0067_0306 64064
 Bq y 64064
 Bq :y 64064
 Bq 'y 64064
@@ -55,6 +60,7 @@ Bq Y -96096
 Bq :Y -96096
 Bq 'Y -96096
 Bq O -32032
+Bq u004F_030B -32032
 Bq `O -32032
 Bq 'O -32032
 Bq ^O -32032
@@ -65,6 +71,8 @@ Bq /O -32032
 Bq C -32032
 Bq G -32032
 Bq 'C -32032
+Bq u0043_030C -32032
+Bq u0047_0306 -32032
 Bq ,C -32032
 Bq Q -32032
 Fc . -96096
@@ -76,6 +84,7 @@ ff ` 80080
 ff lq 80080
 ff rq 80080
 ff ? 80080
+ff u01C3 80080
 ff ! 80080
 ff ) 80080
 ff rB 80080
@@ -84,7 +93,9 @@ cq rq 128128
 ' rq 128128
 cq ? 128128
 ' ? 128128
+cq u01C3 128128
 cq ! 128128
+' u01C3 128128
 ' ! 128128
 A y -32032
 A :y -32032
@@ -93,15 +104,21 @@ A v -32032
 A w -32032
 A c -32032
 A 'c -32032
+A u0063_030C -32032
 A ,c -32032
 A d -32032
+A u0064_030C -32032
+A u0111 -32032
 A Sd -32032
 A e -32032
+A u0065_030C -32032
+A u0065_0328 -32032
 A `e -32032
 A 'e -32032
 A ^e -32032
 A :e -32032
 A o -32032
+A u006F_030B -32032
 A `o -32032
 A 'o -32032
 A ^o -32032
@@ -111,12 +128,17 @@ A oe -32032
 A /o -32032
 A q -32032
 A t -32032
+A u0074_030C -32032
+A u0074_0327 -32032
 A C -32032
 A G -32032
 A 'C -32032
+A u0043_030C -32032
+A u0047_0306 -32032
 A ,C -32032
 A Q -32032
 A O -32032
+A u004F_030B -32032
 A `O -32032
 A 'O -32032
 A ^O -32032
@@ -125,11 +147,15 @@ A :O -32032
 A OE -32032
 A /O -32032
 A U -32032
+A u0055_030B -32032
+A u0055_030A -32032
 A `U -32032
 A 'U -32032
 A ^U -32032
 A :U -32032
 A T -96096
+A u0054_030C -96096
+A u0054_0327 -96096
 A Y -96096
 A :Y -96096
 A 'Y -96096
@@ -138,6 +164,8 @@ A W -128128
 D X -32032
 D W -32032
 D A -32032
+D u0041_0306 -32032
+D u0041_0328 -32032
 D `A -32032
 D 'A -32032
 D ^A -32032
@@ -168,6 +196,8 @@ F z -32032
 F ae -32032
 F /o -32032
 F A -96096
+F u0041_0306 -96096
+F u0041_0328 -96096
 F `A -96096
 F 'A -96096
 F ^A -96096
@@ -176,6 +206,7 @@ F :A -96096
 F oA -96096
 F AE -96096
 F O -32032
+F u004F_030B -32032
 F `O -32032
 F 'O -32032
 F ^O -32032
@@ -186,11 +217,14 @@ F /O -32032
 F C -32032
 F G -32032
 F 'C -32032
+F u0043_030C -32032
+F u0047_0306 -32032
 F ,C -32032
 F Q -32032
 I I 32032
 K v -32032
 K o -32032
+K u006F_030B -32032
 K `o -32032
 K 'o -32032
 K ^o -32032
@@ -201,9 +235,13 @@ K /o -32032
 K C -32032
 K G -32032
 K 'C -32032
+K u0043_030C -32032
+K u0047_0306 -32032
 K ,C -32032
 K Q -32032
 L T -96096
+L u0054_030C -96096
+L u0054_0327 -96096
 L Y -96096
 L :Y -96096
 L 'Y -96096
@@ -212,6 +250,8 @@ L W -128128
 O X -32032
 O W -32032
 O A -32032
+O u0041_0306 -32032
+O u0041_0328 -32032
 O `A -32032
 O 'A -32032
 O ^A -32032
@@ -224,6 +264,8 @@ O Y -32032
 O :Y -32032
 O 'Y -32032
 P A -96096
+P u0041_0306 -96096
+P u0041_0328 -96096
 P `A -96096
 P 'A -96096
 P ^A -96096
@@ -232,6 +274,7 @@ P :A -96096
 P oA -96096
 P AE -96096
 P o -32032
+P u006F_030B -32032
 P `o -32032
 P 'o -32032
 P ^o -32032
@@ -240,11 +283,15 @@ P :o -32032
 P oe -32032
 P /o -32032
 P e -32032
+P u0065_030C -32032
+P u0065_0328 -32032
 P `e -32032
 P 'e -32032
 P ^e -32032
 P :e -32032
 P a -32032
+P u0061_0306 -32032
+P u0061_0328 -32032
 P `a -32032
 P 'a -32032
 P ^a -32032
@@ -273,6 +320,8 @@ T w -96096
 T x -96096
 T z -96096
 T A -96096
+T u0041_0306 -96096
+T u0041_0328 -96096
 T `A -96096
 T 'A -96096
 T ^A -96096
@@ -299,6 +348,8 @@ V z -32032
 V ae -32032
 V /o -32032
 V A -96096
+V u0041_0306 -96096
+V u0041_0328 -96096
 V `A -96096
 V 'A -96096
 V ^A -96096
@@ -307,6 +358,7 @@ V :A -96096
 V oA -96096
 V AE -96096
 V O -32032
+V u004F_030B -32032
 V `O -32032
 V 'O -32032
 V ^O -32032
@@ -317,6 +369,8 @@ V /O -32032
 V C -32032
 V G -32032
 V 'C -32032
+V u0043_030C -32032
+V u0047_0306 -32032
 V ,C -32032
 V Q -32032
 W o -32032
@@ -338,6 +392,8 @@ W z -32032
 W ae -32032
 W /o -32032
 W A -96096
+W u0041_0306 -96096
+W u0041_0328 -96096
 W `A -96096
 W 'A -96096
 W ^A -96096
@@ -346,6 +402,7 @@ W :A -96096
 W oA -96096
 W AE -96096
 W O -32032
+W u004F_030B -32032
 W `O -32032
 W 'O -32032
 W ^O -32032
@@ -356,9 +413,12 @@ W /O -32032
 W C -32032
 W G -32032
 W 'C -32032
+W u0043_030C -32032
+W u0047_0306 -32032
 W ,C -32032
 W Q -32032
 X O -32032
+X u004F_030B -32032
 X `O -32032
 X 'O -32032
 X ^O -32032
@@ -369,6 +429,8 @@ X /O -32032
 X C -32032
 X G -32032
 X 'C -32032
+X u0043_030C -32032
+X u0047_0306 -32032
 X ,C -32032
 X Q -32032
 Y e -96096
@@ -388,6 +450,8 @@ Y w -96096
 Y x -96096
 Y z -96096
 Y A -96096
+Y u0041_0306 -96096
+Y u0041_0328 -96096
 Y `A -96096
 Y 'A -96096
 Y ^A -96096
@@ -399,7 +463,9 @@ oq lq 128128
 ` lq 128128
 oq ? 128128
 ` ? 128128
+oq u01C3 128128
 oq ! 128128
+` u01C3 128128
 ` ! 128128
 a r -32032
 a y -32032
@@ -407,11 +473,14 @@ a :y -32032
 a 'y -32032
 a w -32032
 b e 32032
+b u0065_030C 32032
+b u0065_0328 32032
 b `e 32032
 b 'e 32032
 b ^e 32032
 b :e 32032
 b o 32032
+b u006F_030B 32032
 b `o 32032
 b 'o 32032
 b ^o 32032
@@ -423,6 +492,7 @@ b x -32032
 b d 32032
 b c 32032
 b 'c 32032
+b u0063_030C 32032
 b ,c 32032
 b q 32032
 b r -32032
@@ -438,6 +508,7 @@ f ` 80080
 f lq 80080
 f rq 80080
 f ? 80080
+f u01C3 80080
 f ! 80080
 f ) 80080
 f rB 80080
@@ -446,11 +517,15 @@ g j 32032
 k W -96096
 k V -96096
 k e -32032
+k u0065_030C -32032
+k u0065_0328 -32032
 k `e -32032
 k 'e -32032
 k ^e -32032
 k :e -32032
 k a -32032
+k u0061_0306 -32032
+k u0061_0328 -32032
 k `a -32032
 k 'a -32032
 k ^a -32032
@@ -460,6 +535,7 @@ k :a -32032
 k oa -32032
 k ae -32032
 k o -32032
+k u006F_030B -32032
 k `o -32032
 k 'o -32032
 k ^o -32032
@@ -469,13 +545,17 @@ k oe -32032
 k /o -32032
 k c -32032
 k 'c -32032
+k u0063_030C -32032
 k ,c -32032
 o e 32032
+o u0065_030C 32032
+o u0065_0328 32032
 o `e 32032
 o 'e 32032
 o ^e 32032
 o :e 32032
 o o 32032
+o u006F_030B 32032
 o `o 32032
 o 'o 32032
 o ^o 32032
@@ -487,6 +567,7 @@ o x -32032
 o d 32032
 o c 32032
 o 'c 32032
+o u0063_030C 32032
 o ,c 32032
 o q 32032
 o r -32032
@@ -495,11 +576,14 @@ o :y -32032
 o 'y -32032
 o w -32032
 p e 32032
+p u0065_030C 32032
+p u0065_0328 32032
 p `e 32032
 p 'e 32032
 p ^e 32032
 p :e 32032
 p o 32032
+p u006F_030B 32032
 p `o 32032
 p 'o 32032
 p ^o 32032
@@ -511,6 +595,7 @@ p x -32032
 p d 32032
 p c 32032
 p 'c 32032
+p u0063_030C 32032
 p ,c 32032
 p q 32032
 p r -32032
@@ -524,11 +609,15 @@ t 'y -32032
 t w -32032
 u w -32032
 w e -32032
+w u0065_030C -32032
+w u0065_0328 -32032
 w `e -32032
 w 'e -32032
 w ^e -32032
 w :e -32032
 w a -32032
+w u0061_0306 -32032
+w u0061_0328 -32032
 w `a -32032
 w 'a -32032
 w ^a -32032
@@ -538,6 +627,7 @@ w :a -32032
 w oa -32032
 w ae -32032
 w o -32032
+w u006F_030B -32032
 w `o -32032
 w 'o -32032
 w ^o -32032
@@ -547,8 +637,10 @@ w oe -32032
 w /o -32032
 w c -32032
 w 'c -32032
+w u0063_030C -32032
 w ,c -32032
 y o -32032
+y u006F_030B -32032
 y `o -32032
 y 'o -32032
 y ^o -32032
@@ -557,11 +649,15 @@ y :o -32032
 y oe -32032
 y /o -32032
 y e -32032
+y u0065_030C -32032
+y u0065_0328 -32032
 y `e -32032
 y 'e -32032
 y ^e -32032
 y :e -32032
 y a -32032
+y u0061_0306 -32032
+y u0061_0328 -32032
 y `a -32032
 y 'a -32032
 y ^a -32032
@@ -572,19 +668,89 @@ y oa -32032
 y ae -32032
 y . -96096
 y , -96096
+u0041_0306 y -32032
+u0041_0306 :y -32032
+u0041_0306 'y -32032
+u0041_0306 v -32032
+u0041_0306 w -32032
+u0041_0306 c -32032
+u0041_0306 'c -32032
+u0041_0306 u0063_030C -32032
+u0041_0306 ,c -32032
+u0041_0306 d -32032
+u0041_0306 u0064_030C -32032
+u0041_0306 u0111 -32032
+u0041_0306 Sd -32032
+u0041_0306 e -32032
+u0041_0306 u0065_030C -32032
+u0041_0306 u0065_0328 -32032
+u0041_0306 `e -32032
+u0041_0306 'e -32032
+u0041_0306 ^e -32032
+u0041_0306 :e -32032
+u0041_0306 o -32032
+u0041_0306 u006F_030B -32032
+u0041_0306 `o -32032
+u0041_0306 'o -32032
+u0041_0306 ^o -32032
+u0041_0306 ~o -32032
+u0041_0306 :o -32032
+u0041_0306 oe -32032
+u0041_0306 /o -32032
+u0041_0306 q -32032
+u0041_0306 t -32032
+u0041_0306 u0074_030C -32032
+u0041_0306 u0074_0327 -32032
+u0041_0306 C -32032
+u0041_0306 G -32032
+u0041_0306 'C -32032
+u0041_0306 u0043_030C -32032
+u0041_0306 u0047_0306 -32032
+u0041_0306 ,C -32032
+u0041_0306 Q -32032
+u0041_0306 O -32032
+u0041_0306 u004F_030B -32032
+u0041_0306 `O -32032
+u0041_0306 'O -32032
+u0041_0306 ^O -32032
+u0041_0306 ~O -32032
+u0041_0306 :O -32032
+u0041_0306 OE -32032
+u0041_0306 /O -32032
+u0041_0306 U -32032
+u0041_0306 u0055_030B -32032
+u0041_0306 u0055_030A -32032
+u0041_0306 `U -32032
+u0041_0306 'U -32032
+u0041_0306 ^U -32032
+u0041_0306 :U -32032
+u0041_0306 T -96096
+u0041_0306 u0054_030C -96096
+u0041_0306 u0054_0327 -96096
+u0041_0306 Y -96096
+u0041_0306 :Y -96096
+u0041_0306 'Y -96096
+u0041_0306 V -128128
+u0041_0306 W -128128
 'C v -32032
 'C w -32032
 'C c -32032
 'C 'c -32032
+'C u0063_030C -32032
 'C ,c -32032
 'C d -32032
+'C u0064_030C -32032
+'C u0111 -32032
 'C Sd -32032
 'C e -32032
+'C u0065_030C -32032
+'C u0065_0328 -32032
 'C `e -32032
 'C 'e -32032
 'C ^e -32032
 'C :e -32032
 'C o -32032
+'C u006F_030B -32032
 'C `o -32032
 'C 'o -32032
 'C ^o -32032
@@ -594,12 +760,17 @@ y , -96096
 'C /o -32032
 'C q -32032
 'C t -32032
+'C u0074_030C -32032
+'C u0074_0327 -32032
 'C C -32032
 'C G -32032
 'C 'C -32032
+'C u0043_030C -32032
+'C u0047_0306 -32032
 'C ,C -32032
 'C Q -32032
 'C O -32032
+'C u004F_030B -32032
 'C `O -32032
 'C 'O -32032
 'C ^O -32032
@@ -608,22 +779,130 @@ y , -96096
 'C OE -32032
 'C /O -32032
 'C U -32032
+'C u0055_030B -32032
+'C u0055_030A -32032
 'C `U -32032
 'C 'U -32032
 'C ^U -32032
 'C :U -32032
 'C T -96096
+'C u0054_030C -96096
+'C u0054_0327 -96096
 'C Y -96096
 'C :Y -96096
 'C 'Y -96096
 'C V -128128
 'C W -128128
+u0044_030C X -32032
+u0044_030C W -32032
+u0044_030C A -32032
+u0044_030C u0041_0306 -32032
+u0044_030C u0041_0328 -32032
+u0044_030C `A -32032
+u0044_030C 'A -32032
+u0044_030C ^A -32032
+u0044_030C ~A -32032
+u0044_030C :A -32032
+u0044_030C oA -32032
+u0044_030C AE -32032
+u0044_030C V -32032
+u0044_030C Y -32032
+u0044_030C :Y -32032
+u0044_030C 'Y -32032
+u004C_0301 T -96096
+u004C_0301 u0054_030C -96096
+u004C_0301 u0054_0327 -96096
+u004C_0301 Y -96096
+u004C_0301 :Y -96096
+u004C_0301 'Y -96096
+u004C_0301 V -128128
+u004C_0301 W -128128
+u004C_030C T -96096
+u004C_030C u0054_030C -96096
+u004C_030C u0054_0327 -96096
+u004C_030C Y -96096
+u004C_030C :Y -96096
+u004C_030C 'Y -96096
+u004C_030C V -128128
+u004C_030C W -128128
 /L T -96096
+/L u0054_030C -96096
+/L u0054_0327 -96096
 /L Y -96096
 /L :Y -96096
 /L 'Y -96096
 /L V -128128
 /L W -128128
+u004F_030B X -32032
+u004F_030B W -32032
+u004F_030B A -32032
+u004F_030B u0041_0306 -32032
+u004F_030B u0041_0328 -32032
+u004F_030B `A -32032
+u004F_030B 'A -32032
+u004F_030B ^A -32032
+u004F_030B ~A -32032
+u004F_030B :A -32032
+u004F_030B oA -32032
+u004F_030B AE -32032
+u004F_030B V -32032
+u004F_030B Y -32032
+u004F_030B :Y -32032
+u004F_030B 'Y -32032
+u0054_030C y -96096
+u0054_030C e -96096
+u0054_030C o -96096
+u0054_030C r -96096
+u0054_030C a -96096
+u0054_030C u -96096
+u0054_030C n -96096
+u0054_030C .i -96096
+u0054_030C c -96096
+u0054_030C d -96096
+u0054_030C g -96096
+u0054_030C p -96096
+u0054_030C s -96096
+u0054_030C v -96096
+u0054_030C w -96096
+u0054_030C x -96096
+u0054_030C z -96096
+u0054_030C A -96096
+u0054_030C u0041_0306 -96096
+u0054_030C u0041_0328 -96096
+u0054_030C `A -96096
+u0054_030C 'A -96096
+u0054_030C ^A -96096
+u0054_030C ~A -96096
+u0054_030C :A -96096
+u0054_030C oA -96096
+u0054_030C AE -96096
+u0054_0327 y -96096
+u0054_0327 e -96096
+u0054_0327 o -96096
+u0054_0327 r -96096
+u0054_0327 a -96096
+u0054_0327 u -96096
+u0054_0327 n -96096
+u0054_0327 .i -96096
+u0054_0327 c -96096
+u0054_0327 d -96096
+u0054_0327 g -96096
+u0054_0327 p -96096
+u0054_0327 s -96096
+u0054_0327 v -96096
+u0054_0327 w -96096
+u0054_0327 x -96096
+u0054_0327 z -96096
+u0054_0327 A -96096
+u0054_0327 u0041_0306 -96096
+u0054_0327 u0041_0328 -96096
+u0054_0327 `A -96096
+u0054_0327 'A -96096
+u0054_0327 ^A -96096
+u0054_0327 ~A -96096
+u0054_0327 :A -96096
+u0054_0327 oA -96096
+u0054_0327 AE -96096
 :Y e -96096
 :Y o -96096
 :Y r -96096
@@ -641,6 +920,8 @@ y , -96096
 :Y x -96096
 :Y z -96096
 :Y A -96096
+:Y u0041_0306 -96096
+:Y u0041_0328 -96096
 :Y `A -96096
 :Y 'A -96096
 :Y ^A -96096
@@ -648,18 +929,66 @@ y , -96096
 :Y :A -96096
 :Y oA -96096
 :Y AE -96096
+u0061_0306 r -32032
+u0061_0306 y -32032
+u0061_0306 :y -32032
+u0061_0306 'y -32032
+u0061_0306 w -32032
+u0061_0328 w -32032
 /l cq 32032
 /l ' 32032
 /l a -32032
+/l u0061_0328 -32032
 /l c -32032
 /l 'c -32032
 /l d -32032
 /l e -32032
+/l u0065_0328 -32032
 /l g -32032
 /l o -32032
 /l 'o -32032
 /l s -32032
+/l u0073_0301 -32032
+u006F_030B e 32032
+u006F_030B u0065_030C 32032
+u006F_030B u0065_0328 32032
+u006F_030B `e 32032
+u006F_030B 'e 32032
+u006F_030B ^e 32032
+u006F_030B :e 32032
+u006F_030B o 32032
+u006F_030B u006F_030B 32032
+u006F_030B `o 32032
+u006F_030B 'o 32032
+u006F_030B ^o 32032
+u006F_030B ~o 32032
+u006F_030B :o 32032
+u006F_030B oe 32032
+u006F_030B /o 32032
+u006F_030B x -32032
+u006F_030B d 32032
+u006F_030B c 32032
+u006F_030B 'c 32032
+u006F_030B u0063_030C 32032
+u006F_030B ,c 32032
+u006F_030B q 32032
+u006F_030B r -32032
+u006F_030B y -32032
+u006F_030B :y -32032
+u006F_030B 'y -32032
+u006F_030B w -32032
+u0074_030C y -32032
+u0074_030C :y -32032
+u0074_030C 'y -32032
+u0074_030C w -32032
+u0074_0327 y -32032
+u0074_0327 :y -32032
+u0074_0327 'y -32032
+u0074_0327 w -32032
+u0075_030B w -32032
+u0075_030A w -32032
 :y o -32032
+:y u006F_030B -32032
 :y `o -32032
 :y 'o -32032
 :y ^o -32032
@@ -668,11 +997,15 @@ y , -96096
 :y oe -32032
 :y /o -32032
 :y e -32032
+:y u0065_030C -32032
+:y u0065_0328 -32032
 :y `e -32032
 :y 'e -32032
 :y ^e -32032
 :y :e -32032
 :y a -32032
+:y u0061_0306 -32032
+:y u0061_0328 -32032
 :y `a -32032
 :y 'a -32032
 :y ^a -32032
@@ -690,15 +1023,21 @@ y , -96096
 `A w -32032
 `A c -32032
 `A 'c -32032
+`A u0063_030C -32032
 `A ,c -32032
 `A d -32032
+`A u0064_030C -32032
+`A u0111 -32032
 `A Sd -32032
 `A e -32032
+`A u0065_030C -32032
+`A u0065_0328 -32032
 `A `e -32032
 `A 'e -32032
 `A ^e -32032
 `A :e -32032
 `A o -32032
+`A u006F_030B -32032
 `A `o -32032
 `A 'o -32032
 `A ^o -32032
@@ -708,12 +1047,17 @@ y , -96096
 `A /o -32032
 `A q -32032
 `A t -32032
+`A u0074_030C -32032
+`A u0074_0327 -32032
 `A C -32032
 `A G -32032
 `A 'C -32032
+`A u0043_030C -32032
+`A u0047_0306 -32032
 `A ,C -32032
 `A Q -32032
 `A O -32032
+`A u004F_030B -32032
 `A `O -32032
 `A 'O -32032
 `A ^O -32032
@@ -722,11 +1066,15 @@ y , -96096
 `A OE -32032
 `A /O -32032
 `A U -32032
+`A u0055_030B -32032
+`A u0055_030A -32032
 `A `U -32032
 `A 'U -32032
 `A ^U -32032
 `A :U -32032
 `A T -96096
+`A u0054_030C -96096
+`A u0054_0327 -96096
 `A Y -96096
 `A :Y -96096
 `A 'Y -96096
@@ -739,15 +1087,21 @@ y , -96096
 'A w -32032
 'A c -32032
 'A 'c -32032
+'A u0063_030C -32032
 'A ,c -32032
 'A d -32032
+'A u0064_030C -32032
+'A u0111 -32032
 'A Sd -32032
 'A e -32032
+'A u0065_030C -32032
+'A u0065_0328 -32032
 'A `e -32032
 'A 'e -32032
 'A ^e -32032
 'A :e -32032
 'A o -32032
+'A u006F_030B -32032
 'A `o -32032
 'A 'o -32032
 'A ^o -32032
@@ -757,12 +1111,17 @@ y , -96096
 'A /o -32032
 'A q -32032
 'A t -32032
+'A u0074_030C -32032
+'A u0074_0327 -32032
 'A C -32032
 'A G -32032
 'A 'C -32032
+'A u0043_030C -32032
+'A u0047_0306 -32032
 'A ,C -32032
 'A Q -32032
 'A O -32032
+'A u004F_030B -32032
 'A `O -32032
 'A 'O -32032
 'A ^O -32032
@@ -771,11 +1130,15 @@ y , -96096
 'A OE -32032
 'A /O -32032
 'A U -32032
+'A u0055_030B -32032
+'A u0055_030A -32032
 'A `U -32032
 'A 'U -32032
 'A ^U -32032
 'A :U -32032
 'A T -96096
+'A u0054_030C -96096
+'A u0054_0327 -96096
 'A Y -96096
 'A :Y -96096
 'A 'Y -96096
@@ -788,15 +1151,21 @@ y , -96096
 ^A w -32032
 ^A c -32032
 ^A 'c -32032
+^A u0063_030C -32032
 ^A ,c -32032
 ^A d -32032
+^A u0064_030C -32032
+^A u0111 -32032
 ^A Sd -32032
 ^A e -32032
+^A u0065_030C -32032
+^A u0065_0328 -32032
 ^A `e -32032
 ^A 'e -32032
 ^A ^e -32032
 ^A :e -32032
 ^A o -32032
+^A u006F_030B -32032
 ^A `o -32032
 ^A 'o -32032
 ^A ^o -32032
@@ -806,12 +1175,17 @@ y , -96096
 ^A /o -32032
 ^A q -32032
 ^A t -32032
+^A u0074_030C -32032
+^A u0074_0327 -32032
 ^A C -32032
 ^A G -32032
 ^A 'C -32032
+^A u0043_030C -32032
+^A u0047_0306 -32032
 ^A ,C -32032
 ^A Q -32032
 ^A O -32032
+^A u004F_030B -32032
 ^A `O -32032
 ^A 'O -32032
 ^A ^O -32032
@@ -820,11 +1194,15 @@ y , -96096
 ^A OE -32032
 ^A /O -32032
 ^A U -32032
+^A u0055_030B -32032
+^A u0055_030A -32032
 ^A `U -32032
 ^A 'U -32032
 ^A ^U -32032
 ^A :U -32032
 ^A T -96096
+^A u0054_030C -96096
+^A u0054_0327 -96096
 ^A Y -96096
 ^A :Y -96096
 ^A 'Y -96096
@@ -837,15 +1215,21 @@ y , -96096
 ~A w -32032
 ~A c -32032
 ~A 'c -32032
+~A u0063_030C -32032
 ~A ,c -32032
 ~A d -32032
+~A u0064_030C -32032
+~A u0111 -32032
 ~A Sd -32032
 ~A e -32032
+~A u0065_030C -32032
+~A u0065_0328 -32032
 ~A `e -32032
 ~A 'e -32032
 ~A ^e -32032
 ~A :e -32032
 ~A o -32032
+~A u006F_030B -32032
 ~A `o -32032
 ~A 'o -32032
 ~A ^o -32032
@@ -855,12 +1239,17 @@ y , -96096
 ~A /o -32032
 ~A q -32032
 ~A t -32032
+~A u0074_030C -32032
+~A u0074_0327 -32032
 ~A C -32032
 ~A G -32032
 ~A 'C -32032
+~A u0043_030C -32032
+~A u0047_0306 -32032
 ~A ,C -32032
 ~A Q -32032
 ~A O -32032
+~A u004F_030B -32032
 ~A `O -32032
 ~A 'O -32032
 ~A ^O -32032
@@ -869,11 +1258,15 @@ y , -96096
 ~A OE -32032
 ~A /O -32032
 ~A U -32032
+~A u0055_030B -32032
+~A u0055_030A -32032
 ~A `U -32032
 ~A 'U -32032
 ~A ^U -32032
 ~A :U -32032
 ~A T -96096
+~A u0054_030C -96096
+~A u0054_0327 -96096
 ~A Y -96096
 ~A :Y -96096
 ~A 'Y -96096
@@ -886,15 +1279,21 @@ y , -96096
 :A w -32032
 :A c -32032
 :A 'c -32032
+:A u0063_030C -32032
 :A ,c -32032
 :A d -32032
+:A u0064_030C -32032
+:A u0111 -32032
 :A Sd -32032
 :A e -32032
+:A u0065_030C -32032
+:A u0065_0328 -32032
 :A `e -32032
 :A 'e -32032
 :A ^e -32032
 :A :e -32032
 :A o -32032
+:A u006F_030B -32032
 :A `o -32032
 :A 'o -32032
 :A ^o -32032
@@ -904,12 +1303,17 @@ y , -96096
 :A /o -32032
 :A q -32032
 :A t -32032
+:A u0074_030C -32032
+:A u0074_0327 -32032
 :A C -32032
 :A G -32032
 :A 'C -32032
+:A u0043_030C -32032
+:A u0047_0306 -32032
 :A ,C -32032
 :A Q -32032
 :A O -32032
+:A u004F_030B -32032
 :A `O -32032
 :A 'O -32032
 :A ^O -32032
@@ -918,11 +1322,15 @@ y , -96096
 :A OE -32032
 :A /O -32032
 :A U -32032
+:A u0055_030B -32032
+:A u0055_030A -32032
 :A `U -32032
 :A 'U -32032
 :A ^U -32032
 :A :U -32032
 :A T -96096
+:A u0054_030C -96096
+:A u0054_0327 -96096
 :A Y -96096
 :A :Y -96096
 :A 'Y -96096
@@ -935,15 +1343,21 @@ oA v -32032
 oA w -32032
 oA c -32032
 oA 'c -32032
+oA u0063_030C -32032
 oA ,c -32032
 oA d -32032
+oA u0064_030C -32032
+oA u0111 -32032
 oA Sd -32032
 oA e -32032
+oA u0065_030C -32032
+oA u0065_0328 -32032
 oA `e -32032
 oA 'e -32032
 oA ^e -32032
 oA :e -32032
 oA o -32032
+oA u006F_030B -32032
 oA `o -32032
 oA 'o -32032
 oA ^o -32032
@@ -953,12 +1367,17 @@ oA oe -32032
 oA /o -32032
 oA q -32032
 oA t -32032
+oA u0074_030C -32032
+oA u0074_0327 -32032
 oA C -32032
 oA G -32032
 oA 'C -32032
+oA u0043_030C -32032
+oA u0047_0306 -32032
 oA ,C -32032
 oA Q -32032
 oA O -32032
+oA u004F_030B -32032
 oA `O -32032
 oA 'O -32032
 oA ^O -32032
@@ -967,33 +1386,73 @@ oA :O -32032
 oA OE -32032
 oA /O -32032
 oA U -32032
+oA u0055_030B -32032
+oA u0055_030A -32032
 oA `U -32032
 oA 'U -32032
 oA ^U -32032
 oA :U -32032
 oA T -96096
+oA u0054_030C -96096
+oA u0054_0327 -96096
 oA Y -96096
 oA :Y -96096
 oA 'Y -96096
 oA V -128128
 oA W -128128
+u0189 X -32032
+u0110 X -32032
 -D X -32032
+u0189 W -32032
+u0110 W -32032
 -D W -32032
+u0189 A -32032
+u0110 A -32032
 -D A -32032
+u0189 u0041_0306 -32032
+u0110 u0041_0306 -32032
+-D u0041_0306 -32032
+u0189 u0041_0328 -32032
+u0110 u0041_0328 -32032
+-D u0041_0328 -32032
+u0189 `A -32032
+u0110 `A -32032
 -D `A -32032
+u0189 'A -32032
+u0110 'A -32032
 -D 'A -32032
+u0189 ^A -32032
+u0110 ^A -32032
 -D ^A -32032
+u0189 ~A -32032
+u0110 ~A -32032
 -D ~A -32032
+u0189 :A -32032
+u0110 :A -32032
 -D :A -32032
+u0189 oA -32032
+u0110 oA -32032
 -D oA -32032
+u0189 AE -32032
+u0110 AE -32032
 -D AE -32032
+u0189 V -32032
+u0110 V -32032
 -D V -32032
+u0189 Y -32032
+u0110 Y -32032
 -D Y -32032
+u0189 :Y -32032
+u0110 :Y -32032
 -D :Y -32032
+u0189 'Y -32032
+u0110 'Y -32032
 -D 'Y -32032
 `O X -32032
 `O W -32032
 `O A -32032
+`O u0041_0306 -32032
+`O u0041_0328 -32032
 `O `A -32032
 `O 'A -32032
 `O ^A -32032
@@ -1008,6 +1467,8 @@ oA W -128128
 'O X -32032
 'O W -32032
 'O A -32032
+'O u0041_0306 -32032
+'O u0041_0328 -32032
 'O `A -32032
 'O 'A -32032
 'O ^A -32032
@@ -1022,6 +1483,8 @@ oA W -128128
 ^O X -32032
 ^O W -32032
 ^O A -32032
+^O u0041_0306 -32032
+^O u0041_0328 -32032
 ^O `A -32032
 ^O 'A -32032
 ^O ^A -32032
@@ -1036,6 +1499,8 @@ oA W -128128
 ~O X -32032
 ~O W -32032
 ~O A -32032
+~O u0041_0306 -32032
+~O u0041_0328 -32032
 ~O `A -32032
 ~O 'A -32032
 ~O ^A -32032
@@ -1050,6 +1515,8 @@ oA W -128128
 :O X -32032
 :O W -32032
 :O A -32032
+:O u0041_0306 -32032
+:O u0041_0328 -32032
 :O `A -32032
 :O 'A -32032
 :O ^A -32032
@@ -1064,6 +1531,8 @@ oA W -128128
 /O X -32032
 /O W -32032
 /O A -32032
+/O u0041_0306 -32032
+/O u0041_0328 -32032
 /O `A -32032
 /O 'A -32032
 /O ^A -32032
@@ -1092,6 +1561,8 @@ oA W -128128
 'Y x -96096
 'Y z -96096
 'Y A -96096
+'Y u0041_0306 -96096
+'Y u0041_0328 -96096
 'Y `A -96096
 'Y 'A -96096
 'Y ^A -96096
@@ -1130,11 +1601,14 @@ oa :y -32032
 oa 'y -32032
 oa w -32032
 `o e 32032
+`o u0065_030C 32032
+`o u0065_0328 32032
 `o `e 32032
 `o 'e 32032
 `o ^e 32032
 `o :e 32032
 `o o 32032
+`o u006F_030B 32032
 `o `o 32032
 `o 'o 32032
 `o ^o 32032
@@ -1146,6 +1620,7 @@ oa w -32032
 `o d 32032
 `o c 32032
 `o 'c 32032
+`o u0063_030C 32032
 `o ,c 32032
 `o q 32032
 `o r -32032
@@ -1154,11 +1629,14 @@ oa w -32032
 `o 'y -32032
 `o w -32032
 'o e 32032
+'o u0065_030C 32032
+'o u0065_0328 32032
 'o `e 32032
 'o 'e 32032
 'o ^e 32032
 'o :e 32032
 'o o 32032
+'o u006F_030B 32032
 'o `o 32032
 'o 'o 32032
 'o ^o 32032
@@ -1170,6 +1648,7 @@ oa w -32032
 'o d 32032
 'o c 32032
 'o 'c 32032
+'o u0063_030C 32032
 'o ,c 32032
 'o q 32032
 'o r -32032
@@ -1178,11 +1657,14 @@ oa w -32032
 'o 'y -32032
 'o w -32032
 ^o e 32032
+^o u0065_030C 32032
+^o u0065_0328 32032
 ^o `e 32032
 ^o 'e 32032
 ^o ^e 32032
 ^o :e 32032
 ^o o 32032
+^o u006F_030B 32032
 ^o `o 32032
 ^o 'o 32032
 ^o ^o 32032
@@ -1194,6 +1676,7 @@ oa w -32032
 ^o d 32032
 ^o c 32032
 ^o 'c 32032
+^o u0063_030C 32032
 ^o ,c 32032
 ^o q 32032
 ^o r -32032
@@ -1202,11 +1685,14 @@ oa w -32032
 ^o 'y -32032
 ^o w -32032
 ~o e 32032
+~o u0065_030C 32032
+~o u0065_0328 32032
 ~o `e 32032
 ~o 'e 32032
 ~o ^e 32032
 ~o :e 32032
 ~o o 32032
+~o u006F_030B 32032
 ~o `o 32032
 ~o 'o 32032
 ~o ^o 32032
@@ -1218,6 +1704,7 @@ oa w -32032
 ~o d 32032
 ~o c 32032
 ~o 'c 32032
+~o u0063_030C 32032
 ~o ,c 32032
 ~o q 32032
 ~o r -32032
@@ -1226,11 +1713,14 @@ oa w -32032
 ~o 'y -32032
 ~o w -32032
 :o e 32032
+:o u0065_030C 32032
+:o u0065_0328 32032
 :o `e 32032
 :o 'e 32032
 :o ^e 32032
 :o :e 32032
 :o o 32032
+:o u006F_030B 32032
 :o `o 32032
 :o 'o 32032
 :o ^o 32032
@@ -1242,6 +1732,7 @@ oa w -32032
 :o d 32032
 :o c 32032
 :o 'c 32032
+:o u0063_030C 32032
 :o ,c 32032
 :o q 32032
 :o r -32032
@@ -1250,11 +1741,14 @@ oa w -32032
 :o 'y -32032
 :o w -32032
 /o e 32032
+/o u0065_030C 32032
+/o u0065_0328 32032
 /o `e 32032
 /o 'e 32032
 /o ^e 32032
 /o :e 32032
 /o o 32032
+/o u006F_030B 32032
 /o `o 32032
 /o 'o 32032
 /o ^o 32032
@@ -1266,6 +1760,7 @@ oa w -32032
 /o d 32032
 /o c 32032
 /o 'c 32032
+/o u0063_030C 32032
 /o ,c 32032
 /o q 32032
 /o r -32032
@@ -1278,6 +1773,7 @@ oa w -32032
 ^u w -32032
 :u w -32032
 'y o -32032
+'y u006F_030B -32032
 'y `o -32032
 'y 'o -32032
 'y ^o -32032
@@ -1286,11 +1782,15 @@ oa w -32032
 'y oe -32032
 'y /o -32032
 'y e -32032
+'y u0065_030C -32032
+'y u0065_0328 -32032
 'y `e -32032
 'y 'e -32032
 'y ^e -32032
 'y :e -32032
 'y a -32032
+'y u0061_0306 -32032
+'y u0061_0328 -32032
 'y `a -32032
 'y 'a -32032
 'y ^a -32032
@@ -1334,8 +1834,9 @@ fi	614432,755976	2	0034
 fl	614432,755976	2	0035
 Fi	934752,755976	2	0036
 Fl	934752,755976	2	0037
----	576576,480480,101920	1	0040
-!	384384,755976	2	0041
+u2423	576576,480480,101920	1	0040
+u01C3	384384,755976	2	0041
+!	"
 dq	576576,755976	2	0042
 "	"
 sh	960960,755976,232960	3	0043
@@ -1349,8 +1850,7 @@ cq	320320,755976	2	0047
 (	448448,782600,262080	3	0050
 )	448448,782600,262080	3	0051
 *	576576,782600	2	0052
-pl	896896,646464,122304	3	0053
-+	"
++	896896,646464,122304	3	0053
 ,	320320,136864,110656	1	0054
 -	384384,480480	0	0055
 .	320320,136864	0	0056
@@ -1369,8 +1869,7 @@ sl	576576,782600,262080	3	0057
 :	320320,480480	0	0072
 ;	320320,480480,110656	1	0073
 <	896896,636091,111931	3	0074
-eq	896896,425880,-98280	0	0075
-=	"
+=	896896,425880,-98280	0	0075
 >	896896,636091,111931	3	0076
 ?	544544,755976	2	0077
 at	768768,755976	2	0100
@@ -1440,74 +1939,73 @@ y	524160,480480,203840,16016	1	0171
 z	499408,480480	0	0172
 lC	576576,782600,262080	3	0173
 {	"
-ba	320320,782600,262080	3	0174
-bv	"
-or	"
+u01C0	320320,782600,262080	3	0174
+ba	"
 |	"
 rC	576576,782600,262080	3	0175
 }	"
 ~	704704,755976	2	0176
 hy	192192,480480	0	0177
----	768768,946400	2	0200
----	768768,728000,203840	3	0201
+u0041_0306	768768,946400	2	0200
+u0041_0328	768768,728000,203840	3	0201
 'C	736736,905917	2	0202
----	736736,946400,0,0,-32032	2	0203
----	832832,946400,0,0,0,-32032	2	0204
----	672672,946400	2	0205
----	672672,728000,203840	3	0206
----	768768,946400,0,0,-32032	2	0207
----	608608,905917,0,0,0,64064	2	0210
----	608608,946400,0,0,0,64064	2	0211
+u0043_030C	736736,946400,0,0,-32032	2	0203
+u0044_030C	832832,946400,0,0,0,-32032	2	0204
+u0045_030C	672672,946400	2	0205
+u0045_0328	672672,728000,203840	3	0206
+u0047_0306	768768,946400,0,0,-32032	2	0207
+u004C_0301	608608,905917,0,0,0,64064	2	0210
+u004C_030C	608608,946400,0,0,0,64064	2	0211
 /L	704704,728000	2	0212
----	832832,905917	2	0213
----	832832,946400	2	0214
----	864864,728000,0,0,0,-32032	2	0215
----	832832,905917,0,0,-32032,-32032	2	0216
----	736736,905917	2	0217
----	736736,946400	2	0220
----	640640,905917	2	0221
+u004E_0301	832832,905917	2	0213
+u004E_030C	832832,946400	2	0214
+u014A	864864,728000,0,0,0,-32032	2	0215
+u004F_030B	832832,905917,0,0,-32032,-32032	2	0216
+u0052_0301	736736,905917	2	0217
+u0052_030C	736736,946400	2	0220
+u0053_0301	640640,905917	2	0221
 vS	640640,946400	2	0222
----	640640,728000,178360	3	0223
----	768768,946400,0,0,0,-160160	2	0224
----	768768,728000,178360,0,0,-160160	3	0225
----	800800,905917,0,0,32032	2	0226
----	800800,946400,0,0,32032	2	0227
+u0053_0327	640640,728000,178360	3	0223
+u0054_030C	768768,946400,0,0,0,-160160	2	0224
+u0054_0327	768768,728000,178360,0,0,-160160	3	0225
+u0055_030B	800800,905917,0,0,32032	2	0226
+u0055_030A	800800,946400,0,0,32032	2	0227
 :Y	768768,946400,0,28829,32032,-227427	2	0230
----	704704,905917	2	0231
+u005A_0301	704704,905917	2	0231
 vZ	704704,946400	2	0232
----	704704,905917	2	0233
+u005A_0307	704704,905917	2	0233
 IJ	853216,728000,0,0,0,-32032	2	0234
----	340704,905917	2	0235
----	588224,755976	2	0236
+u0049_0307	340704,905917	2	0235
+u0111	588224,755976	2	0236
 sc	559104,755976,203840	3	0237
----	550368,698880	2	0240
----	550368,480480,203840	1	0241
+u0061_0306	550368,698880	2	0240
+u0061_0328	550368,480480,203840	1	0241
 'c	512512,698880	2	0242
----	512512,698880	2	0243
----	767312,755976	2	0244
----	535808,698880	2	0245
----	535808,480480,203840	1	0246
----	576576,698880,203840,16016	3	0247
----	267904,905917,0,123075	2	0250
----	446992,755976	2	0251
+u0063_030C	512512,698880	2	0243
+u0064_030C	767312,755976	2	0244
+u0065_030C	535808,698880	2	0245
+u0065_0328	535808,480480,203840	1	0246
+u0067_0306	576576,698880,203840,16016	3	0247
+u006C_0301	267904,905917,0,123075	2	0250
+u006C_030C	446992,755976	2	0251
 /l	399818,755976,0,29120	2	0252
----	588224,698880	2	0253
----	588224,698880	2	0254
----	588224,480480,203840	1	0255
----	576576,698880,0,14555	2	0256
----	390208,698880,0,16016	2	0257
----	390208,698880,0,16016	2	0260
----	442042,698880	2	0261
+u006E_0301	588224,698880	2	0253
+u006E_030C	588224,698880	2	0254
+u016A	588224,480480,203840	1	0255
+u006F_030B	576576,698880,0,14555	2	0256
+u0072_0301	390208,698880,0,16016	2	0257
+u0072_030C	390208,698880,0,16016	2	0260
+u0073_0301	442042,698880	2	0261
 vs	442042,698880	2	0262
----	442042,480480,178360	1	0263
----	423696,755976	2	0264
----	423696,617763,178360	3	0265
----	588224,698880,0,8730	2	0266
----	588224,698880	2	0267
+u0073_0327	442042,480480,178360	1	0263
+u0074_030C	423696,755976	2	0264
+u0074_0327	423696,617763,178360	3	0265
+u0075_030B	588224,698880,0,8730	2	0266
+u0075_030A	588224,698880	2	0267
 :y	524160,728000,203840,16016	3	0270
----	499408,698880	2	0271
+u007A_0301	499408,698880	2	0271
 vz	499408,698880	2	0272
----	499408,755976	2	0273
+u007A_0307	499408,755976	2	0273
 ij	620256,755976,203840	3	0274
 r!	384384,553280,203840	3	0275
 r?	544544,553280,203840	3	0276
@@ -1528,7 +2026,9 @@ AE	992992,728000	2	0306
 'I	340704,905917,0,85210,0,42605	2	0315
 ^I	340704,946400	2	0316
 :I	340704,946400	2	0317
--D	832832,728000,0,0,0,-32032	2	0320
+u0189	832832,728000,0,0,0,-32032	2	0320
+u0110	"
+-D	"
 ~N	832832,946400	2	0321
 `O	832832,905917,0,0,-32032,-32032	2	0322
 'O	832832,905917	2	0323
diff --git a/contrib/groff/font/devdvi/HBI b/contrib/groff/font/devdvi/HBI
index 4e9efd0..f410707 100644
--- a/contrib/groff/font/devdvi/HBI
+++ b/contrib/groff/font/devdvi/HBI
@@ -13,6 +13,8 @@ ff ! 80101
 ff ) 80101
 ff rB 80101
 ff ] 80101
+slash@for@l l -267971
+slash@for@l L -307293
 cq ? 128160
 ' ? 128160
 cq ! 128160
@@ -186,7 +188,7 @@ oe	897120,480597,0,78936	0	0033
 AE	993240,728178,0,122738	2	0035
 OE	1121400,728178,0,122738	2	0036
 /O	897120,779150,50973,76304	3	0037
----	267971,480597	0	0040
+slash@for@l	267971,480597	0	0040
 !	384480,728178,0,63027	2	0041
 rq	585458,728178,0,28947	2	0042
 sh	961200,728178,203888,58506	3	0043
diff --git a/contrib/groff/font/devdvi/HBIEC b/contrib/groff/font/devdvi/HBIEC
index 6e8f1ff..a34a04f 100644
--- a/contrib/groff/font/devdvi/HBIEC
+++ b/contrib/groff/font/devdvi/HBIEC
@@ -10,6 +10,7 @@ bq Bq 128128
 bq j 128128
 bq .j 128128
 bq g 64064
+bq u0067_0306 64064
 bq y 64064
 bq :y 64064
 bq 'y 64064
@@ -21,6 +22,7 @@ bq Y -96096
 bq :Y -96096
 bq 'Y -96096
 bq O -32032
+bq u004F_030B -32032
 bq `O -32032
 bq 'O -32032
 bq ^O -32032
@@ -31,6 +33,8 @@ bq /O -32032
 bq C -32032
 bq G -32032
 bq 'C -32032
+bq u0043_030C -32032
+bq u0047_0306 -32032
 bq ,C -32032
 bq Q -32032
 lq oq 128128
@@ -45,6 +49,7 @@ Bq Bq 128128
 Bq j 128128
 Bq .j 128128
 Bq g 64064
+Bq u0067_0306 64064
 Bq y 64064
 Bq :y 64064
 Bq 'y 64064
@@ -56,6 +61,7 @@ Bq Y -96096
 Bq :Y -96096
 Bq 'Y -96096
 Bq O -32032
+Bq u004F_030B -32032
 Bq `O -32032
 Bq 'O -32032
 Bq ^O -32032
@@ -66,6 +72,8 @@ Bq /O -32032
 Bq C -32032
 Bq G -32032
 Bq 'C -32032
+Bq u0043_030C -32032
+Bq u0047_0306 -32032
 Bq ,C -32032
 Bq Q -32032
 Fc . -96096
@@ -77,6 +85,7 @@ ff ` 80080
 ff lq 80080
 ff rq 80080
 ff ? 80080
+ff u01C3 80080
 ff ! 80080
 ff ) 80080
 ff rB 80080
@@ -85,7 +94,9 @@ cq rq 128128
 ' rq 128128
 cq ? 128128
 ' ? 128128
+cq u01C3 128128
 cq ! 128128
+' u01C3 128128
 ' ! 128128
 A y -32032
 A :y -32032
@@ -94,15 +105,21 @@ A v -32032
 A w -32032
 A c -32032
 A 'c -32032
+A u0063_030C -32032
 A ,c -32032
 A d -32032
+A u0064_030C -32032
+A u0111 -32032
 A Sd -32032
 A e -32032
+A u0065_030C -32032
+A u0065_0328 -32032
 A `e -32032
 A 'e -32032
 A ^e -32032
 A :e -32032
 A o -32032
+A u006F_030B -32032
 A `o -32032
 A 'o -32032
 A ^o -32032
@@ -112,12 +129,17 @@ A oe -32032
 A /o -32032
 A q -32032
 A t -32032
+A u0074_030C -32032
+A u0074_0327 -32032
 A C -32032
 A G -32032
 A 'C -32032
+A u0043_030C -32032
+A u0047_0306 -32032
 A ,C -32032
 A Q -32032
 A O -32032
+A u004F_030B -32032
 A `O -32032
 A 'O -32032
 A ^O -32032
@@ -126,11 +148,15 @@ A :O -32032
 A OE -32032
 A /O -32032
 A U -32032
+A u0055_030B -32032
+A u0055_030A -32032
 A `U -32032
 A 'U -32032
 A ^U -32032
 A :U -32032
 A T -96096
+A u0054_030C -96096
+A u0054_0327 -96096
 A Y -96096
 A :Y -96096
 A 'Y -96096
@@ -139,6 +165,8 @@ A W -128128
 D X -32032
 D W -32032
 D A -32032
+D u0041_0306 -32032
+D u0041_0328 -32032
 D `A -32032
 D 'A -32032
 D ^A -32032
@@ -169,6 +197,8 @@ F z -32032
 F ae -32032
 F /o -32032
 F A -96096
+F u0041_0306 -96096
+F u0041_0328 -96096
 F `A -96096
 F 'A -96096
 F ^A -96096
@@ -177,6 +207,7 @@ F :A -96096
 F oA -96096
 F AE -96096
 F O -32032
+F u004F_030B -32032
 F `O -32032
 F 'O -32032
 F ^O -32032
@@ -187,11 +218,14 @@ F /O -32032
 F C -32032
 F G -32032
 F 'C -32032
+F u0043_030C -32032
+F u0047_0306 -32032
 F ,C -32032
 F Q -32032
 I I 32032
 K v -32032
 K o -32032
+K u006F_030B -32032
 K `o -32032
 K 'o -32032
 K ^o -32032
@@ -202,9 +236,13 @@ K /o -32032
 K C -32032
 K G -32032
 K 'C -32032
+K u0043_030C -32032
+K u0047_0306 -32032
 K ,C -32032
 K Q -32032
 L T -96096
+L u0054_030C -96096
+L u0054_0327 -96096
 L Y -96096
 L :Y -96096
 L 'Y -96096
@@ -213,6 +251,8 @@ L W -128128
 O X -32032
 O W -32032
 O A -32032
+O u0041_0306 -32032
+O u0041_0328 -32032
 O `A -32032
 O 'A -32032
 O ^A -32032
@@ -225,6 +265,8 @@ O Y -32032
 O :Y -32032
 O 'Y -32032
 P A -96096
+P u0041_0306 -96096
+P u0041_0328 -96096
 P `A -96096
 P 'A -96096
 P ^A -96096
@@ -233,6 +275,7 @@ P :A -96096
 P oA -96096
 P AE -96096
 P o -32032
+P u006F_030B -32032
 P `o -32032
 P 'o -32032
 P ^o -32032
@@ -241,11 +284,15 @@ P :o -32032
 P oe -32032
 P /o -32032
 P e -32032
+P u0065_030C -32032
+P u0065_0328 -32032
 P `e -32032
 P 'e -32032
 P ^e -32032
 P :e -32032
 P a -32032
+P u0061_0306 -32032
+P u0061_0328 -32032
 P `a -32032
 P 'a -32032
 P ^a -32032
@@ -274,6 +321,8 @@ T w -96096
 T x -96096
 T z -96096
 T A -96096
+T u0041_0306 -96096
+T u0041_0328 -96096
 T `A -96096
 T 'A -96096
 T ^A -96096
@@ -300,6 +349,8 @@ V z -32032
 V ae -32032
 V /o -32032
 V A -96096
+V u0041_0306 -96096
+V u0041_0328 -96096
 V `A -96096
 V 'A -96096
 V ^A -96096
@@ -308,6 +359,7 @@ V :A -96096
 V oA -96096
 V AE -96096
 V O -32032
+V u004F_030B -32032
 V `O -32032
 V 'O -32032
 V ^O -32032
@@ -318,6 +370,8 @@ V /O -32032
 V C -32032
 V G -32032
 V 'C -32032
+V u0043_030C -32032
+V u0047_0306 -32032
 V ,C -32032
 V Q -32032
 W o -32032
@@ -339,6 +393,8 @@ W z -32032
 W ae -32032
 W /o -32032
 W A -96096
+W u0041_0306 -96096
+W u0041_0328 -96096
 W `A -96096
 W 'A -96096
 W ^A -96096
@@ -347,6 +403,7 @@ W :A -96096
 W oA -96096
 W AE -96096
 W O -32032
+W u004F_030B -32032
 W `O -32032
 W 'O -32032
 W ^O -32032
@@ -357,9 +414,12 @@ W /O -32032
 W C -32032
 W G -32032
 W 'C -32032
+W u0043_030C -32032
+W u0047_0306 -32032
 W ,C -32032
 W Q -32032
 X O -32032
+X u004F_030B -32032
 X `O -32032
 X 'O -32032
 X ^O -32032
@@ -370,6 +430,8 @@ X /O -32032
 X C -32032
 X G -32032
 X 'C -32032
+X u0043_030C -32032
+X u0047_0306 -32032
 X ,C -32032
 X Q -32032
 Y e -96096
@@ -389,6 +451,8 @@ Y w -96096
 Y x -96096
 Y z -96096
 Y A -96096
+Y u0041_0306 -96096
+Y u0041_0328 -96096
 Y `A -96096
 Y 'A -96096
 Y ^A -96096
@@ -400,7 +464,9 @@ oq lq 128128
 ` lq 128128
 oq ? 128128
 ` ? 128128
+oq u01C3 128128
 oq ! 128128
+` u01C3 128128
 ` ! 128128
 a r -32032
 a y -32032
@@ -408,11 +474,14 @@ a :y -32032
 a 'y -32032
 a w -32032
 b e 32032
+b u0065_030C 32032
+b u0065_0328 32032
 b `e 32032
 b 'e 32032
 b ^e 32032
 b :e 32032
 b o 32032
+b u006F_030B 32032
 b `o 32032
 b 'o 32032
 b ^o 32032
@@ -424,6 +493,7 @@ b x -32032
 b d 32032
 b c 32032
 b 'c 32032
+b u0063_030C 32032
 b ,c 32032
 b q 32032
 b r -32032
@@ -439,6 +509,7 @@ f ` 80080
 f lq 80080
 f rq 80080
 f ? 80080
+f u01C3 80080
 f ! 80080
 f ) 80080
 f rB 80080
@@ -447,11 +518,15 @@ g j 32032
 k W -96096
 k V -96096
 k e -32032
+k u0065_030C -32032
+k u0065_0328 -32032
 k `e -32032
 k 'e -32032
 k ^e -32032
 k :e -32032
 k a -32032
+k u0061_0306 -32032
+k u0061_0328 -32032
 k `a -32032
 k 'a -32032
 k ^a -32032
@@ -461,6 +536,7 @@ k :a -32032
 k oa -32032
 k ae -32032
 k o -32032
+k u006F_030B -32032
 k `o -32032
 k 'o -32032
 k ^o -32032
@@ -470,13 +546,17 @@ k oe -32032
 k /o -32032
 k c -32032
 k 'c -32032
+k u0063_030C -32032
 k ,c -32032
 o e 32032
+o u0065_030C 32032
+o u0065_0328 32032
 o `e 32032
 o 'e 32032
 o ^e 32032
 o :e 32032
 o o 32032
+o u006F_030B 32032
 o `o 32032
 o 'o 32032
 o ^o 32032
@@ -488,6 +568,7 @@ o x -32032
 o d 32032
 o c 32032
 o 'c 32032
+o u0063_030C 32032
 o ,c 32032
 o q 32032
 o r -32032
@@ -496,11 +577,14 @@ o :y -32032
 o 'y -32032
 o w -32032
 p e 32032
+p u0065_030C 32032
+p u0065_0328 32032
 p `e 32032
 p 'e 32032
 p ^e 32032
 p :e 32032
 p o 32032
+p u006F_030B 32032
 p `o 32032
 p 'o 32032
 p ^o 32032
@@ -512,6 +596,7 @@ p x -32032
 p d 32032
 p c 32032
 p 'c 32032
+p u0063_030C 32032
 p ,c 32032
 p q 32032
 p r -32032
@@ -525,11 +610,15 @@ t 'y -32032
 t w -32032
 u w -32032
 w e -32032
+w u0065_030C -32032
+w u0065_0328 -32032
 w `e -32032
 w 'e -32032
 w ^e -32032
 w :e -32032
 w a -32032
+w u0061_0306 -32032
+w u0061_0328 -32032
 w `a -32032
 w 'a -32032
 w ^a -32032
@@ -539,6 +628,7 @@ w :a -32032
 w oa -32032
 w ae -32032
 w o -32032
+w u006F_030B -32032
 w `o -32032
 w 'o -32032
 w ^o -32032
@@ -548,8 +638,10 @@ w oe -32032
 w /o -32032
 w c -32032
 w 'c -32032
+w u0063_030C -32032
 w ,c -32032
 y o -32032
+y u006F_030B -32032
 y `o -32032
 y 'o -32032
 y ^o -32032
@@ -558,11 +650,15 @@ y :o -32032
 y oe -32032
 y /o -32032
 y e -32032
+y u0065_030C -32032
+y u0065_0328 -32032
 y `e -32032
 y 'e -32032
 y ^e -32032
 y :e -32032
 y a -32032
+y u0061_0306 -32032
+y u0061_0328 -32032
 y `a -32032
 y 'a -32032
 y ^a -32032
@@ -573,19 +669,89 @@ y oa -32032
 y ae -32032
 y . -96096
 y , -96096
+u0041_0306 y -32032
+u0041_0306 :y -32032
+u0041_0306 'y -32032
+u0041_0306 v -32032
+u0041_0306 w -32032
+u0041_0306 c -32032
+u0041_0306 'c -32032
+u0041_0306 u0063_030C -32032
+u0041_0306 ,c -32032
+u0041_0306 d -32032
+u0041_0306 u0064_030C -32032
+u0041_0306 u0111 -32032
+u0041_0306 Sd -32032
+u0041_0306 e -32032
+u0041_0306 u0065_030C -32032
+u0041_0306 u0065_0328 -32032
+u0041_0306 `e -32032
+u0041_0306 'e -32032
+u0041_0306 ^e -32032
+u0041_0306 :e -32032
+u0041_0306 o -32032
+u0041_0306 u006F_030B -32032
+u0041_0306 `o -32032
+u0041_0306 'o -32032
+u0041_0306 ^o -32032
+u0041_0306 ~o -32032
+u0041_0306 :o -32032
+u0041_0306 oe -32032
+u0041_0306 /o -32032
+u0041_0306 q -32032
+u0041_0306 t -32032
+u0041_0306 u0074_030C -32032
+u0041_0306 u0074_0327 -32032
+u0041_0306 C -32032
+u0041_0306 G -32032
+u0041_0306 'C -32032
+u0041_0306 u0043_030C -32032
+u0041_0306 u0047_0306 -32032
+u0041_0306 ,C -32032
+u0041_0306 Q -32032
+u0041_0306 O -32032
+u0041_0306 u004F_030B -32032
+u0041_0306 `O -32032
+u0041_0306 'O -32032
+u0041_0306 ^O -32032
+u0041_0306 ~O -32032
+u0041_0306 :O -32032
+u0041_0306 OE -32032
+u0041_0306 /O -32032
+u0041_0306 U -32032
+u0041_0306 u0055_030B -32032
+u0041_0306 u0055_030A -32032
+u0041_0306 `U -32032
+u0041_0306 'U -32032
+u0041_0306 ^U -32032
+u0041_0306 :U -32032
+u0041_0306 T -96096
+u0041_0306 u0054_030C -96096
+u0041_0306 u0054_0327 -96096
+u0041_0306 Y -96096
+u0041_0306 :Y -96096
+u0041_0306 'Y -96096
+u0041_0306 V -128128
+u0041_0306 W -128128
 'C v -32032
 'C w -32032
 'C c -32032
 'C 'c -32032
+'C u0063_030C -32032
 'C ,c -32032
 'C d -32032
+'C u0064_030C -32032
+'C u0111 -32032
 'C Sd -32032
 'C e -32032
+'C u0065_030C -32032
+'C u0065_0328 -32032
 'C `e -32032
 'C 'e -32032
 'C ^e -32032
 'C :e -32032
 'C o -32032
+'C u006F_030B -32032
 'C `o -32032
 'C 'o -32032
 'C ^o -32032
@@ -595,12 +761,17 @@ y , -96096
 'C /o -32032
 'C q -32032
 'C t -32032
+'C u0074_030C -32032
+'C u0074_0327 -32032
 'C C -32032
 'C G -32032
 'C 'C -32032
+'C u0043_030C -32032
+'C u0047_0306 -32032
 'C ,C -32032
 'C Q -32032
 'C O -32032
+'C u004F_030B -32032
 'C `O -32032
 'C 'O -32032
 'C ^O -32032
@@ -609,22 +780,130 @@ y , -96096
 'C OE -32032
 'C /O -32032
 'C U -32032
+'C u0055_030B -32032
+'C u0055_030A -32032
 'C `U -32032
 'C 'U -32032
 'C ^U -32032
 'C :U -32032
 'C T -96096
+'C u0054_030C -96096
+'C u0054_0327 -96096
 'C Y -96096
 'C :Y -96096
 'C 'Y -96096
 'C V -128128
 'C W -128128
+u0044_030C X -32032
+u0044_030C W -32032
+u0044_030C A -32032
+u0044_030C u0041_0306 -32032
+u0044_030C u0041_0328 -32032
+u0044_030C `A -32032
+u0044_030C 'A -32032
+u0044_030C ^A -32032
+u0044_030C ~A -32032
+u0044_030C :A -32032
+u0044_030C oA -32032
+u0044_030C AE -32032
+u0044_030C V -32032
+u0044_030C Y -32032
+u0044_030C :Y -32032
+u0044_030C 'Y -32032
+u004C_0301 T -96096
+u004C_0301 u0054_030C -96096
+u004C_0301 u0054_0327 -96096
+u004C_0301 Y -96096
+u004C_0301 :Y -96096
+u004C_0301 'Y -96096
+u004C_0301 V -128128
+u004C_0301 W -128128
+u004C_030C T -96096
+u004C_030C u0054_030C -96096
+u004C_030C u0054_0327 -96096
+u004C_030C Y -96096
+u004C_030C :Y -96096
+u004C_030C 'Y -96096
+u004C_030C V -128128
+u004C_030C W -128128
 /L T -96096
+/L u0054_030C -96096
+/L u0054_0327 -96096
 /L Y -96096
 /L :Y -96096
 /L 'Y -96096
 /L V -128128
 /L W -128128
+u004F_030B X -32032
+u004F_030B W -32032
+u004F_030B A -32032
+u004F_030B u0041_0306 -32032
+u004F_030B u0041_0328 -32032
+u004F_030B `A -32032
+u004F_030B 'A -32032
+u004F_030B ^A -32032
+u004F_030B ~A -32032
+u004F_030B :A -32032
+u004F_030B oA -32032
+u004F_030B AE -32032
+u004F_030B V -32032
+u004F_030B Y -32032
+u004F_030B :Y -32032
+u004F_030B 'Y -32032
+u0054_030C y -96096
+u0054_030C e -96096
+u0054_030C o -96096
+u0054_030C r -96096
+u0054_030C a -96096
+u0054_030C u -96096
+u0054_030C n -96096
+u0054_030C .i -96096
+u0054_030C c -96096
+u0054_030C d -96096
+u0054_030C g -96096
+u0054_030C p -96096
+u0054_030C s -96096
+u0054_030C v -96096
+u0054_030C w -96096
+u0054_030C x -96096
+u0054_030C z -96096
+u0054_030C A -96096
+u0054_030C u0041_0306 -96096
+u0054_030C u0041_0328 -96096
+u0054_030C `A -96096
+u0054_030C 'A -96096
+u0054_030C ^A -96096
+u0054_030C ~A -96096
+u0054_030C :A -96096
+u0054_030C oA -96096
+u0054_030C AE -96096
+u0054_0327 y -96096
+u0054_0327 e -96096
+u0054_0327 o -96096
+u0054_0327 r -96096
+u0054_0327 a -96096
+u0054_0327 u -96096
+u0054_0327 n -96096
+u0054_0327 .i -96096
+u0054_0327 c -96096
+u0054_0327 d -96096
+u0054_0327 g -96096
+u0054_0327 p -96096
+u0054_0327 s -96096
+u0054_0327 v -96096
+u0054_0327 w -96096
+u0054_0327 x -96096
+u0054_0327 z -96096
+u0054_0327 A -96096
+u0054_0327 u0041_0306 -96096
+u0054_0327 u0041_0328 -96096
+u0054_0327 `A -96096
+u0054_0327 'A -96096
+u0054_0327 ^A -96096
+u0054_0327 ~A -96096
+u0054_0327 :A -96096
+u0054_0327 oA -96096
+u0054_0327 AE -96096
 :Y e -96096
 :Y o -96096
 :Y r -96096
@@ -642,6 +921,8 @@ y , -96096
 :Y x -96096
 :Y z -96096
 :Y A -96096
+:Y u0041_0306 -96096
+:Y u0041_0328 -96096
 :Y `A -96096
 :Y 'A -96096
 :Y ^A -96096
@@ -649,18 +930,66 @@ y , -96096
 :Y :A -96096
 :Y oA -96096
 :Y AE -96096
+u0061_0306 r -32032
+u0061_0306 y -32032
+u0061_0306 :y -32032
+u0061_0306 'y -32032
+u0061_0306 w -32032
+u0061_0328 w -32032
 /l cq 32032
 /l ' 32032
 /l a -32032
+/l u0061_0328 -32032
 /l c -32032
 /l 'c -32032
 /l d -32032
 /l e -32032
+/l u0065_0328 -32032
 /l g -32032
 /l o -32032
 /l 'o -32032
 /l s -32032
+/l u0073_0301 -32032
+u006F_030B e 32032
+u006F_030B u0065_030C 32032
+u006F_030B u0065_0328 32032
+u006F_030B `e 32032
+u006F_030B 'e 32032
+u006F_030B ^e 32032
+u006F_030B :e 32032
+u006F_030B o 32032
+u006F_030B u006F_030B 32032
+u006F_030B `o 32032
+u006F_030B 'o 32032
+u006F_030B ^o 32032
+u006F_030B ~o 32032
+u006F_030B :o 32032
+u006F_030B oe 32032
+u006F_030B /o 32032
+u006F_030B x -32032
+u006F_030B d 32032
+u006F_030B c 32032
+u006F_030B 'c 32032
+u006F_030B u0063_030C 32032
+u006F_030B ,c 32032
+u006F_030B q 32032
+u006F_030B r -32032
+u006F_030B y -32032
+u006F_030B :y -32032
+u006F_030B 'y -32032
+u006F_030B w -32032
+u0074_030C y -32032
+u0074_030C :y -32032
+u0074_030C 'y -32032
+u0074_030C w -32032
+u0074_0327 y -32032
+u0074_0327 :y -32032
+u0074_0327 'y -32032
+u0074_0327 w -32032
+u0075_030B w -32032
+u0075_030A w -32032
 :y o -32032
+:y u006F_030B -32032
 :y `o -32032
 :y 'o -32032
 :y ^o -32032
@@ -669,11 +998,15 @@ y , -96096
 :y oe -32032
 :y /o -32032
 :y e -32032
+:y u0065_030C -32032
+:y u0065_0328 -32032
 :y `e -32032
 :y 'e -32032
 :y ^e -32032
 :y :e -32032
 :y a -32032
+:y u0061_0306 -32032
+:y u0061_0328 -32032
 :y `a -32032
 :y 'a -32032
 :y ^a -32032
@@ -691,15 +1024,21 @@ y , -96096
 `A w -32032
 `A c -32032
 `A 'c -32032
+`A u0063_030C -32032
 `A ,c -32032
 `A d -32032
+`A u0064_030C -32032
+`A u0111 -32032
 `A Sd -32032
 `A e -32032
+`A u0065_030C -32032
+`A u0065_0328 -32032
 `A `e -32032
 `A 'e -32032
 `A ^e -32032
 `A :e -32032
 `A o -32032
+`A u006F_030B -32032
 `A `o -32032
 `A 'o -32032
 `A ^o -32032
@@ -709,12 +1048,17 @@ y , -96096
 `A /o -32032
 `A q -32032
 `A t -32032
+`A u0074_030C -32032
+`A u0074_0327 -32032
 `A C -32032
 `A G -32032
 `A 'C -32032
+`A u0043_030C -32032
+`A u0047_0306 -32032
 `A ,C -32032
 `A Q -32032
 `A O -32032
+`A u004F_030B -32032
 `A `O -32032
 `A 'O -32032
 `A ^O -32032
@@ -723,11 +1067,15 @@ y , -96096
 `A OE -32032
 `A /O -32032
 `A U -32032
+`A u0055_030B -32032
+`A u0055_030A -32032
 `A `U -32032
 `A 'U -32032
 `A ^U -32032
 `A :U -32032
 `A T -96096
+`A u0054_030C -96096
+`A u0054_0327 -96096
 `A Y -96096
 `A :Y -96096
 `A 'Y -96096
@@ -740,15 +1088,21 @@ y , -96096
 'A w -32032
 'A c -32032
 'A 'c -32032
+'A u0063_030C -32032
 'A ,c -32032
 'A d -32032
+'A u0064_030C -32032
+'A u0111 -32032
 'A Sd -32032
 'A e -32032
+'A u0065_030C -32032
+'A u0065_0328 -32032
 'A `e -32032
 'A 'e -32032
 'A ^e -32032
 'A :e -32032
 'A o -32032
+'A u006F_030B -32032
 'A `o -32032
 'A 'o -32032
 'A ^o -32032
@@ -758,12 +1112,17 @@ y , -96096
 'A /o -32032
 'A q -32032
 'A t -32032
+'A u0074_030C -32032
+'A u0074_0327 -32032
 'A C -32032
 'A G -32032
 'A 'C -32032
+'A u0043_030C -32032
+'A u0047_0306 -32032
 'A ,C -32032
 'A Q -32032
 'A O -32032
+'A u004F_030B -32032
 'A `O -32032
 'A 'O -32032
 'A ^O -32032
@@ -772,11 +1131,15 @@ y , -96096
 'A OE -32032
 'A /O -32032
 'A U -32032
+'A u0055_030B -32032
+'A u0055_030A -32032
 'A `U -32032
 'A 'U -32032
 'A ^U -32032
 'A :U -32032
 'A T -96096
+'A u0054_030C -96096
+'A u0054_0327 -96096
 'A Y -96096
 'A :Y -96096
 'A 'Y -96096
@@ -789,15 +1152,21 @@ y , -96096
 ^A w -32032
 ^A c -32032
 ^A 'c -32032
+^A u0063_030C -32032
 ^A ,c -32032
 ^A d -32032
+^A u0064_030C -32032
+^A u0111 -32032
 ^A Sd -32032
 ^A e -32032
+^A u0065_030C -32032
+^A u0065_0328 -32032
 ^A `e -32032
 ^A 'e -32032
 ^A ^e -32032
 ^A :e -32032
 ^A o -32032
+^A u006F_030B -32032
 ^A `o -32032
 ^A 'o -32032
 ^A ^o -32032
@@ -807,12 +1176,17 @@ y , -96096
 ^A /o -32032
 ^A q -32032
 ^A t -32032
+^A u0074_030C -32032
+^A u0074_0327 -32032
 ^A C -32032
 ^A G -32032
 ^A 'C -32032
+^A u0043_030C -32032
+^A u0047_0306 -32032
 ^A ,C -32032
 ^A Q -32032
 ^A O -32032
+^A u004F_030B -32032
 ^A `O -32032
 ^A 'O -32032
 ^A ^O -32032
@@ -821,11 +1195,15 @@ y , -96096
 ^A OE -32032
 ^A /O -32032
 ^A U -32032
+^A u0055_030B -32032
+^A u0055_030A -32032
 ^A `U -32032
 ^A 'U -32032
 ^A ^U -32032
 ^A :U -32032
 ^A T -96096
+^A u0054_030C -96096
+^A u0054_0327 -96096
 ^A Y -96096
 ^A :Y -96096
 ^A 'Y -96096
@@ -838,15 +1216,21 @@ y , -96096
 ~A w -32032
 ~A c -32032
 ~A 'c -32032
+~A u0063_030C -32032
 ~A ,c -32032
 ~A d -32032
+~A u0064_030C -32032
+~A u0111 -32032
 ~A Sd -32032
 ~A e -32032
+~A u0065_030C -32032
+~A u0065_0328 -32032
 ~A `e -32032
 ~A 'e -32032
 ~A ^e -32032
 ~A :e -32032
 ~A o -32032
+~A u006F_030B -32032
 ~A `o -32032
 ~A 'o -32032
 ~A ^o -32032
@@ -856,12 +1240,17 @@ y , -96096
 ~A /o -32032
 ~A q -32032
 ~A t -32032
+~A u0074_030C -32032
+~A u0074_0327 -32032
 ~A C -32032
 ~A G -32032
 ~A 'C -32032
+~A u0043_030C -32032
+~A u0047_0306 -32032
 ~A ,C -32032
 ~A Q -32032
 ~A O -32032
+~A u004F_030B -32032
 ~A `O -32032
 ~A 'O -32032
 ~A ^O -32032
@@ -870,11 +1259,15 @@ y , -96096
 ~A OE -32032
 ~A /O -32032
 ~A U -32032
+~A u0055_030B -32032
+~A u0055_030A -32032
 ~A `U -32032
 ~A 'U -32032
 ~A ^U -32032
 ~A :U -32032
 ~A T -96096
+~A u0054_030C -96096
+~A u0054_0327 -96096
 ~A Y -96096
 ~A :Y -96096
 ~A 'Y -96096
@@ -887,15 +1280,21 @@ y , -96096
 :A w -32032
 :A c -32032
 :A 'c -32032
+:A u0063_030C -32032
 :A ,c -32032
 :A d -32032
+:A u0064_030C -32032
+:A u0111 -32032
 :A Sd -32032
 :A e -32032
+:A u0065_030C -32032
+:A u0065_0328 -32032
 :A `e -32032
 :A 'e -32032
 :A ^e -32032
 :A :e -32032
 :A o -32032
+:A u006F_030B -32032
 :A `o -32032
 :A 'o -32032
 :A ^o -32032
@@ -905,12 +1304,17 @@ y , -96096
 :A /o -32032
 :A q -32032
 :A t -32032
+:A u0074_030C -32032
+:A u0074_0327 -32032
 :A C -32032
 :A G -32032
 :A 'C -32032
+:A u0043_030C -32032
+:A u0047_0306 -32032
 :A ,C -32032
 :A Q -32032
 :A O -32032
+:A u004F_030B -32032
 :A `O -32032
 :A 'O -32032
 :A ^O -32032
@@ -919,11 +1323,15 @@ y , -96096
 :A OE -32032
 :A /O -32032
 :A U -32032
+:A u0055_030B -32032
+:A u0055_030A -32032
 :A `U -32032
 :A 'U -32032
 :A ^U -32032
 :A :U -32032
 :A T -96096
+:A u0054_030C -96096
+:A u0054_0327 -96096
 :A Y -96096
 :A :Y -96096
 :A 'Y -96096
@@ -936,15 +1344,21 @@ oA v -32032
 oA w -32032
 oA c -32032
 oA 'c -32032
+oA u0063_030C -32032
 oA ,c -32032
 oA d -32032
+oA u0064_030C -32032
+oA u0111 -32032
 oA Sd -32032
 oA e -32032
+oA u0065_030C -32032
+oA u0065_0328 -32032
 oA `e -32032
 oA 'e -32032
 oA ^e -32032
 oA :e -32032
 oA o -32032
+oA u006F_030B -32032
 oA `o -32032
 oA 'o -32032
 oA ^o -32032
@@ -954,12 +1368,17 @@ oA oe -32032
 oA /o -32032
 oA q -32032
 oA t -32032
+oA u0074_030C -32032
+oA u0074_0327 -32032
 oA C -32032
 oA G -32032
 oA 'C -32032
+oA u0043_030C -32032
+oA u0047_0306 -32032
 oA ,C -32032
 oA Q -32032
 oA O -32032
+oA u004F_030B -32032
 oA `O -32032
 oA 'O -32032
 oA ^O -32032
@@ -968,33 +1387,73 @@ oA :O -32032
 oA OE -32032
 oA /O -32032
 oA U -32032
+oA u0055_030B -32032
+oA u0055_030A -32032
 oA `U -32032
 oA 'U -32032
 oA ^U -32032
 oA :U -32032
 oA T -96096
+oA u0054_030C -96096
+oA u0054_0327 -96096
 oA Y -96096
 oA :Y -96096
 oA 'Y -96096
 oA V -128128
 oA W -128128
+u0189 X -32032
+u0110 X -32032
 -D X -32032
+u0189 W -32032
+u0110 W -32032
 -D W -32032
+u0189 A -32032
+u0110 A -32032
 -D A -32032
+u0189 u0041_0306 -32032
+u0110 u0041_0306 -32032
+-D u0041_0306 -32032
+u0189 u0041_0328 -32032
+u0110 u0041_0328 -32032
+-D u0041_0328 -32032
+u0189 `A -32032
+u0110 `A -32032
 -D `A -32032
+u0189 'A -32032
+u0110 'A -32032
 -D 'A -32032
+u0189 ^A -32032
+u0110 ^A -32032
 -D ^A -32032
+u0189 ~A -32032
+u0110 ~A -32032
 -D ~A -32032
+u0189 :A -32032
+u0110 :A -32032
 -D :A -32032
+u0189 oA -32032
+u0110 oA -32032
 -D oA -32032
+u0189 AE -32032
+u0110 AE -32032
 -D AE -32032
+u0189 V -32032
+u0110 V -32032
 -D V -32032
+u0189 Y -32032
+u0110 Y -32032
 -D Y -32032
+u0189 :Y -32032
+u0110 :Y -32032
 -D :Y -32032
+u0189 'Y -32032
+u0110 'Y -32032
 -D 'Y -32032
 `O X -32032
 `O W -32032
 `O A -32032
+`O u0041_0306 -32032
+`O u0041_0328 -32032
 `O `A -32032
 `O 'A -32032
 `O ^A -32032
@@ -1009,6 +1468,8 @@ oA W -128128
 'O X -32032
 'O W -32032
 'O A -32032
+'O u0041_0306 -32032
+'O u0041_0328 -32032
 'O `A -32032
 'O 'A -32032
 'O ^A -32032
@@ -1023,6 +1484,8 @@ oA W -128128
 ^O X -32032
 ^O W -32032
 ^O A -32032
+^O u0041_0306 -32032
+^O u0041_0328 -32032
 ^O `A -32032
 ^O 'A -32032
 ^O ^A -32032
@@ -1037,6 +1500,8 @@ oA W -128128
 ~O X -32032
 ~O W -32032
 ~O A -32032
+~O u0041_0306 -32032
+~O u0041_0328 -32032
 ~O `A -32032
 ~O 'A -32032
 ~O ^A -32032
@@ -1051,6 +1516,8 @@ oA W -128128
 :O X -32032
 :O W -32032
 :O A -32032
+:O u0041_0306 -32032
+:O u0041_0328 -32032
 :O `A -32032
 :O 'A -32032
 :O ^A -32032
@@ -1065,6 +1532,8 @@ oA W -128128
 /O X -32032
 /O W -32032
 /O A -32032
+/O u0041_0306 -32032
+/O u0041_0328 -32032
 /O `A -32032
 /O 'A -32032
 /O ^A -32032
@@ -1093,6 +1562,8 @@ oA W -128128
 'Y x -96096
 'Y z -96096
 'Y A -96096
+'Y u0041_0306 -96096
+'Y u0041_0328 -96096
 'Y `A -96096
 'Y 'A -96096
 'Y ^A -96096
@@ -1131,11 +1602,14 @@ oa :y -32032
 oa 'y -32032
 oa w -32032
 `o e 32032
+`o u0065_030C 32032
+`o u0065_0328 32032
 `o `e 32032
 `o 'e 32032
 `o ^e 32032
 `o :e 32032
 `o o 32032
+`o u006F_030B 32032
 `o `o 32032
 `o 'o 32032
 `o ^o 32032
@@ -1147,6 +1621,7 @@ oa w -32032
 `o d 32032
 `o c 32032
 `o 'c 32032
+`o u0063_030C 32032
 `o ,c 32032
 `o q 32032
 `o r -32032
@@ -1155,11 +1630,14 @@ oa w -32032
 `o 'y -32032
 `o w -32032
 'o e 32032
+'o u0065_030C 32032
+'o u0065_0328 32032
 'o `e 32032
 'o 'e 32032
 'o ^e 32032
 'o :e 32032
 'o o 32032
+'o u006F_030B 32032
 'o `o 32032
 'o 'o 32032
 'o ^o 32032
@@ -1171,6 +1649,7 @@ oa w -32032
 'o d 32032
 'o c 32032
 'o 'c 32032
+'o u0063_030C 32032
 'o ,c 32032
 'o q 32032
 'o r -32032
@@ -1179,11 +1658,14 @@ oa w -32032
 'o 'y -32032
 'o w -32032
 ^o e 32032
+^o u0065_030C 32032
+^o u0065_0328 32032
 ^o `e 32032
 ^o 'e 32032
 ^o ^e 32032
 ^o :e 32032
 ^o o 32032
+^o u006F_030B 32032
 ^o `o 32032
 ^o 'o 32032
 ^o ^o 32032
@@ -1195,6 +1677,7 @@ oa w -32032
 ^o d 32032
 ^o c 32032
 ^o 'c 32032
+^o u0063_030C 32032
 ^o ,c 32032
 ^o q 32032
 ^o r -32032
@@ -1203,11 +1686,14 @@ oa w -32032
 ^o 'y -32032
 ^o w -32032
 ~o e 32032
+~o u0065_030C 32032
+~o u0065_0328 32032
 ~o `e 32032
 ~o 'e 32032
 ~o ^e 32032
 ~o :e 32032
 ~o o 32032
+~o u006F_030B 32032
 ~o `o 32032
 ~o 'o 32032
 ~o ^o 32032
@@ -1219,6 +1705,7 @@ oa w -32032
 ~o d 32032
 ~o c 32032
 ~o 'c 32032
+~o u0063_030C 32032
 ~o ,c 32032
 ~o q 32032
 ~o r -32032
@@ -1227,11 +1714,14 @@ oa w -32032
 ~o 'y -32032
 ~o w -32032
 :o e 32032
+:o u0065_030C 32032
+:o u0065_0328 32032
 :o `e 32032
 :o 'e 32032
 :o ^e 32032
 :o :e 32032
 :o o 32032
+:o u006F_030B 32032
 :o `o 32032
 :o 'o 32032
 :o ^o 32032
@@ -1243,6 +1733,7 @@ oa w -32032
 :o d 32032
 :o c 32032
 :o 'c 32032
+:o u0063_030C 32032
 :o ,c 32032
 :o q 32032
 :o r -32032
@@ -1251,11 +1742,14 @@ oa w -32032
 :o 'y -32032
 :o w -32032
 /o e 32032
+/o u0065_030C 32032
+/o u0065_0328 32032
 /o `e 32032
 /o 'e 32032
 /o ^e 32032
 /o :e 32032
 /o o 32032
+/o u006F_030B 32032
 /o `o 32032
 /o 'o 32032
 /o ^o 32032
@@ -1267,6 +1761,7 @@ oa w -32032
 /o d 32032
 /o c 32032
 /o 'c 32032
+/o u0063_030C 32032
 /o ,c 32032
 /o q 32032
 /o r -32032
@@ -1279,6 +1774,7 @@ oa w -32032
 ^u w -32032
 :u w -32032
 'y o -32032
+'y u006F_030B -32032
 'y `o -32032
 'y 'o -32032
 'y ^o -32032
@@ -1287,11 +1783,15 @@ oa w -32032
 'y oe -32032
 'y /o -32032
 'y e -32032
+'y u0065_030C -32032
+'y u0065_0328 -32032
 'y `e -32032
 'y 'e -32032
 'y ^e -32032
 'y :e -32032
 'y a -32032
+'y u0061_0306 -32032
+'y u0061_0328 -32032
 'y `a -32032
 'y 'a -32032
 'y ^a -32032
@@ -1335,8 +1835,9 @@ fi	614432,755976,0,127442	2	0034
 fl	614432,755976,0,130354	2	0035
 Fi	934752,755976,0,127442	2	0036
 Fl	934752,755976,0,130354	2	0037
----	576576,480480,101920,39690	1	0040
-!	384384,755976,0,69202	2	0041
+u2423	576576,480480,101920,39690	1	0040
+u01C3	384384,755976,0,69202	2	0041
+!	"
 dq	576576,755976,0,72114	2	0042
 "	"
 sh	960960,755976,232960,58491	3	0043
@@ -1350,8 +1851,7 @@ cq	320320,755976,0,101234	2	0047
 (	448448,782600,262080,135086	3	0050
 )	448448,782600,262080,23674	3	0051
 *	576576,782600,0,119070	2	0052
-pl	896896,646464,122304,23674	3	0053
-+	"
++	896896,646464,122304,23674	3	0053
 ,	320320,136864,110656	1	0054
 -	384384,480480,0,19032	0	0055
 .	320320,136864	0	0056
@@ -1370,8 +1870,7 @@ sl	576576,782600,262080,135086	3	0057
 :	320320,480480,0,42432	0	0072
 ;	320320,480480,110656,42432	1	0073
 <	896896,636091,111931,71141	3	0074
-eq	896896,425880,-98280,58491	0	0075
-=	"
+=	896896,425880,-98280,58491	0	0075
 >	896896,636091,111931	3	0076
 ?	544544,755976,0,128744	2	0077
 at	768768,755976,0,80618	2	0100
@@ -1441,74 +1940,73 @@ y	524160,480480,203840,118144	1	0171
 z	499408,480480,0,96013	0	0172
 lC	576576,782600,262080,140910	3	0173
 {	"
-ba	320320,782600,262080,82670	3	0174
-bv	"
-or	"
+u01C0	320320,782600,262080,82670	3	0174
+ba	"
 |	"
 rC	576576,782600,262080,29498	3	0175
 }	"
 ~	704704,755976,0,96379	2	0176
 hy	192192,480480,0,19032	0	0177
----	768768,946400	2	0200
----	768768,728000,203840	3	0201
+u0041_0306	768768,946400	2	0200
+u0041_0328	768768,728000,203840	3	0201
 'C	736736,905917,0,122707	2	0202
----	736736,946400,0,122707,-78454,61354	2	0203
----	832832,946400,0,76286,0,44254	2	0204
----	672672,946400,0,122707,0,61354	2	0205
----	672672,728000,203840,122707	3	0206
----	768768,946400,0,122707,-78454,61354	2	0207
----	608608,905917,0,0,0,64064	2	0210
----	608608,946400,0,0,0,64064	2	0211
+u0043_030C	736736,946400,0,122707,-78454,61354	2	0203
+u0044_030C	832832,946400,0,76286,0,44254	2	0204
+u0045_030C	672672,946400,0,122707,0,61354	2	0205
+u0045_0328	672672,728000,203840,122707	3	0206
+u0047_0306	768768,946400,0,122707,-78454,61354	2	0207
+u004C_0301	608608,905917,0,0,0,64064	2	0210
+u004C_030C	608608,946400,0,0,0,64064	2	0211
 /L	704704,728000	2	0212
----	832832,905917,0,90675	2	0213
----	832832,946400,0,90675,0,13306	2	0214
----	864864,728000,0,154739,0,45338	2	0215
----	832832,905917,0,76286,-78454,44254	2	0216
----	736736,905917,0,84022,0,63018	2	0217
----	736736,946400,0,84022,0,63018	2	0220
----	640640,905917,0,90675	2	0221
+u004E_0301	832832,905917,0,90675	2	0213
+u004E_030C	832832,946400,0,90675,0,13306	2	0214
+u014A	864864,728000,0,154739,0,45338	2	0215
+u004F_030B	832832,905917,0,76286,-78454,44254	2	0216
+u0052_0301	736736,905917,0,84022,0,63018	2	0217
+u0052_030C	736736,946400,0,84022,0,63018	2	0220
+u0053_0301	640640,905917,0,90675	2	0221
 vS	640640,946400,0,90675,0,45338	2	0222
----	640640,728000,178360,90675,0,45338	3	0223
----	768768,946400,0,138723,-116054,-21437	2	0224
----	768768,728000,178360,138723,-116054,-21437	3	0225
----	800800,905917,0,90675,-78454,13306	2	0226
----	800800,946400,0,90675,-78454,13306	2	0227
+u0053_0327	640640,728000,178360,90675,0,45338	3	0223
+u0054_030C	768768,946400,0,138723,-116054,-21437	2	0224
+u0054_0327	768768,728000,178360,138723,-116054,-21437	3	0225
+u0055_030B	800800,905917,0,90675,-78454,13306	2	0226
+u0055_030A	800800,946400,0,90675,-78454,13306	2	0227
 :Y	768768,946400,0,183568,-122707,-72688	2	0230
----	704704,905917,0,122707	2	0231
+u005A_0301	704704,905917,0,122707	2	0231
 vZ	704704,946400,0,122707,0,61354	2	0232
----	704704,905917,0,122707	2	0233
+u005A_0307	704704,905917,0,122707	2	0233
 IJ	853216,728000,0,90675,0,13306	2	0234
----	340704,905917,0,138723,0,69362	2	0235
----	588224,755976,0,130354	2	0236
+u0049_0307	340704,905917,0,138723,0,69362	2	0235
+u0111	588224,755976,0,130354	2	0236
 sc	559104,755976,203840	3	0237
----	550368,698880,0,40605	2	0240
----	550368,480480,203840,40605	1	0241
+u0061_0306	550368,698880,0,40605	2	0240
+u0061_0328	550368,480480,203840,40605	1	0241
 'c	512512,698880,0,89315	2	0242
----	512512,698880,0,89315	2	0243
----	767312,755976,0,130354	2	0244
----	535808,698880,0,78917	2	0245
----	535808,480480,203840,78917	1	0246
----	576576,698880,203840,118144	3	0247
----	267904,905917,0,130354	2	0250
----	446992,755976,0,130354	2	0251
+u0063_030C	512512,698880,0,89315	2	0243
+u0064_030C	767312,755976,0,130354	2	0244
+u0065_030C	535808,698880,0,78917	2	0245
+u0065_0328	535808,480480,203840,78917	1	0246
+u0067_0306	576576,698880,203840,118144	3	0247
+u006C_0301	267904,905917,0,130354	2	0250
+u006C_030C	446992,755976,0,130354	2	0251
 /l	399818,755976,0,130354	2	0252
----	588224,698880,0,48341	2	0253
----	588224,698880,0,48341	2	0254
----	588224,480480,203840,48341	1	0255
----	576576,698880,0,71520	2	0256
----	390208,698880,0,118144	2	0257
----	390208,698880,0,118144	2	0260
----	442042,698880,0,82909	2	0261
+u006E_0301	588224,698880,0,48341	2	0253
+u006E_030C	588224,698880,0,48341	2	0254
+u016A	588224,480480,203840,48341	1	0255
+u006F_030B	576576,698880,0,71520	2	0256
+u0072_0301	390208,698880,0,118144	2	0257
+u0072_030C	390208,698880,0,118144	2	0260
+u0073_0301	442042,698880,0,82909	2	0261
 vs	442042,698880,0,82909	2	0262
----	442042,480480,178360,82909	1	0263
----	423696,755976,0,135304	2	0264
----	423696,617763,178360,76502	3	0265
----	588224,698880,0,71520	2	0266
----	588224,698880,0,71520	2	0267
+u0073_0327	442042,480480,178360,82909	1	0263
+u0074_030C	423696,755976,0,135304	2	0264
+u0074_0327	423696,617763,178360,76502	3	0265
+u0075_030B	588224,698880,0,71520	2	0266
+u0075_030A	588224,698880,0,71520	2	0267
 :y	524160,728000,203840,118144	3	0270
----	499408,698880,0,96013	2	0271
+u007A_0301	499408,698880,0,96013	2	0271
 vz	499408,698880,0,96013	2	0272
----	499408,755976,0,96013	2	0273
+u007A_0307	499408,755976,0,96013	2	0273
 ij	620256,755976,203840,133266	3	0274
 r!	384384,553280,203840,25874	3	0275
 r?	544544,553280,203840	3	0276
@@ -1529,7 +2027,9 @@ AE	992992,728000,0,122707	2	0306
 'I	340704,905917,0,138723,0,69362	2	0315
 ^I	340704,946400,0,138723,0,69362	2	0316
 :I	340704,946400,0,138723,0,69362	2	0317
--D	832832,728000,0,76286,0,44254	2	0320
+u0189	832832,728000,0,76286,0,44254	2	0320
+u0110	"
+-D	"
 ~N	832832,946400,0,90675,0,13306	2	0321
 `O	832832,905917,0,76286,-78454,44254	2	0322
 'O	832832,905917,0,76286	2	0323
diff --git a/contrib/groff/font/devdvi/HBITC b/contrib/groff/font/devdvi/HBITC
index 26167ca..9a9fec8 100644
--- a/contrib/groff/font/devdvi/HBITC
+++ b/contrib/groff/font/devdvi/HBITC
@@ -31,11 +31,11 @@ charset
 ---	524160,757120,0,487894	2	0034
 ---	524160,757120,0,543309	2	0035
 ---	0,757120	2	0037
----	588224,757120,0,35048	2	0040
+u2422	588224,757120,0,35048	2	0040
 Do	576576,786240,29120,122707	3	0044
 $	"
 aq	320320,757120,0,104146	2	0047
-**	576576,502320,-21840	2	0052
+---	576576,502320,-21840	2	0052
 ,	320320,137072,110656	1	0054
 ---	384384,425880,-98280,58491	0	0055
 .	320320,137072	0	0056
@@ -51,14 +51,13 @@ f/	576576,786240,262080,135086	3	0057
 8	576576,728000,0,90675	2	0070
 9	576576,483392,203840,38064	3	0071
 la	448448,786240,262080	3	0074
-mi	896896,646464,122304,23674	3	0075
-\-	"
+\-	896896,646464,122304,23674	3	0075
 ra	448448,786240,262080	3	0076
----	832832,728000,0,132317,0,66158	2	0115
+u2127	832832,728000,0,132317,0,66158	2	0115
 ci	1281280,786240,262080	3	0117
----	832832,728000,0,84022,0,42011	2	0127
----	464464,786240,262080	3	0133
----	464464,786240,262080	3	0135
+u03A9	832832,728000,0,84022,0,42011	2	0127
+u301A	464464,786240,262080	3	0133
+u301B	464464,786240,262080	3	0135
 ua	576576,757120,232960,96098	3	0136
 da	576576,757120,232960	3	0137
 ---	576576,757120	2	0140
@@ -67,7 +66,7 @@ da	576576,757120,232960	3	0137
 ---	576576,660915,27666	3	0144
 ---	1153152,757120	2	0154
 ---	576576,502320,-21840	2	0155
----	704704,757120	2	0156
+u266A	704704,757120	2	0156
 ti	704704,137072	0	0176
 ~	"
 ---	192192,425880,-98280,58491	0	0177
@@ -77,34 +76,34 @@ ti	704704,137072	0	0176
 ---	576576,757120	2	0203
 dg	512512,757120,203840	3	0204
 dd	512512,757120,203840	3	0205
----	576576,786240,262080	3	0206
-%O	1463224,786240,29120,32339	3	0207
+u2016	576576,786240,262080	3	0206
+%0	1463224,786240,29120,32339	3	0207
 bu	576576,483392,-37856	2	0210
----	992992,728000,0,122707,-78454,61354	2	0211
+u2103	992992,728000,0,122707,-78454,61354	2	0211
 ---	704704,786240,29120,122707	3	0212
 ---	576576,582400,101920,89315	3	0213
 Fn	352352,757120,0,241010	2	0214
----	736736,786240,29120,122707,-78454,61354	3	0215
----	1089088,728000,0,170755,-106691,10595	2	0216
----	864864,728000,0,90675,0,13306	2	0217
+u20A1	736736,786240,29120,122707,-78454,61354	3	0215
+u20A9	1089088,728000,0,170755,-106691,10595	2	0216
+u20A6	864864,728000,0,90675,0,13306	2	0217
 ---	896896,786240,29120,122707,-78454,61354	3	0220
----	752752,728000,0,84022,0,-76138	2	0221
----	857434,757120	2	0222
----	736736,728000,0,84022,0,63018	2	0223
----	544544,757120,0,128744	2	0224
+u20B1	752752,728000,0,84022,0,-76138	2	0221
+u20A4	857434,757120	2	0222
+u211E	736736,728000,0,84022,0,63018	2	0223
+u203D	544544,757120,0,128744	2	0224
 ---	544544,553280,203840	3	0225
----	588224,786240,0,130354	2	0226
+u20AB	588224,786240,0,130354	2	0226
 tm	768768,786240,0,550366	2	0227
----	2088494,786240,29120,32339	3	0230
+u2031	2088494,786240,29120,32339	3	0230
 ---	544544,757120,203840	3	0231
----	768768,786240,29120,84022,0,42011	3	0232
----	960960,728000,0,90675,0,13306	2	0233
----	576576,786240,0,135086	2	0234
----	794976,728000,0,117602	2	0235
----	576576,483392,-37856	2	0236
----	768768,786240,0,550366	2	0237
----	416416,786240,262080,29498	3	0240
----	416416,786240,262080,140910	3	0241
+u0E3F	768768,786240,29120,84022,0,42011	3	0232
+u2116	960960,728000,0,90675,0,13306	2	0233
+u2052	576576,786240,0,135086	2	0234
+u212E	794976,728000,0,117602	2	0235
+u25E6	576576,483392,-37856	2	0236
+u2120	768768,786240,0,550366	2	0237
+u2045	416416,786240,262080,29498	3	0240
+u2046	416416,786240,262080,140910	3	0241
 ct	576576,582400,101920,89315	3	0242
 Po	857434,757120	2	0243
 Cs	826203,617763,0,102128	2	0244
@@ -115,10 +114,10 @@ sc	559104,757120,203840	3	0247
 co	1281280,786240,262080	3	0251
 Of	512512,786240,0,116982	2	0252
 ---	1281280,786240,262080	3	0253
-no	768768,483392,0,70096	2	0254
----	1281280,786240,262080	3	0255
+tno	768768,483392,0,70096	2	0254
+u2117	1281280,786240,262080	3	0255
 rg	1281280,786240,262080	3	0256
-rn	896896,757120	2	0257
+---	896896,757120	2	0257
 de	384384,728000	2	0260
 t+-	896896,646464,122304,23674	3	0261
 S2	512512,786240,0,135086	2	0262
@@ -127,13 +126,13 @@ S3	512512,786240,0,135086	2	0263
 mc	588224,483392,203840,71552	3	0265
 ps	704704,757120,203840	3	0266
 pc	235872,483392	2	0267
----	700819,572691,0,19032	2	0270
+u203B	700819,572691,0,19032	2	0270
 S1	512512,786240,0,135086	2	0271
 Om	512512,786240,0,116982	2	0272
 ---	544544,786240,174720,167118	3	0273
-14	512512,786240,203840,135086	3	0274
-12	512512,786240,203840,135086	3	0275
-34	512512,786240,203840,135086	3	0276
+---	512512,786240,203840,135086	3	0274
+---	512512,786240,203840,135086	3	0275
+---	512512,786240,203840,135086	3	0276
 Eu	896896,728000,0,122707	2	0277
 tmu	896896,646464,122304,23674	3	0326
 tdi	896896,646464,122304,23674	3	0366
diff --git a/contrib/groff/font/devdvi/HBTC b/contrib/groff/font/devdvi/HBTC
index 9844258..74c0f27 100644
--- a/contrib/groff/font/devdvi/HBTC
+++ b/contrib/groff/font/devdvi/HBTC
@@ -30,11 +30,11 @@ charset
 ---	524160,757120,0,359632	2	0034
 ---	524160,757120,0,391664	2	0035
 ---	0,757120	2	0037
----	588224,757120	2	0040
+u2422	588224,757120	2	0040
 Do	576576,786240,29120	3	0044
 $	"
 aq	320320,757120	2	0047
-**	576576,502320,-21840	2	0052
+---	576576,502320,-21840	2	0052
 ,	320320,137072,110656	1	0054
 ---	384384,425880,-98280	0	0055
 .	320320,137072	0	0056
@@ -50,14 +50,13 @@ f/	576576,786240,262080	3	0057
 8	576576,728000	2	0070
 9	576576,483392,203840	3	0071
 la	448448,786240,262080	3	0074
-mi	896896,646464,122304	3	0075
-\-	"
+\-	896896,646464,122304	3	0075
 ra	448448,786240,262080	3	0076
----	832832,728000	2	0115
+u2127	832832,728000	2	0115
 ci	1281280,786240,262080	3	0117
----	832832,728000	2	0127
----	464464,786240,262080	3	0133
----	464464,786240,262080	3	0135
+u03A9	832832,728000	2	0127
+u301A	464464,786240,262080	3	0133
+u301B	464464,786240,262080	3	0135
 ua	576576,757120,232960	3	0136
 da	576576,757120,232960	3	0137
 ---	576576,757120	2	0140
@@ -66,7 +65,7 @@ da	576576,757120,232960	3	0137
 ---	576576,660915,27666	3	0144
 ---	1153152,757120	2	0154
 ---	576576,502320,-21840	2	0155
----	704704,757120	2	0156
+u266A	704704,757120	2	0156
 ti	704704,137072	0	0176
 ~	"
 ---	192192,425880,-98280	0	0177
@@ -76,34 +75,34 @@ ti	704704,137072	0	0176
 ---	576576,757120	2	0203
 dg	512512,757120,203840	3	0204
 dd	512512,757120,203840	3	0205
----	576576,786240,262080	3	0206
-%O	1463224,786240,29120	3	0207
+u2016	576576,786240,262080	3	0206
+%0	1463224,786240,29120	3	0207
 bu	576576,483392,-37856	2	0210
----	992992,728000,0,0,-32032	2	0211
+u2103	992992,728000,0,0,-32032	2	0211
 ---	704704,786240,29120	3	0212
 ---	576576,582400,101920	3	0213
 Fn	352352,757120,0,80080	2	0214
----	736736,786240,29120,0,-32032	3	0215
----	1089088,728000,0,16016,48048,-144144	2	0216
----	864864,728000	2	0217
+u20A1	736736,786240,29120,0,-32032	3	0215
+u20A9	1089088,728000,0,16016,48048,-144144	2	0216
+u20A6	864864,728000	2	0217
 ---	896896,786240,29120,0,-32032	3	0220
----	752752,728000,0,0,0,-160160	2	0221
----	736736,757120	2	0222
----	736736,728000	2	0223
----	544544,757120	2	0224
+u20B1	752752,728000,0,0,0,-160160	2	0221
+u20A4	736736,757120	2	0222
+u211E	736736,728000	2	0223
+u203D	544544,757120	2	0224
 ---	544544,553280,203840	3	0225
----	588224,786240	2	0226
+u20AB	588224,786240	2	0226
 tm	768768,786240,0,550366	2	0227
----	2088494,786240,29120	3	0230
+u2031	2088494,786240,29120	3	0230
 ---	544544,757120,203840	3	0231
----	768768,786240,29120	3	0232
----	960960,728000	2	0233
----	576576,786240	2	0234
----	794976,728000	2	0235
----	576576,483392,-37856	2	0236
----	768768,786240,0,550366	2	0237
----	416416,786240,262080	3	0240
----	416416,786240,262080	3	0241
+u0E3F	768768,786240,29120	3	0232
+u2116	960960,728000	2	0233
+u2052	576576,786240	2	0234
+u212E	794976,728000	2	0235
+u25E6	576576,483392,-37856	2	0236
+u2120	768768,786240,0,550366	2	0237
+u2045	416416,786240,262080	3	0240
+u2046	416416,786240,262080	3	0241
 ct	576576,582400,101920	3	0242
 Po	736736,757120	2	0243
 Cs	826203,617763	2	0244
@@ -114,10 +113,10 @@ sc	559104,757120,203840	3	0247
 co	1281280,786240,262080	3	0251
 Of	512512,786240	2	0252
 ---	1281280,786240,262080	3	0253
-no	768768,483392	2	0254
----	1281280,786240,262080	3	0255
+tno	768768,483392	2	0254
+u2117	1281280,786240,262080	3	0255
 rg	1281280,786240,262080	3	0256
-rn	896896,757120	2	0257
+---	896896,757120	2	0257
 de	384384,728000	2	0260
 t+-	896896,646464,122304	3	0261
 S2	512512,786240	2	0262
@@ -126,13 +125,13 @@ S3	512512,786240	2	0263
 mc	588224,483392,203840	3	0265
 ps	704704,757120,203840	3	0266
 pc	235872,483392	2	0267
----	700819,572691	2	0270
+u203B	700819,572691	2	0270
 S1	512512,786240	2	0271
 Om	512512,786240	2	0272
 ---	544544,786240,174720	3	0273
-14	512512,786240,203840	3	0274
-12	512512,786240,203840	3	0275
-34	512512,786240,203840	3	0276
+---	512512,786240,203840	3	0274
+---	512512,786240,203840	3	0275
+---	512512,786240,203840	3	0276
 Eu	896896,728000	2	0277
 tmu	896896,646464,122304	3	0326
 tdi	896896,646464,122304	3	0366
diff --git a/contrib/groff/font/devdvi/HI b/contrib/groff/font/devdvi/HI
index f98081e..4034e21 100644
--- a/contrib/groff/font/devdvi/HI
+++ b/contrib/groff/font/devdvi/HI
@@ -13,6 +13,8 @@ ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+slash@for@l l -250494
+slash@for@l L -270885
 cq ? 116509
 ' ? 116509
 cq ! 116509
@@ -186,7 +188,7 @@ oe	815562,466034,0,71070	0	0033
 AE	902944,728178,0,125650	2	0035
 OE	1019453,728178,0,125650	2	0036
 /O	815562,779150,50973,79216	3	0037
----	250494,466034	0	0040
+slash@for@l	250494,466034	0	0040
 !	334963,728178,0,60114	2	0041
 rq	524290,728178,0,3315	2	0042
 sh	873816,728178,203888,53338	3	0043
diff --git a/contrib/groff/font/devdvi/HIEC b/contrib/groff/font/devdvi/HIEC
index ef1a129..a53f126 100644
--- a/contrib/groff/font/devdvi/HIEC
+++ b/contrib/groff/font/devdvi/HIEC
@@ -10,6 +10,7 @@ bq Bq 116480
 bq j 116480
 bq .j 116480
 bq g 58240
+bq u0067_0306 58240
 bq y 58240
 bq :y 58240
 bq 'y 58240
@@ -21,6 +22,7 @@ bq Y -87360
 bq :Y -87360
 bq 'Y -87360
 bq O -29120
+bq u004F_030B -29120
 bq `O -29120
 bq 'O -29120
 bq ^O -29120
@@ -31,6 +33,8 @@ bq /O -29120
 bq C -29120
 bq G -29120
 bq 'C -29120
+bq u0043_030C -29120
+bq u0047_0306 -29120
 bq ,C -29120
 bq Q -29120
 lq oq 116480
@@ -45,6 +49,7 @@ Bq Bq 116480
 Bq j 116480
 Bq .j 116480
 Bq g 58240
+Bq u0067_0306 58240
 Bq y 58240
 Bq :y 58240
 Bq 'y 58240
@@ -56,6 +61,7 @@ Bq Y -87360
 Bq :Y -87360
 Bq 'Y -87360
 Bq O -29120
+Bq u004F_030B -29120
 Bq `O -29120
 Bq 'O -29120
 Bq ^O -29120
@@ -66,6 +72,8 @@ Bq /O -29120
 Bq C -29120
 Bq G -29120
 Bq 'C -29120
+Bq u0043_030C -29120
+Bq u0047_0306 -29120
 Bq ,C -29120
 Bq Q -29120
 Fc . -87360
@@ -77,6 +85,7 @@ ff ` 72800
 ff lq 72800
 ff rq 72800
 ff ? 72800
+ff u01C3 72800
 ff ! 72800
 ff ) 72800
 ff rB 72800
@@ -85,7 +94,9 @@ cq rq 116480
 ' rq 116480
 cq ? 116480
 ' ? 116480
+cq u01C3 116480
 cq ! 116480
+' u01C3 116480
 ' ! 116480
 A y -29120
 A :y -29120
@@ -94,15 +105,21 @@ A v -29120
 A w -29120
 A c -29120
 A 'c -29120
+A u0063_030C -29120
 A ,c -29120
 A d -29120
+A u0064_030C -29120
+A u0111 -29120
 A Sd -29120
 A e -29120
+A u0065_030C -29120
+A u0065_0328 -29120
 A `e -29120
 A 'e -29120
 A ^e -29120
 A :e -29120
 A o -29120
+A u006F_030B -29120
 A `o -29120
 A 'o -29120
 A ^o -29120
@@ -112,12 +129,17 @@ A oe -29120
 A /o -29120
 A q -29120
 A t -29120
+A u0074_030C -29120
+A u0074_0327 -29120
 A C -29120
 A G -29120
 A 'C -29120
+A u0043_030C -29120
+A u0047_0306 -29120
 A ,C -29120
 A Q -29120
 A O -29120
+A u004F_030B -29120
 A `O -29120
 A 'O -29120
 A ^O -29120
@@ -126,11 +148,15 @@ A :O -29120
 A OE -29120
 A /O -29120
 A U -29120
+A u0055_030B -29120
+A u0055_030A -29120
 A `U -29120
 A 'U -29120
 A ^U -29120
 A :U -29120
 A T -87360
+A u0054_030C -87360
+A u0054_0327 -87360
 A Y -87360
 A :Y -87360
 A 'Y -87360
@@ -139,6 +165,8 @@ A W -116480
 D X -29120
 D W -29120
 D A -29120
+D u0041_0306 -29120
+D u0041_0328 -29120
 D `A -29120
 D 'A -29120
 D ^A -29120
@@ -169,6 +197,8 @@ F z -29120
 F ae -29120
 F /o -29120
 F A -87360
+F u0041_0306 -87360
+F u0041_0328 -87360
 F `A -87360
 F 'A -87360
 F ^A -87360
@@ -177,6 +207,7 @@ F :A -87360
 F oA -87360
 F AE -87360
 F O -29120
+F u004F_030B -29120
 F `O -29120
 F 'O -29120
 F ^O -29120
@@ -187,11 +218,14 @@ F /O -29120
 F C -29120
 F G -29120
 F 'C -29120
+F u0043_030C -29120
+F u0047_0306 -29120
 F ,C -29120
 F Q -29120
 I I 29120
 K v -29120
 K o -29120
+K u006F_030B -29120
 K `o -29120
 K 'o -29120
 K ^o -29120
@@ -202,9 +236,13 @@ K /o -29120
 K C -29120
 K G -29120
 K 'C -29120
+K u0043_030C -29120
+K u0047_0306 -29120
 K ,C -29120
 K Q -29120
 L T -87360
+L u0054_030C -87360
+L u0054_0327 -87360
 L Y -87360
 L :Y -87360
 L 'Y -87360
@@ -213,6 +251,8 @@ L W -116480
 O X -29120
 O W -29120
 O A -29120
+O u0041_0306 -29120
+O u0041_0328 -29120
 O `A -29120
 O 'A -29120
 O ^A -29120
@@ -225,6 +265,8 @@ O Y -29120
 O :Y -29120
 O 'Y -29120
 P A -87360
+P u0041_0306 -87360
+P u0041_0328 -87360
 P `A -87360
 P 'A -87360
 P ^A -87360
@@ -233,6 +275,7 @@ P :A -87360
 P oA -87360
 P AE -87360
 P o -29120
+P u006F_030B -29120
 P `o -29120
 P 'o -29120
 P ^o -29120
@@ -241,11 +284,15 @@ P :o -29120
 P oe -29120
 P /o -29120
 P e -29120
+P u0065_030C -29120
+P u0065_0328 -29120
 P `e -29120
 P 'e -29120
 P ^e -29120
 P :e -29120
 P a -29120
+P u0061_0306 -29120
+P u0061_0328 -29120
 P `a -29120
 P 'a -29120
 P ^a -29120
@@ -274,6 +321,8 @@ T w -87360
 T x -87360
 T z -87360
 T A -87360
+T u0041_0306 -87360
+T u0041_0328 -87360
 T `A -87360
 T 'A -87360
 T ^A -87360
@@ -300,6 +349,8 @@ V z -29120
 V ae -29120
 V /o -29120
 V A -87360
+V u0041_0306 -87360
+V u0041_0328 -87360
 V `A -87360
 V 'A -87360
 V ^A -87360
@@ -308,6 +359,7 @@ V :A -87360
 V oA -87360
 V AE -87360
 V O -29120
+V u004F_030B -29120
 V `O -29120
 V 'O -29120
 V ^O -29120
@@ -318,6 +370,8 @@ V /O -29120
 V C -29120
 V G -29120
 V 'C -29120
+V u0043_030C -29120
+V u0047_0306 -29120
 V ,C -29120
 V Q -29120
 W o -29120
@@ -339,6 +393,8 @@ W z -29120
 W ae -29120
 W /o -29120
 W A -87360
+W u0041_0306 -87360
+W u0041_0328 -87360
 W `A -87360
 W 'A -87360
 W ^A -87360
@@ -347,6 +403,7 @@ W :A -87360
 W oA -87360
 W AE -87360
 W O -29120
+W u004F_030B -29120
 W `O -29120
 W 'O -29120
 W ^O -29120
@@ -357,9 +414,12 @@ W /O -29120
 W C -29120
 W G -29120
 W 'C -29120
+W u0043_030C -29120
+W u0047_0306 -29120
 W ,C -29120
 W Q -29120
 X O -29120
+X u004F_030B -29120
 X `O -29120
 X 'O -29120
 X ^O -29120
@@ -370,6 +430,8 @@ X /O -29120
 X C -29120
 X G -29120
 X 'C -29120
+X u0043_030C -29120
+X u0047_0306 -29120
 X ,C -29120
 X Q -29120
 Y e -87360
@@ -389,6 +451,8 @@ Y w -87360
 Y x -87360
 Y z -87360
 Y A -87360
+Y u0041_0306 -87360
+Y u0041_0328 -87360
 Y `A -87360
 Y 'A -87360
 Y ^A -87360
@@ -400,7 +464,9 @@ oq lq 116480
 ` lq 116480
 oq ? 116480
 ` ? 116480
+oq u01C3 116480
 oq ! 116480
+` u01C3 116480
 ` ! 116480
 a r -29120
 a y -29120
@@ -408,11 +474,14 @@ a :y -29120
 a 'y -29120
 a w -29120
 b e 29120
+b u0065_030C 29120
+b u0065_0328 29120
 b `e 29120
 b 'e 29120
 b ^e 29120
 b :e 29120
 b o 29120
+b u006F_030B 29120
 b `o 29120
 b 'o 29120
 b ^o 29120
@@ -424,6 +493,7 @@ b x -29120
 b d 29120
 b c 29120
 b 'c 29120
+b u0063_030C 29120
 b ,c 29120
 b q 29120
 b r -29120
@@ -439,6 +509,7 @@ f ` 72800
 f lq 72800
 f rq 72800
 f ? 72800
+f u01C3 72800
 f ! 72800
 f ) 72800
 f rB 72800
@@ -447,11 +518,15 @@ g j 29120
 k W -87360
 k V -87360
 k e -29120
+k u0065_030C -29120
+k u0065_0328 -29120
 k `e -29120
 k 'e -29120
 k ^e -29120
 k :e -29120
 k a -29120
+k u0061_0306 -29120
+k u0061_0328 -29120
 k `a -29120
 k 'a -29120
 k ^a -29120
@@ -461,6 +536,7 @@ k :a -29120
 k oa -29120
 k ae -29120
 k o -29120
+k u006F_030B -29120
 k `o -29120
 k 'o -29120
 k ^o -29120
@@ -470,13 +546,17 @@ k oe -29120
 k /o -29120
 k c -29120
 k 'c -29120
+k u0063_030C -29120
 k ,c -29120
 o e 29120
+o u0065_030C 29120
+o u0065_0328 29120
 o `e 29120
 o 'e 29120
 o ^e 29120
 o :e 29120
 o o 29120
+o u006F_030B 29120
 o `o 29120
 o 'o 29120
 o ^o 29120
@@ -488,6 +568,7 @@ o x -29120
 o d 29120
 o c 29120
 o 'c 29120
+o u0063_030C 29120
 o ,c 29120
 o q 29120
 o r -29120
@@ -496,11 +577,14 @@ o :y -29120
 o 'y -29120
 o w -29120
 p e 29120
+p u0065_030C 29120
+p u0065_0328 29120
 p `e 29120
 p 'e 29120
 p ^e 29120
 p :e 29120
 p o 29120
+p u006F_030B 29120
 p `o 29120
 p 'o 29120
 p ^o 29120
@@ -512,6 +596,7 @@ p x -29120
 p d 29120
 p c 29120
 p 'c 29120
+p u0063_030C 29120
 p ,c 29120
 p q 29120
 p r -29120
@@ -525,11 +610,15 @@ t 'y -29120
 t w -29120
 u w -29120
 w e -29120
+w u0065_030C -29120
+w u0065_0328 -29120
 w `e -29120
 w 'e -29120
 w ^e -29120
 w :e -29120
 w a -29120
+w u0061_0306 -29120
+w u0061_0328 -29120
 w `a -29120
 w 'a -29120
 w ^a -29120
@@ -539,6 +628,7 @@ w :a -29120
 w oa -29120
 w ae -29120
 w o -29120
+w u006F_030B -29120
 w `o -29120
 w 'o -29120
 w ^o -29120
@@ -548,8 +638,10 @@ w oe -29120
 w /o -29120
 w c -29120
 w 'c -29120
+w u0063_030C -29120
 w ,c -29120
 y o -29120
+y u006F_030B -29120
 y `o -29120
 y 'o -29120
 y ^o -29120
@@ -558,11 +650,15 @@ y :o -29120
 y oe -29120
 y /o -29120
 y e -29120
+y u0065_030C -29120
+y u0065_0328 -29120
 y `e -29120
 y 'e -29120
 y ^e -29120
 y :e -29120
 y a -29120
+y u0061_0306 -29120
+y u0061_0328 -29120
 y `a -29120
 y 'a -29120
 y ^a -29120
@@ -573,19 +669,89 @@ y oa -29120
 y ae -29120
 y . -87360
 y , -87360
+u0041_0306 y -29120
+u0041_0306 :y -29120
+u0041_0306 'y -29120
+u0041_0306 v -29120
+u0041_0306 w -29120
+u0041_0306 c -29120
+u0041_0306 'c -29120
+u0041_0306 u0063_030C -29120
+u0041_0306 ,c -29120
+u0041_0306 d -29120
+u0041_0306 u0064_030C -29120
+u0041_0306 u0111 -29120
+u0041_0306 Sd -29120
+u0041_0306 e -29120
+u0041_0306 u0065_030C -29120
+u0041_0306 u0065_0328 -29120
+u0041_0306 `e -29120
+u0041_0306 'e -29120
+u0041_0306 ^e -29120
+u0041_0306 :e -29120
+u0041_0306 o -29120
+u0041_0306 u006F_030B -29120
+u0041_0306 `o -29120
+u0041_0306 'o -29120
+u0041_0306 ^o -29120
+u0041_0306 ~o -29120
+u0041_0306 :o -29120
+u0041_0306 oe -29120
+u0041_0306 /o -29120
+u0041_0306 q -29120
+u0041_0306 t -29120
+u0041_0306 u0074_030C -29120
+u0041_0306 u0074_0327 -29120
+u0041_0306 C -29120
+u0041_0306 G -29120
+u0041_0306 'C -29120
+u0041_0306 u0043_030C -29120
+u0041_0306 u0047_0306 -29120
+u0041_0306 ,C -29120
+u0041_0306 Q -29120
+u0041_0306 O -29120
+u0041_0306 u004F_030B -29120
+u0041_0306 `O -29120
+u0041_0306 'O -29120
+u0041_0306 ^O -29120
+u0041_0306 ~O -29120
+u0041_0306 :O -29120
+u0041_0306 OE -29120
+u0041_0306 /O -29120
+u0041_0306 U -29120
+u0041_0306 u0055_030B -29120
+u0041_0306 u0055_030A -29120
+u0041_0306 `U -29120
+u0041_0306 'U -29120
+u0041_0306 ^U -29120
+u0041_0306 :U -29120
+u0041_0306 T -87360
+u0041_0306 u0054_030C -87360
+u0041_0306 u0054_0327 -87360
+u0041_0306 Y -87360
+u0041_0306 :Y -87360
+u0041_0306 'Y -87360
+u0041_0306 V -116480
+u0041_0306 W -116480
 'C v -29120
 'C w -29120
 'C c -29120
 'C 'c -29120
+'C u0063_030C -29120
 'C ,c -29120
 'C d -29120
+'C u0064_030C -29120
+'C u0111 -29120
 'C Sd -29120
 'C e -29120
+'C u0065_030C -29120
+'C u0065_0328 -29120
 'C `e -29120
 'C 'e -29120
 'C ^e -29120
 'C :e -29120
 'C o -29120
+'C u006F_030B -29120
 'C `o -29120
 'C 'o -29120
 'C ^o -29120
@@ -595,12 +761,17 @@ y , -87360
 'C /o -29120
 'C q -29120
 'C t -29120
+'C u0074_030C -29120
+'C u0074_0327 -29120
 'C C -29120
 'C G -29120
 'C 'C -29120
+'C u0043_030C -29120
+'C u0047_0306 -29120
 'C ,C -29120
 'C Q -29120
 'C O -29120
+'C u004F_030B -29120
 'C `O -29120
 'C 'O -29120
 'C ^O -29120
@@ -609,22 +780,130 @@ y , -87360
 'C OE -29120
 'C /O -29120
 'C U -29120
+'C u0055_030B -29120
+'C u0055_030A -29120
 'C `U -29120
 'C 'U -29120
 'C ^U -29120
 'C :U -29120
 'C T -87360
+'C u0054_030C -87360
+'C u0054_0327 -87360
 'C Y -87360
 'C :Y -87360
 'C 'Y -87360
 'C V -116480
 'C W -116480
+u0044_030C X -29120
+u0044_030C W -29120
+u0044_030C A -29120
+u0044_030C u0041_0306 -29120
+u0044_030C u0041_0328 -29120
+u0044_030C `A -29120
+u0044_030C 'A -29120
+u0044_030C ^A -29120
+u0044_030C ~A -29120
+u0044_030C :A -29120
+u0044_030C oA -29120
+u0044_030C AE -29120
+u0044_030C V -29120
+u0044_030C Y -29120
+u0044_030C :Y -29120
+u0044_030C 'Y -29120
+u004C_0301 T -87360
+u004C_0301 u0054_030C -87360
+u004C_0301 u0054_0327 -87360
+u004C_0301 Y -87360
+u004C_0301 :Y -87360
+u004C_0301 'Y -87360
+u004C_0301 V -116480
+u004C_0301 W -116480
+u004C_030C T -87360
+u004C_030C u0054_030C -87360
+u004C_030C u0054_0327 -87360
+u004C_030C Y -87360
+u004C_030C :Y -87360
+u004C_030C 'Y -87360
+u004C_030C V -116480
+u004C_030C W -116480
 /L T -87360
+/L u0054_030C -87360
+/L u0054_0327 -87360
 /L Y -87360
 /L :Y -87360
 /L 'Y -87360
 /L V -116480
 /L W -116480
+u004F_030B X -29120
+u004F_030B W -29120
+u004F_030B A -29120
+u004F_030B u0041_0306 -29120
+u004F_030B u0041_0328 -29120
+u004F_030B `A -29120
+u004F_030B 'A -29120
+u004F_030B ^A -29120
+u004F_030B ~A -29120
+u004F_030B :A -29120
+u004F_030B oA -29120
+u004F_030B AE -29120
+u004F_030B V -29120
+u004F_030B Y -29120
+u004F_030B :Y -29120
+u004F_030B 'Y -29120
+u0054_030C y -87360
+u0054_030C e -87360
+u0054_030C o -87360
+u0054_030C r -87360
+u0054_030C a -87360
+u0054_030C u -87360
+u0054_030C n -87360
+u0054_030C .i -87360
+u0054_030C c -87360
+u0054_030C d -87360
+u0054_030C g -87360
+u0054_030C p -87360
+u0054_030C s -87360
+u0054_030C v -87360
+u0054_030C w -87360
+u0054_030C x -87360
+u0054_030C z -87360
+u0054_030C A -87360
+u0054_030C u0041_0306 -87360
+u0054_030C u0041_0328 -87360
+u0054_030C `A -87360
+u0054_030C 'A -87360
+u0054_030C ^A -87360
+u0054_030C ~A -87360
+u0054_030C :A -87360
+u0054_030C oA -87360
+u0054_030C AE -87360
+u0054_0327 y -87360
+u0054_0327 e -87360
+u0054_0327 o -87360
+u0054_0327 r -87360
+u0054_0327 a -87360
+u0054_0327 u -87360
+u0054_0327 n -87360
+u0054_0327 .i -87360
+u0054_0327 c -87360
+u0054_0327 d -87360
+u0054_0327 g -87360
+u0054_0327 p -87360
+u0054_0327 s -87360
+u0054_0327 v -87360
+u0054_0327 w -87360
+u0054_0327 x -87360
+u0054_0327 z -87360
+u0054_0327 A -87360
+u0054_0327 u0041_0306 -87360
+u0054_0327 u0041_0328 -87360
+u0054_0327 `A -87360
+u0054_0327 'A -87360
+u0054_0327 ^A -87360
+u0054_0327 ~A -87360
+u0054_0327 :A -87360
+u0054_0327 oA -87360
+u0054_0327 AE -87360
 :Y e -87360
 :Y o -87360
 :Y r -87360
@@ -642,6 +921,8 @@ y , -87360
 :Y x -87360
 :Y z -87360
 :Y A -87360
+:Y u0041_0306 -87360
+:Y u0041_0328 -87360
 :Y `A -87360
 :Y 'A -87360
 :Y ^A -87360
@@ -649,18 +930,66 @@ y , -87360
 :Y :A -87360
 :Y oA -87360
 :Y AE -87360
+u0061_0306 r -29120
+u0061_0306 y -29120
+u0061_0306 :y -29120
+u0061_0306 'y -29120
+u0061_0306 w -29120
+u0061_0328 w -29120
 /l cq 29120
 /l ' 29120
 /l a -29120
+/l u0061_0328 -29120
 /l c -29120
 /l 'c -29120
 /l d -29120
 /l e -29120
+/l u0065_0328 -29120
 /l g -29120
 /l o -29120
 /l 'o -29120
 /l s -29120
+/l u0073_0301 -29120
+u006F_030B e 29120
+u006F_030B u0065_030C 29120
+u006F_030B u0065_0328 29120
+u006F_030B `e 29120
+u006F_030B 'e 29120
+u006F_030B ^e 29120
+u006F_030B :e 29120
+u006F_030B o 29120
+u006F_030B u006F_030B 29120
+u006F_030B `o 29120
+u006F_030B 'o 29120
+u006F_030B ^o 29120
+u006F_030B ~o 29120
+u006F_030B :o 29120
+u006F_030B oe 29120
+u006F_030B /o 29120
+u006F_030B x -29120
+u006F_030B d 29120
+u006F_030B c 29120
+u006F_030B 'c 29120
+u006F_030B u0063_030C 29120
+u006F_030B ,c 29120
+u006F_030B q 29120
+u006F_030B r -29120
+u006F_030B y -29120
+u006F_030B :y -29120
+u006F_030B 'y -29120
+u006F_030B w -29120
+u0074_030C y -29120
+u0074_030C :y -29120
+u0074_030C 'y -29120
+u0074_030C w -29120
+u0074_0327 y -29120
+u0074_0327 :y -29120
+u0074_0327 'y -29120
+u0074_0327 w -29120
+u0075_030B w -29120
+u0075_030A w -29120
 :y o -29120
+:y u006F_030B -29120
 :y `o -29120
 :y 'o -29120
 :y ^o -29120
@@ -669,11 +998,15 @@ y , -87360
 :y oe -29120
 :y /o -29120
 :y e -29120
+:y u0065_030C -29120
+:y u0065_0328 -29120
 :y `e -29120
 :y 'e -29120
 :y ^e -29120
 :y :e -29120
 :y a -29120
+:y u0061_0306 -29120
+:y u0061_0328 -29120
 :y `a -29120
 :y 'a -29120
 :y ^a -29120
@@ -691,15 +1024,21 @@ y , -87360
 `A w -29120
 `A c -29120
 `A 'c -29120
+`A u0063_030C -29120
 `A ,c -29120
 `A d -29120
+`A u0064_030C -29120
+`A u0111 -29120
 `A Sd -29120
 `A e -29120
+`A u0065_030C -29120
+`A u0065_0328 -29120
 `A `e -29120
 `A 'e -29120
 `A ^e -29120
 `A :e -29120
 `A o -29120
+`A u006F_030B -29120
 `A `o -29120
 `A 'o -29120
 `A ^o -29120
@@ -709,12 +1048,17 @@ y , -87360
 `A /o -29120
 `A q -29120
 `A t -29120
+`A u0074_030C -29120
+`A u0074_0327 -29120
 `A C -29120
 `A G -29120
 `A 'C -29120
+`A u0043_030C -29120
+`A u0047_0306 -29120
 `A ,C -29120
 `A Q -29120
 `A O -29120
+`A u004F_030B -29120
 `A `O -29120
 `A 'O -29120
 `A ^O -29120
@@ -723,11 +1067,15 @@ y , -87360
 `A OE -29120
 `A /O -29120
 `A U -29120
+`A u0055_030B -29120
+`A u0055_030A -29120
 `A `U -29120
 `A 'U -29120
 `A ^U -29120
 `A :U -29120
 `A T -87360
+`A u0054_030C -87360
+`A u0054_0327 -87360
 `A Y -87360
 `A :Y -87360
 `A 'Y -87360
@@ -740,15 +1088,21 @@ y , -87360
 'A w -29120
 'A c -29120
 'A 'c -29120
+'A u0063_030C -29120
 'A ,c -29120
 'A d -29120
+'A u0064_030C -29120
+'A u0111 -29120
 'A Sd -29120
 'A e -29120
+'A u0065_030C -29120
+'A u0065_0328 -29120
 'A `e -29120
 'A 'e -29120
 'A ^e -29120
 'A :e -29120
 'A o -29120
+'A u006F_030B -29120
 'A `o -29120
 'A 'o -29120
 'A ^o -29120
@@ -758,12 +1112,17 @@ y , -87360
 'A /o -29120
 'A q -29120
 'A t -29120
+'A u0074_030C -29120
+'A u0074_0327 -29120
 'A C -29120
 'A G -29120
 'A 'C -29120
+'A u0043_030C -29120
+'A u0047_0306 -29120
 'A ,C -29120
 'A Q -29120
 'A O -29120
+'A u004F_030B -29120
 'A `O -29120
 'A 'O -29120
 'A ^O -29120
@@ -772,11 +1131,15 @@ y , -87360
 'A OE -29120
 'A /O -29120
 'A U -29120
+'A u0055_030B -29120
+'A u0055_030A -29120
 'A `U -29120
 'A 'U -29120
 'A ^U -29120
 'A :U -29120
 'A T -87360
+'A u0054_030C -87360
+'A u0054_0327 -87360
 'A Y -87360
 'A :Y -87360
 'A 'Y -87360
@@ -789,15 +1152,21 @@ y , -87360
 ^A w -29120
 ^A c -29120
 ^A 'c -29120
+^A u0063_030C -29120
 ^A ,c -29120
 ^A d -29120
+^A u0064_030C -29120
+^A u0111 -29120
 ^A Sd -29120
 ^A e -29120
+^A u0065_030C -29120
+^A u0065_0328 -29120
 ^A `e -29120
 ^A 'e -29120
 ^A ^e -29120
 ^A :e -29120
 ^A o -29120
+^A u006F_030B -29120
 ^A `o -29120
 ^A 'o -29120
 ^A ^o -29120
@@ -807,12 +1176,17 @@ y , -87360
 ^A /o -29120
 ^A q -29120
 ^A t -29120
+^A u0074_030C -29120
+^A u0074_0327 -29120
 ^A C -29120
 ^A G -29120
 ^A 'C -29120
+^A u0043_030C -29120
+^A u0047_0306 -29120
 ^A ,C -29120
 ^A Q -29120
 ^A O -29120
+^A u004F_030B -29120
 ^A `O -29120
 ^A 'O -29120
 ^A ^O -29120
@@ -821,11 +1195,15 @@ y , -87360
 ^A OE -29120
 ^A /O -29120
 ^A U -29120
+^A u0055_030B -29120
+^A u0055_030A -29120
 ^A `U -29120
 ^A 'U -29120
 ^A ^U -29120
 ^A :U -29120
 ^A T -87360
+^A u0054_030C -87360
+^A u0054_0327 -87360
 ^A Y -87360
 ^A :Y -87360
 ^A 'Y -87360
@@ -838,15 +1216,21 @@ y , -87360
 ~A w -29120
 ~A c -29120
 ~A 'c -29120
+~A u0063_030C -29120
 ~A ,c -29120
 ~A d -29120
+~A u0064_030C -29120
+~A u0111 -29120
 ~A Sd -29120
 ~A e -29120
+~A u0065_030C -29120
+~A u0065_0328 -29120
 ~A `e -29120
 ~A 'e -29120
 ~A ^e -29120
 ~A :e -29120
 ~A o -29120
+~A u006F_030B -29120
 ~A `o -29120
 ~A 'o -29120
 ~A ^o -29120
@@ -856,12 +1240,17 @@ y , -87360
 ~A /o -29120
 ~A q -29120
 ~A t -29120
+~A u0074_030C -29120
+~A u0074_0327 -29120
 ~A C -29120
 ~A G -29120
 ~A 'C -29120
+~A u0043_030C -29120
+~A u0047_0306 -29120
 ~A ,C -29120
 ~A Q -29120
 ~A O -29120
+~A u004F_030B -29120
 ~A `O -29120
 ~A 'O -29120
 ~A ^O -29120
@@ -870,11 +1259,15 @@ y , -87360
 ~A OE -29120
 ~A /O -29120
 ~A U -29120
+~A u0055_030B -29120
+~A u0055_030A -29120
 ~A `U -29120
 ~A 'U -29120
 ~A ^U -29120
 ~A :U -29120
 ~A T -87360
+~A u0054_030C -87360
+~A u0054_0327 -87360
 ~A Y -87360
 ~A :Y -87360
 ~A 'Y -87360
@@ -887,15 +1280,21 @@ y , -87360
 :A w -29120
 :A c -29120
 :A 'c -29120
+:A u0063_030C -29120
 :A ,c -29120
 :A d -29120
+:A u0064_030C -29120
+:A u0111 -29120
 :A Sd -29120
 :A e -29120
+:A u0065_030C -29120
+:A u0065_0328 -29120
 :A `e -29120
 :A 'e -29120
 :A ^e -29120
 :A :e -29120
 :A o -29120
+:A u006F_030B -29120
 :A `o -29120
 :A 'o -29120
 :A ^o -29120
@@ -905,12 +1304,17 @@ y , -87360
 :A /o -29120
 :A q -29120
 :A t -29120
+:A u0074_030C -29120
+:A u0074_0327 -29120
 :A C -29120
 :A G -29120
 :A 'C -29120
+:A u0043_030C -29120
+:A u0047_0306 -29120
 :A ,C -29120
 :A Q -29120
 :A O -29120
+:A u004F_030B -29120
 :A `O -29120
 :A 'O -29120
 :A ^O -29120
@@ -919,11 +1323,15 @@ y , -87360
 :A OE -29120
 :A /O -29120
 :A U -29120
+:A u0055_030B -29120
+:A u0055_030A -29120
 :A `U -29120
 :A 'U -29120
 :A ^U -29120
 :A :U -29120
 :A T -87360
+:A u0054_030C -87360
+:A u0054_0327 -87360
 :A Y -87360
 :A :Y -87360
 :A 'Y -87360
@@ -936,15 +1344,21 @@ oA v -29120
 oA w -29120
 oA c -29120
 oA 'c -29120
+oA u0063_030C -29120
 oA ,c -29120
 oA d -29120
+oA u0064_030C -29120
+oA u0111 -29120
 oA Sd -29120
 oA e -29120
+oA u0065_030C -29120
+oA u0065_0328 -29120
 oA `e -29120
 oA 'e -29120
 oA ^e -29120
 oA :e -29120
 oA o -29120
+oA u006F_030B -29120
 oA `o -29120
 oA 'o -29120
 oA ^o -29120
@@ -954,12 +1368,17 @@ oA oe -29120
 oA /o -29120
 oA q -29120
 oA t -29120
+oA u0074_030C -29120
+oA u0074_0327 -29120
 oA C -29120
 oA G -29120
 oA 'C -29120
+oA u0043_030C -29120
+oA u0047_0306 -29120
 oA ,C -29120
 oA Q -29120
 oA O -29120
+oA u004F_030B -29120
 oA `O -29120
 oA 'O -29120
 oA ^O -29120
@@ -968,33 +1387,73 @@ oA :O -29120
 oA OE -29120
 oA /O -29120
 oA U -29120
+oA u0055_030B -29120
+oA u0055_030A -29120
 oA `U -29120
 oA 'U -29120
 oA ^U -29120
 oA :U -29120
 oA T -87360
+oA u0054_030C -87360
+oA u0054_0327 -87360
 oA Y -87360
 oA :Y -87360
 oA 'Y -87360
 oA V -116480
 oA W -116480
+u0189 X -29120
+u0110 X -29120
 -D X -29120
+u0189 W -29120
+u0110 W -29120
 -D W -29120
+u0189 A -29120
+u0110 A -29120
 -D A -29120
+u0189 u0041_0306 -29120
+u0110 u0041_0306 -29120
+-D u0041_0306 -29120
+u0189 u0041_0328 -29120
+u0110 u0041_0328 -29120
+-D u0041_0328 -29120
+u0189 `A -29120
+u0110 `A -29120
 -D `A -29120
+u0189 'A -29120
+u0110 'A -29120
 -D 'A -29120
+u0189 ^A -29120
+u0110 ^A -29120
 -D ^A -29120
+u0189 ~A -29120
+u0110 ~A -29120
 -D ~A -29120
+u0189 :A -29120
+u0110 :A -29120
 -D :A -29120
+u0189 oA -29120
+u0110 oA -29120
 -D oA -29120
+u0189 AE -29120
+u0110 AE -29120
 -D AE -29120
+u0189 V -29120
+u0110 V -29120
 -D V -29120
+u0189 Y -29120
+u0110 Y -29120
 -D Y -29120
+u0189 :Y -29120
+u0110 :Y -29120
 -D :Y -29120
+u0189 'Y -29120
+u0110 'Y -29120
 -D 'Y -29120
 `O X -29120
 `O W -29120
 `O A -29120
+`O u0041_0306 -29120
+`O u0041_0328 -29120
 `O `A -29120
 `O 'A -29120
 `O ^A -29120
@@ -1009,6 +1468,8 @@ oA W -116480
 'O X -29120
 'O W -29120
 'O A -29120
+'O u0041_0306 -29120
+'O u0041_0328 -29120
 'O `A -29120
 'O 'A -29120
 'O ^A -29120
@@ -1023,6 +1484,8 @@ oA W -116480
 ^O X -29120
 ^O W -29120
 ^O A -29120
+^O u0041_0306 -29120
+^O u0041_0328 -29120
 ^O `A -29120
 ^O 'A -29120
 ^O ^A -29120
@@ -1037,6 +1500,8 @@ oA W -116480
 ~O X -29120
 ~O W -29120
 ~O A -29120
+~O u0041_0306 -29120
+~O u0041_0328 -29120
 ~O `A -29120
 ~O 'A -29120
 ~O ^A -29120
@@ -1051,6 +1516,8 @@ oA W -116480
 :O X -29120
 :O W -29120
 :O A -29120
+:O u0041_0306 -29120
+:O u0041_0328 -29120
 :O `A -29120
 :O 'A -29120
 :O ^A -29120
@@ -1065,6 +1532,8 @@ oA W -116480
 /O X -29120
 /O W -29120
 /O A -29120
+/O u0041_0306 -29120
+/O u0041_0328 -29120
 /O `A -29120
 /O 'A -29120
 /O ^A -29120
@@ -1093,6 +1562,8 @@ oA W -116480
 'Y x -87360
 'Y z -87360
 'Y A -87360
+'Y u0041_0306 -87360
+'Y u0041_0328 -87360
 'Y `A -87360
 'Y 'A -87360
 'Y ^A -87360
@@ -1131,11 +1602,14 @@ oa :y -29120
 oa 'y -29120
 oa w -29120
 `o e 29120
+`o u0065_030C 29120
+`o u0065_0328 29120
 `o `e 29120
 `o 'e 29120
 `o ^e 29120
 `o :e 29120
 `o o 29120
+`o u006F_030B 29120
 `o `o 29120
 `o 'o 29120
 `o ^o 29120
@@ -1147,6 +1621,7 @@ oa w -29120
 `o d 29120
 `o c 29120
 `o 'c 29120
+`o u0063_030C 29120
 `o ,c 29120
 `o q 29120
 `o r -29120
@@ -1155,11 +1630,14 @@ oa w -29120
 `o 'y -29120
 `o w -29120
 'o e 29120
+'o u0065_030C 29120
+'o u0065_0328 29120
 'o `e 29120
 'o 'e 29120
 'o ^e 29120
 'o :e 29120
 'o o 29120
+'o u006F_030B 29120
 'o `o 29120
 'o 'o 29120
 'o ^o 29120
@@ -1171,6 +1649,7 @@ oa w -29120
 'o d 29120
 'o c 29120
 'o 'c 29120
+'o u0063_030C 29120
 'o ,c 29120
 'o q 29120
 'o r -29120
@@ -1179,11 +1658,14 @@ oa w -29120
 'o 'y -29120
 'o w -29120
 ^o e 29120
+^o u0065_030C 29120
+^o u0065_0328 29120
 ^o `e 29120
 ^o 'e 29120
 ^o ^e 29120
 ^o :e 29120
 ^o o 29120
+^o u006F_030B 29120
 ^o `o 29120
 ^o 'o 29120
 ^o ^o 29120
@@ -1195,6 +1677,7 @@ oa w -29120
 ^o d 29120
 ^o c 29120
 ^o 'c 29120
+^o u0063_030C 29120
 ^o ,c 29120
 ^o q 29120
 ^o r -29120
@@ -1203,11 +1686,14 @@ oa w -29120
 ^o 'y -29120
 ^o w -29120
 ~o e 29120
+~o u0065_030C 29120
+~o u0065_0328 29120
 ~o `e 29120
 ~o 'e 29120
 ~o ^e 29120
 ~o :e 29120
 ~o o 29120
+~o u006F_030B 29120
 ~o `o 29120
 ~o 'o 29120
 ~o ^o 29120
@@ -1219,6 +1705,7 @@ oa w -29120
 ~o d 29120
 ~o c 29120
 ~o 'c 29120
+~o u0063_030C 29120
 ~o ,c 29120
 ~o q 29120
 ~o r -29120
@@ -1227,11 +1714,14 @@ oa w -29120
 ~o 'y -29120
 ~o w -29120
 :o e 29120
+:o u0065_030C 29120
+:o u0065_0328 29120
 :o `e 29120
 :o 'e 29120
 :o ^e 29120
 :o :e 29120
 :o o 29120
+:o u006F_030B 29120
 :o `o 29120
 :o 'o 29120
 :o ^o 29120
@@ -1243,6 +1733,7 @@ oa w -29120
 :o d 29120
 :o c 29120
 :o 'c 29120
+:o u0063_030C 29120
 :o ,c 29120
 :o q 29120
 :o r -29120
@@ -1251,11 +1742,14 @@ oa w -29120
 :o 'y -29120
 :o w -29120
 /o e 29120
+/o u0065_030C 29120
+/o u0065_0328 29120
 /o `e 29120
 /o 'e 29120
 /o ^e 29120
 /o :e 29120
 /o o 29120
+/o u006F_030B 29120
 /o `o 29120
 /o 'o 29120
 /o ^o 29120
@@ -1267,6 +1761,7 @@ oa w -29120
 /o d 29120
 /o c 29120
 /o 'c 29120
+/o u0063_030C 29120
 /o ,c 29120
 /o q 29120
 /o r -29120
@@ -1279,6 +1774,7 @@ oa w -29120
 ^u w -29120
 :u w -29120
 'y o -29120
+'y u006F_030B -29120
 'y `o -29120
 'y 'o -29120
 'y ^o -29120
@@ -1287,11 +1783,15 @@ oa w -29120
 'y oe -29120
 'y /o -29120
 'y e -29120
+'y u0065_030C -29120
+'y u0065_0328 -29120
 'y `e -29120
 'y 'e -29120
 'y ^e -29120
 'y :e -29120
 'y a -29120
+'y u0061_0306 -29120
+'y u0061_0328 -29120
 'y `a -29120
 'y 'a -29120
 'y ^a -29120
@@ -1335,8 +1835,9 @@ fi	562016,757120,0,108514	2	0034
 fl	562016,757120,0,105602	2	0035
 Fi	853216,757120,0,108514	2	0036
 Fl	853216,757120,0,105602	2	0037
----	524160,463008,101920,34338	1	0040
-!	334880,757120,0,66290	2	0041
+u2423	524160,463008,101920,34338	1	0040
+u01C3	334880,757120,0,66290	2	0041
+!	"
 dq	524160,757120,0,56098	2	0042
 "	"
 sh	873600,757120,232960,53326	3	0043
@@ -1350,8 +1851,7 @@ cq	291200,757120,0,88130	2	0047
 (	407680,782600,262080,137998	3	0050
 )	407680,782600,262080,26586	3	0051
 *	524160,782600,0,123438	2	0052
-pl	815360,611520,87360,26586	3	0053
-+	"
++	815360,611520,87360,26586	3	0053
 ,	291200,87360,131040	1	0054
 -	349440,463008,0,20397	0	0055
 .	291200,87360	0	0056
@@ -1370,8 +1870,7 @@ sl	524160,782600,262080,137998	3	0057
 :	291200,463008,0,26234	0	0072
 ;	291200,463008,131040,26234	1	0073
 <	815360,571045,50091,63819	3	0074
-eq	815360,387883,-136277,53326	0	0075
-=	"
+=	815360,387883,-136277,53326	0	0075
 >	815360,571045,50091	3	0076
 ?	495040,757120,0,128744	2	0077
 at	698880,757120,0,83530	2	0100
@@ -1441,74 +1940,73 @@ y	483392,463008,203840,113594	1	0171
 z	455728,463008,0,91754	0	0172
 lC	524160,782600,262080,140910	3	0173
 {	"
-ba	291200,782600,262080,71610	3	0174
-bv	"
-or	"
+u01C0	291200,782600,262080,71610	3	0174
+ba	"
 |	"
 rC	524160,782600,262080,29498	3	0175
 }	"
 ~	640640,710738,0,92522	2	0176
 hy	174720,463008,0,20397	0	0177
----	698880,931840	2	0200
----	698880,728000,203840	3	0201
+u0041_0306	698880,931840	2	0200
+u0041_0328	698880,728000,203840	3	0201
 'C	669760,892202,0,125619	2	0202
----	669760,931840,0,125619,-75542,62810	2	0203
----	757120,931840,0,79198,0,50078	2	0204
----	626080,931840,0,125619,0,62810	2	0205
----	626080,728000,203840,125619	3	0206
----	698880,931840,0,125619,-75542,62810	2	0207
----	567840,892202,0,0,0,58240	2	0210
----	567840,931840,0,0,0,58240	2	0211
+u0043_030C	669760,931840,0,125619,-75542,62810	2	0203
+u0044_030C	757120,931840,0,79198,0,50078	2	0204
+u0045_030C	626080,931840,0,125619,0,62810	2	0205
+u0045_0328	626080,728000,203840,125619	3	0206
+u0047_0306	698880,931840,0,125619,-75542,62810	2	0207
+u004C_0301	567840,892202,0,0,0,58240	2	0210
+u004C_030C	567840,931840,0,0,0,58240	2	0211
 /L	655200,728000	2	0212
----	742560,892202,0,84851	2	0213
----	742560,931840,0,84851,0,13306	2	0214
----	786240,728000,0,154739,0,48250	2	0215
----	771680,892202,0,79198,-75542,50078	2	0216
----	677040,892202,0,86934,0,65202	2	0217
----	677040,931840,0,86934,0,65202	2	0220
----	582400,892202,0,96499	2	0221
+u004E_0301	742560,892202,0,84851	2	0213
+u004E_030C	742560,931840,0,84851,0,13306	2	0214
+u014A	786240,728000,0,154739,0,48250	2	0215
+u004F_030B	771680,892202,0,79198,-75542,50078	2	0216
+u0052_0301	677040,892202,0,86934,0,65202	2	0217
+u0052_030C	677040,931840,0,86934,0,65202	2	0220
+u0053_0301	582400,892202,0,96499	2	0221
 vS	582400,931840,0,96499,0,48250	2	0222
----	582400,728000,178360,96499,0,48250	3	0223
----	713440,931840,0,140179,-116054,-5421	2	0224
----	713440,728000,178360,140179,-116054,-5421	3	0225
----	720720,892202,0,84851,-75542,13306	2	0226
----	720720,931840,0,84851,-75542,13306	2	0227
+u0053_0327	582400,728000,178360,96499,0,48250	3	0223
+u0054_030C	713440,931840,0,140179,-116054,-5421	2	0224
+u0054_0327	713440,728000,178360,140179,-116054,-5421	3	0225
+u0055_030B	720720,892202,0,84851,-75542,13306	2	0226
+u0055_030A	720720,931840,0,84851,-75542,13306	2	0227
 :Y	698880,931840,0,180947,-125619,-52013	2	0230
----	640640,892202,0,125619	2	0231
+u005A_0301	640640,892202,0,125619	2	0231
 vZ	640640,931840,0,125619,0,62810	2	0232
----	640640,892202,0,125619	2	0233
+u005A_0307	640640,892202,0,125619	2	0233
 IJ	757120,728000,0,84851,0,13306	2	0234
----	291200,892202,0,140179,0,70090	2	0235
----	541632,757120,0,105602	2	0236
+u0049_0307	291200,892202,0,140179,0,70090	2	0235
+u0111	541632,757120,0,105602	2	0236
 sc	465920,757120,203840	3	0237
----	503776,669760,0,10282	2	0240
----	503776,463008,203840,10282	1	0241
+u0061_0306	503776,669760,0,10282	2	0240
+u0061_0328	503776,463008,203840,10282	1	0241
 'c	465920,669760,0,87386	2	0242
----	465920,669760,0,87386	2	0243
----	663936,757120,0,105602	2	0244
----	465920,669760,0,71054	2	0245
----	465920,463008,203840,71054	1	0246
----	524160,669760,203840,113594	3	0247
----	250432,892202,0,105602	2	0250
----	372736,757120,0,105602	2	0251
+u0063_030C	465920,669760,0,87386	2	0243
+u0064_030C	663936,757120,0,105602	2	0244
+u0065_030C	465920,669760,0,71054	2	0245
+u0065_0328	465920,463008,203840,71054	1	0246
+u0067_0306	524160,669760,203840,113594	3	0247
+u006C_0301	250432,892202,0,105602	2	0250
+u006C_030C	372736,757120,0,105602	2	0251
 /l	340122,757120,0,105602	2	0252
----	541632,669760,0,18638	2	0253
----	541632,669760,0,18638	2	0254
----	541632,463008,203840,18638	1	0255
----	524160,669760,0,69323	2	0256
----	358176,669760,0,113594	2	0257
----	358176,669760,0,113594	2	0260
----	401856,669760,0,81526	2	0261
+u006E_0301	541632,669760,0,18638	2	0253
+u006E_030C	541632,669760,0,18638	2	0254
+u016A	541632,463008,203840,18638	1	0255
+u006F_030B	524160,669760,0,69323	2	0256
+u0072_0301	358176,669760,0,113594	2	0257
+u0072_030C	358176,669760,0,113594	2	0260
+u0073_0301	401856,669760,0,81526	2	0261
 vs	401856,669760,0,81526	2	0262
----	401856,463008,178360,81526	1	0263
----	378560,757120,0,137634	2	0264
----	378560,599043,178360,75738	3	0265
----	541632,669760,0,43706	2	0266
----	541632,669760,0,43706	2	0267
+u0073_0327	401856,463008,178360,81526	1	0263
+u0074_030C	378560,757120,0,137634	2	0264
+u0074_0327	378560,599043,178360,75738	3	0265
+u0075_030B	541632,669760,0,43706	2	0266
+u0075_030A	541632,669760,0,43706	2	0267
 :y	483392,689730,203840,113594	3	0270
----	455728,669760,0,91754	2	0271
+u007A_0301	455728,669760,0,91754	2	0271
 vz	455728,669760,0,91754	2	0272
----	455728,710738,0,91754	2	0273
+u007A_0307	455728,710738,0,91754	2	0273
 ij	570752,710738,203840,101877	3	0274
 r!	334880,553280,203840,22962	3	0275
 r?	495040,553280,203840	3	0276
@@ -1529,7 +2027,9 @@ AE	902720,728000,0,125619	2	0306
 'I	291200,892202,0,140179,0,70090	2	0315
 ^I	291200,931840,0,140179,0,70090	2	0316
 :I	291200,931840,0,140179,0,70090	2	0317
--D	757120,728000,0,79198,0,50078	2	0320
+u0189	757120,728000,0,79198,0,50078	2	0320
+u0110	"
+-D	"
 ~N	742560,931840,0,84851,0,13306	2	0321
 `O	771680,892202,0,79198,-75542,50078	2	0322
 'O	771680,892202,0,79198	2	0323
diff --git a/contrib/groff/font/devdvi/HITC b/contrib/groff/font/devdvi/HITC
index 64face8..46d62df 100644
--- a/contrib/groff/font/devdvi/HITC
+++ b/contrib/groff/font/devdvi/HITC
@@ -31,11 +31,11 @@ charset
 ---	483392,757120,0,429390	2	0034
 ---	483392,757120,0,483269	2	0035
 ---	0,757120	2	0037
----	541632,757120,0,32045	2	0040
+u2422	541632,757120,0,32045	2	0040
 Do	524160,786240,29120,116955	3	0044
 $	"
 aq	291200,757120,0,85218	2	0047
-**	524160,495040,-29120	2	0052
+---	524160,495040,-29120	2	0052
 ,	291200,87360,131040	1	0054
 ---	349440,387883,-136277,53326	0	0055
 .	291200,87360	0	0056
@@ -51,14 +51,13 @@ f/	524160,786240,262080,137998	3	0057
 8	524160,687232,0,87835	2	0070
 9	524160,465920,203840,40794	1	0071
 la	407680,786240,262080	3	0074
-mi	815360,605282,87360,26586	3	0075
-\-	"
+\-	815360,605282,87360,26586	3	0075
 ra	407680,786240,262080	3	0076
----	757120,728000,0,134355,0,67178	2	0115
+u2127	757120,728000,0,134355,0,67178	2	0115
 ci	1164800,786240,262080	3	0117
----	757120,728000,0,86934,0,43467	2	0127
----	422240,786240,262080	3	0133
----	422240,786240,262080	3	0135
+u03A9	757120,728000,0,86934,0,43467	2	0127
+u301A	422240,786240,262080	3	0133
+u301B	422240,786240,262080	3	0135
 ua	524160,757120,232960,64066	3	0136
 da	524160,757120,232960	3	0137
 ---	524160,757120	2	0140
@@ -67,7 +66,7 @@ da	524160,757120,232960	3	0137
 ---	524160,662478,29122	3	0144
 ---	1048320,757120	2	0154
 ---	524160,495040,-29120	2	0155
----	640640,757120	2	0156
+u266A	640640,757120	2	0156
 ti	640640,133120	0	0176
 ~	"
 ---	174720,387883,-136277,53326	0	0177
@@ -77,34 +76,34 @@ ti	640640,133120	0	0176
 ---	524160,757120	2	0203
 dg	465920,757120,203840	3	0204
 dd	465920,757120,203840	3	0205
----	524160,786240,262080	3	0206
-%O	1223040,786240,29120,35251	3	0207
+u2016	524160,786240,262080	3	0206
+%0	1223040,786240,29120,35251	3	0207
 bu	524160,465920,-58240	0	0210
----	902720,728000,0,125619,-75542,62810	2	0211
+u2103	902720,728000,0,125619,-75542,62810	2	0211
 ---	640640,786240,29120,116955	3	0212
 ---	524160,560560,101920,87386	3	0213
 Fn	320320,757120,0,233730	2	0214
----	669760,786240,29120,125619,-75542,62810	3	0215
----	990080,728000,0,169299,-111059,23699	2	0216
----	771680,728000,0,84851,0,13306	2	0217
+u20A1	669760,786240,29120,125619,-75542,62810	3	0215
+u20A9	990080,728000,0,169299,-111059,23699	2	0216
+u20A6	771680,728000,0,84851,0,13306	2	0217
 ---	815360,786240,29120,125619,-75542,62810	3	0220
----	684320,728000,0,86934,0,-58666	2	0221
----	790458,757120	2	0222
----	677040,728000,0,86934,0,65202	2	0223
----	495040,757120,0,128744	2	0224
+u20B1	684320,728000,0,86934,0,-58666	2	0221
+u20A4	790458,757120	2	0222
+u211E	677040,728000,0,86934,0,65202	2	0223
+u203D	495040,757120,0,128744	2	0224
 ---	495040,560560,203840	3	0225
----	541632,786240,0,105602	2	0226
+u20AB	541632,786240,0,105602	2	0226
 tm	698880,786240,0,550366	2	0227
----	1612550,786240,29120,35251	3	0230
+u2031	1612550,786240,29120,35251	3	0230
 ---	495040,757120,203840	3	0231
----	698880,786240,29120,86934,0,43467	3	0232
----	859040,728000,0,84851,0,13306	2	0233
----	524160,786240,0,137998	2	0234
----	701792,728000,0,114690	2	0235
----	524160,465920,-58240	0	0236
----	698880,786240,0,550366	2	0237
----	378560,786240,262080,29498	3	0240
----	378560,786240,262080,140910	3	0241
+u0E3F	698880,786240,29120,86934,0,43467	3	0232
+u2116	859040,728000,0,84851,0,13306	2	0233
+u2052	524160,786240,0,137998	2	0234
+u212E	701792,728000,0,114690	2	0235
+u25E6	524160,465920,-58240	0	0236
+u2120	698880,786240,0,550366	2	0237
+u2045	378560,786240,262080,29498	3	0240
+u2046	378560,786240,262080,140910	3	0241
 ct	524160,560560,101920,87386	3	0242
 Po	790458,757120	2	0243
 Cs	793402,605282,0,99034	2	0244
@@ -115,10 +114,10 @@ sc	465920,757120,203840	3	0247
 co	1164800,786240,262080	3	0251
 Of	465920,786240,0,116982	2	0252
 ---	1164800,786240,262080	3	0253
-no	698880,465920,0,69914	0	0254
----	1164800,786240,262080	3	0255
+tno	698880,465920,0,69914	0	0254
+u2117	1164800,786240,262080	3	0255
 rg	1164800,786240,262080	3	0256
-rn	815360,757120	2	0257
+---	815360,757120	2	0257
 de	349440,728000	2	0260
 t+-	815360,605282,87360,26586	3	0261
 S2	465920,786240,0,137998	2	0262
@@ -127,13 +126,13 @@ S3	465920,786240,0,137998	2	0263
 mc	541632,465920,203840,43706	1	0265
 ps	640640,757120,203840	3	0266
 pc	247520,465920	0	0267
----	679466,560560,0,20397	2	0270
+u203B	679466,560560,0,20397	2	0270
 S1	465920,786240,0,137998	2	0271
 Om	465920,786240,0,116982	2	0272
 ---	495040,786240,220138,167118	3	0273
-14	465920,786240,203840,137998	3	0274
-12	465920,786240,203840,137998	3	0275
-34	465920,786240,203840,137998	3	0276
+---	465920,786240,203840,137998	3	0274
+---	465920,786240,203840,137998	3	0275
+---	465920,786240,203840,137998	3	0276
 Eu	815360,728000,0,125619	2	0277
 tmu	815360,605282,87360,26586	3	0326
 tdi	815360,605282,87360,26586	3	0366
diff --git a/contrib/groff/font/devdvi/HR b/contrib/groff/font/devdvi/HR
index 93b8a2d..d9d660b 100644
--- a/contrib/groff/font/devdvi/HR
+++ b/contrib/groff/font/devdvi/HR
@@ -12,6 +12,8 @@ ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+slash@for@l l -250494
+slash@for@l L -270885
 cq ? 116509
 ' ? 116509
 cq ! 116509
@@ -185,7 +187,7 @@ oe	815562,466034	0	0033
 AE	902944,728178	2	0035
 OE	1019453,728178	2	0036
 /O	815562,779150,50973	3	0037
----	250494,466034	0	0040
+slash@for@l	250494,466034	0	0040
 !	334963,728178	2	0041
 rq	524290,728178	2	0042
 sh	873816,728178,203888	3	0043
diff --git a/contrib/groff/font/devdvi/HREC b/contrib/groff/font/devdvi/HREC
index bd35a20..735f2f1 100644
--- a/contrib/groff/font/devdvi/HREC
+++ b/contrib/groff/font/devdvi/HREC
@@ -9,6 +9,7 @@ bq Bq 116480
 bq j 116480
 bq .j 116480
 bq g 58240
+bq u0067_0306 58240
 bq y 58240
 bq :y 58240
 bq 'y 58240
@@ -20,6 +21,7 @@ bq Y -87360
 bq :Y -87360
 bq 'Y -87360
 bq O -29120
+bq u004F_030B -29120
 bq `O -29120
 bq 'O -29120
 bq ^O -29120
@@ -30,6 +32,8 @@ bq /O -29120
 bq C -29120
 bq G -29120
 bq 'C -29120
+bq u0043_030C -29120
+bq u0047_0306 -29120
 bq ,C -29120
 bq Q -29120
 lq oq 116480
@@ -44,6 +48,7 @@ Bq Bq 116480
 Bq j 116480
 Bq .j 116480
 Bq g 58240
+Bq u0067_0306 58240
 Bq y 58240
 Bq :y 58240
 Bq 'y 58240
@@ -55,6 +60,7 @@ Bq Y -87360
 Bq :Y -87360
 Bq 'Y -87360
 Bq O -29120
+Bq u004F_030B -29120
 Bq `O -29120
 Bq 'O -29120
 Bq ^O -29120
@@ -65,6 +71,8 @@ Bq /O -29120
 Bq C -29120
 Bq G -29120
 Bq 'C -29120
+Bq u0043_030C -29120
+Bq u0047_0306 -29120
 Bq ,C -29120
 Bq Q -29120
 Fc . -87360
@@ -76,6 +84,7 @@ ff ` 72800
 ff lq 72800
 ff rq 72800
 ff ? 72800
+ff u01C3 72800
 ff ! 72800
 ff ) 72800
 ff rB 72800
@@ -84,7 +93,9 @@ cq rq 116480
 ' rq 116480
 cq ? 116480
 ' ? 116480
+cq u01C3 116480
 cq ! 116480
+' u01C3 116480
 ' ! 116480
 A y -29120
 A :y -29120
@@ -93,15 +104,21 @@ A v -29120
 A w -29120
 A c -29120
 A 'c -29120
+A u0063_030C -29120
 A ,c -29120
 A d -29120
+A u0064_030C -29120
+A u0111 -29120
 A Sd -29120
 A e -29120
+A u0065_030C -29120
+A u0065_0328 -29120
 A `e -29120
 A 'e -29120
 A ^e -29120
 A :e -29120
 A o -29120
+A u006F_030B -29120
 A `o -29120
 A 'o -29120
 A ^o -29120
@@ -111,12 +128,17 @@ A oe -29120
 A /o -29120
 A q -29120
 A t -29120
+A u0074_030C -29120
+A u0074_0327 -29120
 A C -29120
 A G -29120
 A 'C -29120
+A u0043_030C -29120
+A u0047_0306 -29120
 A ,C -29120
 A Q -29120
 A O -29120
+A u004F_030B -29120
 A `O -29120
 A 'O -29120
 A ^O -29120
@@ -125,11 +147,15 @@ A :O -29120
 A OE -29120
 A /O -29120
 A U -29120
+A u0055_030B -29120
+A u0055_030A -29120
 A `U -29120
 A 'U -29120
 A ^U -29120
 A :U -29120
 A T -87360
+A u0054_030C -87360
+A u0054_0327 -87360
 A Y -87360
 A :Y -87360
 A 'Y -87360
@@ -138,6 +164,8 @@ A W -116480
 D X -29120
 D W -29120
 D A -29120
+D u0041_0306 -29120
+D u0041_0328 -29120
 D `A -29120
 D 'A -29120
 D ^A -29120
@@ -168,6 +196,8 @@ F z -29120
 F ae -29120
 F /o -29120
 F A -87360
+F u0041_0306 -87360
+F u0041_0328 -87360
 F `A -87360
 F 'A -87360
 F ^A -87360
@@ -176,6 +206,7 @@ F :A -87360
 F oA -87360
 F AE -87360
 F O -29120
+F u004F_030B -29120
 F `O -29120
 F 'O -29120
 F ^O -29120
@@ -186,11 +217,14 @@ F /O -29120
 F C -29120
 F G -29120
 F 'C -29120
+F u0043_030C -29120
+F u0047_0306 -29120
 F ,C -29120
 F Q -29120
 I I 29120
 K v -29120
 K o -29120
+K u006F_030B -29120
 K `o -29120
 K 'o -29120
 K ^o -29120
@@ -201,9 +235,13 @@ K /o -29120
 K C -29120
 K G -29120
 K 'C -29120
+K u0043_030C -29120
+K u0047_0306 -29120
 K ,C -29120
 K Q -29120
 L T -87360
+L u0054_030C -87360
+L u0054_0327 -87360
 L Y -87360
 L :Y -87360
 L 'Y -87360
@@ -212,6 +250,8 @@ L W -116480
 O X -29120
 O W -29120
 O A -29120
+O u0041_0306 -29120
+O u0041_0328 -29120
 O `A -29120
 O 'A -29120
 O ^A -29120
@@ -224,6 +264,8 @@ O Y -29120
 O :Y -29120
 O 'Y -29120
 P A -87360
+P u0041_0306 -87360
+P u0041_0328 -87360
 P `A -87360
 P 'A -87360
 P ^A -87360
@@ -232,6 +274,7 @@ P :A -87360
 P oA -87360
 P AE -87360
 P o -29120
+P u006F_030B -29120
 P `o -29120
 P 'o -29120
 P ^o -29120
@@ -240,11 +283,15 @@ P :o -29120
 P oe -29120
 P /o -29120
 P e -29120
+P u0065_030C -29120
+P u0065_0328 -29120
 P `e -29120
 P 'e -29120
 P ^e -29120
 P :e -29120
 P a -29120
+P u0061_0306 -29120
+P u0061_0328 -29120
 P `a -29120
 P 'a -29120
 P ^a -29120
@@ -273,6 +320,8 @@ T w -87360
 T x -87360
 T z -87360
 T A -87360
+T u0041_0306 -87360
+T u0041_0328 -87360
 T `A -87360
 T 'A -87360
 T ^A -87360
@@ -299,6 +348,8 @@ V z -29120
 V ae -29120
 V /o -29120
 V A -87360
+V u0041_0306 -87360
+V u0041_0328 -87360
 V `A -87360
 V 'A -87360
 V ^A -87360
@@ -307,6 +358,7 @@ V :A -87360
 V oA -87360
 V AE -87360
 V O -29120
+V u004F_030B -29120
 V `O -29120
 V 'O -29120
 V ^O -29120
@@ -317,6 +369,8 @@ V /O -29120
 V C -29120
 V G -29120
 V 'C -29120
+V u0043_030C -29120
+V u0047_0306 -29120
 V ,C -29120
 V Q -29120
 W o -29120
@@ -338,6 +392,8 @@ W z -29120
 W ae -29120
 W /o -29120
 W A -87360
+W u0041_0306 -87360
+W u0041_0328 -87360
 W `A -87360
 W 'A -87360
 W ^A -87360
@@ -346,6 +402,7 @@ W :A -87360
 W oA -87360
 W AE -87360
 W O -29120
+W u004F_030B -29120
 W `O -29120
 W 'O -29120
 W ^O -29120
@@ -356,9 +413,12 @@ W /O -29120
 W C -29120
 W G -29120
 W 'C -29120
+W u0043_030C -29120
+W u0047_0306 -29120
 W ,C -29120
 W Q -29120
 X O -29120
+X u004F_030B -29120
 X `O -29120
 X 'O -29120
 X ^O -29120
@@ -369,6 +429,8 @@ X /O -29120
 X C -29120
 X G -29120
 X 'C -29120
+X u0043_030C -29120
+X u0047_0306 -29120
 X ,C -29120
 X Q -29120
 Y e -87360
@@ -388,6 +450,8 @@ Y w -87360
 Y x -87360
 Y z -87360
 Y A -87360
+Y u0041_0306 -87360
+Y u0041_0328 -87360
 Y `A -87360
 Y 'A -87360
 Y ^A -87360
@@ -399,7 +463,9 @@ oq lq 116480
 ` lq 116480
 oq ? 116480
 ` ? 116480
+oq u01C3 116480
 oq ! 116480
+` u01C3 116480
 ` ! 116480
 a r -29120
 a y -29120
@@ -407,11 +473,14 @@ a :y -29120
 a 'y -29120
 a w -29120
 b e 29120
+b u0065_030C 29120
+b u0065_0328 29120
 b `e 29120
 b 'e 29120
 b ^e 29120
 b :e 29120
 b o 29120
+b u006F_030B 29120
 b `o 29120
 b 'o 29120
 b ^o 29120
@@ -423,6 +492,7 @@ b x -29120
 b d 29120
 b c 29120
 b 'c 29120
+b u0063_030C 29120
 b ,c 29120
 b q 29120
 b r -29120
@@ -438,6 +508,7 @@ f ` 72800
 f lq 72800
 f rq 72800
 f ? 72800
+f u01C3 72800
 f ! 72800
 f ) 72800
 f rB 72800
@@ -446,11 +517,15 @@ g j 29120
 k W -87360
 k V -87360
 k e -29120
+k u0065_030C -29120
+k u0065_0328 -29120
 k `e -29120
 k 'e -29120
 k ^e -29120
 k :e -29120
 k a -29120
+k u0061_0306 -29120
+k u0061_0328 -29120
 k `a -29120
 k 'a -29120
 k ^a -29120
@@ -460,6 +535,7 @@ k :a -29120
 k oa -29120
 k ae -29120
 k o -29120
+k u006F_030B -29120
 k `o -29120
 k 'o -29120
 k ^o -29120
@@ -469,13 +545,17 @@ k oe -29120
 k /o -29120
 k c -29120
 k 'c -29120
+k u0063_030C -29120
 k ,c -29120
 o e 29120
+o u0065_030C 29120
+o u0065_0328 29120
 o `e 29120
 o 'e 29120
 o ^e 29120
 o :e 29120
 o o 29120
+o u006F_030B 29120
 o `o 29120
 o 'o 29120
 o ^o 29120
@@ -487,6 +567,7 @@ o x -29120
 o d 29120
 o c 29120
 o 'c 29120
+o u0063_030C 29120
 o ,c 29120
 o q 29120
 o r -29120
@@ -495,11 +576,14 @@ o :y -29120
 o 'y -29120
 o w -29120
 p e 29120
+p u0065_030C 29120
+p u0065_0328 29120
 p `e 29120
 p 'e 29120
 p ^e 29120
 p :e 29120
 p o 29120
+p u006F_030B 29120
 p `o 29120
 p 'o 29120
 p ^o 29120
@@ -511,6 +595,7 @@ p x -29120
 p d 29120
 p c 29120
 p 'c 29120
+p u0063_030C 29120
 p ,c 29120
 p q 29120
 p r -29120
@@ -524,11 +609,15 @@ t 'y -29120
 t w -29120
 u w -29120
 w e -29120
+w u0065_030C -29120
+w u0065_0328 -29120
 w `e -29120
 w 'e -29120
 w ^e -29120
 w :e -29120
 w a -29120
+w u0061_0306 -29120
+w u0061_0328 -29120
 w `a -29120
 w 'a -29120
 w ^a -29120
@@ -538,6 +627,7 @@ w :a -29120
 w oa -29120
 w ae -29120
 w o -29120
+w u006F_030B -29120
 w `o -29120
 w 'o -29120
 w ^o -29120
@@ -547,8 +637,10 @@ w oe -29120
 w /o -29120
 w c -29120
 w 'c -29120
+w u0063_030C -29120
 w ,c -29120
 y o -29120
+y u006F_030B -29120
 y `o -29120
 y 'o -29120
 y ^o -29120
@@ -557,11 +649,15 @@ y :o -29120
 y oe -29120
 y /o -29120
 y e -29120
+y u0065_030C -29120
+y u0065_0328 -29120
 y `e -29120
 y 'e -29120
 y ^e -29120
 y :e -29120
 y a -29120
+y u0061_0306 -29120
+y u0061_0328 -29120
 y `a -29120
 y 'a -29120
 y ^a -29120
@@ -572,19 +668,89 @@ y oa -29120
 y ae -29120
 y . -87360
 y , -87360
+u0041_0306 y -29120
+u0041_0306 :y -29120
+u0041_0306 'y -29120
+u0041_0306 v -29120
+u0041_0306 w -29120
+u0041_0306 c -29120
+u0041_0306 'c -29120
+u0041_0306 u0063_030C -29120
+u0041_0306 ,c -29120
+u0041_0306 d -29120
+u0041_0306 u0064_030C -29120
+u0041_0306 u0111 -29120
+u0041_0306 Sd -29120
+u0041_0306 e -29120
+u0041_0306 u0065_030C -29120
+u0041_0306 u0065_0328 -29120
+u0041_0306 `e -29120
+u0041_0306 'e -29120
+u0041_0306 ^e -29120
+u0041_0306 :e -29120
+u0041_0306 o -29120
+u0041_0306 u006F_030B -29120
+u0041_0306 `o -29120
+u0041_0306 'o -29120
+u0041_0306 ^o -29120
+u0041_0306 ~o -29120
+u0041_0306 :o -29120
+u0041_0306 oe -29120
+u0041_0306 /o -29120
+u0041_0306 q -29120
+u0041_0306 t -29120
+u0041_0306 u0074_030C -29120
+u0041_0306 u0074_0327 -29120
+u0041_0306 C -29120
+u0041_0306 G -29120
+u0041_0306 'C -29120
+u0041_0306 u0043_030C -29120
+u0041_0306 u0047_0306 -29120
+u0041_0306 ,C -29120
+u0041_0306 Q -29120
+u0041_0306 O -29120
+u0041_0306 u004F_030B -29120
+u0041_0306 `O -29120
+u0041_0306 'O -29120
+u0041_0306 ^O -29120
+u0041_0306 ~O -29120
+u0041_0306 :O -29120
+u0041_0306 OE -29120
+u0041_0306 /O -29120
+u0041_0306 U -29120
+u0041_0306 u0055_030B -29120
+u0041_0306 u0055_030A -29120
+u0041_0306 `U -29120
+u0041_0306 'U -29120
+u0041_0306 ^U -29120
+u0041_0306 :U -29120
+u0041_0306 T -87360
+u0041_0306 u0054_030C -87360
+u0041_0306 u0054_0327 -87360
+u0041_0306 Y -87360
+u0041_0306 :Y -87360
+u0041_0306 'Y -87360
+u0041_0306 V -116480
+u0041_0306 W -116480
 'C v -29120
 'C w -29120
 'C c -29120
 'C 'c -29120
+'C u0063_030C -29120
 'C ,c -29120
 'C d -29120
+'C u0064_030C -29120
+'C u0111 -29120
 'C Sd -29120
 'C e -29120
+'C u0065_030C -29120
+'C u0065_0328 -29120
 'C `e -29120
 'C 'e -29120
 'C ^e -29120
 'C :e -29120
 'C o -29120
+'C u006F_030B -29120
 'C `o -29120
 'C 'o -29120
 'C ^o -29120
@@ -594,12 +760,17 @@ y , -87360
 'C /o -29120
 'C q -29120
 'C t -29120
+'C u0074_030C -29120
+'C u0074_0327 -29120
 'C C -29120
 'C G -29120
 'C 'C -29120
+'C u0043_030C -29120
+'C u0047_0306 -29120
 'C ,C -29120
 'C Q -29120
 'C O -29120
+'C u004F_030B -29120
 'C `O -29120
 'C 'O -29120
 'C ^O -29120
@@ -608,22 +779,130 @@ y , -87360
 'C OE -29120
 'C /O -29120
 'C U -29120
+'C u0055_030B -29120
+'C u0055_030A -29120
 'C `U -29120
 'C 'U -29120
 'C ^U -29120
 'C :U -29120
 'C T -87360
+'C u0054_030C -87360
+'C u0054_0327 -87360
 'C Y -87360
 'C :Y -87360
 'C 'Y -87360
 'C V -116480
 'C W -116480
+u0044_030C X -29120
+u0044_030C W -29120
+u0044_030C A -29120
+u0044_030C u0041_0306 -29120
+u0044_030C u0041_0328 -29120
+u0044_030C `A -29120
+u0044_030C 'A -29120
+u0044_030C ^A -29120
+u0044_030C ~A -29120
+u0044_030C :A -29120
+u0044_030C oA -29120
+u0044_030C AE -29120
+u0044_030C V -29120
+u0044_030C Y -29120
+u0044_030C :Y -29120
+u0044_030C 'Y -29120
+u004C_0301 T -87360
+u004C_0301 u0054_030C -87360
+u004C_0301 u0054_0327 -87360
+u004C_0301 Y -87360
+u004C_0301 :Y -87360
+u004C_0301 'Y -87360
+u004C_0301 V -116480
+u004C_0301 W -116480
+u004C_030C T -87360
+u004C_030C u0054_030C -87360
+u004C_030C u0054_0327 -87360
+u004C_030C Y -87360
+u004C_030C :Y -87360
+u004C_030C 'Y -87360
+u004C_030C V -116480
+u004C_030C W -116480
 /L T -87360
+/L u0054_030C -87360
+/L u0054_0327 -87360
 /L Y -87360
 /L :Y -87360
 /L 'Y -87360
 /L V -116480
 /L W -116480
+u004F_030B X -29120
+u004F_030B W -29120
+u004F_030B A -29120
+u004F_030B u0041_0306 -29120
+u004F_030B u0041_0328 -29120
+u004F_030B `A -29120
+u004F_030B 'A -29120
+u004F_030B ^A -29120
+u004F_030B ~A -29120
+u004F_030B :A -29120
+u004F_030B oA -29120
+u004F_030B AE -29120
+u004F_030B V -29120
+u004F_030B Y -29120
+u004F_030B :Y -29120
+u004F_030B 'Y -29120
+u0054_030C y -87360
+u0054_030C e -87360
+u0054_030C o -87360
+u0054_030C r -87360
+u0054_030C a -87360
+u0054_030C u -87360
+u0054_030C n -87360
+u0054_030C .i -87360
+u0054_030C c -87360
+u0054_030C d -87360
+u0054_030C g -87360
+u0054_030C p -87360
+u0054_030C s -87360
+u0054_030C v -87360
+u0054_030C w -87360
+u0054_030C x -87360
+u0054_030C z -87360
+u0054_030C A -87360
+u0054_030C u0041_0306 -87360
+u0054_030C u0041_0328 -87360
+u0054_030C `A -87360
+u0054_030C 'A -87360
+u0054_030C ^A -87360
+u0054_030C ~A -87360
+u0054_030C :A -87360
+u0054_030C oA -87360
+u0054_030C AE -87360
+u0054_0327 y -87360
+u0054_0327 e -87360
+u0054_0327 o -87360
+u0054_0327 r -87360
+u0054_0327 a -87360
+u0054_0327 u -87360
+u0054_0327 n -87360
+u0054_0327 .i -87360
+u0054_0327 c -87360
+u0054_0327 d -87360
+u0054_0327 g -87360
+u0054_0327 p -87360
+u0054_0327 s -87360
+u0054_0327 v -87360
+u0054_0327 w -87360
+u0054_0327 x -87360
+u0054_0327 z -87360
+u0054_0327 A -87360
+u0054_0327 u0041_0306 -87360
+u0054_0327 u0041_0328 -87360
+u0054_0327 `A -87360
+u0054_0327 'A -87360
+u0054_0327 ^A -87360
+u0054_0327 ~A -87360
+u0054_0327 :A -87360
+u0054_0327 oA -87360
+u0054_0327 AE -87360
 :Y e -87360
 :Y o -87360
 :Y r -87360
@@ -641,6 +920,8 @@ y , -87360
 :Y x -87360
 :Y z -87360
 :Y A -87360
+:Y u0041_0306 -87360
+:Y u0041_0328 -87360
 :Y `A -87360
 :Y 'A -87360
 :Y ^A -87360
@@ -648,18 +929,66 @@ y , -87360
 :Y :A -87360
 :Y oA -87360
 :Y AE -87360
+u0061_0306 r -29120
+u0061_0306 y -29120
+u0061_0306 :y -29120
+u0061_0306 'y -29120
+u0061_0306 w -29120
+u0061_0328 w -29120
 /l cq 29120
 /l ' 29120
 /l a -29120
+/l u0061_0328 -29120
 /l c -29120
 /l 'c -29120
 /l d -29120
 /l e -29120
+/l u0065_0328 -29120
 /l g -29120
 /l o -29120
 /l 'o -29120
 /l s -29120
+/l u0073_0301 -29120
+u006F_030B e 29120
+u006F_030B u0065_030C 29120
+u006F_030B u0065_0328 29120
+u006F_030B `e 29120
+u006F_030B 'e 29120
+u006F_030B ^e 29120
+u006F_030B :e 29120
+u006F_030B o 29120
+u006F_030B u006F_030B 29120
+u006F_030B `o 29120
+u006F_030B 'o 29120
+u006F_030B ^o 29120
+u006F_030B ~o 29120
+u006F_030B :o 29120
+u006F_030B oe 29120
+u006F_030B /o 29120
+u006F_030B x -29120
+u006F_030B d 29120
+u006F_030B c 29120
+u006F_030B 'c 29120
+u006F_030B u0063_030C 29120
+u006F_030B ,c 29120
+u006F_030B q 29120
+u006F_030B r -29120
+u006F_030B y -29120
+u006F_030B :y -29120
+u006F_030B 'y -29120
+u006F_030B w -29120
+u0074_030C y -29120
+u0074_030C :y -29120
+u0074_030C 'y -29120
+u0074_030C w -29120
+u0074_0327 y -29120
+u0074_0327 :y -29120
+u0074_0327 'y -29120
+u0074_0327 w -29120
+u0075_030B w -29120
+u0075_030A w -29120
 :y o -29120
+:y u006F_030B -29120
 :y `o -29120
 :y 'o -29120
 :y ^o -29120
@@ -668,11 +997,15 @@ y , -87360
 :y oe -29120
 :y /o -29120
 :y e -29120
+:y u0065_030C -29120
+:y u0065_0328 -29120
 :y `e -29120
 :y 'e -29120
 :y ^e -29120
 :y :e -29120
 :y a -29120
+:y u0061_0306 -29120
+:y u0061_0328 -29120
 :y `a -29120
 :y 'a -29120
 :y ^a -29120
@@ -690,15 +1023,21 @@ y , -87360
 `A w -29120
 `A c -29120
 `A 'c -29120
+`A u0063_030C -29120
 `A ,c -29120
 `A d -29120
+`A u0064_030C -29120
+`A u0111 -29120
 `A Sd -29120
 `A e -29120
+`A u0065_030C -29120
+`A u0065_0328 -29120
 `A `e -29120
 `A 'e -29120
 `A ^e -29120
 `A :e -29120
 `A o -29120
+`A u006F_030B -29120
 `A `o -29120
 `A 'o -29120
 `A ^o -29120
@@ -708,12 +1047,17 @@ y , -87360
 `A /o -29120
 `A q -29120
 `A t -29120
+`A u0074_030C -29120
+`A u0074_0327 -29120
 `A C -29120
 `A G -29120
 `A 'C -29120
+`A u0043_030C -29120
+`A u0047_0306 -29120
 `A ,C -29120
 `A Q -29120
 `A O -29120
+`A u004F_030B -29120
 `A `O -29120
 `A 'O -29120
 `A ^O -29120
@@ -722,11 +1066,15 @@ y , -87360
 `A OE -29120
 `A /O -29120
 `A U -29120
+`A u0055_030B -29120
+`A u0055_030A -29120
 `A `U -29120
 `A 'U -29120
 `A ^U -29120
 `A :U -29120
 `A T -87360
+`A u0054_030C -87360
+`A u0054_0327 -87360
 `A Y -87360
 `A :Y -87360
 `A 'Y -87360
@@ -739,15 +1087,21 @@ y , -87360
 'A w -29120
 'A c -29120
 'A 'c -29120
+'A u0063_030C -29120
 'A ,c -29120
 'A d -29120
+'A u0064_030C -29120
+'A u0111 -29120
 'A Sd -29120
 'A e -29120
+'A u0065_030C -29120
+'A u0065_0328 -29120
 'A `e -29120
 'A 'e -29120
 'A ^e -29120
 'A :e -29120
 'A o -29120
+'A u006F_030B -29120
 'A `o -29120
 'A 'o -29120
 'A ^o -29120
@@ -757,12 +1111,17 @@ y , -87360
 'A /o -29120
 'A q -29120
 'A t -29120
+'A u0074_030C -29120
+'A u0074_0327 -29120
 'A C -29120
 'A G -29120
 'A 'C -29120
+'A u0043_030C -29120
+'A u0047_0306 -29120
 'A ,C -29120
 'A Q -29120
 'A O -29120
+'A u004F_030B -29120
 'A `O -29120
 'A 'O -29120
 'A ^O -29120
@@ -771,11 +1130,15 @@ y , -87360
 'A OE -29120
 'A /O -29120
 'A U -29120
+'A u0055_030B -29120
+'A u0055_030A -29120
 'A `U -29120
 'A 'U -29120
 'A ^U -29120
 'A :U -29120
 'A T -87360
+'A u0054_030C -87360
+'A u0054_0327 -87360
 'A Y -87360
 'A :Y -87360
 'A 'Y -87360
@@ -788,15 +1151,21 @@ y , -87360
 ^A w -29120
 ^A c -29120
 ^A 'c -29120
+^A u0063_030C -29120
 ^A ,c -29120
 ^A d -29120
+^A u0064_030C -29120
+^A u0111 -29120
 ^A Sd -29120
 ^A e -29120
+^A u0065_030C -29120
+^A u0065_0328 -29120
 ^A `e -29120
 ^A 'e -29120
 ^A ^e -29120
 ^A :e -29120
 ^A o -29120
+^A u006F_030B -29120
 ^A `o -29120
 ^A 'o -29120
 ^A ^o -29120
@@ -806,12 +1175,17 @@ y , -87360
 ^A /o -29120
 ^A q -29120
 ^A t -29120
+^A u0074_030C -29120
+^A u0074_0327 -29120
 ^A C -29120
 ^A G -29120
 ^A 'C -29120
+^A u0043_030C -29120
+^A u0047_0306 -29120
 ^A ,C -29120
 ^A Q -29120
 ^A O -29120
+^A u004F_030B -29120
 ^A `O -29120
 ^A 'O -29120
 ^A ^O -29120
@@ -820,11 +1194,15 @@ y , -87360
 ^A OE -29120
 ^A /O -29120
 ^A U -29120
+^A u0055_030B -29120
+^A u0055_030A -29120
 ^A `U -29120
 ^A 'U -29120
 ^A ^U -29120
 ^A :U -29120
 ^A T -87360
+^A u0054_030C -87360
+^A u0054_0327 -87360
 ^A Y -87360
 ^A :Y -87360
 ^A 'Y -87360
@@ -837,15 +1215,21 @@ y , -87360
 ~A w -29120
 ~A c -29120
 ~A 'c -29120
+~A u0063_030C -29120
 ~A ,c -29120
 ~A d -29120
+~A u0064_030C -29120
+~A u0111 -29120
 ~A Sd -29120
 ~A e -29120
+~A u0065_030C -29120
+~A u0065_0328 -29120
 ~A `e -29120
 ~A 'e -29120
 ~A ^e -29120
 ~A :e -29120
 ~A o -29120
+~A u006F_030B -29120
 ~A `o -29120
 ~A 'o -29120
 ~A ^o -29120
@@ -855,12 +1239,17 @@ y , -87360
 ~A /o -29120
 ~A q -29120
 ~A t -29120
+~A u0074_030C -29120
+~A u0074_0327 -29120
 ~A C -29120
 ~A G -29120
 ~A 'C -29120
+~A u0043_030C -29120
+~A u0047_0306 -29120
 ~A ,C -29120
 ~A Q -29120
 ~A O -29120
+~A u004F_030B -29120
 ~A `O -29120
 ~A 'O -29120
 ~A ^O -29120
@@ -869,11 +1258,15 @@ y , -87360
 ~A OE -29120
 ~A /O -29120
 ~A U -29120
+~A u0055_030B -29120
+~A u0055_030A -29120
 ~A `U -29120
 ~A 'U -29120
 ~A ^U -29120
 ~A :U -29120
 ~A T -87360
+~A u0054_030C -87360
+~A u0054_0327 -87360
 ~A Y -87360
 ~A :Y -87360
 ~A 'Y -87360
@@ -886,15 +1279,21 @@ y , -87360
 :A w -29120
 :A c -29120
 :A 'c -29120
+:A u0063_030C -29120
 :A ,c -29120
 :A d -29120
+:A u0064_030C -29120
+:A u0111 -29120
 :A Sd -29120
 :A e -29120
+:A u0065_030C -29120
+:A u0065_0328 -29120
 :A `e -29120
 :A 'e -29120
 :A ^e -29120
 :A :e -29120
 :A o -29120
+:A u006F_030B -29120
 :A `o -29120
 :A 'o -29120
 :A ^o -29120
@@ -904,12 +1303,17 @@ y , -87360
 :A /o -29120
 :A q -29120
 :A t -29120
+:A u0074_030C -29120
+:A u0074_0327 -29120
 :A C -29120
 :A G -29120
 :A 'C -29120
+:A u0043_030C -29120
+:A u0047_0306 -29120
 :A ,C -29120
 :A Q -29120
 :A O -29120
+:A u004F_030B -29120
 :A `O -29120
 :A 'O -29120
 :A ^O -29120
@@ -918,11 +1322,15 @@ y , -87360
 :A OE -29120
 :A /O -29120
 :A U -29120
+:A u0055_030B -29120
+:A u0055_030A -29120
 :A `U -29120
 :A 'U -29120
 :A ^U -29120
 :A :U -29120
 :A T -87360
+:A u0054_030C -87360
+:A u0054_0327 -87360
 :A Y -87360
 :A :Y -87360
 :A 'Y -87360
@@ -935,15 +1343,21 @@ oA v -29120
 oA w -29120
 oA c -29120
 oA 'c -29120
+oA u0063_030C -29120
 oA ,c -29120
 oA d -29120
+oA u0064_030C -29120
+oA u0111 -29120
 oA Sd -29120
 oA e -29120
+oA u0065_030C -29120
+oA u0065_0328 -29120
 oA `e -29120
 oA 'e -29120
 oA ^e -29120
 oA :e -29120
 oA o -29120
+oA u006F_030B -29120
 oA `o -29120
 oA 'o -29120
 oA ^o -29120
@@ -953,12 +1367,17 @@ oA oe -29120
 oA /o -29120
 oA q -29120
 oA t -29120
+oA u0074_030C -29120
+oA u0074_0327 -29120
 oA C -29120
 oA G -29120
 oA 'C -29120
+oA u0043_030C -29120
+oA u0047_0306 -29120
 oA ,C -29120
 oA Q -29120
 oA O -29120
+oA u004F_030B -29120
 oA `O -29120
 oA 'O -29120
 oA ^O -29120
@@ -967,33 +1386,73 @@ oA :O -29120
 oA OE -29120
 oA /O -29120
 oA U -29120
+oA u0055_030B -29120
+oA u0055_030A -29120
 oA `U -29120
 oA 'U -29120
 oA ^U -29120
 oA :U -29120
 oA T -87360
+oA u0054_030C -87360
+oA u0054_0327 -87360
 oA Y -87360
 oA :Y -87360
 oA 'Y -87360
 oA V -116480
 oA W -116480
+u0189 X -29120
+u0110 X -29120
 -D X -29120
+u0189 W -29120
+u0110 W -29120
 -D W -29120
+u0189 A -29120
+u0110 A -29120
 -D A -29120
+u0189 u0041_0306 -29120
+u0110 u0041_0306 -29120
+-D u0041_0306 -29120
+u0189 u0041_0328 -29120
+u0110 u0041_0328 -29120
+-D u0041_0328 -29120
+u0189 `A -29120
+u0110 `A -29120
 -D `A -29120
+u0189 'A -29120
+u0110 'A -29120
 -D 'A -29120
+u0189 ^A -29120
+u0110 ^A -29120
 -D ^A -29120
+u0189 ~A -29120
+u0110 ~A -29120
 -D ~A -29120
+u0189 :A -29120
+u0110 :A -29120
 -D :A -29120
+u0189 oA -29120
+u0110 oA -29120
 -D oA -29120
+u0189 AE -29120
+u0110 AE -29120
 -D AE -29120
+u0189 V -29120
+u0110 V -29120
 -D V -29120
+u0189 Y -29120
+u0110 Y -29120
 -D Y -29120
+u0189 :Y -29120
+u0110 :Y -29120
 -D :Y -29120
+u0189 'Y -29120
+u0110 'Y -29120
 -D 'Y -29120
 `O X -29120
 `O W -29120
 `O A -29120
+`O u0041_0306 -29120
+`O u0041_0328 -29120
 `O `A -29120
 `O 'A -29120
 `O ^A -29120
@@ -1008,6 +1467,8 @@ oA W -116480
 'O X -29120
 'O W -29120
 'O A -29120
+'O u0041_0306 -29120
+'O u0041_0328 -29120
 'O `A -29120
 'O 'A -29120
 'O ^A -29120
@@ -1022,6 +1483,8 @@ oA W -116480
 ^O X -29120
 ^O W -29120
 ^O A -29120
+^O u0041_0306 -29120
+^O u0041_0328 -29120
 ^O `A -29120
 ^O 'A -29120
 ^O ^A -29120
@@ -1036,6 +1499,8 @@ oA W -116480
 ~O X -29120
 ~O W -29120
 ~O A -29120
+~O u0041_0306 -29120
+~O u0041_0328 -29120
 ~O `A -29120
 ~O 'A -29120
 ~O ^A -29120
@@ -1050,6 +1515,8 @@ oA W -116480
 :O X -29120
 :O W -29120
 :O A -29120
+:O u0041_0306 -29120
+:O u0041_0328 -29120
 :O `A -29120
 :O 'A -29120
 :O ^A -29120
@@ -1064,6 +1531,8 @@ oA W -116480
 /O X -29120
 /O W -29120
 /O A -29120
+/O u0041_0306 -29120
+/O u0041_0328 -29120
 /O `A -29120
 /O 'A -29120
 /O ^A -29120
@@ -1092,6 +1561,8 @@ oA W -116480
 'Y x -87360
 'Y z -87360
 'Y A -87360
+'Y u0041_0306 -87360
+'Y u0041_0328 -87360
 'Y `A -87360
 'Y 'A -87360
 'Y ^A -87360
@@ -1130,11 +1601,14 @@ oa :y -29120
 oa 'y -29120
 oa w -29120
 `o e 29120
+`o u0065_030C 29120
+`o u0065_0328 29120
 `o `e 29120
 `o 'e 29120
 `o ^e 29120
 `o :e 29120
 `o o 29120
+`o u006F_030B 29120
 `o `o 29120
 `o 'o 29120
 `o ^o 29120
@@ -1146,6 +1620,7 @@ oa w -29120
 `o d 29120
 `o c 29120
 `o 'c 29120
+`o u0063_030C 29120
 `o ,c 29120
 `o q 29120
 `o r -29120
@@ -1154,11 +1629,14 @@ oa w -29120
 `o 'y -29120
 `o w -29120
 'o e 29120
+'o u0065_030C 29120
+'o u0065_0328 29120
 'o `e 29120
 'o 'e 29120
 'o ^e 29120
 'o :e 29120
 'o o 29120
+'o u006F_030B 29120
 'o `o 29120
 'o 'o 29120
 'o ^o 29120
@@ -1170,6 +1648,7 @@ oa w -29120
 'o d 29120
 'o c 29120
 'o 'c 29120
+'o u0063_030C 29120
 'o ,c 29120
 'o q 29120
 'o r -29120
@@ -1178,11 +1657,14 @@ oa w -29120
 'o 'y -29120
 'o w -29120
 ^o e 29120
+^o u0065_030C 29120
+^o u0065_0328 29120
 ^o `e 29120
 ^o 'e 29120
 ^o ^e 29120
 ^o :e 29120
 ^o o 29120
+^o u006F_030B 29120
 ^o `o 29120
 ^o 'o 29120
 ^o ^o 29120
@@ -1194,6 +1676,7 @@ oa w -29120
 ^o d 29120
 ^o c 29120
 ^o 'c 29120
+^o u0063_030C 29120
 ^o ,c 29120
 ^o q 29120
 ^o r -29120
@@ -1202,11 +1685,14 @@ oa w -29120
 ^o 'y -29120
 ^o w -29120
 ~o e 29120
+~o u0065_030C 29120
+~o u0065_0328 29120
 ~o `e 29120
 ~o 'e 29120
 ~o ^e 29120
 ~o :e 29120
 ~o o 29120
+~o u006F_030B 29120
 ~o `o 29120
 ~o 'o 29120
 ~o ^o 29120
@@ -1218,6 +1704,7 @@ oa w -29120
 ~o d 29120
 ~o c 29120
 ~o 'c 29120
+~o u0063_030C 29120
 ~o ,c 29120
 ~o q 29120
 ~o r -29120
@@ -1226,11 +1713,14 @@ oa w -29120
 ~o 'y -29120
 ~o w -29120
 :o e 29120
+:o u0065_030C 29120
+:o u0065_0328 29120
 :o `e 29120
 :o 'e 29120
 :o ^e 29120
 :o :e 29120
 :o o 29120
+:o u006F_030B 29120
 :o `o 29120
 :o 'o 29120
 :o ^o 29120
@@ -1242,6 +1732,7 @@ oa w -29120
 :o d 29120
 :o c 29120
 :o 'c 29120
+:o u0063_030C 29120
 :o ,c 29120
 :o q 29120
 :o r -29120
@@ -1250,11 +1741,14 @@ oa w -29120
 :o 'y -29120
 :o w -29120
 /o e 29120
+/o u0065_030C 29120
+/o u0065_0328 29120
 /o `e 29120
 /o 'e 29120
 /o ^e 29120
 /o :e 29120
 /o o 29120
+/o u006F_030B 29120
 /o `o 29120
 /o 'o 29120
 /o ^o 29120
@@ -1266,6 +1760,7 @@ oa w -29120
 /o d 29120
 /o c 29120
 /o 'c 29120
+/o u0063_030C 29120
 /o ,c 29120
 /o q 29120
 /o r -29120
@@ -1278,6 +1773,7 @@ oa w -29120
 ^u w -29120
 :u w -29120
 'y o -29120
+'y u006F_030B -29120
 'y `o -29120
 'y 'o -29120
 'y ^o -29120
@@ -1286,11 +1782,15 @@ oa w -29120
 'y oe -29120
 'y /o -29120
 'y e -29120
+'y u0065_030C -29120
+'y u0065_0328 -29120
 'y `e -29120
 'y 'e -29120
 'y ^e -29120
 'y :e -29120
 'y a -29120
+'y u0061_0306 -29120
+'y u0061_0328 -29120
 'y `a -29120
 'y 'a -29120
 'y ^a -29120
@@ -1334,8 +1834,9 @@ fi	562016,757120	2	0034
 fl	562016,757120	2	0035
 Fi	853216,757120	2	0036
 Fl	853216,757120	2	0037
----	524160,463008,101920	1	0040
-!	334880,757120	2	0041
+u2423	524160,463008,101920	1	0040
+u01C3	334880,757120	2	0041
+!	"
 dq	524160,757120	2	0042
 "	"
 sh	873600,757120,232960	3	0043
@@ -1349,8 +1850,7 @@ cq	291200,757120	2	0047
 (	407680,782600,262080	3	0050
 )	407680,782600,262080	3	0051
 *	524160,782600	2	0052
-pl	815360,611520,87360	3	0053
-+	"
++	815360,611520,87360	3	0053
 ,	291200,87360,131040	1	0054
 -	349440,463008	0	0055
 .	291200,87360	0	0056
@@ -1369,8 +1869,7 @@ sl	524160,782600,262080	3	0057
 :	291200,463008	0	0072
 ;	291200,463008,131040	1	0073
 <	815360,571045,50091	3	0074
-eq	815360,387883,-136277	0	0075
-=	"
+=	815360,387883,-136277	0	0075
 >	815360,571045,50091	3	0076
 ?	495040,757120	2	0077
 at	698880,757120	2	0100
@@ -1440,74 +1939,73 @@ y	483392,463008,203840,14560	1	0171
 z	455728,463008	0	0172
 lC	524160,782600,262080	3	0173
 {	"
-ba	291200,782600,262080	3	0174
-bv	"
-or	"
+u01C0	291200,782600,262080	3	0174
+ba	"
 |	"
 rC	524160,782600,262080	3	0175
 }	"
 ~	640640,710738	2	0176
 hy	174720,463008	0	0177
----	698880,931840	2	0200
----	698880,728000,203840	3	0201
+u0041_0306	698880,931840	2	0200
+u0041_0328	698880,728000,203840	3	0201
 'C	669760,892202	2	0202
----	669760,931840,0,0,-29120	2	0203
----	757120,931840,0,0,0,-29120	2	0204
----	626080,931840	2	0205
----	626080,728000,203840	3	0206
----	698880,931840,0,0,-29120	2	0207
----	567840,892202,0,0,0,58240	2	0210
----	567840,931840,0,0,0,58240	2	0211
+u0043_030C	669760,931840,0,0,-29120	2	0203
+u0044_030C	757120,931840,0,0,0,-29120	2	0204
+u0045_030C	626080,931840	2	0205
+u0045_0328	626080,728000,203840	3	0206
+u0047_0306	698880,931840,0,0,-29120	2	0207
+u004C_0301	567840,892202,0,0,0,58240	2	0210
+u004C_030C	567840,931840,0,0,0,58240	2	0211
 /L	655200,728000	2	0212
----	742560,892202	2	0213
----	742560,931840	2	0214
----	786240,728000,0,0,0,-29120	2	0215
----	771680,892202,0,0,-29120,-29120	2	0216
----	677040,892202	2	0217
----	677040,931840	2	0220
----	582400,892202	2	0221
+u004E_0301	742560,892202	2	0213
+u004E_030C	742560,931840	2	0214
+u014A	786240,728000,0,0,0,-29120	2	0215
+u004F_030B	771680,892202,0,0,-29120,-29120	2	0216
+u0052_0301	677040,892202	2	0217
+u0052_030C	677040,931840	2	0220
+u0053_0301	582400,892202	2	0221
 vS	582400,931840	2	0222
----	582400,728000,178360	3	0223
----	713440,931840,0,0,0,-145600	2	0224
----	713440,728000,178360,0,0,-145600	3	0225
----	720720,892202,0,0,29120	2	0226
----	720720,931840,0,0,29120	2	0227
+u0053_0327	582400,728000,178360	3	0223
+u0054_030C	713440,931840,0,0,0,-145600	2	0224
+u0054_0327	713440,728000,178360,0,0,-145600	3	0225
+u0055_030B	720720,892202,0,0,29120	2	0226
+u0055_030A	720720,931840,0,0,29120	2	0227
 :Y	698880,931840,0,26208,29120,-206752	2	0230
----	640640,892202	2	0231
+u005A_0301	640640,892202	2	0231
 vZ	640640,931840	2	0232
----	640640,892202	2	0233
+u005A_0307	640640,892202	2	0233
 IJ	757120,728000,0,0,0,-29120	2	0234
----	291200,892202	2	0235
----	541632,757120	2	0236
+u0049_0307	291200,892202	2	0235
+u0111	541632,757120	2	0236
 sc	465920,757120,203840	3	0237
----	503776,669760	2	0240
----	503776,463008,203840	1	0241
+u0061_0306	503776,669760	2	0240
+u0061_0328	503776,463008,203840	1	0241
 'c	465920,669760	2	0242
----	465920,669760	2	0243
----	663936,757120	2	0244
----	465920,669760	2	0245
----	465920,463008,203840	1	0246
----	524160,669760,203840,14560	3	0247
----	250432,892202,0,96354	2	0250
----	372736,757120	2	0251
+u0063_030C	465920,669760	2	0243
+u0064_030C	663936,757120	2	0244
+u0065_030C	465920,669760	2	0245
+u0065_0328	465920,463008,203840	1	0246
+u0067_0306	524160,669760,203840,14560	3	0247
+u006C_0301	250432,892202,0,96354	2	0250
+u006C_030C	372736,757120	2	0251
 /l	340122,757120,0,11645	2	0252
----	541632,669760	2	0253
----	541632,669760	2	0254
----	541632,463008,203840	1	0255
----	524160,669760,0,14557	2	0256
----	358176,669760,0,14560	2	0257
----	358176,669760,0,14560	2	0260
----	401856,669760	2	0261
+u006E_0301	541632,669760	2	0253
+u006E_030C	541632,669760	2	0254
+u016A	541632,463008,203840	1	0255
+u006F_030B	524160,669760,0,14557	2	0256
+u0072_0301	358176,669760,0,14560	2	0257
+u0072_030C	358176,669760,0,14560	2	0260
+u0073_0301	401856,669760	2	0261
 vs	401856,669760	2	0262
----	401856,463008,178360	1	0263
----	378560,757120	2	0264
----	378560,599043,178360	3	0265
----	541632,669760,0,5818	2	0266
----	541632,669760	2	0267
+u0073_0327	401856,463008,178360	1	0263
+u0074_030C	378560,757120	2	0264
+u0074_0327	378560,599043,178360	3	0265
+u0075_030B	541632,669760,0,5818	2	0266
+u0075_030A	541632,669760	2	0267
 :y	483392,689730,203840,14560	3	0270
----	455728,669760	2	0271
+u007A_0301	455728,669760	2	0271
 vz	455728,669760	2	0272
----	455728,710738	2	0273
+u007A_0307	455728,710738	2	0273
 ij	570752,710738,203840	3	0274
 r!	334880,553280,203840	3	0275
 r?	495040,553280,203840	3	0276
@@ -1528,7 +2026,9 @@ AE	902720,728000	2	0306
 'I	291200,892202,0,78541,0,39270	2	0315
 ^I	291200,931840	2	0316
 :I	291200,931840	2	0317
--D	757120,728000,0,0,0,-29120	2	0320
+u0189	757120,728000,0,0,0,-29120	2	0320
+u0110	"
+-D	"
 ~N	742560,931840	2	0321
 `O	771680,892202,0,0,-29120,-29120	2	0322
 'O	771680,892202	2	0323
diff --git a/contrib/groff/font/devdvi/HRTC b/contrib/groff/font/devdvi/HRTC
index d312c4e..9e7b715 100644
--- a/contrib/groff/font/devdvi/HRTC
+++ b/contrib/groff/font/devdvi/HRTC
@@ -30,11 +30,11 @@ charset
 ---	483392,757120,0,302848	2	0034
 ---	483392,757120,0,331968	2	0035
 ---	0,757120	2	0037
----	541632,757120	2	0040
+u2422	541632,757120	2	0040
 Do	524160,786240,29120	3	0044
 $	"
 aq	291200,757120	2	0047
-**	524160,495040,-29120	2	0052
+---	524160,495040,-29120	2	0052
 ,	291200,87360,131040	1	0054
 ---	349440,387883,-136277	0	0055
 .	291200,87360	0	0056
@@ -50,14 +50,13 @@ f/	524160,786240,262080	3	0057
 8	524160,687232	2	0070
 9	524160,465920,203840	1	0071
 la	407680,786240,262080	3	0074
-mi	815360,605282,87360	3	0075
-\-	"
+\-	815360,605282,87360	3	0075
 ra	407680,786240,262080	3	0076
----	757120,728000	2	0115
+u2127	757120,728000	2	0115
 ci	1164800,786240,262080	3	0117
----	757120,728000	2	0127
----	422240,786240,262080	3	0133
----	422240,786240,262080	3	0135
+u03A9	757120,728000	2	0127
+u301A	422240,786240,262080	3	0133
+u301B	422240,786240,262080	3	0135
 ua	524160,757120,232960	3	0136
 da	524160,757120,232960	3	0137
 ---	524160,757120	2	0140
@@ -66,7 +65,7 @@ da	524160,757120,232960	3	0137
 ---	524160,662478,29122	3	0144
 ---	1048320,757120	2	0154
 ---	524160,495040,-29120	2	0155
----	640640,757120	2	0156
+u266A	640640,757120	2	0156
 ti	640640,133120	0	0176
 ~	"
 ---	174720,387883,-136277	0	0177
@@ -76,34 +75,34 @@ ti	640640,133120	0	0176
 ---	524160,757120	2	0203
 dg	465920,757120,203840	3	0204
 dd	465920,757120,203840	3	0205
----	524160,786240,262080	3	0206
-%O	1223040,786240,29120	3	0207
+u2016	524160,786240,262080	3	0206
+%0	1223040,786240,29120	3	0207
 bu	524160,465920,-58240	0	0210
----	902720,728000,0,0,-29120	2	0211
+u2103	902720,728000,0,0,-29120	2	0211
 ---	640640,786240,29120	3	0212
 ---	524160,560560,101920	3	0213
 Fn	320320,757120,0,72800	2	0214
----	669760,786240,29120,0,-29120	3	0215
----	990080,728000,0,14560,43680,-131040	2	0216
----	771680,728000	2	0217
+u20A1	669760,786240,29120,0,-29120	3	0215
+u20A9	990080,728000,0,14560,43680,-131040	2	0216
+u20A6	771680,728000	2	0217
 ---	815360,786240,29120,0,-29120	3	0220
----	684320,728000,0,0,0,-145600	2	0221
----	669760,757120	2	0222
----	677040,728000	2	0223
----	495040,757120	2	0224
+u20B1	684320,728000,0,0,0,-145600	2	0221
+u20A4	669760,757120	2	0222
+u211E	677040,728000	2	0223
+u203D	495040,757120	2	0224
 ---	495040,560560,203840	3	0225
----	541632,786240	2	0226
+u20AB	541632,786240	2	0226
 tm	698880,786240,0,550366	2	0227
----	1612550,786240,29120	3	0230
+u2031	1612550,786240,29120	3	0230
 ---	495040,757120,203840	3	0231
----	698880,786240,29120	3	0232
----	859040,728000	2	0233
----	524160,786240	2	0234
----	701792,728000	2	0235
----	524160,465920,-58240	0	0236
----	698880,786240,0,550366	2	0237
----	378560,786240,262080	3	0240
----	378560,786240,262080	3	0241
+u0E3F	698880,786240,29120	3	0232
+u2116	859040,728000	2	0233
+u2052	524160,786240	2	0234
+u212E	701792,728000	2	0235
+u25E6	524160,465920,-58240	0	0236
+u2120	698880,786240,0,550366	2	0237
+u2045	378560,786240,262080	3	0240
+u2046	378560,786240,262080	3	0241
 ct	524160,560560,101920	3	0242
 Po	669760,757120	2	0243
 Cs	793402,605282	2	0244
@@ -114,10 +113,10 @@ sc	465920,757120,203840	3	0247
 co	1164800,786240,262080	3	0251
 Of	465920,786240	2	0252
 ---	1164800,786240,262080	3	0253
-no	698880,465920	0	0254
----	1164800,786240,262080	3	0255
+tno	698880,465920	0	0254
+u2117	1164800,786240,262080	3	0255
 rg	1164800,786240,262080	3	0256
-rn	815360,757120	2	0257
+---	815360,757120	2	0257
 de	349440,728000	2	0260
 t+-	815360,605282,87360	3	0261
 S2	465920,786240	2	0262
@@ -126,13 +125,13 @@ S3	465920,786240	2	0263
 mc	541632,465920,203840	1	0265
 ps	640640,757120,203840	3	0266
 pc	247520,465920	0	0267
----	679466,560560	2	0270
+u203B	679466,560560	2	0270
 S1	465920,786240	2	0271
 Om	465920,786240	2	0272
 ---	495040,786240,220138	3	0273
-14	465920,786240,203840	3	0274
-12	465920,786240,203840	3	0275
-34	465920,786240,203840	3	0276
+---	465920,786240,203840	3	0274
+---	465920,786240,203840	3	0275
+---	465920,786240,203840	3	0276
 Eu	815360,728000	2	0277
 tmu	815360,605282,87360	3	0326
 tdi	815360,605282,87360	3	0366
diff --git a/contrib/groff/font/devdvi/MI b/contrib/groff/font/devdvi/MI
index d3b0fcf..6821f7d 100644
--- a/contrib/groff/font/devdvi/MI
+++ b/contrib/groff/font/devdvi/MI
@@ -20,15 +20,15 @@ charset
 *b	593102,728178,203890,55342	3	0014
 *g	542880,451470,203890,58254	1	0015
 *d	466034,728178,0,39685	2	0016
-*e	425621,451470	0	0017
++e	425621,451470	0	0017
 *z	458754,728178,203890,77368	3	0020
 *y	520651,451470,203890,37622	1	0021
 *h	492248,728178,0,29128	2	0022
 *i	371130,451470	0	0023
 *k	604147,451470	0	0024
 *l	611672,728178	2	0025
-*m	631819,451470,203890	1	0026
-mc	"
+mc	631819,451470,203890	1	0026
+*m	"
 *n	517979,451470,0,66750	0	0027
 *c	458754,728178,203890,48242	3	0030
 *p	597717,451470,0,37622	0	0031
@@ -40,20 +40,20 @@ mc	"
 *x	656086,451470,203890	1	0037
 *q	683034,728178,203890,37622	3	0040
 *w	652691,451470,0,37622	0	0041
----	488970,451470	0	0042
+*e	488970,451470	0	0042
 +h	620170,728178	2	0043
 +p	868357,451470,0,29128	0	0044
 ---	542130,451470,203890	1	0045
 ts	380474,451470,101946,83739	1	0046
 +f	685944,451470,203890	1	0047
----	1048579,384696,-139592	0	0050
----	1048579,384696,-139592	0	0051
----	1048579,384696,-139592	0	0052
----	1048579,384696,-139592	0	0053
+u21BC	1048579,384696,-139592	0	0050
+u21BD	1048579,384696,-139592	0	0051
+u21C0	1048579,384696,-139592	0	0052
+u21C1	1048579,384696,-139592	0	0053
 ---	291272,486275,-38013	2	0054
 ---	291272,486275,-38013	2	0055
----	524290,487880,-36408	2	0056
----	524290,487880,-36408	2	0057
+u25B7	524290,487880,-36408	2	0056
+u25C1	524290,487880,-36408	2	0057
 ---	524290,451470	0	0060
 ---	524290,451470	0	0061
 ---	524290,451470	0	0062
@@ -69,7 +69,7 @@ ts	380474,451470,101946,83739	1	0046
 <	815562,565285,40997	3	0074
 ---	524290,786432,262144	3	0075
 >	815562,565285,40997	3	0076
----	524290,487880,-36408	2	0077
+u22C6	524290,487880,-36408	2	0077
 pd	556693,728178,0,58254	2	0100
 ---	786434,716526	2	0101
 ---	795355,716526,0,52610	2	0102
@@ -97,12 +97,12 @@ pd	556693,728178,0,58254	2	0100
 ---	868718,716526,0,82283	2	0130
 ---	608758,716526,0,233018	2	0131
 ---	715800,716526,0,75002	2	0132
----	407781,786432	2	0133
----	407781,728178,203890	3	0134
----	407781,728178,203890	3	0135
----	1048579,375013,-149275	0	0136
----	1048579,375013,-149275	0	0137
----	436910,728178	2	0140
+u266D	407781,786432	2	0133
+u266E	407781,728178,203890	3	0134
+u266F	407781,728178,203890	3	0135
+u2323	1048579,375013,-149275	0	0136
+u2322	1048579,375013,-149275	0	0137
+u2113	436910,728178	2	0140
 ---	554267,451470	0	0141
 ---	450014,728178	2	0142
 ---	453778,451470	0	0143
diff --git a/contrib/groff/font/devdvi/Makefile.sub b/contrib/groff/font/devdvi/Makefile.sub
index 098e602..052e00a 100644
--- a/contrib/groff/font/devdvi/Makefile.sub
+++ b/contrib/groff/font/devdvi/Makefile.sub
@@ -3,15 +3,21 @@ DEVFILES=DESC \
   TR TI TB TBI CW CWI HR HI HB HBI \
   TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \
   TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \
-  MI S EX SA SB \
-  generate/CompileFonts generate/Makefile \
+  MI S EX SA SB SC \
+  generate/Makefile \
   generate/msam.map generate/msbm.map \
   generate/texb.map generate/texex.map generate/texi.map generate/texmi.map \
-  generate/texr.map generate/texsy.map generate/textt.map \
+  generate/texr.map generate/texsy.map generate/textt.map generate/textex.map \
   generate/ec.map generate/tc.map
+DEVSCRIPTS=generate/CompileFonts
 
 CLEANADD=DESC
 
 DESC: DESC.in
 	cat $(srcdir)/DESC.in >DESC
+	if test "$(PAGE)" = A4; then \
+	  echo "papersize a4" >>DESC; \
+	else \
+	  echo "papersize letter" >>DESC; \
+	fi
 	test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>DESC
diff --git a/contrib/groff/font/devdvi/S b/contrib/groff/font/devdvi/S
index 810c11e..3030135 100644
--- a/contrib/groff/font/devdvi/S
+++ b/contrib/groff/font/devdvi/S
@@ -14,68 +14,68 @@ mu	"
 **	524290,487880,-36408	2	0003
 tdi	815562,611670,87382	3	0004
 di	"
----	524290,466035,-58253	2	0005
+u22C4	524290,466035,-58253	2	0005
 t+-	815562,611670,87382	3	0006
 +-	"
 -+	815562,611670,87382	3	0007
 c+	815562,611670,87382	3	0010
----	815562,611670,87382	3	0011
+u2296	815562,611670,87382	3	0011
 c*	815562,611670,87382	3	0012
----	815562,611670,87382	3	0013
----	815562,611670,87382	3	0014
+u2298	815562,611670,87382	3	0013
+u2299	815562,611670,87382	3	0014
 ci	1048579,728178,203890	3	0015
----	524290,466035,-58253	2	0016
+u25E6	524290,466035,-58253	2	0016
 bu	524290,466035,-58253	2	0017
----	815562,486275,-38013	2	0020
+u224D	815562,486275,-38013	2	0020
 ==	815562,486275,-38013	2	0021
 ib	815562,666864,142576	3	0022
 ip	815562,666864,142576	3	0023
 <=	815562,666864,142576	3	0024
 >=	815562,666864,142576	3	0025
----	815562,666864,142576	3	0026
----	815562,666864,142576	3	0027
+u227C	815562,666864,142576	3	0026
+u227D	815562,666864,142576	3	0027
 ti	815562,384696,-139592	0	0030
 ap	"
-~~	815562,506590,-17698	2	0031
+~=	815562,506590,-17698	2	0031
+~~	"
 sb	815562,565285,40997	3	0032
 sp	815562,565285,40997	3	0033
 <<	1048579,565285,40997	3	0034
 >>	1048579,565285,40997	3	0035
----	815562,565285,40997	3	0036
----	815562,565285,40997	3	0037
+u227A	815562,565285,40997	3	0036
+u227B	815562,565285,40997	3	0037
 <-	1048579,384696,-139592	0	0040
 ->	1048579,384696,-139592	0	0041
 ua	524290,728178,203888	3	0042
 da	524290,728178,203888	3	0043
 <>	1048579,384696,-139592	0	0044
----	1048579,728178,203888	3	0045
----	1048579,728178,203888	3	0046
-~=	815562,486275,-38013	2	0047
-lh	1048579,384696,-139592	0	0050
-lA	"
-rh	1048579,384696,-139592	0	0051
-rA	"
+u2197	1048579,728178,203888	3	0045
+u2198	1048579,728178,203888	3	0046
+|=	815562,486275,-38013	2	0047
+lA	1048579,384696,-139592	0	0050
+rA	1048579,384696,-139592	0	0051
 uA	640798,728178,203888	3	0052
 dA	640798,728178,203888	3	0053
 hA	1048579,384696,-139592	0	0054
----	1048579,728178,203888	3	0055
----	1048579,728178,203888	3	0056
+u2196	1048579,728178,203888	3	0055
+u2199	1048579,728178,203888	3	0056
 pt	815562,451470	0	0057
 prime	288358,582544	2	0060
 if	1048579,451470	0	0061
 mo	699053,565285,40997	3	0062
 st	699053,565285,40997	3	0063
----	932070,728178,203890	3	0064
----	932070,728178,203890	3	0065
+u25B3	932070,728178,203890	3	0064
+u25BD	932070,728178,203890	3	0065
 slashnot	0,728178,203888	3	0066
 ---	0,384696,-139592	0	0067
 fa	582544,728178	2	0070
 te	582544,728178	2	0071
-no	699053,451470	0	0072
+tno	699053,451470	0	0072
+no	"
 es	524290,786432,58254	3	0073
 Re	757307,728178	2	0074
 Im	757307,728178	2	0075
----	815562,728178	2	0076
+u22A4	815562,728178	2	0076
 pp	815562,728178	2	0077
 Ah	640798,728178	2	0100
 A	837258,716526	2	0101
@@ -106,11 +106,11 @@ Y	700802,716526,101946,86216	3	0131
 Z	759930,716526,0,83302	2	0132
 cu	699053,582544	2	0133
 ca	699053,582544	2	0134
----	699053,582544	2	0135
+u228E	699053,582544	2	0135
 AN	699053,582544	2	0136
 OR	699053,582544	2	0137
----	640798,728178	2	0140
----	640798,728178	2	0141
+u22A2	640798,728178	2	0140
+u22A3	640798,728178	2	0141
 lf	466035,786432,262144	3	0142
 rf	466035,786432,262144	3	0143
 lc	466035,786432,262144	3	0144
@@ -122,7 +122,6 @@ rC	"
 la	407781,786432,262144	3	0150
 ra	407781,786432,262144	3	0151
 bar	291272,786432,262144	3	0152
-or	"
 bv	"
 |	"
 ba	"
@@ -131,20 +130,20 @@ va	524290,786432,262144	3	0154
 vA	640798,786432,262144	3	0155
 rs	524290,786432,262144	3	0156
 \	"
----	291272,728178,203888	3	0157
-sr	873816,41942,1006634	1	0160
----	786434,716526	2	0161
+u2240	291272,728178,203888	3	0157
+sqrt	873816,41942,1006634	1	0160
+u2210	786434,716526	2	0161
 gr	873816,716526	2	0162
----	436909,728178,203890,116509	3	0163
----	699053,582544	2	0164
----	699053,582544	2	0165
----	815562,666864,142576	3	0166
----	815562,666864,142576	3	0167
+is	436909,728178,203890,116509	3	0163
+u2294	699053,582544	2	0164
+u2293	699053,582544	2	0165
+u2291	815562,666864,142576	3	0166
+u2292	815562,666864,142576	3	0167
 sc	466037,728178,203890	3	0170
 dg	466035,728178,203890	3	0171
 dd	466035,728178,203890	3	0172
 ps	640798,728178,203890	3	0173
 CL	815562,728178,135926	3	0174
-DI	815562,728178,135926	3	0175
-HE	815562,728178,135926	3	0176
+u2662	815562,728178,135926	3	0175
+u2661	815562,728178,135926	3	0176
 SP	815562,728178,135926	3	0177
diff --git a/contrib/groff/font/devdvi/SC b/contrib/groff/font/devdvi/SC
new file mode 100644
index 0000000..43497b2
--- /dev/null
+++ b/contrib/groff/font/devdvi/SC
@@ -0,0 +1,137 @@
+name SC
+special
+internalname cmtex10
+spacewidth 550498
+checksum -538297224
+designsize 10485760
+charset
+pc	550498,534482,-106315	2	0000
+md	"
+da	550498,640797	2	0001
+*a	550498,451470	0	0002
+*b	550498,640797,233018	3	0003
+AN	550498,512640	2	0004
+tno	550498,451470	0	0005
+no	"
+mo	550498,582542,-58254	2	0006
+*p	550498,451470	0	0007
+*l	550498,640797	2	0010
+*g	550498,451470,233018	1	0011
+*d	550498,640797	2	0012
+ua	550498,640797	2	0013
+pm	550498,556326,-84470	2	0014
+c+	550498,556326,-84470	2	0015
+if	550498,451470	0	0016
+pd	550498,640797	2	0017
+sb	550498,582542,-58254	2	0020
+sp	550498,582542,-58254	2	0021
+ca	550498,512640	2	0022
+cu	550498,512640	2	0023
+fa	550498,640797	2	0024
+te	550498,640797	2	0025
+c*	550498,556326,-84470	2	0026
+u21C6	550498,628053,-12744	2	0027
+<-	550498,435813,-204984	0	0030
+->	550498,435813,-204984	0	0031
+!=	550498,672827,32030	3	0032
+u22C4	550498,534482,-106315	2	0033
+<=	550498,661547,20750	3	0034
+>=	550498,661547,20750	3	0035
+==	550498,514818,-125979	2	0036
+OR	550498,512640	2	0037
+---	550498	0	0040
+---	550498,640797	2	0041
+---	550498,640797	2	0042
+---	550498,640797	2	0043
+---	550498,728178,87381	3	0044
+---	550498,728178,87381	3	0045
+---	550498,640797	2	0046
+---	550498,640797	2	0047
+---	550498,728178,87379	3	0050
+---	550498,728178,87379	3	0051
+---	550498,546134	2	0052
+---	550498,556326,-84470	2	0053
+---	550498,131072,145635	1	0054
+---	550498,556326,-84470	2	0055
+---	550498,131072	0	0056
+---	550498,728178,87379	3	0057
+---	550498,640797	2	0060
+---	550498,640797	2	0061
+---	550498,640797	2	0062
+---	550498,640797	2	0063
+---	550498,640797	2	0064
+---	550498,640797	2	0065
+---	550498,640797	2	0066
+---	550498,640797	2	0067
+---	550498,640797	2	0070
+---	550498,640797	2	0071
+---	550498,451470	0	0072
+---	550498,451470,145635	1	0073
+---	550498,582542,-58254	2	0074
+---	550498,435813,-204984	0	0075
+---	550498,582542,-58254	2	0076
+---	550498,640797	2	0077
+---	550498,640797	2	0100
+---	550498,640797	2	0101
+---	550498,640797	2	0102
+---	550498,640797	2	0103
+---	550498,640797	2	0104
+---	550498,640797	2	0105
+---	550498,640797	2	0106
+---	550498,640797	2	0107
+---	550498,640797	2	0110
+---	550498,640797	2	0111
+---	550498,640797	2	0112
+---	550498,640797	2	0113
+---	550498,640797	2	0114
+---	550498,640797	2	0115
+---	550498,640797	2	0116
+---	550498,640797	2	0117
+---	550498,640797	2	0120
+---	550498,640797,145635	3	0121
+---	550498,640797	2	0122
+---	550498,640797	2	0123
+---	550498,640797	2	0124
+---	550498,640797	2	0125
+---	550498,640797	2	0126
+---	550498,640797	2	0127
+---	550498,640797	2	0130
+---	550498,640797	2	0131
+---	550498,640797	2	0132
+---	550498,728178,87379	3	0133
+---	550498,728178,87379	3	0134
+---	550498,728178,87379	3	0135
+---	550498,640797	2	0136
+---	550498,0,99757	1	0137
+---	550498,640797	2	0140
+---	550498,451470	0	0141
+---	550498,640797	2	0142
+---	550498,451470	0	0143
+---	550498,640797	2	0144
+---	550498,451470	0	0145
+---	550498,640797	2	0146
+---	550498,451470,233018	1	0147
+---	550498,640797	2	0150
+---	550498,640797	2	0151
+---	550498,640797,233018	3	0152
+---	550498,640797	2	0153
+---	550498,640797	2	0154
+---	550498,451470	0	0155
+---	550498,451470	0	0156
+---	550498,451470	0	0157
+---	550498,451470,233018	1	0160
+---	550498,451470,233018	1	0161
+---	550498,451470	0	0162
+---	550498,451470	0	0163
+---	550498,580466	2	0164
+---	550498,451470	0	0165
+---	550498,451470	0	0166
+---	550498,451470	0	0167
+---	550498,451470	0	0170
+---	550498,451470,233018	1	0171
+---	550498,451470	0	0172
+---	550498,728178,87379	3	0173
+---	550498,728178,87379	3	0174
+---	550498,728178,87379	3	0175
+---	550498,640797	2	0176
+is	550498,640797,233018	3	0177
diff --git a/contrib/groff/font/devdvi/TB b/contrib/groff/font/devdvi/TB
index 92b231a..581840a 100644
--- a/contrib/groff/font/devdvi/TB
+++ b/contrib/groff/font/devdvi/TB
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TB
 internalname cmbx10
@@ -8,8 +8,8 @@ ligatures ff fi fl ffi ffl 0
 checksum 452076118
 designsize 10485760
 kernpairs
-ff ' 114323
 ff cq 114323
+ff ' 114323
 ff ? 114323
 ff ! 114323
 ff ) 114323
@@ -19,10 +19,12 @@ ff ] 114323
 ' cq -100488
 cq ' -100488
 cq cq -100488
-' ? 133984
+slash@for@l l -334960
+slash@for@l L -396128
 cq ? 133984
-' ! 133984
+' ? 133984
 cq ! 133984
+' ! 133984
 A t -33496
 A C -33496
 A O -33496
@@ -135,8 +137,8 @@ b y -33496
 b w -33496
 c h -33496
 c k -33496
-f ' 114323
 f cq 114323
+f ' 114323
 f ? 114323
 f ! 114323
 f ) 114323
@@ -236,7 +238,7 @@ oe	937888,466034	0	0033
 AE	1092261,719440	2	0035
 OE	1226245,719440	2	0036
 /O	937888,770413,50973	3	0037
----	334960,466034	0	0040
+slash@for@l	334960,466034	0	0040
 !	367000,728178	2	0041
 rq	632056,728178	2	0042
 sh	1004880,728178,203888	3	0043
diff --git a/contrib/groff/font/devdvi/TBEC b/contrib/groff/font/devdvi/TBEC
index ad3cf55..7ee1a69 100644
--- a/contrib/groff/font/devdvi/TBEC
+++ b/contrib/groff/font/devdvi/TBEC
@@ -9,6 +9,7 @@ bq Bq 133952
 bq j 133952
 bq .j 133952
 bq g 66976
+bq u0067_0306 66976
 bq y 66976
 bq :y 66976
 bq 'y 66976
@@ -20,6 +21,7 @@ bq Y -100464
 bq :Y -100464
 bq 'Y -100464
 bq O -33488
+bq u004F_030B -33488
 bq `O -33488
 bq 'O -33488
 bq ^O -33488
@@ -30,6 +32,8 @@ bq /O -33488
 bq C -33488
 bq G -33488
 bq 'C -33488
+bq u0043_030C -33488
+bq u0047_0306 -33488
 bq ,C -33488
 bq Q -33488
 lq oq 133952
@@ -44,6 +48,7 @@ Bq Bq 133952
 Bq j 133952
 Bq .j 133952
 Bq g 66976
+Bq u0067_0306 66976
 Bq y 66976
 Bq :y 66976
 Bq 'y 66976
@@ -55,6 +60,7 @@ Bq Y -100464
 Bq :Y -100464
 Bq 'Y -100464
 Bq O -33488
+Bq u004F_030B -33488
 Bq `O -33488
 Bq 'O -33488
 Bq ^O -33488
@@ -65,6 +71,8 @@ Bq /O -33488
 Bq C -33488
 Bq G -33488
 Bq 'C -33488
+Bq u0043_030C -33488
+Bq u0047_0306 -33488
 Bq ,C -33488
 Bq Q -33488
 Fc . -100464
@@ -76,6 +84,7 @@ ff ` 114296
 ff lq 114296
 ff rq 114296
 ff ? 114296
+ff u01C3 114296
 ff ! 114296
 ff ) 114296
 ff rB 114296
@@ -84,7 +93,9 @@ cq rq 133952
 ' rq 133952
 cq ? 133952
 ' ? 133952
+cq u01C3 133952
 cq ! 133952
+' u01C3 133952
 ' ! 133952
 A y -100464
 A :y -100464
@@ -93,15 +104,21 @@ A v -133952
 A w -100464
 A c -33488
 A 'c -33488
+A u0063_030C -33488
 A ,c -33488
 A d -33488
+A u0064_030C -33488
+A u0111 -33488
 A Sd -33488
 A e -33488
+A u0065_030C -33488
+A u0065_0328 -33488
 A `e -33488
 A 'e -33488
 A ^e -33488
 A :e -33488
 A o -33488
+A u006F_030B -33488
 A `o -33488
 A 'o -33488
 A ^o -33488
@@ -111,12 +128,17 @@ A oe -33488
 A /o -33488
 A q -33488
 A t -33488
+A u0074_030C -33488
+A u0074_0327 -33488
 A C -33488
 A G -33488
 A 'C -33488
+A u0043_030C -33488
+A u0047_0306 -33488
 A ,C -33488
 A Q -33488
 A O -33488
+A u004F_030B -33488
 A `O -33488
 A 'O -33488
 A ^O -33488
@@ -125,11 +147,15 @@ A :O -33488
 A OE -33488
 A /O -33488
 A U -33488
+A u0055_030B -33488
+A u0055_030A -33488
 A `U -33488
 A 'U -33488
 A ^U -33488
 A :U -33488
 A T -100464
+A u0054_030C -100464
+A u0054_0327 -100464
 A Y -100464
 A :Y -100464
 A 'Y -100464
@@ -138,6 +164,8 @@ A W -133952
 D X -33488
 D W -33488
 D A -33488
+D u0041_0306 -33488
+D u0041_0328 -33488
 D `A -33488
 D 'A -33488
 D ^A -33488
@@ -168,6 +196,8 @@ F z -100464
 F ae -100464
 F /o -100464
 F A -133952
+F u0041_0306 -133952
+F u0041_0328 -133952
 F `A -133952
 F 'A -133952
 F ^A -133952
@@ -176,6 +206,7 @@ F :A -133952
 F oA -133952
 F AE -133952
 F O -33488
+F u004F_030B -33488
 F `O -33488
 F 'O -33488
 F ^O -33488
@@ -186,12 +217,15 @@ F /O -33488
 F C -33488
 F G -33488
 F 'C -33488
+F u0043_030C -33488
+F u0047_0306 -33488
 F ,C -33488
 F Q -33488
 I I 33488
 K v -100464
 K w -33488
 K o -33488
+K u006F_030B -33488
 K `o -33488
 K 'o -33488
 K ^o -33488
@@ -202,9 +236,13 @@ K /o -33488
 K C -33488
 K G -33488
 K 'C -33488
+K u0043_030C -33488
+K u0047_0306 -33488
 K ,C -33488
 K Q -33488
 L T -100464
+L u0054_030C -100464
+L u0054_0327 -100464
 L Y -100464
 L :Y -100464
 L 'Y -100464
@@ -213,6 +251,8 @@ L W -133952
 O X -33488
 O W -33488
 O A -33488
+O u0041_0306 -33488
+O u0041_0328 -33488
 O `A -33488
 O 'A -33488
 O ^A -33488
@@ -225,6 +265,8 @@ O Y -33488
 O :Y -33488
 O 'Y -33488
 P A -100464
+P u0041_0306 -100464
+P u0041_0328 -100464
 P `A -100464
 P 'A -100464
 P ^A -100464
@@ -233,6 +275,7 @@ P :A -100464
 P oA -100464
 P AE -100464
 P o -33488
+P u006F_030B -33488
 P `o -33488
 P 'o -33488
 P ^o -33488
@@ -241,11 +284,15 @@ P :o -33488
 P oe -33488
 P /o -33488
 P e -33488
+P u0065_030C -33488
+P u0065_0328 -33488
 P `e -33488
 P 'e -33488
 P ^e -33488
 P :e -33488
 P a -33488
+P u0061_0306 -33488
+P u0061_0328 -33488
 P `a -33488
 P 'a -33488
 P ^a -33488
@@ -257,12 +304,17 @@ P ae -33488
 P . -100464
 P , -100464
 R t -33488
+R u0074_030C -33488
+R u0074_0327 -33488
 R C -33488
 R G -33488
 R 'C -33488
+R u0043_030C -33488
+R u0047_0306 -33488
 R ,C -33488
 R Q -33488
 R O -33488
+R u004F_030B -33488
 R `O -33488
 R 'O -33488
 R ^O -33488
@@ -271,11 +323,15 @@ R :O -33488
 R OE -33488
 R /O -33488
 R U -33488
+R u0055_030B -33488
+R u0055_030A -33488
 R `U -33488
 R 'U -33488
 R ^U -33488
 R :U -33488
 R T -100464
+R u0054_030C -100464
+R u0054_0327 -100464
 R Y -100464
 R :Y -100464
 R 'Y -100464
@@ -299,6 +355,8 @@ T w -100464
 T x -100464
 T z -100464
 T A -100464
+T u0041_0306 -100464
+T u0041_0328 -100464
 T `A -100464
 T 'A -100464
 T ^A -100464
@@ -325,6 +383,8 @@ V z -100464
 V ae -100464
 V /o -100464
 V A -133952
+V u0041_0306 -133952
+V u0041_0328 -133952
 V `A -133952
 V 'A -133952
 V ^A -133952
@@ -333,6 +393,7 @@ V :A -133952
 V oA -133952
 V AE -133952
 V O -33488
+V u004F_030B -33488
 V `O -33488
 V 'O -33488
 V ^O -33488
@@ -343,6 +404,8 @@ V /O -33488
 V C -33488
 V G -33488
 V 'C -33488
+V u0043_030C -33488
+V u0047_0306 -33488
 V ,C -33488
 V Q -33488
 W o -100464
@@ -364,6 +427,8 @@ W z -100464
 W ae -100464
 W /o -100464
 W A -133952
+W u0041_0306 -133952
+W u0041_0328 -133952
 W `A -133952
 W 'A -133952
 W ^A -133952
@@ -372,6 +437,7 @@ W :A -133952
 W oA -133952
 W AE -133952
 W O -33488
+W u004F_030B -33488
 W `O -33488
 W 'O -33488
 W ^O -33488
@@ -382,9 +448,12 @@ W /O -33488
 W C -33488
 W G -33488
 W 'C -33488
+W u0043_030C -33488
+W u0047_0306 -33488
 W ,C -33488
 W Q -33488
 X O -33488
+X u004F_030B -33488
 X `O -33488
 X 'O -33488
 X ^O -33488
@@ -395,6 +464,8 @@ X /O -33488
 X C -33488
 X G -33488
 X 'C -33488
+X u0043_030C -33488
+X u0047_0306 -33488
 X ,C -33488
 X Q -33488
 Y e -100464
@@ -414,6 +485,8 @@ Y w -100464
 Y x -100464
 Y z -100464
 Y A -100464
+Y u0041_0306 -100464
+Y u0041_0328 -100464
 Y `A -100464
 Y 'A -100464
 Y ^A -100464
@@ -425,7 +498,9 @@ oq lq 133952
 ` lq 133952
 oq ? 133952
 ` ? 133952
+oq u01C3 133952
 oq ! 133952
+` u01C3 133952
 ` ! 133952
 a v -33488
 a j 66976
@@ -434,11 +509,14 @@ a :y -33488
 a 'y -33488
 a w -33488
 b e 33488
+b u0065_030C 33488
+b u0065_0328 33488
 b `e 33488
 b 'e 33488
 b ^e 33488
 b :e 33488
 b o 33488
+b u006F_030B 33488
 b `o 33488
 b 'o 33488
 b ^o 33488
@@ -450,6 +528,7 @@ b x -33488
 b d 33488
 b c 33488
 b 'c 33488
+b u0063_030C 33488
 b ,c 33488
 b q 33488
 b v -33488
@@ -468,6 +547,7 @@ f ` 114296
 f lq 114296
 f rq 114296
 f ? 114296
+f u01C3 114296
 f ! 114296
 f ) 114296
 f rB 114296
@@ -477,6 +557,8 @@ h W -100464
 h V -100464
 h t -33488
 h u -33488
+h u0075_030B -33488
+h u0075_030A -33488
 h `u -33488
 h 'u -33488
 h ^u -33488
@@ -488,6 +570,8 @@ h w -33488
 k W -100464
 k V -100464
 k a -66976
+k u0061_0306 -66976
+k u0061_0328 -66976
 k `a -66976
 k 'a -66976
 k ^a -66976
@@ -497,11 +581,15 @@ k :a -66976
 k oa -66976
 k ae -66976
 k e -33488
+k u0065_030C -33488
+k u0065_0328 -33488
 k `e -33488
 k 'e -33488
 k ^e -33488
 k :e -33488
 k a -33488
+k u0061_0306 -33488
+k u0061_0328 -33488
 k `a -33488
 k 'a -33488
 k ^a -33488
@@ -511,6 +599,7 @@ k :a -33488
 k oa -33488
 k ae -33488
 k o -33488
+k u006F_030B -33488
 k `o -33488
 k 'o -33488
 k ^o -33488
@@ -520,11 +609,14 @@ k oe -33488
 k /o -33488
 k c -33488
 k 'c -33488
+k u0063_030C -33488
 k ,c -33488
 m W -100464
 m V -100464
 m t -33488
 m u -33488
+m u0075_030B -33488
+m u0075_030A -33488
 m `u -33488
 m 'u -33488
 m ^u -33488
@@ -537,6 +629,8 @@ n W -100464
 n V -100464
 n t -33488
 n u -33488
+n u0075_030B -33488
+n u0075_030A -33488
 n `u -33488
 n 'u -33488
 n ^u -33488
@@ -546,11 +640,14 @@ n y -33488
 n v -33488
 n w -33488
 o e 33488
+o u0065_030C 33488
+o u0065_0328 33488
 o `e 33488
 o 'e 33488
 o ^e 33488
 o :e 33488
 o o 33488
+o u006F_030B 33488
 o `o 33488
 o 'o 33488
 o ^o 33488
@@ -562,6 +659,7 @@ o x -33488
 o d 33488
 o c 33488
 o 'c 33488
+o u0063_030C 33488
 o ,c 33488
 o q 33488
 o v -33488
@@ -571,11 +669,14 @@ o :y -33488
 o 'y -33488
 o w -33488
 p e 33488
+p u0065_030C 33488
+p u0065_0328 33488
 p `e 33488
 p 'e 33488
 p ^e 33488
 p :e 33488
 p o 33488
+p u006F_030B 33488
 p `o 33488
 p 'o 33488
 p ^o 33488
@@ -587,6 +688,7 @@ p x -33488
 p d 33488
 p c 33488
 p 'c 33488
+p u0063_030C 33488
 p ,c 33488
 p q 33488
 p v -33488
@@ -601,6 +703,8 @@ t 'y -33488
 t w -33488
 u w -33488
 v a -66976
+v u0061_0306 -66976
+v u0061_0328 -66976
 v `a -66976
 v 'a -66976
 v ^a -66976
@@ -610,11 +714,15 @@ v :a -66976
 v oa -66976
 v ae -66976
 v e -33488
+v u0065_030C -33488
+v u0065_0328 -33488
 v `e -33488
 v 'e -33488
 v ^e -33488
 v :e -33488
 v a -33488
+v u0061_0306 -33488
+v u0061_0328 -33488
 v `a -33488
 v 'a -33488
 v ^a -33488
@@ -624,6 +732,7 @@ v :a -33488
 v oa -33488
 v ae -33488
 v o -33488
+v u006F_030B -33488
 v `o -33488
 v 'o -33488
 v ^o -33488
@@ -633,13 +742,18 @@ v oe -33488
 v /o -33488
 v c -33488
 v 'c -33488
+v u0063_030C -33488
 v ,c -33488
 w e -33488
+w u0065_030C -33488
+w u0065_0328 -33488
 w `e -33488
 w 'e -33488
 w ^e -33488
 w :e -33488
 w a -33488
+w u0061_0306 -33488
+w u0061_0328 -33488
 w `a -33488
 w 'a -33488
 w ^a -33488
@@ -649,6 +763,7 @@ w :a -33488
 w oa -33488
 w ae -33488
 w o -33488
+w u006F_030B -33488
 w `o -33488
 w 'o -33488
 w ^o -33488
@@ -658,8 +773,10 @@ w oe -33488
 w /o -33488
 w c -33488
 w 'c -33488
+w u0063_030C -33488
 w ,c -33488
 y o -33488
+y u006F_030B -33488
 y `o -33488
 y 'o -33488
 y ^o -33488
@@ -668,11 +785,15 @@ y :o -33488
 y oe -33488
 y /o -33488
 y e -33488
+y u0065_030C -33488
+y u0065_0328 -33488
 y `e -33488
 y 'e -33488
 y ^e -33488
 y :e -33488
 y a -33488
+y u0061_0306 -33488
+y u0061_0328 -33488
 y `a -33488
 y 'a -33488
 y ^a -33488
@@ -683,19 +804,89 @@ y oa -33488
 y ae -33488
 y . -100464
 y , -100464
+u0041_0306 y -100464
+u0041_0306 :y -100464
+u0041_0306 'y -100464
+u0041_0306 v -133952
+u0041_0306 w -100464
+u0041_0306 c -33488
+u0041_0306 'c -33488
+u0041_0306 u0063_030C -33488
+u0041_0306 ,c -33488
+u0041_0306 d -33488
+u0041_0306 u0064_030C -33488
+u0041_0306 u0111 -33488
+u0041_0306 Sd -33488
+u0041_0306 e -33488
+u0041_0306 u0065_030C -33488
+u0041_0306 u0065_0328 -33488
+u0041_0306 `e -33488
+u0041_0306 'e -33488
+u0041_0306 ^e -33488
+u0041_0306 :e -33488
+u0041_0306 o -33488
+u0041_0306 u006F_030B -33488
+u0041_0306 `o -33488
+u0041_0306 'o -33488
+u0041_0306 ^o -33488
+u0041_0306 ~o -33488
+u0041_0306 :o -33488
+u0041_0306 oe -33488
+u0041_0306 /o -33488
+u0041_0306 q -33488
+u0041_0306 t -33488
+u0041_0306 u0074_030C -33488
+u0041_0306 u0074_0327 -33488
+u0041_0306 C -33488
+u0041_0306 G -33488
+u0041_0306 'C -33488
+u0041_0306 u0043_030C -33488
+u0041_0306 u0047_0306 -33488
+u0041_0306 ,C -33488
+u0041_0306 Q -33488
+u0041_0306 O -33488
+u0041_0306 u004F_030B -33488
+u0041_0306 `O -33488
+u0041_0306 'O -33488
+u0041_0306 ^O -33488
+u0041_0306 ~O -33488
+u0041_0306 :O -33488
+u0041_0306 OE -33488
+u0041_0306 /O -33488
+u0041_0306 U -33488
+u0041_0306 u0055_030B -33488
+u0041_0306 u0055_030A -33488
+u0041_0306 `U -33488
+u0041_0306 'U -33488
+u0041_0306 ^U -33488
+u0041_0306 :U -33488
+u0041_0306 T -100464
+u0041_0306 u0054_030C -100464
+u0041_0306 u0054_0327 -100464
+u0041_0306 Y -100464
+u0041_0306 :Y -100464
+u0041_0306 'Y -100464
+u0041_0306 V -133952
+u0041_0306 W -133952
 'C v -133952
 'C w -100464
 'C c -33488
 'C 'c -33488
+'C u0063_030C -33488
 'C ,c -33488
 'C d -33488
+'C u0064_030C -33488
+'C u0111 -33488
 'C Sd -33488
 'C e -33488
+'C u0065_030C -33488
+'C u0065_0328 -33488
 'C `e -33488
 'C 'e -33488
 'C ^e -33488
 'C :e -33488
 'C o -33488
+'C u006F_030B -33488
 'C `o -33488
 'C 'o -33488
 'C ^o -33488
@@ -705,12 +896,17 @@ y , -100464
 'C /o -33488
 'C q -33488
 'C t -33488
+'C u0074_030C -33488
+'C u0074_0327 -33488
 'C C -33488
 'C G -33488
 'C 'C -33488
+'C u0043_030C -33488
+'C u0047_0306 -33488
 'C ,C -33488
 'C Q -33488
 'C O -33488
+'C u004F_030B -33488
 'C `O -33488
 'C 'O -33488
 'C ^O -33488
@@ -719,22 +915,164 @@ y , -100464
 'C OE -33488
 'C /O -33488
 'C U -33488
+'C u0055_030B -33488
+'C u0055_030A -33488
 'C `U -33488
 'C 'U -33488
 'C ^U -33488
 'C :U -33488
 'C T -100464
+'C u0054_030C -100464
+'C u0054_0327 -100464
 'C Y -100464
 'C :Y -100464
 'C 'Y -100464
 'C V -133952
 'C W -133952
+u0044_030C X -33488
+u0044_030C W -33488
+u0044_030C A -33488
+u0044_030C u0041_0306 -33488
+u0044_030C u0041_0328 -33488
+u0044_030C `A -33488
+u0044_030C 'A -33488
+u0044_030C ^A -33488
+u0044_030C ~A -33488
+u0044_030C :A -33488
+u0044_030C oA -33488
+u0044_030C AE -33488
+u0044_030C V -33488
+u0044_030C Y -33488
+u0044_030C :Y -33488
+u0044_030C 'Y -33488
+u004C_0301 T -100464
+u004C_0301 u0054_030C -100464
+u004C_0301 u0054_0327 -100464
+u004C_0301 Y -100464
+u004C_0301 :Y -100464
+u004C_0301 'Y -100464
+u004C_0301 V -133952
+u004C_0301 W -133952
+u004C_030C T -100464
+u004C_030C u0054_030C -100464
+u004C_030C u0054_0327 -100464
+u004C_030C Y -100464
+u004C_030C :Y -100464
+u004C_030C 'Y -100464
+u004C_030C V -133952
+u004C_030C W -133952
 /L T -100464
+/L u0054_030C -100464
+/L u0054_0327 -100464
 /L Y -100464
 /L :Y -100464
 /L 'Y -100464
 /L V -133952
 /L W -133952
+u004F_030B X -33488
+u004F_030B W -33488
+u004F_030B A -33488
+u004F_030B u0041_0306 -33488
+u004F_030B u0041_0328 -33488
+u004F_030B `A -33488
+u004F_030B 'A -33488
+u004F_030B ^A -33488
+u004F_030B ~A -33488
+u004F_030B :A -33488
+u004F_030B oA -33488
+u004F_030B AE -33488
+u004F_030B V -33488
+u004F_030B Y -33488
+u004F_030B :Y -33488
+u004F_030B 'Y -33488
+u0052_0301 t -33488
+u0052_0301 u0074_030C -33488
+u0052_0301 u0074_0327 -33488
+u0052_0301 C -33488
+u0052_0301 G -33488
+u0052_0301 'C -33488
+u0052_0301 u0043_030C -33488
+u0052_0301 u0047_0306 -33488
+u0052_0301 ,C -33488
+u0052_0301 Q -33488
+u0052_0301 O -33488
+u0052_0301 u004F_030B -33488
+u0052_0301 `O -33488
+u0052_0301 'O -33488
+u0052_0301 ^O -33488
+u0052_0301 ~O -33488
+u0052_0301 :O -33488
+u0052_0301 OE -33488
+u0052_0301 /O -33488
+u0052_0301 U -33488
+u0052_0301 u0055_030B -33488
+u0052_0301 u0055_030A -33488
+u0052_0301 `U -33488
+u0052_0301 'U -33488
+u0052_0301 ^U -33488
+u0052_0301 :U -33488
+u0052_0301 T -100464
+u0052_0301 u0054_030C -100464
+u0052_0301 u0054_0327 -100464
+u0052_0301 Y -100464
+u0052_0301 :Y -100464
+u0052_0301 'Y -100464
+u0052_0301 V -133952
+u0052_0301 W -133952
+u0054_030C y -33488
+u0054_030C e -100464
+u0054_030C o -100464
+u0054_030C r -100464
+u0054_030C a -100464
+u0054_030C u -100464
+u0054_030C n -100464
+u0054_030C .i -100464
+u0054_030C c -100464
+u0054_030C d -100464
+u0054_030C g -100464
+u0054_030C p -100464
+u0054_030C s -100464
+u0054_030C v -100464
+u0054_030C w -100464
+u0054_030C x -100464
+u0054_030C z -100464
+u0054_030C A -100464
+u0054_030C u0041_0306 -100464
+u0054_030C u0041_0328 -100464
+u0054_030C `A -100464
+u0054_030C 'A -100464
+u0054_030C ^A -100464
+u0054_030C ~A -100464
+u0054_030C :A -100464
+u0054_030C oA -100464
+u0054_030C AE -100464
+u0054_0327 y -33488
+u0054_0327 e -100464
+u0054_0327 o -100464
+u0054_0327 r -100464
+u0054_0327 a -100464
+u0054_0327 u -100464
+u0054_0327 n -100464
+u0054_0327 .i -100464
+u0054_0327 c -100464
+u0054_0327 d -100464
+u0054_0327 g -100464
+u0054_0327 p -100464
+u0054_0327 s -100464
+u0054_0327 v -100464
+u0054_0327 w -100464
+u0054_0327 x -100464
+u0054_0327 z -100464
+u0054_0327 A -100464
+u0054_0327 u0041_0306 -100464
+u0054_0327 u0041_0328 -100464
+u0054_0327 `A -100464
+u0054_0327 'A -100464
+u0054_0327 ^A -100464
+u0054_0327 ~A -100464
+u0054_0327 :A -100464
+u0054_0327 oA -100464
+u0054_0327 AE -100464
 :Y e -100464
 :Y o -100464
 :Y r -100464
@@ -752,6 +1090,8 @@ y , -100464
 :Y x -100464
 :Y z -100464
 :Y A -100464
+:Y u0041_0306 -100464
+:Y u0041_0328 -100464
 :Y `A -100464
 :Y 'A -100464
 :Y ^A -100464
@@ -759,11 +1099,98 @@ y , -100464
 :Y :A -100464
 :Y oA -100464
 :Y AE -100464
+u0061_0306 v -33488
+u0061_0306 j 66976
+u0061_0306 y -33488
+u0061_0306 :y -33488
+u0061_0306 'y -33488
+u0061_0306 w -33488
+u0061_0328 g 33488
+u0061_0328 p 33488
+u0061_0328 w -33488
 'c h -33488
 'c k -33488
+u0063_030C h -33488
+u0063_030C k -33488
 /l cq 33488
 /l ' 33488
+u006E_0301 t -33488
+u006E_0301 u -33488
+u006E_0301 u0075_030B -33488
+u006E_0301 u0075_030A -33488
+u006E_0301 `u -33488
+u006E_0301 'u -33488
+u006E_0301 ^u -33488
+u006E_0301 :u -33488
+u006E_0301 b -33488
+u006E_0301 y -33488
+u006E_0301 v -33488
+u006E_0301 w -33488
+u006E_030C t -33488
+u006E_030C u -33488
+u006E_030C u0075_030B -33488
+u006E_030C u0075_030A -33488
+u006E_030C `u -33488
+u006E_030C 'u -33488
+u006E_030C ^u -33488
+u006E_030C :u -33488
+u006E_030C b -33488
+u006E_030C y -33488
+u006E_030C v -33488
+u006E_030C w -33488
+u016A t -33488
+u016A u -33488
+u016A u0075_030B -33488
+u016A u0075_030A -33488
+u016A `u -33488
+u016A 'u -33488
+u016A ^u -33488
+u016A :u -33488
+u016A b -33488
+u016A y -33488
+u016A v -33488
+u016A w -33488
+u006F_030B e 33488
+u006F_030B u0065_030C 33488
+u006F_030B u0065_0328 33488
+u006F_030B `e 33488
+u006F_030B 'e 33488
+u006F_030B ^e 33488
+u006F_030B :e 33488
+u006F_030B o 33488
+u006F_030B u006F_030B 33488
+u006F_030B `o 33488
+u006F_030B 'o 33488
+u006F_030B ^o 33488
+u006F_030B ~o 33488
+u006F_030B :o 33488
+u006F_030B oe 33488
+u006F_030B /o 33488
+u006F_030B x -33488
+u006F_030B d 33488
+u006F_030B c 33488
+u006F_030B 'c 33488
+u006F_030B u0063_030C 33488
+u006F_030B ,c 33488
+u006F_030B q 33488
+u006F_030B v -33488
+u006F_030B j 66976
+u006F_030B y -33488
+u006F_030B :y -33488
+u006F_030B 'y -33488
+u006F_030B w -33488
+u0074_030C y -33488
+u0074_030C :y -33488
+u0074_030C 'y -33488
+u0074_030C w -33488
+u0074_0327 y -33488
+u0074_0327 :y -33488
+u0074_0327 'y -33488
+u0074_0327 w -33488
+u0075_030B w -33488
+u0075_030A w -33488
 :y o -33488
+:y u006F_030B -33488
 :y `o -33488
 :y 'o -33488
 :y ^o -33488
@@ -772,11 +1199,15 @@ y , -100464
 :y oe -33488
 :y /o -33488
 :y e -33488
+:y u0065_030C -33488
+:y u0065_0328 -33488
 :y `e -33488
 :y 'e -33488
 :y ^e -33488
 :y :e -33488
 :y a -33488
+:y u0061_0306 -33488
+:y u0061_0328 -33488
 :y `a -33488
 :y 'a -33488
 :y ^a -33488
@@ -794,15 +1225,21 @@ y , -100464
 `A w -100464
 `A c -33488
 `A 'c -33488
+`A u0063_030C -33488
 `A ,c -33488
 `A d -33488
+`A u0064_030C -33488
+`A u0111 -33488
 `A Sd -33488
 `A e -33488
+`A u0065_030C -33488
+`A u0065_0328 -33488
 `A `e -33488
 `A 'e -33488
 `A ^e -33488
 `A :e -33488
 `A o -33488
+`A u006F_030B -33488
 `A `o -33488
 `A 'o -33488
 `A ^o -33488
@@ -812,12 +1249,17 @@ y , -100464
 `A /o -33488
 `A q -33488
 `A t -33488
+`A u0074_030C -33488
+`A u0074_0327 -33488
 `A C -33488
 `A G -33488
 `A 'C -33488
+`A u0043_030C -33488
+`A u0047_0306 -33488
 `A ,C -33488
 `A Q -33488
 `A O -33488
+`A u004F_030B -33488
 `A `O -33488
 `A 'O -33488
 `A ^O -33488
@@ -826,11 +1268,15 @@ y , -100464
 `A OE -33488
 `A /O -33488
 `A U -33488
+`A u0055_030B -33488
+`A u0055_030A -33488
 `A `U -33488
 `A 'U -33488
 `A ^U -33488
 `A :U -33488
 `A T -100464
+`A u0054_030C -100464
+`A u0054_0327 -100464
 `A Y -100464
 `A :Y -100464
 `A 'Y -100464
@@ -843,15 +1289,21 @@ y , -100464
 'A w -100464
 'A c -33488
 'A 'c -33488
+'A u0063_030C -33488
 'A ,c -33488
 'A d -33488
+'A u0064_030C -33488
+'A u0111 -33488
 'A Sd -33488
 'A e -33488
+'A u0065_030C -33488
+'A u0065_0328 -33488
 'A `e -33488
 'A 'e -33488
 'A ^e -33488
 'A :e -33488
 'A o -33488
+'A u006F_030B -33488
 'A `o -33488
 'A 'o -33488
 'A ^o -33488
@@ -861,12 +1313,17 @@ y , -100464
 'A /o -33488
 'A q -33488
 'A t -33488
+'A u0074_030C -33488
+'A u0074_0327 -33488
 'A C -33488
 'A G -33488
 'A 'C -33488
+'A u0043_030C -33488
+'A u0047_0306 -33488
 'A ,C -33488
 'A Q -33488
 'A O -33488
+'A u004F_030B -33488
 'A `O -33488
 'A 'O -33488
 'A ^O -33488
@@ -875,11 +1332,15 @@ y , -100464
 'A OE -33488
 'A /O -33488
 'A U -33488
+'A u0055_030B -33488
+'A u0055_030A -33488
 'A `U -33488
 'A 'U -33488
 'A ^U -33488
 'A :U -33488
 'A T -100464
+'A u0054_030C -100464
+'A u0054_0327 -100464
 'A Y -100464
 'A :Y -100464
 'A 'Y -100464
@@ -892,15 +1353,21 @@ y , -100464
 ^A w -100464
 ^A c -33488
 ^A 'c -33488
+^A u0063_030C -33488
 ^A ,c -33488
 ^A d -33488
+^A u0064_030C -33488
+^A u0111 -33488
 ^A Sd -33488
 ^A e -33488
+^A u0065_030C -33488
+^A u0065_0328 -33488
 ^A `e -33488
 ^A 'e -33488
 ^A ^e -33488
 ^A :e -33488
 ^A o -33488
+^A u006F_030B -33488
 ^A `o -33488
 ^A 'o -33488
 ^A ^o -33488
@@ -910,12 +1377,17 @@ y , -100464
 ^A /o -33488
 ^A q -33488
 ^A t -33488
+^A u0074_030C -33488
+^A u0074_0327 -33488
 ^A C -33488
 ^A G -33488
 ^A 'C -33488
+^A u0043_030C -33488
+^A u0047_0306 -33488
 ^A ,C -33488
 ^A Q -33488
 ^A O -33488
+^A u004F_030B -33488
 ^A `O -33488
 ^A 'O -33488
 ^A ^O -33488
@@ -924,11 +1396,15 @@ y , -100464
 ^A OE -33488
 ^A /O -33488
 ^A U -33488
+^A u0055_030B -33488
+^A u0055_030A -33488
 ^A `U -33488
 ^A 'U -33488
 ^A ^U -33488
 ^A :U -33488
 ^A T -100464
+^A u0054_030C -100464
+^A u0054_0327 -100464
 ^A Y -100464
 ^A :Y -100464
 ^A 'Y -100464
@@ -941,15 +1417,21 @@ y , -100464
 ~A w -100464
 ~A c -33488
 ~A 'c -33488
+~A u0063_030C -33488
 ~A ,c -33488
 ~A d -33488
+~A u0064_030C -33488
+~A u0111 -33488
 ~A Sd -33488
 ~A e -33488
+~A u0065_030C -33488
+~A u0065_0328 -33488
 ~A `e -33488
 ~A 'e -33488
 ~A ^e -33488
 ~A :e -33488
 ~A o -33488
+~A u006F_030B -33488
 ~A `o -33488
 ~A 'o -33488
 ~A ^o -33488
@@ -959,12 +1441,17 @@ y , -100464
 ~A /o -33488
 ~A q -33488
 ~A t -33488
+~A u0074_030C -33488
+~A u0074_0327 -33488
 ~A C -33488
 ~A G -33488
 ~A 'C -33488
+~A u0043_030C -33488
+~A u0047_0306 -33488
 ~A ,C -33488
 ~A Q -33488
 ~A O -33488
+~A u004F_030B -33488
 ~A `O -33488
 ~A 'O -33488
 ~A ^O -33488
@@ -973,11 +1460,15 @@ y , -100464
 ~A OE -33488
 ~A /O -33488
 ~A U -33488
+~A u0055_030B -33488
+~A u0055_030A -33488
 ~A `U -33488
 ~A 'U -33488
 ~A ^U -33488
 ~A :U -33488
 ~A T -100464
+~A u0054_030C -100464
+~A u0054_0327 -100464
 ~A Y -100464
 ~A :Y -100464
 ~A 'Y -100464
@@ -990,15 +1481,21 @@ y , -100464
 :A w -100464
 :A c -33488
 :A 'c -33488
+:A u0063_030C -33488
 :A ,c -33488
 :A d -33488
+:A u0064_030C -33488
+:A u0111 -33488
 :A Sd -33488
 :A e -33488
+:A u0065_030C -33488
+:A u0065_0328 -33488
 :A `e -33488
 :A 'e -33488
 :A ^e -33488
 :A :e -33488
 :A o -33488
+:A u006F_030B -33488
 :A `o -33488
 :A 'o -33488
 :A ^o -33488
@@ -1008,12 +1505,17 @@ y , -100464
 :A /o -33488
 :A q -33488
 :A t -33488
+:A u0074_030C -33488
+:A u0074_0327 -33488
 :A C -33488
 :A G -33488
 :A 'C -33488
+:A u0043_030C -33488
+:A u0047_0306 -33488
 :A ,C -33488
 :A Q -33488
 :A O -33488
+:A u004F_030B -33488
 :A `O -33488
 :A 'O -33488
 :A ^O -33488
@@ -1022,11 +1524,15 @@ y , -100464
 :A OE -33488
 :A /O -33488
 :A U -33488
+:A u0055_030B -33488
+:A u0055_030A -33488
 :A `U -33488
 :A 'U -33488
 :A ^U -33488
 :A :U -33488
 :A T -100464
+:A u0054_030C -100464
+:A u0054_0327 -100464
 :A Y -100464
 :A :Y -100464
 :A 'Y -100464
@@ -1039,15 +1545,21 @@ oA v -133952
 oA w -100464
 oA c -33488
 oA 'c -33488
+oA u0063_030C -33488
 oA ,c -33488
 oA d -33488
+oA u0064_030C -33488
+oA u0111 -33488
 oA Sd -33488
 oA e -33488
+oA u0065_030C -33488
+oA u0065_0328 -33488
 oA `e -33488
 oA 'e -33488
 oA ^e -33488
 oA :e -33488
 oA o -33488
+oA u006F_030B -33488
 oA `o -33488
 oA 'o -33488
 oA ^o -33488
@@ -1057,12 +1569,17 @@ oA oe -33488
 oA /o -33488
 oA q -33488
 oA t -33488
+oA u0074_030C -33488
+oA u0074_0327 -33488
 oA C -33488
 oA G -33488
 oA 'C -33488
+oA u0043_030C -33488
+oA u0047_0306 -33488
 oA ,C -33488
 oA Q -33488
 oA O -33488
+oA u004F_030B -33488
 oA `O -33488
 oA 'O -33488
 oA ^O -33488
@@ -1071,33 +1588,73 @@ oA :O -33488
 oA OE -33488
 oA /O -33488
 oA U -33488
+oA u0055_030B -33488
+oA u0055_030A -33488
 oA `U -33488
 oA 'U -33488
 oA ^U -33488
 oA :U -33488
 oA T -100464
+oA u0054_030C -100464
+oA u0054_0327 -100464
 oA Y -100464
 oA :Y -100464
 oA 'Y -100464
 oA V -133952
 oA W -133952
+u0189 X -33488
+u0110 X -33488
 -D X -33488
+u0189 W -33488
+u0110 W -33488
 -D W -33488
+u0189 A -33488
+u0110 A -33488
 -D A -33488
+u0189 u0041_0306 -33488
+u0110 u0041_0306 -33488
+-D u0041_0306 -33488
+u0189 u0041_0328 -33488
+u0110 u0041_0328 -33488
+-D u0041_0328 -33488
+u0189 `A -33488
+u0110 `A -33488
 -D `A -33488
+u0189 'A -33488
+u0110 'A -33488
 -D 'A -33488
+u0189 ^A -33488
+u0110 ^A -33488
 -D ^A -33488
+u0189 ~A -33488
+u0110 ~A -33488
 -D ~A -33488
+u0189 :A -33488
+u0110 :A -33488
 -D :A -33488
+u0189 oA -33488
+u0110 oA -33488
 -D oA -33488
+u0189 AE -33488
+u0110 AE -33488
 -D AE -33488
+u0189 V -33488
+u0110 V -33488
 -D V -33488
+u0189 Y -33488
+u0110 Y -33488
 -D Y -33488
+u0189 :Y -33488
+u0110 :Y -33488
 -D :Y -33488
+u0189 'Y -33488
+u0110 'Y -33488
 -D 'Y -33488
 `O X -33488
 `O W -33488
 `O A -33488
+`O u0041_0306 -33488
+`O u0041_0328 -33488
 `O `A -33488
 `O 'A -33488
 `O ^A -33488
@@ -1112,6 +1669,8 @@ oA W -133952
 'O X -33488
 'O W -33488
 'O A -33488
+'O u0041_0306 -33488
+'O u0041_0328 -33488
 'O `A -33488
 'O 'A -33488
 'O ^A -33488
@@ -1126,6 +1685,8 @@ oA W -133952
 ^O X -33488
 ^O W -33488
 ^O A -33488
+^O u0041_0306 -33488
+^O u0041_0328 -33488
 ^O `A -33488
 ^O 'A -33488
 ^O ^A -33488
@@ -1140,6 +1701,8 @@ oA W -133952
 ~O X -33488
 ~O W -33488
 ~O A -33488
+~O u0041_0306 -33488
+~O u0041_0328 -33488
 ~O `A -33488
 ~O 'A -33488
 ~O ^A -33488
@@ -1154,6 +1717,8 @@ oA W -133952
 :O X -33488
 :O W -33488
 :O A -33488
+:O u0041_0306 -33488
+:O u0041_0328 -33488
 :O `A -33488
 :O 'A -33488
 :O ^A -33488
@@ -1168,6 +1733,8 @@ oA W -133952
 /O X -33488
 /O W -33488
 /O A -33488
+/O u0041_0306 -33488
+/O u0041_0328 -33488
 /O `A -33488
 /O 'A -33488
 /O ^A -33488
@@ -1196,6 +1763,8 @@ oA W -133952
 'Y x -100464
 'Y z -100464
 'Y A -100464
+'Y u0041_0306 -100464
+'Y u0041_0328 -100464
 'Y `A -100464
 'Y 'A -100464
 'Y ^A -100464
@@ -1243,6 +1812,8 @@ oa w -33488
 ,c k -33488
 ~n t -33488
 ~n u -33488
+~n u0075_030B -33488
+~n u0075_030A -33488
 ~n `u -33488
 ~n 'u -33488
 ~n ^u -33488
@@ -1252,11 +1823,14 @@ oa w -33488
 ~n v -33488
 ~n w -33488
 `o e 33488
+`o u0065_030C 33488
+`o u0065_0328 33488
 `o `e 33488
 `o 'e 33488
 `o ^e 33488
 `o :e 33488
 `o o 33488
+`o u006F_030B 33488
 `o `o 33488
 `o 'o 33488
 `o ^o 33488
@@ -1268,6 +1842,7 @@ oa w -33488
 `o d 33488
 `o c 33488
 `o 'c 33488
+`o u0063_030C 33488
 `o ,c 33488
 `o q 33488
 `o v -33488
@@ -1277,11 +1852,14 @@ oa w -33488
 `o 'y -33488
 `o w -33488
 'o e 33488
+'o u0065_030C 33488
+'o u0065_0328 33488
 'o `e 33488
 'o 'e 33488
 'o ^e 33488
 'o :e 33488
 'o o 33488
+'o u006F_030B 33488
 'o `o 33488
 'o 'o 33488
 'o ^o 33488
@@ -1293,6 +1871,7 @@ oa w -33488
 'o d 33488
 'o c 33488
 'o 'c 33488
+'o u0063_030C 33488
 'o ,c 33488
 'o q 33488
 'o v -33488
@@ -1302,11 +1881,14 @@ oa w -33488
 'o 'y -33488
 'o w -33488
 ^o e 33488
+^o u0065_030C 33488
+^o u0065_0328 33488
 ^o `e 33488
 ^o 'e 33488
 ^o ^e 33488
 ^o :e 33488
 ^o o 33488
+^o u006F_030B 33488
 ^o `o 33488
 ^o 'o 33488
 ^o ^o 33488
@@ -1318,6 +1900,7 @@ oa w -33488
 ^o d 33488
 ^o c 33488
 ^o 'c 33488
+^o u0063_030C 33488
 ^o ,c 33488
 ^o q 33488
 ^o v -33488
@@ -1327,11 +1910,14 @@ oa w -33488
 ^o 'y -33488
 ^o w -33488
 ~o e 33488
+~o u0065_030C 33488
+~o u0065_0328 33488
 ~o `e 33488
 ~o 'e 33488
 ~o ^e 33488
 ~o :e 33488
 ~o o 33488
+~o u006F_030B 33488
 ~o `o 33488
 ~o 'o 33488
 ~o ^o 33488
@@ -1343,6 +1929,7 @@ oa w -33488
 ~o d 33488
 ~o c 33488
 ~o 'c 33488
+~o u0063_030C 33488
 ~o ,c 33488
 ~o q 33488
 ~o v -33488
@@ -1352,11 +1939,14 @@ oa w -33488
 ~o 'y -33488
 ~o w -33488
 :o e 33488
+:o u0065_030C 33488
+:o u0065_0328 33488
 :o `e 33488
 :o 'e 33488
 :o ^e 33488
 :o :e 33488
 :o o 33488
+:o u006F_030B 33488
 :o `o 33488
 :o 'o 33488
 :o ^o 33488
@@ -1368,6 +1958,7 @@ oa w -33488
 :o d 33488
 :o c 33488
 :o 'c 33488
+:o u0063_030C 33488
 :o ,c 33488
 :o q 33488
 :o v -33488
@@ -1377,11 +1968,14 @@ oa w -33488
 :o 'y -33488
 :o w -33488
 /o e 33488
+/o u0065_030C 33488
+/o u0065_0328 33488
 /o `e 33488
 /o 'e 33488
 /o ^e 33488
 /o :e 33488
 /o o 33488
+/o u006F_030B 33488
 /o `o 33488
 /o 'o 33488
 /o ^o 33488
@@ -1393,6 +1987,7 @@ oa w -33488
 /o d 33488
 /o c 33488
 /o 'c 33488
+/o u0063_030C 33488
 /o ,c 33488
 /o q 33488
 /o v -33488
@@ -1406,6 +2001,7 @@ oa w -33488
 ^u w -33488
 :u w -33488
 'y o -33488
+'y u006F_030B -33488
 'y `o -33488
 'y 'o -33488
 'y ^o -33488
@@ -1414,11 +2010,15 @@ oa w -33488
 'y oe -33488
 'y /o -33488
 'y e -33488
+'y u0065_030C -33488
+'y u0065_0328 -33488
 'y `e -33488
 'y 'e -33488
 'y ^e -33488
 'y :e -33488
 'y a -33488
+'y u0061_0306 -33488
+'y u0061_0328 -33488
 'y `a -33488
 'y 'a -33488
 'y ^a -33488
@@ -1462,8 +2062,9 @@ fi	669760,723632	2	0034
 fl	669760,723632	2	0035
 Fi	1004640,723632	2	0036
 Fl	1004640,723632	2	0037
----	602784,465920,101920	1	0040
-!	366912,723632	2	0041
+u2423	602784,465920,101920	1	0040
+u01C3	366912,723632	2	0041
+!	"
 dq	602784,723632	2	0042
 "	"
 sh	1004640,723632,203840	3	0043
@@ -1477,8 +2078,7 @@ cq	334880,723632	2	0047
 (	468832,786240,262080	3	0050
 )	468832,786240,262080	3	0051
 *	602784,786240	2	0052
-pl	937664,664768,139776	3	0053
-+	"
++	937664,664768,139776	3	0053
 ,	334880,163072,203840	1	0054
 -	401856,465920	0	0055
 .	334880,163072	0	0056
@@ -1497,8 +2097,7 @@ sl	602784,786240,262080	3	0057
 :	334880,465920	0	0072
 ;	334880,465920,203840	1	0073
 <	937664,613858,89698	3	0074
-eq	937664,410018,-114142	0	0075
-=	"
+=	937664,410018,-114142	0	0075
 >	937664,613858,89698	3	0076
 ?	569296,723632	2	0077
 at	937664,723632	2	0100
@@ -1568,74 +2167,73 @@ y	636272,465920,203840,16744	1	0171
 z	535808,465920	0	0172
 lC	602784,786240,262080	3	0173
 {	"
-ba	334880,786240,262080	3	0174
-bv	"
-or	"
+u01C0	334880,786240,262080	3	0174
+ba	"
 |	"
 rC	602784,786240,262080	3	0175
 }	"
 ~	736736,723632	2	0176
 hy	200928,465920	0	0177
----	911456,937664	2	0200
----	911456,723632,203840	3	0201
+u0041_0306	911456,937664	2	0200
+u0041_0328	911456,723632,203840	3	0201
 'C	870688,918813	2	0202
----	870688,937664,0,0,-33488	2	0203
----	924560,937664,0,0,0,-33488	2	0204
----	792064,937664	2	0205
----	792064,723632,203840	3	0206
----	947856,937664,0,0,-33488	2	0207
----	725088,918813,0,0,0,66976	2	0210
----	725088,937664,0,0,0,66976	2	0211
+u0043_030C	870688,937664,0,0,-33488	2	0203
+u0044_030C	924560,937664,0,0,0,-33488	2	0204
+u0045_030C	792064,937664	2	0205
+u0045_0328	792064,723632,203840	3	0206
+u0047_0306	947856,937664,0,0,-33488	2	0207
+u004C_0301	725088,918813,0,0,0,66976	2	0210
+u004C_030C	725088,937664,0,0,0,66976	2	0211
 /L	725088,723632	2	0212
----	943488,918813	2	0213
----	943488,937664	2	0214
----	958048,723632,0,0,0,-33488	2	0215
----	905632,918813,0,0,-33488,-33488	2	0216
----	904176,918813	2	0217
----	904176,937664	2	0220
----	669760,918813	2	0221
+u004E_0301	943488,918813	2	0213
+u004E_030C	943488,937664	2	0214
+u014A	958048,723632,0,0,0,-33488	2	0215
+u004F_030B	905632,918813,0,0,-33488,-33488	2	0216
+u0052_0301	904176,918813	2	0217
+u0052_030C	904176,937664	2	0220
+u0053_0301	669760,918813	2	0221
 vS	669760,937664	2	0222
----	669760,723632,178360	3	0223
----	838656,937664,0,0,0,-167440	2	0224
----	838656,723632,178360,0,0,-167440	3	0225
----	927472,918813,0,0,-20384	2	0226
----	927472,937664,0,0,-20384	2	0227
+u0053_0327	669760,723632,178360	3	0223
+u0054_030C	838656,937664,0,0,0,-167440	2	0224
+u0054_0327	838656,723632,178360,0,0,-167440	3	0225
+u0055_030B	927472,918813,0,0,-20384	2	0226
+u0055_030A	927472,937664,0,0,-20384	2	0227
 :Y	911456,937664,0,30139,33488,-237765	2	0230
----	736736,918813	2	0231
+u005A_0301	736736,918813	2	0231
 vZ	736736,937664	2	0232
----	736736,918813	2	0233
+u005A_0307	736736,918813	2	0233
 IJ	1059968,723632,0,0,0,-33488	2	0234
----	457184,918813	2	0235
----	669760,723632	2	0236
+u0049_0307	457184,918813	2	0235
+u0111	669760,723632	2	0236
 sc	554736,723632,203840	3	0237
----	586040,679952	2	0240
----	586040,465920,203840	1	0241
+u0061_0306	586040,679952	2	0240
+u0061_0328	586040,465920,203840	1	0241
 'c	535808,679952	2	0242
----	535808,679952	2	0243
----	849576,723632	2	0244
----	552552,679952	2	0245
----	552552,465920,203840	1	0246
----	602784,679952,203840,16744	3	0247
----	334880,918813,0,56493	2	0250
----	526344,723632	2	0251
+u0063_030C	535808,679952	2	0243
+u0064_030C	849576,723632	2	0244
+u0065_030C	552552,679952	2	0245
+u0065_0328	552552,465920,203840	1	0246
+u0067_0306	602784,679952,203840,16744	3	0247
+u006C_0301	334880,918813,0,56493	2	0250
+u006C_030C	526344,723632	2	0251
 /l	405205,723632	2	0252
----	669760,679952	2	0253
----	669760,679952	2	0254
----	669760,465920,203840	1	0255
----	602784,679952,0,15530	2	0256
----	496496,679952	2	0257
----	496496,679952	2	0260
----	475530,679952	2	0261
+u006E_0301	669760,679952	2	0253
+u006E_030C	669760,679952	2	0254
+u016A	669760,465920,203840	1	0255
+u006F_030B	602784,679952,0,15530	2	0256
+u0072_0301	496496,679952	2	0257
+u0072_030C	496496,679952	2	0260
+u0073_0301	475530,679952	2	0261
 vs	475530,679952	2	0262
----	475530,465920,178360	1	0263
----	468832,723632	2	0264
----	468832,664768,178360	3	0265
----	669760,679952	2	0266
----	669760,679952	2	0267
+u0073_0327	475530,465920,178360	1	0263
+u0074_030C	468832,723632	2	0264
+u0074_0327	468832,664768,178360	3	0265
+u0075_030B	669760,679952	2	0266
+u0075_030A	669760,679952	2	0267
 :y	636272,723632,203840,16744	3	0270
----	535808,679952	2	0271
+u007A_0301	535808,679952	2	0271
 vz	535808,679952	2	0272
----	535808,723632	2	0273
+u007A_0307	535808,723632	2	0273
 ij	703248,723632,203840	3	0274
 r!	366912,524160,203840	3	0275
 r?	569296,524160,203840	3	0276
@@ -1656,7 +2254,9 @@ AE	1092000,723632	2	0306
 'I	457184,918813	2	0315
 ^I	457184,937664	2	0316
 :I	457184,937664	2	0317
--D	924560,723632,0,0,0,-33488	2	0320
+u0189	924560,723632,0,0,0,-33488	2	0320
+u0110	"
+-D	"
 ~N	943488,937664	2	0321
 `O	905632,918813,0,0,-33488,-33488	2	0322
 'O	905632,918813	2	0323
diff --git a/contrib/groff/font/devdvi/TBI b/contrib/groff/font/devdvi/TBI
index 7020689..5c34bc2 100644
--- a/contrib/groff/font/devdvi/TBI
+++ b/contrib/groff/font/devdvi/TBI
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TBI
 internalname cmbxti10
@@ -20,10 +20,12 @@ ff ] 111848
 cq ' -92624
 ' cq -92624
 cq cq -92624
-' ? 123498
+slash@for@l l -311075
+slash@for@l L -402826
 cq ? 123498
-' ! 123498
+' ? 123498
 cq ! 123498
+' ! 123498
 A n -30875
 A l -30875
 A r -30875
@@ -185,8 +187,8 @@ Fn ] 111848
 f rB 111848
 f ] 111848
 l l 61749
-n ' -123498
 n cq -123498
+n ' -123498
 o e -61749
 o a -61749
 o o -61749
@@ -242,7 +244,7 @@ oe	866814,466034,0,89131	0	0033
 AE	1072450,719440,0,119859	2	0035
 OE	1195947,719440,0,119859	2	0036
 /O	928563,770413,50973,95027	3	0037
----	311075,466034	0	0040
+slash@for@l	311075,466034	0	0040
 !	404864,728178,0,119714	2	0041
 rq	650696,728178,0,83248	2	0042
 sh	990312,728178,203888,71653	3	0043
diff --git a/contrib/groff/font/devdvi/TBIEC b/contrib/groff/font/devdvi/TBIEC
index 561be02..0bc0973 100644
--- a/contrib/groff/font/devdvi/TBIEC
+++ b/contrib/groff/font/devdvi/TBIEC
@@ -16,6 +16,7 @@ bq Y -92602
 bq :Y -92602
 bq 'Y -92602
 bq O -30867
+bq u004F_030B -30867
 bq `O -30867
 bq 'O -30867
 bq ^O -30867
@@ -26,6 +27,8 @@ bq /O -30867
 bq C -30867
 bq G -30867
 bq 'C -30867
+bq u0043_030C -30867
+bq u0047_0306 -30867
 bq ,C -30867
 bq Q -30867
 lq oq 123469
@@ -46,6 +49,7 @@ Bq Y -92602
 Bq :Y -92602
 Bq 'Y -92602
 Bq O -30867
+Bq u004F_030B -30867
 Bq `O -30867
 Bq 'O -30867
 Bq ^O -30867
@@ -56,6 +60,8 @@ Bq /O -30867
 Bq C -30867
 Bq G -30867
 Bq 'C -30867
+Bq u0043_030C -30867
+Bq u0047_0306 -30867
 Bq ,C -30867
 Bq Q -30867
 Fc . -92602
@@ -67,6 +73,7 @@ ff ` 111821
 ff lq 111821
 ff rq 111821
 ff ? 111821
+ff u01C3 111821
 ff ! 111821
 ff ) 111821
 ff rB 111821
@@ -75,22 +82,33 @@ cq rq 123469
 ' rq 123469
 cq ? 123469
 ' ? 123469
+cq u01C3 123469
 cq ! 123469
+' u01C3 123469
 ' ! 123469
 A y -30867
 A :y -30867
 A 'y -30867
 A n -30867
+A u006E_0301 -30867
+A u006E_030C -30867
+A u016A -30867
 A ~n -30867
 A l -30867
+A u006C_0301 -30867
+A u006C_030C -30867
 A r -30867
 A u -30867
+A u0075_030B -30867
+A u0075_030A -30867
 A `u -30867
 A 'u -30867
 A ^u -30867
 A :u -30867
 A m -30867
 A t -30867
+A u0074_030C -30867
+A u0074_0327 -30867
 A i -30867
 A 'i -30867
 A h -30867
@@ -101,9 +119,12 @@ A w -30867
 A C -30867
 A G -30867
 A 'C -30867
+A u0043_030C -30867
+A u0047_0306 -30867
 A ,C -30867
 A Q -30867
 A O -30867
+A u004F_030B -30867
 A `O -30867
 A 'O -30867
 A ^O -30867
@@ -112,22 +133,30 @@ A :O -30867
 A OE -30867
 A /O -30867
 A U -30867
+A u0055_030B -30867
+A u0055_030A -30867
 A `U -30867
 A 'U -30867
 A ^U -30867
 A :U -30867
 A T -92602
+A u0054_030C -92602
+A u0054_0327 -92602
 A Y -92602
 A :Y -92602
 A 'Y -92602
 A V -123469
 A W -123469
 A e -61734
+A u0065_030C -61734
+A u0065_0328 -61734
 A `e -61734
 A 'e -61734
 A ^e -61734
 A :e -61734
 A a -61734
+A u0061_0306 -61734
+A u0061_0328 -61734
 A `a -61734
 A 'a -61734
 A ^a -61734
@@ -137,6 +166,7 @@ A :a -61734
 A oa -61734
 A ae -61734
 A o -61734
+A u006F_030B -61734
 A `o -61734
 A 'o -61734
 A ^o -61734
@@ -145,14 +175,19 @@ A :o -61734
 A oe -61734
 A /o -61734
 A d -61734
+A u0111 -61734
 A c -61734
 A 'c -61734
+A u0063_030C -61734
 A ,c -61734
 A g -61734
+A u0067_0306 -61734
 A q -61734
 D X -30867
 D W -30867
 D A -30867
+D u0041_0306 -30867
+D u0041_0328 -30867
 D `A -30867
 D 'A -30867
 D ^A -30867
@@ -166,12 +201,16 @@ D :Y -30867
 D 'Y -30867
 F o -92602
 F e -92602
+F u0065_0328 -92602
 F u -92602
 F r -92602
 F n -92602
 F v -92602
 F a -92602
+F u0061_0328 -92602
 F A -123469
+F u0041_0306 -123469
+F u0041_0328 -123469
 F `A -123469
 F 'A -123469
 F ^A -123469
@@ -180,6 +219,7 @@ F :A -123469
 F oA -123469
 F AE -123469
 F O -30867
+F u004F_030B -30867
 F `O -30867
 F 'O -30867
 F ^O -30867
@@ -190,11 +230,14 @@ F /O -30867
 F C -30867
 F G -30867
 F 'C -30867
+F u0043_030C -30867
+F u0047_0306 -30867
 F ,C -30867
 F Q -30867
 K v -30867
 K w -30867
 K O -30867
+K u004F_030B -30867
 K `O -30867
 K 'O -30867
 K ^O -30867
@@ -205,20 +248,28 @@ K /O -30867
 K C -30867
 K G -30867
 K 'C -30867
+K u0043_030C -30867
+K u0047_0306 -30867
 K ,C -30867
 K Q -30867
 L T -92602
+L u0054_030C -92602
+L u0054_0327 -92602
 L Y -92602
 L :Y -92602
 L 'Y -92602
 L V -123469
 L W -123469
 L e -61734
+L u0065_030C -61734
+L u0065_0328 -61734
 L `e -61734
 L 'e -61734
 L ^e -61734
 L :e -61734
 L a -61734
+L u0061_0306 -61734
+L u0061_0328 -61734
 L `a -61734
 L 'a -61734
 L ^a -61734
@@ -228,6 +279,7 @@ L :a -61734
 L oa -61734
 L ae -61734
 L o -61734
+L u006F_030B -61734
 L `o -61734
 L 'o -61734
 L ^o -61734
@@ -236,14 +288,19 @@ L :o -61734
 L oe -61734
 L /o -61734
 L d -61734
+L u0111 -61734
 L c -61734
 L 'c -61734
+L u0063_030C -61734
 L ,c -61734
 L g -61734
+L u0067_0306 -61734
 L q -61734
 O X -30867
 O W -30867
 O A -30867
+O u0041_0306 -30867
+O u0041_0328 -30867
 O `A -30867
 O 'A -30867
 O ^A -30867
@@ -256,6 +313,8 @@ O Y -30867
 O :Y -30867
 O 'Y -30867
 P A -92602
+P u0041_0306 -92602
+P u0041_0328 -92602
 P `A -92602
 P 'A -92602
 P ^A -92602
@@ -264,16 +323,25 @@ P :A -92602
 P oA -92602
 P AE -92602
 R n -30867
+R u006E_0301 -30867
+R u006E_030C -30867
+R u016A -30867
 R ~n -30867
 R l -30867
+R u006C_0301 -30867
+R u006C_030C -30867
 R r -30867
 R u -30867
+R u0075_030B -30867
+R u0075_030A -30867
 R `u -30867
 R 'u -30867
 R ^u -30867
 R :u -30867
 R m -30867
 R t -30867
+R u0074_030C -30867
+R u0074_0327 -30867
 R i -30867
 R 'i -30867
 R h -30867
@@ -284,9 +352,12 @@ R w -30867
 R C -30867
 R G -30867
 R 'C -30867
+R u0043_030C -30867
+R u0047_0306 -30867
 R ,C -30867
 R Q -30867
 R O -30867
+R u004F_030B -30867
 R `O -30867
 R 'O -30867
 R ^O -30867
@@ -295,22 +366,30 @@ R :O -30867
 R OE -30867
 R /O -30867
 R U -30867
+R u0055_030B -30867
+R u0055_030A -30867
 R `U -30867
 R 'U -30867
 R ^U -30867
 R :U -30867
 R T -92602
+R u0054_030C -92602
+R u0054_0327 -92602
 R Y -92602
 R :Y -92602
 R 'Y -92602
 R V -123469
 R W -123469
 R e -61734
+R u0065_030C -61734
+R u0065_0328 -61734
 R `e -61734
 R 'e -61734
 R ^e -61734
 R :e -61734
 R a -61734
+R u0061_0306 -61734
+R u0061_0328 -61734
 R `a -61734
 R 'a -61734
 R ^a -61734
@@ -320,6 +399,7 @@ R :a -61734
 R oa -61734
 R ae -61734
 R o -61734
+R u006F_030B -61734
 R `o -61734
 R 'o -61734
 R ^o -61734
@@ -328,10 +408,13 @@ R :o -61734
 R oe -61734
 R /o -61734
 R d -61734
+R u0111 -61734
 R c -61734
 R 'c -61734
+R u0063_030C -61734
 R ,c -61734
 R g -61734
+R u0067_0306 -61734
 R q -61734
 T y -92602
 T e -92602
@@ -340,6 +423,8 @@ T r -92602
 T a -92602
 T u -92602
 T A -92602
+T u0041_0306 -92602
+T u0041_0328 -92602
 T `A -92602
 T 'A -92602
 T ^A -92602
@@ -349,12 +434,16 @@ T oA -92602
 T AE -92602
 V o -92602
 V e -92602
+V u0065_0328 -92602
 V u -92602
 V r -92602
 V n -92602
 V v -92602
 V a -92602
+V u0061_0328 -92602
 V A -123469
+V u0041_0306 -123469
+V u0041_0328 -123469
 V `A -123469
 V 'A -123469
 V ^A -123469
@@ -363,6 +452,7 @@ V :A -123469
 V oA -123469
 V AE -123469
 V O -30867
+V u004F_030B -30867
 V `O -30867
 V 'O -30867
 V ^O -30867
@@ -373,16 +463,22 @@ V /O -30867
 V C -30867
 V G -30867
 V 'C -30867
+V u0043_030C -30867
+V u0047_0306 -30867
 V ,C -30867
 V Q -30867
 W o -92602
 W e -92602
+W u0065_0328 -92602
 W u -92602
 W r -92602
 W n -92602
 W v -92602
 W a -92602
+W u0061_0328 -92602
 W A -123469
+W u0041_0306 -123469
+W u0041_0328 -123469
 W `A -123469
 W 'A -123469
 W ^A -123469
@@ -391,6 +487,7 @@ W :A -123469
 W oA -123469
 W AE -123469
 W O -30867
+W u004F_030B -30867
 W `O -30867
 W 'O -30867
 W ^O -30867
@@ -401,9 +498,12 @@ W /O -30867
 W C -30867
 W G -30867
 W 'C -30867
+W u0043_030C -30867
+W u0047_0306 -30867
 W ,C -30867
 W Q -30867
 X O -30867
+X u004F_030B -30867
 X `O -30867
 X 'O -30867
 X ^O -30867
@@ -414,6 +514,8 @@ X /O -30867
 X C -30867
 X G -30867
 X 'C -30867
+X u0043_030C -30867
+X u0047_0306 -30867
 X ,C -30867
 X Q -30867
 Y e -92602
@@ -422,6 +524,8 @@ Y r -92602
 Y a -92602
 Y u -92602
 Y A -92602
+Y u0041_0306 -92602
+Y u0041_0328 -92602
 Y `A -92602
 Y 'A -92602
 Y ^A -92602
@@ -433,14 +537,20 @@ oq lq 123469
 ` lq 123469
 oq ? 123469
 ` ? 123469
+oq u01C3 123469
 oq ! 123469
+` u01C3 123469
 ` ! 123469
 b e -61734
+b u0065_030C -61734
+b u0065_0328 -61734
 b `e -61734
 b 'e -61734
 b ^e -61734
 b :e -61734
 b a -61734
+b u0061_0306 -61734
+b u0061_0328 -61734
 b `a -61734
 b 'a -61734
 b ^a -61734
@@ -450,6 +560,7 @@ b :a -61734
 b oa -61734
 b ae -61734
 b o -61734
+b u006F_030B -61734
 b `o -61734
 b 'o -61734
 b ^o -61734
@@ -458,17 +569,24 @@ b :o -61734
 b oe -61734
 b /o -61734
 b d -61734
+b u0111 -61734
 b c -61734
 b 'c -61734
+b u0063_030C -61734
 b ,c -61734
 b g -61734
+b u0067_0306 -61734
 b q -61734
 c e -61734
+c u0065_030C -61734
+c u0065_0328 -61734
 c `e -61734
 c 'e -61734
 c ^e -61734
 c :e -61734
 c a -61734
+c u0061_0306 -61734
+c u0061_0328 -61734
 c `a -61734
 c 'a -61734
 c ^a -61734
@@ -478,6 +596,7 @@ c :a -61734
 c oa -61734
 c ae -61734
 c o -61734
+c u006F_030B -61734
 c `o -61734
 c 'o -61734
 c ^o -61734
@@ -486,18 +605,27 @@ c :o -61734
 c oe -61734
 c /o -61734
 c d -61734
+c u0111 -61734
 c c -61734
 c 'c -61734
+c u0063_030C -61734
 c ,c -61734
 c g -61734
+c u0067_0306 -61734
 c q -61734
 d l 61734
+d u006C_0301 61734
+d u006C_030C 61734
 e e -61734
+e u0065_030C -61734
+e u0065_0328 -61734
 e `e -61734
 e 'e -61734
 e ^e -61734
 e :e -61734
 e a -61734
+e u0061_0306 -61734
+e u0061_0328 -61734
 e `a -61734
 e 'a -61734
 e ^a -61734
@@ -507,6 +635,7 @@ e :a -61734
 e oa -61734
 e ae -61734
 e o -61734
+e u006F_030B -61734
 e `o -61734
 e 'o -61734
 e ^o -61734
@@ -515,10 +644,13 @@ e :o -61734
 e oe -61734
 e /o -61734
 e d -61734
+e u0111 -61734
 e c -61734
 e 'c -61734
+e u0063_030C -61734
 e ,c -61734
 e g -61734
+e u0067_0306 -61734
 e q -61734
 f cq 111821
 f ' 111821
@@ -527,19 +659,26 @@ f ` 111821
 f lq 111821
 f rq 111821
 f ? 111821
+f u01C3 111821
 f ! 111821
 f ) 111821
 f rB 111821
 f ] 111821
 l l 61734
+l u006C_0301 61734
+l u006C_030C 61734
 n cq -123469
 n ' -123469
 o e -61734
+o u0065_030C -61734
+o u0065_0328 -61734
 o `e -61734
 o 'e -61734
 o ^e -61734
 o :e -61734
 o a -61734
+o u0061_0306 -61734
+o u0061_0328 -61734
 o `a -61734
 o 'a -61734
 o ^a -61734
@@ -549,6 +688,7 @@ o :a -61734
 o oa -61734
 o ae -61734
 o o -61734
+o u006F_030B -61734
 o `o -61734
 o 'o -61734
 o ^o -61734
@@ -557,17 +697,24 @@ o :o -61734
 o oe -61734
 o /o -61734
 o d -61734
+o u0111 -61734
 o c -61734
 o 'c -61734
+o u0063_030C -61734
 o ,c -61734
 o g -61734
+o u0067_0306 -61734
 o q -61734
 p e -61734
+p u0065_030C -61734
+p u0065_0328 -61734
 p `e -61734
 p 'e -61734
 p ^e -61734
 p :e -61734
 p a -61734
+p u0061_0306 -61734
+p u0061_0328 -61734
 p `a -61734
 p 'a -61734
 p ^a -61734
@@ -577,6 +724,7 @@ p :a -61734
 p oa -61734
 p ae -61734
 p o -61734
+p u006F_030B -61734
 p `o -61734
 p 'o -61734
 p ^o -61734
@@ -585,17 +733,24 @@ p :o -61734
 p oe -61734
 p /o -61734
 p d -61734
+p u0111 -61734
 p c -61734
 p 'c -61734
+p u0063_030C -61734
 p ,c -61734
 p g -61734
+p u0067_0306 -61734
 p q -61734
 r e -61734
+r u0065_030C -61734
+r u0065_0328 -61734
 r `e -61734
 r 'e -61734
 r ^e -61734
 r :e -61734
 r a -61734
+r u0061_0306 -61734
+r u0061_0328 -61734
 r `a -61734
 r 'a -61734
 r ^a -61734
@@ -605,6 +760,7 @@ r :a -61734
 r oa -61734
 r ae -61734
 r o -61734
+r u006F_030B -61734
 r `o -61734
 r 'o -61734
 r ^o -61734
@@ -613,18 +769,462 @@ r :o -61734
 r oe -61734
 r /o -61734
 r d -61734
+r u0111 -61734
 r c -61734
 r 'c -61734
+r u0063_030C -61734
 r ,c -61734
 r g -61734
+r u0067_0306 -61734
 r q -61734
 w l 61734
+w u006C_0301 61734
+w u006C_030C 61734
+u0041_0306 y -30867
+u0041_0306 :y -30867
+u0041_0306 'y -30867
+u0041_0306 n -30867
+u0041_0306 u006E_0301 -30867
+u0041_0306 u006E_030C -30867
+u0041_0306 u016A -30867
+u0041_0306 ~n -30867
+u0041_0306 l -30867
+u0041_0306 u006C_0301 -30867
+u0041_0306 u006C_030C -30867
+u0041_0306 r -30867
+u0041_0306 u -30867
+u0041_0306 u0075_030B -30867
+u0041_0306 u0075_030A -30867
+u0041_0306 `u -30867
+u0041_0306 'u -30867
+u0041_0306 ^u -30867
+u0041_0306 :u -30867
+u0041_0306 m -30867
+u0041_0306 t -30867
+u0041_0306 u0074_030C -30867
+u0041_0306 u0074_0327 -30867
+u0041_0306 i -30867
+u0041_0306 'i -30867
+u0041_0306 h -30867
+u0041_0306 b -30867
+u0041_0306 k -30867
+u0041_0306 v -30867
+u0041_0306 w -30867
+u0041_0306 C -30867
+u0041_0306 G -30867
+u0041_0306 'C -30867
+u0041_0306 u0043_030C -30867
+u0041_0306 u0047_0306 -30867
+u0041_0306 ,C -30867
+u0041_0306 Q -30867
+u0041_0306 O -30867
+u0041_0306 u004F_030B -30867
+u0041_0306 `O -30867
+u0041_0306 'O -30867
+u0041_0306 ^O -30867
+u0041_0306 ~O -30867
+u0041_0306 :O -30867
+u0041_0306 OE -30867
+u0041_0306 /O -30867
+u0041_0306 U -30867
+u0041_0306 u0055_030B -30867
+u0041_0306 u0055_030A -30867
+u0041_0306 `U -30867
+u0041_0306 'U -30867
+u0041_0306 ^U -30867
+u0041_0306 :U -30867
+u0041_0306 T -92602
+u0041_0306 u0054_030C -92602
+u0041_0306 u0054_0327 -92602
+u0041_0306 Y -92602
+u0041_0306 :Y -92602
+u0041_0306 'Y -92602
+u0041_0306 V -123469
+u0041_0306 W -123469
+u0041_0306 e -61734
+u0041_0306 u0065_030C -61734
+u0041_0306 u0065_0328 -61734
+u0041_0306 `e -61734
+u0041_0306 'e -61734
+u0041_0306 ^e -61734
+u0041_0306 :e -61734
+u0041_0306 a -61734
+u0041_0306 u0061_0306 -61734
+u0041_0306 u0061_0328 -61734
+u0041_0306 `a -61734
+u0041_0306 'a -61734
+u0041_0306 ^a -61734
+u0041_0306 ^a -61734
+u0041_0306 ~a -61734
+u0041_0306 :a -61734
+u0041_0306 oa -61734
+u0041_0306 ae -61734
+u0041_0306 o -61734
+u0041_0306 u006F_030B -61734
+u0041_0306 `o -61734
+u0041_0306 'o -61734
+u0041_0306 ^o -61734
+u0041_0306 ~o -61734
+u0041_0306 :o -61734
+u0041_0306 oe -61734
+u0041_0306 /o -61734
+u0041_0306 d -61734
+u0041_0306 u0111 -61734
+u0041_0306 c -61734
+u0041_0306 'c -61734
+u0041_0306 u0063_030C -61734
+u0041_0306 ,c -61734
+u0041_0306 g -61734
+u0041_0306 u0067_0306 -61734
+u0041_0306 q -61734
+u0041_0328 n -30867
+u0041_0328 u006E_0301 -30867
+u0041_0328 u006E_030C -30867
+u0041_0328 u016A -30867
+u0041_0328 ~n -30867
+u0041_0328 l -30867
+u0041_0328 u006C_0301 -30867
+u0041_0328 u006C_030C -30867
+u0041_0328 r -30867
+u0041_0328 u -30867
+u0041_0328 u0075_030B -30867
+u0041_0328 u0075_030A -30867
+u0041_0328 `u -30867
+u0041_0328 'u -30867
+u0041_0328 ^u -30867
+u0041_0328 :u -30867
+u0041_0328 m -30867
+u0041_0328 t -30867
+u0041_0328 u0074_030C -30867
+u0041_0328 u0074_0327 -30867
+u0041_0328 i -30867
+u0041_0328 'i -30867
+u0041_0328 h -30867
+u0041_0328 b -30867
+u0041_0328 k -30867
+u0041_0328 v -30867
+u0041_0328 w -30867
+u0041_0328 C -30867
+u0041_0328 G -30867
+u0041_0328 'C -30867
+u0041_0328 u0043_030C -30867
+u0041_0328 u0047_0306 -30867
+u0041_0328 ,C -30867
+u0041_0328 Q -30867
+u0041_0328 O -30867
+u0041_0328 u004F_030B -30867
+u0041_0328 `O -30867
+u0041_0328 'O -30867
+u0041_0328 ^O -30867
+u0041_0328 ~O -30867
+u0041_0328 :O -30867
+u0041_0328 OE -30867
+u0041_0328 /O -30867
+u0041_0328 U -30867
+u0041_0328 u0055_030B -30867
+u0041_0328 u0055_030A -30867
+u0041_0328 `U -30867
+u0041_0328 'U -30867
+u0041_0328 ^U -30867
+u0041_0328 :U -30867
+u0041_0328 T -92602
+u0041_0328 u0054_030C -92602
+u0041_0328 u0054_0327 -92602
+u0041_0328 Y -92602
+u0041_0328 :Y -92602
+u0041_0328 'Y -92602
+u0041_0328 V -123469
+u0041_0328 W -123469
+u0041_0328 e -61734
+u0041_0328 u0065_030C -61734
+u0041_0328 u0065_0328 -61734
+u0041_0328 `e -61734
+u0041_0328 'e -61734
+u0041_0328 ^e -61734
+u0041_0328 :e -61734
+u0041_0328 a -61734
+u0041_0328 u0061_0306 -61734
+u0041_0328 u0061_0328 -61734
+u0041_0328 `a -61734
+u0041_0328 'a -61734
+u0041_0328 ^a -61734
+u0041_0328 ^a -61734
+u0041_0328 ~a -61734
+u0041_0328 :a -61734
+u0041_0328 oa -61734
+u0041_0328 ae -61734
+u0041_0328 o -61734
+u0041_0328 u006F_030B -61734
+u0041_0328 `o -61734
+u0041_0328 'o -61734
+u0041_0328 ^o -61734
+u0041_0328 ~o -61734
+u0041_0328 :o -61734
+u0041_0328 oe -61734
+u0041_0328 /o -61734
+u0041_0328 d -61734
+u0041_0328 u0111 -61734
+u0041_0328 c -61734
+u0041_0328 'c -61734
+u0041_0328 u0063_030C -61734
+u0041_0328 ,c -61734
+u0041_0328 g -61734
+u0041_0328 u0067_0306 -61734
+u0041_0328 q -61734
+u0044_030C X -30867
+u0044_030C W -30867
+u0044_030C A -30867
+u0044_030C u0041_0306 -30867
+u0044_030C u0041_0328 -30867
+u0044_030C `A -30867
+u0044_030C 'A -30867
+u0044_030C ^A -30867
+u0044_030C ~A -30867
+u0044_030C :A -30867
+u0044_030C oA -30867
+u0044_030C AE -30867
+u0044_030C V -30867
+u0044_030C Y -30867
+u0044_030C :Y -30867
+u0044_030C 'Y -30867
+u004C_0301 T -92602
+u004C_0301 u0054_030C -92602
+u004C_0301 u0054_0327 -92602
+u004C_0301 Y -92602
+u004C_0301 :Y -92602
+u004C_0301 'Y -92602
+u004C_0301 V -123469
+u004C_0301 W -123469
+u004C_0301 e -61734
+u004C_0301 u0065_030C -61734
+u004C_0301 u0065_0328 -61734
+u004C_0301 `e -61734
+u004C_0301 'e -61734
+u004C_0301 ^e -61734
+u004C_0301 :e -61734
+u004C_0301 a -61734
+u004C_0301 u0061_0306 -61734
+u004C_0301 u0061_0328 -61734
+u004C_0301 `a -61734
+u004C_0301 'a -61734
+u004C_0301 ^a -61734
+u004C_0301 ^a -61734
+u004C_0301 ~a -61734
+u004C_0301 :a -61734
+u004C_0301 oa -61734
+u004C_0301 ae -61734
+u004C_0301 o -61734
+u004C_0301 u006F_030B -61734
+u004C_0301 `o -61734
+u004C_0301 'o -61734
+u004C_0301 ^o -61734
+u004C_0301 ~o -61734
+u004C_0301 :o -61734
+u004C_0301 oe -61734
+u004C_0301 /o -61734
+u004C_0301 d -61734
+u004C_0301 u0111 -61734
+u004C_0301 c -61734
+u004C_0301 'c -61734
+u004C_0301 u0063_030C -61734
+u004C_0301 ,c -61734
+u004C_0301 g -61734
+u004C_0301 u0067_0306 -61734
+u004C_0301 q -61734
+u004C_030C T -92602
+u004C_030C u0054_030C -92602
+u004C_030C u0054_0327 -92602
+u004C_030C Y -92602
+u004C_030C :Y -92602
+u004C_030C 'Y -92602
+u004C_030C V -123469
+u004C_030C W -123469
+u004C_030C e -61734
+u004C_030C u0065_030C -61734
+u004C_030C u0065_0328 -61734
+u004C_030C `e -61734
+u004C_030C 'e -61734
+u004C_030C ^e -61734
+u004C_030C :e -61734
+u004C_030C a -61734
+u004C_030C u0061_0306 -61734
+u004C_030C u0061_0328 -61734
+u004C_030C `a -61734
+u004C_030C 'a -61734
+u004C_030C ^a -61734
+u004C_030C ^a -61734
+u004C_030C ~a -61734
+u004C_030C :a -61734
+u004C_030C oa -61734
+u004C_030C ae -61734
+u004C_030C o -61734
+u004C_030C u006F_030B -61734
+u004C_030C `o -61734
+u004C_030C 'o -61734
+u004C_030C ^o -61734
+u004C_030C ~o -61734
+u004C_030C :o -61734
+u004C_030C oe -61734
+u004C_030C /o -61734
+u004C_030C d -61734
+u004C_030C u0111 -61734
+u004C_030C c -61734
+u004C_030C 'c -61734
+u004C_030C u0063_030C -61734
+u004C_030C ,c -61734
+u004C_030C g -61734
+u004C_030C u0067_0306 -61734
+u004C_030C q -61734
+u004F_030B X -30867
+u004F_030B W -30867
+u004F_030B A -30867
+u004F_030B u0041_0306 -30867
+u004F_030B u0041_0328 -30867
+u004F_030B `A -30867
+u004F_030B 'A -30867
+u004F_030B ^A -30867
+u004F_030B ~A -30867
+u004F_030B :A -30867
+u004F_030B oA -30867
+u004F_030B AE -30867
+u004F_030B V -30867
+u004F_030B Y -30867
+u004F_030B :Y -30867
+u004F_030B 'Y -30867
+u0052_0301 n -30867
+u0052_0301 u006E_0301 -30867
+u0052_0301 u006E_030C -30867
+u0052_0301 u016A -30867
+u0052_0301 ~n -30867
+u0052_0301 l -30867
+u0052_0301 u006C_0301 -30867
+u0052_0301 u006C_030C -30867
+u0052_0301 r -30867
+u0052_0301 u -30867
+u0052_0301 u0075_030B -30867
+u0052_0301 u0075_030A -30867
+u0052_0301 `u -30867
+u0052_0301 'u -30867
+u0052_0301 ^u -30867
+u0052_0301 :u -30867
+u0052_0301 m -30867
+u0052_0301 t -30867
+u0052_0301 u0074_030C -30867
+u0052_0301 u0074_0327 -30867
+u0052_0301 i -30867
+u0052_0301 'i -30867
+u0052_0301 h -30867
+u0052_0301 b -30867
+u0052_0301 k -30867
+u0052_0301 v -30867
+u0052_0301 w -30867
+u0052_0301 C -30867
+u0052_0301 G -30867
+u0052_0301 'C -30867
+u0052_0301 u0043_030C -30867
+u0052_0301 u0047_0306 -30867
+u0052_0301 ,C -30867
+u0052_0301 Q -30867
+u0052_0301 O -30867
+u0052_0301 u004F_030B -30867
+u0052_0301 `O -30867
+u0052_0301 'O -30867
+u0052_0301 ^O -30867
+u0052_0301 ~O -30867
+u0052_0301 :O -30867
+u0052_0301 OE -30867
+u0052_0301 /O -30867
+u0052_0301 U -30867
+u0052_0301 u0055_030B -30867
+u0052_0301 u0055_030A -30867
+u0052_0301 `U -30867
+u0052_0301 'U -30867
+u0052_0301 ^U -30867
+u0052_0301 :U -30867
+u0052_0301 T -92602
+u0052_0301 u0054_030C -92602
+u0052_0301 u0054_0327 -92602
+u0052_0301 Y -92602
+u0052_0301 :Y -92602
+u0052_0301 'Y -92602
+u0052_0301 V -123469
+u0052_0301 W -123469
+u0052_0301 e -61734
+u0052_0301 u0065_030C -61734
+u0052_0301 u0065_0328 -61734
+u0052_0301 `e -61734
+u0052_0301 'e -61734
+u0052_0301 ^e -61734
+u0052_0301 :e -61734
+u0052_0301 a -61734
+u0052_0301 u0061_0306 -61734
+u0052_0301 u0061_0328 -61734
+u0052_0301 `a -61734
+u0052_0301 'a -61734
+u0052_0301 ^a -61734
+u0052_0301 ^a -61734
+u0052_0301 ~a -61734
+u0052_0301 :a -61734
+u0052_0301 oa -61734
+u0052_0301 ae -61734
+u0052_0301 o -61734
+u0052_0301 u006F_030B -61734
+u0052_0301 `o -61734
+u0052_0301 'o -61734
+u0052_0301 ^o -61734
+u0052_0301 ~o -61734
+u0052_0301 :o -61734
+u0052_0301 oe -61734
+u0052_0301 /o -61734
+u0052_0301 d -61734
+u0052_0301 u0111 -61734
+u0052_0301 c -61734
+u0052_0301 'c -61734
+u0052_0301 u0063_030C -61734
+u0052_0301 ,c -61734
+u0052_0301 g -61734
+u0052_0301 u0067_0306 -61734
+u0052_0301 q -61734
+u0054_030C y -92602
+u0054_030C e -92602
+u0054_030C o -92602
+u0054_030C r -92602
+u0054_030C a -92602
+u0054_030C u -92602
+u0054_030C A -92602
+u0054_030C u0041_0306 -92602
+u0054_030C u0041_0328 -92602
+u0054_030C `A -92602
+u0054_030C 'A -92602
+u0054_030C ^A -92602
+u0054_030C ~A -92602
+u0054_030C :A -92602
+u0054_030C oA -92602
+u0054_030C AE -92602
+u0054_0327 y -92602
+u0054_0327 e -92602
+u0054_0327 o -92602
+u0054_0327 r -92602
+u0054_0327 a -92602
+u0054_0327 u -92602
+u0054_0327 A -92602
+u0054_0327 u0041_0306 -92602
+u0054_0327 u0041_0328 -92602
+u0054_0327 `A -92602
+u0054_0327 'A -92602
+u0054_0327 ^A -92602
+u0054_0327 ~A -92602
+u0054_0327 :A -92602
+u0054_0327 oA -92602
+u0054_0327 AE -92602
 :Y e -92602
 :Y o -92602
 :Y r -92602
 :Y a -92602
 :Y u -92602
 :Y A -92602
+:Y u0041_0306 -92602
+:Y u0041_0328 -92602
 :Y `A -92602
 :Y 'A -92602
 :Y ^A -92602
@@ -633,11 +1233,15 @@ w l 61734
 :Y oA -92602
 :Y AE -92602
 'c e -61734
+'c u0065_030C -61734
+'c u0065_0328 -61734
 'c `e -61734
 'c 'e -61734
 'c ^e -61734
 'c :e -61734
 'c a -61734
+'c u0061_0306 -61734
+'c u0061_0328 -61734
 'c `a -61734
 'c 'a -61734
 'c ^a -61734
@@ -647,6 +1251,7 @@ w l 61734
 'c oa -61734
 'c ae -61734
 'c o -61734
+'c u006F_030B -61734
 'c `o -61734
 'c 'o -61734
 'c ^o -61734
@@ -655,27 +1260,156 @@ w l 61734
 'c oe -61734
 'c /o -61734
 'c d -61734
+'c u0111 -61734
 'c c -61734
 'c 'c -61734
+'c u0063_030C -61734
 'c ,c -61734
 'c g -61734
+'c u0067_0306 -61734
 'c q -61734
+u0063_030C e -61734
+u0063_030C u0065_030C -61734
+u0063_030C u0065_0328 -61734
+u0063_030C `e -61734
+u0063_030C 'e -61734
+u0063_030C ^e -61734
+u0063_030C :e -61734
+u0063_030C a -61734
+u0063_030C u0061_0306 -61734
+u0063_030C u0061_0328 -61734
+u0063_030C `a -61734
+u0063_030C 'a -61734
+u0063_030C ^a -61734
+u0063_030C ^a -61734
+u0063_030C ~a -61734
+u0063_030C :a -61734
+u0063_030C oa -61734
+u0063_030C ae -61734
+u0063_030C o -61734
+u0063_030C u006F_030B -61734
+u0063_030C `o -61734
+u0063_030C 'o -61734
+u0063_030C ^o -61734
+u0063_030C ~o -61734
+u0063_030C :o -61734
+u0063_030C oe -61734
+u0063_030C /o -61734
+u0063_030C d -61734
+u0063_030C u0111 -61734
+u0063_030C c -61734
+u0063_030C 'c -61734
+u0063_030C u0063_030C -61734
+u0063_030C ,c -61734
+u0063_030C g -61734
+u0063_030C u0067_0306 -61734
+u0063_030C q -61734
+u0064_030C l 61734
+u0064_030C u006C_0301 61734
+u0064_030C u006C_030C 61734
+u0065_030C e -61734
+u0065_030C u0065_030C -61734
+u0065_030C u0065_0328 -61734
+u0065_030C `e -61734
+u0065_030C 'e -61734
+u0065_030C ^e -61734
+u0065_030C :e -61734
+u0065_030C a -61734
+u0065_030C u0061_0306 -61734
+u0065_030C u0061_0328 -61734
+u0065_030C `a -61734
+u0065_030C 'a -61734
+u0065_030C ^a -61734
+u0065_030C ^a -61734
+u0065_030C ~a -61734
+u0065_030C :a -61734
+u0065_030C oa -61734
+u0065_030C ae -61734
+u0065_030C o -61734
+u0065_030C u006F_030B -61734
+u0065_030C `o -61734
+u0065_030C 'o -61734
+u0065_030C ^o -61734
+u0065_030C ~o -61734
+u0065_030C :o -61734
+u0065_030C oe -61734
+u0065_030C /o -61734
+u0065_030C d -61734
+u0065_030C u0111 -61734
+u0065_030C c -61734
+u0065_030C 'c -61734
+u0065_030C u0063_030C -61734
+u0065_030C ,c -61734
+u0065_030C g -61734
+u0065_030C u0067_0306 -61734
+u0065_030C q -61734
+u0065_0328 e -61734
+u0065_0328 u0065_030C -61734
+u0065_0328 u0065_0328 -61734
+u0065_0328 `e -61734
+u0065_0328 'e -61734
+u0065_0328 ^e -61734
+u0065_0328 :e -61734
+u0065_0328 a -61734
+u0065_0328 u0061_0306 -61734
+u0065_0328 u0061_0328 -61734
+u0065_0328 `a -61734
+u0065_0328 'a -61734
+u0065_0328 ^a -61734
+u0065_0328 ^a -61734
+u0065_0328 ~a -61734
+u0065_0328 :a -61734
+u0065_0328 oa -61734
+u0065_0328 ae -61734
+u0065_0328 o -61734
+u0065_0328 u006F_030B -61734
+u0065_0328 `o -61734
+u0065_0328 'o -61734
+u0065_0328 ^o -61734
+u0065_0328 ~o -61734
+u0065_0328 :o -61734
+u0065_0328 oe -61734
+u0065_0328 /o -61734
+u0065_0328 d -61734
+u0065_0328 u0111 -61734
+u0065_0328 c -61734
+u0065_0328 'c -61734
+u0065_0328 u0063_030C -61734
+u0065_0328 ,c -61734
+u0065_0328 g -61734
+u0065_0328 u0067_0306 -61734
+u0065_0328 q -61734
+u006C_0301 l 61734
+u006C_0301 u006C_0301 61734
+u006C_0301 u006C_030C 61734
+u006C_030C l 61734
+u006C_030C u006C_0301 61734
+u006C_030C u006C_030C 61734
 /l cq 30867
 /l ' 30867
 `A y -30867
 `A :y -30867
 `A 'y -30867
 `A n -30867
+`A u006E_0301 -30867
+`A u006E_030C -30867
+`A u016A -30867
 `A ~n -30867
 `A l -30867
+`A u006C_0301 -30867
+`A u006C_030C -30867
 `A r -30867
 `A u -30867
+`A u0075_030B -30867
+`A u0075_030A -30867
 `A `u -30867
 `A 'u -30867
 `A ^u -30867
 `A :u -30867
 `A m -30867
 `A t -30867
+`A u0074_030C -30867
+`A u0074_0327 -30867
 `A i -30867
 `A 'i -30867
 `A h -30867
@@ -686,9 +1420,12 @@ w l 61734
 `A C -30867
 `A G -30867
 `A 'C -30867
+`A u0043_030C -30867
+`A u0047_0306 -30867
 `A ,C -30867
 `A Q -30867
 `A O -30867
+`A u004F_030B -30867
 `A `O -30867
 `A 'O -30867
 `A ^O -30867
@@ -697,22 +1434,30 @@ w l 61734
 `A OE -30867
 `A /O -30867
 `A U -30867
+`A u0055_030B -30867
+`A u0055_030A -30867
 `A `U -30867
 `A 'U -30867
 `A ^U -30867
 `A :U -30867
 `A T -92602
+`A u0054_030C -92602
+`A u0054_0327 -92602
 `A Y -92602
 `A :Y -92602
 `A 'Y -92602
 `A V -123469
 `A W -123469
 `A e -61734
+`A u0065_030C -61734
+`A u0065_0328 -61734
 `A `e -61734
 `A 'e -61734
 `A ^e -61734
 `A :e -61734
 `A a -61734
+`A u0061_0306 -61734
+`A u0061_0328 -61734
 `A `a -61734
 `A 'a -61734
 `A ^a -61734
@@ -722,6 +1467,7 @@ w l 61734
 `A oa -61734
 `A ae -61734
 `A o -61734
+`A u006F_030B -61734
 `A `o -61734
 `A 'o -61734
 `A ^o -61734
@@ -730,25 +1476,37 @@ w l 61734
 `A oe -61734
 `A /o -61734
 `A d -61734
+`A u0111 -61734
 `A c -61734
 `A 'c -61734
+`A u0063_030C -61734
 `A ,c -61734
 `A g -61734
+`A u0067_0306 -61734
 `A q -61734
 'A y -30867
 'A :y -30867
 'A 'y -30867
 'A n -30867
+'A u006E_0301 -30867
+'A u006E_030C -30867
+'A u016A -30867
 'A ~n -30867
 'A l -30867
+'A u006C_0301 -30867
+'A u006C_030C -30867
 'A r -30867
 'A u -30867
+'A u0075_030B -30867
+'A u0075_030A -30867
 'A `u -30867
 'A 'u -30867
 'A ^u -30867
 'A :u -30867
 'A m -30867
 'A t -30867
+'A u0074_030C -30867
+'A u0074_0327 -30867
 'A i -30867
 'A 'i -30867
 'A h -30867
@@ -759,9 +1517,12 @@ w l 61734
 'A C -30867
 'A G -30867
 'A 'C -30867
+'A u0043_030C -30867
+'A u0047_0306 -30867
 'A ,C -30867
 'A Q -30867
 'A O -30867
+'A u004F_030B -30867
 'A `O -30867
 'A 'O -30867
 'A ^O -30867
@@ -770,22 +1531,30 @@ w l 61734
 'A OE -30867
 'A /O -30867
 'A U -30867
+'A u0055_030B -30867
+'A u0055_030A -30867
 'A `U -30867
 'A 'U -30867
 'A ^U -30867
 'A :U -30867
 'A T -92602
+'A u0054_030C -92602
+'A u0054_0327 -92602
 'A Y -92602
 'A :Y -92602
 'A 'Y -92602
 'A V -123469
 'A W -123469
 'A e -61734
+'A u0065_030C -61734
+'A u0065_0328 -61734
 'A `e -61734
 'A 'e -61734
 'A ^e -61734
 'A :e -61734
 'A a -61734
+'A u0061_0306 -61734
+'A u0061_0328 -61734
 'A `a -61734
 'A 'a -61734
 'A ^a -61734
@@ -795,6 +1564,7 @@ w l 61734
 'A oa -61734
 'A ae -61734
 'A o -61734
+'A u006F_030B -61734
 'A `o -61734
 'A 'o -61734
 'A ^o -61734
@@ -803,25 +1573,37 @@ w l 61734
 'A oe -61734
 'A /o -61734
 'A d -61734
+'A u0111 -61734
 'A c -61734
 'A 'c -61734
+'A u0063_030C -61734
 'A ,c -61734
 'A g -61734
+'A u0067_0306 -61734
 'A q -61734
 ^A y -30867
 ^A :y -30867
 ^A 'y -30867
 ^A n -30867
+^A u006E_0301 -30867
+^A u006E_030C -30867
+^A u016A -30867
 ^A ~n -30867
 ^A l -30867
+^A u006C_0301 -30867
+^A u006C_030C -30867
 ^A r -30867
 ^A u -30867
+^A u0075_030B -30867
+^A u0075_030A -30867
 ^A `u -30867
 ^A 'u -30867
 ^A ^u -30867
 ^A :u -30867
 ^A m -30867
 ^A t -30867
+^A u0074_030C -30867
+^A u0074_0327 -30867
 ^A i -30867
 ^A 'i -30867
 ^A h -30867
@@ -832,9 +1614,12 @@ w l 61734
 ^A C -30867
 ^A G -30867
 ^A 'C -30867
+^A u0043_030C -30867
+^A u0047_0306 -30867
 ^A ,C -30867
 ^A Q -30867
 ^A O -30867
+^A u004F_030B -30867
 ^A `O -30867
 ^A 'O -30867
 ^A ^O -30867
@@ -843,22 +1628,30 @@ w l 61734
 ^A OE -30867
 ^A /O -30867
 ^A U -30867
+^A u0055_030B -30867
+^A u0055_030A -30867
 ^A `U -30867
 ^A 'U -30867
 ^A ^U -30867
 ^A :U -30867
 ^A T -92602
+^A u0054_030C -92602
+^A u0054_0327 -92602
 ^A Y -92602
 ^A :Y -92602
 ^A 'Y -92602
 ^A V -123469
 ^A W -123469
 ^A e -61734
+^A u0065_030C -61734
+^A u0065_0328 -61734
 ^A `e -61734
 ^A 'e -61734
 ^A ^e -61734
 ^A :e -61734
 ^A a -61734
+^A u0061_0306 -61734
+^A u0061_0328 -61734
 ^A `a -61734
 ^A 'a -61734
 ^A ^a -61734
@@ -868,6 +1661,7 @@ w l 61734
 ^A oa -61734
 ^A ae -61734
 ^A o -61734
+^A u006F_030B -61734
 ^A `o -61734
 ^A 'o -61734
 ^A ^o -61734
@@ -876,25 +1670,37 @@ w l 61734
 ^A oe -61734
 ^A /o -61734
 ^A d -61734
+^A u0111 -61734
 ^A c -61734
 ^A 'c -61734
+^A u0063_030C -61734
 ^A ,c -61734
 ^A g -61734
+^A u0067_0306 -61734
 ^A q -61734
 ~A y -30867
 ~A :y -30867
 ~A 'y -30867
 ~A n -30867
+~A u006E_0301 -30867
+~A u006E_030C -30867
+~A u016A -30867
 ~A ~n -30867
 ~A l -30867
+~A u006C_0301 -30867
+~A u006C_030C -30867
 ~A r -30867
 ~A u -30867
+~A u0075_030B -30867
+~A u0075_030A -30867
 ~A `u -30867
 ~A 'u -30867
 ~A ^u -30867
 ~A :u -30867
 ~A m -30867
 ~A t -30867
+~A u0074_030C -30867
+~A u0074_0327 -30867
 ~A i -30867
 ~A 'i -30867
 ~A h -30867
@@ -905,9 +1711,12 @@ w l 61734
 ~A C -30867
 ~A G -30867
 ~A 'C -30867
+~A u0043_030C -30867
+~A u0047_0306 -30867
 ~A ,C -30867
 ~A Q -30867
 ~A O -30867
+~A u004F_030B -30867
 ~A `O -30867
 ~A 'O -30867
 ~A ^O -30867
@@ -916,22 +1725,30 @@ w l 61734
 ~A OE -30867
 ~A /O -30867
 ~A U -30867
+~A u0055_030B -30867
+~A u0055_030A -30867
 ~A `U -30867
 ~A 'U -30867
 ~A ^U -30867
 ~A :U -30867
 ~A T -92602
+~A u0054_030C -92602
+~A u0054_0327 -92602
 ~A Y -92602
 ~A :Y -92602
 ~A 'Y -92602
 ~A V -123469
 ~A W -123469
 ~A e -61734
+~A u0065_030C -61734
+~A u0065_0328 -61734
 ~A `e -61734
 ~A 'e -61734
 ~A ^e -61734
 ~A :e -61734
 ~A a -61734
+~A u0061_0306 -61734
+~A u0061_0328 -61734
 ~A `a -61734
 ~A 'a -61734
 ~A ^a -61734
@@ -941,6 +1758,7 @@ w l 61734
 ~A oa -61734
 ~A ae -61734
 ~A o -61734
+~A u006F_030B -61734
 ~A `o -61734
 ~A 'o -61734
 ~A ^o -61734
@@ -949,25 +1767,37 @@ w l 61734
 ~A oe -61734
 ~A /o -61734
 ~A d -61734
+~A u0111 -61734
 ~A c -61734
 ~A 'c -61734
+~A u0063_030C -61734
 ~A ,c -61734
 ~A g -61734
+~A u0067_0306 -61734
 ~A q -61734
 :A y -30867
 :A :y -30867
 :A 'y -30867
 :A n -30867
+:A u006E_0301 -30867
+:A u006E_030C -30867
+:A u016A -30867
 :A ~n -30867
 :A l -30867
+:A u006C_0301 -30867
+:A u006C_030C -30867
 :A r -30867
 :A u -30867
+:A u0075_030B -30867
+:A u0075_030A -30867
 :A `u -30867
 :A 'u -30867
 :A ^u -30867
 :A :u -30867
 :A m -30867
 :A t -30867
+:A u0074_030C -30867
+:A u0074_0327 -30867
 :A i -30867
 :A 'i -30867
 :A h -30867
@@ -978,9 +1808,12 @@ w l 61734
 :A C -30867
 :A G -30867
 :A 'C -30867
+:A u0043_030C -30867
+:A u0047_0306 -30867
 :A ,C -30867
 :A Q -30867
 :A O -30867
+:A u004F_030B -30867
 :A `O -30867
 :A 'O -30867
 :A ^O -30867
@@ -989,22 +1822,30 @@ w l 61734
 :A OE -30867
 :A /O -30867
 :A U -30867
+:A u0055_030B -30867
+:A u0055_030A -30867
 :A `U -30867
 :A 'U -30867
 :A ^U -30867
 :A :U -30867
 :A T -92602
+:A u0054_030C -92602
+:A u0054_0327 -92602
 :A Y -92602
 :A :Y -92602
 :A 'Y -92602
 :A V -123469
 :A W -123469
 :A e -61734
+:A u0065_030C -61734
+:A u0065_0328 -61734
 :A `e -61734
 :A 'e -61734
 :A ^e -61734
 :A :e -61734
 :A a -61734
+:A u0061_0306 -61734
+:A u0061_0328 -61734
 :A `a -61734
 :A 'a -61734
 :A ^a -61734
@@ -1014,6 +1855,7 @@ w l 61734
 :A oa -61734
 :A ae -61734
 :A o -61734
+:A u006F_030B -61734
 :A `o -61734
 :A 'o -61734
 :A ^o -61734
@@ -1022,25 +1864,37 @@ w l 61734
 :A oe -61734
 :A /o -61734
 :A d -61734
+:A u0111 -61734
 :A c -61734
 :A 'c -61734
+:A u0063_030C -61734
 :A ,c -61734
 :A g -61734
+:A u0067_0306 -61734
 :A q -61734
 oA y -30867
 oA :y -30867
 oA 'y -30867
 oA n -30867
+oA u006E_0301 -30867
+oA u006E_030C -30867
+oA u016A -30867
 oA ~n -30867
 oA l -30867
+oA u006C_0301 -30867
+oA u006C_030C -30867
 oA r -30867
 oA u -30867
+oA u0075_030B -30867
+oA u0075_030A -30867
 oA `u -30867
 oA 'u -30867
 oA ^u -30867
 oA :u -30867
 oA m -30867
 oA t -30867
+oA u0074_030C -30867
+oA u0074_0327 -30867
 oA i -30867
 oA 'i -30867
 oA h -30867
@@ -1051,9 +1905,12 @@ oA w -30867
 oA C -30867
 oA G -30867
 oA 'C -30867
+oA u0043_030C -30867
+oA u0047_0306 -30867
 oA ,C -30867
 oA Q -30867
 oA O -30867
+oA u004F_030B -30867
 oA `O -30867
 oA 'O -30867
 oA ^O -30867
@@ -1062,22 +1919,30 @@ oA :O -30867
 oA OE -30867
 oA /O -30867
 oA U -30867
+oA u0055_030B -30867
+oA u0055_030A -30867
 oA `U -30867
 oA 'U -30867
 oA ^U -30867
 oA :U -30867
 oA T -92602
+oA u0054_030C -92602
+oA u0054_0327 -92602
 oA Y -92602
 oA :Y -92602
 oA 'Y -92602
 oA V -123469
 oA W -123469
 oA e -61734
+oA u0065_030C -61734
+oA u0065_0328 -61734
 oA `e -61734
 oA 'e -61734
 oA ^e -61734
 oA :e -61734
 oA a -61734
+oA u0061_0306 -61734
+oA u0061_0328 -61734
 oA `a -61734
 oA 'a -61734
 oA ^a -61734
@@ -1087,6 +1952,7 @@ oA :a -61734
 oA oa -61734
 oA ae -61734
 oA o -61734
+oA u006F_030B -61734
 oA `o -61734
 oA 'o -61734
 oA ^o -61734
@@ -1095,28 +1961,67 @@ oA :o -61734
 oA oe -61734
 oA /o -61734
 oA d -61734
+oA u0111 -61734
 oA c -61734
 oA 'c -61734
+oA u0063_030C -61734
 oA ,c -61734
 oA g -61734
+oA u0067_0306 -61734
 oA q -61734
+u0189 X -30867
+u0110 X -30867
 -D X -30867
+u0189 W -30867
+u0110 W -30867
 -D W -30867
+u0189 A -30867
+u0110 A -30867
 -D A -30867
+u0189 u0041_0306 -30867
+u0110 u0041_0306 -30867
+-D u0041_0306 -30867
+u0189 u0041_0328 -30867
+u0110 u0041_0328 -30867
+-D u0041_0328 -30867
+u0189 `A -30867
+u0110 `A -30867
 -D `A -30867
+u0189 'A -30867
+u0110 'A -30867
 -D 'A -30867
+u0189 ^A -30867
+u0110 ^A -30867
 -D ^A -30867
+u0189 ~A -30867
+u0110 ~A -30867
 -D ~A -30867
+u0189 :A -30867
+u0110 :A -30867
 -D :A -30867
+u0189 oA -30867
+u0110 oA -30867
 -D oA -30867
+u0189 AE -30867
+u0110 AE -30867
 -D AE -30867
+u0189 V -30867
+u0110 V -30867
 -D V -30867
+u0189 Y -30867
+u0110 Y -30867
 -D Y -30867
+u0189 :Y -30867
+u0110 :Y -30867
 -D :Y -30867
+u0189 'Y -30867
+u0110 'Y -30867
 -D 'Y -30867
 `O X -30867
 `O W -30867
 `O A -30867
+`O u0041_0306 -30867
+`O u0041_0328 -30867
 `O `A -30867
 `O 'A -30867
 `O ^A -30867
@@ -1131,6 +2036,8 @@ oA q -61734
 'O X -30867
 'O W -30867
 'O A -30867
+'O u0041_0306 -30867
+'O u0041_0328 -30867
 'O `A -30867
 'O 'A -30867
 'O ^A -30867
@@ -1145,6 +2052,8 @@ oA q -61734
 ^O X -30867
 ^O W -30867
 ^O A -30867
+^O u0041_0306 -30867
+^O u0041_0328 -30867
 ^O `A -30867
 ^O 'A -30867
 ^O ^A -30867
@@ -1159,6 +2068,8 @@ oA q -61734
 ~O X -30867
 ~O W -30867
 ~O A -30867
+~O u0041_0306 -30867
+~O u0041_0328 -30867
 ~O `A -30867
 ~O 'A -30867
 ~O ^A -30867
@@ -1173,6 +2084,8 @@ oA q -61734
 :O X -30867
 :O W -30867
 :O A -30867
+:O u0041_0306 -30867
+:O u0041_0328 -30867
 :O `A -30867
 :O 'A -30867
 :O ^A -30867
@@ -1187,6 +2100,8 @@ oA q -61734
 /O X -30867
 /O W -30867
 /O A -30867
+/O u0041_0306 -30867
+/O u0041_0328 -30867
 /O `A -30867
 /O 'A -30867
 /O ^A -30867
@@ -1204,6 +2119,8 @@ oA q -61734
 'Y a -92602
 'Y u -92602
 'Y A -92602
+'Y u0041_0306 -92602
+'Y u0041_0328 -92602
 'Y `A -92602
 'Y 'A -92602
 'Y ^A -92602
@@ -1212,11 +2129,15 @@ oA q -61734
 'Y oA -92602
 'Y AE -92602
 `e e -61734
+`e u0065_030C -61734
+`e u0065_0328 -61734
 `e `e -61734
 `e 'e -61734
 `e ^e -61734
 `e :e -61734
 `e a -61734
+`e u0061_0306 -61734
+`e u0061_0328 -61734
 `e `a -61734
 `e 'a -61734
 `e ^a -61734
@@ -1226,6 +2147,7 @@ oA q -61734
 `e oa -61734
 `e ae -61734
 `e o -61734
+`e u006F_030B -61734
 `e `o -61734
 `e 'o -61734
 `e ^o -61734
@@ -1234,17 +2156,24 @@ oA q -61734
 `e oe -61734
 `e /o -61734
 `e d -61734
+`e u0111 -61734
 `e c -61734
 `e 'c -61734
+`e u0063_030C -61734
 `e ,c -61734
 `e g -61734
+`e u0067_0306 -61734
 `e q -61734
 'e e -61734
+'e u0065_030C -61734
+'e u0065_0328 -61734
 'e `e -61734
 'e 'e -61734
 'e ^e -61734
 'e :e -61734
 'e a -61734
+'e u0061_0306 -61734
+'e u0061_0328 -61734
 'e `a -61734
 'e 'a -61734
 'e ^a -61734
@@ -1254,6 +2183,7 @@ oA q -61734
 'e oa -61734
 'e ae -61734
 'e o -61734
+'e u006F_030B -61734
 'e `o -61734
 'e 'o -61734
 'e ^o -61734
@@ -1262,17 +2192,24 @@ oA q -61734
 'e oe -61734
 'e /o -61734
 'e d -61734
+'e u0111 -61734
 'e c -61734
 'e 'c -61734
+'e u0063_030C -61734
 'e ,c -61734
 'e g -61734
+'e u0067_0306 -61734
 'e q -61734
 ^e e -61734
+^e u0065_030C -61734
+^e u0065_0328 -61734
 ^e `e -61734
 ^e 'e -61734
 ^e ^e -61734
 ^e :e -61734
 ^e a -61734
+^e u0061_0306 -61734
+^e u0061_0328 -61734
 ^e `a -61734
 ^e 'a -61734
 ^e ^a -61734
@@ -1282,6 +2219,7 @@ oA q -61734
 ^e oa -61734
 ^e ae -61734
 ^e o -61734
+^e u006F_030B -61734
 ^e `o -61734
 ^e 'o -61734
 ^e ^o -61734
@@ -1290,17 +2228,24 @@ oA q -61734
 ^e oe -61734
 ^e /o -61734
 ^e d -61734
+^e u0111 -61734
 ^e c -61734
 ^e 'c -61734
+^e u0063_030C -61734
 ^e ,c -61734
 ^e g -61734
+^e u0067_0306 -61734
 ^e q -61734
 :e e -61734
+:e u0065_030C -61734
+:e u0065_0328 -61734
 :e `e -61734
 :e 'e -61734
 :e ^e -61734
 :e :e -61734
 :e a -61734
+:e u0061_0306 -61734
+:e u0061_0328 -61734
 :e `a -61734
 :e 'a -61734
 :e ^a -61734
@@ -1310,6 +2255,7 @@ oA q -61734
 :e oa -61734
 :e ae -61734
 :e o -61734
+:e u006F_030B -61734
 :e `o -61734
 :e 'o -61734
 :e ^o -61734
@@ -1318,17 +2264,24 @@ oA q -61734
 :e oe -61734
 :e /o -61734
 :e d -61734
+:e u0111 -61734
 :e c -61734
 :e 'c -61734
+:e u0063_030C -61734
 :e ,c -61734
 :e g -61734
+:e u0067_0306 -61734
 :e q -61734
 `o e -61734
+`o u0065_030C -61734
+`o u0065_0328 -61734
 `o `e -61734
 `o 'e -61734
 `o ^e -61734
 `o :e -61734
 `o a -61734
+`o u0061_0306 -61734
+`o u0061_0328 -61734
 `o `a -61734
 `o 'a -61734
 `o ^a -61734
@@ -1338,6 +2291,7 @@ oA q -61734
 `o oa -61734
 `o ae -61734
 `o o -61734
+`o u006F_030B -61734
 `o `o -61734
 `o 'o -61734
 `o ^o -61734
@@ -1346,17 +2300,24 @@ oA q -61734
 `o oe -61734
 `o /o -61734
 `o d -61734
+`o u0111 -61734
 `o c -61734
 `o 'c -61734
+`o u0063_030C -61734
 `o ,c -61734
 `o g -61734
+`o u0067_0306 -61734
 `o q -61734
 'o e -61734
+'o u0065_030C -61734
+'o u0065_0328 -61734
 'o `e -61734
 'o 'e -61734
 'o ^e -61734
 'o :e -61734
 'o a -61734
+'o u0061_0306 -61734
+'o u0061_0328 -61734
 'o `a -61734
 'o 'a -61734
 'o ^a -61734
@@ -1366,6 +2327,7 @@ oA q -61734
 'o oa -61734
 'o ae -61734
 'o o -61734
+'o u006F_030B -61734
 'o `o -61734
 'o 'o -61734
 'o ^o -61734
@@ -1374,17 +2336,24 @@ oA q -61734
 'o oe -61734
 'o /o -61734
 'o d -61734
+'o u0111 -61734
 'o c -61734
 'o 'c -61734
+'o u0063_030C -61734
 'o ,c -61734
 'o g -61734
+'o u0067_0306 -61734
 'o q -61734
 ^o e -61734
+^o u0065_030C -61734
+^o u0065_0328 -61734
 ^o `e -61734
 ^o 'e -61734
 ^o ^e -61734
 ^o :e -61734
 ^o a -61734
+^o u0061_0306 -61734
+^o u0061_0328 -61734
 ^o `a -61734
 ^o 'a -61734
 ^o ^a -61734
@@ -1394,6 +2363,7 @@ oA q -61734
 ^o oa -61734
 ^o ae -61734
 ^o o -61734
+^o u006F_030B -61734
 ^o `o -61734
 ^o 'o -61734
 ^o ^o -61734
@@ -1402,17 +2372,24 @@ oA q -61734
 ^o oe -61734
 ^o /o -61734
 ^o d -61734
+^o u0111 -61734
 ^o c -61734
 ^o 'c -61734
+^o u0063_030C -61734
 ^o ,c -61734
 ^o g -61734
+^o u0067_0306 -61734
 ^o q -61734
 ~o e -61734
+~o u0065_030C -61734
+~o u0065_0328 -61734
 ~o `e -61734
 ~o 'e -61734
 ~o ^e -61734
 ~o :e -61734
 ~o a -61734
+~o u0061_0306 -61734
+~o u0061_0328 -61734
 ~o `a -61734
 ~o 'a -61734
 ~o ^a -61734
@@ -1422,6 +2399,7 @@ oA q -61734
 ~o oa -61734
 ~o ae -61734
 ~o o -61734
+~o u006F_030B -61734
 ~o `o -61734
 ~o 'o -61734
 ~o ^o -61734
@@ -1430,17 +2408,24 @@ oA q -61734
 ~o oe -61734
 ~o /o -61734
 ~o d -61734
+~o u0111 -61734
 ~o c -61734
 ~o 'c -61734
+~o u0063_030C -61734
 ~o ,c -61734
 ~o g -61734
+~o u0067_0306 -61734
 ~o q -61734
 :o e -61734
+:o u0065_030C -61734
+:o u0065_0328 -61734
 :o `e -61734
 :o 'e -61734
 :o ^e -61734
 :o :e -61734
 :o a -61734
+:o u0061_0306 -61734
+:o u0061_0328 -61734
 :o `a -61734
 :o 'a -61734
 :o ^a -61734
@@ -1450,6 +2435,7 @@ oA q -61734
 :o oa -61734
 :o ae -61734
 :o o -61734
+:o u006F_030B -61734
 :o `o -61734
 :o 'o -61734
 :o ^o -61734
@@ -1458,17 +2444,24 @@ oA q -61734
 :o oe -61734
 :o /o -61734
 :o d -61734
+:o u0111 -61734
 :o c -61734
 :o 'c -61734
+:o u0063_030C -61734
 :o ,c -61734
 :o g -61734
+:o u0067_0306 -61734
 :o q -61734
 Tp e -61734
+Tp u0065_030C -61734
+Tp u0065_0328 -61734
 Tp `e -61734
 Tp 'e -61734
 Tp ^e -61734
 Tp :e -61734
 Tp a -61734
+Tp u0061_0306 -61734
+Tp u0061_0328 -61734
 Tp `a -61734
 Tp 'a -61734
 Tp ^a -61734
@@ -1478,6 +2471,7 @@ Tp :a -61734
 Tp oa -61734
 Tp ae -61734
 Tp o -61734
+Tp u006F_030B -61734
 Tp `o -61734
 Tp 'o -61734
 Tp ^o -61734
@@ -1486,10 +2480,13 @@ Tp :o -61734
 Tp oe -61734
 Tp /o -61734
 Tp d -61734
+Tp u0111 -61734
 Tp c -61734
 Tp 'c -61734
+Tp u0063_030C -61734
 Tp ,c -61734
 Tp g -61734
+Tp u0067_0306 -61734
 Tp q -61734
 charset
 ga	619674,684320	2	0000
@@ -1524,8 +2521,9 @@ fi	707034,723632,203840,113859	3	0034
 fl	737901,723632,203840,113859	3	0035
 Fi	1095203,723632,203840,113859	3	0036
 Fl	1110637,723632,203840,113859	3	0037
----	619674,465920,101920,46446,0,23224	1	0040
-!	404768,723632,0,119755	2	0041
+u2423	619674,465920,101920,46446,0,23224	1	0040
+u01C3	404768,723632,0,119755	2	0041
+!	"
 dq	619674,723632,0,88816	2	0042
 "	"
 sh	990080,723632,203840,71637	3	0043
@@ -1539,8 +2537,7 @@ cq	372736,723632,0,135699	2	0047
 (	496205,778232,262080,165693	3	0050
 )	496205,778232,262080,34653	3	0051
 *	619674,778232,0,150259	2	0052
-pl	928346,632486,108326,34653	3	0053
-+	"
++	928346,632486,108326,34653	3	0053
 ,	372736,154336,203840	1	0054
 -	434470,465920,0,27373	0	0055
 .	372736,154336	0	0056
@@ -1559,8 +2556,7 @@ sl	619674,778232,262080,165693	3	0057
 :	372736,465920,0,70251	0	0072
 ;	372736,465920,203840,70251	1	0073
 <	928346,613858,89698,91730	3	0074
-eq	928346,410018,-114142,71637	0	0075
-=	"
+=	928346,410018,-114142,71637	0	0075
 >	928346,613858,89698,3786	3	0076
 ?	619674,723632,0,120266	2	0077
 at	928346,723632,0,96533	2	0100
@@ -1630,74 +2626,73 @@ y	588806,465920,203840,110074,-17666,71246	1	0171
 z	514259,465920,0,145600,0,98814	0	0172
 lC	619674,778232,262080,153754	3	0173
 {	"
-ba	372736,778232,262080,104549	3	0174
-bv	"
-or	"
+u01C0	372736,778232,262080,104549	3	0174
+ba	"
 |	"
 rC	619674,778232,262080,22714	3	0175
 }	"
 ~	743142,723632,0,120266	2	0176
 hy	249267,465920,0,27373	0	0177
----	907379,937664	2	0200
----	907379,723632,203840	3	0201
+u0041_0306	907379,937664	2	0200
+u0041_0328	907379,723632,203840	3	0201
 'C	866611,916128,0,148949	2	0202
----	866611,937664,0,148949,-84813,74475	2	0203
----	917862,937664,0,95003,0,64136	2	0204
----	793229,937664,0,119755,0,59915	2	0205
----	793229,723632,203840,119755	3	0206
----	938538,937664,0,77022,-84813,77022	2	0207
----	731494,916128,0,0,0,61734	2	0210
----	731494,937664,0,0,0,61734	2	0211
+u0043_030C	866611,937664,0,148949,-84813,74475	2	0203
+u0044_030C	917862,937664,0,95003,0,64136	2	0204
+u0045_030C	793229,937664,0,119755,0,59915	2	0205
+u0045_0328	793229,723632,203840,119755	3	0206
+u0047_0306	938538,937664,0,77022,-84813,77022	2	0207
+u004C_0301	731494,916128,0,0,0,61734	2	0210
+u004C_030C	731494,937664,0,0,0,61734	2	0211
 /L	731494,723632	2	0212
----	939411,916128,0,180398	2	0213
----	939411,937664,0,180398,0,59333	2	0214
----	948730,723632,0,179816,0,59042	2	0215
----	896314,916128,0,95003,-84813,64136	2	0216
----	900973,916128,0,26827,0,20120	2	0217
----	900973,937664,0,26827,0,20120	2	0220
----	681408,916128,0,118082	2	0221
+u004E_0301	939411,916128,0,180398	2	0213
+u004E_030C	939411,937664,0,180398,0,59333	2	0214
+u014A	948730,723632,0,179816,0,59042	2	0215
+u004F_030B	896314,916128,0,95003,-84813,64136	2	0216
+u0052_0301	900973,916128,0,26827,0,20120	2	0217
+u0052_030C	900973,937664,0,26827,0,20120	2	0220
+u0053_0301	681408,916128,0,118082	2	0221
 vS	681408,937664,0,118082,0,59042	2	0222
----	681408,723632,178360,118082,0,59042	3	0223
----	834579,937664,0,135262,-134862,-19074	2	0224
----	834579,723632,178360,135262,-134862,-19074	3	0225
----	923395,916128,0,180398,-136064,59333	2	0226
----	923395,937664,0,180398,-136064,59333	2	0227
+u0053_0327	681408,723632,178360,118082,0,59042	3	0223
+u0054_030C	834579,937664,0,135262,-134862,-19074	2	0224
+u0054_0327	834579,723632,178360,135262,-134862,-19074	3	0225
+u0055_030B	923395,916128,0,180398,-136064,59333	2	0226
+u0055_030A	923395,937664,0,180398,-136064,59333	2	0227
 :Y	907379,937664,0,207597,-148949,-39341	2	0230
----	743142,916128,0,148949	2	0231
+u005A_0301	743142,916128,0,148949	2	0231
 vZ	743142,937664,0,148949,0,74475	2	0232
----	743142,916128,0,148949	2	0233
+u005A_0307	743142,916128,0,148949	2	0233
 IJ	1050067,723632,0,152006,0,45136	2	0234
----	494458,916128,0,164382,0,82192	2	0235
----	619674,723632,0,113859,-34070,113859	2	0236
+u0049_0307	494458,916128,0,164382,0,82192	2	0235
+u0111	619674,723632,0,113859,-34070,113859	2	0236
 sc	575994,723632,203840	3	0237
----	619674,684320,0,98814,-34070,98814	2	0240
----	619674,465920,203840,98814	1	0241
+u0061_0306	619674,684320,0,98814,-34070,98814	2	0240
+u0061_0328	619674,465920,203840,98814	1	0241
 'c	557939,684320,0,54746	2	0242
----	557939,684320,0,54746,-34070,54746	2	0243
----	619674,723632,0,113859,-34070,113859	2	0244
----	557939,684320,0,89107,-34070,89107	2	0245
----	557939,465920,203840,89107	1	0246
----	557939,684320,203840,110074,-35818,71246	3	0247
----	311002,916128,0,113859,-30867,129682	2	0250
----	311002,723632,0,113859,-30867,129682	2	0251
+u0063_030C	557939,684320,0,54746,-34070,54746	2	0243
+u0064_030C	619674,723632,0,113859,-34070,113859	2	0244
+u0065_030C	557939,684320,0,89107,-34070,89107	2	0245
+u0065_0328	557939,465920,203840,89107	1	0246
+u0067_0306	557939,684320,203840,110074,-35818,71246	3	0247
+u006C_0301	311002,916128,0,113859,-30867,129682	2	0250
+u006C_030C	311002,723632,0,113859,-30867,129682	2	0251
 /l	372736,723632,0,113859	2	0252
----	681408,684320,0,98814	2	0253
----	681408,684320,0,98814,-17666,98814	2	0254
----	681408,465920,203840,98814,-17666,98814	1	0255
----	619674,684320,0,82410,-34070,82410	2	0256
----	525907,684320,0,116480,-17666,85613	2	0257
----	525907,684320,0,116480,-17666,85613	2	0260
----	510474,684320,0,85613	2	0261
+u006E_0301	681408,684320,0,98814	2	0253
+u006E_030C	681408,684320,0,98814,-17666,98814	2	0254
+u016A	681408,465920,203840,98814,-17666,98814	1	0255
+u006F_030B	619674,684320,0,82410,-34070,82410	2	0256
+u0072_0301	525907,684320,0,116480,-17666,85613	2	0257
+u0072_030C	525907,684320,0,116480,-17666,85613	2	0260
+u0073_0301	510474,684320,0,85613	2	0261
 vs	510474,684320,0,140213,0,140213	2	0262
----	510474,465920,178360,85613,0,85613	1	0263
----	403603,723632,0,101046,-39312,101046	2	0264
----	403603,670592,178360,101046,-39312,101046	3	0265
----	650541,684320,0,231067,-17666,231067	2	0266
----	650541,684320,0,98814,-17666,98814	2	0267
+u0073_0327	510474,465920,178360,85613,0,85613	1	0263
+u0074_030C	403603,723632,0,101046,-39312,101046	2	0264
+u0074_0327	403603,670592,178360,101046,-39312,101046	3	0265
+u0075_030B	650541,684320,0,231067,-17666,231067	2	0266
+u0075_030A	650541,684320,0,98814,-17666,98814	2	0267
 :y	588806,684320,203840,110074,-17666,71246	3	0270
----	514259,684320,0,145600,0,98814	2	0271
+u007A_0301	514259,684320,0,145600,0,98814	2	0271
 vz	514259,684320,0,145600,0,98814	2	0272
----	514259,723632,0,145600,0,98814	2	0273
+u007A_0307	514259,723632,0,145600,0,98814	2	0273
 ij	681408,723632,203840,119371,50960,110074	3	0274
 r!	404768,524160,203840,68723	3	0275
 r?	619674,524160,203840	3	0276
@@ -1718,7 +2713,9 @@ AE	1072198,723632,0,119755	2	0306
 'I	494458,916128,0,164382,0,82192	2	0315
 ^I	494458,937664,0,164382,0,82192	2	0316
 :I	494458,937664,0,164382,0,82192	2	0317
--D	917862,723632,0,95003,0,64136	2	0320
+u0189	917862,723632,0,95003,0,64136	2	0320
+u0110	"
+-D	"
 ~N	939411,937664,0,180398,0,59333	2	0321
 `O	896314,916128,0,95003,-84813,64136	2	0322
 'O	896314,916128,0,95003	2	0323
diff --git a/contrib/groff/font/devdvi/TBITC b/contrib/groff/font/devdvi/TBITC
index e9aec28..1a68c23 100644
--- a/contrib/groff/font/devdvi/TBITC
+++ b/contrib/groff/font/devdvi/TBITC
@@ -31,11 +31,11 @@ charset
 ---	619674,723632,0,516589	2	0034
 ---	619674,723632,0,575605	2	0035
 ---	0,723632	2	0037
----	557939,723632,0,82410,-34070,82410	2	0040
+u2422	557939,723632,0,82410,-34070,82410	2	0040
 Do	619674,786240,58240,138029	3	0044
 $	"
 aq	372736,723632,0,119683	2	0047
-**	619674,495040,-29120	2	0052
+---	619674,495040,-29120	2	0052
 ,	372736,154336,203840	1	0054
 ---	434470,410018,-114142,71637	0	0055
 .	372736,154336	0	0056
@@ -51,14 +51,13 @@ f/	619674,786240,262080,165693	3	0057
 8	619674,679952,0,107162	2	0070
 9	619674,472035,203840,54746	3	0071
 la	496205,786240,262080	3	0074
-mi	928346,634378,108326,34653	3	0075
-\-	"
+\-	928346,634378,108326,34653	3	0075
 ra	496205,786240,262080	3	0076
----	866611,723632,0,158208,0,79104	2	0115
+u2127	866611,723632,0,158208,0,79104	2	0115
 ci	1298752,786240,262080	3	0117
----	866611,723632,0,103995,0,51998	2	0127
----	511638,786240,262080	3	0133
----	511638,786240,262080	3	0135
+u03A9	866611,723632,0,103995,0,51998	2	0127
+u301A	511638,786240,262080	3	0133
+u301B	511638,786240,262080	3	0135
 ua	619674,723632,203840,95514	3	0136
 da	619674,723632,203840	3	0137
 ---	619674,723632	2	0140
@@ -67,7 +66,7 @@ da	619674,723632,203840	3	0137
 ---	619674,634378,26210	3	0144
 ---	1175283,723632	2	0154
 ---	619674,495040,-29120	2	0155
----	679078,723632	2	0156
+u266A	679078,723632	2	0156
 ti	743142,133120	0	0176
 ~	"
 ---	249267,410018,-114142,71637	0	0177
@@ -77,34 +76,34 @@ ti	743142,133120	0	0176
 ---	619674,723632	2	0203
 dg	557939,723632,203840	3	0204
 dd	557939,723632,203840	3	0205
----	619674,786240,262080	3	0206
-%O	1360486,786240,58240,134826	3	0207
+u2016	619674,786240,262080	3	0206
+%0	1360486,786240,58240,134826	3	0207
 bu	619674,472035,-46010	2	0210
----	1113549,723632,0,148949,-84813,74475	2	0211
+u2103	1113549,723632,0,148949,-84813,74475	2	0211
 ---	743142,786240,58240,138029	3	0212
 ---	619674,567840,101920,104133	3	0213
 Fn	419328,723632,203840,228301,112694,116480	3	0214
----	866611,786240,58240,148949,-84813,74475	3	0215
----	1216051,723632,0,195250,-133515,40914	2	0216
----	970278,723632,0,180398,0,59333	2	0217
+u20A1	866611,786240,58240,148949,-84813,74475	3	0215
+u20A9	1216051,723632,0,195250,-133515,40914	2	0216
+u20A6	970278,723632,0,180398,0,59333	2	0217
 ---	938538,786240,58240,77022,-84813,77022	3	0220
----	840694,723632,0,103995,0,-50341	2	0221
----	910510,723632	2	0222
----	900973,723632,0,26827,0,20120	2	0223
----	683738,723632,0,120266	2	0224
+u20B1	840694,723632,0,103995,0,-50341	2	0221
+u20A4	910510,723632	2	0222
+u211E	900973,723632,0,26827,0,20120	2	0223
+u203D	683738,723632,0,120266	2	0224
 ---	619674,524160,203840	3	0225
----	619674,786240,0,128419,-34070,128419	2	0226
+u20AB	619674,786240,0,128419,-34070,128419	2	0226
 tm	804877,786240,0,550366	2	0227
----	1811264,786240,58240,134826	3	0230
+u2031	1811264,786240,58240,134826	3	0230
 ---	588806,723632,203840	3	0231
----	856128,786240,58240,103995,0,51998	3	0232
----	1140048,723632,0,180398,0,59333	2	0233
----	619674,786240,0,165693	2	0234
----	834288,723632,0,136659	2	0235
----	619674,472035,-46010	2	0236
----	804877,786240,0,550366	2	0237
----	465338,786240,262080,22714	3	0240
----	465338,786240,262080,153754	3	0241
+u0E3F	856128,786240,58240,103995,0,51998	3	0232
+u2116	1140048,723632,0,180398,0,59333	2	0233
+u2052	619674,786240,0,165693	2	0234
+u212E	834288,723632,0,136659	2	0235
+u25E6	619674,472035,-46010	2	0236
+u2120	804877,786240,0,550366	2	0237
+u2045	465338,786240,262080,22714	3	0240
+u2046	465338,786240,262080,153754	3	0241
 ct	619674,567840,101920,104133	3	0242
 Po	910510,723632	2	0243
 Cs	864454,599043,0,116480	2	0244
@@ -115,10 +114,10 @@ sc	575994,723632,203840	3	0247
 co	1298752,786240,262080	3	0251
 Of	557939,786240,0,137592	2	0252
 ---	1298752,786240,262080	3	0253
-no	804877,472035,0,85613	2	0254
----	1298752,786240,262080	3	0255
+tno	804877,472035,0,85613	2	0254
+u2117	1298752,786240,262080	3	0255
 rg	1298752,786240,262080	3	0256
-rn	928346,723632	2	0257
+---	928346,723632	2	0257
 de	434470,723632	2	0260
 t+-	928346,634378,108326,34653	3	0261
 S2	557939,786240,0,165693	2	0262
@@ -127,13 +126,13 @@ S3	557939,786240,0,165693	2	0263
 mc	619674,472035,203840,98814,44554,98814	3	0265
 ps	743142,723632,203840	3	0266
 pc	321485,472035	2	0267
----	740811,553278,0,27373	2	0270
+u203B	740811,553278,0,27373	2	0270
 S1	557939,786240,0,165693	2	0271
 Om	557939,786240,0,137592	2	0272
 ---	556774,786240,199165,196560	3	0273
-14	557939,786240,203840,165693	3	0274
-12	557939,786240,203840,165693	3	0275
-34	557939,786240,203840,165693	3	0276
+---	557939,786240,203840,165693	3	0274
+---	557939,786240,203840,165693	3	0275
+---	557939,786240,203840,165693	3	0276
 Eu	928346,723632,0,119829	2	0277
 tmu	928346,634378,108326,34653	3	0326
 tdi	928346,634378,108326,34653	3	0366
diff --git a/contrib/groff/font/devdvi/TBTC b/contrib/groff/font/devdvi/TBTC
index 9a623b3..94e2360 100644
--- a/contrib/groff/font/devdvi/TBTC
+++ b/contrib/groff/font/devdvi/TBTC
@@ -30,11 +30,11 @@ charset
 ---	602784,723632,0,326144	2	0034
 ---	602784,723632,0,359632	2	0035
 ---	0,723632	2	0037
----	669760,723632	2	0040
+u2422	669760,723632	2	0040
 Do	602784,786240,58240	3	0044
 $	"
 aq	334880,723632	2	0047
-**	602784,495768,-29120	2	0052
+---	602784,495768,-29120	2	0052
 ,	334880,163072,203840	1	0054
 ---	401856,410018,-114142	0	0055
 .	334880,163072	0	0056
@@ -50,14 +50,13 @@ f/	602784,786240,262080	3	0057
 8	602784,679952	2	0070
 9	602784,465920,203840	1	0071
 la	468832,786240,262080	3	0074
-mi	937664,664624,139776	3	0075
-\-	"
+\-	937664,664624,139776	3	0075
 ra	468832,786240,262080	3	0076
----	870688,723632	2	0115
+u2127	870688,723632	2	0115
 ci	1339520,786240,262080	3	0117
----	870688,723632	2	0127
----	485576,786240,262080	3	0133
----	485576,786240,262080	3	0135
+u03A9	870688,723632	2	0127
+u301A	485576,786240,262080	3	0133
+u301B	485576,786240,262080	3	0135
 ua	602784,723632,203840	3	0136
 da	602784,723632,203840	3	0137
 ---	602784,723632	2	0140
@@ -66,7 +65,7 @@ da	602784,723632,203840	3	0137
 ---	602784,636270,26210	3	0144
 ---	1205568,723632	2	0154
 ---	602784,495768,-29120	2	0155
----	736736,723632	2	0156
+u266A	736736,723632	2	0156
 ti	736736,133120	0	0176
 ~	"
 ---	200928,410018,-114142	0	0177
@@ -76,34 +75,34 @@ ti	736736,133120	0	0176
 ---	602784,723632	2	0203
 dg	535808,723632,203840	3	0204
 dd	535808,723632,203840	3	0205
----	602784,786240,262080	3	0206
-%O	1406496,786240,58240	3	0207
+u2016	602784,786240,262080	3	0206
+%0	1406496,786240,58240	3	0207
 bu	602784,495768,-27664	2	0210
----	1138592,723632,0,0,-33488	2	0211
+u2103	1138592,723632,0,0,-33488	2	0211
 ---	736736,786240,58240	3	0212
 ---	602784,567840,101920	3	0213
 Fn	368368,723632,0,114296	2	0214
----	870688,786240,58240,0,-33488	3	0215
----	1246336,723632,0,16744,50232,-150696	2	0216
----	976976,723632	2	0217
+u20A1	870688,786240,58240,0,-33488	3	0215
+u20A9	1246336,723632,0,16744,50232,-150696	2	0216
+u20A6	976976,723632	2	0217
 ---	947856,786240,58240,0,-33488	3	0220
----	840840,723632,0,0,0,-167440	2	0221
----	770224,723632	2	0222
----	904176,723632	2	0223
----	569296,723632	2	0224
+u20B1	840840,723632,0,0,0,-167440	2	0221
+u20A4	770224,723632	2	0222
+u211E	904176,723632	2	0223
+u203D	569296,723632	2	0224
 ---	569296,524160,203840	3	0225
----	669760,786240	2	0226
+u20AB	669760,786240	2	0226
 tm	803712,786240,0,550366	2	0227
----	1889888,786240,58240	3	0230
+u2031	1889888,786240,58240	3	0230
 ---	569296,723632,203840	3	0231
----	857584,786240,58240	3	0232
----	1157520,723632	2	0233
----	602784,786240	2	0234
----	833560,723632	2	0235
----	602784,495768,-27664	2	0236
----	803712,786240,0,550366	2	0237
----	435344,786240,262080	3	0240
----	435344,786240,262080	3	0241
+u0E3F	857584,786240,58240	3	0232
+u2116	1157520,723632	2	0233
+u2052	602784,786240	2	0234
+u212E	833560,723632	2	0235
+u25E6	602784,495768,-27664	2	0236
+u2120	803712,786240,0,550366	2	0237
+u2045	435344,786240,262080	3	0240
+u2046	435344,786240,262080	3	0241
 ct	602784,567840,101920	3	0242
 Po	770224,723632	2	0243
 Cs	810874,599043	2	0244
@@ -114,10 +113,10 @@ sc	554736,723632,203840	3	0247
 co	1339520,786240,262080	3	0251
 Of	535808,786240	2	0252
 ---	1339520,786240,262080	3	0253
-no	803712,465920	0	0254
----	1339520,786240,262080	3	0255
+tno	803712,465920	0	0254
+u2117	1339520,786240,262080	3	0255
 rg	1339520,786240,262080	3	0256
-rn	937664,723632	2	0257
+---	937664,723632	2	0257
 de	401856,723632	2	0260
 t+-	937664,664624,139776	3	0261
 S2	535808,786240	2	0262
@@ -126,13 +125,13 @@ S3	535808,786240	2	0263
 mc	669760,465920,203840	1	0265
 ps	736736,723632,203840	3	0266
 pc	288288,465920	0	0267
----	687230,553278	2	0270
+u203B	687230,553278	2	0270
 S1	535808,786240	2	0271
 Om	535808,786240	2	0272
 ---	569296,786240,199165	3	0273
-14	535808,786240,203840	3	0274
-12	535808,786240,203840	3	0275
-34	535808,786240,203840	3	0276
+---	535808,786240,203840	3	0274
+---	535808,786240,203840	3	0275
+---	535808,786240,203840	3	0276
 Eu	937664,723632	2	0277
 tmu	937664,664624,139776	3	0326
 tdi	937664,664624,139776	3	0366
diff --git a/contrib/groff/font/devdvi/TI b/contrib/groff/font/devdvi/TI
index f073937..31a0edc 100644
--- a/contrib/groff/font/devdvi/TI
+++ b/contrib/groff/font/devdvi/TI
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TI
 special
@@ -21,6 +21,8 @@ ff ] 109373
 cq ' -80390
 ' cq -80390
 cq cq -80390
+slash@for@l l -267968
+slash@for@l L -336125
 cq ? 107187
 ' ? 107187
 cq ! 107187
@@ -243,7 +245,7 @@ oe	750310,451470,0,78789	0	0033
 AE	925654,716526,0,126120	2	0035
 OE	1032842,716526,0,126120	2	0036
 /O	803904,767499,50973,98595	3	0037
----	267968,451470	0	0040
+slash@for@l	267968,451470	0	0040
 !	321562,728178,0,130200	2	0041
 rq	539432,728178,0,72994	2	0042
 sh	857498,728178,203888,69378	3	0043
diff --git a/contrib/groff/font/devdvi/TIEC b/contrib/groff/font/devdvi/TIEC
index a21473c..ccf4bec 100644
--- a/contrib/groff/font/devdvi/TIEC
+++ b/contrib/groff/font/devdvi/TIEC
@@ -16,6 +16,7 @@ bq Y -80371
 bq :Y -80371
 bq 'Y -80371
 bq O -26790
+bq u004F_030B -26790
 bq `O -26790
 bq 'O -26790
 bq ^O -26790
@@ -26,6 +27,8 @@ bq /O -26790
 bq C -26790
 bq G -26790
 bq 'C -26790
+bq u0043_030C -26790
+bq u0047_0306 -26790
 bq ,C -26790
 bq Q -26790
 lq oq 107162
@@ -46,6 +49,7 @@ Bq Y -80371
 Bq :Y -80371
 Bq 'Y -80371
 Bq O -26790
+Bq u004F_030B -26790
 Bq `O -26790
 Bq 'O -26790
 Bq ^O -26790
@@ -56,6 +60,8 @@ Bq /O -26790
 Bq C -26790
 Bq G -26790
 Bq 'C -26790
+Bq u0043_030C -26790
+Bq u0047_0306 -26790
 Bq ,C -26790
 Bq Q -26790
 Fc . -80371
@@ -67,6 +73,7 @@ ff ` 109346
 ff lq 109346
 ff rq 109346
 ff ? 109346
+ff u01C3 109346
 ff ! 109346
 ff ) 109346
 ff rB 109346
@@ -75,22 +82,33 @@ cq rq 107162
 ' rq 107162
 cq ? 107162
 ' ? 107162
+cq u01C3 107162
 cq ! 107162
+' u01C3 107162
 ' ! 107162
 A y -26790
 A :y -26790
 A 'y -26790
 A n -26790
+A u006E_0301 -26790
+A u006E_030C -26790
+A u016A -26790
 A ~n -26790
 A l -26790
+A u006C_0301 -26790
+A u006C_030C -26790
 A r -26790
 A u -26790
+A u0075_030B -26790
+A u0075_030A -26790
 A `u -26790
 A 'u -26790
 A ^u -26790
 A :u -26790
 A m -26790
 A t -26790
+A u0074_030C -26790
+A u0074_0327 -26790
 A i -26790
 A 'i -26790
 A h -26790
@@ -101,9 +119,12 @@ A w -26790
 A C -26790
 A G -26790
 A 'C -26790
+A u0043_030C -26790
+A u0047_0306 -26790
 A ,C -26790
 A Q -26790
 A O -26790
+A u004F_030B -26790
 A `O -26790
 A 'O -26790
 A ^O -26790
@@ -112,22 +133,30 @@ A :O -26790
 A OE -26790
 A /O -26790
 A U -26790
+A u0055_030B -26790
+A u0055_030A -26790
 A `U -26790
 A 'U -26790
 A ^U -26790
 A :U -26790
 A T -80371
+A u0054_030C -80371
+A u0054_0327 -80371
 A Y -80371
 A :Y -80371
 A 'Y -80371
 A V -107162
 A W -107162
 A e -53581
+A u0065_030C -53581
+A u0065_0328 -53581
 A `e -53581
 A 'e -53581
 A ^e -53581
 A :e -53581
 A a -53581
+A u0061_0306 -53581
+A u0061_0328 -53581
 A `a -53581
 A 'a -53581
 A ^a -53581
@@ -137,6 +166,7 @@ A :a -53581
 A oa -53581
 A ae -53581
 A o -53581
+A u006F_030B -53581
 A `o -53581
 A 'o -53581
 A ^o -53581
@@ -145,14 +175,19 @@ A :o -53581
 A oe -53581
 A /o -53581
 A d -53581
+A u0111 -53581
 A c -53581
 A 'c -53581
+A u0063_030C -53581
 A ,c -53581
 A g -53581
+A u0067_0306 -53581
 A q -53581
 D X -26790
 D W -26790
 D A -26790
+D u0041_0306 -26790
+D u0041_0328 -26790
 D `A -26790
 D 'A -26790
 D ^A -26790
@@ -166,12 +201,16 @@ D :Y -26790
 D 'Y -26790
 F o -80371
 F e -80371
+F u0065_0328 -80371
 F u -80371
 F r -80371
 F n -80371
 F v -80371
 F a -80371
+F u0061_0328 -80371
 F A -107162
+F u0041_0306 -107162
+F u0041_0328 -107162
 F `A -107162
 F 'A -107162
 F ^A -107162
@@ -180,6 +219,7 @@ F :A -107162
 F oA -107162
 F AE -107162
 F O -26790
+F u004F_030B -26790
 F `O -26790
 F 'O -26790
 F ^O -26790
@@ -190,11 +230,14 @@ F /O -26790
 F C -26790
 F G -26790
 F 'C -26790
+F u0043_030C -26790
+F u0047_0306 -26790
 F ,C -26790
 F Q -26790
 K v -26790
 K w -26790
 K O -26790
+K u004F_030B -26790
 K `O -26790
 K 'O -26790
 K ^O -26790
@@ -205,20 +248,28 @@ K /O -26790
 K C -26790
 K G -26790
 K 'C -26790
+K u0043_030C -26790
+K u0047_0306 -26790
 K ,C -26790
 K Q -26790
 L T -80371
+L u0054_030C -80371
+L u0054_0327 -80371
 L Y -80371
 L :Y -80371
 L 'Y -80371
 L V -107162
 L W -107162
 L e -53581
+L u0065_030C -53581
+L u0065_0328 -53581
 L `e -53581
 L 'e -53581
 L ^e -53581
 L :e -53581
 L a -53581
+L u0061_0306 -53581
+L u0061_0328 -53581
 L `a -53581
 L 'a -53581
 L ^a -53581
@@ -228,6 +279,7 @@ L :a -53581
 L oa -53581
 L ae -53581
 L o -53581
+L u006F_030B -53581
 L `o -53581
 L 'o -53581
 L ^o -53581
@@ -236,14 +288,19 @@ L :o -53581
 L oe -53581
 L /o -53581
 L d -53581
+L u0111 -53581
 L c -53581
 L 'c -53581
+L u0063_030C -53581
 L ,c -53581
 L g -53581
+L u0067_0306 -53581
 L q -53581
 O X -26790
 O W -26790
 O A -26790
+O u0041_0306 -26790
+O u0041_0328 -26790
 O `A -26790
 O 'A -26790
 O ^A -26790
@@ -256,6 +313,8 @@ O Y -26790
 O :Y -26790
 O 'Y -26790
 P A -80371
+P u0041_0306 -80371
+P u0041_0328 -80371
 P `A -80371
 P 'A -80371
 P ^A -80371
@@ -264,16 +323,25 @@ P :A -80371
 P oA -80371
 P AE -80371
 R n -26790
+R u006E_0301 -26790
+R u006E_030C -26790
+R u016A -26790
 R ~n -26790
 R l -26790
+R u006C_0301 -26790
+R u006C_030C -26790
 R r -26790
 R u -26790
+R u0075_030B -26790
+R u0075_030A -26790
 R `u -26790
 R 'u -26790
 R ^u -26790
 R :u -26790
 R m -26790
 R t -26790
+R u0074_030C -26790
+R u0074_0327 -26790
 R i -26790
 R 'i -26790
 R h -26790
@@ -284,9 +352,12 @@ R w -26790
 R C -26790
 R G -26790
 R 'C -26790
+R u0043_030C -26790
+R u0047_0306 -26790
 R ,C -26790
 R Q -26790
 R O -26790
+R u004F_030B -26790
 R `O -26790
 R 'O -26790
 R ^O -26790
@@ -295,22 +366,30 @@ R :O -26790
 R OE -26790
 R /O -26790
 R U -26790
+R u0055_030B -26790
+R u0055_030A -26790
 R `U -26790
 R 'U -26790
 R ^U -26790
 R :U -26790
 R T -80371
+R u0054_030C -80371
+R u0054_0327 -80371
 R Y -80371
 R :Y -80371
 R 'Y -80371
 R V -107162
 R W -107162
 R e -53581
+R u0065_030C -53581
+R u0065_0328 -53581
 R `e -53581
 R 'e -53581
 R ^e -53581
 R :e -53581
 R a -53581
+R u0061_0306 -53581
+R u0061_0328 -53581
 R `a -53581
 R 'a -53581
 R ^a -53581
@@ -320,6 +399,7 @@ R :a -53581
 R oa -53581
 R ae -53581
 R o -53581
+R u006F_030B -53581
 R `o -53581
 R 'o -53581
 R ^o -53581
@@ -328,10 +408,13 @@ R :o -53581
 R oe -53581
 R /o -53581
 R d -53581
+R u0111 -53581
 R c -53581
 R 'c -53581
+R u0063_030C -53581
 R ,c -53581
 R g -53581
+R u0067_0306 -53581
 R q -53581
 T y -80371
 T e -80371
@@ -340,6 +423,8 @@ T r -80371
 T a -80371
 T u -80371
 T A -80371
+T u0041_0306 -80371
+T u0041_0328 -80371
 T `A -80371
 T 'A -80371
 T ^A -80371
@@ -349,12 +434,16 @@ T oA -80371
 T AE -80371
 V o -80371
 V e -80371
+V u0065_0328 -80371
 V u -80371
 V r -80371
 V n -80371
 V v -80371
 V a -80371
+V u0061_0328 -80371
 V A -107162
+V u0041_0306 -107162
+V u0041_0328 -107162
 V `A -107162
 V 'A -107162
 V ^A -107162
@@ -363,6 +452,7 @@ V :A -107162
 V oA -107162
 V AE -107162
 V O -26790
+V u004F_030B -26790
 V `O -26790
 V 'O -26790
 V ^O -26790
@@ -373,16 +463,22 @@ V /O -26790
 V C -26790
 V G -26790
 V 'C -26790
+V u0043_030C -26790
+V u0047_0306 -26790
 V ,C -26790
 V Q -26790
 W o -80371
 W e -80371
+W u0065_0328 -80371
 W u -80371
 W r -80371
 W n -80371
 W v -80371
 W a -80371
+W u0061_0328 -80371
 W A -107162
+W u0041_0306 -107162
+W u0041_0328 -107162
 W `A -107162
 W 'A -107162
 W ^A -107162
@@ -391,6 +487,7 @@ W :A -107162
 W oA -107162
 W AE -107162
 W O -26790
+W u004F_030B -26790
 W `O -26790
 W 'O -26790
 W ^O -26790
@@ -401,9 +498,12 @@ W /O -26790
 W C -26790
 W G -26790
 W 'C -26790
+W u0043_030C -26790
+W u0047_0306 -26790
 W ,C -26790
 W Q -26790
 X O -26790
+X u004F_030B -26790
 X `O -26790
 X 'O -26790
 X ^O -26790
@@ -414,6 +514,8 @@ X /O -26790
 X C -26790
 X G -26790
 X 'C -26790
+X u0043_030C -26790
+X u0047_0306 -26790
 X ,C -26790
 X Q -26790
 Y e -80371
@@ -422,6 +524,8 @@ Y r -80371
 Y a -80371
 Y u -80371
 Y A -80371
+Y u0041_0306 -80371
+Y u0041_0328 -80371
 Y `A -80371
 Y 'A -80371
 Y ^A -80371
@@ -433,14 +537,20 @@ oq lq 107162
 ` lq 107162
 oq ? 107162
 ` ? 107162
+oq u01C3 107162
 oq ! 107162
+` u01C3 107162
 ` ! 107162
 b e -53581
+b u0065_030C -53581
+b u0065_0328 -53581
 b `e -53581
 b 'e -53581
 b ^e -53581
 b :e -53581
 b a -53581
+b u0061_0306 -53581
+b u0061_0328 -53581
 b `a -53581
 b 'a -53581
 b ^a -53581
@@ -450,6 +560,7 @@ b :a -53581
 b oa -53581
 b ae -53581
 b o -53581
+b u006F_030B -53581
 b `o -53581
 b 'o -53581
 b ^o -53581
@@ -458,17 +569,24 @@ b :o -53581
 b oe -53581
 b /o -53581
 b d -53581
+b u0111 -53581
 b c -53581
 b 'c -53581
+b u0063_030C -53581
 b ,c -53581
 b g -53581
+b u0067_0306 -53581
 b q -53581
 c e -53581
+c u0065_030C -53581
+c u0065_0328 -53581
 c `e -53581
 c 'e -53581
 c ^e -53581
 c :e -53581
 c a -53581
+c u0061_0306 -53581
+c u0061_0328 -53581
 c `a -53581
 c 'a -53581
 c ^a -53581
@@ -478,6 +596,7 @@ c :a -53581
 c oa -53581
 c ae -53581
 c o -53581
+c u006F_030B -53581
 c `o -53581
 c 'o -53581
 c ^o -53581
@@ -486,18 +605,27 @@ c :o -53581
 c oe -53581
 c /o -53581
 c d -53581
+c u0111 -53581
 c c -53581
 c 'c -53581
+c u0063_030C -53581
 c ,c -53581
 c g -53581
+c u0067_0306 -53581
 c q -53581
 d l 53581
+d u006C_0301 53581
+d u006C_030C 53581
 e e -53581
+e u0065_030C -53581
+e u0065_0328 -53581
 e `e -53581
 e 'e -53581
 e ^e -53581
 e :e -53581
 e a -53581
+e u0061_0306 -53581
+e u0061_0328 -53581
 e `a -53581
 e 'a -53581
 e ^a -53581
@@ -507,6 +635,7 @@ e :a -53581
 e oa -53581
 e ae -53581
 e o -53581
+e u006F_030B -53581
 e `o -53581
 e 'o -53581
 e ^o -53581
@@ -515,10 +644,13 @@ e :o -53581
 e oe -53581
 e /o -53581
 e d -53581
+e u0111 -53581
 e c -53581
 e 'c -53581
+e u0063_030C -53581
 e ,c -53581
 e g -53581
+e u0067_0306 -53581
 e q -53581
 f cq 109346
 f ' 109346
@@ -527,19 +659,26 @@ f ` 109346
 f lq 109346
 f rq 109346
 f ? 109346
+f u01C3 109346
 f ! 109346
 f ) 109346
 f rB 109346
 f ] 109346
 l l 53581
+l u006C_0301 53581
+l u006C_030C 53581
 n cq -107162
 n ' -107162
 o e -53581
+o u0065_030C -53581
+o u0065_0328 -53581
 o `e -53581
 o 'e -53581
 o ^e -53581
 o :e -53581
 o a -53581
+o u0061_0306 -53581
+o u0061_0328 -53581
 o `a -53581
 o 'a -53581
 o ^a -53581
@@ -549,6 +688,7 @@ o :a -53581
 o oa -53581
 o ae -53581
 o o -53581
+o u006F_030B -53581
 o `o -53581
 o 'o -53581
 o ^o -53581
@@ -557,17 +697,24 @@ o :o -53581
 o oe -53581
 o /o -53581
 o d -53581
+o u0111 -53581
 o c -53581
 o 'c -53581
+o u0063_030C -53581
 o ,c -53581
 o g -53581
+o u0067_0306 -53581
 o q -53581
 p e -53581
+p u0065_030C -53581
+p u0065_0328 -53581
 p `e -53581
 p 'e -53581
 p ^e -53581
 p :e -53581
 p a -53581
+p u0061_0306 -53581
+p u0061_0328 -53581
 p `a -53581
 p 'a -53581
 p ^a -53581
@@ -577,6 +724,7 @@ p :a -53581
 p oa -53581
 p ae -53581
 p o -53581
+p u006F_030B -53581
 p `o -53581
 p 'o -53581
 p ^o -53581
@@ -585,17 +733,24 @@ p :o -53581
 p oe -53581
 p /o -53581
 p d -53581
+p u0111 -53581
 p c -53581
 p 'c -53581
+p u0063_030C -53581
 p ,c -53581
 p g -53581
+p u0067_0306 -53581
 p q -53581
 r e -53581
+r u0065_030C -53581
+r u0065_0328 -53581
 r `e -53581
 r 'e -53581
 r ^e -53581
 r :e -53581
 r a -53581
+r u0061_0306 -53581
+r u0061_0328 -53581
 r `a -53581
 r 'a -53581
 r ^a -53581
@@ -605,6 +760,7 @@ r :a -53581
 r oa -53581
 r ae -53581
 r o -53581
+r u006F_030B -53581
 r `o -53581
 r 'o -53581
 r ^o -53581
@@ -613,18 +769,462 @@ r :o -53581
 r oe -53581
 r /o -53581
 r d -53581
+r u0111 -53581
 r c -53581
 r 'c -53581
+r u0063_030C -53581
 r ,c -53581
 r g -53581
+r u0067_0306 -53581
 r q -53581
 w l 53581
+w u006C_0301 53581
+w u006C_030C 53581
+u0041_0306 y -26790
+u0041_0306 :y -26790
+u0041_0306 'y -26790
+u0041_0306 n -26790
+u0041_0306 u006E_0301 -26790
+u0041_0306 u006E_030C -26790
+u0041_0306 u016A -26790
+u0041_0306 ~n -26790
+u0041_0306 l -26790
+u0041_0306 u006C_0301 -26790
+u0041_0306 u006C_030C -26790
+u0041_0306 r -26790
+u0041_0306 u -26790
+u0041_0306 u0075_030B -26790
+u0041_0306 u0075_030A -26790
+u0041_0306 `u -26790
+u0041_0306 'u -26790
+u0041_0306 ^u -26790
+u0041_0306 :u -26790
+u0041_0306 m -26790
+u0041_0306 t -26790
+u0041_0306 u0074_030C -26790
+u0041_0306 u0074_0327 -26790
+u0041_0306 i -26790
+u0041_0306 'i -26790
+u0041_0306 h -26790
+u0041_0306 b -26790
+u0041_0306 k -26790
+u0041_0306 v -26790
+u0041_0306 w -26790
+u0041_0306 C -26790
+u0041_0306 G -26790
+u0041_0306 'C -26790
+u0041_0306 u0043_030C -26790
+u0041_0306 u0047_0306 -26790
+u0041_0306 ,C -26790
+u0041_0306 Q -26790
+u0041_0306 O -26790
+u0041_0306 u004F_030B -26790
+u0041_0306 `O -26790
+u0041_0306 'O -26790
+u0041_0306 ^O -26790
+u0041_0306 ~O -26790
+u0041_0306 :O -26790
+u0041_0306 OE -26790
+u0041_0306 /O -26790
+u0041_0306 U -26790
+u0041_0306 u0055_030B -26790
+u0041_0306 u0055_030A -26790
+u0041_0306 `U -26790
+u0041_0306 'U -26790
+u0041_0306 ^U -26790
+u0041_0306 :U -26790
+u0041_0306 T -80371
+u0041_0306 u0054_030C -80371
+u0041_0306 u0054_0327 -80371
+u0041_0306 Y -80371
+u0041_0306 :Y -80371
+u0041_0306 'Y -80371
+u0041_0306 V -107162
+u0041_0306 W -107162
+u0041_0306 e -53581
+u0041_0306 u0065_030C -53581
+u0041_0306 u0065_0328 -53581
+u0041_0306 `e -53581
+u0041_0306 'e -53581
+u0041_0306 ^e -53581
+u0041_0306 :e -53581
+u0041_0306 a -53581
+u0041_0306 u0061_0306 -53581
+u0041_0306 u0061_0328 -53581
+u0041_0306 `a -53581
+u0041_0306 'a -53581
+u0041_0306 ^a -53581
+u0041_0306 ^a -53581
+u0041_0306 ~a -53581
+u0041_0306 :a -53581
+u0041_0306 oa -53581
+u0041_0306 ae -53581
+u0041_0306 o -53581
+u0041_0306 u006F_030B -53581
+u0041_0306 `o -53581
+u0041_0306 'o -53581
+u0041_0306 ^o -53581
+u0041_0306 ~o -53581
+u0041_0306 :o -53581
+u0041_0306 oe -53581
+u0041_0306 /o -53581
+u0041_0306 d -53581
+u0041_0306 u0111 -53581
+u0041_0306 c -53581
+u0041_0306 'c -53581
+u0041_0306 u0063_030C -53581
+u0041_0306 ,c -53581
+u0041_0306 g -53581
+u0041_0306 u0067_0306 -53581
+u0041_0306 q -53581
+u0041_0328 n -26790
+u0041_0328 u006E_0301 -26790
+u0041_0328 u006E_030C -26790
+u0041_0328 u016A -26790
+u0041_0328 ~n -26790
+u0041_0328 l -26790
+u0041_0328 u006C_0301 -26790
+u0041_0328 u006C_030C -26790
+u0041_0328 r -26790
+u0041_0328 u -26790
+u0041_0328 u0075_030B -26790
+u0041_0328 u0075_030A -26790
+u0041_0328 `u -26790
+u0041_0328 'u -26790
+u0041_0328 ^u -26790
+u0041_0328 :u -26790
+u0041_0328 m -26790
+u0041_0328 t -26790
+u0041_0328 u0074_030C -26790
+u0041_0328 u0074_0327 -26790
+u0041_0328 i -26790
+u0041_0328 'i -26790
+u0041_0328 h -26790
+u0041_0328 b -26790
+u0041_0328 k -26790
+u0041_0328 v -26790
+u0041_0328 w -26790
+u0041_0328 C -26790
+u0041_0328 G -26790
+u0041_0328 'C -26790
+u0041_0328 u0043_030C -26790
+u0041_0328 u0047_0306 -26790
+u0041_0328 ,C -26790
+u0041_0328 Q -26790
+u0041_0328 O -26790
+u0041_0328 u004F_030B -26790
+u0041_0328 `O -26790
+u0041_0328 'O -26790
+u0041_0328 ^O -26790
+u0041_0328 ~O -26790
+u0041_0328 :O -26790
+u0041_0328 OE -26790
+u0041_0328 /O -26790
+u0041_0328 U -26790
+u0041_0328 u0055_030B -26790
+u0041_0328 u0055_030A -26790
+u0041_0328 `U -26790
+u0041_0328 'U -26790
+u0041_0328 ^U -26790
+u0041_0328 :U -26790
+u0041_0328 T -80371
+u0041_0328 u0054_030C -80371
+u0041_0328 u0054_0327 -80371
+u0041_0328 Y -80371
+u0041_0328 :Y -80371
+u0041_0328 'Y -80371
+u0041_0328 V -107162
+u0041_0328 W -107162
+u0041_0328 e -53581
+u0041_0328 u0065_030C -53581
+u0041_0328 u0065_0328 -53581
+u0041_0328 `e -53581
+u0041_0328 'e -53581
+u0041_0328 ^e -53581
+u0041_0328 :e -53581
+u0041_0328 a -53581
+u0041_0328 u0061_0306 -53581
+u0041_0328 u0061_0328 -53581
+u0041_0328 `a -53581
+u0041_0328 'a -53581
+u0041_0328 ^a -53581
+u0041_0328 ^a -53581
+u0041_0328 ~a -53581
+u0041_0328 :a -53581
+u0041_0328 oa -53581
+u0041_0328 ae -53581
+u0041_0328 o -53581
+u0041_0328 u006F_030B -53581
+u0041_0328 `o -53581
+u0041_0328 'o -53581
+u0041_0328 ^o -53581
+u0041_0328 ~o -53581
+u0041_0328 :o -53581
+u0041_0328 oe -53581
+u0041_0328 /o -53581
+u0041_0328 d -53581
+u0041_0328 u0111 -53581
+u0041_0328 c -53581
+u0041_0328 'c -53581
+u0041_0328 u0063_030C -53581
+u0041_0328 ,c -53581
+u0041_0328 g -53581
+u0041_0328 u0067_0306 -53581
+u0041_0328 q -53581
+u0044_030C X -26790
+u0044_030C W -26790
+u0044_030C A -26790
+u0044_030C u0041_0306 -26790
+u0044_030C u0041_0328 -26790
+u0044_030C `A -26790
+u0044_030C 'A -26790
+u0044_030C ^A -26790
+u0044_030C ~A -26790
+u0044_030C :A -26790
+u0044_030C oA -26790
+u0044_030C AE -26790
+u0044_030C V -26790
+u0044_030C Y -26790
+u0044_030C :Y -26790
+u0044_030C 'Y -26790
+u004C_0301 T -80371
+u004C_0301 u0054_030C -80371
+u004C_0301 u0054_0327 -80371
+u004C_0301 Y -80371
+u004C_0301 :Y -80371
+u004C_0301 'Y -80371
+u004C_0301 V -107162
+u004C_0301 W -107162
+u004C_0301 e -53581
+u004C_0301 u0065_030C -53581
+u004C_0301 u0065_0328 -53581
+u004C_0301 `e -53581
+u004C_0301 'e -53581
+u004C_0301 ^e -53581
+u004C_0301 :e -53581
+u004C_0301 a -53581
+u004C_0301 u0061_0306 -53581
+u004C_0301 u0061_0328 -53581
+u004C_0301 `a -53581
+u004C_0301 'a -53581
+u004C_0301 ^a -53581
+u004C_0301 ^a -53581
+u004C_0301 ~a -53581
+u004C_0301 :a -53581
+u004C_0301 oa -53581
+u004C_0301 ae -53581
+u004C_0301 o -53581
+u004C_0301 u006F_030B -53581
+u004C_0301 `o -53581
+u004C_0301 'o -53581
+u004C_0301 ^o -53581
+u004C_0301 ~o -53581
+u004C_0301 :o -53581
+u004C_0301 oe -53581
+u004C_0301 /o -53581
+u004C_0301 d -53581
+u004C_0301 u0111 -53581
+u004C_0301 c -53581
+u004C_0301 'c -53581
+u004C_0301 u0063_030C -53581
+u004C_0301 ,c -53581
+u004C_0301 g -53581
+u004C_0301 u0067_0306 -53581
+u004C_0301 q -53581
+u004C_030C T -80371
+u004C_030C u0054_030C -80371
+u004C_030C u0054_0327 -80371
+u004C_030C Y -80371
+u004C_030C :Y -80371
+u004C_030C 'Y -80371
+u004C_030C V -107162
+u004C_030C W -107162
+u004C_030C e -53581
+u004C_030C u0065_030C -53581
+u004C_030C u0065_0328 -53581
+u004C_030C `e -53581
+u004C_030C 'e -53581
+u004C_030C ^e -53581
+u004C_030C :e -53581
+u004C_030C a -53581
+u004C_030C u0061_0306 -53581
+u004C_030C u0061_0328 -53581
+u004C_030C `a -53581
+u004C_030C 'a -53581
+u004C_030C ^a -53581
+u004C_030C ^a -53581
+u004C_030C ~a -53581
+u004C_030C :a -53581
+u004C_030C oa -53581
+u004C_030C ae -53581
+u004C_030C o -53581
+u004C_030C u006F_030B -53581
+u004C_030C `o -53581
+u004C_030C 'o -53581
+u004C_030C ^o -53581
+u004C_030C ~o -53581
+u004C_030C :o -53581
+u004C_030C oe -53581
+u004C_030C /o -53581
+u004C_030C d -53581
+u004C_030C u0111 -53581
+u004C_030C c -53581
+u004C_030C 'c -53581
+u004C_030C u0063_030C -53581
+u004C_030C ,c -53581
+u004C_030C g -53581
+u004C_030C u0067_0306 -53581
+u004C_030C q -53581
+u004F_030B X -26790
+u004F_030B W -26790
+u004F_030B A -26790
+u004F_030B u0041_0306 -26790
+u004F_030B u0041_0328 -26790
+u004F_030B `A -26790
+u004F_030B 'A -26790
+u004F_030B ^A -26790
+u004F_030B ~A -26790
+u004F_030B :A -26790
+u004F_030B oA -26790
+u004F_030B AE -26790
+u004F_030B V -26790
+u004F_030B Y -26790
+u004F_030B :Y -26790
+u004F_030B 'Y -26790
+u0052_0301 n -26790
+u0052_0301 u006E_0301 -26790
+u0052_0301 u006E_030C -26790
+u0052_0301 u016A -26790
+u0052_0301 ~n -26790
+u0052_0301 l -26790
+u0052_0301 u006C_0301 -26790
+u0052_0301 u006C_030C -26790
+u0052_0301 r -26790
+u0052_0301 u -26790
+u0052_0301 u0075_030B -26790
+u0052_0301 u0075_030A -26790
+u0052_0301 `u -26790
+u0052_0301 'u -26790
+u0052_0301 ^u -26790
+u0052_0301 :u -26790
+u0052_0301 m -26790
+u0052_0301 t -26790
+u0052_0301 u0074_030C -26790
+u0052_0301 u0074_0327 -26790
+u0052_0301 i -26790
+u0052_0301 'i -26790
+u0052_0301 h -26790
+u0052_0301 b -26790
+u0052_0301 k -26790
+u0052_0301 v -26790
+u0052_0301 w -26790
+u0052_0301 C -26790
+u0052_0301 G -26790
+u0052_0301 'C -26790
+u0052_0301 u0043_030C -26790
+u0052_0301 u0047_0306 -26790
+u0052_0301 ,C -26790
+u0052_0301 Q -26790
+u0052_0301 O -26790
+u0052_0301 u004F_030B -26790
+u0052_0301 `O -26790
+u0052_0301 'O -26790
+u0052_0301 ^O -26790
+u0052_0301 ~O -26790
+u0052_0301 :O -26790
+u0052_0301 OE -26790
+u0052_0301 /O -26790
+u0052_0301 U -26790
+u0052_0301 u0055_030B -26790
+u0052_0301 u0055_030A -26790
+u0052_0301 `U -26790
+u0052_0301 'U -26790
+u0052_0301 ^U -26790
+u0052_0301 :U -26790
+u0052_0301 T -80371
+u0052_0301 u0054_030C -80371
+u0052_0301 u0054_0327 -80371
+u0052_0301 Y -80371
+u0052_0301 :Y -80371
+u0052_0301 'Y -80371
+u0052_0301 V -107162
+u0052_0301 W -107162
+u0052_0301 e -53581
+u0052_0301 u0065_030C -53581
+u0052_0301 u0065_0328 -53581
+u0052_0301 `e -53581
+u0052_0301 'e -53581
+u0052_0301 ^e -53581
+u0052_0301 :e -53581
+u0052_0301 a -53581
+u0052_0301 u0061_0306 -53581
+u0052_0301 u0061_0328 -53581
+u0052_0301 `a -53581
+u0052_0301 'a -53581
+u0052_0301 ^a -53581
+u0052_0301 ^a -53581
+u0052_0301 ~a -53581
+u0052_0301 :a -53581
+u0052_0301 oa -53581
+u0052_0301 ae -53581
+u0052_0301 o -53581
+u0052_0301 u006F_030B -53581
+u0052_0301 `o -53581
+u0052_0301 'o -53581
+u0052_0301 ^o -53581
+u0052_0301 ~o -53581
+u0052_0301 :o -53581
+u0052_0301 oe -53581
+u0052_0301 /o -53581
+u0052_0301 d -53581
+u0052_0301 u0111 -53581
+u0052_0301 c -53581
+u0052_0301 'c -53581
+u0052_0301 u0063_030C -53581
+u0052_0301 ,c -53581
+u0052_0301 g -53581
+u0052_0301 u0067_0306 -53581
+u0052_0301 q -53581
+u0054_030C y -80371
+u0054_030C e -80371
+u0054_030C o -80371
+u0054_030C r -80371
+u0054_030C a -80371
+u0054_030C u -80371
+u0054_030C A -80371
+u0054_030C u0041_0306 -80371
+u0054_030C u0041_0328 -80371
+u0054_030C `A -80371
+u0054_030C 'A -80371
+u0054_030C ^A -80371
+u0054_030C ~A -80371
+u0054_030C :A -80371
+u0054_030C oA -80371
+u0054_030C AE -80371
+u0054_0327 y -80371
+u0054_0327 e -80371
+u0054_0327 o -80371
+u0054_0327 r -80371
+u0054_0327 a -80371
+u0054_0327 u -80371
+u0054_0327 A -80371
+u0054_0327 u0041_0306 -80371
+u0054_0327 u0041_0328 -80371
+u0054_0327 `A -80371
+u0054_0327 'A -80371
+u0054_0327 ^A -80371
+u0054_0327 ~A -80371
+u0054_0327 :A -80371
+u0054_0327 oA -80371
+u0054_0327 AE -80371
 :Y e -80371
 :Y o -80371
 :Y r -80371
 :Y a -80371
 :Y u -80371
 :Y A -80371
+:Y u0041_0306 -80371
+:Y u0041_0328 -80371
 :Y `A -80371
 :Y 'A -80371
 :Y ^A -80371
@@ -633,11 +1233,15 @@ w l 53581
 :Y oA -80371
 :Y AE -80371
 'c e -53581
+'c u0065_030C -53581
+'c u0065_0328 -53581
 'c `e -53581
 'c 'e -53581
 'c ^e -53581
 'c :e -53581
 'c a -53581
+'c u0061_0306 -53581
+'c u0061_0328 -53581
 'c `a -53581
 'c 'a -53581
 'c ^a -53581
@@ -647,6 +1251,7 @@ w l 53581
 'c oa -53581
 'c ae -53581
 'c o -53581
+'c u006F_030B -53581
 'c `o -53581
 'c 'o -53581
 'c ^o -53581
@@ -655,27 +1260,156 @@ w l 53581
 'c oe -53581
 'c /o -53581
 'c d -53581
+'c u0111 -53581
 'c c -53581
 'c 'c -53581
+'c u0063_030C -53581
 'c ,c -53581
 'c g -53581
+'c u0067_0306 -53581
 'c q -53581
+u0063_030C e -53581
+u0063_030C u0065_030C -53581
+u0063_030C u0065_0328 -53581
+u0063_030C `e -53581
+u0063_030C 'e -53581
+u0063_030C ^e -53581
+u0063_030C :e -53581
+u0063_030C a -53581
+u0063_030C u0061_0306 -53581
+u0063_030C u0061_0328 -53581
+u0063_030C `a -53581
+u0063_030C 'a -53581
+u0063_030C ^a -53581
+u0063_030C ^a -53581
+u0063_030C ~a -53581
+u0063_030C :a -53581
+u0063_030C oa -53581
+u0063_030C ae -53581
+u0063_030C o -53581
+u0063_030C u006F_030B -53581
+u0063_030C `o -53581
+u0063_030C 'o -53581
+u0063_030C ^o -53581
+u0063_030C ~o -53581
+u0063_030C :o -53581
+u0063_030C oe -53581
+u0063_030C /o -53581
+u0063_030C d -53581
+u0063_030C u0111 -53581
+u0063_030C c -53581
+u0063_030C 'c -53581
+u0063_030C u0063_030C -53581
+u0063_030C ,c -53581
+u0063_030C g -53581
+u0063_030C u0067_0306 -53581
+u0063_030C q -53581
+u0064_030C l 53581
+u0064_030C u006C_0301 53581
+u0064_030C u006C_030C 53581
+u0065_030C e -53581
+u0065_030C u0065_030C -53581
+u0065_030C u0065_0328 -53581
+u0065_030C `e -53581
+u0065_030C 'e -53581
+u0065_030C ^e -53581
+u0065_030C :e -53581
+u0065_030C a -53581
+u0065_030C u0061_0306 -53581
+u0065_030C u0061_0328 -53581
+u0065_030C `a -53581
+u0065_030C 'a -53581
+u0065_030C ^a -53581
+u0065_030C ^a -53581
+u0065_030C ~a -53581
+u0065_030C :a -53581
+u0065_030C oa -53581
+u0065_030C ae -53581
+u0065_030C o -53581
+u0065_030C u006F_030B -53581
+u0065_030C `o -53581
+u0065_030C 'o -53581
+u0065_030C ^o -53581
+u0065_030C ~o -53581
+u0065_030C :o -53581
+u0065_030C oe -53581
+u0065_030C /o -53581
+u0065_030C d -53581
+u0065_030C u0111 -53581
+u0065_030C c -53581
+u0065_030C 'c -53581
+u0065_030C u0063_030C -53581
+u0065_030C ,c -53581
+u0065_030C g -53581
+u0065_030C u0067_0306 -53581
+u0065_030C q -53581
+u0065_0328 e -53581
+u0065_0328 u0065_030C -53581
+u0065_0328 u0065_0328 -53581
+u0065_0328 `e -53581
+u0065_0328 'e -53581
+u0065_0328 ^e -53581
+u0065_0328 :e -53581
+u0065_0328 a -53581
+u0065_0328 u0061_0306 -53581
+u0065_0328 u0061_0328 -53581
+u0065_0328 `a -53581
+u0065_0328 'a -53581
+u0065_0328 ^a -53581
+u0065_0328 ^a -53581
+u0065_0328 ~a -53581
+u0065_0328 :a -53581
+u0065_0328 oa -53581
+u0065_0328 ae -53581
+u0065_0328 o -53581
+u0065_0328 u006F_030B -53581
+u0065_0328 `o -53581
+u0065_0328 'o -53581
+u0065_0328 ^o -53581
+u0065_0328 ~o -53581
+u0065_0328 :o -53581
+u0065_0328 oe -53581
+u0065_0328 /o -53581
+u0065_0328 d -53581
+u0065_0328 u0111 -53581
+u0065_0328 c -53581
+u0065_0328 'c -53581
+u0065_0328 u0063_030C -53581
+u0065_0328 ,c -53581
+u0065_0328 g -53581
+u0065_0328 u0067_0306 -53581
+u0065_0328 q -53581
+u006C_0301 l 53581
+u006C_0301 u006C_0301 53581
+u006C_0301 u006C_030C 53581
+u006C_030C l 53581
+u006C_030C u006C_0301 53581
+u006C_030C u006C_030C 53581
 /l cq 26790
 /l ' 26790
 `A y -26790
 `A :y -26790
 `A 'y -26790
 `A n -26790
+`A u006E_0301 -26790
+`A u006E_030C -26790
+`A u016A -26790
 `A ~n -26790
 `A l -26790
+`A u006C_0301 -26790
+`A u006C_030C -26790
 `A r -26790
 `A u -26790
+`A u0075_030B -26790
+`A u0075_030A -26790
 `A `u -26790
 `A 'u -26790
 `A ^u -26790
 `A :u -26790
 `A m -26790
 `A t -26790
+`A u0074_030C -26790
+`A u0074_0327 -26790
 `A i -26790
 `A 'i -26790
 `A h -26790
@@ -686,9 +1420,12 @@ w l 53581
 `A C -26790
 `A G -26790
 `A 'C -26790
+`A u0043_030C -26790
+`A u0047_0306 -26790
 `A ,C -26790
 `A Q -26790
 `A O -26790
+`A u004F_030B -26790
 `A `O -26790
 `A 'O -26790
 `A ^O -26790
@@ -697,22 +1434,30 @@ w l 53581
 `A OE -26790
 `A /O -26790
 `A U -26790
+`A u0055_030B -26790
+`A u0055_030A -26790
 `A `U -26790
 `A 'U -26790
 `A ^U -26790
 `A :U -26790
 `A T -80371
+`A u0054_030C -80371
+`A u0054_0327 -80371
 `A Y -80371
 `A :Y -80371
 `A 'Y -80371
 `A V -107162
 `A W -107162
 `A e -53581
+`A u0065_030C -53581
+`A u0065_0328 -53581
 `A `e -53581
 `A 'e -53581
 `A ^e -53581
 `A :e -53581
 `A a -53581
+`A u0061_0306 -53581
+`A u0061_0328 -53581
 `A `a -53581
 `A 'a -53581
 `A ^a -53581
@@ -722,6 +1467,7 @@ w l 53581
 `A oa -53581
 `A ae -53581
 `A o -53581
+`A u006F_030B -53581
 `A `o -53581
 `A 'o -53581
 `A ^o -53581
@@ -730,25 +1476,37 @@ w l 53581
 `A oe -53581
 `A /o -53581
 `A d -53581
+`A u0111 -53581
 `A c -53581
 `A 'c -53581
+`A u0063_030C -53581
 `A ,c -53581
 `A g -53581
+`A u0067_0306 -53581
 `A q -53581
 'A y -26790
 'A :y -26790
 'A 'y -26790
 'A n -26790
+'A u006E_0301 -26790
+'A u006E_030C -26790
+'A u016A -26790
 'A ~n -26790
 'A l -26790
+'A u006C_0301 -26790
+'A u006C_030C -26790
 'A r -26790
 'A u -26790
+'A u0075_030B -26790
+'A u0075_030A -26790
 'A `u -26790
 'A 'u -26790
 'A ^u -26790
 'A :u -26790
 'A m -26790
 'A t -26790
+'A u0074_030C -26790
+'A u0074_0327 -26790
 'A i -26790
 'A 'i -26790
 'A h -26790
@@ -759,9 +1517,12 @@ w l 53581
 'A C -26790
 'A G -26790
 'A 'C -26790
+'A u0043_030C -26790
+'A u0047_0306 -26790
 'A ,C -26790
 'A Q -26790
 'A O -26790
+'A u004F_030B -26790
 'A `O -26790
 'A 'O -26790
 'A ^O -26790
@@ -770,22 +1531,30 @@ w l 53581
 'A OE -26790
 'A /O -26790
 'A U -26790
+'A u0055_030B -26790
+'A u0055_030A -26790
 'A `U -26790
 'A 'U -26790
 'A ^U -26790
 'A :U -26790
 'A T -80371
+'A u0054_030C -80371
+'A u0054_0327 -80371
 'A Y -80371
 'A :Y -80371
 'A 'Y -80371
 'A V -107162
 'A W -107162
 'A e -53581
+'A u0065_030C -53581
+'A u0065_0328 -53581
 'A `e -53581
 'A 'e -53581
 'A ^e -53581
 'A :e -53581
 'A a -53581
+'A u0061_0306 -53581
+'A u0061_0328 -53581
 'A `a -53581
 'A 'a -53581
 'A ^a -53581
@@ -795,6 +1564,7 @@ w l 53581
 'A oa -53581
 'A ae -53581
 'A o -53581
+'A u006F_030B -53581
 'A `o -53581
 'A 'o -53581
 'A ^o -53581
@@ -803,25 +1573,37 @@ w l 53581
 'A oe -53581
 'A /o -53581
 'A d -53581
+'A u0111 -53581
 'A c -53581
 'A 'c -53581
+'A u0063_030C -53581
 'A ,c -53581
 'A g -53581
+'A u0067_0306 -53581
 'A q -53581
 ^A y -26790
 ^A :y -26790
 ^A 'y -26790
 ^A n -26790
+^A u006E_0301 -26790
+^A u006E_030C -26790
+^A u016A -26790
 ^A ~n -26790
 ^A l -26790
+^A u006C_0301 -26790
+^A u006C_030C -26790
 ^A r -26790
 ^A u -26790
+^A u0075_030B -26790
+^A u0075_030A -26790
 ^A `u -26790
 ^A 'u -26790
 ^A ^u -26790
 ^A :u -26790
 ^A m -26790
 ^A t -26790
+^A u0074_030C -26790
+^A u0074_0327 -26790
 ^A i -26790
 ^A 'i -26790
 ^A h -26790
@@ -832,9 +1614,12 @@ w l 53581
 ^A C -26790
 ^A G -26790
 ^A 'C -26790
+^A u0043_030C -26790
+^A u0047_0306 -26790
 ^A ,C -26790
 ^A Q -26790
 ^A O -26790
+^A u004F_030B -26790
 ^A `O -26790
 ^A 'O -26790
 ^A ^O -26790
@@ -843,22 +1628,30 @@ w l 53581
 ^A OE -26790
 ^A /O -26790
 ^A U -26790
+^A u0055_030B -26790
+^A u0055_030A -26790
 ^A `U -26790
 ^A 'U -26790
 ^A ^U -26790
 ^A :U -26790
 ^A T -80371
+^A u0054_030C -80371
+^A u0054_0327 -80371
 ^A Y -80371
 ^A :Y -80371
 ^A 'Y -80371
 ^A V -107162
 ^A W -107162
 ^A e -53581
+^A u0065_030C -53581
+^A u0065_0328 -53581
 ^A `e -53581
 ^A 'e -53581
 ^A ^e -53581
 ^A :e -53581
 ^A a -53581
+^A u0061_0306 -53581
+^A u0061_0328 -53581
 ^A `a -53581
 ^A 'a -53581
 ^A ^a -53581
@@ -868,6 +1661,7 @@ w l 53581
 ^A oa -53581
 ^A ae -53581
 ^A o -53581
+^A u006F_030B -53581
 ^A `o -53581
 ^A 'o -53581
 ^A ^o -53581
@@ -876,25 +1670,37 @@ w l 53581
 ^A oe -53581
 ^A /o -53581
 ^A d -53581
+^A u0111 -53581
 ^A c -53581
 ^A 'c -53581
+^A u0063_030C -53581
 ^A ,c -53581
 ^A g -53581
+^A u0067_0306 -53581
 ^A q -53581
 ~A y -26790
 ~A :y -26790
 ~A 'y -26790
 ~A n -26790
+~A u006E_0301 -26790
+~A u006E_030C -26790
+~A u016A -26790
 ~A ~n -26790
 ~A l -26790
+~A u006C_0301 -26790
+~A u006C_030C -26790
 ~A r -26790
 ~A u -26790
+~A u0075_030B -26790
+~A u0075_030A -26790
 ~A `u -26790
 ~A 'u -26790
 ~A ^u -26790
 ~A :u -26790
 ~A m -26790
 ~A t -26790
+~A u0074_030C -26790
+~A u0074_0327 -26790
 ~A i -26790
 ~A 'i -26790
 ~A h -26790
@@ -905,9 +1711,12 @@ w l 53581
 ~A C -26790
 ~A G -26790
 ~A 'C -26790
+~A u0043_030C -26790
+~A u0047_0306 -26790
 ~A ,C -26790
 ~A Q -26790
 ~A O -26790
+~A u004F_030B -26790
 ~A `O -26790
 ~A 'O -26790
 ~A ^O -26790
@@ -916,22 +1725,30 @@ w l 53581
 ~A OE -26790
 ~A /O -26790
 ~A U -26790
+~A u0055_030B -26790
+~A u0055_030A -26790
 ~A `U -26790
 ~A 'U -26790
 ~A ^U -26790
 ~A :U -26790
 ~A T -80371
+~A u0054_030C -80371
+~A u0054_0327 -80371
 ~A Y -80371
 ~A :Y -80371
 ~A 'Y -80371
 ~A V -107162
 ~A W -107162
 ~A e -53581
+~A u0065_030C -53581
+~A u0065_0328 -53581
 ~A `e -53581
 ~A 'e -53581
 ~A ^e -53581
 ~A :e -53581
 ~A a -53581
+~A u0061_0306 -53581
+~A u0061_0328 -53581
 ~A `a -53581
 ~A 'a -53581
 ~A ^a -53581
@@ -941,6 +1758,7 @@ w l 53581
 ~A oa -53581
 ~A ae -53581
 ~A o -53581
+~A u006F_030B -53581
 ~A `o -53581
 ~A 'o -53581
 ~A ^o -53581
@@ -949,25 +1767,37 @@ w l 53581
 ~A oe -53581
 ~A /o -53581
 ~A d -53581
+~A u0111 -53581
 ~A c -53581
 ~A 'c -53581
+~A u0063_030C -53581
 ~A ,c -53581
 ~A g -53581
+~A u0067_0306 -53581
 ~A q -53581
 :A y -26790
 :A :y -26790
 :A 'y -26790
 :A n -26790
+:A u006E_0301 -26790
+:A u006E_030C -26790
+:A u016A -26790
 :A ~n -26790
 :A l -26790
+:A u006C_0301 -26790
+:A u006C_030C -26790
 :A r -26790
 :A u -26790
+:A u0075_030B -26790
+:A u0075_030A -26790
 :A `u -26790
 :A 'u -26790
 :A ^u -26790
 :A :u -26790
 :A m -26790
 :A t -26790
+:A u0074_030C -26790
+:A u0074_0327 -26790
 :A i -26790
 :A 'i -26790
 :A h -26790
@@ -978,9 +1808,12 @@ w l 53581
 :A C -26790
 :A G -26790
 :A 'C -26790
+:A u0043_030C -26790
+:A u0047_0306 -26790
 :A ,C -26790
 :A Q -26790
 :A O -26790
+:A u004F_030B -26790
 :A `O -26790
 :A 'O -26790
 :A ^O -26790
@@ -989,22 +1822,30 @@ w l 53581
 :A OE -26790
 :A /O -26790
 :A U -26790
+:A u0055_030B -26790
+:A u0055_030A -26790
 :A `U -26790
 :A 'U -26790
 :A ^U -26790
 :A :U -26790
 :A T -80371
+:A u0054_030C -80371
+:A u0054_0327 -80371
 :A Y -80371
 :A :Y -80371
 :A 'Y -80371
 :A V -107162
 :A W -107162
 :A e -53581
+:A u0065_030C -53581
+:A u0065_0328 -53581
 :A `e -53581
 :A 'e -53581
 :A ^e -53581
 :A :e -53581
 :A a -53581
+:A u0061_0306 -53581
+:A u0061_0328 -53581
 :A `a -53581
 :A 'a -53581
 :A ^a -53581
@@ -1014,6 +1855,7 @@ w l 53581
 :A oa -53581
 :A ae -53581
 :A o -53581
+:A u006F_030B -53581
 :A `o -53581
 :A 'o -53581
 :A ^o -53581
@@ -1022,25 +1864,37 @@ w l 53581
 :A oe -53581
 :A /o -53581
 :A d -53581
+:A u0111 -53581
 :A c -53581
 :A 'c -53581
+:A u0063_030C -53581
 :A ,c -53581
 :A g -53581
+:A u0067_0306 -53581
 :A q -53581
 oA y -26790
 oA :y -26790
 oA 'y -26790
 oA n -26790
+oA u006E_0301 -26790
+oA u006E_030C -26790
+oA u016A -26790
 oA ~n -26790
 oA l -26790
+oA u006C_0301 -26790
+oA u006C_030C -26790
 oA r -26790
 oA u -26790
+oA u0075_030B -26790
+oA u0075_030A -26790
 oA `u -26790
 oA 'u -26790
 oA ^u -26790
 oA :u -26790
 oA m -26790
 oA t -26790
+oA u0074_030C -26790
+oA u0074_0327 -26790
 oA i -26790
 oA 'i -26790
 oA h -26790
@@ -1051,9 +1905,12 @@ oA w -26790
 oA C -26790
 oA G -26790
 oA 'C -26790
+oA u0043_030C -26790
+oA u0047_0306 -26790
 oA ,C -26790
 oA Q -26790
 oA O -26790
+oA u004F_030B -26790
 oA `O -26790
 oA 'O -26790
 oA ^O -26790
@@ -1062,22 +1919,30 @@ oA :O -26790
 oA OE -26790
 oA /O -26790
 oA U -26790
+oA u0055_030B -26790
+oA u0055_030A -26790
 oA `U -26790
 oA 'U -26790
 oA ^U -26790
 oA :U -26790
 oA T -80371
+oA u0054_030C -80371
+oA u0054_0327 -80371
 oA Y -80371
 oA :Y -80371
 oA 'Y -80371
 oA V -107162
 oA W -107162
 oA e -53581
+oA u0065_030C -53581
+oA u0065_0328 -53581
 oA `e -53581
 oA 'e -53581
 oA ^e -53581
 oA :e -53581
 oA a -53581
+oA u0061_0306 -53581
+oA u0061_0328 -53581
 oA `a -53581
 oA 'a -53581
 oA ^a -53581
@@ -1087,6 +1952,7 @@ oA :a -53581
 oA oa -53581
 oA ae -53581
 oA o -53581
+oA u006F_030B -53581
 oA `o -53581
 oA 'o -53581
 oA ^o -53581
@@ -1095,28 +1961,67 @@ oA :o -53581
 oA oe -53581
 oA /o -53581
 oA d -53581
+oA u0111 -53581
 oA c -53581
 oA 'c -53581
+oA u0063_030C -53581
 oA ,c -53581
 oA g -53581
+oA u0067_0306 -53581
 oA q -53581
+u0189 X -26790
+u0110 X -26790
 -D X -26790
+u0189 W -26790
+u0110 W -26790
 -D W -26790
+u0189 A -26790
+u0110 A -26790
 -D A -26790
+u0189 u0041_0306 -26790
+u0110 u0041_0306 -26790
+-D u0041_0306 -26790
+u0189 u0041_0328 -26790
+u0110 u0041_0328 -26790
+-D u0041_0328 -26790
+u0189 `A -26790
+u0110 `A -26790
 -D `A -26790
+u0189 'A -26790
+u0110 'A -26790
 -D 'A -26790
+u0189 ^A -26790
+u0110 ^A -26790
 -D ^A -26790
+u0189 ~A -26790
+u0110 ~A -26790
 -D ~A -26790
+u0189 :A -26790
+u0110 :A -26790
 -D :A -26790
+u0189 oA -26790
+u0110 oA -26790
 -D oA -26790
+u0189 AE -26790
+u0110 AE -26790
 -D AE -26790
+u0189 V -26790
+u0110 V -26790
 -D V -26790
+u0189 Y -26790
+u0110 Y -26790
 -D Y -26790
+u0189 :Y -26790
+u0110 :Y -26790
 -D :Y -26790
+u0189 'Y -26790
+u0110 'Y -26790
 -D 'Y -26790
 `O X -26790
 `O W -26790
 `O A -26790
+`O u0041_0306 -26790
+`O u0041_0328 -26790
 `O `A -26790
 `O 'A -26790
 `O ^A -26790
@@ -1131,6 +2036,8 @@ oA q -53581
 'O X -26790
 'O W -26790
 'O A -26790
+'O u0041_0306 -26790
+'O u0041_0328 -26790
 'O `A -26790
 'O 'A -26790
 'O ^A -26790
@@ -1145,6 +2052,8 @@ oA q -53581
 ^O X -26790
 ^O W -26790
 ^O A -26790
+^O u0041_0306 -26790
+^O u0041_0328 -26790
 ^O `A -26790
 ^O 'A -26790
 ^O ^A -26790
@@ -1159,6 +2068,8 @@ oA q -53581
 ~O X -26790
 ~O W -26790
 ~O A -26790
+~O u0041_0306 -26790
+~O u0041_0328 -26790
 ~O `A -26790
 ~O 'A -26790
 ~O ^A -26790
@@ -1173,6 +2084,8 @@ oA q -53581
 :O X -26790
 :O W -26790
 :O A -26790
+:O u0041_0306 -26790
+:O u0041_0328 -26790
 :O `A -26790
 :O 'A -26790
 :O ^A -26790
@@ -1187,6 +2100,8 @@ oA q -53581
 /O X -26790
 /O W -26790
 /O A -26790
+/O u0041_0306 -26790
+/O u0041_0328 -26790
 /O `A -26790
 /O 'A -26790
 /O ^A -26790
@@ -1204,6 +2119,8 @@ oA q -53581
 'Y a -80371
 'Y u -80371
 'Y A -80371
+'Y u0041_0306 -80371
+'Y u0041_0328 -80371
 'Y `A -80371
 'Y 'A -80371
 'Y ^A -80371
@@ -1212,11 +2129,15 @@ oA q -53581
 'Y oA -80371
 'Y AE -80371
 `e e -53581
+`e u0065_030C -53581
+`e u0065_0328 -53581
 `e `e -53581
 `e 'e -53581
 `e ^e -53581
 `e :e -53581
 `e a -53581
+`e u0061_0306 -53581
+`e u0061_0328 -53581
 `e `a -53581
 `e 'a -53581
 `e ^a -53581
@@ -1226,6 +2147,7 @@ oA q -53581
 `e oa -53581
 `e ae -53581
 `e o -53581
+`e u006F_030B -53581
 `e `o -53581
 `e 'o -53581
 `e ^o -53581
@@ -1234,17 +2156,24 @@ oA q -53581
 `e oe -53581
 `e /o -53581
 `e d -53581
+`e u0111 -53581
 `e c -53581
 `e 'c -53581
+`e u0063_030C -53581
 `e ,c -53581
 `e g -53581
+`e u0067_0306 -53581
 `e q -53581
 'e e -53581
+'e u0065_030C -53581
+'e u0065_0328 -53581
 'e `e -53581
 'e 'e -53581
 'e ^e -53581
 'e :e -53581
 'e a -53581
+'e u0061_0306 -53581
+'e u0061_0328 -53581
 'e `a -53581
 'e 'a -53581
 'e ^a -53581
@@ -1254,6 +2183,7 @@ oA q -53581
 'e oa -53581
 'e ae -53581
 'e o -53581
+'e u006F_030B -53581
 'e `o -53581
 'e 'o -53581
 'e ^o -53581
@@ -1262,17 +2192,24 @@ oA q -53581
 'e oe -53581
 'e /o -53581
 'e d -53581
+'e u0111 -53581
 'e c -53581
 'e 'c -53581
+'e u0063_030C -53581
 'e ,c -53581
 'e g -53581
+'e u0067_0306 -53581
 'e q -53581
 ^e e -53581
+^e u0065_030C -53581
+^e u0065_0328 -53581
 ^e `e -53581
 ^e 'e -53581
 ^e ^e -53581
 ^e :e -53581
 ^e a -53581
+^e u0061_0306 -53581
+^e u0061_0328 -53581
 ^e `a -53581
 ^e 'a -53581
 ^e ^a -53581
@@ -1282,6 +2219,7 @@ oA q -53581
 ^e oa -53581
 ^e ae -53581
 ^e o -53581
+^e u006F_030B -53581
 ^e `o -53581
 ^e 'o -53581
 ^e ^o -53581
@@ -1290,17 +2228,24 @@ oA q -53581
 ^e oe -53581
 ^e /o -53581
 ^e d -53581
+^e u0111 -53581
 ^e c -53581
 ^e 'c -53581
+^e u0063_030C -53581
 ^e ,c -53581
 ^e g -53581
+^e u0067_0306 -53581
 ^e q -53581
 :e e -53581
+:e u0065_030C -53581
+:e u0065_0328 -53581
 :e `e -53581
 :e 'e -53581
 :e ^e -53581
 :e :e -53581
 :e a -53581
+:e u0061_0306 -53581
+:e u0061_0328 -53581
 :e `a -53581
 :e 'a -53581
 :e ^a -53581
@@ -1310,6 +2255,7 @@ oA q -53581
 :e oa -53581
 :e ae -53581
 :e o -53581
+:e u006F_030B -53581
 :e `o -53581
 :e 'o -53581
 :e ^o -53581
@@ -1318,17 +2264,24 @@ oA q -53581
 :e oe -53581
 :e /o -53581
 :e d -53581
+:e u0111 -53581
 :e c -53581
 :e 'c -53581
+:e u0063_030C -53581
 :e ,c -53581
 :e g -53581
+:e u0067_0306 -53581
 :e q -53581
 `o e -53581
+`o u0065_030C -53581
+`o u0065_0328 -53581
 `o `e -53581
 `o 'e -53581
 `o ^e -53581
 `o :e -53581
 `o a -53581
+`o u0061_0306 -53581
+`o u0061_0328 -53581
 `o `a -53581
 `o 'a -53581
 `o ^a -53581
@@ -1338,6 +2291,7 @@ oA q -53581
 `o oa -53581
 `o ae -53581
 `o o -53581
+`o u006F_030B -53581
 `o `o -53581
 `o 'o -53581
 `o ^o -53581
@@ -1346,17 +2300,24 @@ oA q -53581
 `o oe -53581
 `o /o -53581
 `o d -53581
+`o u0111 -53581
 `o c -53581
 `o 'c -53581
+`o u0063_030C -53581
 `o ,c -53581
 `o g -53581
+`o u0067_0306 -53581
 `o q -53581
 'o e -53581
+'o u0065_030C -53581
+'o u0065_0328 -53581
 'o `e -53581
 'o 'e -53581
 'o ^e -53581
 'o :e -53581
 'o a -53581
+'o u0061_0306 -53581
+'o u0061_0328 -53581
 'o `a -53581
 'o 'a -53581
 'o ^a -53581
@@ -1366,6 +2327,7 @@ oA q -53581
 'o oa -53581
 'o ae -53581
 'o o -53581
+'o u006F_030B -53581
 'o `o -53581
 'o 'o -53581
 'o ^o -53581
@@ -1374,17 +2336,24 @@ oA q -53581
 'o oe -53581
 'o /o -53581
 'o d -53581
+'o u0111 -53581
 'o c -53581
 'o 'c -53581
+'o u0063_030C -53581
 'o ,c -53581
 'o g -53581
+'o u0067_0306 -53581
 'o q -53581
 ^o e -53581
+^o u0065_030C -53581
+^o u0065_0328 -53581
 ^o `e -53581
 ^o 'e -53581
 ^o ^e -53581
 ^o :e -53581
 ^o a -53581
+^o u0061_0306 -53581
+^o u0061_0328 -53581
 ^o `a -53581
 ^o 'a -53581
 ^o ^a -53581
@@ -1394,6 +2363,7 @@ oA q -53581
 ^o oa -53581
 ^o ae -53581
 ^o o -53581
+^o u006F_030B -53581
 ^o `o -53581
 ^o 'o -53581
 ^o ^o -53581
@@ -1402,17 +2372,24 @@ oA q -53581
 ^o oe -53581
 ^o /o -53581
 ^o d -53581
+^o u0111 -53581
 ^o c -53581
 ^o 'c -53581
+^o u0063_030C -53581
 ^o ,c -53581
 ^o g -53581
+^o u0067_0306 -53581
 ^o q -53581
 ~o e -53581
+~o u0065_030C -53581
+~o u0065_0328 -53581
 ~o `e -53581
 ~o 'e -53581
 ~o ^e -53581
 ~o :e -53581
 ~o a -53581
+~o u0061_0306 -53581
+~o u0061_0328 -53581
 ~o `a -53581
 ~o 'a -53581
 ~o ^a -53581
@@ -1422,6 +2399,7 @@ oA q -53581
 ~o oa -53581
 ~o ae -53581
 ~o o -53581
+~o u006F_030B -53581
 ~o `o -53581
 ~o 'o -53581
 ~o ^o -53581
@@ -1430,17 +2408,24 @@ oA q -53581
 ~o oe -53581
 ~o /o -53581
 ~o d -53581
+~o u0111 -53581
 ~o c -53581
 ~o 'c -53581
+~o u0063_030C -53581
 ~o ,c -53581
 ~o g -53581
+~o u0067_0306 -53581
 ~o q -53581
 :o e -53581
+:o u0065_030C -53581
+:o u0065_0328 -53581
 :o `e -53581
 :o 'e -53581
 :o ^e -53581
 :o :e -53581
 :o a -53581
+:o u0061_0306 -53581
+:o u0061_0328 -53581
 :o `a -53581
 :o 'a -53581
 :o ^a -53581
@@ -1450,6 +2435,7 @@ oA q -53581
 :o oa -53581
 :o ae -53581
 :o o -53581
+:o u006F_030B -53581
 :o `o -53581
 :o 'o -53581
 :o ^o -53581
@@ -1458,17 +2444,24 @@ oA q -53581
 :o oe -53581
 :o /o -53581
 :o d -53581
+:o u0111 -53581
 :o c -53581
 :o 'c -53581
+:o u0063_030C -53581
 :o ,c -53581
 :o g -53581
+:o u0067_0306 -53581
 :o q -53581
 Tp e -53581
+Tp u0065_030C -53581
+Tp u0065_0328 -53581
 Tp `e -53581
 Tp 'e -53581
 Tp ^e -53581
 Tp :e -53581
 Tp a -53581
+Tp u0061_0306 -53581
+Tp u0061_0328 -53581
 Tp `a -53581
 Tp 'a -53581
 Tp ^a -53581
@@ -1478,6 +2471,7 @@ Tp :a -53581
 Tp oa -53581
 Tp ae -53581
 Tp o -53581
+Tp u006F_030B -53581
 Tp `o -53581
 Tp 'o -53581
 Tp ^o -53581
@@ -1486,10 +2480,13 @@ Tp :o -53581
 Tp oe -53581
 Tp /o -53581
 Tp d -53581
+Tp u0111 -53581
 Tp c -53581
 Tp 'c -53581
+Tp u0063_030C -53581
 Tp ,c -53581
 Tp g -53581
+Tp u0067_0306 -53581
 Tp q -53581
 charset
 ga	535808,672672	2	0000
@@ -1524,8 +2521,9 @@ fi	589389,722176,203840,108326	3	0034
 fl	616179,722176,203840,108326	3	0035
 Fi	924269,722176,203840,108326	3	0036
 Fl	937664,722176,203840,108326	3	0037
----	535808,451360,101920,49941,0,24971	1	0040
-!	321485,722176,0,130166	2	0041
+u2423	535808,451360,101920,49941,0,24971	1	0040
+u01C3	321485,722176,0,130166	2	0041
+!	"
 dq	535808,722176,0,90272	2	0042
 "	"
 sh	857293,722176,203840,69362	3	0043
@@ -1539,8 +2537,7 @@ cq	321485,722176,0,130166	2	0047
 (	428646,786240,262080,169770	3	0050
 )	428646,786240,262080,38730	3	0051
 *	535808,786240,0,156374	2	0052
-pl	803712,583565,59405,38730	3	0053
-+	"
++	803712,583565,59405,38730	3	0053
 ,	321485,110656,203840	1	0054
 -	375066,451360,0,29630	0	0055
 .	321485,110656	0	0056
@@ -1559,8 +2556,7 @@ sl	535808,786240,262080,169770	3	0057
 :	321485,451360,0,61006	0	0072
 ;	321485,451360,203840,61006	1	0073
 <	803712,559216,40992,87707	3	0074
-eq	803712,384606,-139554,69362	0	0075
-=	"
+=	803712,384606,-139554,69362	0	0075
 >	803712,559216,40992,11939	3	0076
 ?	535808,722176,0,128419	2	0077
 at	803712,722176,0,100610	2	0100
@@ -1630,74 +2626,73 @@ y	509018,451360,203840,92747,-32421,55134	1	0171
 z	428646,451360,0,128856,0,80419	0	0172
 lC	535808,786240,262080,154627	3	0173
 {	"
-ba	321485,786240,262080,110370	3	0174
-bv	"
-or	"
+u01C0	321485,786240,262080,110370	3	0174
+ba	"
 |	"
 rC	535808,786240,262080,23587	3	0175
 }	"
 ~	642970,693578,0,121451	2	0176
 hy	214323,451360,0,29630	0	0177
----	779251,934752	2	0200
----	779251,722176,203840	3	0201
+u0041_0306	779251,934752	2	0200
+u0041_0328	779251,722176,203840	3	0201
 'C	750131,896954,0,152298	2	0202
----	750131,934752,0,152298,-80517,76149	2	0203
----	791482,934752,0,98571,0,71781	2	0204
----	711110,934752,0,126090,0,63045	2	0205
----	711110,722176,203840,126090	3	0206
----	810992,934752,0,91437,-80517,91437	2	0207
----	657530,896954,0,0,0,53581	2	0210
----	657530,934752,0,0,0,53581	2	0211
+u0043_030C	750131,934752,0,152298,-80517,76149	2	0203
+u0044_030C	791482,934752,0,98571,0,71781	2	0204
+u0045_030C	711110,934752,0,126090,0,63045	2	0205
+u0045_0328	711110,722176,203840,126090	3	0206
+u0047_0306	810992,934752,0,91437,-80517,91437	2	0207
+u004C_0301	657530,896954,0,0,0,53581	2	0210
+u004C_030C	657530,934752,0,0,0,53581	2	0211
 /L	657530,722176	2	0212
----	779251,896954,0,171808	2	0213
----	779251,934752,0,171808,0,59114	2	0214
----	818272,722176,0,179088,0,62754	2	0215
----	803712,896954,0,98571,-80517,71781	2	0216
----	764691,896954,0,40550,0,30413	2	0217
----	764691,934752,0,40550,0,30413	2	0220
----	589389,896954,0,125507	2	0221
+u004E_0301	779251,896954,0,171808	2	0213
+u004E_030C	779251,934752,0,171808,0,59114	2	0214
+u014A	818272,722176,0,179088,0,62754	2	0215
+u004F_030B	803712,896954,0,98571,-80517,71781	2	0216
+u0052_0301	764691,896954,0,40550,0,30413	2	0217
+u0052_030C	764691,934752,0,40550,0,30413	2	0220
+u0053_0301	589389,896954,0,125507	2	0221
 vS	589389,934752,0,125507,0,62754	2	0222
----	589389,722176,178360,125507,0,62754	3	0223
----	750131,934752,0,139485,-134317,5533	2	0224
----	750131,722176,178360,139485,-134317,5533	3	0225
----	779251,896954,0,171808,-121867,59114	2	0226
----	779251,934752,0,171808,-121867,59114	2	0227
+u0053_0327	589389,722176,178360,125507,0,62754	3	0223
+u0054_030C	750131,934752,0,139485,-134317,5533	2	0224
+u0054_0327	750131,722176,178360,139485,-134317,5533	3	0225
+u0055_030B	779251,896954,0,171808,-121867,59114	2	0226
+u0055_030A	779251,934752,0,171808,-121867,59114	2	0227
 :Y	779251,934752,0,203198,-152298,-11125	2	0230
----	642970,896954,0,152298	2	0231
+u005A_0301	642970,896954,0,152298	2	0231
 vZ	642970,934752,0,152298,0,76149	2	0232
----	642970,896954,0,152298	2	0233
+u005A_0307	642970,896954,0,152298	2	0233
 IJ	886413,722176,0,147056,0,46738	2	0234
----	404186,896954,0,165693,0,82846	2	0235
----	535808,722176,0,108326,-46666,108326	2	0236
+u0049_0307	404186,896954,0,165693,0,82846	2	0235
+u0111	535808,722176,0,108326,-46666,108326	2	0236
 sc	482227,722176,203840	3	0237
----	535808,672672,0,80419,-46666,80419	2	0240
----	535808,451360,203840,80419	1	0241
+u0061_0306	535808,672672,0,80419,-46666,80419	2	0240
+u0061_0328	535808,451360,203840,80419	1	0241
 'c	482227,672672,0,59259	2	0242
----	482227,672672,0,59259,-46666,59259	2	0243
----	535808,722176,0,108326,-46666,108326	2	0244
----	482227,672672,0,78770,-46666,78770	2	0245
----	482227,451360,203840,78770	1	0246
----	482227,672672,203840,92747,-21040,55134	3	0247
----	267904,896954,0,108326,-26790,107210	2	0250
----	267904,722176,0,108326,-26790,107210	2	0251
+u0063_030C	482227,672672,0,59259,-46666,59259	2	0243
+u0064_030C	535808,722176,0,108326,-46666,108326	2	0244
+u0065_030C	482227,672672,0,78770,-46666,78770	2	0245
+u0065_0328	482227,451360,203840,78770	1	0246
+u0067_0306	482227,672672,203840,92747,-21040,55134	3	0247
+u006C_0301	267904,896954,0,108326,-26790,107210	2	0250
+u006C_030C	267904,722176,0,108326,-26790,107210	2	0251
 /l	334880,722176,0,108326	2	0252
----	589389,672672,0,80419	2	0253
----	589389,672672,0,80419,-32421,80419	2	0254
----	589389,451360,203840,80419,-32421,80419	1	0255
----	535808,672672,0,66174,-46666,66174	2	0256
----	442042,672672,0,112840,-32421,86050	2	0257
----	442042,672672,0,112840,-32421,86050	2	0260
----	428646,672672,0,86050	2	0261
+u006E_0301	589389,672672,0,80419	2	0253
+u006E_030C	589389,672672,0,80419,-32421,80419	2	0254
+u016A	589389,451360,203840,80419,-32421,80419	1	0255
+u006F_030B	535808,672672,0,66174,-46666,66174	2	0256
+u0072_0301	442042,672672,0,112840,-32421,86050	2	0257
+u0072_030C	442042,672672,0,112840,-32421,86050	2	0260
+u0073_0301	428646,672672,0,86050	2	0261
 vs	428646,672672,0,140650,0,140650	2	0262
----	428646,451360,178360,86050,0,86050	1	0263
----	348275,722176,0,99445,-45864,99445	2	0264
----	348275,644802,178360,99445,-45864,99445	3	0265
----	562598,672672,0,210246,-32421,210246	2	0266
----	562598,672672,0,80419,-32421,80419	2	0267
+u0073_0327	428646,451360,178360,86050,0,86050	1	0263
+u0074_030C	348275,722176,0,99445,-45864,99445	2	0264
+u0074_0327	348275,644802,178360,99445,-45864,99445	3	0265
+u0075_030B	562598,672672,0,210246,-32421,210246	2	0266
+u0075_030A	562598,672672,0,80419,-32421,80419	2	0267
 :y	509018,672672,203840,92747,-32421,55134	3	0270
----	428646,672672,0,128856,0,80419	2	0271
+u007A_0301	428646,672672,0,128856,0,80419	2	0271
 vz	428646,672672,0,128856,0,80419	2	0272
----	428646,693578,0,128856,0,80419	2	0273
+u007A_0307	428646,693578,0,128856,0,80419	2	0273
 ij	589389,693578,203840,106819,50960,92747	3	0274
 r!	321485,524160,203840,79206	3	0275
 r?	535808,524160,203840	3	0276
@@ -1718,7 +2713,9 @@ AE	925434,722176,0,126090	2	0306
 'I	404186,896954,0,165693,0,82846	2	0315
 ^I	404186,934752,0,165693,0,82846	2	0316
 :I	404186,934752,0,165693,0,82846	2	0317
--D	791482,722176,0,98571,0,71781	2	0320
+u0189	791482,722176,0,98571,0,71781	2	0320
+u0110	"
+-D	"
 ~N	779251,934752,0,171808,0,59114	2	0321
 `O	803712,896954,0,98571,-80517,71781	2	0322
 'O	803712,896954,0,98571	2	0323
diff --git a/contrib/groff/font/devdvi/TITC b/contrib/groff/font/devdvi/TITC
index 451985c..4987eeb 100644
--- a/contrib/groff/font/devdvi/TITC
+++ b/contrib/groff/font/devdvi/TITC
@@ -31,11 +31,11 @@ charset
 ---	535808,728000,0,454288	2	0034
 ---	535808,728000,0,510522	2	0035
 ---	0,728000	2	0037
----	482227,728000,0,66174,-46666,66174	2	0040
+u2422	482227,728000,0,66174,-46666,66174	2	0040
 Do	535808,786240,58240,142106	3	0044
 $	"
 aq	321485,728000,0,117062	2	0047
-**	535808,487760,-36400	2	0052
+---	535808,487760,-36400	2	0052
 ,	321485,110656,203840	1	0054
 ---	375066,384606,-139554,69362	0	0055
 .	321485,110656	0	0056
@@ -51,14 +51,13 @@ f/	535808,786240,262080,169770	3	0057
 8	535808,672672,0,115315	2	0070
 9	535808,450486,203840,59259	1	0071
 la	428646,786240,262080	3	0074
-mi	803712,581944,59405,38730	3	0075
-\-	"
+\-	803712,581944,59405,38730	3	0075
 ra	428646,786240,262080	3	0076
----	750131,716352,0,160334,0,80168	2	0115
+u2127	750131,716352,0,160334,0,80168	2	0115
 ci	1125197,786240,262080	3	0117
----	750131,716352,0,107526,0,53763	2	0127
----	442042,786240,262080	3	0133
----	442042,786240,262080	3	0135
+u03A9	750131,716352,0,107526,0,53763	2	0127
+u301A	442042,786240,262080	3	0133
+u301B	442042,786240,262080	3	0135
 ua	535808,728000,203840,96387	3	0136
 da	535808,728000,203840	3	0137
 ---	535808,728000	2	0140
@@ -67,7 +66,7 @@ da	535808,728000,203840	3	0137
 ---	535808,634477,27666	3	0144
 ---	1018035,728000	2	0154
 ---	535808,487760,-36400	2	0155
----	589389,728000	2	0156
+u266A	589389,728000	2	0156
 ti	642970,128960	0	0176
 ~	"
 ---	214323,384606,-139554,69362	0	0177
@@ -77,34 +76,34 @@ ti	642970,128960	0	0176
 ---	535808,728000	2	0203
 dg	482227,728000,203840	3	0204
 dd	482227,728000,203840	3	0205
----	535808,786240,262080	3	0206
-%O	1178778,786240,58240,142979	3	0207
+u2016	535808,786240,262080	3	0206
+%0	1178778,786240,58240,142979	3	0207
 bu	535808,450486,-74547	0	0210
----	964454,716352,0,152298,-80517,76149	2	0211
+u2103	964454,716352,0,152298,-80517,76149	2	0211
 ---	642970,786240,58240,142106	3	0212
 ---	535808,548426,101920,102125	3	0213
 Fn	321485,728000,203840,222186,104541,112840	3	0214
----	750131,786240,58240,152298,-80517,76149	3	0215
----	1047155,716352,0,192483,-138902,58531	2	0216
----	806042,716352,0,171808,0,59114	2	0217
+u20A1	750131,786240,58240,152298,-80517,76149	3	0215
+u20A9	1047155,716352,0,192483,-138902,58531	2	0216
+u20A6	806042,716352,0,171808,0,59114	2	0217
 ---	810992,786240,58240,91437,-80517,91437	3	0220
----	724506,716352,0,107526,0,-26426	2	0221
----	806261,728000	2	0222
----	764691,716352,0,40550,0,30413	2	0223
----	589389,728000,0,128419	2	0224
+u20B1	724506,716352,0,107526,0,-26426	2	0221
+u20A4	806261,728000	2	0222
+u211E	764691,716352,0,40550,0,30413	2	0223
+u203D	589389,728000,0,128419	2	0224
 ---	535808,524160,203840	3	0225
----	535808,786240,0,122886,-46666,122886	2	0226
+u20AB	535808,786240,0,122886,-46666,122886	2	0226
 tm	696550,786240,0,550366	2	0227
----	1515405,786240,58240,142979	3	0230
+u2031	1515405,786240,58240,142979	3	0230
 ---	509018,728000,203840	3	0231
----	737901,786240,58240,107526,0,53763	3	0232
----	937373,716352,0,171808,0,59114	2	0233
----	535808,786240,0,169770	2	0234
----	705869,716352,0,136106	2	0235
----	535808,450486,-74547	0	0236
----	696550,786240,0,550366	2	0237
----	401856,786240,262080,23587	3	0240
----	401856,786240,262080,154627	3	0241
+u0E3F	737901,786240,58240,107526,0,53763	3	0232
+u2116	937373,716352,0,171808,0,59114	2	0233
+u2052	535808,786240,0,169770	2	0234
+u212E	705869,716352,0,136106	2	0235
+u25E6	535808,450486,-74547	0	0236
+u2120	696550,786240,0,550366	2	0237
+u2045	401856,786240,262080,23587	3	0240
+u2046	401856,786240,262080,154627	3	0241
 ct	535808,548426,101920,102125	3	0242
 Po	806261,728000	2	0243
 Cs	816510,581944,0,112840	2	0244
@@ -115,10 +114,10 @@ sc	482227,728000,203840	3	0247
 co	1125197,786240,262080	3	0251
 Of	482227,786240,0,137592	2	0252
 ---	1125197,786240,262080	3	0253
-no	696550,450486,0,86050	0	0254
----	1125197,786240,262080	3	0255
+tno	696550,450486,0,86050	0	0254
+u2117	1125197,786240,262080	3	0255
 rg	1125197,786240,262080	3	0256
-rn	803712,728000	2	0257
+---	803712,728000	2	0257
 de	375066,716352	2	0260
 t+-	803712,581944,59405,38730	3	0261
 S2	482227,786240,0,169770	2	0262
@@ -127,13 +126,13 @@ S3	482227,786240,0,169770	2	0263
 mc	535808,450486,203840,80419,30867,80419	1	0265
 ps	642970,728000,203840	3	0266
 pc	321485,450486	0	0267
----	704314,548426,0,29630	2	0270
+u203B	704314,548426,0,29630	2	0270
 S1	482227,786240,0,169770	2	0271
 Om	482227,786240,0,137592	2	0272
 ---	482227,786240,220138,196560	3	0273
-14	482227,786240,203840,169770	3	0274
-12	482227,786240,203840,169770	3	0275
-34	482227,786240,203840,169770	3	0276
+---	482227,786240,203840,169770	3	0274
+---	482227,786240,203840,169770	3	0275
+---	482227,786240,203840,169770	3	0276
 Eu	803712,716352,0,126090	2	0277
 tmu	803712,581944,59405,38730	3	0326
 tdi	803712,581944,59405,38730	3	0366
diff --git a/contrib/groff/font/devdvi/TR b/contrib/groff/font/devdvi/TR
index 4a42532..64f457b 100644
--- a/contrib/groff/font/devdvi/TR
+++ b/contrib/groff/font/devdvi/TR
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TR
 special
@@ -20,10 +20,12 @@ ff ] 81557
 cq ' -87382
 ' cq -87382
 cq cq -87382
-' ? 116509
+slash@for@l l -291272
+slash@for@l L -334963
 cq ? 116509
-' ! 116509
+' ? 116509
 cq ! 116509
+' ! 116509
 *A t -29128
 A t -29128
 *A C -29128
@@ -203,8 +205,8 @@ b y -29128
 b w -29128
 c h -29128
 c k -29128
-f ' 81557
 f cq 81557
+f ' 81557
 f ? 81557
 f ! 81557
 f ) 81557
@@ -304,7 +306,7 @@ oe	815562,451470	0	0033
 AE	946634,716526	2	0035
 OE	1063142,716526	2	0036
 /O	815562,767499,50973	3	0037
----	291272,451470	0	0040
+slash@for@l	291272,451470	0	0040
 !	291272,728178	2	0041
 rq	524290,728178	2	0042
 sh	873816,728178,203888	3	0043
diff --git a/contrib/groff/font/devdvi/TREC b/contrib/groff/font/devdvi/TREC
index d0f404c..01a391e 100644
--- a/contrib/groff/font/devdvi/TREC
+++ b/contrib/groff/font/devdvi/TREC
@@ -9,6 +9,7 @@ bq Bq 116480
 bq j 116480
 bq .j 116480
 bq g 58240
+bq u0067_0306 58240
 bq y 58240
 bq :y 58240
 bq 'y 58240
@@ -20,6 +21,7 @@ bq Y -87360
 bq :Y -87360
 bq 'Y -87360
 bq O -29120
+bq u004F_030B -29120
 bq `O -29120
 bq 'O -29120
 bq ^O -29120
@@ -30,6 +32,8 @@ bq /O -29120
 bq C -29120
 bq G -29120
 bq 'C -29120
+bq u0043_030C -29120
+bq u0047_0306 -29120
 bq ,C -29120
 bq Q -29120
 lq oq 116480
@@ -44,6 +48,7 @@ Bq Bq 116480
 Bq j 116480
 Bq .j 116480
 Bq g 58240
+Bq u0067_0306 58240
 Bq y 58240
 Bq :y 58240
 Bq 'y 58240
@@ -55,6 +60,7 @@ Bq Y -87360
 Bq :Y -87360
 Bq 'Y -87360
 Bq O -29120
+Bq u004F_030B -29120
 Bq `O -29120
 Bq 'O -29120
 Bq ^O -29120
@@ -65,6 +71,8 @@ Bq /O -29120
 Bq C -29120
 Bq G -29120
 Bq 'C -29120
+Bq u0043_030C -29120
+Bq u0047_0306 -29120
 Bq ,C -29120
 Bq Q -29120
 Fc . -87360
@@ -76,6 +84,7 @@ ff ` 81536
 ff lq 81536
 ff rq 81536
 ff ? 81536
+ff u01C3 81536
 ff ! 81536
 ff ) 81536
 ff rB 81536
@@ -84,7 +93,9 @@ cq rq 116480
 ' rq 116480
 cq ? 116480
 ' ? 116480
+cq u01C3 116480
 cq ! 116480
+' u01C3 116480
 ' ! 116480
 A y -87360
 A :y -87360
@@ -93,15 +104,21 @@ A v -116480
 A w -87360
 A c -29120
 A 'c -29120
+A u0063_030C -29120
 A ,c -29120
 A d -29120
+A u0064_030C -29120
+A u0111 -29120
 A Sd -29120
 A e -29120
+A u0065_030C -29120
+A u0065_0328 -29120
 A `e -29120
 A 'e -29120
 A ^e -29120
 A :e -29120
 A o -29120
+A u006F_030B -29120
 A `o -29120
 A 'o -29120
 A ^o -29120
@@ -111,12 +128,17 @@ A oe -29120
 A /o -29120
 A q -29120
 A t -29120
+A u0074_030C -29120
+A u0074_0327 -29120
 A C -29120
 A G -29120
 A 'C -29120
+A u0043_030C -29120
+A u0047_0306 -29120
 A ,C -29120
 A Q -29120
 A O -29120
+A u004F_030B -29120
 A `O -29120
 A 'O -29120
 A ^O -29120
@@ -125,11 +147,15 @@ A :O -29120
 A OE -29120
 A /O -29120
 A U -29120
+A u0055_030B -29120
+A u0055_030A -29120
 A `U -29120
 A 'U -29120
 A ^U -29120
 A :U -29120
 A T -87360
+A u0054_030C -87360
+A u0054_0327 -87360
 A Y -87360
 A :Y -87360
 A 'Y -87360
@@ -138,6 +164,8 @@ A W -116480
 D X -29120
 D W -29120
 D A -29120
+D u0041_0306 -29120
+D u0041_0328 -29120
 D `A -29120
 D 'A -29120
 D ^A -29120
@@ -168,6 +196,8 @@ F z -87360
 F ae -87360
 F /o -87360
 F A -116480
+F u0041_0306 -116480
+F u0041_0328 -116480
 F `A -116480
 F 'A -116480
 F ^A -116480
@@ -176,6 +206,7 @@ F :A -116480
 F oA -116480
 F AE -116480
 F O -29120
+F u004F_030B -29120
 F `O -29120
 F 'O -29120
 F ^O -29120
@@ -186,12 +217,15 @@ F /O -29120
 F C -29120
 F G -29120
 F 'C -29120
+F u0043_030C -29120
+F u0047_0306 -29120
 F ,C -29120
 F Q -29120
 I I 29120
 K v -87360
 K w -29120
 K o -29120
+K u006F_030B -29120
 K `o -29120
 K 'o -29120
 K ^o -29120
@@ -202,9 +236,13 @@ K /o -29120
 K C -29120
 K G -29120
 K 'C -29120
+K u0043_030C -29120
+K u0047_0306 -29120
 K ,C -29120
 K Q -29120
 L T -87360
+L u0054_030C -87360
+L u0054_0327 -87360
 L Y -87360
 L :Y -87360
 L 'Y -87360
@@ -213,6 +251,8 @@ L W -116480
 O X -29120
 O W -29120
 O A -29120
+O u0041_0306 -29120
+O u0041_0328 -29120
 O `A -29120
 O 'A -29120
 O ^A -29120
@@ -225,6 +265,8 @@ O Y -29120
 O :Y -29120
 O 'Y -29120
 P A -87360
+P u0041_0306 -87360
+P u0041_0328 -87360
 P `A -87360
 P 'A -87360
 P ^A -87360
@@ -233,6 +275,7 @@ P :A -87360
 P oA -87360
 P AE -87360
 P o -29120
+P u006F_030B -29120
 P `o -29120
 P 'o -29120
 P ^o -29120
@@ -241,11 +284,15 @@ P :o -29120
 P oe -29120
 P /o -29120
 P e -29120
+P u0065_030C -29120
+P u0065_0328 -29120
 P `e -29120
 P 'e -29120
 P ^e -29120
 P :e -29120
 P a -29120
+P u0061_0306 -29120
+P u0061_0328 -29120
 P `a -29120
 P 'a -29120
 P ^a -29120
@@ -257,12 +304,17 @@ P ae -29120
 P . -87360
 P , -87360
 R t -29120
+R u0074_030C -29120
+R u0074_0327 -29120
 R C -29120
 R G -29120
 R 'C -29120
+R u0043_030C -29120
+R u0047_0306 -29120
 R ,C -29120
 R Q -29120
 R O -29120
+R u004F_030B -29120
 R `O -29120
 R 'O -29120
 R ^O -29120
@@ -271,11 +323,15 @@ R :O -29120
 R OE -29120
 R /O -29120
 R U -29120
+R u0055_030B -29120
+R u0055_030A -29120
 R `U -29120
 R 'U -29120
 R ^U -29120
 R :U -29120
 R T -87360
+R u0054_030C -87360
+R u0054_0327 -87360
 R Y -87360
 R :Y -87360
 R 'Y -87360
@@ -299,6 +355,8 @@ T w -87360
 T x -87360
 T z -87360
 T A -87360
+T u0041_0306 -87360
+T u0041_0328 -87360
 T `A -87360
 T 'A -87360
 T ^A -87360
@@ -325,6 +383,8 @@ V z -87360
 V ae -87360
 V /o -87360
 V A -116480
+V u0041_0306 -116480
+V u0041_0328 -116480
 V `A -116480
 V 'A -116480
 V ^A -116480
@@ -333,6 +393,7 @@ V :A -116480
 V oA -116480
 V AE -116480
 V O -29120
+V u004F_030B -29120
 V `O -29120
 V 'O -29120
 V ^O -29120
@@ -343,6 +404,8 @@ V /O -29120
 V C -29120
 V G -29120
 V 'C -29120
+V u0043_030C -29120
+V u0047_0306 -29120
 V ,C -29120
 V Q -29120
 W o -87360
@@ -364,6 +427,8 @@ W z -87360
 W ae -87360
 W /o -87360
 W A -116480
+W u0041_0306 -116480
+W u0041_0328 -116480
 W `A -116480
 W 'A -116480
 W ^A -116480
@@ -372,6 +437,7 @@ W :A -116480
 W oA -116480
 W AE -116480
 W O -29120
+W u004F_030B -29120
 W `O -29120
 W 'O -29120
 W ^O -29120
@@ -382,9 +448,12 @@ W /O -29120
 W C -29120
 W G -29120
 W 'C -29120
+W u0043_030C -29120
+W u0047_0306 -29120
 W ,C -29120
 W Q -29120
 X O -29120
+X u004F_030B -29120
 X `O -29120
 X 'O -29120
 X ^O -29120
@@ -395,6 +464,8 @@ X /O -29120
 X C -29120
 X G -29120
 X 'C -29120
+X u0043_030C -29120
+X u0047_0306 -29120
 X ,C -29120
 X Q -29120
 Y e -87360
@@ -414,6 +485,8 @@ Y w -87360
 Y x -87360
 Y z -87360
 Y A -87360
+Y u0041_0306 -87360
+Y u0041_0328 -87360
 Y `A -87360
 Y 'A -87360
 Y ^A -87360
@@ -425,7 +498,9 @@ oq lq 116480
 ` lq 116480
 oq ? 116480
 ` ? 116480
+oq u01C3 116480
 oq ! 116480
+` u01C3 116480
 ` ! 116480
 a v -29120
 a j 58240
@@ -434,11 +509,14 @@ a :y -29120
 a 'y -29120
 a w -29120
 b e 29120
+b u0065_030C 29120
+b u0065_0328 29120
 b `e 29120
 b 'e 29120
 b ^e 29120
 b :e 29120
 b o 29120
+b u006F_030B 29120
 b `o 29120
 b 'o 29120
 b ^o 29120
@@ -450,6 +528,7 @@ b x -29120
 b d 29120
 b c 29120
 b 'c 29120
+b u0063_030C 29120
 b ,c 29120
 b q 29120
 b v -29120
@@ -468,6 +547,7 @@ f ` 81536
 f lq 81536
 f rq 81536
 f ? 81536
+f u01C3 81536
 f ! 81536
 f ) 81536
 f rB 81536
@@ -477,6 +557,8 @@ h W -87360
 h V -87360
 h t -29120
 h u -29120
+h u0075_030B -29120
+h u0075_030A -29120
 h `u -29120
 h 'u -29120
 h ^u -29120
@@ -488,6 +570,8 @@ h w -29120
 k W -87360
 k V -87360
 k a -58240
+k u0061_0306 -58240
+k u0061_0328 -58240
 k `a -58240
 k 'a -58240
 k ^a -58240
@@ -497,11 +581,15 @@ k :a -58240
 k oa -58240
 k ae -58240
 k e -29120
+k u0065_030C -29120
+k u0065_0328 -29120
 k `e -29120
 k 'e -29120
 k ^e -29120
 k :e -29120
 k a -29120
+k u0061_0306 -29120
+k u0061_0328 -29120
 k `a -29120
 k 'a -29120
 k ^a -29120
@@ -511,6 +599,7 @@ k :a -29120
 k oa -29120
 k ae -29120
 k o -29120
+k u006F_030B -29120
 k `o -29120
 k 'o -29120
 k ^o -29120
@@ -520,11 +609,14 @@ k oe -29120
 k /o -29120
 k c -29120
 k 'c -29120
+k u0063_030C -29120
 k ,c -29120
 m W -87360
 m V -87360
 m t -29120
 m u -29120
+m u0075_030B -29120
+m u0075_030A -29120
 m `u -29120
 m 'u -29120
 m ^u -29120
@@ -537,6 +629,8 @@ n W -87360
 n V -87360
 n t -29120
 n u -29120
+n u0075_030B -29120
+n u0075_030A -29120
 n `u -29120
 n 'u -29120
 n ^u -29120
@@ -546,11 +640,14 @@ n y -29120
 n v -29120
 n w -29120
 o e 29120
+o u0065_030C 29120
+o u0065_0328 29120
 o `e 29120
 o 'e 29120
 o ^e 29120
 o :e 29120
 o o 29120
+o u006F_030B 29120
 o `o 29120
 o 'o 29120
 o ^o 29120
@@ -562,6 +659,7 @@ o x -29120
 o d 29120
 o c 29120
 o 'c 29120
+o u0063_030C 29120
 o ,c 29120
 o q 29120
 o v -29120
@@ -571,11 +669,14 @@ o :y -29120
 o 'y -29120
 o w -29120
 p e 29120
+p u0065_030C 29120
+p u0065_0328 29120
 p `e 29120
 p 'e 29120
 p ^e 29120
 p :e 29120
 p o 29120
+p u006F_030B 29120
 p `o 29120
 p 'o 29120
 p ^o 29120
@@ -587,6 +688,7 @@ p x -29120
 p d 29120
 p c 29120
 p 'c 29120
+p u0063_030C 29120
 p ,c 29120
 p q 29120
 p v -29120
@@ -601,6 +703,8 @@ t 'y -29120
 t w -29120
 u w -29120
 v a -58240
+v u0061_0306 -58240
+v u0061_0328 -58240
 v `a -58240
 v 'a -58240
 v ^a -58240
@@ -610,11 +714,15 @@ v :a -58240
 v oa -58240
 v ae -58240
 v e -29120
+v u0065_030C -29120
+v u0065_0328 -29120
 v `e -29120
 v 'e -29120
 v ^e -29120
 v :e -29120
 v a -29120
+v u0061_0306 -29120
+v u0061_0328 -29120
 v `a -29120
 v 'a -29120
 v ^a -29120
@@ -624,6 +732,7 @@ v :a -29120
 v oa -29120
 v ae -29120
 v o -29120
+v u006F_030B -29120
 v `o -29120
 v 'o -29120
 v ^o -29120
@@ -633,13 +742,18 @@ v oe -29120
 v /o -29120
 v c -29120
 v 'c -29120
+v u0063_030C -29120
 v ,c -29120
 w e -29120
+w u0065_030C -29120
+w u0065_0328 -29120
 w `e -29120
 w 'e -29120
 w ^e -29120
 w :e -29120
 w a -29120
+w u0061_0306 -29120
+w u0061_0328 -29120
 w `a -29120
 w 'a -29120
 w ^a -29120
@@ -649,6 +763,7 @@ w :a -29120
 w oa -29120
 w ae -29120
 w o -29120
+w u006F_030B -29120
 w `o -29120
 w 'o -29120
 w ^o -29120
@@ -658,8 +773,10 @@ w oe -29120
 w /o -29120
 w c -29120
 w 'c -29120
+w u0063_030C -29120
 w ,c -29120
 y o -29120
+y u006F_030B -29120
 y `o -29120
 y 'o -29120
 y ^o -29120
@@ -668,11 +785,15 @@ y :o -29120
 y oe -29120
 y /o -29120
 y e -29120
+y u0065_030C -29120
+y u0065_0328 -29120
 y `e -29120
 y 'e -29120
 y ^e -29120
 y :e -29120
 y a -29120
+y u0061_0306 -29120
+y u0061_0328 -29120
 y `a -29120
 y 'a -29120
 y ^a -29120
@@ -683,19 +804,89 @@ y oa -29120
 y ae -29120
 y . -87360
 y , -87360
+u0041_0306 y -87360
+u0041_0306 :y -87360
+u0041_0306 'y -87360
+u0041_0306 v -116480
+u0041_0306 w -87360
+u0041_0306 c -29120
+u0041_0306 'c -29120
+u0041_0306 u0063_030C -29120
+u0041_0306 ,c -29120
+u0041_0306 d -29120
+u0041_0306 u0064_030C -29120
+u0041_0306 u0111 -29120
+u0041_0306 Sd -29120
+u0041_0306 e -29120
+u0041_0306 u0065_030C -29120
+u0041_0306 u0065_0328 -29120
+u0041_0306 `e -29120
+u0041_0306 'e -29120
+u0041_0306 ^e -29120
+u0041_0306 :e -29120
+u0041_0306 o -29120
+u0041_0306 u006F_030B -29120
+u0041_0306 `o -29120
+u0041_0306 'o -29120
+u0041_0306 ^o -29120
+u0041_0306 ~o -29120
+u0041_0306 :o -29120
+u0041_0306 oe -29120
+u0041_0306 /o -29120
+u0041_0306 q -29120
+u0041_0306 t -29120
+u0041_0306 u0074_030C -29120
+u0041_0306 u0074_0327 -29120
+u0041_0306 C -29120
+u0041_0306 G -29120
+u0041_0306 'C -29120
+u0041_0306 u0043_030C -29120
+u0041_0306 u0047_0306 -29120
+u0041_0306 ,C -29120
+u0041_0306 Q -29120
+u0041_0306 O -29120
+u0041_0306 u004F_030B -29120
+u0041_0306 `O -29120
+u0041_0306 'O -29120
+u0041_0306 ^O -29120
+u0041_0306 ~O -29120
+u0041_0306 :O -29120
+u0041_0306 OE -29120
+u0041_0306 /O -29120
+u0041_0306 U -29120
+u0041_0306 u0055_030B -29120
+u0041_0306 u0055_030A -29120
+u0041_0306 `U -29120
+u0041_0306 'U -29120
+u0041_0306 ^U -29120
+u0041_0306 :U -29120
+u0041_0306 T -87360
+u0041_0306 u0054_030C -87360
+u0041_0306 u0054_0327 -87360
+u0041_0306 Y -87360
+u0041_0306 :Y -87360
+u0041_0306 'Y -87360
+u0041_0306 V -116480
+u0041_0306 W -116480
 'C v -116480
 'C w -87360
 'C c -29120
 'C 'c -29120
+'C u0063_030C -29120
 'C ,c -29120
 'C d -29120
+'C u0064_030C -29120
+'C u0111 -29120
 'C Sd -29120
 'C e -29120
+'C u0065_030C -29120
+'C u0065_0328 -29120
 'C `e -29120
 'C 'e -29120
 'C ^e -29120
 'C :e -29120
 'C o -29120
+'C u006F_030B -29120
 'C `o -29120
 'C 'o -29120
 'C ^o -29120
@@ -705,12 +896,17 @@ y , -87360
 'C /o -29120
 'C q -29120
 'C t -29120
+'C u0074_030C -29120
+'C u0074_0327 -29120
 'C C -29120
 'C G -29120
 'C 'C -29120
+'C u0043_030C -29120
+'C u0047_0306 -29120
 'C ,C -29120
 'C Q -29120
 'C O -29120
+'C u004F_030B -29120
 'C `O -29120
 'C 'O -29120
 'C ^O -29120
@@ -719,22 +915,164 @@ y , -87360
 'C OE -29120
 'C /O -29120
 'C U -29120
+'C u0055_030B -29120
+'C u0055_030A -29120
 'C `U -29120
 'C 'U -29120
 'C ^U -29120
 'C :U -29120
 'C T -87360
+'C u0054_030C -87360
+'C u0054_0327 -87360
 'C Y -87360
 'C :Y -87360
 'C 'Y -87360
 'C V -116480
 'C W -116480
+u0044_030C X -29120
+u0044_030C W -29120
+u0044_030C A -29120
+u0044_030C u0041_0306 -29120
+u0044_030C u0041_0328 -29120
+u0044_030C `A -29120
+u0044_030C 'A -29120
+u0044_030C ^A -29120
+u0044_030C ~A -29120
+u0044_030C :A -29120
+u0044_030C oA -29120
+u0044_030C AE -29120
+u0044_030C V -29120
+u0044_030C Y -29120
+u0044_030C :Y -29120
+u0044_030C 'Y -29120
+u004C_0301 T -87360
+u004C_0301 u0054_030C -87360
+u004C_0301 u0054_0327 -87360
+u004C_0301 Y -87360
+u004C_0301 :Y -87360
+u004C_0301 'Y -87360
+u004C_0301 V -116480
+u004C_0301 W -116480
+u004C_030C T -87360
+u004C_030C u0054_030C -87360
+u004C_030C u0054_0327 -87360
+u004C_030C Y -87360
+u004C_030C :Y -87360
+u004C_030C 'Y -87360
+u004C_030C V -116480
+u004C_030C W -116480
 /L T -87360
+/L u0054_030C -87360
+/L u0054_0327 -87360
 /L Y -87360
 /L :Y -87360
 /L 'Y -87360
 /L V -116480
 /L W -116480
+u004F_030B X -29120
+u004F_030B W -29120
+u004F_030B A -29120
+u004F_030B u0041_0306 -29120
+u004F_030B u0041_0328 -29120
+u004F_030B `A -29120
+u004F_030B 'A -29120
+u004F_030B ^A -29120
+u004F_030B ~A -29120
+u004F_030B :A -29120
+u004F_030B oA -29120
+u004F_030B AE -29120
+u004F_030B V -29120
+u004F_030B Y -29120
+u004F_030B :Y -29120
+u004F_030B 'Y -29120
+u0052_0301 t -29120
+u0052_0301 u0074_030C -29120
+u0052_0301 u0074_0327 -29120
+u0052_0301 C -29120
+u0052_0301 G -29120
+u0052_0301 'C -29120
+u0052_0301 u0043_030C -29120
+u0052_0301 u0047_0306 -29120
+u0052_0301 ,C -29120
+u0052_0301 Q -29120
+u0052_0301 O -29120
+u0052_0301 u004F_030B -29120
+u0052_0301 `O -29120
+u0052_0301 'O -29120
+u0052_0301 ^O -29120
+u0052_0301 ~O -29120
+u0052_0301 :O -29120
+u0052_0301 OE -29120
+u0052_0301 /O -29120
+u0052_0301 U -29120
+u0052_0301 u0055_030B -29120
+u0052_0301 u0055_030A -29120
+u0052_0301 `U -29120
+u0052_0301 'U -29120
+u0052_0301 ^U -29120
+u0052_0301 :U -29120
+u0052_0301 T -87360
+u0052_0301 u0054_030C -87360
+u0052_0301 u0054_0327 -87360
+u0052_0301 Y -87360
+u0052_0301 :Y -87360
+u0052_0301 'Y -87360
+u0052_0301 V -116480
+u0052_0301 W -116480
+u0054_030C y -29120
+u0054_030C e -87360
+u0054_030C o -87360
+u0054_030C r -87360
+u0054_030C a -87360
+u0054_030C u -87360
+u0054_030C n -87360
+u0054_030C .i -87360
+u0054_030C c -87360
+u0054_030C d -87360
+u0054_030C g -87360
+u0054_030C p -87360
+u0054_030C s -87360
+u0054_030C v -87360
+u0054_030C w -87360
+u0054_030C x -87360
+u0054_030C z -87360
+u0054_030C A -87360
+u0054_030C u0041_0306 -87360
+u0054_030C u0041_0328 -87360
+u0054_030C `A -87360
+u0054_030C 'A -87360
+u0054_030C ^A -87360
+u0054_030C ~A -87360
+u0054_030C :A -87360
+u0054_030C oA -87360
+u0054_030C AE -87360
+u0054_0327 y -29120
+u0054_0327 e -87360
+u0054_0327 o -87360
+u0054_0327 r -87360
+u0054_0327 a -87360
+u0054_0327 u -87360
+u0054_0327 n -87360
+u0054_0327 .i -87360
+u0054_0327 c -87360
+u0054_0327 d -87360
+u0054_0327 g -87360
+u0054_0327 p -87360
+u0054_0327 s -87360
+u0054_0327 v -87360
+u0054_0327 w -87360
+u0054_0327 x -87360
+u0054_0327 z -87360
+u0054_0327 A -87360
+u0054_0327 u0041_0306 -87360
+u0054_0327 u0041_0328 -87360
+u0054_0327 `A -87360
+u0054_0327 'A -87360
+u0054_0327 ^A -87360
+u0054_0327 ~A -87360
+u0054_0327 :A -87360
+u0054_0327 oA -87360
+u0054_0327 AE -87360
 :Y e -87360
 :Y o -87360
 :Y r -87360
@@ -752,6 +1090,8 @@ y , -87360
 :Y x -87360
 :Y z -87360
 :Y A -87360
+:Y u0041_0306 -87360
+:Y u0041_0328 -87360
 :Y `A -87360
 :Y 'A -87360
 :Y ^A -87360
@@ -759,11 +1099,98 @@ y , -87360
 :Y :A -87360
 :Y oA -87360
 :Y AE -87360
+u0061_0306 v -29120
+u0061_0306 j 58240
+u0061_0306 y -29120
+u0061_0306 :y -29120
+u0061_0306 'y -29120
+u0061_0306 w -29120
+u0061_0328 g 29120
+u0061_0328 p 29120
+u0061_0328 w -29120
 'c h -29120
 'c k -29120
+u0063_030C h -29120
+u0063_030C k -29120
 /l cq 29120
 /l ' 29120
+u006E_0301 t -29120
+u006E_0301 u -29120
+u006E_0301 u0075_030B -29120
+u006E_0301 u0075_030A -29120
+u006E_0301 `u -29120
+u006E_0301 'u -29120
+u006E_0301 ^u -29120
+u006E_0301 :u -29120
+u006E_0301 b -29120
+u006E_0301 y -29120
+u006E_0301 v -29120
+u006E_0301 w -29120
+u006E_030C t -29120
+u006E_030C u -29120
+u006E_030C u0075_030B -29120
+u006E_030C u0075_030A -29120
+u006E_030C `u -29120
+u006E_030C 'u -29120
+u006E_030C ^u -29120
+u006E_030C :u -29120
+u006E_030C b -29120
+u006E_030C y -29120
+u006E_030C v -29120
+u006E_030C w -29120
+u016A t -29120
+u016A u -29120
+u016A u0075_030B -29120
+u016A u0075_030A -29120
+u016A `u -29120
+u016A 'u -29120
+u016A ^u -29120
+u016A :u -29120
+u016A b -29120
+u016A y -29120
+u016A v -29120
+u016A w -29120
+u006F_030B e 29120
+u006F_030B u0065_030C 29120
+u006F_030B u0065_0328 29120
+u006F_030B `e 29120
+u006F_030B 'e 29120
+u006F_030B ^e 29120
+u006F_030B :e 29120
+u006F_030B o 29120
+u006F_030B u006F_030B 29120
+u006F_030B `o 29120
+u006F_030B 'o 29120
+u006F_030B ^o 29120
+u006F_030B ~o 29120
+u006F_030B :o 29120
+u006F_030B oe 29120
+u006F_030B /o 29120
+u006F_030B x -29120
+u006F_030B d 29120
+u006F_030B c 29120
+u006F_030B 'c 29120
+u006F_030B u0063_030C 29120
+u006F_030B ,c 29120
+u006F_030B q 29120
+u006F_030B v -29120
+u006F_030B j 58240
+u006F_030B y -29120
+u006F_030B :y -29120
+u006F_030B 'y -29120
+u006F_030B w -29120
+u0074_030C y -29120
+u0074_030C :y -29120
+u0074_030C 'y -29120
+u0074_030C w -29120
+u0074_0327 y -29120
+u0074_0327 :y -29120
+u0074_0327 'y -29120
+u0074_0327 w -29120
+u0075_030B w -29120
+u0075_030A w -29120
 :y o -29120
+:y u006F_030B -29120
 :y `o -29120
 :y 'o -29120
 :y ^o -29120
@@ -772,11 +1199,15 @@ y , -87360
 :y oe -29120
 :y /o -29120
 :y e -29120
+:y u0065_030C -29120
+:y u0065_0328 -29120
 :y `e -29120
 :y 'e -29120
 :y ^e -29120
 :y :e -29120
 :y a -29120
+:y u0061_0306 -29120
+:y u0061_0328 -29120
 :y `a -29120
 :y 'a -29120
 :y ^a -29120
@@ -794,15 +1225,21 @@ y , -87360
 `A w -87360
 `A c -29120
 `A 'c -29120
+`A u0063_030C -29120
 `A ,c -29120
 `A d -29120
+`A u0064_030C -29120
+`A u0111 -29120
 `A Sd -29120
 `A e -29120
+`A u0065_030C -29120
+`A u0065_0328 -29120
 `A `e -29120
 `A 'e -29120
 `A ^e -29120
 `A :e -29120
 `A o -29120
+`A u006F_030B -29120
 `A `o -29120
 `A 'o -29120
 `A ^o -29120
@@ -812,12 +1249,17 @@ y , -87360
 `A /o -29120
 `A q -29120
 `A t -29120
+`A u0074_030C -29120
+`A u0074_0327 -29120
 `A C -29120
 `A G -29120
 `A 'C -29120
+`A u0043_030C -29120
+`A u0047_0306 -29120
 `A ,C -29120
 `A Q -29120
 `A O -29120
+`A u004F_030B -29120
 `A `O -29120
 `A 'O -29120
 `A ^O -29120
@@ -826,11 +1268,15 @@ y , -87360
 `A OE -29120
 `A /O -29120
 `A U -29120
+`A u0055_030B -29120
+`A u0055_030A -29120
 `A `U -29120
 `A 'U -29120
 `A ^U -29120
 `A :U -29120
 `A T -87360
+`A u0054_030C -87360
+`A u0054_0327 -87360
 `A Y -87360
 `A :Y -87360
 `A 'Y -87360
@@ -843,15 +1289,21 @@ y , -87360
 'A w -87360
 'A c -29120
 'A 'c -29120
+'A u0063_030C -29120
 'A ,c -29120
 'A d -29120
+'A u0064_030C -29120
+'A u0111 -29120
 'A Sd -29120
 'A e -29120
+'A u0065_030C -29120
+'A u0065_0328 -29120
 'A `e -29120
 'A 'e -29120
 'A ^e -29120
 'A :e -29120
 'A o -29120
+'A u006F_030B -29120
 'A `o -29120
 'A 'o -29120
 'A ^o -29120
@@ -861,12 +1313,17 @@ y , -87360
 'A /o -29120
 'A q -29120
 'A t -29120
+'A u0074_030C -29120
+'A u0074_0327 -29120
 'A C -29120
 'A G -29120
 'A 'C -29120
+'A u0043_030C -29120
+'A u0047_0306 -29120
 'A ,C -29120
 'A Q -29120
 'A O -29120
+'A u004F_030B -29120
 'A `O -29120
 'A 'O -29120
 'A ^O -29120
@@ -875,11 +1332,15 @@ y , -87360
 'A OE -29120
 'A /O -29120
 'A U -29120
+'A u0055_030B -29120
+'A u0055_030A -29120
 'A `U -29120
 'A 'U -29120
 'A ^U -29120
 'A :U -29120
 'A T -87360
+'A u0054_030C -87360
+'A u0054_0327 -87360
 'A Y -87360
 'A :Y -87360
 'A 'Y -87360
@@ -892,15 +1353,21 @@ y , -87360
 ^A w -87360
 ^A c -29120
 ^A 'c -29120
+^A u0063_030C -29120
 ^A ,c -29120
 ^A d -29120
+^A u0064_030C -29120
+^A u0111 -29120
 ^A Sd -29120
 ^A e -29120
+^A u0065_030C -29120
+^A u0065_0328 -29120
 ^A `e -29120
 ^A 'e -29120
 ^A ^e -29120
 ^A :e -29120
 ^A o -29120
+^A u006F_030B -29120
 ^A `o -29120
 ^A 'o -29120
 ^A ^o -29120
@@ -910,12 +1377,17 @@ y , -87360
 ^A /o -29120
 ^A q -29120
 ^A t -29120
+^A u0074_030C -29120
+^A u0074_0327 -29120
 ^A C -29120
 ^A G -29120
 ^A 'C -29120
+^A u0043_030C -29120
+^A u0047_0306 -29120
 ^A ,C -29120
 ^A Q -29120
 ^A O -29120
+^A u004F_030B -29120
 ^A `O -29120
 ^A 'O -29120
 ^A ^O -29120
@@ -924,11 +1396,15 @@ y , -87360
 ^A OE -29120
 ^A /O -29120
 ^A U -29120
+^A u0055_030B -29120
+^A u0055_030A -29120
 ^A `U -29120
 ^A 'U -29120
 ^A ^U -29120
 ^A :U -29120
 ^A T -87360
+^A u0054_030C -87360
+^A u0054_0327 -87360
 ^A Y -87360
 ^A :Y -87360
 ^A 'Y -87360
@@ -941,15 +1417,21 @@ y , -87360
 ~A w -87360
 ~A c -29120
 ~A 'c -29120
+~A u0063_030C -29120
 ~A ,c -29120
 ~A d -29120
+~A u0064_030C -29120
+~A u0111 -29120
 ~A Sd -29120
 ~A e -29120
+~A u0065_030C -29120
+~A u0065_0328 -29120
 ~A `e -29120
 ~A 'e -29120
 ~A ^e -29120
 ~A :e -29120
 ~A o -29120
+~A u006F_030B -29120
 ~A `o -29120
 ~A 'o -29120
 ~A ^o -29120
@@ -959,12 +1441,17 @@ y , -87360
 ~A /o -29120
 ~A q -29120
 ~A t -29120
+~A u0074_030C -29120
+~A u0074_0327 -29120
 ~A C -29120
 ~A G -29120
 ~A 'C -29120
+~A u0043_030C -29120
+~A u0047_0306 -29120
 ~A ,C -29120
 ~A Q -29120
 ~A O -29120
+~A u004F_030B -29120
 ~A `O -29120
 ~A 'O -29120
 ~A ^O -29120
@@ -973,11 +1460,15 @@ y , -87360
 ~A OE -29120
 ~A /O -29120
 ~A U -29120
+~A u0055_030B -29120
+~A u0055_030A -29120
 ~A `U -29120
 ~A 'U -29120
 ~A ^U -29120
 ~A :U -29120
 ~A T -87360
+~A u0054_030C -87360
+~A u0054_0327 -87360
 ~A Y -87360
 ~A :Y -87360
 ~A 'Y -87360
@@ -990,15 +1481,21 @@ y , -87360
 :A w -87360
 :A c -29120
 :A 'c -29120
+:A u0063_030C -29120
 :A ,c -29120
 :A d -29120
+:A u0064_030C -29120
+:A u0111 -29120
 :A Sd -29120
 :A e -29120
+:A u0065_030C -29120
+:A u0065_0328 -29120
 :A `e -29120
 :A 'e -29120
 :A ^e -29120
 :A :e -29120
 :A o -29120
+:A u006F_030B -29120
 :A `o -29120
 :A 'o -29120
 :A ^o -29120
@@ -1008,12 +1505,17 @@ y , -87360
 :A /o -29120
 :A q -29120
 :A t -29120
+:A u0074_030C -29120
+:A u0074_0327 -29120
 :A C -29120
 :A G -29120
 :A 'C -29120
+:A u0043_030C -29120
+:A u0047_0306 -29120
 :A ,C -29120
 :A Q -29120
 :A O -29120
+:A u004F_030B -29120
 :A `O -29120
 :A 'O -29120
 :A ^O -29120
@@ -1022,11 +1524,15 @@ y , -87360
 :A OE -29120
 :A /O -29120
 :A U -29120
+:A u0055_030B -29120
+:A u0055_030A -29120
 :A `U -29120
 :A 'U -29120
 :A ^U -29120
 :A :U -29120
 :A T -87360
+:A u0054_030C -87360
+:A u0054_0327 -87360
 :A Y -87360
 :A :Y -87360
 :A 'Y -87360
@@ -1039,15 +1545,21 @@ oA v -116480
 oA w -87360
 oA c -29120
 oA 'c -29120
+oA u0063_030C -29120
 oA ,c -29120
 oA d -29120
+oA u0064_030C -29120
+oA u0111 -29120
 oA Sd -29120
 oA e -29120
+oA u0065_030C -29120
+oA u0065_0328 -29120
 oA `e -29120
 oA 'e -29120
 oA ^e -29120
 oA :e -29120
 oA o -29120
+oA u006F_030B -29120
 oA `o -29120
 oA 'o -29120
 oA ^o -29120
@@ -1057,12 +1569,17 @@ oA oe -29120
 oA /o -29120
 oA q -29120
 oA t -29120
+oA u0074_030C -29120
+oA u0074_0327 -29120
 oA C -29120
 oA G -29120
 oA 'C -29120
+oA u0043_030C -29120
+oA u0047_0306 -29120
 oA ,C -29120
 oA Q -29120
 oA O -29120
+oA u004F_030B -29120
 oA `O -29120
 oA 'O -29120
 oA ^O -29120
@@ -1071,33 +1588,73 @@ oA :O -29120
 oA OE -29120
 oA /O -29120
 oA U -29120
+oA u0055_030B -29120
+oA u0055_030A -29120
 oA `U -29120
 oA 'U -29120
 oA ^U -29120
 oA :U -29120
 oA T -87360
+oA u0054_030C -87360
+oA u0054_0327 -87360
 oA Y -87360
 oA :Y -87360
 oA 'Y -87360
 oA V -116480
 oA W -116480
+u0189 X -29120
+u0110 X -29120
 -D X -29120
+u0189 W -29120
+u0110 W -29120
 -D W -29120
+u0189 A -29120
+u0110 A -29120
 -D A -29120
+u0189 u0041_0306 -29120
+u0110 u0041_0306 -29120
+-D u0041_0306 -29120
+u0189 u0041_0328 -29120
+u0110 u0041_0328 -29120
+-D u0041_0328 -29120
+u0189 `A -29120
+u0110 `A -29120
 -D `A -29120
+u0189 'A -29120
+u0110 'A -29120
 -D 'A -29120
+u0189 ^A -29120
+u0110 ^A -29120
 -D ^A -29120
+u0189 ~A -29120
+u0110 ~A -29120
 -D ~A -29120
+u0189 :A -29120
+u0110 :A -29120
 -D :A -29120
+u0189 oA -29120
+u0110 oA -29120
 -D oA -29120
+u0189 AE -29120
+u0110 AE -29120
 -D AE -29120
+u0189 V -29120
+u0110 V -29120
 -D V -29120
+u0189 Y -29120
+u0110 Y -29120
 -D Y -29120
+u0189 :Y -29120
+u0110 :Y -29120
 -D :Y -29120
+u0189 'Y -29120
+u0110 'Y -29120
 -D 'Y -29120
 `O X -29120
 `O W -29120
 `O A -29120
+`O u0041_0306 -29120
+`O u0041_0328 -29120
 `O `A -29120
 `O 'A -29120
 `O ^A -29120
@@ -1112,6 +1669,8 @@ oA W -116480
 'O X -29120
 'O W -29120
 'O A -29120
+'O u0041_0306 -29120
+'O u0041_0328 -29120
 'O `A -29120
 'O 'A -29120
 'O ^A -29120
@@ -1126,6 +1685,8 @@ oA W -116480
 ^O X -29120
 ^O W -29120
 ^O A -29120
+^O u0041_0306 -29120
+^O u0041_0328 -29120
 ^O `A -29120
 ^O 'A -29120
 ^O ^A -29120
@@ -1140,6 +1701,8 @@ oA W -116480
 ~O X -29120
 ~O W -29120
 ~O A -29120
+~O u0041_0306 -29120
+~O u0041_0328 -29120
 ~O `A -29120
 ~O 'A -29120
 ~O ^A -29120
@@ -1154,6 +1717,8 @@ oA W -116480
 :O X -29120
 :O W -29120
 :O A -29120
+:O u0041_0306 -29120
+:O u0041_0328 -29120
 :O `A -29120
 :O 'A -29120
 :O ^A -29120
@@ -1168,6 +1733,8 @@ oA W -116480
 /O X -29120
 /O W -29120
 /O A -29120
+/O u0041_0306 -29120
+/O u0041_0328 -29120
 /O `A -29120
 /O 'A -29120
 /O ^A -29120
@@ -1196,6 +1763,8 @@ oA W -116480
 'Y x -87360
 'Y z -87360
 'Y A -87360
+'Y u0041_0306 -87360
+'Y u0041_0328 -87360
 'Y `A -87360
 'Y 'A -87360
 'Y ^A -87360
@@ -1243,6 +1812,8 @@ oa w -29120
 ,c k -29120
 ~n t -29120
 ~n u -29120
+~n u0075_030B -29120
+~n u0075_030A -29120
 ~n `u -29120
 ~n 'u -29120
 ~n ^u -29120
@@ -1252,11 +1823,14 @@ oa w -29120
 ~n v -29120
 ~n w -29120
 `o e 29120
+`o u0065_030C 29120
+`o u0065_0328 29120
 `o `e 29120
 `o 'e 29120
 `o ^e 29120
 `o :e 29120
 `o o 29120
+`o u006F_030B 29120
 `o `o 29120
 `o 'o 29120
 `o ^o 29120
@@ -1268,6 +1842,7 @@ oa w -29120
 `o d 29120
 `o c 29120
 `o 'c 29120
+`o u0063_030C 29120
 `o ,c 29120
 `o q 29120
 `o v -29120
@@ -1277,11 +1852,14 @@ oa w -29120
 `o 'y -29120
 `o w -29120
 'o e 29120
+'o u0065_030C 29120
+'o u0065_0328 29120
 'o `e 29120
 'o 'e 29120
 'o ^e 29120
 'o :e 29120
 'o o 29120
+'o u006F_030B 29120
 'o `o 29120
 'o 'o 29120
 'o ^o 29120
@@ -1293,6 +1871,7 @@ oa w -29120
 'o d 29120
 'o c 29120
 'o 'c 29120
+'o u0063_030C 29120
 'o ,c 29120
 'o q 29120
 'o v -29120
@@ -1302,11 +1881,14 @@ oa w -29120
 'o 'y -29120
 'o w -29120
 ^o e 29120
+^o u0065_030C 29120
+^o u0065_0328 29120
 ^o `e 29120
 ^o 'e 29120
 ^o ^e 29120
 ^o :e 29120
 ^o o 29120
+^o u006F_030B 29120
 ^o `o 29120
 ^o 'o 29120
 ^o ^o 29120
@@ -1318,6 +1900,7 @@ oa w -29120
 ^o d 29120
 ^o c 29120
 ^o 'c 29120
+^o u0063_030C 29120
 ^o ,c 29120
 ^o q 29120
 ^o v -29120
@@ -1327,11 +1910,14 @@ oa w -29120
 ^o 'y -29120
 ^o w -29120
 ~o e 29120
+~o u0065_030C 29120
+~o u0065_0328 29120
 ~o `e 29120
 ~o 'e 29120
 ~o ^e 29120
 ~o :e 29120
 ~o o 29120
+~o u006F_030B 29120
 ~o `o 29120
 ~o 'o 29120
 ~o ^o 29120
@@ -1343,6 +1929,7 @@ oa w -29120
 ~o d 29120
 ~o c 29120
 ~o 'c 29120
+~o u0063_030C 29120
 ~o ,c 29120
 ~o q 29120
 ~o v -29120
@@ -1352,11 +1939,14 @@ oa w -29120
 ~o 'y -29120
 ~o w -29120
 :o e 29120
+:o u0065_030C 29120
+:o u0065_0328 29120
 :o `e 29120
 :o 'e 29120
 :o ^e 29120
 :o :e 29120
 :o o 29120
+:o u006F_030B 29120
 :o `o 29120
 :o 'o 29120
 :o ^o 29120
@@ -1368,6 +1958,7 @@ oa w -29120
 :o d 29120
 :o c 29120
 :o 'c 29120
+:o u0063_030C 29120
 :o ,c 29120
 :o q 29120
 :o v -29120
@@ -1377,11 +1968,14 @@ oa w -29120
 :o 'y -29120
 :o w -29120
 /o e 29120
+/o u0065_030C 29120
+/o u0065_0328 29120
 /o `e 29120
 /o 'e 29120
 /o ^e 29120
 /o :e 29120
 /o o 29120
+/o u006F_030B 29120
 /o `o 29120
 /o 'o 29120
 /o ^o 29120
@@ -1393,6 +1987,7 @@ oa w -29120
 /o d 29120
 /o c 29120
 /o 'c 29120
+/o u0063_030C 29120
 /o ,c 29120
 /o q 29120
 /o v -29120
@@ -1406,6 +2001,7 @@ oa w -29120
 ^u w -29120
 :u w -29120
 'y o -29120
+'y u006F_030B -29120
 'y `o -29120
 'y 'o -29120
 'y ^o -29120
@@ -1414,11 +2010,15 @@ oa w -29120
 'y oe -29120
 'y /o -29120
 'y e -29120
+'y u0065_030C -29120
+'y u0065_0328 -29120
 'y `e -29120
 'y 'e -29120
 'y ^e -29120
 'y :e -29120
 'y a -29120
+'y u0061_0306 -29120
+'y u0061_0328 -29120
 'y `a -29120
 'y 'a -29120
 'y ^a -29120
@@ -1462,8 +2062,9 @@ fi	582400,722176	2	0034
 fl	582400,722176	2	0035
 Fi	873600,722176	2	0036
 Fl	873600,722176	2	0037
----	524160,451360,101920	1	0040
-!	291200,722176	2	0041
+u2423	524160,451360,101920	1	0040
+u01C3	291200,722176	2	0041
+!	"
 dq	524160,722176	2	0042
 "	"
 sh	873600,722176,203840	3	0043
@@ -1477,8 +2078,7 @@ cq	291200,722176	2	0047
 (	407680,786240,262080	3	0050
 )	407680,786240,262080	3	0051
 *	524160,786240	2	0052
-pl	815360,611520,87360	3	0053
-+	"
++	815360,611520,87360	3	0053
 ,	291200,110656,203840	1	0054
 -	349440,451360	0	0055
 .	291200,110656	0	0056
@@ -1497,8 +2097,7 @@ sl	524160,786240,262080	3	0057
 :	291200,451360	0	0072
 ;	291200,451360,203840	1	0073
 <	815360,559216,40992	3	0074
-eq	815360,384606,-139554	0	0075
-=	"
+=	815360,384606,-139554	0	0075
 >	815360,559216,40992	3	0076
 ?	495040,722176	2	0077
 at	815360,722176	2	0100
@@ -1568,74 +2167,73 @@ y	553280,451360,203840,14560	1	0171
 z	465920,451360	0	0172
 lC	524160,786240,262080	3	0173
 {	"
-ba	291200,786240,262080	3	0174
-bv	"
-or	"
+u01C0	291200,786240,262080	3	0174
+ba	"
 |	"
 rC	524160,786240,262080	3	0175
 }	"
 ~	640640,695554	2	0176
 hy	174720,451360	0	0177
----	786240,934752	2	0200
----	786240,722176,203840	3	0201
+u0041_0306	786240,934752	2	0200
+u0041_0328	786240,722176,203840	3	0201
 'C	757120,897976	2	0202
----	757120,934752,0,0,-29120	2	0203
----	800800,934752,0,0,0,-29120	2	0204
----	713440,934752	2	0205
----	713440,722176,203840	3	0206
----	822640,934752,0,0,-29120	2	0207
----	655200,897976,0,0,0,58240	2	0210
----	655200,934752,0,0,0,58240	2	0211
+u0043_030C	757120,934752,0,0,-29120	2	0203
+u0044_030C	800800,934752,0,0,0,-29120	2	0204
+u0045_030C	713440,934752	2	0205
+u0045_0328	713440,722176,203840	3	0206
+u0047_0306	822640,934752,0,0,-29120	2	0207
+u004C_0301	655200,897976,0,0,0,58240	2	0210
+u004C_030C	655200,934752,0,0,0,58240	2	0211
 /L	655200,722176	2	0212
----	786240,897976	2	0213
----	786240,934752	2	0214
----	829920,722176,0,0,0,-29120	2	0215
----	815360,897976,0,0,-29120,-29120	2	0216
----	771680,897976	2	0217
----	771680,934752	2	0220
----	582400,897976	2	0221
+u004E_0301	786240,897976	2	0213
+u004E_030C	786240,934752	2	0214
+u014A	829920,722176,0,0,0,-29120	2	0215
+u004F_030B	815360,897976,0,0,-29120,-29120	2	0216
+u0052_0301	771680,897976	2	0217
+u0052_030C	771680,934752	2	0220
+u0053_0301	582400,897976	2	0221
 vS	582400,934752	2	0222
----	582400,722176,178360	3	0223
----	757120,934752,0,0,0,-145600	2	0224
----	757120,722176,178360,0,0,-145600	3	0225
----	786240,897976,0,0,-14560	2	0226
----	786240,934752,0,0,-14560	2	0227
+u0053_0327	582400,722176,178360	3	0223
+u0054_030C	757120,934752,0,0,0,-145600	2	0224
+u0054_0327	757120,722176,178360,0,0,-145600	3	0225
+u0055_030B	786240,897976,0,0,-14560	2	0226
+u0055_030A	786240,934752,0,0,-14560	2	0227
 :Y	786240,934752,0,26208,29120,-206752	2	0230
----	640640,897976	2	0231
+u005A_0301	640640,897976	2	0231
 vZ	640640,934752	2	0232
----	640640,897976	2	0233
+u005A_0307	640640,897976	2	0233
 IJ	902720,722176,0,0,0,-29120	2	0234
----	378560,897976	2	0235
----	582400,722176	2	0236
+u0049_0307	378560,897976	2	0235
+u0111	582400,722176	2	0236
 sc	465920,722176,203840	3	0237
----	524160,672672	2	0240
----	524160,451360,203840	1	0241
+u0061_0306	524160,672672	2	0240
+u0061_0328	524160,451360,203840	1	0241
 'c	465920,672672	2	0242
----	465920,672672	2	0243
----	707616,722176	2	0244
----	465920,672672	2	0245
----	465920,451360,203840	1	0246
----	524160,672672,203840,14560	3	0247
----	291200,897976,0,52149	2	0250
----	422240,722176	2	0251
+u0063_030C	465920,672672	2	0243
+u0064_030C	707616,722176	2	0244
+u0065_030C	465920,672672	2	0245
+u0065_0328	465920,451360,203840	1	0246
+u0067_0306	524160,672672,203840,14560	3	0247
+u006C_0301	291200,897976,0,52149	2	0250
+u006C_030C	422240,722176	2	0251
 /l	352352,722176	2	0252
----	582400,672672	2	0253
----	582400,672672	2	0254
----	582400,451360,203840	1	0255
----	524160,672672,0,10267	2	0256
----	410592,672672	2	0257
----	410592,672672	2	0260
----	413504,672672	2	0261
+u006E_0301	582400,672672	2	0253
+u006E_030C	582400,672672	2	0254
+u016A	582400,451360,203840	1	0255
+u006F_030B	524160,672672,0,10267	2	0256
+u0072_0301	410592,672672	2	0257
+u0072_030C	410592,672672	2	0260
+u0073_0301	413504,672672	2	0261
 vs	413504,672672	2	0262
----	413504,451360,178360	1	0263
----	407680,722176	2	0264
----	407680,644802,178360	3	0265
----	582400,672672	2	0266
----	582400,672672	2	0267
+u0073_0327	413504,451360,178360	1	0263
+u0074_030C	407680,722176	2	0264
+u0074_0327	407680,644802,178360	3	0265
+u0075_030B	582400,672672	2	0266
+u0075_030A	582400,672672	2	0267
 :y	553280,695554,203840,14560	3	0270
----	465920,672672	2	0271
+u007A_0301	465920,672672	2	0271
 vz	465920,672672	2	0272
----	465920,695554	2	0273
+u007A_0307	465920,695554	2	0273
 ij	611520,695554,203840	3	0274
 r!	291200,524160,203840	3	0275
 r?	495040,524160,203840	3	0276
@@ -1656,7 +2254,9 @@ AE	946400,722176	2	0306
 'I	378560,897976	2	0315
 ^I	378560,934752	2	0316
 :I	378560,934752	2	0317
--D	800800,722176,0,0,0,-29120	2	0320
+u0189	800800,722176,0,0,0,-29120	2	0320
+u0110	"
+-D	"
 ~N	786240,934752	2	0321
 `O	815360,897976,0,0,-29120,-29120	2	0322
 'O	815360,897976	2	0323
diff --git a/contrib/groff/font/devdvi/TRTC b/contrib/groff/font/devdvi/TRTC
index 37a054c..6042e8e 100644
--- a/contrib/groff/font/devdvi/TRTC
+++ b/contrib/groff/font/devdvi/TRTC
@@ -30,11 +30,11 @@ charset
 ---	524160,722176,0,275184	2	0034
 ---	524160,722176,0,304304	2	0035
 ---	0,722176	2	0037
----	582400,722176	2	0040
+u2422	582400,722176	2	0040
 Do	524160,786240,58240	3	0044
 $	"
 aq	291200,722176	2	0047
-**	524160,487760,-36400	2	0052
+---	524160,487760,-36400	2	0052
 ,	291200,110656,203840	1	0054
 ---	349440,384606,-139554	0	0055
 .	291200,110656	0	0056
@@ -50,14 +50,13 @@ f/	524160,786240,262080	3	0057
 8	524160,672672	2	0070
 9	524160,458640,203840	3	0071
 la	407680,786240,262080	3	0074
-mi	815360,611520,87360	3	0075
-\-	"
+\-	815360,611520,87360	3	0075
 ra	407680,786240,262080	3	0076
----	757120,722176	2	0115
+u2127	757120,722176	2	0115
 ci	1164800,786240,262080	3	0117
----	757120,722176	2	0127
----	422240,786240,262080	3	0133
----	422240,786240,262080	3	0135
+u03A9	757120,722176	2	0127
+u301A	422240,786240,262080	3	0133
+u301B	422240,786240,262080	3	0135
 ua	524160,722176,203840	3	0136
 da	524160,722176,203840	3	0137
 ---	524160,722176	2	0140
@@ -66,7 +65,7 @@ da	524160,722176,203840	3	0137
 ---	524160,635442,27666	3	0144
 ---	1048320,722176	2	0154
 ---	524160,487760,-36400	2	0155
----	640640,722176	2	0156
+u266A	640640,722176	2	0156
 ti	640640,128960	0	0176
 ~	"
 ---	174720,384606,-139554	0	0177
@@ -76,34 +75,34 @@ ti	640640,128960	0	0176
 ---	524160,722176	2	0203
 dg	465920,722176,203840	3	0204
 dd	465920,722176,203840	3	0205
----	524160,786240,262080	3	0206
-%O	1223040,786240,58240	3	0207
+u2016	524160,786240,262080	3	0206
+%0	1223040,786240,58240	3	0207
 bu	524160,458640,-58240	2	0210
----	990080,722176,0,0,-29120	2	0211
+u2103	990080,722176,0,0,-29120	2	0211
 ---	640640,786240,58240	3	0212
 ---	524160,548426,101920	3	0213
 Fn	320320,722176,0,81536	2	0214
----	757120,786240,58240,0,-29120	3	0215
----	1077440,722176,0,14560,43680,-131040	2	0216
----	815360,722176	2	0217
+u20A1	757120,786240,58240,0,-29120	3	0215
+u20A9	1077440,722176,0,14560,43680,-131040	2	0216
+u20A6	815360,722176	2	0217
 ---	822640,786240,58240,0,-29120	3	0220
----	728000,722176,0,0,0,-145600	2	0221
----	669760,722176	2	0222
----	771680,722176	2	0223
----	495040,722176	2	0224
+u20B1	728000,722176,0,0,0,-145600	2	0221
+u20A4	669760,722176	2	0222
+u211E	771680,722176	2	0223
+u203D	495040,722176	2	0224
 ---	495040,524160,203840	3	0225
----	582400,786240	2	0226
+u20AB	582400,786240	2	0226
 tm	698880,786240,0,550366	2	0227
----	1586070,786240,58240	3	0230
+u2031	1586070,786240,58240	3	0230
 ---	495040,722176,203840	3	0231
----	742560,786240,58240	3	0232
----	960960,722176	2	0233
----	524160,786240	2	0234
----	709072,722176	2	0235
----	524160,458640,-58240	2	0236
----	698880,786240,0,550366	2	0237
----	378560,786240,262080	3	0240
----	378560,786240,262080	3	0241
+u0E3F	742560,786240,58240	3	0232
+u2116	960960,722176	2	0233
+u2052	524160,786240	2	0234
+u212E	709072,722176	2	0235
+u25E6	524160,458640,-58240	2	0236
+u2120	698880,786240,0,550366	2	0237
+u2045	378560,786240,262080	3	0240
+u2046	378560,786240,262080	3	0241
 ct	524160,548426,101920	3	0242
 Po	669760,722176	2	0243
 Cs	772248,580323	2	0244
@@ -114,10 +113,10 @@ sc	465920,722176,203840	3	0247
 co	1164800,786240,262080	3	0251
 Of	465920,786240	2	0252
 ---	1164800,786240,262080	3	0253
-no	698880,458640	2	0254
----	1164800,786240,262080	3	0255
+tno	698880,458640	2	0254
+u2117	1164800,786240,262080	3	0255
 rg	1164800,786240,262080	3	0256
-rn	815360,722176	2	0257
+---	815360,722176	2	0257
 de	349440,722176	2	0260
 t+-	815360,611520,87360	3	0261
 S2	465920,786240	2	0262
@@ -126,13 +125,13 @@ S3	465920,786240	2	0263
 mc	582400,458640,203840	3	0265
 ps	640640,722176,203840	3	0266
 pc	291200,458640	2	0267
----	660051,548426	2	0270
+u203B	660051,548426	2	0270
 S1	465920,786240	2	0271
 Om	465920,786240	2	0272
 ---	495040,786240,220138	3	0273
-14	465920,786240,203840	3	0274
-12	465920,786240,203840	3	0275
-34	465920,786240,203840	3	0276
+---	465920,786240,203840	3	0274
+---	465920,786240,203840	3	0275
+---	465920,786240,203840	3	0276
 Eu	815360,722176	2	0277
 tmu	815360,611520,87360	3	0326
 tdi	815360,611520,87360	3	0366
diff --git a/contrib/groff/font/devdvi/generate/Makefile b/contrib/groff/font/devdvi/generate/Makefile
index 37c8eb4..8215007 100644
--- a/contrib/groff/font/devdvi/generate/Makefile
+++ b/contrib/groff/font/devdvi/generate/Makefile
@@ -32,7 +32,7 @@ TFMTODIT=tfmtodit
 FONTS=TR TI TB TBI CW CWI HR HI HB HBI \
       TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \
       TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \
-      MI S EX SA SB
+      MI S SC EX SA SB
 SPECIALFLAG=-s
 
 all: $(FONTS)
@@ -78,6 +78,10 @@ S: $(srcdir)/texsy.map
 	$(TFMTODIT) $(SPECIALFLAG) -k 060 \
 	  $(tfmdir)/cmsy10.tfm $(srcdir)/texsy.map $@
 
+SC: $(srcdir)/textex.map
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/cmtex10.tfm $(srcdir)/textex.map $@
+
 EX: $(srcdir)/texex.map
 	$(TFMTODIT) $(SPECIALFLAG) \
 	  $(tfmdir)/cmex10.tfm $(srcdir)/texex.map $@
diff --git a/contrib/groff/font/devdvi/generate/ec.map b/contrib/groff/font/devdvi/generate/ec.map
index 53ba341..57e6608 100644
--- a/contrib/groff/font/devdvi/generate/ec.map
+++ b/contrib/groff/font/devdvi/generate/ec.map
@@ -1,5 +1,5 @@
 # Map for EC fonts with T1 encoding.
-# Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+# Originally contributed by Andreas Schwab <schwab@suse.de>
 0 ga
 1 aa
 2 a^
@@ -30,7 +30,8 @@
 29 fl
 30 Fi
 31 Fl
-33 !
+32 u2423
+33 ! u01C3
 34 " dq
 35 # sh
 36 $ Do
@@ -40,7 +41,7 @@
 40 (
 41 )
 42 *
-43 + pl
+43 +
 44 ,
 45 -
 46 .
@@ -58,7 +59,7 @@
 58 :
 59 ;
 60 <
-61 = eq
+61 =
 62 >
 63 ?
 64 @ at
@@ -121,22 +122,70 @@
 121 y
 122 z
 123 { lC
-124 | or bv ba
+124 | ba u01C0
 125 } rC
 126 ~
 127 hy
+128 u0041_0306
+129 u0041_0328
 130 'C
+131 u0043_030C
+132 u0044_030C
+133 u0045_030C
+134 u0045_0328
+135 u0047_0306
+136 u004C_0301
+137 u004C_030C
 138 /L
+139 u004E_0301
+140 u004E_030C
+141 u014A
+142 u004F_030B
+143 u0052_0301
+144 u0052_030C
+145 u0053_0301
 146 vS
+147 u0053_0327
+148 u0054_030C
+149 u0054_0327
+150 u0055_030B
+151 u0055_030A
 152 :Y
+153 u005A_0301
 154 vZ
+155 u005A_0307
 156 IJ
+157 u0049_0307
+158 u0111
 159 sc
+160 u0061_0306
+161 u0061_0328
 162 'c
+163 u0063_030C
+164 u0064_030C
+165 u0065_030C
+166 u0065_0328
+167 u0067_0306
+168 u006C_0301
+169 u006C_030C
 170 /l
+171 u006E_0301
+172 u006E_030C
+173 u016A
+174 u006F_030B
+175 u0072_0301
+176 u0072_030C
+177 u0073_0301
 178 vs
+179 u0073_0327
+180 u0074_030C
+181 u0074_0327
+182 u0075_030B
+183 u0075_030A
 184 :y
+185 u007A_0301
 186 vz
+187 u007A_0307
 188 ij
 189 r!
 190 r?
@@ -157,7 +206,7 @@
 205 'I
 206 ^I
 207 :I
-208 -D
+208 -D u0110 u0189
 209 ~N
 210 `O
 211 'O
diff --git a/contrib/groff/font/devdvi/generate/tc.map b/contrib/groff/font/devdvi/generate/tc.map
index 6934ca4..e745722 100644
--- a/contrib/groff/font/devdvi/generate/tc.map
+++ b/contrib/groff/font/devdvi/generate/tc.map
@@ -1,9 +1,9 @@
 # Map for TC fonts with TS1 encoding.
 24 <-
 25 ->
+32 u2422
 36 $ Do
 39 aq
-42 **
 44 ,
 46 .
 47 f/
@@ -18,18 +18,42 @@
 56 8
 57 9
 60 la
-61 \- mi
+61 \-
 62 ra
+77 u2127
 79 ci
+87 u03A9
+91 u301A
+93 u301B
 94 ua
 95 da
+110 u266A
 126 ~ ti
 132 dg
 133 dd
-135 %O
+134 u2016
+135 %0
 136 bu
+137 u2103
 140 Fn
+141 u20A1
+142 u20A9
+143 u20A6
+145 u20B1
+146 u20A4
+147 u211E
+148 u203D
+150 u20AB
 151 tm
+152 u2031
+154 u0E3F
+155 u2116
+156 u2052
+157 u212E
+158 u25E6
+159 u2120
+160 u2045
+161 u2046
 162 ct
 163 Po
 164 Cs
@@ -38,9 +62,9 @@
 167 sc
 169 co
 170 Of
-172 no
+172 tno
+173 u2117
 174 rg
-175 rn
 176 de
 177 t+-
 178 S2
@@ -48,11 +72,9 @@
 181 mc
 182 ps
 183 pc
+184 u203B
 185 S1
 186 Om
-188 14
-189 12
-190 34
 191 Eu
 214 tmu
 246 tdi
diff --git a/contrib/groff/font/devdvi/generate/texb.map b/contrib/groff/font/devdvi/generate/texb.map
index 6ea689f..ddab640 100644
--- a/contrib/groff/font/devdvi/generate/texb.map
+++ b/contrib/groff/font/devdvi/generate/texb.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/contrib/groff/font/devdvi/generate/texex.map b/contrib/groff/font/devdvi/generate/texex.map
index a5b2690..2e497f7 100644
--- a/contrib/groff/font/devdvi/generate/texex.map
+++ b/contrib/groff/font/devdvi/generate/texex.map
@@ -74,7 +74,7 @@
 79 bigcirclemultiply
 88 sum
 89 product
-90 is integral
+90 integral
 91 bigunion
 92 bigintersection
 93 bigunionplus
@@ -89,10 +89,10 @@
 109 ceilingright1
 110 braceleft1
 111 braceright1
-112 sr0
-113 sr1
-114 sr2
-115 sr3
+112 sqrt0
+113 sqrt1
+114 sqrt2
+115 sqrt3
 119 arrowvertdblex 
 120 arrowverttp 
 121 arrowvertbt
diff --git a/contrib/groff/font/devdvi/generate/texi.map b/contrib/groff/font/devdvi/generate/texi.map
index 82497eb..4e3915d 100644
--- a/contrib/groff/font/devdvi/generate/texi.map
+++ b/contrib/groff/font/devdvi/generate/texi.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/contrib/groff/font/devdvi/generate/texmi.map b/contrib/groff/font/devdvi/generate/texmi.map
index 41b4742..669d046 100644
--- a/contrib/groff/font/devdvi/generate/texmi.map
+++ b/contrib/groff/font/devdvi/generate/texmi.map
@@ -2,7 +2,7 @@
 12 *b
 13 *g
 14 *d
-15 *e
+15 +e
 16 *z
 17 *y
 18 *h
@@ -21,12 +21,26 @@
 31 *x
 32 *q
 33 *w
+34 *e
 35 +h
 36 +p
 38 ts
 39 +f
+40 u21BC
+41 u21BD
+42 u21C0
+43 u21C1
+46 u25B7
+47 u25C1
 60 <
 62 >
+63 u22C6
 64 pd
+91 u266D
+92 u266E
+93 u266F
+94 u2323
+95 u2322
+96 u2113
 111 *o
 125 wp
diff --git a/contrib/groff/font/devdvi/generate/texr.map b/contrib/groff/font/devdvi/generate/texr.map
index 73abe16..0eaf423 100644
--- a/contrib/groff/font/devdvi/generate/texr.map
+++ b/contrib/groff/font/devdvi/generate/texr.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/contrib/groff/font/devdvi/generate/texsy.map b/contrib/groff/font/devdvi/generate/texsy.map
index c22d044..8848c92 100644
--- a/contrib/groff/font/devdvi/generate/texsy.map
+++ b/contrib/groff/font/devdvi/generate/texsy.map
@@ -3,46 +3,63 @@
 2 mu tmu
 3 **
 4 di tdi
+5 u22C4
 6 +- t+-
 7 -+
 8 c+
+9 u2296
 10 c*
+11 u2298
+12 u2299
 13 ci
+14 u25E6
 15 bu
+16 u224D
 17 ==
 18 ib
 19 ip
 20 <=
 21 >=
+22 u227C
+23 u227D
 24 ap ti
-25 ~~
+25 ~~ ~=
 26 sb
 27 sp
 28 <<
 29 >>
+30 u227A
+31 u227B
 32 <-
 33 ->
 34 ua
 35 da
 36 <>
-39 ~=
-40 lA lh
-41 rA rh
+37 u2197
+38 u2198
+39 |=
+40 lA
+41 rA
 42 uA
 43 dA
 44 hA
+45 u2196
+46 u2199
 47 pt
 48 prime
 49 if
 50 mo
 51 st
+52 u25B3
+53 u25BD
 54 slashnot
 56 fa
 57 te
-58 no
+58 no tno
 59 es
 60 Re
 61 Im
+62 u22A4
 63 pp
 64 Ah
 65 A
@@ -73,8 +90,11 @@
 90 Z
 91 cu
 92 ca
+93 u228E
 94 AN
 95 OR
+96 u22A2
+97 u22A3
 98 lf
 99 rf
 100 lc
@@ -83,18 +103,25 @@
 103 rC }
 104 la
 105 ra
-106 ba | bv or bar
+106 ba | bv bar
 107 bardbl
 108 va
 109 vA
 110 \ rs
-112 sr
+111 u2240
+112 sqrt
+113 u2210
 114 gr
+115 is
+116 u2294
+117 u2293
+118 u2291
+119 u2292
 120 sc
 121 dg
 122 dd
 123 ps
 124 CL
-125 DI
-126 HE
+125 u2662
+126 u2661
 127 SP
diff --git a/contrib/groff/font/devdvi/generate/textex.map b/contrib/groff/font/devdvi/generate/textex.map
new file mode 100644
index 0000000..9756627
--- /dev/null
+++ b/contrib/groff/font/devdvi/generate/textex.map
@@ -0,0 +1,34 @@
+# Map for the cmtex font
+0 md pc
+1 da
+2 *a
+3 *b
+4 AN
+5 no tno
+6 mo
+7 *p
+8 *l
+9 *g
+10 *d
+11 ua
+12 pm
+13 c+
+14 if
+15 pd
+16 sb
+17 sp
+18 ca
+19 cu
+20 fa
+21 te
+22 c*
+23 u21C6
+24 <-
+25 ->
+26 !=
+27 u22C4
+28 <=
+29 >=
+30 ==
+31 OR
+127 is
diff --git a/contrib/groff/font/devdvi/generate/textt.map b/contrib/groff/font/devdvi/generate/textt.map
index c980496..157013d 100644
--- a/contrib/groff/font/devdvi/generate/textt.map
+++ b/contrib/groff/font/devdvi/generate/textt.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 u2423
 33 !
 34 " dq
 35 # sh
@@ -124,3 +125,4 @@
 124 ba |
 125 rC }
 126 a~ ~
+127 ad
diff --git a/contrib/groff/font/devhtml/DESC.proto b/contrib/groff/font/devhtml/DESC.proto
index c3a53a2..9a2fbe5 100644
--- a/contrib/groff/font/devhtml/DESC.proto
+++ b/contrib/groff/font/devhtml/DESC.proto
@@ -2,7 +2,7 @@ res 240
 hor 24
 vert 40
 unitwidth 10
-sizes 6 8 10 12 14 16 18 0
+sizes 1-1000 0
 fonts 9 R I B BI CR CI CB CBI S
 tcommand
 html
diff --git a/contrib/groff/font/devhtml/R.proto b/contrib/groff/font/devhtml/R.proto
index 3af836d..a4bddf0 100644
--- a/contrib/groff/font/devhtml/R.proto
+++ b/contrib/groff/font/devhtml/R.proto
@@ -118,6 +118,7 @@ rC	24	0	0x007D
 a~	24	0	0x007E
 ~	"
 ti	"
+---	24	0	0x00A0	&nbsp;
 r!	24	0	0x00A1	&iexcl;
 ct	24	0	0x00A2	&cent;
 Po	24	0	0x00A3	&pound;
@@ -130,6 +131,7 @@ co	24	0	0x00A9	&copy;
 Of	24	0	0x00AA	&ordf;
 Fo	24	0	0x00AB	&laquo;
 no	24	0	0x00AC	&not;
+tno	"
 rg	24	0	0x00AE	&reg;
 a-	24	0	0x00AF	&macr;
 de	24	0	0x00B0	&deg;
@@ -149,6 +151,10 @@ Fc	24	0	0x00BB	&raquo;
 14	24	0	0x00BC	&frac14;
 12	24	0	0x00BD	&frac12;
 34	24	0	0x00BE	&frac34;
+18	24	0	0x215B	&#8539;
+38	24	0	0x215C	&#8540;
+58	24	0	0x215D	&#8541;
+78	24	0	0x215E	&#8542;
 r?	24	0	0x00BF	&iquest;
 `A	24	0	0x00C0	&Agrave;
 'A	24	0	0x00C1	&Aacute;
@@ -216,7 +222,11 @@ tdi	"
 'y	24	0	0x00FD	&yacute;
 Tp	24	0	0x00FE	&thorn;
 :y	24	0	0x00FF	&yuml;
+'C	24	0	0x0106	&#262;
+'c	24	0	0x0107	&#263;
 .i	24	0	0x0131	&#305;
+IJ	24	0	0x0132	&#306;
+ij	24	0	0x0133	&#307;
 /L	24	0	0x0141	&#321;
 /l	24	0	0x0142	&#322;
 OE	24	0	0x0152	&OElig;
@@ -278,13 +288,14 @@ ts	24	0	0x03C2	&sigmaf;
 *s	24	0	0x03C3	&sigma;
 *t	24	0	0x03C4	&tau;
 *u	24	0	0x03C5	&upsilon;
-*f	24	0	0x03C6	&phi;
++f	24	0	0x03C6	&phi;
 *x	24	0	0x03C7	&chi;
 *q	24	0	0x03C8	&psi;
 *w	24	0	0x03C9	&omega;
 +h	24	0	0x03D1	&thetasym;
-+f	24	0	0x03D5	&#981;
+*f	24	0	0x03D5	&#981;
 +p	24	0	0x03D6	&piv;
++e	24	0	0x03F5	&#1013;
 en	24	0	0x2013	&ndash;
 em	24	0	0x2014	&mdash;
 `	24	0	0x2018	&lsquo;
@@ -307,6 +318,8 @@ rn	24	0	0x203E	&oline;
 f/	24	0	0x2044	&frasl;
 Eu	24	0	0x20AC	&euro;
 eu	"
+-h	24	0	0x210F	&#8463;
+hbar	"
 Im	24	0	0x2111	&image;
 wp	24	0	0x2118	&weierp;
 Re	24	0	0x211C	&real;
@@ -317,11 +330,14 @@ ua	24	0	0x2191	&uarr;
 ->	24	0	0x2192	&rarr;
 da	24	0	0x2193	&darr;
 <>	24	0	0x2194	&harr;
+va	24	0	0x2195	&#8597;
+CR	24	0	0x21B5	&#8629;
 lA	24	0	0x21D0	&lArr;
 uA	24	0	0x21D1	&uArr;
 rA	24	0	0x21D2	&rArr;
 dA	24	0	0x21D3	&dArr;
 hA	24	0	0x21D4	&hArr;
+vA	24	0	0x21D5	&#8661;
 fa	24	0	0x2200	&forall;
 pd	24	0	0x2202	&part;
 te	24	0	0x2203	&exist;
@@ -334,8 +350,10 @@ product	24	0	0x220F	&prod;
 sum	24	0	0x2211	&sum;
 \-	24	0	0x2212	&minus;
 mi	"
+-+	24	0	0x2213	&#8723;
 **	24	0	0x2217	&lowast;
 sr	24	0	0x221A	&radic;
+sqrt	"
 pt	24	0	0x221D	&prop;
 if	24	0	0x221E	&infin;
 /_	24	0	0x2220	&ang;
@@ -344,20 +362,25 @@ OR	24	0	0x2228	&or;
 ca	24	0	0x2229	&cap;
 cu	24	0	0x222A	&cup;
 is	24	0	0x222B	&int;
+integral	"
 tf	24	0	0x2234	&there4;
 3d	"
-ti	24	0	0x223C	&sim;
-ap	"
+ap	24	0	0x223C	&sim;
+|=	24	0	0x2243	&#8771;
 =~	24	0	0x2245	&cong;
 ~~	24	0	0x2248	&asymp;
 ~=	"
 !=	24	0	0x2260	&ne;
 ==	24	0	0x2261	&equiv;
+ne	24	0	0x2262	&#8802;
 <=	24	0	0x2264	&le;
 >=	24	0	0x2265	&ge;
+<<	24	0	0x226A	&#8810;
+>>	24	0	0x226B	&#8811;
 sb	24	0	0x2282	&sub;
 sp	24	0	0x2283	&sup;
 nb	24	0	0x2284	&nsub;
+nc	24	0	0x2285	&#8837;
 ib	24	0	0x2286	&sube;
 ip	24	0	0x2287	&supe;
 c+	24	0	0x2295	&oplus;
@@ -370,22 +393,43 @@ lf	24	0	0x230A	&lfloor;
 rf	24	0	0x230B	&rfloor;
 la	24	0	0x2329	&lang;
 ra	24	0	0x232A	&rang;
-CR	24	0	0x240D	&#9229;
-an	24	0	0x2500	&#9472;
+parenlefttp	24	0	0x239B	&#9115;
+parenleftex	24	0	0x239C	&#9116;
+parenleftbt	24	0	0x239D	&#9117;
+parenrighttp	24	0	0x239E	&#9118;
+parenrightex	24	0	0x239F	&#9119;
+parenrightbt	24	0	0x23A0	&#9120;
+bracketlefttp	24	0	0x23A1	&#9121;
+bracketleftex	24	0	0x23A2	&#9122;
+bracketleftbt	24	0	0x23A3	&#9123;
+bracketrighttp	24	0	0x23A4	&#9124;
+bracketrightex	24	0	0x23A5	&#9125;
+bracketrightbt	24	0	0x23A6	&#9126;
+lt	24	0	0x23A7	&#9127;
+bracelefttp	"
+lk	24	0	0x23A8	&#9128;
+braceleftmid	"
+lb	24	0	0x23A9	&#9129;
+braceleftbt	"
+bv	24	0	0x23AA	&#9130;
+braceex	"
+braceleftex	"
+bracerightex	"
+rt	24	0	0x23AB	&#9131;
+bracerighttp	"
+rk	24	0	0x23AC	&#9132;
+bracerightmid	"
+rb	24	0	0x23AD	&#9133;
+bracerightbt	"
+an	24	0	0x23AF	&#9135;
 br	24	0	0x2502	&#9474;
-bv	"
-rk	24	0	0x251D	&#9501;
-lk	24	0	0x2525	&#9509;
-lt	24	0	0x256D	&#9581;
-rt	24	0	0x256E	&#9582;
-rb	24	0	0x256F	&#9583;
-lb	24	0	0x2570	&#9584;
 sq	24	0	0x25A1	&#9633;
 lz	24	0	0x25CA	&loz;
-ci	24	0	0x25EF	&#9711;
+ci	24	0	0x25CB	&#9675;
 lh	24	0	0x261C	&#9756;
 rh	24	0	0x261E	&#9758;
 SP	24	0	0x2660	&spades;
 CL	24	0	0x2663	&clubs;
 HE	24	0	0x2665	&hearts;
 DI	24	0	0x2666	&diams;
+OK	24	0	0x2713	&#10003;
diff --git a/contrib/groff/font/devlatin1/R.proto b/contrib/groff/font/devlatin1/R.proto
index db701ee..92e7605 100644
--- a/contrib/groff/font/devlatin1/R.proto
+++ b/contrib/groff/font/devlatin1/R.proto
@@ -2,6 +2,38 @@ name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0000
+---	24	0	0001
+---	24	0	0002
+---	24	0	0003
+---	24	0	0004
+---	24	0	0005
+---	24	0	0006
+---	24	0	0007
+---	24	0	0010
+---	24	0	0011
+---	24	0	0012
+---	24	0	0013
+---	24	0	0014
+---	24	0	0015
+---	24	0	0016
+---	24	0	0017
+---	24	0	0020
+---	24	0	0021
+---	24	0	0022
+---	24	0	0023
+---	24	0	0024
+---	24	0	0025
+---	24	0	0026
+---	24	0	0027
+---	24	0	0030
+---	24	0	0031
+---	24	0	0032
+---	24	0	0033
+---	24	0	0034
+---	24	0	0035
+---	24	0	0036
+---	24	0	0037
 !	24	0	0041
 "	24	0	0042
 dq	"
@@ -121,7 +153,6 @@ f	24	0	0146
 g	24	0	0147
 h	24	0	0150
 i	24	0	0151
-.i	"
 j	24	0	0152
 k	24	0	0153
 l	24	0	0154
@@ -147,22 +178,46 @@ or	"
 bv	"
 br	"
 |	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
 rC	24	0	0175
 }	"
 a~	24	0	0176
 ~	"
 ap	"
 ti	"
+---	24	0	0177
+---	24	0	0200
+---	24	0	0201
+---	24	0	0202
+---	24	0	0203
+---	24	0	0204
+---	24	0	0205
+---	24	0	0206
+---	24	0	0207
+---	24	0	0210
+---	24	0	0211
+---	24	0	0212
+---	24	0	0213
+---	24	0	0214
+---	24	0	0215
+---	24	0	0216
+---	24	0	0217
+---	24	0	0220
+---	24	0	0221
+---	24	0	0222
+---	24	0	0223
+---	24	0	0224
+---	24	0	0225
+---	24	0	0226
+---	24	0	0227
+---	24	0	0230
+---	24	0	0231
+---	24	0	0232
+---	24	0	0233
+---	24	0	0234
+---	24	0	0235
+---	24	0	0236
+---	24	0	0237
+---	24	0	0240
 r!	24	0	0241
 ct	24	0	0242
 Po	24	0	0243
@@ -175,6 +230,7 @@ co	24	0	0251
 Of	24	0	0252
 Fo	24	0	0253
 no	24	0	0254
+tno	"
 shc	24	0	0255
 rg	24	0	0256
 a-	24	0	0257
diff --git a/contrib/groff/font/devlbp/CB b/contrib/groff/font/devlbp/CB
index 720f65a..1a828a1 100644
--- a/contrib/groff/font/devlbp/CB
+++ b/contrib/groff/font/devlbp/CB
@@ -204,6 +204,7 @@ rs	2200	0	0x5c		--	0,92	#	backslash
 <=	2200	0	0xf3		--	6,2	#	lessequal
 ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	2200	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	2200	0	0x5		--	5,168	#	club	"club	suit"
 SP	2200	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	2200	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/CI b/contrib/groff/font/devlbp/CI
index 1322440..454bfd1 100644
--- a/contrib/groff/font/devlbp/CI
+++ b/contrib/groff/font/devlbp/CI
@@ -204,6 +204,7 @@ rs	2200	0	0x5c		--	0,92	#	backslash
 <=	2200	0	0xf3		--	6,2	#	lessequal
 ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	2200	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	2200	0	0x5		--	5,168	#	club	"club	suit"
 SP	2200	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	2200	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/CR b/contrib/groff/font/devlbp/CR
index 70b43a6..4799995 100644
--- a/contrib/groff/font/devlbp/CR
+++ b/contrib/groff/font/devlbp/CR
@@ -204,6 +204,7 @@ rs	2200	0	0x5c		--	0,92	#	backslash
 <=	2200	0	0xf3		--	6,2	#	lessequal
 ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	2200	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	2200	0	0x5		--	5,168	#	club	"club	suit"
 SP	2200	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	2200	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/EB b/contrib/groff/font/devlbp/EB
index 3c02e90..d3f2322 100644
--- a/contrib/groff/font/devlbp/EB
+++ b/contrib/groff/font/devlbp/EB
@@ -204,6 +204,7 @@ rs	1900	0	0x5c		--	0,92	#	backslash
 <=	1900	0	0xf3		--	6,2	#	lessequal
 ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	1900	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	1900	0	0x5		--	5,168	#	club	"club	suit"
 SP	1900	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	1900	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/EI b/contrib/groff/font/devlbp/EI
index 95c85af..372e352 100644
--- a/contrib/groff/font/devlbp/EI
+++ b/contrib/groff/font/devlbp/EI
@@ -204,6 +204,7 @@ rs	1900	0	0x5c		--	0,92	#	backslash
 <=	1900	0	0xf3		--	6,2	#	lessequal
 ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	1900	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	1900	0	0x5		--	5,168	#	club	"club	suit"
 SP	1900	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	1900	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/ER b/contrib/groff/font/devlbp/ER
index 677ed5e..f384293 100644
--- a/contrib/groff/font/devlbp/ER
+++ b/contrib/groff/font/devlbp/ER
@@ -204,6 +204,7 @@ rs	1900	0	0x5c		--	0,92	#	backslash
 <=	1900	0	0xf3		--	6,2	#	lessequal
 ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
 -h	1900	0	0xc4		--	3,8	#	hbar
+hbar	"
 CL	1900	0	0x5		--	5,168	#	club	"club	suit"
 SP	1900	0	0x6		--	5,171	#	spade	"spade	suit"
 HE	1900	0	0x3		--	5,170	#	heart	"heart	suit"
diff --git a/contrib/groff/font/devlbp/HB b/contrib/groff/font/devlbp/HB
index 5292e0e..30ad0ea 100644
--- a/contrib/groff/font/devlbp/HB
+++ b/contrib/groff/font/devlbp/HB
@@ -279,7 +279,6 @@ lq	1667	2	0x125	 4,32	 # quotedblleft
 rq	1667	2	0x4ba	 6,31	 # quotedblright
 oq	927	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	793	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	933	0	0x3f4	 0,124	 # bar
 at	3250	2	0x40	 0,64	 # at
 .C1	1947	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1853	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	2027	0	0x3a5	 8,19	 # infinity
 md	2027	0	0x3b7	 8,32	 # dotmath
 mo	2027	0	0x3ce	 8,15	 # element
 mu	2027	0	0x3b4	 8,39	 # multiply
-nc	2027	0	0x3cb	 8,197	 # notpropersuperset
+nc	2027	0	0x3cb	 8,197	 # uni2285
 nm	2027	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1947	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2593	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	2037	0	0xe6	 8,25	 # mu
 t+-	1947	0	0xf1	 6,1	 # plusminus
 tmu	2027	0	0x3b4	 8,39	 # multiply
 tdi	1947	0	0x3b8	 6,8	 # divide "division sign"
+tno	2027	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HBI b/contrib/groff/font/devlbp/HBI
index 6094be2..e0e83db 100644
--- a/contrib/groff/font/devlbp/HBI
+++ b/contrib/groff/font/devlbp/HBI
@@ -280,7 +280,6 @@ lq	1667	2	0x125	 4,32	 # quotedblleft
 rq	1667	2	0x4ba	 6,31	 # quotedblright
 oq	927	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	793	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	933	0	0x3f4	 0,124	 # bar
 at	3250	2	0x40	 0,64	 # at
 .C1	1947	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1853	2	0x23	 0,35	 # numbersign
@@ -361,7 +360,7 @@ if	2027	0	0x3a5	 8,19	 # infinity
 md	2027	0	0x3b7	 8,32	 # dotmath
 mo	2027	0	0x3ce	 8,15	 # element
 mu	2027	0	0x3b4	 8,39	 # multiply
-nc	2027	0	0x3cb	 8,197	 # notpropersuperset
+nc	2027	0	0x3cb	 8,197	 # uni2285
 nm	2027	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -379,6 +378,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1947	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2593	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -398,3 +398,4 @@ mc	2037	0	0xe6	 8,25	 # mu
 t+-	1947	0	0xf1	 6,1	 # plusminus
 tmu	2027	0	0x3b4	 8,39	 # multiply
 tdi	1947	0	0x3b8	 6,8	 # divide "division sign"
+tno	2027	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HI b/contrib/groff/font/devlbp/HI
index 6d87cf5..fc63a63 100644
--- a/contrib/groff/font/devlbp/HI
+++ b/contrib/groff/font/devlbp/HI
@@ -280,7 +280,6 @@ lq	1110	2	0x125	 4,32	 # quotedblleft
 rq	1110	2	0x4ba	 6,31	 # quotedblright
 oq	740	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	637	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	867	0	0x3f4	 0,124	 # bar
 at	3383	2	0x40	 0,64	 # at
 .C1	1947	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1853	2	0x23	 0,35	 # numbersign
@@ -361,7 +360,7 @@ if	1893	0	0x3a5	 8,19	 # infinity
 md	1893	0	0x3b7	 8,32	 # dotmath
 mo	1893	0	0x3ce	 8,15	 # element
 mu	1893	0	0x3b4	 8,39	 # multiply
-nc	1893	0	0x3cb	 8,197	 # notpropersuperset
+nc	1893	0	0x3cb	 8,197	 # uni2285
 nm	1893	0	0x3cf	 8,209	 # notelement
 pl	927	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -379,6 +378,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1947	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2593	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -398,3 +398,4 @@ mc	1853	0	0xe6	 8,25	 # mu
 t+-	1947	0	0xf1	 6,1	 # plusminus
 tmu	1893	0	0x3b4	 8,39	 # multiply
 tdi	1947	0	0x3b8	 6,8	 # divide "division sign"
+tno	1893	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HNB b/contrib/groff/font/devlbp/HNB
index 28ae9a7..23475b5 100644
--- a/contrib/groff/font/devlbp/HNB
+++ b/contrib/groff/font/devlbp/HNB
@@ -279,7 +279,6 @@ lq	410	2	0x125	 4,32	 # quotedblleft
 rq	410	2	0x4ba	 6,31	 # quotedblright
 oq	228	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	195	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	230	0	0x3f4	 0,124	 # bar
 at	800	2	0x40	 0,64	 # at
 .C1	479	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	456	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	499	0	0x3a5	 8,19	 # infinity
 md	499	0	0x3b7	 8,32	 # dotmath
 mo	499	0	0x3ce	 8,15	 # element
 mu	499	0	0x3b4	 8,39	 # multiply
-nc	499	0	0x3cb	 8,197	 # notpropersuperset
+nc	499	0	0x3cb	 8,197	 # uni2285
 nm	499	0	0x3cf	 8,209	 # notelement
 pl	273	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	645	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	645	0	0x3c8	 6,66	 # union "union, cup"
 di	479	0	0x3b8	 6,8	 # divide "division sign"
 -h	820	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	820	0	0x3d1	 6,33	 # gradient
 es	638	0	0x3c6	 0,79	 # emptyset
 CL	617	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	501	0	0xe6	 8,25	 # mu
 t+-	479	0	0xf1	 6,1	 # plusminus
 tmu	499	0	0x3b4	 8,39	 # multiply
 tdi	479	0	0x3b8	 6,8	 # divide "division sign"
+tno	499	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HNBI b/contrib/groff/font/devlbp/HNBI
index 360b906..119aa6e 100644
--- a/contrib/groff/font/devlbp/HNBI
+++ b/contrib/groff/font/devlbp/HNBI
@@ -279,7 +279,6 @@ lq	410	2	0x125	 4,32	 # quotedblleft
 rq	410	2	0x4ba	 6,31	 # quotedblright
 oq	228	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	195	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	230	0	0x3f4	 0,124	 # bar
 at	800	2	0x40	 0,64	 # at
 .C1	479	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	456	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	499	0	0x3a5	 8,19	 # infinity
 md	499	0	0x3b7	 8,32	 # dotmath
 mo	499	0	0x3ce	 8,15	 # element
 mu	499	0	0x3b4	 8,39	 # multiply
-nc	499	0	0x3cb	 8,197	 # notpropersuperset
+nc	499	0	0x3cb	 8,197	 # uni2285
 nm	499	0	0x3cf	 8,209	 # notelement
 pl	273	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	645	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	645	0	0x3c8	 6,66	 # union "union, cup"
 di	479	0	0x3b8	 6,8	 # divide "division sign"
 -h	820	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	820	0	0x3d1	 6,33	 # gradient
 es	638	0	0x3c6	 0,79	 # emptyset
 CL	617	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	501	0	0xe6	 8,25	 # mu
 t+-	479	0	0xf1	 6,1	 # plusminus
 tmu	499	0	0x3b4	 8,39	 # multiply
 tdi	479	0	0x3b8	 6,8	 # divide "division sign"
+tno	499	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HNI b/contrib/groff/font/devlbp/HNI
index 1cad306..78d2207 100644
--- a/contrib/groff/font/devlbp/HNI
+++ b/contrib/groff/font/devlbp/HNI
@@ -279,7 +279,6 @@ lq	273	2	0x125	 4,32	 # quotedblleft
 rq	273	2	0x4ba	 6,31	 # quotedblright
 oq	182	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	157	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	213	0	0x3f4	 0,124	 # bar
 at	832	2	0x40	 0,64	 # at
 .C1	479	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	456	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	466	0	0x3a5	 8,19	 # infinity
 md	466	0	0x3b7	 8,32	 # dotmath
 mo	466	0	0x3ce	 8,15	 # element
 mu	466	0	0x3b4	 8,39	 # multiply
-nc	466	0	0x3cb	 8,197	 # notpropersuperset
+nc	466	0	0x3cb	 8,197	 # uni2285
 nm	466	0	0x3cf	 8,209	 # notelement
 pl	228	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	645	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	645	0	0x3c8	 6,66	 # union "union, cup"
 di	479	0	0x3b8	 6,8	 # divide "division sign"
 -h	820	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	820	0	0x3d1	 6,33	 # gradient
 es	638	0	0x3c6	 0,79	 # emptyset
 CL	617	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	456	0	0xe6	 8,25	 # mu
 t+-	479	0	0xf1	 6,1	 # plusminus
 tmu	466	0	0x3b4	 8,39	 # multiply
 tdi	479	0	0x3b8	 6,8	 # divide "division sign"
+tno	466	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HNR b/contrib/groff/font/devlbp/HNR
index d09bc19..7ad6e07 100644
--- a/contrib/groff/font/devlbp/HNR
+++ b/contrib/groff/font/devlbp/HNR
@@ -279,7 +279,6 @@ lq	273	2	0x125	 4,32	 # quotedblleft
 rq	273	2	0x4ba	 6,31	 # quotedblright
 oq	182	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	157	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	213	0	0x3f4	 0,124	 # bar
 at	832	2	0x40	 0,64	 # at
 .C1	479	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	456	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	466	0	0x3a5	 8,19	 # infinity
 md	466	0	0x3b7	 8,32	 # dotmath
 mo	466	0	0x3ce	 8,15	 # element
 mu	466	0	0x3b4	 8,39	 # multiply
-nc	466	0	0x3cb	 8,197	 # notpropersuperset
+nc	466	0	0x3cb	 8,197	 # uni2285
 nm	466	0	0x3cf	 8,209	 # notelement
 pl	228	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	479	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	645	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	645	0	0x3c8	 6,66	 # union "union, cup"
 di	479	0	0x3b8	 6,8	 # divide "division sign"
 -h	820	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	820	0	0x3d1	 6,33	 # gradient
 es	638	0	0x3c6	 0,79	 # emptyset
 CL	617	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	456	0	0xe6	 8,25	 # mu
 t+-	479	0	0xf1	 6,1	 # plusminus
 tmu	466	0	0x3b4	 8,39	 # multiply
 tdi	479	0	0x3b8	 6,8	 # divide "division sign"
+tno	466	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/HR b/contrib/groff/font/devlbp/HR
index 8bcdf3e..7e2de1b 100644
--- a/contrib/groff/font/devlbp/HR
+++ b/contrib/groff/font/devlbp/HR
@@ -279,7 +279,6 @@ lq	1110	2	0x125	 4,32	 # quotedblleft
 rq	1110	2	0x4ba	 6,31	 # quotedblright
 oq	740	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	637	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	867	0	0x3f4	 0,124	 # bar
 at	3383	2	0x40	 0,64	 # at
 .C1	1947	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1853	2	0x23	 0,35	 # numbersign
@@ -360,7 +359,7 @@ if	1893	0	0x3a5	 8,19	 # infinity
 md	1893	0	0x3b7	 8,32	 # dotmath
 mo	1893	0	0x3ce	 8,15	 # element
 mu	1893	0	0x3b4	 8,39	 # multiply
-nc	1893	0	0x3cb	 8,197	 # notpropersuperset
+nc	1893	0	0x3cb	 8,197	 # uni2285
 nm	1893	0	0x3cf	 8,209	 # notelement
 pl	927	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1947	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -378,6 +377,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1947	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2593	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -397,3 +397,4 @@ mc	1853	0	0xe6	 8,25	 # mu
 t+-	1947	0	0xf1	 6,1	 # plusminus
 tmu	1893	0	0x3b4	 8,39	 # multiply
 tdi	1947	0	0x3b8	 6,8	 # divide "division sign"
+tno	1893	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/TB b/contrib/groff/font/devlbp/TB
index 5826899..57d6696 100644
--- a/contrib/groff/font/devlbp/TB
+++ b/contrib/groff/font/devlbp/TB
@@ -281,7 +281,6 @@ lq	1667	2	0x125	 4,32	 # quotedblleft
 rq	1667	2	0x4ba	 6,31	 # quotedblright
 oq	1110	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	927	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	733	0	0x3f4	 0,124	 # bar
 at	3100	2	0x40	 0,64	 # at
 .C1	1900	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1667	2	0x23	 0,35	 # numbersign
@@ -362,7 +361,7 @@ if	1633	0	0x3a5	 8,19	 # infinity
 md	1633	0	0x3b7	 8,32	 # dotmath
 mo	1633	0	0x3ce	 8,15	 # element
 mu	1633	0	0x3b4	 8,39	 # multiply
-nc	1633	0	0x3cb	 8,197	 # notpropersuperset
+nc	1633	0	0x3cb	 8,197	 # uni2285
 nm	1633	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1900	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -380,6 +379,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1900	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2593	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -399,6 +399,7 @@ mc	1853	0	0xe6	 8,25	 # mu
 t+-	1900	0	0xf1	 6,1	 # plusminus
 tmu	1633	0	0x3b4	 8,39	 # multiply
 tdi	1900	0	0x3b8	 6,8	 # divide "division sign"
+tno	1633	0	0x3d8	 8,20	 # logicalnot
 kernpairs
 V A	-120
 W A	-96
diff --git a/contrib/groff/font/devlbp/TBI b/contrib/groff/font/devlbp/TBI
index d4fd3ca..ba247b7 100644
--- a/contrib/groff/font/devlbp/TBI
+++ b/contrib/groff/font/devlbp/TBI
@@ -281,7 +281,6 @@ lq	1667	2	0x125	 4,32	 # quotedblleft
 rq	1667	2	0x4ba	 6,31	 # quotedblright
 oq	1110	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	927	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	733	0	0x3f4	 0,124	 # bar
 at	2773	2	0x40	 0,64	 # at
 .C1	2020	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1667	2	0x23	 0,35	 # numbersign
@@ -362,7 +361,7 @@ if	1633	0	0x3a5	 8,19	 # infinity
 md	1633	0	0x3b7	 8,32	 # dotmath
 mo	1633	0	0x3ce	 8,15	 # element
 mu	1633	0	0x3b4	 8,39	 # multiply
-nc	1633	0	0x3cb	 8,197	 # notpropersuperset
+nc	1633	0	0x3cb	 8,197	 # uni2285
 nm	1633	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1900	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -380,6 +379,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1900	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2407	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -399,3 +399,4 @@ mc	1920	0	0xe6	 8,25	 # mu
 t+-	1900	0	0xf1	 6,1	 # plusminus
 tmu	1633	0	0x3b4	 8,39	 # multiply
 tdi	1900	0	0x3b8	 6,8	 # divide "division sign"
+tno	1633	0	0x3d8	 8,20	 # logicalnot
diff --git a/contrib/groff/font/devlbp/TI b/contrib/groff/font/devlbp/TI
index e41fa35..97fee75 100644
--- a/contrib/groff/font/devlbp/TI
+++ b/contrib/groff/font/devlbp/TI
@@ -281,7 +281,6 @@ lq	1853	2	0x125	 4,32	 # quotedblleft
 rq	1853	2	0x4ba	 6,31	 # quotedblright
 oq	1110	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	713	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	917	0	0x3f4	 0,124	 # bar
 at	3067	2	0x40	 0,64	 # at
 .C1	2250	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1667	2	0x23	 0,35	 # numbersign
@@ -362,7 +361,7 @@ if	1723	0	0x3a5	 8,19	 # infinity
 md	1723	0	0x3b7	 8,32	 # dotmath
 mo	1723	0	0x3ce	 8,15	 # element
 mu	1723	0	0x3b4	 8,39	 # multiply
-nc	1723	0	0x3cb	 8,197	 # notpropersuperset
+nc	1723	0	0x3cb	 8,197	 # uni2285
 nm	1723	0	0x3cf	 8,209	 # notelement
 pl	1297	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	2250	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -380,6 +379,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	2250	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2407	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -399,6 +399,7 @@ mc	1667	0	0xe6	 8,25	 # mu
 t+-	2250	0	0xf1	 6,1	 # plusminus
 tmu	1723	0	0x3b4	 8,39	 # multiply
 tdi	2250	0	0x3b8	 6,8	 # divide "division sign"
+tno	1723	0	0x3d8	 8,20	 # logicalnot
 kernpairs
 V A	-168
 W A	-96
diff --git a/contrib/groff/font/devlbp/TR b/contrib/groff/font/devlbp/TR
index ceeb2dc..a66b7fd 100644
--- a/contrib/groff/font/devlbp/TR
+++ b/contrib/groff/font/devlbp/TR
@@ -280,7 +280,6 @@ lq	1480	2	0x125	 4,32	 # quotedblleft
 rq	1480	2	0x4ba	 6,31	 # quotedblright
 oq	1110	2	0x176	 4,29	 # quoteleft "single open quote"
 aq	600	2	0x27	 0,39	 # quotesingle "apostrophe quote"
-or	667	0	0x3f4	 0,124	 # bar
 at	3070	2	0x40	 0,64	 # at
 .C1	1110	0	0x2d	 0,45	 # - minus "minus sign from current font"
 sh	1667	2	0x23	 0,35	 # numbersign
@@ -361,7 +360,7 @@ if	1723	0	0x3a5	 8,19	 # infinity
 md	1723	0	0x3b7	 8,32	 # dotmath
 mo	1723	0	0x3ce	 8,15	 # element
 mu	1723	0	0x3b4	 8,39	 # multiply
-nc	1723	0	0x3cb	 8,197	 # notpropersuperset
+nc	1723	0	0x3cb	 8,197	 # uni2285
 nm	1723	0	0x3cf	 8,209	 # notelement
 pl	1110	0	0x32b	 0,93	 # plusmath "plus sign in special font"
 eq	1880	0	0x33d	 0,61	 # equalmath "equals sign in special font"
@@ -379,6 +378,7 @@ ca	2620	0	0xef	 6,16	 # intersection "intersection, cap"
 cu	2620	0	0x3c8	 6,66	 # union "union, cup"
 di	1880	0	0x3b8	 6,8	 # divide "division sign"
 -h	3333	0	0xc4	 3,8	 # hbar
+hbar	"
 gr	3333	0	0x3d1	 6,33	 # gradient
 es	2407	0	0x3c6	 0,79	 # emptyset
 CL	2510	0	0x5	 5,168	 # club "club suit"
@@ -398,6 +398,7 @@ mc	1667	0	0xe6	 8,25	 # mu
 t+-	1880	0	0xf1	 6,1	 # plusminus
 tmu	1723	0	0x3b4	 8,39	 # multiply
 tdi	1880	0	0x3b8	 6,8	 # divide "division sign"
+tno	1723	0	0x3d8	 8,20	 # logicalnot
 kernpairs
 F A	-48
 P A	-48
diff --git a/contrib/groff/font/devlj4/ALBB b/contrib/groff/font/devlj4/ALBB
index 41f3ad1..61e8a53 100644
--- a/contrib/groff/font/devlj4/ALBB
+++ b/contrib/groff/font/devlj4/ALBB
@@ -503,7 +503,7 @@ rs	13173,20130	2	3676
 rB	13173,20130,3960	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	9759,20130	2	51808
 `	"
 a	13173,14310,300	0	3681
@@ -633,7 +633,7 @@ Fc	13662,12450	0	3771
 t+-	25857,15465,6855	1	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	25857,12210	0	3756
+tno	25857,12210	0	3756
 rg	13173,19635	2	3758
 S2	12198,20340	2	3762
 S3	12198,20130	2	3763
diff --git a/contrib/groff/font/devlj4/ALBR b/contrib/groff/font/devlj4/ALBR
index 5931c0d6..21ce82e 100644
--- a/contrib/groff/font/devlj4/ALBR
+++ b/contrib/groff/font/devlj4/ALBR
@@ -518,7 +518,7 @@ rs	11709,20130	2	3676
 rB	11220,20130,4365	3	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	8295,20130	2	51808
 `	"
 a	12198,14310,300	0	3681
@@ -648,7 +648,7 @@ Fc	12198,12450	0	3771
 t+-	24882,15420,5175	1	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	24882,12135	0	3756
+tno	24882,12135	0	3756
 rg	13173,19635	2	3758
 S2	10245,20340	2	3762
 S3	10245,20130	2	3763
diff --git a/contrib/groff/font/devlj4/AOB b/contrib/groff/font/devlj4/AOB
index d051485..39e97f1 100644
--- a/contrib/groff/font/devlj4/AOB
+++ b/contrib/groff/font/devlj4/AOB
@@ -467,7 +467,7 @@ rs	10734,20820,450	2	3676
 rB	8781,19755	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	6831,19755	2	51808
 `	"
 a	17076,17205,450	0	3681
@@ -597,7 +597,7 @@ Fc	15612,14025	0	3771
 t+-	30249,15450,5895	1	3761
 bb	13173,19083,5916	1	3750
 co	13173,19635	0	3753
-no	30249,11274	0	3756
+tno	30249,11274	0	3756
 rg	13173,19635	0	3758
 S2	11709,20385	2	3762
 S3	11709,20055	2	3763
diff --git a/contrib/groff/font/devlj4/AOI b/contrib/groff/font/devlj4/AOI
index 2e6aee0..77f0c14 100644
--- a/contrib/groff/font/devlj4/AOI
+++ b/contrib/groff/font/devlj4/AOI
@@ -529,7 +529,7 @@ rs	7806,20820,405,0,-1671	2	3676
 rB	7806,19755,405,1341,2004,880	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,880	3	3679
+_	13173,0,6588,1317,1317,880	1	3679
 oq	7806,19755,0,1062,-2169,880	2	51808
 `	"
 a	16101,17160,405,0,621	0	3681
@@ -659,7 +659,7 @@ Fc	13662,14145,0,267,1770,267	0	3771
 t+-	26346,15255,3900,0,-3906	1	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,3903,-2112,880	2	3753
-no	26346,11679,0,0,-3984	0	3756
+tno	26346,11679,0,0,-3984	0	3756
 rg	13173,19635,0,3903,-2112,880	2	3758
 S2	10245,20385,0,2097,-225,880	2	3762
 S3	10245,20055,0,2064,-186,880	2	3763
diff --git a/contrib/groff/font/devlj4/AOR b/contrib/groff/font/devlj4/AOR
index faa554f..b8f9eda 100644
--- a/contrib/groff/font/devlj4/AOR
+++ b/contrib/groff/font/devlj4/AOR
@@ -455,7 +455,7 @@ rs	8295,20820,405	2	3676
 rB	7806,19755,405	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	6831,19755	2	51808
 `	"
 a	15126,17160,405	0	3681
@@ -585,7 +585,7 @@ Fc	14148,13950	0	3771
 t+-	26835,15255,3900	1	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	26835,11331	0	3756
+tno	26835,11331	0	3756
 rg	13173,19635	2	3758
 S2	10245,20385	2	3762
 S3	10245,20055	2	3763
diff --git a/contrib/groff/font/devlj4/CB b/contrib/groff/font/devlj4/CB
index 97b9ecc..1687e64 100644
--- a/contrib/groff/font/devlj4/CB
+++ b/contrib/groff/font/devlj4/CB
@@ -77,7 +77,7 @@ rs	15873,18300,3525	2	3676
 rB	15873,16935,2295	2	3677
 ]	"
 ha	15873,19758	2	51875
-_	15873,191367,6588	3	3679
+_	15873,0,6588	1	3679
 oq	15873,15060	0	51808
 `	"
 a	15873,11775,330	0	3681
@@ -207,7 +207,7 @@ Fc	15873,11595	0	3771
 t+-	15873,11535,3360	0	3761
 bb	15873,19083,5916	3	3750
 co	15873,19635	2	3753
-no	15873,9420	0	3756
+tno	15873,9420	0	3756
 rg	15873,19635	2	3758
 S2	15873,16035	2	3762
 S3	15873,16035	2	3763
diff --git a/contrib/groff/font/devlj4/CBI b/contrib/groff/font/devlj4/CBI
index ffcd3b0..2fea841 100644
--- a/contrib/groff/font/devlj4/CBI
+++ b/contrib/groff/font/devlj4/CBI
@@ -78,7 +78,7 @@ rs	15873,18300,3525,0,-2523	2	3676
 rB	15873,16935,2295,0,-1632	2	3677
 ]	"
 ha	15873,19758,0,0,-1314	2	51875
-_	15873,191367,6588,1317,1317,614	3	3679
+_	15873,0,6588,1317,1317,614	1	3679
 oq	15873,15060,0,0,-3345	0	51808
 `	"
 a	15873,11775,330,0,837	0	3681
@@ -208,7 +208,7 @@ Fc	15873,11625,0,0,1605	0	3771
 t+-	15873,11535,3360,0,-891	0	3761
 bb	15873,19083,5916,0,-5946	3	3750
 co	15873,19635,0,225,-1134,225	2	3753
-no	15873,9420,0,0,-951	0	3756
+tno	15873,9420,0,0,-951	0	3756
 rg	15873,19635,0,225,-1134,225	2	3758
 S2	15873,16170,0,0,-3063	2	3762
 S3	15873,16170,0,0,-3162	2	3763
diff --git a/contrib/groff/font/devlj4/CI b/contrib/groff/font/devlj4/CI
index 98969c2..756f2a4 100644
--- a/contrib/groff/font/devlj4/CI
+++ b/contrib/groff/font/devlj4/CI
@@ -78,7 +78,7 @@ rs	15873,18465,3765,0,-4674	2	3676
 rB	15873,17070,2580,0,-1221	2	3677
 ]	"
 ha	15873,19758,0,0,-1314	2	51875
-_	15873,191367,6588,1317,1317,610	3	3679
+_	15873,0,6588,1317,1317,610	1	3679
 oq	15873,15060,0,0,-6267	0	51808
 `	"
 a	15873,11775,330,531,-696,531	0	3681
@@ -208,7 +208,7 @@ Fc	15873,11010,0,330,-1284,330	0	3771
 t+-	15873,11385,2835,252,-2151,252	0	3761
 bb	15873,19083,5916,0,-5946	3	3750
 co	15873,19635,0,2121,-3030,610	2	3753
-no	15873,8865,0,252,-2151,252	0	3756
+tno	15873,8865,0,252,-2151,252	0	3756
 rg	15873,19635,0,1839,-2748,610	2	3758
 S2	15873,15240,0,0,-4467	0	3762
 S3	15873,15240,0,0,-4548	0	3763
diff --git a/contrib/groff/font/devlj4/CLARENDON b/contrib/groff/font/devlj4/CLARENDON
index 159cca1..e945709 100644
--- a/contrib/groff/font/devlj4/CLARENDON
+++ b/contrib/groff/font/devlj4/CLARENDON
@@ -78,7 +78,7 @@ rs	5856,18645,345	2	3676
 rB	5856,18300,5085	3	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	5856,18645	2	51808
 `	"
 a	13662,14250,345	0	3681
@@ -208,7 +208,7 @@ Fc	12198,12195	0	3771
 t+-	17565,16500	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19725	2	3753
-no	17565,13479	0	3756
+tno	17565,13479	0	3756
 rg	13173,19725	2	3758
 S2	7806,18480	2	3762
 S3	7806,18480	2	3763
diff --git a/contrib/groff/font/devlj4/CORONET b/contrib/groff/font/devlj4/CORONET
index cc26caa..3004c8f 100644
--- a/contrib/groff/font/devlj4/CORONET
+++ b/contrib/groff/font/devlj4/CORONET
@@ -78,7 +78,7 @@ rs	13227,19545,330	2	3676
 rB	13227,18990,2940	2	3677
 ]	"
 ha	13227,19758	2	51875
-_	13227,191367,6588	3	3679
+_	13227,0,6588	1	3679
 oq	13227,19326	2	51808
 `	"
 a	13227,14355,330	0	3681
@@ -208,7 +208,7 @@ Fc	13227,13710	0	3771
 t+-	13227,15075	0	3761
 bb	13227,19083,5916	3	3750
 co	13227,19635	2	3753
-no	13227,12501	0	3756
+tno	13227,12501	0	3756
 rg	13227,19635	2	3758
 S2	13227,19110	2	3762
 S3	13227,19110	2	3763
diff --git a/contrib/groff/font/devlj4/CR b/contrib/groff/font/devlj4/CR
index 6ca3ca8..21f8189 100644
--- a/contrib/groff/font/devlj4/CR
+++ b/contrib/groff/font/devlj4/CR
@@ -77,7 +77,7 @@ rs	15873,18465,3765	2	3676
 rB	15873,17070,2580	2	3677
 ]	"
 ha	15873,19758	2	51875
-_	15873,191367,6588	3	3679
+_	15873,0,6588	1	3679
 oq	15873,15060	0	51808
 `	"
 a	15873,11775,330	0	3681
@@ -207,7 +207,7 @@ Fc	15873,11490	0	3771
 t+-	15873,11385,2835	0	3761
 bb	15873,19083,5916	3	3750
 co	15873,19635	2	3753
-no	15873,8865	0	3756
+tno	15873,8865	0	3756
 rg	15873,19635	2	3758
 S2	15873,15240	0	3762
 S3	15873,15240	0	3763
diff --git a/contrib/groff/font/devlj4/GB b/contrib/groff/font/devlj4/GB
index b5dd52d..591f128 100644
--- a/contrib/groff/font/devlj4/GB
+++ b/contrib/groff/font/devlj4/GB
@@ -465,7 +465,7 @@ rs	13173,20250,300	2	3676
 rB	8295,18165,4905	0	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	6831,18555	2	51808
 `	"
 a	12198,12420,390	0	3681
@@ -595,7 +595,7 @@ Fc	12684,10605	0	3771
 t+-	21954,13467,3354	0	3761
 bb	13173,19083,5916	2	3750
 co	13173,19725	2	3753
-no	21954,10560	0	3756
+tno	21954,10560	0	3756
 rg	13173,19725	2	3758
 S2	9270,17805	0	3762
 S3	9270,17805	0	3763
diff --git a/contrib/groff/font/devlj4/GBI b/contrib/groff/font/devlj4/GBI
index 5ea7f10..87d98c6 100644
--- a/contrib/groff/font/devlj4/GBI
+++ b/contrib/groff/font/devlj4/GBI
@@ -465,7 +465,7 @@ rs	13173,18717,390,0,-2868	2	3676
 rB	7806,18165,4614,3402,3693,962	0	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,962	3	3679
+_	13173,0,6588,1317,1317,962	1	3679
 oq	6831,18555,0,3195,-1800,962	2	51808
 `	"
 a	13662,13143,390,1143,663,962	0	3681
@@ -595,7 +595,7 @@ Fc	11220,9906,0,435,1011,435	0	3771
 t+-	21954,13467,3354,0,-2865	0	3761
 bb	13173,19083,5916,0,-4596	2	3750
 co	13173,19725,0,5022,-3198,962	2	3753
-no	21954,10560,0,0,-2565	0	3756
+tno	21954,10560,0,0,-2565	0	3756
 rg	13173,19725,0,5022,-3198,962	2	3758
 S2	8781,17805,0,2001,-606,962	0	3762
 S3	8781,17805,0,1881,-387,962	0	3763
diff --git a/contrib/groff/font/devlj4/GI b/contrib/groff/font/devlj4/GI
index 8d51371..67c2ac5 100644
--- a/contrib/groff/font/devlj4/GI
+++ b/contrib/groff/font/devlj4/GI
@@ -400,7 +400,7 @@ rs	13173,20250,225,0,-3234	2	3676
 rB	6342,18165,5160,3387,4722,910	0	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,910	3	3679
+_	13173,0,6588,1317,1317,910	1	3679
 oq	6342,18555,0,3606,-2646,910	2	51808
 `	"
 a	12198,11670,390,687,1335,687	0	3681
@@ -530,7 +530,7 @@ Fc	10734,9945,0,204,546,204	0	3771
 t+-	20490,13191,3105,0,-2502	0	3761
 bb	13173,19083,5916,0,-4596	2	3750
 co	13173,19725,0,5526,-3702,910	2	3753
-no	20490,10029,0,0,-2055	0	3756
+tno	20490,10029,0,0,-2055	0	3756
 rg	13173,19725,0,5526,-3702,910	2	3758
 S2	8781,17805,0,1725,-690,910	0	3762
 S3	8781,17805,0,1746,-273,910	0	3763
diff --git a/contrib/groff/font/devlj4/GR b/contrib/groff/font/devlj4/GR
index b5b805f..3244d97 100644
--- a/contrib/groff/font/devlj4/GR
+++ b/contrib/groff/font/devlj4/GR
@@ -583,7 +583,7 @@ rs	12684,20250,480	2	3676
 rB	7806,18165,4905	0	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	7317,18555	2	51808
 `	"
 a	11220,11670,390	0	3681
@@ -713,7 +713,7 @@ Fc	11220,9945	0	3771
 t+-	21468,13191,3105	0	3761
 bb	13173,19083,5916	2	3750
 co	13173,19725	2	3753
-no	21468,10029	0	3756
+tno	21468,10029	0	3756
 rg	13173,19725	2	3758
 S2	8781,17805	0	3762
 S3	8781,17805	0	3763
diff --git a/contrib/groff/font/devlj4/LGB b/contrib/groff/font/devlj4/LGB
index ca42d9a..07a0a38 100644
--- a/contrib/groff/font/devlj4/LGB
+++ b/contrib/groff/font/devlj4/LGB
@@ -77,7 +77,7 @@ rs	13227,19545,330	2	3676
 rB	13227,18990,3510	2	3677
 ]	"
 ha	13227,19758	2	51875
-_	13227,191367,6588	3	3679
+_	13227,0,6588	1	3679
 oq	13227,19320	2	51808
 `	"
 a	13227,14355,330	0	3681
@@ -207,7 +207,7 @@ Fc	13227,14115	0	3771
 t+-	13227,15645,30	0	3761
 bb	13227,19083,5916	3	3750
 co	13227,19635	2	3753
-no	13227,13020	0	3756
+tno	13227,13020	0	3756
 rg	13227,19635	2	3758
 S2	13227,19110	2	3762
 S3	13227,19110	2	3763
diff --git a/contrib/groff/font/devlj4/LGI b/contrib/groff/font/devlj4/LGI
index a28b058..255f55f 100644
--- a/contrib/groff/font/devlj4/LGI
+++ b/contrib/groff/font/devlj4/LGI
@@ -78,7 +78,7 @@ rs	13227,19545,330,0,-3072	2	3676
 rB	13227,18990,2940,342,735,342	2	3677
 ]	"
 ha	13227,19758,0,9,9,9	2	51875
-_	13227,191367,6588,1317,1317,790	3	3679
+_	13227,0,6588,1317,1317,790	1	3679
 oq	13227,19326,0,0,-6222	2	51808
 `	"
 a	13227,14355,330,0,105	0	3681
@@ -208,7 +208,7 @@ Fc	13227,13710,0,1107,2415,790	0	3771
 t+-	13227,15075,0,1110,-243,790	0	3761
 bb	13227,19083,5916,0,-4623	3	3750
 co	13227,19635,0,3927,-2190,790	2	3753
-no	13227,12501,0,1065,-288,790	0	3756
+tno	13227,12501,0,1065,-288,790	0	3756
 rg	13227,19635,0,3927,-2190,790	2	3758
 S2	13227,19110,0,0,-2379	2	3762
 S3	13227,19110,0,0,-2073	2	3763
diff --git a/contrib/groff/font/devlj4/LGR b/contrib/groff/font/devlj4/LGR
index b9e8f0e..523151f 100644
--- a/contrib/groff/font/devlj4/LGR
+++ b/contrib/groff/font/devlj4/LGR
@@ -77,7 +77,7 @@ rs	13227,19545,330	2	3676
 rB	13227,18990,2940	2	3677
 ]	"
 ha	13227,19758	2	51875
-_	13227,191367,6588	3	3679
+_	13227,0,6588	1	3679
 oq	13227,19320	2	51808
 `	"
 a	13227,14355,330	0	3681
@@ -207,7 +207,7 @@ Fc	13227,13710	0	3771
 t+-	13227,15075	0	3761
 bb	13227,19083,5916	3	3750
 co	13227,19635	2	3753
-no	13227,12501	0	3756
+tno	13227,12501	0	3756
 rg	13227,19635	2	3758
 S2	13227,19110	2	3762
 S3	13227,19119	2	3763
diff --git a/contrib/groff/font/devlj4/MARIGOLD b/contrib/groff/font/devlj4/MARIGOLD
index 142ae85..a8374d1 100644
--- a/contrib/groff/font/devlj4/MARIGOLD
+++ b/contrib/groff/font/devlj4/MARIGOLD
@@ -78,7 +78,7 @@ rs	8781,16770,3240	2	3676
 rB	6342,16860,1260	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	2	3679
+_	13173,0,6588	0	3679
 oq	3903,11790	0	51808
 `	"
 a	8295,10350,330	0	3681
@@ -208,7 +208,7 @@ Fc	9270,8535	0	3771
 t+-	11709,8445,2595	0	3761
 bb	13173,19083,5916	2	3750
 co	7806,15960	2	3753
-no	11709,6780	0	3756
+tno	11709,6780	0	3756
 rg	7806,15960	2	3758
 S2	7317,11850	0	3762
 S3	7317,11850	0	3763
diff --git a/contrib/groff/font/devlj4/OB b/contrib/groff/font/devlj4/OB
index ad6bd17..2badb4c 100644
--- a/contrib/groff/font/devlj4/OB
+++ b/contrib/groff/font/devlj4/OB
@@ -531,7 +531,7 @@ rs	7317,19650,525	2	3676
 rB	7317,18201,4701	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	7317,18375	2	51808
 `	"
 a	13173,12840,375	0	3681
@@ -661,11 +661,11 @@ Fc	11709,11028	0	3771
 t+-	23418,13164,4314	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	23418,10770	0	3756
+tno	23418,10770	0	3756
 rg	13173,19635	2	3758
 S2	9759,17700	0	3762
 S3	9759,17700	0	3763
-ac	14637,196476,5469	3	3768
+ac	14637,0,5469	1	3768
 S1	9759,18099	2	3769
 tmu	23418,13107,567	0	3799
 tdi	23418,13017,387	0	3831
diff --git a/contrib/groff/font/devlj4/OBI b/contrib/groff/font/devlj4/OBI
index ca076aa..8253b30 100644
--- a/contrib/groff/font/devlj4/OBI
+++ b/contrib/groff/font/devlj4/OBI
@@ -523,7 +523,7 @@ rs	7317,19575,450,0,-1611	2	3676
 rB	7317,18249,4749,3696,2238,737	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,737	3	3679
+_	13173,0,6588,1317,1317,737	1	3679
 oq	7317,18375,0,2508,-528,737	2	51808
 `	"
 a	13173,12840,375,189,954,189	0	3681
@@ -653,7 +653,7 @@ Fc	11220,10851,0,588,816,588	0	3771
 t+-	23418,13080,4230,0,-3522	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,3885,-2094,737	2	3753
-no	23418,10770,0,0,-3105	0	3756
+tno	23418,10770,0,0,-3105	0	3756
 rg	13173,19635,0,3885,-2094,737	2	3758
 S2	9270,17700,0,2130,-162,737	0	3762
 S3	9270,17700,0,1656,-123,737	0	3763
diff --git a/contrib/groff/font/devlj4/OI b/contrib/groff/font/devlj4/OI
index ef931aa..78fd356 100644
--- a/contrib/groff/font/devlj4/OI
+++ b/contrib/groff/font/devlj4/OI
@@ -634,7 +634,7 @@ rs	7317,19650,480,294,-1518,294	2	3676
 rB	7317,18201,4956,1338,2766,586	3	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,586	3	3679
+_	13173,0,6588,1317,1317,586	1	3679
 oq	7317,18375,0,1704,-1407,586	2	51808
 `	"
 a	13173,12795,330,168,582,168	0	3681
@@ -764,7 +764,7 @@ Fc	9759,10920,0,120,1035,120	0	3771
 t+-	23418,13260,3132,0,-3333	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,3384,-1593,586	2	3753
-no	23418,10671,0,0,-3015	0	3756
+tno	23418,10671,0,0,-3015	0	3756
 rg	13173,19635,0,3384,-1593,586	2	3758
 S2	10245,17700,0,705,-774,586	0	3762
 S3	10245,17700,0,525,-807,525	0	3763
diff --git a/contrib/groff/font/devlj4/OR b/contrib/groff/font/devlj4/OR
index 01fb2ae..17ee9b7 100644
--- a/contrib/groff/font/devlj4/OR
+++ b/contrib/groff/font/devlj4/OR
@@ -610,7 +610,7 @@ rs	7317,19566,396	2	3676
 rB	7317,18204,4179	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	7317,18375	2	51808
 `	"
 a	12684,12795,330	0	3681
@@ -740,7 +740,7 @@ Fc	9759,10809	0	3771
 t+-	23418,13260,3132	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	23418,10671	0	3756
+tno	23418,10671	0	3756
 rg	13173,19635	2	3758
 S2	9759,17700	0	3762
 S3	9759,17700	0	3763
diff --git a/contrib/groff/font/devlj4/S b/contrib/groff/font/devlj4/S
index 599867f..4982b4f 100644
--- a/contrib/groff/font/devlj4/S
+++ b/contrib/groff/font/devlj4/S
@@ -40,7 +40,6 @@ eq	23418,10875	0	68925
 *T	16587,17895	2	68947
 *X	19029,17895	2	68950
 *Z	17076,17895	2	68934
-or	13173,19758,6588	3	44412
 ap	26346,8952	0	44414
 mi	23418,8610	0	68909
 +-	23418,15750,2625	0	69118
@@ -62,11 +61,13 @@ ca	26346,16650	0	69046
 ==	26346,11634	0	68989
 >=	26346,15960	0	68958
 <=	26346,15960	0	68956
-~~	26346,11172	0	68927
+~=	26346,11172	0	68927
+~~	"
 md	8781,10407	0	69066
-sr	19029,23322	2	68897
+sqrt	19029,23322	2	68897
+sr	"
 pt	26346,12723	0	68902
-+e	11709,12705,555	0	68923
+*e	11709,12705,555	0	68923
 tf	26346,16545	0	68928
 3d	"
 *G	16101,18045	2	68931
@@ -88,7 +89,7 @@ ts	13173,12600,4734	0	68955
 *b	14637,18450,4260	2	68962
 *g	14637,11205,5595	1	68963
 *d	11709,18450,405	2	68964
-*e	10245,11205,405	0	68965
++e	10245,11205,405	0	68965
 *z	11709,17508,4920	2	68966
 *y	13173,11205,5283	1	68967
 *h	11709,18450,405	2	68968
@@ -111,7 +112,7 @@ ts	13173,12600,4734	0	68955
 +h	16101,18450,405	2	68985
 +f	16101,11205,4608	0	68986
 +p	16101,11442,405	0	68987
-~=	26346,11436	0	68988
+|=	26346,11436	0	68988
 ne	26346,15300,966	0	68990
 uA	19029,17553,1536	2	69029
 arrowverttp	"
@@ -141,7 +142,8 @@ c*	26346,18900	2	69058
 AN	26346,15240	0	69061
 OR	26346,15240	0	69062
 ci	26346,18900	2	69069
-is	26346,20268,5997	3	69077
+integral	26346,20268,5997	3	69077
+is	"
 /_	26346,19365	2	69079
 es	26346,18465,435	2	69080
 Ah	13173,13980	0	69081
@@ -172,7 +174,8 @@ bracerightmid	"
 rb	19029,19758,6588	3	69108
 parenrightbt	"
 bracerightbt	"
-bv	19029,23322,6588	3	69109
+braceex	19029,23322,6588	3	69109
+bv	"
 bracerightex	"
 braceleftex	"
 parenrightex	19029,23322,6588	3	69110
@@ -186,7 +189,8 @@ ra	8781,21000,4950	2	44529
 =~	26346,14187	0	69103
 <<	26346,15294,1086	0	128316
 >>	26346,15294,1086	0	128318
--h	15126,18564,486	2	128328
+hbar	15126,18564,486	2	128328
+-h	"
 wp	17076,13026,4218	0	44483
 lz	26346,17844,294	2	44512
 st	12198,12846,396	0	69076
diff --git a/contrib/groff/font/devlj4/TB b/contrib/groff/font/devlj4/TB
index 91e4646..cdfcabc 100644
--- a/contrib/groff/font/devlj4/TB
+++ b/contrib/groff/font/devlj4/TB
@@ -700,7 +700,7 @@ rs	8781,18450,405	2	3676
 rB	8781,18045,4305	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	8781,18450	2	51808
 `	"
 a	13173,12735,405	0	3681
@@ -830,7 +830,7 @@ Fc	11220,9861	0	3771
 t+-	23418,15975,2880	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19725	2	3753
-no	23418,12210	0	3756
+tno	23418,12210	0	3756
 rg	13173,19725	2	3758
 S2	9270,18285	2	3762
 S3	9270,18285	2	3763
diff --git a/contrib/groff/font/devlj4/TBI b/contrib/groff/font/devlj4/TBI
index 14a0d2a..8661d7d 100644
--- a/contrib/groff/font/devlj4/TBI
+++ b/contrib/groff/font/devlj4/TBI
@@ -753,7 +753,7 @@ rs	8781,18450,405,0,-2226	2	3676
 rB	8781,18045,4095,2826,3813,913	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,913	3	3679
+_	13173,0,6588,1317,1317,913	1	3679
 oq	8781,18450,0,2001,-2790,913	2	51808
 `	"
 a	13173,12735,405,1059,1059,913	0	3681
@@ -883,7 +883,7 @@ Fc	11709,10200,0,615,1110,615	0	3771
 t+-	23418,15975,2880,0,-2883	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19725,0,4398,-2574,913	2	3753
-no	23418,12225,0,0,-4023	0	3756
+tno	23418,12225,0,0,-4023	0	3756
 rg	13173,19725,0,4398,-2574,913	2	3758
 S2	8781,18285,0,1911,-213,913	2	3762
 S3	8781,18285,0,1980,-552,913	2	3763
diff --git a/contrib/groff/font/devlj4/TI b/contrib/groff/font/devlj4/TI
index d4f0033..7c32efd 100644
--- a/contrib/groff/font/devlj4/TI
+++ b/contrib/groff/font/devlj4/TI
@@ -837,7 +837,7 @@ rs	8781,18225,330,0,-2229	2	3676
 rB	8781,17895,4380,1938,3663,899	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,899	3	3679
+_	13173,0,6588,1317,1317,899	1	3679
 oq	8781,18225,0,1422,-3570,899	2	51808
 `	"
 a	13173,12669,330,759,1044,759	0	3681
@@ -967,7 +967,7 @@ Fc	12198,10095,0,336,495,336	0	3771
 t+-	23418,15750,2625,0,-2949	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19725,0,5355,-3531,899	2	3753
-no	23418,12165,0,0,-3045	0	3756
+tno	23418,12165,0,0,-3045	0	3756
 rg	13173,19725,0,5355,-3531,899	2	3758
 S2	9270,18060,0,1602,-555,899	2	3762
 S3	9270,18060,0,1980,-771,899	2	3763
diff --git a/contrib/groff/font/devlj4/TR b/contrib/groff/font/devlj4/TR
index d103992..508180d 100644
--- a/contrib/groff/font/devlj4/TR
+++ b/contrib/groff/font/devlj4/TR
@@ -590,7 +590,7 @@ rs	8781,18225,330	2	3676
 rB	8781,17895,4380	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	8781,18225	2	51808
 `	"
 a	11709,12669,330	0	3681
@@ -720,7 +720,7 @@ Fc	10734,10095	0	3771
 t+-	23418,15750,2625	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19725	2	3753
-no	23418,12165	0	3756
+tno	23418,12165	0	3756
 rg	13173,19725	2	3758
 S2	9270,18060	2	3762
 S3	9270,18060	2	3763
diff --git a/contrib/groff/font/devlj4/UB b/contrib/groff/font/devlj4/UB
index 884f932..ecb240d 100644
--- a/contrib/groff/font/devlj4/UB
+++ b/contrib/groff/font/devlj4/UB
@@ -544,7 +544,7 @@ rs	8781,18495,885	2	3676
 rB	8781,18135,2355	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	8781,18135	2	51808
 `	"
 a	14148,12990,360	0	3681
@@ -674,11 +674,11 @@ Fc	14637,11250	0	3771
 t+-	26346,14670	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	26346,11787	0	3756
+tno	26346,11787	0	3756
 rg	13173,19635	2	3758
 S2	10245,18465	2	3762
 S3	10245,18465	2	3763
-ac	16587,195033,5160	3	3768
+ac	16587,0,5160	1	3768
 S1	10245,18345	2	3769
 tmu	26346,14154	0	3799
 tdi	26346,12870	0	3831
diff --git a/contrib/groff/font/devlj4/UBI b/contrib/groff/font/devlj4/UBI
index b7baac1..2a2233e 100644
--- a/contrib/groff/font/devlj4/UBI
+++ b/contrib/groff/font/devlj4/UBI
@@ -495,7 +495,7 @@ rs	8781,18135,1470,540,-1632,540	2	3676
 rB	8781,18135,2445,2919,3126,1012	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,1012	3	3679
+_	13173,0,6588,1317,1317,1012	1	3679
 oq	8781,18135,0,2880,-2067,1012	2	51808
 `	"
 a	14148,12990,360,651,978,651	0	3681
@@ -625,11 +625,11 @@ Fc	14637,11115,0,243,1467,243	0	3771
 t+-	26346,14670,0,0,-4695	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,4881,-3090,1012	2	3753
-no	26346,11787,0,0,-4329	0	3756
+tno	26346,11787,0,0,-4329	0	3756
 rg	13173,19635,0,4881,-3090,1012	2	3758
 S2	10245,18465,0,2217,-933,1012	2	3762
 S3	10245,18465,0,2439,-957,1012	2	3763
-ac	16587,195102,5046,0,-1809	3	3768
+ac	16587,0,5046,0,-1809	1	3768
 S1	10245,18345,0,1083,-2880,1012	2	3769
 tmu	26346,14154,0,0,-5958	0	3799
 tdi	26346,12870,0,0,-4767	0	3831
diff --git a/contrib/groff/font/devlj4/UCB b/contrib/groff/font/devlj4/UCB
index 311a42b..7595b582 100644
--- a/contrib/groff/font/devlj4/UCB
+++ b/contrib/groff/font/devlj4/UCB
@@ -505,7 +505,7 @@ rs	5856,18165,2430	2	3676
 rB	5856,18135,2430	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	5856,18135	2	51808
 `	"
 a	11709,12885,255	0	3681
@@ -635,11 +635,11 @@ Fc	11709,11070	0	3771
 t+-	17565,12810,2520	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	17565,10320	0	3756
+tno	17565,10320	0	3756
 rg	13173,19635	2	3758
 S2	8295,18465	2	3762
 S3	8295,18465	2	3763
-ac	12684,195258,5190	3	3768
+ac	12684,0,5190	1	3768
 S1	8295,18345	2	3769
 tmu	17565,12345	0	3799
 tdi	17565,12015	0	3831
diff --git a/contrib/groff/font/devlj4/UCBI b/contrib/groff/font/devlj4/UCBI
index 5088b04..14c401f 100644
--- a/contrib/groff/font/devlj4/UCBI
+++ b/contrib/groff/font/devlj4/UCBI
@@ -413,7 +413,7 @@ rs	8295,18165,2430,534,-1680,534	2	3676
 rB	5856,18135,2430,3555,3123,994	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,994	3	3679
+_	13173,0,6588,1317,1317,994	1	3679
 oq	5856,18135,0,3957,-1134,994	2	51808
 `	"
 a	11709,12885,255,999,1161,994	0	3681
@@ -543,11 +543,11 @@ Fc	11709,10965,0,219,1836,219	0	3771
 t+-	17565,12810,2520,0,-1431	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,4629,-2838,994	2	3753
-no	17565,10320,0,0,-1455	0	3756
+tno	17565,10320,0,0,-1455	0	3756
 rg	13173,19635,0,4629,-2838,994	2	3758
 S2	8295,18465,0,2814,-432,994	2	3762
 S3	8295,18465,0,2817,-1047,994	2	3763
-ac	12684,195183,5205,0,444	3	3768
+ac	12684,0,5205,0,444	1	3768
 S1	8295,18345,0,1920,-2586,994	2	3769
 tmu	17565,12345,0,0,-2448	0	3799
 tdi	17565,12015,0,0,-1446	0	3831
diff --git a/contrib/groff/font/devlj4/UCI b/contrib/groff/font/devlj4/UCI
index bab7fc6..cf30c1a 100644
--- a/contrib/groff/font/devlj4/UCI
+++ b/contrib/groff/font/devlj4/UCI
@@ -553,7 +553,7 @@ rs	7806,18165,1980,420,-1230,420	2	3676
 rB	5856,18135,2325,3114,3792,996	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,996	3	3679
+_	13173,0,6588,1317,1317,996	1	3679
 oq	5856,18135,0,3690,-1482,996	2	51808
 `	"
 a	10734,12885,255,918,1242,918	0	3681
@@ -683,11 +683,11 @@ Fc	11709,11160,0,0,777	0	3771
 t+-	17565,12210,213,0,-2133	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,4470,-2679,996	2	3753
-no	17565,10185,0,0,-2097	0	3756
+tno	17565,10185,0,0,-2097	0	3756
 rg	13173,19635,0,4470,-2679,996	2	3758
 S2	7317,18465,0,3258,-300,996	2	3762
 S3	7317,18465,0,3042,-957,996	2	3763
-ac	12198,195108,4995,0,1860	3	3768
+ac	12198,0,4995,0,1860	1	3768
 S1	7317,18345,0,2562,-2493,996	2	3769
 tmu	17565,12216,0,0,-2850	0	3799
 tdi	17565,11610,0,0,-2667	0	3831
diff --git a/contrib/groff/font/devlj4/UCR b/contrib/groff/font/devlj4/UCR
index 111a267..4f1935a 100644
--- a/contrib/groff/font/devlj4/UCR
+++ b/contrib/groff/font/devlj4/UCR
@@ -474,7 +474,7 @@ rs	5856,18165,1980	2	3676
 rB	5856,18135,2520	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	5856,18135	2	51808
 `	"
 a	10734,12885,255	0	3681
@@ -604,11 +604,11 @@ Fc	11709,11010	0	3771
 t+-	17565,12210,213	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	17565,10185	0	3756
+tno	17565,10185	0	3756
 rg	13173,19635	2	3758
 S2	7317,18465	2	3762
 S3	7317,18465	2	3763
-ac	12198,195348,4755	3	3768
+ac	12198,0,4755	1	3768
 S1	7317,18345	2	3769
 tmu	17565,12216	0	3799
 tdi	17565,11610	0	3831
diff --git a/contrib/groff/font/devlj4/UI b/contrib/groff/font/devlj4/UI
index 4933816..e649578 100644
--- a/contrib/groff/font/devlj4/UI
+++ b/contrib/groff/font/devlj4/UI
@@ -697,7 +697,7 @@ rs	8781,18135,1500,0,-2547	2	3676
 rB	8781,18135,2397,2013,2715,1000	2	3677
 ]	"
 ha	13173,19758,0,36,36,36	2	51875
-_	13173,191367,6588,1317,1317,1000	3	3679
+_	13173,0,6588,1317,1317,1000	1	3679
 oq	8781,18135,0,2658,-2295,1000	2	51808
 `	"
 a	14148,12990,360,87,729,87	0	3681
@@ -827,11 +827,11 @@ Fc	14637,11046,0,0,537	0	3771
 t+-	26346,14910,0,0,-4770	0	3761
 bb	13173,19083,5916,0,-4596	3	3750
 co	13173,19635,0,4683,-2892,1000	2	3753
-no	26346,11697,0,0,-4425	0	3756
+tno	26346,11697,0,0,-4425	0	3756
 rg	13173,19635,0,4683,-2892,1000	2	3758
 S2	10245,18465,0,1800,-1065,1000	2	3762
 S3	10245,18465,0,1941,-1134,1000	2	3763
-ac	16587,195048,4875,0,-1797	3	3768
+ac	16587,0,4875,0,-1797	1	3768
 S1	10245,18345,0,693,-3387,693	2	3769
 tmu	26346,14010,0,0,-6081	0	3799
 tdi	26346,12255,0,0,-4845	0	3831
diff --git a/contrib/groff/font/devlj4/UR b/contrib/groff/font/devlj4/UR
index f09539d..bd9aa1d 100644
--- a/contrib/groff/font/devlj4/UR
+++ b/contrib/groff/font/devlj4/UR
@@ -595,7 +595,7 @@ rs	8781,18135,1380	2	3676
 rB	8781,18135,2370	2	3677
 ]	"
 ha	13173,19758	2	51875
-_	13173,191367,6588	3	3679
+_	13173,0,6588	1	3679
 oq	8781,18135	2	51808
 `	"
 a	14148,12990,360	0	3681
@@ -725,11 +725,11 @@ Fc	14637,11085	0	3771
 t+-	26346,14985	0	3761
 bb	13173,19083,5916	3	3750
 co	13173,19635	2	3753
-no	26346,11607	0	3756
+tno	26346,11607	0	3756
 rg	13173,19635	2	3758
 S2	10245,18465	2	3762
 S3	10245,18465	2	3763
-ac	16587,194958,5025	3	3768
+ac	16587,0,5025	1	3768
 S1	10245,18345	2	3769
 tmu	26346,14010	0	3799
 tdi	26346,12315	0	3831
diff --git a/contrib/groff/font/devlj4/generate/special.map b/contrib/groff/font/devlj4/generate/special.map
index ea23337..83e1e7a 100644
--- a/contrib/groff/font/devlj4/generate/special.map
+++ b/contrib/groff/font/devlj4/generate/special.map
@@ -14,7 +14,6 @@
 53 *T
 57 *X
 59 *Z
-94 or
 96 ap
 183 mi
 191 +-
@@ -37,10 +36,12 @@
 297 >=
 298 <=
 301 ~~
+301 ~=
 302 md
 500 sr
+500 sqrt
 501 pt
-503 +e
+503 *e
 504 3d
 504 tf
 505 *G
@@ -62,7 +63,7 @@
 523 *b
 524 *g
 525 *d
-526 *e
+526 +e
 527 *z
 528 *y
 529 *h
@@ -85,7 +86,7 @@
 546 +h
 547 +f
 548 +p
-549 ~=
+549 |=
 550 ne
 551 arrowverttp
 551 uA
@@ -116,6 +117,7 @@
 581 OR
 584 ci
 587 is
+587 integral
 589 /_
 590 es
 591 Ah
@@ -149,6 +151,7 @@
 613 braceleftex
 613 bracerightex
 613 bv
+613 braceex
 614 barex
 614 bracketleftex
 614 bracketrightex
@@ -161,6 +164,7 @@
 633 <<
 634 >>
 638 -h
+638 hbar
 641 wp
 654 lz
 663 st
diff --git a/contrib/groff/font/devlj4/generate/text.map b/contrib/groff/font/devlj4/generate/text.map
index f414964..8264162 100644
--- a/contrib/groff/font/devlj4/generate/text.map
+++ b/contrib/groff/font/devlj4/generate/text.map
@@ -201,7 +201,7 @@
 191 t+-
 192 bb
 193 co
-194 no
+194 tno
 196 rg
 197 S2
 198 S3
@@ -237,6 +237,7 @@
 1047 ij
 1067 bq
 1068 %0
+1069 Eu
 1084 a-
 1086 ab
 1088 a.
diff --git a/contrib/groff/font/devps/AB b/contrib/groff/font/devps/AB
index 3a63212..8fd6fce 100644
--- a/contrib/groff/font/devps/AB
+++ b/contrib/groff/font/devps/AB
@@ -233,246 +233,247 @@ y , -100
 y c -35
 y a -30
 charset
-ha	600,740,0,0,-73	2	0000	-- asciicircum
-ti	600,347,0,0,-67	0	0001	-- asciitilde
-vS	520,944,15,0,-12	2	0002	-- Scaron
-vZ	500,944,0,0,-19	2	0003	-- Zcaron
-vs	440,774,18,0,-19	2	0004	-- scaron
-vz	460,774,0,0,-20	2	0005	-- zcaron
-:Y	620,939,0,2,2	2	0006	-- Ydieresis
-tm	1000,740,0,0,-9	2	0007	-- trademark
-aq	220,740,0,0,-44	2	0010	-- quotesingle
-space	280	0	0040
-!	280,740,0,0,-73	2	0041	-- exclam
-"	360,740,0,0,-19	2	0042	-- quotedbl
+ha	600,740	2	0	asciicircum
+ti	600,347	0	1	asciitilde
+vS	520,944,15	2	2	Scaron
+vZ	500,944	2	3	Zcaron
+vs	440,774,18	2	4	scaron
+vz	460,774	2	5	zcaron
+:Y	620,939,0,2,2	2	6	Ydieresis
+tm	1000,740	2	7	trademark
+aq	220,740	2	8	quotesingle
+space	280	0	32	space
+!	280,740	2	33	exclam
+"	360,740	2	34	quotedbl
 dq	"
-#	560,700,0,0,-29	0	0043	-- numbersign
+#	560,700	0	35	numbersign
 sh	"
-$	560,857,86,0,-58	2	0044	-- dollar
+$	560,857,86	2	36	dollar
 Do	"
-%	860,755,15,0,-36	2	0045	-- percent
-&	680,755,15,0,-34	2	0046	-- ampersand
-'	280,740,0,0,-72	2	0047	-- quoteright
+%	860,755,15	2	37	percent
+&	680,755,15	2	38	ampersand
+'	280,740	2	39	quoteright
 cq	"
-(	380,754,157,0,-74	2	0050	-- parenleft
-)	380,754,157,0,-37	2	0051	-- parenright
-*	440,755,0,0,-67	2	0052	-- asterisk
-+	600,506,0,0,-48	0	0053	-- plus
-,	280,133,141,0,-73	0	0054	-- comma
--	420,348,0,0,-71	0	0055	-- hyphen
+(	380,754,157	2	40	parenleft
+)	380,754,157	2	41	parenright
+*	440,755	2	42	asterisk
++	600,506	0	43	plus
+,	280,133,141	0	44	comma
+-	420,348	0	45	hyphen
 hy	"
-.	280,133,0,0,-73	0	0056	-- period
-/	460,740,100,0,-6	2	0057	-- slash
+.	280,133	0	46	period
+/	460,740,100	2	47	slash
 sl	"
-0	560,755,15,0,-32	2	0060	-- zero
-1	560,740,0,0,-137	2	0061	-- one
-2	560,755,0,0,-36	2	0062	-- two
-3	560,755,15,0,-28	2	0063	-- three
-4	560,740,0,0,-15	2	0064	-- four
-5	560,740,15,0,-25	2	0065	-- five
-6	560,739,15,0,-23	2	0066	-- six
-7	560,740,0,0,-62	2	0067	-- seven
-8	560,755,15,0,-33	2	0070	-- eight
-9	560,754,0,0,-24	2	0071	-- nine
-:	280,555,0,0,-73	0	0072	-- colon
-;	280,555,141,0,-73	0	0073	-- semicolon
-<	600,514,8,0,-46	0	0074	-- less
-=	600,425,0,0,-48	0	0075	-- equal
->	600,514,8,0,-46	0	0076	-- greater
-?	560,755,0,0,-38	2	0077	-- question
-@	740,712,12,10,-50	0	0100	-- at
+0	560,755,15	2	48	zero
+1	560,740	2	49	one
+2	560,755	2	50	two
+3	560,755,15	2	51	three
+4	560,740	2	52	four
+5	560,740,15	2	53	five
+6	560,739,15	2	54	six
+7	560,740	2	55	seven
+8	560,755,15	2	56	eight
+9	560,754	2	57	nine
+:	280,555	0	58	colon
+;	280,555,141	0	59	semicolon
+<	600,514,8	0	60	less
+=	600,425	0	61	equal
+>	600,514,8	0	62	greater
+?	560,755	2	63	question
+@	740,712,12,10	0	64	at
 at	"
-A	740,740,0,0,-7	2	0101	-- A
-B	580,740,0,0,-70	2	0102	-- B
-C	780,755,15,0,-34	2	0103	-- C
-D	700,740,0,0,-63	2	0104	-- D
-E	520,740,0,0,-61	2	0105	-- E
-F	480,740,0,0,-61	2	0106	-- F
-G	840,755,15,0,-27	2	0107	-- G
-H	680,740,0,0,-71	2	0110	-- H
-I	280,740,0,0,-72	2	0111	-- I
-J	480,740,15,0,-2	2	0112	-- J
-K	620,740,0,0,-89	2	0113	-- K
-L	440,740,0,0,-72	2	0114	-- L
-M	900,740,0,0,-63	2	0115	-- M
-N	740,740,0,0,-70	2	0116	-- N
-O	840,755,15,0,-33	2	0117	-- O
-P	560,740,0,0,-72	2	0120	-- P
-Q	840,755,15,0,-32	2	0121	-- Q
-R	580,740,0,0,-64	2	0122	-- R
-S	520,755,15,0,-12	2	0123	-- S
-T	420,740,0,0,-6	2	0124	-- T
-U	640,740,15,0,-55	2	0125	-- U
-V	700,740,0,0,-8	2	0126	-- V
-W	900,740,0,0,-7	2	0127	-- W
-X	680,740,0,0,-4	2	0130	-- X
-Y	620,740,0,2,2	2	0131	-- Y
-Z	500,740,0,0,-19	2	0132	-- Z
-[	320,754,157,0,-66	2	0133	-- bracketleft
+A	740,740	2	65	A
+B	580,740	2	66	B
+C	780,755,15	2	67	C
+D	700,740	2	68	D
+E	520,740	2	69	E
+F	480,740	2	70	F
+G	840,755,15	2	71	G
+H	680,740	2	72	H
+I	280,740	2	73	I
+J	480,740,15	2	74	J
+K	620,740	2	75	K
+L	440,740	2	76	L
+M	900,740	2	77	M
+N	740,740	2	78	N
+O	840,755,15	2	79	O
+P	560,740	2	80	P
+Q	840,755,15	2	81	Q
+R	580,740	2	82	R
+S	520,755,15	2	83	S
+T	420,740	2	84	T
+U	640,740,15	2	85	U
+V	700,740	2	86	V
+W	900,740	2	87	W
+X	680,740	2	88	X
+Y	620,740,0,2,2	2	89	Y
+Z	500,740	2	90	Z
+[	320,754,157	2	91	bracketleft
 lB	"
-\	640,740,100,0,-96	2	0134	-- backslash
+\	640,740,100	2	92	backslash
 rs	"
-]	320,754,157,0,-36	2	0135	-- bracketright
+]	320,754,157	2	93	bracketright
 rB	"
-a^	540,774,0,0,-71	2	0136	-- circumflex
+a^	540,774	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	280,740,0,0,-72	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	280,740	2	96	quoteleft
 oq	"
-a	660,574,18,0,-27	0	0141	-- a
-b	660,740,18,0,-47	2	0142	-- b
-c	640,574,18,0,-37	0	0143	-- c
-d	660,740,18,0,-34	2	0144	-- d
-e	640,577,18,0,-31	0	0145	-- e
-f	280,755,0,0,-15	2	0146	-- f
-g	660,574,226,0,-32	1	0147	-- g
-h	600,740,0,0,-54	2	0150	-- h
-i	240,740,0,0,-53	2	0151	-- i
-j	260,740,185,0,-16	3	0152	-- j
-k	580,740,0,0,-80	2	0153	-- k
-l	240,740,0,0,-54	2	0154	-- l
-m	940,574,0,0,-54	0	0155	-- m
-n	600,574,0,0,-54	0	0156	-- n
-o	640,574,18,0,-25	0	0157	-- o
-p	660,574,185,0,-47	1	0160	-- p
-q	660,574,185,0,-31	1	0161	-- q
-r	320,574,0,0,-63	0	0162	-- r
-s	440,574,18,0,-19	0	0163	-- s
-t	300,740,0,0,-21	2	0164	-- t
-u	600,555,18,0,-50	0	0165	-- u
-v	560,555,0,0,-3	0	0166	-- v
-w	800,555,0,0,-11	0	0167	-- w
-x	560,555,0,0,-3	0	0170	-- x
-y	580,555,185,0,-8	1	0171	-- y
-z	460,555,0,0,-20	0	0172	-- z
-lC	340,747,191,0,3	3	0173	-- braceleft
+a	660,574,18	0	97	a
+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
+f	280,755	2	102	f
+g	660,574,226	1	103	g
+h	600,740	2	104	h
+i	240,740	2	105	i
+j	260,740,185	3	106	j
+k	580,740	2	107	k
+l	240,740	2	108	l
+m	940,574	0	109	m
+n	600,574	0	110	n
+o	640,574,18	0	111	o
+p	660,574,185	1	112	p
+q	660,574,185	1	113	q
+r	320,574	0	114	r
+s	440,574,18	0	115	s
+t	300,740	2	116	t
+u	600,555,18	0	117	u
+v	560,555	0	118	v
+w	800,555	0	119	w
+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,0,-233	2	0174	-- bar
+ba	600,740,100	2	124	bar
 |	"
-rC	340,747,191,3,-23	3	0175	-- braceright
+rC	340,747,191,3	3	125	braceright
 }	"
-a~	480,767,0,0,-44	2	0176	-- tilde
+a~	480,767	2	126	tilde
 ~	"
-bq	280,133,141,0,-72	0	0200	-- quotesinglbase
-Fo	460,469,0,0,-61	0	0201	-- guillemotleft
-Fc	460,469,0,0,-61	0	0202	-- guillemotright
-bu	600,532,0,0,-148	0	0203	-- bullet
-Fn	560,824,151	2	0204	-- florin
-f/	160,740,0,122,123	2	0205	-- fraction
-%0	1280,755,15,0,-36	2	0206	-- perthousand
-dg	560,740,142,0,-51	2	0207	-- dagger
-dd	560,740,142,0,-51	2	0210	-- daggerdbl
-en	500,348,0,0,-35	0	0211	-- endash
-em	1000,348,0,0,-35	0	0212	-- emdash
-fi	520,755,0,0,-25	2	0214	-- fi
-fl	520,755,0,0,-25	2	0215	-- fl
-.i	240,555,0,0,-53	0	0220	-- dotlessi
-ga	420,851,0,0,-50	2	0222	-- grave
-a"	700,862,0,0,-132	2	0223	-- hungarumlaut
-a.	280,769,0,0,-74	2	0224	-- dotaccent
-ab	480,770,0,0,-42	2	0225	-- breve
-ah	540,774,0,0,-71	2	0226	-- caron
-ao	360,834,0,0,-73	2	0227	-- ring
-ho	340,9,195,0,-79	1	0230	-- ogonek
-lq	480,740,0,0,-70	2	0231	-- quotedblleft
-rq	480,740,0,0,-70	2	0232	-- quotedblright
-oe	1080,574,18,0,-30	0	0233	-- oe
-/l	320,740,0,0,-34	2	0234	-- lslash
-Bq	480,133,141,0,-70	0	0235	-- quotedblbase
-OE	1060,755,15,0,-37	2	0236	-- OE
-/L	480,740,0,0,-26	2	0237	-- Lslash
-r!	280,555,185,0,-74	1	0241	-- exclamdown
-ct	560,715,0,0,-43	0	0242	-- cent
-Po	560,755,0,2,2	2	0243	-- sterling
-Cs	560,577,0,0,-27	0	0244	-- currency
-Ye	560,740,0,10,10	2	0245	-- yen
-bb	600,740,100,0,-233	2	0246	-- brokenbar
-sc	560,755,158,0,-28	2	0247	-- section
-ad	500,769,0,0,-78	2	0250	-- dieresis
-co	740,752,12,12,12	2	0251	-- copyright
-Of	360,755,0,0,-19	2	0252	-- ordfeminine
-fo	240,469,0,0,-50	0	0253	-- guilsinglleft
-no	600,425,0,0,-48	0	0254	-- logicalnot
-\-	600,313,0,0,-48	0	0255	-- minus
-rg	740,752,12,12,12	2	0256	-- registered
-a-	420,759,0,0,-72	2	0257	-- macron
-de	400,712,0,0,-57	0	0260	-- degree
-t+-	600,556,62,0,-48	0	0261	-- plusminus
-S2	336,749,0,0,-13	2	0262	-- twosuperior
-S3	336,749,0,0,-8	2	0263	-- threesuperior
-aa	420,849,0,0,-91	2	0264	-- acute
-mc	576,555,187,0,-38	1	0265	-- mu
-ps	600,740,103,7,7	2	0266	-- paragraph
-pc	280,320,0,0,-73	0	0267	-- periodcentered
-ac	340,6,251,0,-98	1	0270	-- cedilla
-S1	336,740,0,0,-72	2	0271	-- onesuperior
-Om	360,755,0,0,-23	2	0272	-- ordmasculine
-fc	240,469,0,0,-50	0	0273	-- guilsinglright
-14	840,740,0,0,-92	2	0274	-- onequarter
-12	840,740,0,0,-62	2	0275	-- onehalf
-34	840,749,0,0,-18	2	0276	-- threequarters
-r?	560,555,200,0,-68	1	0277	-- questiondown
-`A	740,1021,0,0,-7	2	0300	-- Agrave
-'A	740,1019,0,0,-7	2	0301	-- Aacute
-^A	740,944,0,0,-7	2	0302	-- Acircumflex
-~A	740,937,0,0,-7	2	0303	-- Atilde
-:A	740,939,0,0,-7	2	0304	-- Adieresis
-oA	740,969,0,0,-7	2	0305	-- Aring
-AE	900,740,0,0,5	2	0306	-- AE
-,C	780,755,251,0,-34	3	0307	-- Ccedilla
-`E	520,1021,0,0,-61	2	0310	-- Egrave
-'E	520,1019,0,0,-61	2	0311	-- Eacute
-^E	520,944,0,0,-61	2	0312	-- Ecircumflex
-:E	520,939,0,0,-61	2	0313	-- Edieresis
-`I	280,1021,0,0,45	2	0314	-- Igrave
-'I	280,1019,0,45,-46	2	0315	-- Iacute
-^I	280,944,0,60,59	2	0316	-- Icircumflex
-:I	280,939,0,32,32	2	0317	-- Idieresis
--D	742,740,0,0,-25	2	0320	-- Eth
-~N	740,937,0,0,-70	2	0321	-- Ntilde
-`O	840,1021,15,0,-33	2	0322	-- Ograve
-'O	840,1019,15,0,-33	2	0323	-- Oacute
-^O	840,944,15,0,-33	2	0324	-- Ocircumflex
-~O	840,937,15,0,-33	2	0325	-- Otilde
-:O	840,939,15,0,-33	2	0326	-- Odieresis
-tmu	600,494,0,0,-59	0	0327	-- multiply
-/O	840,814,71,0,-33	2	0330	-- Oslash
-`U	640,1021,15,0,-55	2	0331	-- Ugrave
-'U	640,1019,15,0,-55	2	0332	-- Uacute
-^U	640,944,15,0,-55	2	0333	-- Ucircumflex
-:U	640,939,15,0,-55	2	0334	-- Udieresis
-'Y	620,1019,0,2,2	2	0335	-- Yacute
-TP	560,740,0,0,-72	2	0336	-- Thorn
-ss	600,755,18,0,-51	2	0337	-- germandbls
-`a	660,851,18,0,-27	2	0340	-- agrave
-'a	660,849,18,0,-27	2	0341	-- aacute
-^a	660,774,18,0,-27	2	0342	-- acircumflex
-~a	660,767,18,0,-27	2	0343	-- atilde
-:a	660,769,18,0,-27	2	0344	-- adieresis
-oa	660,834,18,0,-27	2	0345	-- aring
-ae	1080,574,18,0,-29	0	0346	-- ae
-,c	640,574,251,0,-37	1	0347	-- ccedilla
-`e	640,851,18,0,-31	2	0350	-- egrave
-'e	640,849,18,0,-31	2	0351	-- eacute
-^e	640,774,18,0,-31	2	0352	-- ecircumflex
-:e	640,769,18,0,-31	2	0353	-- edieresis
-`i	240,851,0,0,65	2	0354	-- igrave
-'i	240,849,0,65,-26	2	0355	-- iacute
-^i	240,774,0,80,79	2	0356	-- icircumflex
-:i	240,769,0,52,52	2	0357	-- idieresis
-Sd	640,754,18,0,-27	2	0360	-- eth
-~n	600,767,0,0,-54	2	0361	-- ntilde
-`o	640,851,18,0,-25	2	0362	-- ograve
-'o	640,849,18,0,-25	2	0363	-- oacute
-^o	640,774,18,0,-25	2	0364	-- ocircumflex
-~o	640,767,18,0,-25	2	0365	-- otilde
-:o	640,769,18,0,-25	2	0366	-- odieresis
-tdi	600,526,20,0,-48	0	0367	-- divide
-/o	660,608,50,0,-35	0	0370	-- oslash
-`u	600,851,18,0,-50	2	0371	-- ugrave
-'u	600,849,18,0,-50	2	0372	-- uacute
-^u	600,774,18,0,-50	2	0373	-- ucircumflex
-:u	600,769,18,0,-50	2	0374	-- udieresis
-'y	580,849,185,0,-8	3	0375	-- yacute
-Tp	660,740,185,0,-47	3	0376	-- thorn
-:y	580,769,185,0,-8	3	0377	-- ydieresis
+bq	280,133,141	0	128	quotesinglbase
+Fo	460,469	0	129	guillemotleft
+Fc	460,469	0	130	guillemotright
+bu	600,532	0	131	bullet
+Fn	560,824,151	2	132	florin
+f/	160,740,0,122,123	2	133	fraction
+%0	1280,755,15	2	134	perthousand
+dg	560,740,142	2	135	dagger
+dd	560,740,142	2	136	daggerdbl
+en	500,348	0	137	endash
+em	1000,348	0	138	emdash
+fi	520,755	2	140	fi
+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.	280,769	2	148	dotaccent
+ab	480,770	2	149	breve
+ah	540,774	2	150	caron
+ao	360,834	2	151	ring
+ho	340,9,195	1	152	ogonek
+lq	480,740	2	153	quotedblleft
+rq	480,740	2	154	quotedblright
+oe	1080,574,18	0	155	oe
+/l	320,740	2	156	lslash
+Bq	480,133,141	0	157	quotedblbase
+OE	1060,755,15	2	158	OE
+/L	480,740	2	159	Lslash
+r!	280,555,185	1	161	exclamdown
+ct	560,715	0	162	cent
+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
+sc	560,755,158	2	167	section
+ad	500,769	2	168	dieresis
+co	740,752,12,12,12	2	169	copyright
+Of	360,755	2	170	ordfeminine
+fo	240,469	0	171	guilsinglleft
+tno	600,425	0	172	logicalnot
+\-	600,313	0	173	minus
+rg	740,752,12,12,12	2	174	registered
+a-	420,759	2	175	macron
+de	400,712	0	176	degree
+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
+ps	600,740,103,7,7	2	182	paragraph
+pc	280,320	0	183	periodcentered
+ac	340,6,251	1	184	cedilla
+S1	336,740	2	185	onesuperior
+Om	360,755	2	186	ordmasculine
+fc	240,469	0	187	guilsinglright
+14	840,740	2	188	onequarter
+12	840,740	2	189	onehalf
+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,944	2	194	Acircumflex
+~A	740,937	2	195	Atilde
+:A	740,939	2	196	Adieresis
+oA	740,969	2	197	Aring
+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,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,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,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,944,15	2	219	Ucircumflex
+:U	640,939,15	2	220	Udieresis
+'Y	620,1019,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,774,18	2	226	acircumflex
+~a	660,767,18	2	227	atilde
+:a	660,769,18	2	228	adieresis
+oa	660,834,18	2	229	aring
+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,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,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,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,774,18	2	251	ucircumflex
+:u	600,769,18	2	252	udieresis
+'y	580,849,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 --git a/contrib/groff/font/devps/ABI b/contrib/groff/font/devps/ABI
index 57f8487..f3a38b2 100644
--- a/contrib/groff/font/devps/ABI
+++ b/contrib/groff/font/devps/ABI
@@ -234,246 +234,247 @@ y , -100
 y c -35
 y a -30
 charset
-ha	600,740,0,46,-92,46	2	0000	-- asciicircum
-ti	600,347,0,29,-64,29	0	0001	-- asciitilde
-vS	520,944,15,165,1,82	2	0002	-- Scaron
-vZ	500,944,0,200,31,82	2	0003	-- Zcaron
-vs	440,774,18,173,1,82	2	0004	-- scaron
-vz	460,774,0,188,30,82	2	0005	-- zcaron
-:Y	620,939,0,189,-85,82	2	0006	-- Ydieresis
-tm	1000,740,0,8,-81,8	2	0007	-- trademark
-aq	220,740,0,144,-102,82	2	0010	-- quotesingle
-space	280	0	0040
-!	280,740,0,113,-23,82	2	0041	-- exclam
-"	360,740,0,168,-77,82	2	0042	-- quotedbl
+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
+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
+space	280	0	32	space
+!	280,740,0,113,-23,82	2	33	exclam
+"	360,740,0,168,-77,82	2	34	quotedbl
 dq	"
-#	560,700,0,108,-16,82	0	0043	-- numbersign
+#	560,700,0,108,-16,82	0	35	numbersign
 sh	"
-$	560,857,86,72,-49,72	2	0044	-- dollar
+$	560,857,86,72,-49,72	2	36	dollar
 Do	"
-%	860,755,15,46,-89,46	2	0045	-- percent
-&	680,755,15,112,-21,82	2	0046	-- ampersand
-'	280,740,0,112,-109,82	2	0047	-- quoteright
+%	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
 cq	"
-(	380,754,157,160,-70,82	2	0050	-- parenleft
-)	380,754,157,48,42,48	2	0051	-- parenright
-*	440,755,0,102,-124,82	2	0052	-- asterisk
-+	600,506,0,60,-34,60	0	0053	-- plus
-,	280,133,141,1,2,1	0	0054	-- comma
--	420,348,0,43,-64,43	0	0055	-- hyphen
+(	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
 hy	"
-.	280,133,0,1,-23,1	0	0056	-- period
-/	460,740,100,181,63,82	2	0057	-- slash
+.	280,133,0,1,-23,1	0	46	period
+/	460,740,100,181,63,82	2	47	slash
 sl	"
-0	560,755,15,118,-20,82	2	0060	-- zero
-1	560,740,0,0,-180	2	0061	-- one
-2	560,755,0,112,6,82	2	0062	-- two
-3	560,755,15,75,-17,75	2	0063	-- three
-4	560,740,0,94,14,82	2	0064	-- four
-5	560,740,15,90,-14,82	2	0065	-- five
-6	560,739,15,77,-14,77	2	0066	-- six
-7	560,740,0,125,-33,82	2	0067	-- seven
-8	560,755,15,80,-21,80	2	0070	-- eight
-9	560,754,0,123,-60,82	2	0071	-- nine
-:	280,555,0,79,-23,79	0	0072	-- colon
-;	280,555,141,79,2,79	0	0073	-- semicolon
-<	600,514,8,99,-34,82	0	0074	-- less
-=	600,425,0,81,-13,81	0	0075	-- equal
->	600,514,8,60,5,60	0	0076	-- greater
-?	560,755,0,83,-85,82	2	0077	-- question
-@	740,712,12,142,-59,82	0	0100	-- at
+0	560,755,15,118,-20,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
+:	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
+=	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
 at	"
-A	740,740,0,42,43,42	2	0101	-- A
-B	580,740,0,80,-20,80	2	0102	-- B
-C	780,755,15,134,-47,82	2	0103	-- C
-D	700,740,0,82,-13,82	2	0104	-- D
-E	520,740,0,126,-11,82	2	0105	-- E
-F	480,740,0,145,-11,82	2	0106	-- F
-G	840,755,15,97,-39,82	2	0107	-- G
-H	680,740,0,117,-21,82	2	0110	-- H
-I	280,740,0,116,-22,82	2	0111	-- I
-J	480,740,15,116,16,82	2	0112	-- J
-K	620,740,0,187,-39,82	2	0113	-- K
-L	440,740,0,69,-22,69	2	0114	-- L
-M	900,740,0,124,-13,82	2	0115	-- M
-N	740,740,0,118,-20,82	2	0116	-- N
-O	840,755,15,92,-45,82	2	0117	-- O
-P	560,740,0,135,-22,82	2	0120	-- P
-Q	840,755,15,92,-44,82	2	0121	-- Q
-R	580,740,0,126,-14,82	2	0122	-- R
-S	520,755,15,108,1,82	2	0123	-- S
-T	420,740,0,185,-69,82	2	0124	-- T
-U	640,740,15,132,-47,82	2	0125	-- U
-V	700,740,0,182,-95,82	2	0126	-- V
-W	900,740,0,186,-94,82	2	0127	-- W
-X	680,740,0,183,46,82	2	0130	-- X
-Y	620,740,0,189,-85,82	2	0131	-- Y
-Z	500,740,0,149,31,82	2	0132	-- Z
-[	320,754,157,154,-39,82	2	0133	-- bracketleft
+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
+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
+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
+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
+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
 lB	"
-\	640,740,100,0,-183	2	0134	-- backslash
+\	640,740,100,0,-183	2	92	backslash
 rs	"
-]	320,754,157,72,43,72	2	0135	-- bracketright
+]	320,754,157,72,43,72	2	93	bracketright
 rB	"
-a^	540,774,0,98,-139,82	2	0136	-- circumflex
+a^	540,774,0,98,-139,82	2	94	circumflex
 ^	"
-_	500,0,125,36,73,36	0	0137	-- underscore
-`	280,740,0,111,-108,82	2	0140	-- quoteleft
+_	500,0,125,36,73,36	0	95	underscore
+`	280,740,0,111,-108,82	2	96	quoteleft
 oq	"
-a	660,574,18,106,-23,82	0	0141	-- a
-b	660,740,18,79,3,79	2	0142	-- b
-c	640,574,18,89,-34,82	0	0143	-- c
-d	660,740,18,145,-30,82	2	0144	-- d
-e	640,577,18,77,-27,77	0	0145	-- e
-f	280,755,0,190,-12,82	2	0146	-- f
-g	660,574,226,116,17,82	1	0147	-- g
-h	600,740,0,64,-4,64	2	0150	-- h
-i	240,740,0,133,-3,82	2	0151	-- i
-j	260,740,185,132,68,82	3	0152	-- j
-k	580,740,0,118,-30,82	2	0153	-- k
-l	240,740,0,134,-4,82	2	0154	-- l
-m	940,574,0,64,-4,64	0	0155	-- m
-n	600,574,0,63,-4,63	0	0156	-- n
-o	640,574,18,82,-21,82	0	0157	-- o
-p	660,574,185,76,37,76	1	0160	-- p
-q	660,574,185,106,-28,82	1	0161	-- q
-r	320,574,0,153,-13,82	0	0162	-- r
-s	440,574,18,93,1,82	0	0163	-- s
-t	300,740,0,152,-36,82	2	0164	-- t
-u	600,555,18,97,-37,82	0	0165	-- u
-v	560,555,0,149,-56,82	0	0166	-- v
-w	800,555,0,142,-64,82	0	0167	-- w
-x	560,555,0,122,47,82	0	0170	-- x
-y	580,555,185,144,-25,82	1	0171	-- y
-z	460,555,0,118,30,82	0	0172	-- z
-lC	340,747,191,165,10,82	3	0173	-- braceleft
+a	660,574,18,106,-23,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
+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
+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
+o	640,574,18,82,-21,82	0	111	o
+p	660,574,185,76,37,76	1	112	p
+q	660,574,185,106,-28,82	1	113	q
+r	320,574,0,153,-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
+x	560,555,0,122,47,82	0	120	x
+y	580,555,185,144,-25,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	0174	-- bar
+ba	600,740,100,0,-164	2	124	bar
 |	"
-rC	340,747,191,115,62,82	3	0175	-- braceright
+rC	340,747,191,115,62,82	3	125	braceright
 }	"
-a~	480,767,0,134,-128,82	2	0176	-- tilde
+a~	480,767,0,134,-128,82	2	126	tilde
 ~	"
-bq	280,133,141,0,3	0	0200	-- quotesinglbase
-Fo	460,469,0,77,-55,77	0	0201	-- guillemotleft
-Fc	460,469,0,53,-31,53	0	0202	-- guillemotright
-bu	600,532,0,0,-165	0	0203	-- bullet
-Fn	560,824,151,154,77,82	2	0204	-- florin
-f/	160,740,0,309,173,82	2	0205	-- fraction
-%0	1280,755,15,26,-89,26	2	0206	-- perthousand
-dg	560,740,142,102,-83,82	2	0207	-- dagger
-dd	560,740,142,108,-13,82	2	0210	-- daggerdbl
-en	500,348,0,79,-28,79	0	0211	-- endash
-em	1000,348,0,79,-28,79	0	0212	-- emdash
-fi	520,755,0,128,-22,82	2	0214	-- fi
-fl	520,755,0,128,-22,82	2	0215	-- fl
-.i	240,555,0,99,-3,82	0	0220	-- dotlessi
-ga	420,851,0,92,-139,82	2	0222	-- grave
-a"	700,862,0,104,-208,82	2	0223	-- hungarumlaut
-a.	280,769,0,120,-142,82	2	0224	-- dotaccent
-ab	480,770,0,152,-135,82	2	0225	-- breve
-ah	540,774,0,123,-164,82	2	0226	-- caron
-ao	360,834,0,114,-156,82	2	0227	-- ring
-ho	340,9,195,0,-9	1	0230	-- ogonek
-lq	480,740,0,116,-106,82	2	0231	-- quotedblleft
-rq	480,740,0,117,-107,82	2	0232	-- quotedblright
-oe	1080,574,18,78,-26,78	0	0233	-- oe
-/l	320,740,0,134,-24,82	2	0234	-- lslash
-Bq	480,133,141,5,5,5	0	0235	-- quotedblbase
-OE	1060,755,15,134,-48,82	2	0236	-- OE
-/L	480,740,0,54,-18,54	2	0237	-- Lslash
-r!	280,555,185,80,10,80	1	0241	-- exclamdown
-ct	560,715,0,89,-60,82	0	0242	-- cent
-Po	560,755,0,105,12,82	2	0243	-- sterling
-Cs	560,577,0,118,-3,82	0	0244	-- currency
-Ye	560,740,0,197,-33,82	2	0245	-- yen
-bb	600,740,100,0,-164	2	0246	-- brokenbar
-sc	560,755,158,92,-15,82	2	0247	-- section
-ad	500,769,0,115,-146,82	2	0250	-- dieresis
-co	740,752,12,137,0,82	2	0251	-- copyright
-Of	360,755,0,162,-77,82	2	0252	-- ordfeminine
-fo	240,469,0,87,-44,82	0	0253	-- guilsinglleft
-no	600,425,0,81,-55,81	0	0254	-- logicalnot
-\-	600,313,0,60,-34,60	0	0255	-- minus
-rg	740,752,12,137,0,82	2	0256	-- registered
-a-	420,759,0,120,-142,82	2	0257	-- macron
-de	400,712,0,101,-110,82	0	0260	-- degree
-t+-	600,556,62,76,13,76	0	0261	-- plusminus
-S2	336,749,0,150,-23,82	2	0262	-- twosuperior
-S3	336,749,0,127,-37,82	2	0263	-- threesuperior
-aa	420,849,0,138,-174,82	2	0264	-- acute
-mc	576,555,187,116,47,82	1	0265	-- mu
-ps	600,740,103,194,-40,82	2	0266	-- paragraph
-pc	280,320,0,35,-58,35	0	0267	-- periodcentered
-ac	340,6,251,0,-17	1	0270	-- cedilla
-S1	336,740,0,74,-132,74	2	0271	-- onesuperior
-Om	360,755,0,141,-81,82	2	0272	-- ordmasculine
-fc	240,469,0,63,-20,63	0	0273	-- guilsinglright
-14	840,740,0,0,-137	2	0274	-- onequarter
-12	840,740,0,40,-107,40	2	0275	-- onehalf
-34	840,749,0,46,-47,46	2	0276	-- threequarters
-r?	560,555,200,17,-19,17	1	0277	-- questiondown
-`A	740,1021,0,42,43,42	2	0300	-- Agrave
-'A	740,1019,0,42,43,42	2	0301	-- Aacute
-^A	740,944,0,42,43,42	2	0302	-- Acircumflex
-~A	740,937,0,42,43,42	2	0303	-- Atilde
-:A	740,939,0,42,43,42	2	0304	-- Adieresis
-oA	740,969,0,42,43,42	2	0305	-- Aring
-AE	900,740,0,111,55,82	2	0306	-- AE
-,C	780,755,251,134,-47,82	3	0307	-- Ccedilla
-`E	520,1021,0,126,-11,82	2	0310	-- Egrave
-'E	520,1019,0,126,-11,82	2	0311	-- Eacute
-^E	520,944,0,139,-11,82	2	0312	-- Ecircumflex
-:E	520,939,0,136,-11,82	2	0313	-- Edieresis
-`I	280,1021,0,168,-22,82	2	0314	-- Igrave
-'I	280,1019,0,264,-22,82	2	0315	-- Iacute
-^I	280,944,0,259,-22,82	2	0316	-- Icircumflex
-:I	280,939,0,256,-22,82	2	0317	-- Idieresis
--D	742,740,0,74,-33,74	2	0320	-- Eth
-~N	740,937,0,118,-20,82	2	0321	-- Ntilde
-`O	840,1021,15,92,-45,82	2	0322	-- Ograve
-'O	840,1019,15,92,-45,82	2	0323	-- Oacute
-^O	840,944,15,92,-45,82	2	0324	-- Ocircumflex
-~O	840,937,15,92,-45,82	2	0325	-- Otilde
-:O	840,939,15,92,-45,82	2	0326	-- Odieresis
-tmu	600,494,0,67,-26,67	0	0327	-- multiply
-/O	840,814,71,101,-44,82	2	0330	-- Oslash
-`U	640,1021,15,132,-47,82	2	0331	-- Ugrave
-'U	640,1019,15,132,-47,82	2	0332	-- Uacute
-^U	640,944,15,132,-47,82	2	0333	-- Ucircumflex
-:U	640,939,15,132,-47,82	2	0334	-- Udieresis
-'Y	620,1019,0,189,-85,82	2	0335	-- Yacute
-TP	560,740,0,109,-22,82	2	0336	-- Thorn
-ss	600,755,18,79,-1,79	2	0337	-- germandbls
-`a	660,851,18,106,-23,82	2	0340	-- agrave
-'a	660,849,18,106,-23,82	2	0341	-- aacute
-^a	660,774,18,106,-23,82	2	0342	-- acircumflex
-~a	660,767,18,106,-23,82	2	0343	-- atilde
-:a	660,769,18,106,-23,82	2	0344	-- adieresis
-oa	660,834,18,106,-23,82	2	0345	-- aring
-ae	1080,574,18,75,-25,75	0	0346	-- ae
-,c	640,574,251,89,-33,82	1	0347	-- ccedilla
-`e	640,851,18,77,-27,77	2	0350	-- egrave
-'e	640,849,18,77,-27,77	2	0351	-- eacute
-^e	640,774,18,77,-27,77	2	0352	-- ecircumflex
-:e	640,769,18,77,-27,77	2	0353	-- edieresis
-`i	240,851,0,157,-3,82	2	0354	-- igrave
-'i	240,849,0,253,-3,82	2	0355	-- iacute
-^i	240,774,0,248,11,82	2	0356	-- icircumflex
-:i	240,769,0,245,-3,82	2	0357	-- idieresis
-Sd	640,754,18,109,-23,82	2	0360	-- eth
-~n	600,767,0,74,-4,74	2	0361	-- ntilde
-`o	640,851,18,82,-21,82	2	0362	-- ograve
-'o	640,849,18,82,-21,82	2	0363	-- oacute
-^o	640,774,18,82,-21,82	2	0364	-- ocircumflex
-~o	640,767,18,82,-21,82	2	0365	-- otilde
-:o	640,769,18,82,-21,82	2	0366	-- odieresis
-tdi	600,526,20,60,-34,60	0	0367	-- divide
-/o	660,608,50,75,-31,75	0	0370	-- oslash
-`u	600,851,18,97,-37,82	2	0371	-- ugrave
-'u	600,849,18,97,-37,82	2	0372	-- uacute
-^u	600,774,18,97,-37,82	2	0373	-- ucircumflex
-:u	600,769,18,97,-37,82	2	0374	-- udieresis
-'y	580,849,185,144,-25,82	3	0375	-- yacute
-Tp	660,740,185,76,37,76	3	0376	-- thorn
-:y	580,769,185,144,-25,82	3	0377	-- ydieresis
+bq	280,133,141,0,3	0	128	quotesinglbase
+Fo	460,469,0,77,-55,77	0	129	guillemotleft
+Fc	460,469,0,53,-31,53	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
+%0	1280,755,15,26,-89,26	2	134	perthousand
+dg	560,740,142,102,-83,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
+.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
+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
+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
+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
+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
+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
+`A	740,1021,0,42,43,42	2	192	Agrave
+'A	740,1019,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
+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
+,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
+`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,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,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
+/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
+u2026	1000,133,0,0,-50	0	256	ellipsis
diff --git a/contrib/groff/font/devps/AI b/contrib/groff/font/devps/AI
index eb5c689..611434b 100644
--- a/contrib/groff/font/devps/AI
+++ b/contrib/groff/font/devps/AI
@@ -234,246 +234,247 @@ y e -20
 y , -110
 y a -30
 charset
-ha	606,740,0,54,-60,54	2	0000	-- asciicircum
-ti	606,319,0,28,-64,28	0	0001	-- asciitilde
-vS	498,927,13,145,-7,81	2	0002	-- Scaron
-vZ	480,927,0,166,38,81	2	0003	-- Zcaron
-vs	388,764,13,170,1,81	2	0004	-- scaron
-vz	425,764,0,152,40,81	2	0005	-- zcaron
-:Y	592,928,0,187,-88,81	2	0006	-- Ydieresis
-tm	1000,740,0,3,-87,3	2	0007	-- trademark
-aq	198,740,0,129,-103,81	2	0010	-- quotesingle
-space	277	0	0040
-!	295,740,0,77,-61,77	2	0041	-- exclam
-"	309,740,0,151,-80,81	2	0042	-- quotedbl
+ha	606,740,0,54,-60,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	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
+space	277	0	32	space
+!	295,740,0,77,-61,77	2	33	exclam
+"	309,740,0,151,-80,81	2	34	quotedbl
 dq	"
-#	554,740,0,116,-21,81	2	0043	-- numbersign
+#	554,740,0,116,-21,81	2	35	numbersign
 sh	"
-$	554,811,70,77,-57,77	2	0044	-- dollar
+$	554,811,70,77,-57,77	2	36	dollar
 Do	"
-%	775,751,13,62,-74,62	2	0045	-- percent
-&	757,753,12,68,-42,68	2	0046	-- ampersand
-'	351,740,0,92,-145,81	2	0047	-- quoteright
+%	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
 cq	"
-(	369,757,205,176,-39,81	3	0050	-- parenleft
-)	369,757,205,63,74,63	3	0051	-- parenright
-*	425,740,0,104,-120,81	2	0052	-- asterisk
-+	606,506,0,52,-42,52	0	0053	-- plus
-,	277,126,67,0,48	0	0054	-- comma
--	332,315,0,78,-26,78	0	0055	-- hyphen
+(	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
 hy	"
-.	277,126,0,0,-52	0	0056	-- period
-/	437,740,100,153,25,81	2	0057	-- slash
+.	277,126,0,0,-52	0	46	period
+/	437,740,100,153,25,81	2	47	slash
 sl	"
-0	554,753,13,118,-21,81	2	0060	-- zero
-1	554,740,0,0,-210	2	0061	-- one
-2	554,753,0,111,10,81	2	0062	-- two
-3	554,753,13,61,-23,61	2	0063	-- three
-4	554,740,0,94,11,81	2	0064	-- four
-5	554,740,13,101,-19,81	2	0065	-- five
-6	554,739,13,76,-15,76	2	0066	-- six
-7	554,740,0,124,-60,81	2	0067	-- seven
-8	554,753,13,76,-27,76	2	0070	-- eight
-9	554,752,0,122,-61,81	2	0071	-- nine
-:	277,548,0,51,-52,51	0	0072	-- colon
-;	277,548,67,51,48,51	0	0073	-- semicolon
-<	606,514,8,93,-37,81	0	0074	-- less
-=	606,388,0,71,-23,71	0	0075	-- equal
->	606,514,8,57,-1,57	0	0076	-- greater
-?	591,752,0,87,-108,81	2	0077	-- question
-@	867,753,13,71,-76,71	2	0100	-- at
+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
+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
+8	554,753,13,76,-27,76	2	56	eight
+9	554,752,0,122,-61,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
 at	"
-A	740,740,0,39,38,39	2	0101	-- A
-B	574,740,0,82,-24,81	2	0102	-- B
-C	813,752,13,107,-55,81	2	0103	-- C
-D	744,740,0,79,-24,79	2	0104	-- D
-E	536,740,0,126,-20,81	2	0105	-- E
-F	485,740,0,146,-20,81	2	0106	-- F
-G	872,753,13,69,-53,69	2	0107	-- G
-H	683,740,0,111,-26,81	2	0110	-- H
-I	226,740,0,111,-26,81	2	0111	-- I
-J	482,740,13,107,13,81	2	0112	-- J
-K	591,740,0,187,-31,81	2	0113	-- K
-L	462,740,0,62,-32,62	2	0114	-- L
-M	919,740,0,111,-26,81	2	0115	-- M
-N	740,740,0,111,-25,81	2	0116	-- N
-O	869,753,13,82,-55,81	2	0117	-- O
-P	592,740,0,122,-25,81	2	0120	-- P
-Q	871,753,13,91,-52,81	2	0121	-- Q
-R	607,740,0,112,-20,81	2	0122	-- R
-S	498,753,13,113,-7,81	2	0123	-- S
-T	426,740,0,180,-81,81	2	0124	-- T
-U	655,740,13,111,-68,81	2	0125	-- U
-V	702,740,0,178,-95,81	2	0126	-- V
-W	960,740,0,177,-98,81	2	0127	-- W
-X	609,740,0,165,42,81	2	0130	-- X
-Y	592,740,0,187,-88,81	2	0131	-- Y
-Z	480,740,0,166,38,81	2	0132	-- Z
-[	351,753,179,176,-95,81	2	0133	-- bracketleft
+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
 lB	"
-\	605,740,100,0,-205	2	0134	-- backslash
+\	605,740,100,0,-205	2	92	backslash
 rs	"
-]	351,753,179,11,69,11	2	0135	-- bracketright
+]	351,753,179,11,69,11	2	93	bracketright
 rB	"
-a^	502,764,0,94,-142,81	2	0136	-- circumflex
+a^	502,764,0,94,-142,81	2	94	circumflex
 ^	"
-_	500,0,125,36,73,36	0	0137	-- underscore
-`	351,740,0,57,-182,57	2	0140	-- quoteleft
+_	500,0,125,36,73,36	0	95	underscore
+`	351,740,0,57,-182,57	2	96	quoteleft
 oq	"
-a	683,561,13,89,-38,81	0	0141	-- a
-b	682,740,13,71,-18,71	2	0142	-- b
-c	647,561,13,81,-37,81	0	0143	-- c
-d	685,740,13,120,-35,81	2	0144	-- d
-e	650,561,13,64,-34,64	0	0145	-- e
-f	314,753,0,190,-54,81	2	0146	-- f
-g	673,561,215,84,-6,81	1	0147	-- g
-h	610,740,0,46,-12,46	2	0150	-- h
-i	200,740,0,122,-15,81	2	0151	-- i
-j	203,740,192,121,130,81	3	0152	-- j
-k	502,740,0,136,-20,81	2	0153	-- k
-l	200,740,0,122,-15,81	2	0154	-- l
-m	938,561,0,50,-16,50	0	0155	-- m
-n	610,561,0,49,-15,49	0	0156	-- n
-o	655,561,13,64,-38,64	0	0157	-- o
-p	682,561,192,67,22,67	1	0160	-- p
-q	682,561,192,85,-33,81	1	0161	-- q
-r	301,561,0,144,-15,81	0	0162	-- r
-s	388,561,13,86,1,81	0	0163	-- s
-t	339,740,0,142,-54,81	2	0164	-- t
-u	608,547,13,84,-50,81	0	0165	-- u
-v	554,547,0,143,-58,81	0	0166	-- v
-w	831,547,0,140,-64,81	0	0167	-- w
-x	480,547,0,139,38,81	0	0170	-- x
-y	536,547,192,138,-47,81	1	0171	-- y
-z	425,547,0,123,40,81	0	0172	-- z
-lC	351,740,189,167,-65,81	2	0173	-- braceleft
+a	683,561,13,89,-38,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
+f	314,753,0,190,-54,81	2	102	f
+g	673,561,215,84,-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
+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
+p	682,561,192,67,22,67	1	112	p
+q	682,561,192,85,-33,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	0174	-- bar
+ba	672,740,100,0,-230	2	124	bar
 |	"
-rC	351,740,189,37,65,37	2	0175	-- braceright
+rC	351,740,189,37,65,37	2	125	braceright
 }	"
-a~	439,754,0,131,-129,81	2	0176	-- tilde
+a~	439,754,0,131,-129,81	2	126	tilde
 ~	"
-bq	354,126,68,0,-26	0	0200	-- quotesinglbase
-Fo	425,481,0,94,-42,81	0	0201	-- guillemotleft
-Fc	425,481,0,62,-10,62	0	0202	-- guillemotright
-bu	606,532,0,0,-167	0	0203	-- bullet
-Fn	554,818,153,165,89,81	2	0204	-- florin
-f/	166,740,0,301,163,81	2	0205	-- fraction
-%0	1174,751,13,58,-78,58	2	0206	-- perthousand
-dg	553,740,133,90,-96,81	2	0207	-- dagger
-dd	553,740,133,90,-22,81	2	0210	-- daggerdbl
-en	500,315,0,73,-31,73	0	0211	-- endash
-em	1000,315,0,73,-31,73	0	0212	-- emdash
-fi	487,753,0,122,-54,81	2	0214	-- fi
-fl	485,753,0,122,-54,81	2	0215	-- fl
-.i	200,547,0,86,-15,81	0	0220	-- dotlessi
-ga	378,786,0,97,-154,81	2	0222	-- grave
-a"	552,800,0,92,-189,81	2	0223	-- hungarumlaut
-a.	222,765,0,118,-142,81	2	0224	-- dotaccent
-ab	453,754,0,138,-142,81	2	0225	-- breve
-ah	502,764,0,113,-160,81	2	0226	-- caron
-ao	332,807,0,119,-141,81	2	0227	-- ring
-ho	302,0,191,0,-3	1	0230	-- ogonek
-lq	502,740,0,55,-184,55	2	0231	-- quotedblleft
-rq	484,740,0,108,-147,81	2	0232	-- quotedblright
-oe	1137,561,13,73,-30,73	0	0233	-- oe
-/l	300,740,0,104,-45,81	2	0234	-- lslash
-Bq	502,126,68,0,-26	0	0235	-- quotedblbase
-OE	1194,753,13,135,-57,81	2	0236	-- OE
-/L	517,740,0,62,-57,62	2	0237	-- Lslash
-r!	295,548,192,41,-24,41	1	0241	-- exclamdown
-ct	554,707,0,92,-65,81	0	0242	-- cent
-Po	554,753,0,110,21,81	2	0243	-- sterling
-Cs	554,580,0,141,26,81	0	0244	-- currency
-Ye	554,740,0,183,-25,81	2	0245	-- yen
-bb	672,740,100,0,-230	2	0246	-- brokenbar
-sc	615,753,141,32,-68,32	2	0247	-- section
-ad	369,765,0,118,-141,81	2	0250	-- dieresis
-co	747,752,12,133,-3,81	2	0251	-- copyright
-Of	369,753,0,175,-52,81	2	0252	-- ordfeminine
-fo	251,481,0,94,-42,81	0	0253	-- guilsinglleft
-no	606,388,0,71,-60,71	0	0254	-- logicalnot
-\-	606,287,0,52,-42,52	0	0255	-- minus
-rg	747,752,12,133,-3,81	2	0256	-- registered
-a-	485,736,0,112,-147,81	0	0257	-- macron
-de	400,709,0,101,-108,81	0	0260	-- degree
-t+-	606,518,24,62,3,62	0	0261	-- plusminus
-S2	332,747,0,151,-24,81	2	0262	-- twosuperior
-S3	332,747,0,126,-48,81	2	0263	-- threesuperior
-aa	375,786,0,119,-153,81	2	0264	-- acute
-mc	608,547,184,70,4,70	0	0265	-- mu
-ps	564,740,110,174,-69,81	2	0266	-- paragraph
-pc	277,316,0,8,-87,8	0	0267	-- periodcentered
-ac	324,0,222,0,-2	1	0270	-- cedilla
-S1	332,740,0,53,-140,53	2	0271	-- onesuperior
-Om	369,753,0,147,-66,81	2	0272	-- ordmasculine
-fc	251,481,0,62,-10,62	0	0273	-- guilsinglright
-14	831,740,0,0,-133	2	0274	-- onequarter
-12	831,740,0,29,-114,29	2	0275	-- onehalf
-34	831,747,0,44,-76,44	2	0276	-- threequarters
-r?	591,548,205,0,-14	1	0277	-- questiondown
-`A	740,949,0,39,38,39	2	0300	-- Agrave
-'A	740,949,0,39,38,39	2	0301	-- Aacute
-^A	740,927,0,39,38,39	2	0302	-- Acircumflex
-~A	740,917,0,39,38,39	2	0303	-- Atilde
-:A	740,928,0,39,38,39	2	0304	-- Adieresis
-oA	740,955,0,39,38,39	2	0305	-- Aring
-AE	992,740,0,102,70,81	2	0306	-- AE
-,C	813,752,222,107,-55,81	3	0307	-- Ccedilla
-`E	536,949,0,126,-20,81	2	0310	-- Egrave
-'E	536,949,0,126,-20,81	2	0311	-- Eacute
-^E	536,927,0,126,-20,81	2	0312	-- Ecircumflex
-:E	536,928,0,126,-20,81	2	0313	-- Edieresis
-`I	226,949,0,164,-26,81	2	0314	-- Igrave
-'I	226,949,0,264,-26,81	2	0315	-- Iacute
-^I	226,927,0,263,-26,81	2	0316	-- Icircumflex
-:I	226,928,0,220,-26,81	2	0317	-- Idieresis
--D	790,740,0,73,-54,73	2	0320	-- Eth
-~N	740,917,0,111,-25,81	2	0321	-- Ntilde
-`O	869,949,13,82,-55,81	2	0322	-- Ograve
-'O	869,949,13,82,-55,81	2	0323	-- Oacute
-^O	869,927,13,82,-55,81	2	0324	-- Ocircumflex
-~O	869,917,13,82,-55,81	2	0325	-- Otilde
-:O	869,928,13,82,-55,81	2	0326	-- Odieresis
-tmu	606,482,0,56,-37,56	0	0327	-- multiply
-/O	868,819,83,111,-26,81	2	0330	-- Oslash
-`U	655,949,13,111,-68,81	2	0331	-- Ugrave
-'U	655,949,13,111,-68,81	2	0332	-- Uacute
-^U	655,927,13,111,-68,81	2	0333	-- Ucircumflex
-:U	655,928,13,111,-68,81	2	0334	-- Udieresis
-'Y	592,949,0,187,-88,81	2	0335	-- Yacute
-TP	592,740,0,79,-10,79	2	0336	-- Thorn
-ss	554,753,13,74,-11,74	2	0337	-- germandbls
-`a	683,786,13,89,-38,81	2	0340	-- agrave
-'a	683,786,13,89,-38,81	2	0341	-- aacute
-^a	683,764,13,89,-38,81	2	0342	-- acircumflex
-~a	683,754,13,89,-38,81	2	0343	-- atilde
-:a	683,765,13,89,-38,81	2	0344	-- adieresis
-oa	683,807,13,89,-38,81	2	0345	-- aring
-ae	1157,561,13,62,-30,62	0	0346	-- ae
-,c	647,561,222,81,-37,81	1	0347	-- ccedilla
-`e	650,786,13,64,-34,64	2	0350	-- egrave
-'e	650,786,13,64,-34,64	2	0351	-- eacute
-^e	650,764,13,64,-34,64	2	0352	-- ecircumflex
-:e	650,765,13,64,-34,64	2	0353	-- edieresis
-`i	200,786,0,146,-15,81	2	0354	-- igrave
-'i	200,786,0,247,-15,81	2	0355	-- iacute
-^i	200,764,0,245,9,81	2	0356	-- icircumflex
-:i	200,765,0,203,-15,81	2	0357	-- idieresis
-Sd	655,753,12,70,-38,70	2	0360	-- eth
-~n	610,754,0,49,-15,49	2	0361	-- ntilde
-`o	655,786,13,64,-38,64	2	0362	-- ograve
-'o	655,786,13,64,-38,64	2	0363	-- oacute
-^o	655,764,13,64,-38,64	2	0364	-- ocircumflex
-~o	655,754,13,64,-38,64	2	0365	-- otilde
-:o	655,765,13,64,-38,64	2	0366	-- odieresis
-tdi	606,519,13,52,-42,52	0	0367	-- divide
-/o	653,614,64,100,-1,81	0	0370	-- oslash
-`u	608,786,13,84,-50,81	2	0371	-- ugrave
-'u	608,786,13,84,-50,81	2	0372	-- uacute
-^u	608,764,13,84,-50,81	2	0373	-- ucircumflex
-:u	608,765,13,84,-50,81	2	0374	-- udieresis
-'y	536,786,192,138,-47,81	3	0375	-- yacute
-Tp	682,740,192,67,22,67	3	0376	-- thorn
-:y	536,765,192,138,-47,81	3	0377	-- ydieresis
+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
+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
+%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
+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
+/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
+r!	295,548,192,41,-24,41	1	161	exclamdown
+ct	554,707,0,92,-65,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
+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
+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
+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
+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
+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
+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
+^A	740,927,0,39,38,39	2	194	Acircumflex
+~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
+`I	226,949,0,164,-26,81	2	204	Igrave
+'I	226,949,0,264,-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
+: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
+Tp	682,740,192,67,22,67	3	254	thorn
+:y	536,765,192,138,-47,81	3	255	ydieresis
+u2026	1000,126,0,0,-80	0	256	ellipsis
diff --git a/contrib/groff/font/devps/AR b/contrib/groff/font/devps/AR
index 8d3129a..6490cdc 100644
--- a/contrib/groff/font/devps/AR
+++ b/contrib/groff/font/devps/AR
@@ -233,246 +233,247 @@ y e -20
 y , -110
 y a -30
 charset
-ha	606,740,0,0,-53	2	0000	-- asciicircum
-ti	606,319,0,0,-72	0	0001	-- asciitilde
-vS	498,927,13,0,-22	2	0002	-- Scaron
-vZ	480,927,0,0,-12	2	0003	-- Zcaron
-vs	388,764,13,0,-11	2	0004	-- scaron
-vz	425,764,0,0,-10	2	0005	-- zcaron
-:Y	592,928,0,0,-1	2	0006	-- Ydieresis
-tm	1000,740,0,0,-9	2	0007	-- trademark
-aq	198,740,0,0,-59	2	0010	-- quotesingle
-space	277	0	0040
-!	295,740,0,0,-111	2	0041	-- exclam
-"	309,740,0,0,-36	2	0042	-- quotedbl
+ha	606,740	2	0	asciicircum
+ti	606,319	0	1	asciitilde
+vS	498,927,13	2	2	Scaron
+vZ	480,927	2	3	Zcaron
+vs	388,764,13	2	4	scaron
+vz	425,764	2	5	zcaron
+:Y	592,928	2	6	Ydieresis
+tm	1000,740	2	7	trademark
+aq	198,740	2	8	quotesingle
+space	277	0	32	space
+!	295,740	2	33	exclam
+"	309,740	2	34	quotedbl
 dq	"
-#	554,740,0,0,-33	2	0043	-- numbersign
+#	554,740	2	35	numbersign
 sh	"
-$	554,811,70,0,-70	2	0044	-- dollar
+$	554,811,70	2	36	dollar
 Do	"
-%	775,751,13,0,-21	2	0045	-- percent
-&	757,753,12,0,-56	2	0046	-- ampersand
-'	351,740,0,0,-94	2	0047	-- quoteright
+%	775,751,13	2	37	percent
+&	757,753,12	2	38	ampersand
+'	351,740	2	39	quoteright
 cq	"
-(	369,757,205,0,-47	3	0050	-- parenleft
-)	369,757,205,0,-14	3	0051	-- parenright
-*	425,740,0,0,-58	2	0052	-- asterisk
-+	606,506,0,0,-51	0	0053	-- plus
-,	277,126,67,0,-14	0	0054	-- comma
--	332,315,0,0,-30	0	0055	-- hyphen
+(	369,757,205	3	40	parenleft
+)	369,757,205	3	41	parenright
+*	425,740	2	42	asterisk
++	606,506	0	43	plus
+,	277,126,67	0	44	comma
+-	332,315	0	45	hyphen
 hy	"
-.	277,126,0,0,-102	0	0056	-- period
-/	437,740,100,0,-44	2	0057	-- slash
+.	277,126	0	46	period
+/	437,740,100	2	47	slash
 sl	"
-0	554,753,13,0,-29	2	0060	-- zero
-1	554,740,0,0,-135	2	0061	-- one
-2	554,753,0,0,-40	2	0062	-- two
-3	554,753,13,0,-34	2	0063	-- three
-4	554,740,0,0,-14	2	0064	-- four
-5	554,740,13,0,-26	2	0065	-- five
-6	554,739,13,0,-24	2	0066	-- six
-7	554,740,0,0,-63	2	0067	-- seven
-8	554,753,13,0,-41	2	0070	-- eight
-9	554,752,0,0,-24	2	0071	-- nine
-:	277,548,0,0,-102	0	0072	-- colon
-;	277,548,67,0,-14	0	0073	-- semicolon
-<	606,514,8,0,-46	0	0074	-- less
-=	606,388,0,0,-51	0	0075	-- equal
->	606,514,8,0,-52	0	0076	-- greater
-?	591,752,0,0,-64	2	0077	-- question
-@	867,753,13,0,-65	2	0100	-- at
+0	554,753,13	2	48	zero
+1	554,740	2	49	one
+2	554,753	2	50	two
+3	554,753,13	2	51	three
+4	554,740	2	52	four
+5	554,740,13	2	53	five
+6	554,739,13	2	54	six
+7	554,740	2	55	seven
+8	554,753,13	2	56	eight
+9	554,752	2	57	nine
+:	277,548	0	58	colon
+;	277,548,67	0	59	semicolon
+<	606,514,8	0	60	less
+=	606,388	0	61	equal
+>	606,514,8	0	62	greater
+?	591,752	2	63	question
+@	867,753,13	2	64	at
 at	"
-A	740,740,0,0,-12	2	0101	-- A
-B	574,740,0,0,-74	2	0102	-- B
-C	813,752,13,0,-43	2	0103	-- C
-D	744,740,0,0,-74	2	0104	-- D
-E	536,740,0,0,-70	2	0105	-- E
-F	485,740,0,0,-70	2	0106	-- F
-G	872,753,13,0,-40	2	0107	-- G
-H	683,740,0,0,-76	2	0110	-- H
-I	226,740,0,0,-76	2	0111	-- I
-J	482,740,13,0,-6	2	0112	-- J
-K	591,740,0,0,-81	2	0113	-- K
-L	462,740,0,0,-82	2	0114	-- L
-M	919,740,0,0,-76	2	0115	-- M
-N	740,740,0,0,-75	2	0116	-- N
-O	869,753,13,0,-43	2	0117	-- O
-P	592,740,0,0,-75	2	0120	-- P
-Q	871,753,13,0,-40	2	0121	-- Q
-R	607,740,0,0,-70	2	0122	-- R
-S	498,753,13,0,-22	2	0123	-- S
-T	426,740,0,0,-6	2	0124	-- T
-U	655,740,13,0,-75	2	0125	-- U
-V	702,740,0,0,-8	2	0126	-- V
-W	960,740,0,0,-11	2	0127	-- W
-X	609,740,0,0,-8	2	0130	-- X
-Y	592,740,0,0,-1	2	0131	-- Y
-Z	480,740,0,0,-12	2	0132	-- Z
-[	351,753,179,0,-133	2	0133	-- bracketleft
+A	740,740	2	65	A
+B	574,740	2	66	B
+C	813,752,13	2	67	C
+D	744,740	2	68	D
+E	536,740	2	69	E
+F	485,740	2	70	F
+G	872,753,13	2	71	G
+H	683,740	2	72	H
+I	226,740	2	73	I
+J	482,740,13	2	74	J
+K	591,740	2	75	K
+L	462,740	2	76	L
+M	919,740	2	77	M
+N	740,740	2	78	N
+O	869,753,13	2	79	O
+P	592,740	2	80	P
+Q	871,753,13	2	81	Q
+R	607,740	2	82	R
+S	498,753,13	2	83	S
+T	426,740	2	84	T
+U	655,740,13	2	85	U
+V	702,740	2	86	V
+W	960,740	2	87	W
+X	609,740	2	88	X
+Y	592,740	2	89	Y
+Z	480,740	2	90	Z
+[	351,753,179	2	91	bracketleft
 lB	"
-\	605,740,100,0,-118	2	0134	-- backslash
+\	605,740,100	2	92	backslash
 rs	"
-]	351,753,179,0,-14	2	0135	-- bracketright
+]	351,753,179	2	93	bracketright
 rB	"
-a^	502,764,0,0,-74	2	0136	-- circumflex
+a^	502,764	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	351,740,0,0,-95	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	351,740	2	96	quoteleft
 oq	"
-a	683,561,13,0,-42	0	0141	-- a
-b	682,740,13,0,-68	2	0142	-- b
-c	647,561,13,0,-41	0	0143	-- c
-d	685,740,13,0,-39	2	0144	-- d
-e	650,561,13,0,-38	0	0145	-- e
-f	314,753,0,0,-19	2	0146	-- f
-g	673,561,215,0,-37	1	0147	-- g
-h	610,740,0,0,-62	2	0150	-- h
-i	200,740,0,0,-65	2	0151	-- i
-j	203,740,192,0,44	3	0152	-- j
-k	502,740,0,0,-70	2	0153	-- k
-l	200,740,0,0,-65	2	0154	-- l
-m	938,561,0,0,-66	0	0155	-- m
-n	610,561,0,0,-65	0	0156	-- n
-o	655,561,13,0,-42	0	0157	-- o
-p	682,561,192,0,-64	1	0160	-- p
-q	682,561,192,0,-37	1	0161	-- q
-r	301,561,0,0,-65	0	0162	-- r
-s	388,561,13,0,-24	0	0163	-- s
-t	339,740,0,0,-14	2	0164	-- t
-u	608,547,13,0,-62	0	0165	-- u
-v	554,547,0,0,-7	0	0166	-- v
-w	831,547,0,0,-13	0	0167	-- w
-x	480,547,0,0,-12	0	0170	-- x
-y	536,547,192,0,-15	1	0171	-- y
-z	425,547,0,0,-10	0	0172	-- z
-lC	351,740,189,0,-70	2	0173	-- braceleft
+a	683,561,13	0	97	a
+b	682,740,13	2	98	b
+c	647,561,13	0	99	c
+d	685,740,13	2	100	d
+e	650,561,13	0	101	e
+f	314,753	2	102	f
+g	673,561,215	1	103	g
+h	610,740	2	104	h
+i	200,740	2	105	i
+j	203,740,192,0,44	3	106	j
+k	502,740	2	107	k
+l	200,740	2	108	l
+m	938,561	0	109	m
+n	610,561	0	110	n
+o	655,561,13	0	111	o
+p	682,561,192	1	112	p
+q	682,561,192	1	113	q
+r	301,561	0	114	r
+s	388,561,13	0	115	s
+t	339,740	2	116	t
+u	608,547,13	0	117	u
+v	554,547	0	118	v
+w	831,547	0	119	w
+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,0,-299	2	0174	-- bar
+ba	672,740,100	2	124	bar
 |	"
-rC	351,740,189,0,-20	2	0175	-- braceright
+rC	351,740,189	2	125	braceright
 }	"
-a~	439,754,0,0,-47	2	0176	-- tilde
+a~	439,754	2	126	tilde
 ~	"
-bq	354,126,68,0,-89	0	0200	-- quotesinglbase
-Fo	425,481,0,0,-40	0	0201	-- guillemotleft
-Fc	425,481,0,0,-39	0	0202	-- guillemotright
-bu	606,532,0,0,-150	0	0203	-- bullet
-Fn	554,818,153,0,12	2	0204	-- florin
-f/	166,740,0,114,113	2	0205	-- fraction
-%0	1174,751,13,0,-25	2	0206	-- perthousand
-dg	553,740,133,0,-59	2	0207	-- dagger
-dd	553,740,133,0,-59	2	0210	-- daggerdbl
-en	500,315,0,0,-35	0	0211	-- endash
-em	1000,315,0,0,-35	0	0212	-- emdash
-fi	487,753,0,0,-19	2	0214	-- fi
-fl	485,753,0,0,-19	2	0215	-- fl
-.i	200,547,0,0,-65	0	0220	-- dotlessi
-ga	378,786,0,0,-69	2	0222	-- grave
-a"	552,800,0,0,-119	2	0223	-- hungarumlaut
-a.	222,765,0,0,-74	2	0224	-- dotaccent
-ab	453,754,0,0,-52	2	0225	-- breve
-ah	502,764,0,0,-68	2	0226	-- caron
-ao	332,807,0,0,-62	2	0227	-- ring
-ho	302,0,191,0,-73	1	0230	-- ogonek
-lq	502,740,0,0,-97	2	0231	-- quotedblleft
-rq	484,740,0,0,-96	2	0232	-- quotedblright
-oe	1137,561,13,0,-34	0	0233	-- oe
-/l	300,740,0,0,-43	2	0234	-- lslash
-Bq	502,126,68,0,-89	0	0235	-- quotedblbase
-OE	1194,753,13,0,-45	2	0236	-- OE
-/L	517,740,0,0,-59	2	0237	-- Lslash
-r!	295,548,192,0,-110	1	0241	-- exclamdown
-ct	554,707,0,0,-48	0	0242	-- cent
-Po	554,753,0,0,-4	2	0243	-- sterling
-Cs	554,580,0,0,-8	0	0244	-- currency
-Ye	554,740,0,0,-4	2	0245	-- yen
-bb	672,740,100,0,-299	2	0246	-- brokenbar
-sc	615,753,141,0,-85	2	0247	-- section
-ad	369,765,0,0,-73	2	0250	-- dieresis
-co	747,752,12,8,9	2	0251	-- copyright
-Of	369,753,0,0,3	2	0252	-- ordfeminine
-fo	251,481,0,0,-40	0	0253	-- guilsinglleft
-no	606,388,0,0,-51	0	0254	-- logicalnot
-\-	606,287,0,0,-51	0	0255	-- minus
-rg	747,752,12,8,9	2	0256	-- registered
-a-	485,736,0,0,-73	0	0257	-- macron
-de	400,709,0,0,-56	0	0260	-- degree
-t+-	606,518,24,0,-51	0	0261	-- plusminus
-S2	332,747,0,0,-19	2	0262	-- twosuperior
-S3	332,747,0,0,-18	2	0263	-- threesuperior
-aa	375,786,0,0,-78	2	0264	-- acute
-mc	608,547,184,0,-80	0	0265	-- mu
-ps	564,740,110,0,-22	2	0266	-- paragraph
-pc	277,316,0,0,-102	0	0267	-- periodcentered
-ac	324,0,222,0,-80	1	0270	-- cedilla
-S1	332,740,0,0,-63	2	0271	-- onesuperior
-Om	369,753,0,0,-12	2	0272	-- ordmasculine
-fc	251,481,0,0,-39	0	0273	-- guilsinglright
-14	831,740,0,0,-100	2	0274	-- onequarter
-12	831,740,0,0,-81	2	0275	-- onehalf
-34	831,747,0,0,-46	2	0276	-- threequarters
-r?	591,548,205,0,-65	1	0277	-- questiondown
-`A	740,949,0,0,-12	2	0300	-- Agrave
-'A	740,949,0,0,-12	2	0301	-- Aacute
-^A	740,927,0,0,-12	2	0302	-- Acircumflex
-~A	740,917,0,0,-12	2	0303	-- Atilde
-:A	740,928,0,0,-12	2	0304	-- Adieresis
-oA	740,955,0,0,-12	2	0305	-- Aring
-AE	992,740,0,0,20	2	0306	-- AE
-,C	813,752,222,0,-43	3	0307	-- Ccedilla
-`E	536,949,0,0,-70	2	0310	-- Egrave
-'E	536,949,0,0,-70	2	0311	-- Eacute
-^E	536,927,0,0,-70	2	0312	-- Ecircumflex
-:E	536,928,0,0,-70	2	0313	-- Edieresis
-`I	226,949,0,0,47	2	0314	-- Igrave
-'I	226,949,0,49,-44	2	0315	-- Iacute
-^I	226,927,0,64,64	2	0316	-- Icircumflex
-:I	226,928,0,0,-2	2	0317	-- Idieresis
--D	790,740,0,0,-40	2	0320	-- Eth
-~N	740,917,0,0,-75	2	0321	-- Ntilde
-`O	869,949,13,0,-43	2	0322	-- Ograve
-'O	869,949,13,0,-43	2	0323	-- Oacute
-^O	869,927,13,0,-43	2	0324	-- Ocircumflex
-~O	869,917,13,0,-43	2	0325	-- Otilde
-:O	869,928,13,0,-43	2	0326	-- Odieresis
-tmu	606,482,0,0,-74	0	0327	-- multiply
-/O	868,819,83,0,-43	2	0330	-- Oslash
-`U	655,949,13,0,-75	2	0331	-- Ugrave
-'U	655,949,13,0,-75	2	0332	-- Uacute
-^U	655,927,13,0,-75	2	0333	-- Ucircumflex
-:U	655,928,13,0,-75	2	0334	-- Udieresis
-'Y	592,949,0,0,-1	2	0335	-- Yacute
-TP	592,740,0,0,-60	2	0336	-- Thorn
-ss	554,753,13,0,-61	2	0337	-- germandbls
-`a	683,786,13,0,-42	2	0340	-- agrave
-'a	683,786,13,0,-42	2	0341	-- aacute
-^a	683,764,13,0,-42	2	0342	-- acircumflex
-~a	683,754,13,0,-42	2	0343	-- atilde
-:a	683,765,13,0,-42	2	0344	-- adieresis
-oa	683,807,13,0,-42	2	0345	-- aring
-ae	1157,561,13,0,-34	0	0346	-- ae
-,c	647,561,222,0,-41	1	0347	-- ccedilla
-`e	650,786,13,0,-38	2	0350	-- egrave
-'e	650,786,13,0,-38	2	0351	-- eacute
-^e	650,764,13,0,-38	2	0352	-- ecircumflex
-:e	650,765,13,0,-38	2	0353	-- edieresis
-`i	200,786,0,0,60	2	0354	-- igrave
-'i	200,786,0,62,-31	2	0355	-- iacute
-^i	200,764,0,77,77	2	0356	-- icircumflex
-:i	200,765,0,11,11	2	0357	-- idieresis
-Sd	655,753,12,0,-42	2	0360	-- eth
-~n	610,754,0,0,-65	2	0361	-- ntilde
-`o	655,786,13,0,-42	2	0362	-- ograve
-'o	655,786,13,0,-42	2	0363	-- oacute
-^o	655,764,13,0,-42	2	0364	-- ocircumflex
-~o	655,754,13,0,-42	2	0365	-- otilde
-:o	655,765,13,0,-42	2	0366	-- odieresis
-tdi	606,519,13,0,-51	0	0367	-- divide
-/o	653,614,64,0,-41	0	0370	-- oslash
-`u	608,786,13,0,-62	2	0371	-- ugrave
-'u	608,786,13,0,-62	2	0372	-- uacute
-^u	608,764,13,0,-62	2	0373	-- ucircumflex
-:u	608,765,13,0,-62	2	0374	-- udieresis
-'y	536,786,192,0,-15	3	0375	-- yacute
-Tp	682,740,192,0,-64	3	0376	-- thorn
-:y	536,765,192,0,-15	3	0377	-- ydieresis
+bq	354,126,68	0	128	quotesinglbase
+Fo	425,481	0	129	guillemotleft
+Fc	425,481	0	130	guillemotright
+bu	606,532	0	131	bullet
+Fn	554,818,153,0,12	2	132	florin
+f/	166,740,0,114,113	2	133	fraction
+%0	1174,751,13	2	134	perthousand
+dg	553,740,133	2	135	dagger
+dd	553,740,133	2	136	daggerdbl
+en	500,315	0	137	endash
+em	1000,315	0	138	emdash
+fi	487,753	2	140	fi
+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.	222,765	2	148	dotaccent
+ab	453,754	2	149	breve
+ah	502,764	2	150	caron
+ao	332,807	2	151	ring
+ho	302,0,191	1	152	ogonek
+lq	502,740	2	153	quotedblleft
+rq	484,740	2	154	quotedblright
+oe	1137,561,13	0	155	oe
+/l	300,740	2	156	lslash
+Bq	502,126,68	0	157	quotedblbase
+OE	1194,753,13	2	158	OE
+/L	517,740	2	159	Lslash
+r!	295,548,192	1	161	exclamdown
+ct	554,707	0	162	cent
+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
+sc	615,753,141	2	167	section
+ad	369,765	2	168	dieresis
+co	747,752,12,8,9	2	169	copyright
+Of	369,753,0,0,3	2	170	ordfeminine
+fo	251,481	0	171	guilsinglleft
+tno	606,388	0	172	logicalnot
+\-	606,287	0	173	minus
+rg	747,752,12,8,9	2	174	registered
+a-	485,736	0	175	macron
+de	400,709	0	176	degree
+t+-	606,518,24	0	177	plusminus
+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
+ps	564,740,110	2	182	paragraph
+pc	277,316	0	183	periodcentered
+ac	324,0,222	1	184	cedilla
+S1	332,740	2	185	onesuperior
+Om	369,753	2	186	ordmasculine
+fc	251,481	0	187	guilsinglright
+14	831,740	2	188	onequarter
+12	831,740	2	189	onehalf
+34	831,747	2	190	threequarters
+r?	591,548,205	1	191	questiondown
+`A	740,949	2	192	Agrave
+'A	740,949	2	193	Aacute
+^A	740,927	2	194	Acircumflex
+~A	740,917	2	195	Atilde
+:A	740,928	2	196	Adieresis
+oA	740,955	2	197	Aring
+AE	992,740,0,0,20	2	198	AE
+,C	813,752,222	3	199	Ccedilla
+`E	536,949	2	200	Egrave
+'E	536,949	2	201	Eacute
+^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,927,0,64,64	2	206	Icircumflex
+:I	226,928	2	207	Idieresis
+-D	790,740	2	208	Eth
+~N	740,917	2	209	Ntilde
+`O	869,949,13	2	210	Ograve
+'O	869,949,13	2	211	Oacute
+^O	869,927,13	2	212	Ocircumflex
+~O	869,917,13	2	213	Otilde
+:O	869,928,13	2	214	Odieresis
+tmu	606,482	0	215	multiply
+/O	868,819,83	2	216	Oslash
+`U	655,949,13	2	217	Ugrave
+'U	655,949,13	2	218	Uacute
+^U	655,927,13	2	219	Ucircumflex
+:U	655,928,13	2	220	Udieresis
+'Y	592,949	2	221	Yacute
+TP	592,740	2	222	Thorn
+ss	554,753,13	2	223	germandbls
+`a	683,786,13	2	224	agrave
+'a	683,786,13	2	225	aacute
+^a	683,764,13	2	226	acircumflex
+~a	683,754,13	2	227	atilde
+:a	683,765,13	2	228	adieresis
+oa	683,807,13	2	229	aring
+ae	1157,561,13	0	230	ae
+,c	647,561,222	1	231	ccedilla
+`e	650,786,13	2	232	egrave
+'e	650,786,13	2	233	eacute
+^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,764,0,77,77	2	238	icircumflex
+:i	200,765,0,11,11	2	239	idieresis
+Sd	655,753,12	2	240	eth
+~n	610,754	2	241	ntilde
+`o	655,786,13	2	242	ograve
+'o	655,786,13	2	243	oacute
+^o	655,764,13	2	244	ocircumflex
+~o	655,754,13	2	245	otilde
+:o	655,765,13	2	246	odieresis
+tdi	606,519,13	0	247	divide
+/o	653,614,64	0	248	oslash
+`u	608,786,13	2	249	ugrave
+'u	608,786,13	2	250	uacute
+^u	608,764,13	2	251	ucircumflex
+:u	608,765,13	2	252	udieresis
+'y	536,786,192	3	253	yacute
+Tp	682,740,192	3	254	thorn
+:y	536,765,192	3	255	ydieresis
+u2026	1000,126	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMB b/contrib/groff/font/devps/BMB
index 96a7258..edb18a8 100644
--- a/contrib/groff/font/devps/BMB
+++ b/contrib/groff/font/devps/BMB
@@ -100,246 +100,247 @@ r d -10
 r , -101
 r c -9
 charset
-ha	600,681,0,0,-52	2	0000	-- asciicircum
-ti	600,368,0,0,-51	0	0001	-- asciitilde
-vS	660,896,17,0,-21	2	0002	-- Scaron
-vZ	640,896,0,0,-6	2	0003	-- Zcaron
-vs	520,717,8,0,-22	2	0004	-- scaron
-vz	560,717,0,0,-22	2	0005	-- zcaron
-:Y	700,877,0,18,20	2	0006	-- Ydieresis
-tm	980,681,0,2,-42	2	0007	-- trademark
-aq	240,698,0,0,-42	2	0010	-- quotesingle
-space	340	0	0040
-!	360,698,8,0,-82	2	0041	-- exclam
-"	420,698,0,0,-11	2	0042	-- quotedbl
+ha	600,681	2	0	asciicircum
+ti	600,368	0	1	asciitilde
+vS	660,896,17	2	2	Scaron
+vZ	640,896	2	3	Zcaron
+vs	520,717,8	2	4	scaron
+vz	560,717	2	5	zcaron
+:Y	700,877,0,18,20	2	6	Ydieresis
+tm	980,681,0,2	2	7	trademark
+aq	240,698	2	8	quotesingle
+space	340	0	32	space
+!	360,698,8	2	33	exclam
+"	420,698	2	34	quotedbl
 dq	"
-#	660,681,0,0,-84	2	0043	-- numbersign
+#	660,681	2	35	numbersign
 sh	"
-$	660,805,119,0,-48	2	0044	-- dollar
+$	660,805,119	2	36	dollar
 Do	"
-%	940,698,8,0,-12	2	0045	-- percent
-&	800,698,17,0,-21	2	0046	-- ampersand
-'	320,698,0,0,-82	2	0047	-- quoteright
+%	940,698,8	2	37	percent
+&	800,698,17	2	38	ampersand
+'	320,698	2	39	quoteright
 cq	"
-(	320,749,150,0,-48	2	0050	-- parenleft
-)	320,749,150,0,-20	2	0051	-- parenright
-*	460,697,0,0,-62	2	0052	-- asterisk
-+	600,514,0,0,-51	0	0053	-- plus
-,	340,162,124,0,-78	0	0054	-- comma
--	360,318,0,0,-20	0	0055	-- hyphen
+(	320,749,150	2	40	parenleft
+)	320,749,150	2	41	parenright
+*	460,697	2	42	asterisk
++	600,514	0	43	plus
+,	340,162,124	0	44	comma
+-	360,318	0	45	hyphen
 hy	"
-.	340,172,8,0,-76	0	0056	-- period
-/	600,725,149,0,-50	2	0057	-- slash
+.	340,172,8	0	46	period
+/	600,725,149	2	47	slash
 sl	"
-0	660,698,17,0,-30	2	0060	-- zero
-1	660,681,0,0,-137	2	0061	-- one
-2	660,698,0,0,-41	2	0062	-- two
-3	660,698,17,0,-37	2	0063	-- three
-4	660,681,0,0,-19	2	0064	-- four
-5	660,723,17,0,-44	2	0065	-- five
-6	660,698,17,0,-34	2	0066	-- six
-7	660,681,0,0,-36	2	0067	-- seven
-8	660,698,17,0,-36	2	0070	-- eight
-9	660,698,17,0,-33	2	0071	-- nine
-:	340,515,8,0,-76	0	0072	-- colon
-;	340,515,124,0,-75	0	0073	-- semicolon
-<	600,542,9,0,-49	0	0074	-- less
-=	600,421,0,0,-51	0	0075	-- equal
->	600,542,9,0,-48	0	0076	-- greater
-?	660,698,8,0,-61	2	0077	-- question
-@	820,698,17,0,-60	2	0100	-- at
+0	660,698,17	2	48	zero
+1	660,681	2	49	one
+2	660,698	2	50	two
+3	660,698,17	2	51	three
+4	660,681	2	52	four
+5	660,723,17	2	53	five
+6	660,698,17	2	54	six
+7	660,681	2	55	seven
+8	660,698,17	2	56	eight
+9	660,698,17	2	57	nine
+:	340,515,8	0	58	colon
+;	340,515,124	0	59	semicolon
+<	600,542,9	0	60	less
+=	600,421	0	61	equal
+>	600,542,9	0	62	greater
+?	660,698,8	2	63	question
+@	820,698,17	2	64	at
 at	"
-A	720,681,0,43,34	2	0101	-- A
-B	720,681,0,0,-20	2	0102	-- B
-C	740,698,17,0,-35	2	0103	-- C
-D	780,681,0,0,-20	2	0104	-- D
-E	720,681,0,4,-20	2	0105	-- E
-F	680,681,0,6,-20	2	0106	-- F
-G	780,698,17,0,-35	2	0107	-- G
-H	820,681,0,0,-20	2	0110	-- H
-I	400,681,0,0,-20	2	0111	-- I
-J	640,681,17,0,12	2	0112	-- J
-K	800,681,0,0,-20	2	0113	-- K
-L	640,681,0,28,-20	2	0114	-- L
-M	940,681,0,0,-20	2	0115	-- M
-N	740,681,0,0,-20	2	0116	-- N
-O	800,698,17,0,-35	2	0117	-- O
-P	660,681,0,0,-20	2	0120	-- P
-Q	800,698,226,0,-35	3	0121	-- Q
-R	780,681,0,3,-20	2	0122	-- R
-S	660,698,17,0,-21	2	0123	-- S
-T	700,681,0,3,4	2	0124	-- T
-U	740,681,17,0,-15	2	0125	-- U
-V	720,681,0,10,20	2	0126	-- V
-W	940,681,0,23,20	2	0127	-- W
-X	780,681,0,0,-1	2	0130	-- X
-Y	700,681,0,18,20	2	0131	-- Y
-Z	640,681,0,0,-6	2	0132	-- Z
-[	300,725,138,0,-75	2	0133	-- bracketleft
+A	720,681,0,43,34	2	65	A
+B	720,681	2	66	B
+C	740,698,17	2	67	C
+D	780,681	2	68	D
+E	720,681,0,4	2	69	E
+F	680,681,0,6	2	70	F
+G	780,698,17	2	71	G
+H	820,681	2	72	H
+I	400,681	2	73	I
+J	640,681,17,0,12	2	74	J
+K	800,681	2	75	K
+L	640,681,0,28	2	76	L
+M	940,681	2	77	M
+N	740,681	2	78	N
+O	800,698,17	2	79	O
+P	660,681	2	80	P
+Q	800,698,226	3	81	Q
+R	780,681,0,3	2	82	R
+S	660,698,17	2	83	S
+T	700,681,0,3,4	2	84	T
+U	740,681,17	2	85	U
+V	720,681,0,10,20	2	86	V
+W	940,681,0,23,20	2	87	W
+X	780,681	2	88	X
+Y	700,681,0,18,20	2	89	Y
+Z	640,681	2	90	Z
+[	300,725,138	2	91	bracketleft
 lB	"
-\	600,725,0,0,-50	2	0134	-- backslash
+\	600,725	2	92	backslash
 rs	"
-]	300,725,138,0,-21	2	0135	-- bracketright
+]	300,725,138	2	93	bracketright
 rB	"
-a^	500,731,0,0,-68	2	0136	-- circumflex
+a^	500,731	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	320,698,0,0,-82	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	320,698	2	96	quoteleft
 oq	"
-a	580,515,8,8,-28	0	0141	-- a
-b	600,725,8,0,20	2	0142	-- b
-c	580,515,8,0,-31	0	0143	-- c
-d	640,725,8,0,-31	2	0144	-- d
-e	580,515,8,0,-31	0	0145	-- e
-f	380,741,0,81,-22	2	0146	-- f
-g	580,595,243,3,-9	1	0147	-- g
-h	680,725,0,0,-22	2	0150	-- h
-i	360,729,0,0,-22	2	0151	-- i
-j	340,729,221,0,94	3	0152	-- j
-k	660,725,0,0,-22	2	0153	-- k
-l	340,725,0,0,-9	2	0154	-- l
-m	1000,515,0,0,-22	0	0155	-- m
-n	680,515,0,0,-22	0	0156	-- n
-o	620,515,8,0,-31	0	0157	-- o
-p	640,515,212,0,-22	1	0160	-- p
-q	620,515,212,13,-31	1	0161	-- q
-r	460,502,0,2,-22	0	0162	-- r
-s	520,515,8,0,-22	0	0163	-- s
-t	460,660,8,0,-22	2	0164	-- t
-u	660,502,8,0,-22	0	0165	-- u
-v	600,502,0,0,6	0	0166	-- v
-w	800,502,0,10,6	0	0167	-- w
-x	600,502,0,0,-8	0	0170	-- x
-y	620,502,221,0,-6	1	0171	-- y
-z	560,502,0,0,-22	0	0172	-- z
-lC	320,726,139,0,-14	2	0173	-- braceleft
+a	580,515,8,8	0	97	a
+b	600,725,8,0,20	2	98	b
+c	580,515,8	0	99	c
+d	640,725,8	2	100	d
+e	580,515,8	0	101	e
+f	380,741,0,81	2	102	f
+g	580,595,243,3	1	103	g
+h	680,725	2	104	h
+i	360,729	2	105	i
+j	340,729,221,0,94	3	106	j
+k	660,725	2	107	k
+l	340,725	2	108	l
+m	1000,515	0	109	m
+n	680,515	0	110	n
+o	620,515,8	0	111	o
+p	640,515,212	1	112	p
+q	620,515,212,13	1	113	q
+r	460,502,0,2	0	114	r
+s	520,515,8	0	115	s
+t	460,660,8	2	116	t
+u	660,502,8	0	117	u
+v	600,502,0,0,6	0	118	v
+w	800,502,0,10,6	0	119	w
+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,0,-243	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	320,725,140,0,-15	2	0175	-- braceright
+rC	320,725,140	2	125	braceright
 }	"
-a~	480,691,0,0,-69	2	0176	-- tilde
+a~	480,691	2	126	tilde
 ~	"
-bq	320,144,114,0,-82	0	0200	-- quotesinglbase
-Fo	400,457,0,0,-34	0	0201	-- guillemotleft
-Fc	400,457,0,0,-34	0	0202	-- guillemotright
-bu	460,511,0,0,-60	0	0203	-- bullet
-Fn	660,749,209,14,46	2	0204	-- florin
-f/	120,681,0,192,194	2	0205	-- fraction
-%0	1360,698,8,0,-12	2	0206	-- perthousand
-dg	440,698,156,0,-33	2	0207	-- dagger
-dd	380,698,156,0,-8	2	0210	-- daggerdbl
-en	500,318,0,25,25	0	0211	-- endash
-em	1000,318,0,25,25	0	0212	-- emdash
-fi	740,741,0,0,-22	2	0214	-- fi
-fl	740,741,0,0,-22	2	0215	-- fl
-.i	360,502,0,0,-22	0	0220	-- dotlessi
-ga	400,730,0,0,-68	2	0222	-- grave
-a"	440,741,0,0,-68	2	0223	-- hungarumlaut
-a.	320,730,0,0,-68	2	0224	-- dotaccent
-ab	500,722,0,0,-68	2	0225	-- breve
-ah	500,717,0,0,-68	2	0226	-- caron
-ao	340,755,0,0,-68	2	0227	-- ring
-ho	320,0,163,0,-68	0	0230	-- ogonek
-lq	540,698,0,0,-82	2	0231	-- quotedblleft
-rq	540,698,0,0,-82	2	0232	-- quotedblright
-oe	940,515,8,0,-31	0	0233	-- oe
-/l	340,725,0,0,-9	2	0234	-- lslash
-Bq	540,144,114,0,-82	0	0235	-- quotedblbase
-OE	1220,698,17,0,-35	2	0236	-- OE
-/L	640,681,0,28,-20	2	0237	-- Lslash
-r!	360,515,191,0,-84	0	0241	-- exclamdown
-ct	660,674,0,0,-133	2	0242	-- cent
-Po	660,698,17,0,-10	2	0243	-- sterling
-Cs	660,593,0,0,-77	0	0244	-- currency
-Ye	660,681,0,36,28	2	0245	-- yen
-bb	600,675,175,0,-243	2	0246	-- brokenbar
-sc	600,698,153,0,-36	2	0247	-- section
-ad	500,698,0,0,-68	2	0250	-- dieresis
-co	740,698,17,0,-23	2	0251	-- copyright
-Of	400,698,0,0,-27	2	0252	-- ordfeminine
-fo	220,457,0,0,-34	0	0253	-- guilsinglleft
-no	600,421,0,0,-51	0	0254	-- logicalnot
-\-	600,323,0,0,-51	0	0255	-- minus
-rg	740,698,17,0,-23	2	0256	-- registered
-a-	460,663,0,0,-68	2	0257	-- macron
-de	400,698,0,0,-50	2	0260	-- degree
-t+-	600,514,0,0,-51	0	0261	-- plusminus
-S2	396,698,0,0,-14	2	0262	-- twosuperior
-S3	396,698,0,0,-5	2	0263	-- threesuperior
-aa	400,731,0,0,-68	2	0264	-- acute
-mc	660,502,221,0,-22	1	0265	-- mu
-ps	800,681,0,0,-51	2	0266	-- paragraph
-pc	340,355,0,0,-76	0	0267	-- periodcentered
-ac	360,0,213,0,-68	1	0270	-- cedilla
-S1	396,687,0,0,-65	2	0271	-- onesuperior
-Om	400,698,0,0,-17	2	0272	-- ordmasculine
-fc	220,457,0,0,-34	0	0273	-- guilsinglright
-14	990,681,0,0,-65	2	0274	-- onequarter
-12	990,681,0,0,-65	2	0275	-- onehalf
-34	990,692,0,0,-15	2	0276	-- threequarters
-r?	660,515,191,0,-62	0	0277	-- questiondown
-`A	720,909,0,43,34	2	0300	-- Agrave
-'A	720,910,0,43,34	2	0301	-- Aacute
-^A	720,910,0,43,34	2	0302	-- Acircumflex
-~A	720,870,0,43,34	2	0303	-- Atilde
-:A	720,877,0,43,34	2	0304	-- Adieresis
-oA	720,934,0,43,34	2	0305	-- Aring
-AE	1140,681,0,9,34	2	0306	-- AE
-,C	740,698,213,0,-35	3	0307	-- Ccedilla
-`E	720,909,0,4,-20	2	0310	-- Egrave
-'E	720,910,0,4,-20	2	0311	-- Eacute
-^E	720,910,0,4,-20	2	0312	-- Ecircumflex
-:E	720,877,0,4,-20	2	0313	-- Edieresis
-`I	400,909,0,0,-20	2	0314	-- Igrave
-'I	400,910,0,0,-20	2	0315	-- Iacute
-^I	400,910,0,0,-18	2	0316	-- Icircumflex
-:I	400,877,0,0,-18	2	0317	-- Idieresis
--D	780,681,0,0,-20	2	0320	-- Eth
-~N	740,870,0,0,-20	2	0321	-- Ntilde
-`O	800,909,17,0,-35	2	0322	-- Ograve
-'O	800,910,17,0,-35	2	0323	-- Oacute
-^O	800,910,17,0,-35	2	0324	-- Ocircumflex
-~O	800,870,17,0,-35	2	0325	-- Otilde
-:O	800,877,17,0,-35	2	0326	-- Odieresis
-tmu	600,514,0,0,-48	0	0327	-- multiply
-/O	800,781,110,0,-35	2	0330	-- Oslash
-`U	740,909,17,0,-15	2	0331	-- Ugrave
-'U	740,910,17,0,-15	2	0332	-- Uacute
-^U	740,910,17,0,-15	2	0333	-- Ucircumflex
-:U	740,877,17,0,-15	2	0334	-- Udieresis
-'Y	700,910,0,18,20	2	0335	-- Yacute
-TP	660,681,0,0,-20	2	0336	-- Thorn
-ss	660,699,91,0,61	2	0337	-- germandbls
-`a	580,730,8,8,-28	2	0340	-- agrave
-'a	580,731,8,8,-28	2	0341	-- aacute
-^a	580,731,8,8,-28	2	0342	-- acircumflex
-~a	580,691,8,8,-28	2	0343	-- atilde
-:a	580,698,8,8,-28	2	0344	-- adieresis
-oa	580,755,8,8,-28	2	0345	-- aring
-ae	880,515,8,0,-28	0	0346	-- ae
-,c	580,515,213,0,-31	1	0347	-- ccedilla
-`e	580,730,8,0,-31	2	0350	-- egrave
-'e	580,731,8,0,-31	2	0351	-- eacute
-^e	580,731,8,0,-31	2	0352	-- ecircumflex
-:e	580,698,8,0,-31	2	0353	-- edieresis
-`i	360,730,0,0,-22	2	0354	-- igrave
-'i	360,731,0,0,-22	2	0355	-- iacute
-^i	360,731,0,0,2	2	0356	-- icircumflex
-:i	360,698,0,11,2	2	0357	-- idieresis
-Sd	620,741,8,0,-31	2	0360	-- eth
-~n	680,691,0,0,-22	2	0361	-- ntilde
-`o	620,730,8,0,-31	2	0362	-- ograve
-'o	620,731,8,0,-31	2	0363	-- oacute
-^o	620,731,8,0,-31	2	0364	-- ocircumflex
-~o	620,691,8,0,-31	2	0365	-- otilde
-:o	620,698,8,0,-31	2	0366	-- odieresis
-tdi	600,521,0,0,-51	0	0367	-- divide
-/o	620,551,40,0,-31	0	0370	-- oslash
-`u	660,730,8,0,-22	2	0371	-- ugrave
-'u	660,731,8,0,-22	2	0372	-- uacute
-^u	660,731,8,0,-22	2	0373	-- ucircumflex
-:u	660,698,8,0,-22	2	0374	-- udieresis
-'y	620,731,221,0,-6	3	0375	-- yacute
-Tp	640,725,212,0,-22	3	0376	-- thorn
-:y	620,698,221,0,-6	3	0377	-- ydieresis
+bq	320,144,114	0	128	quotesinglbase
+Fo	400,457	0	129	guillemotleft
+Fc	400,457	0	130	guillemotright
+bu	460,511	0	131	bullet
+Fn	660,749,209,14,46	2	132	florin
+f/	120,681,0,192,194	2	133	fraction
+%0	1360,698,8	2	134	perthousand
+dg	440,698,156	2	135	dagger
+dd	380,698,156	2	136	daggerdbl
+en	500,318,0,25,25	0	137	endash
+em	1000,318,0,25,25	0	138	emdash
+fi	740,741	2	140	fi
+fl	740,741	2	141	fl
+.i	360,502	0	144	dotlessi
+ga	400,730	2	146	grave
+a"	440,741	2	147	hungarumlaut
+a.	320,730	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
+lq	540,698	2	153	quotedblleft
+rq	540,698	2	154	quotedblright
+oe	940,515,8	0	155	oe
+/l	340,725	2	156	lslash
+Bq	540,144,114	0	157	quotedblbase
+OE	1220,698,17	2	158	OE
+/L	640,681,0,28	2	159	Lslash
+r!	360,515,191	0	161	exclamdown
+ct	660,674	2	162	cent
+Po	660,698,17	2	163	sterling
+Cs	660,593	0	164	currency
+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
+co	740,698,17	2	169	copyright
+Of	400,698	2	170	ordfeminine
+fo	220,457	0	171	guilsinglleft
+tno	600,421	0	172	logicalnot
+\-	600,323	0	173	minus
+rg	740,698,17	2	174	registered
+a-	460,663	2	175	macron
+de	400,698	2	176	degree
+t+-	600,514	0	177	plusminus
+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
+ps	800,681	2	182	paragraph
+pc	340,355	0	183	periodcentered
+ac	360,0,213	1	184	cedilla
+S1	396,687	2	185	onesuperior
+Om	400,698	2	186	ordmasculine
+fc	220,457	0	187	guilsinglright
+14	990,681	2	188	onequarter
+12	990,681	2	189	onehalf
+34	990,692	2	190	threequarters
+r?	660,515,191	0	191	questiondown
+`A	720,909,0,43,34	2	192	Agrave
+'A	720,910,0,43,34	2	193	Aacute
+^A	720,910,0,43,34	2	194	Acircumflex
+~A	720,870,0,43,34	2	195	Atilde
+:A	720,877,0,43,34	2	196	Adieresis
+oA	720,934,0,43,34	2	197	Aring
+AE	1140,681,0,9,34	2	198	AE
+,C	740,698,213	3	199	Ccedilla
+`E	720,909,0,4	2	200	Egrave
+'E	720,910,0,4	2	201	Eacute
+^E	720,910,0,4	2	202	Ecircumflex
+:E	720,877,0,4	2	203	Edieresis
+`I	400,909	2	204	Igrave
+'I	400,910	2	205	Iacute
+^I	400,910	2	206	Icircumflex
+:I	400,877	2	207	Idieresis
+-D	780,681	2	208	Eth
+~N	740,870	2	209	Ntilde
+`O	800,909,17	2	210	Ograve
+'O	800,910,17	2	211	Oacute
+^O	800,910,17	2	212	Ocircumflex
+~O	800,870,17	2	213	Otilde
+:O	800,877,17	2	214	Odieresis
+tmu	600,514	0	215	multiply
+/O	800,781,110	2	216	Oslash
+`U	740,909,17	2	217	Ugrave
+'U	740,910,17	2	218	Uacute
+^U	740,910,17	2	219	Ucircumflex
+:U	740,877,17	2	220	Udieresis
+'Y	700,910,0,18,20	2	221	Yacute
+TP	660,681	2	222	Thorn
+ss	660,699,91,0,61	2	223	germandbls
+`a	580,730,8,8	2	224	agrave
+'a	580,731,8,8	2	225	aacute
+^a	580,731,8,8	2	226	acircumflex
+~a	580,691,8,8	2	227	atilde
+:a	580,698,8,8	2	228	adieresis
+oa	580,755,8,8	2	229	aring
+ae	880,515,8	0	230	ae
+,c	580,515,213	1	231	ccedilla
+`e	580,730,8	2	232	egrave
+'e	580,731,8	2	233	eacute
+^e	580,731,8	2	234	ecircumflex
+:e	580,698,8	2	235	edieresis
+`i	360,730	2	236	igrave
+'i	360,731	2	237	iacute
+^i	360,731,0,0,2	2	238	icircumflex
+:i	360,698,0,11,2	2	239	idieresis
+Sd	620,741,8	2	240	eth
+~n	680,691	2	241	ntilde
+`o	620,730,8	2	242	ograve
+'o	620,731,8	2	243	oacute
+^o	620,731,8	2	244	ocircumflex
+~o	620,691,8	2	245	otilde
+:o	620,698,8	2	246	odieresis
+tdi	600,521	0	247	divide
+/o	620,551,40	0	248	oslash
+`u	660,730,8	2	249	ugrave
+'u	660,731,8	2	250	uacute
+^u	660,731,8	2	251	ucircumflex
+:u	660,698,8	2	252	udieresis
+'y	620,731,221	3	253	yacute
+Tp	640,725,212	3	254	thorn
+:y	620,698,221	3	255	ydieresis
+u2026	1000,172,8	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMBI b/contrib/groff/font/devps/BMBI
index 32b1422..b794a71 100644
--- a/contrib/groff/font/devps/BMBI
+++ b/contrib/groff/font/devps/BMBI
@@ -103,246 +103,247 @@ r d -3
 r , -113
 r c -5
 charset
-ha	620,681,0,24,-42,24	2	0000	-- asciicircum
-ti	620,368,0,35,-51,35	0	0001	-- asciitilde
-vS	700,915,17,81,-9,73	2	0002	-- Scaron
-vZ	680,915,0,110,27,73	2	0003	-- Zcaron
-vs	540,749,8,83,18,73	2	0004	-- scaron
-vz	560,749,8,76,14,73	2	0005	-- zcaron
-:Y	660,900,0,207,-22,73	2	0006	-- Ydieresis
-tm	940,681,0,92,8,73	2	0007	-- trademark
-aq	180,696,0,165,-76,73	2	0010	-- quotesingle
-space	340	0	0040
-!	320,698,8,96,-36,73	2	0041	-- exclam
-"	380,697,0,177,-90,73	2	0042	-- quotedbl
+ha	620,681,0,24,-42,24	2	0	asciicircum
+ti	620,368,0,35,-51,35	0	1	asciitilde
+vS	700,915,17,81,-9,73	2	2	Scaron
+vZ	680,915,0,110,27,73	2	3	Zcaron
+vs	540,749,8,83,18,73	2	4	scaron
+vz	560,749,8,76,14,73	2	5	zcaron
+: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
+space	340	0	32	space
+!	320,698,8,96,-36,73	2	33	exclam
+"	380,697,0,177,-90,73	2	34	quotedbl
 dq	"
-#	680,681,0,19,-107,19	2	0043	-- numbersign
+#	680,681,0,19,-107,19	2	35	numbersign
 sh	"
-$	680,790,164,67,5,67	2	0044	-- dollar
+$	680,790,164,67,5,67	2	36	dollar
 Do	"
-%	880,698,17,69,-56,69	2	0045	-- percent
-&	980,698,17,86,2,73	2	0046	-- ampersand
-'	320,698,0,79,-121,73	2	0047	-- quoteright
+%	880,698,17,69,-56,69	2	37	percent
+&	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	0050	-- parenleft
-)	260,741,134,112,85,73	2	0051	-- parenright
-*	460,698,0,98,-76,73	2	0052	-- asterisk
-+	600,514,0,45,-41,45	0	0053	-- plus
-,	340,185,124,8,-50,8	0	0054	-- comma
--	280,313,0,89,-9,73	0	0055	-- hyphen
+(	260,741,134,178,19,73	2	40	parenleft
+)	260,741,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
+-	280,313,0,89,-9,73	0	45	hyphen
 hy	"
-.	340,177,8,6,-56,6	0	0056	-- period
-/	360,742,106,192,41,73	2	0057	-- slash
+.	340,177,8,6,-56,6	0	46	period
+/	360,742,106,192,41,73	2	47	slash
 sl	"
-0	680,698,17,73,-37,73	2	0060	-- zero
-1	680,681,0,0,-73	2	0061	-- one
-2	680,698,0,44,-17,44	2	0062	-- two
-3	680,698,17,53,-22,53	2	0063	-- three
-4	680,681,0,78,-13,73	2	0064	-- four
-5	680,681,17,39,-28,39	2	0065	-- five
-6	680,698,17,74,-38,73	2	0066	-- six
-7	680,681,0,109,-73,73	2	0067	-- seven
-8	680,698,17,56,-18,56	2	0070	-- eight
-9	680,698,17,82,-21,73	2	0071	-- nine
-:	340,515,8,66,-56,66	0	0072	-- colon
-;	340,515,124,62,-50,62	0	0073	-- semicolon
-<	620,540,9,18,-29,18	0	0074	-- less
-=	600,421,0,45,-41,45	0	0075	-- equal
->	620,540,9,28,-39,28	0	0076	-- greater
-?	620,698,8,98,-95,73	2	0077	-- question
-@	780,698,17,60,-30,60	2	0100	-- at
+0	680,698,17,73,-37,73	2	48	zero
+1	680,681,0,0,-73	2	49	one
+2	680,698,0,44,-17,44	2	50	two
+3	680,698,17,53,-22,53	2	51	three
+4	680,681,0,78,-13,73	2	52	four
+5	680,681,17,39,-28,39	2	53	five
+6	680,698,17,74,-38,73	2	54	six
+7	680,681,0,109,-73,73	2	55	seven
+8	680,698,17,56,-18,56	2	56	eight
+9	680,698,17,82,-21,73	2	57	nine
+:	340,515,8,66,-56,66	0	58	colon
+;	340,515,124,62,-50,62	0	59	semicolon
+<	620,540,9,18,-29,18	0	60	less
+=	600,421,0,45,-41,45	0	61	equal
+>	620,540,9,28,-39,28	0	62	greater
+?	620,698,8,98,-95,73	2	63	question
+@	780,698,17,60,-30,60	2	64	at
 at	"
-A	720,681,0,99,77,73	2	0101	-- A
-B	720,681,0,92,36,73	2	0102	-- B
-C	700,698,17,104,-28,73	2	0103	-- C
-D	760,681,0,95,36,73	2	0104	-- D
-E	720,681,0,107,36,73	2	0105	-- E
-F	660,681,0,153,36,73	2	0106	-- F
-G	760,698,17,118,-27,73	2	0107	-- G
-H	800,681,0,160,36,73	2	0110	-- H
-I	380,681,0,155,36,73	2	0111	-- I
-J	620,681,17,151,42,73	2	0112	-- J
-K	780,681,0,149,36,73	2	0113	-- K
-L	640,681,0,135,36,73	2	0114	-- L
-M	860,681,0,160,36,73	2	0115	-- M
-N	740,681,0,155,36,73	2	0116	-- N
-O	760,698,17,96,-28,73	2	0117	-- O
-P	640,681,0,134,56,73	2	0120	-- P
-Q	760,698,213,95,13,73	3	0121	-- Q
-R	740,681,0,75,36,73	2	0122	-- R
-S	700,698,17,81,-9,73	2	0123	-- S
-T	700,681,0,152,-20,73	2	0124	-- T
-U	740,681,17,165,-62,73	2	0125	-- U
-V	660,681,0,209,-22,73	2	0126	-- V
-W	1000,681,0,140,-22,73	2	0127	-- W
-X	740,681,0,145,57,73	2	0130	-- X
-Y	660,681,0,207,-22,73	2	0131	-- Y
-Z	680,681,0,110,27,73	2	0132	-- Z
-[	260,741,118,164,41,73	2	0133	-- bracketleft
+A	720,681,0,99,77,73	2	65	A
+B	720,681,0,92,36,73	2	66	B
+C	700,698,17,104,-28,73	2	67	C
+D	760,681,0,95,36,73	2	68	D
+E	720,681,0,107,36,73	2	69	E
+F	660,681,0,153,36,73	2	70	F
+G	760,698,17,118,-27,73	2	71	G
+H	800,681,0,160,36,73	2	72	H
+I	380,681,0,155,36,73	2	73	I
+J	620,681,17,151,42,73	2	74	J
+K	780,681,0,149,36,73	2	75	K
+L	640,681,0,135,36,73	2	76	L
+M	860,681,0,160,36,73	2	77	M
+N	740,681,0,155,36,73	2	78	N
+O	760,698,17,96,-28,73	2	79	O
+P	640,681,0,134,56,73	2	80	P
+Q	760,698,213,95,13,73	3	81	Q
+R	740,681,0,75,36,73	2	82	R
+S	700,698,17,81,-9,73	2	83	S
+T	700,681,0,152,-20,73	2	84	T
+U	740,681,17,165,-62,73	2	85	U
+V	660,681,0,209,-22,73	2	86	V
+W	1000,681,0,140,-22,73	2	87	W
+X	740,681,0,145,57,73	2	88	X
+Y	660,681,0,207,-22,73	2	89	Y
+Z	680,681,0,110,27,73	2	90	Z
+[	260,741,118,164,41,73	2	91	bracketleft
 lB	"
-\	580,741,0,45,-23,45	2	0134	-- backslash
+\	580,741,0,45,-23,45	2	92	backslash
 rs	"
-]	260,741,118,137,68,73	2	0135	-- bracketright
+]	260,741,118,137,68,73	2	93	bracketright
 rB	"
-a^	480,749,0,93,-133,73	2	0136	-- circumflex
+a^	480,749,0,93,-133,73	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	320,698,0,63,-105,63	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	320,698,0,63,-105,63	2	96	quoteleft
 oq	"
-a	680,515,8,105,-34,73	0	0141	-- a
-b	600,732,8,83,-7,73	2	0142	-- b
-c	560,515,8,87,-8,73	0	0143	-- c
-d	680,732,8,84,-10,73	2	0144	-- d
-e	560,515,8,86,-9,73	0	0145	-- e
-f	420,741,213,271,242,73	3	0146	-- f
-g	620,515,213,99,29,73	1	0147	-- g
-h	700,732,8,86,-43,73	2	0150	-- h
-i	380,755,8,90,-33,73	2	0151	-- i
-j	320,755,213,122,210,73	3	0152	-- j
-k	700,732,8,82,-47,73	2	0153	-- k
-l	380,732,8,80,-59,73	2	0154	-- l
-m	960,515,8,86,-33,73	0	0155	-- m
-n	680,515,8,85,-33,73	0	0156	-- n
-o	600,515,8,77,-9,73	0	0157	-- o
-p	660,515,213,72,74,72	1	0160	-- p
-q	620,515,213,70,-10,70	1	0161	-- q
-r	500,515,0,132,-34,73	0	0162	-- r
-s	540,515,8,83,18,73	0	0163	-- s
-t	440,658,8,98,-56,73	2	0164	-- t
-u	680,507,8,90,-33,73	0	0165	-- u
-v	540,515,8,82,-6,73	0	0166	-- v
-w	860,515,8,81,-6,73	0	0167	-- w
-x	620,515,8,84,40,73	0	0170	-- x
-y	600,507,213,92,25,73	1	0171	-- y
-z	560,515,8,76,14,73	0	0172	-- z
-lC	300,742,123,163,1,73	2	0173	-- braceleft
+a	680,515,8,105,-34,73	0	97	a
+b	600,732,8,83,-7,73	2	98	b
+c	560,515,8,87,-8,73	0	99	c
+d	680,732,8,84,-10,73	2	100	d
+e	560,515,8,86,-9,73	0	101	e
+f	420,741,213,271,242,73	3	102	f
+g	620,515,213,99,29,73	1	103	g
+h	700,732,8,86,-43,73	2	104	h
+i	380,755,8,90,-33,73	2	105	i
+j	320,755,213,122,210,73	3	106	j
+k	700,732,8,82,-47,73	2	107	k
+l	380,732,8,80,-59,73	2	108	l
+m	960,515,8,86,-33,73	0	109	m
+n	680,515,8,85,-33,73	0	110	n
+o	600,515,8,77,-9,73	0	111	o
+p	660,515,213,72,74,72	1	112	p
+q	620,515,213,70,-10,70	1	113	q
+r	500,515,0,132,-34,73	0	114	r
+s	540,515,8,83,18,73	0	115	s
+t	440,658,8,98,-56,73	2	116	t
+u	680,507,8,90,-33,73	0	117	u
+v	540,515,8,82,-6,73	0	118	v
+w	860,515,8,81,-6,73	0	119	w
+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	0174	-- bar
+ba	620,750,250,0,-253	3	124	bar
 |	"
-rC	300,751,114,106,58,73	2	0175	-- braceright
+rC	300,751,114,106,58,73	2	125	braceright
 }	"
-a~	480,709,0,103,-128,73	2	0176	-- tilde
+a~	480,709,0,103,-128,73	2	126	tilde
 ~	"
-bq	300,166,112,34,-56,34	0	0200	-- quotesinglbase
-Fo	380,503,0,76,-12,73	0	0201	-- guillemotleft
-Fc	380,503,0,76,-12,73	0	0202	-- guillemotright
-bu	360,511,0,94,-10,73	0	0203	-- bullet
-Fn	680,741,199,113,78,73	2	0204	-- florin
-f/	120,681,0,312,194,73	2	0205	-- fraction
-%0	1360,698,17,23,-56,23	2	0206	-- perthousand
-dg	420,698,137,96,-39,73	2	0207	-- dagger
-dd	420,698,137,116,-29,73	2	0210	-- daggerdbl
-en	500,311,0,123,10,73	0	0211	-- endash
-em	1000,311,0,123,10,73	0	0212	-- emdash
-fi	820,741,213,80,241,73	3	0214	-- fi
-fl	820,741,213,80,241,73	3	0215	-- fl
-.i	380,507,8,90,-33,73	0	0220	-- dotlessi
-ga	380,771,0,94,-143,73	2	0222	-- grave
-a"	560,775,0,106,-131,73	2	0223	-- hungarumlaut
-a.	380,734,0,15,-130,15	2	0224	-- dotaccent
-ab	460,707,0,106,-127,73	2	0225	-- breve
-ah	480,749,0,93,-133,73	2	0226	-- caron
-ao	360,775,0,96,-135,73	2	0227	-- ring
-ho	320,0,182,0,-18	0	0230	-- ogonek
-lq	520,698,0,75,-106,73	2	0231	-- quotedblleft
-rq	520,698,0,90,-121,73	2	0232	-- quotedblright
-oe	920,515,8,91,2,73	0	0233	-- oe
-/l	380,732,8,82,-13,73	2	0234	-- lslash
-Bq	520,166,112,25,-56,25	0	0235	-- quotedblbase
-OE	1180,698,17,115,-44,73	2	0236	-- OE
-/L	640,681,0,134,36,73	2	0237	-- Lslash
-r!	320,515,191,74,-14,73	0	0241	-- exclamdown
-ct	680,718,0,0,-111	2	0242	-- cent
-Po	680,698,17,157,50,73	2	0243	-- sterling
-Cs	680,571,0,7,-98,7	0	0244	-- currency
-Ye	680,681,0,152,-42,73	2	0245	-- yen
-bb	620,675,175,0,-253	2	0246	-- brokenbar
-sc	620,698,137,68,4,68	2	0247	-- section
-ad	520,734,0,99,-130,73	2	0250	-- dieresis
-co	780,698,17,53,-33,53	2	0251	-- copyright
-Of	440,685,0,105,-68,73	2	0252	-- ordfeminine
-fo	220,503,0,79,-12,73	0	0253	-- guilsinglleft
-no	620,421,0,15,-31,15	0	0254	-- logicalnot
-\-	600,323,0,45,-41,45	0	0255	-- minus
-rg	780,698,17,53,-33,53	2	0256	-- registered
-a-	480,691,0,101,-127,73	2	0257	-- macron
-de	400,698,0,80,-80,73	2	0260	-- degree
-t+-	600,514,0,45,-41,45	0	0261	-- plusminus
-S2	408,698,0,127,-41,73	2	0262	-- twosuperior
-S3	408,698,0,125,-36,73	2	0263	-- threesuperior
-aa	340,771,0,117,-126,73	2	0264	-- acute
-mc	680,507,213,90,-4,73	1	0265	-- mu
-ps	680,681,0,85,-87,73	2	0266	-- paragraph
-pc	340,358,0,26,-76,26	0	0267	-- periodcentered
-ac	360,0,220,0,-18	1	0270	-- cedilla
-S1	408,688,0,48,-68,48	2	0271	-- onesuperior
-Om	440,685,0,65,-77,65	2	0272	-- ordmasculine
-fc	220,503,0,79,-12,73	0	0273	-- guilsinglright
-14	1020,681,0,84,-68,73	2	0274	-- onequarter
-12	1020,681,0,66,-68,66	2	0275	-- onehalf
-34	1020,691,0,84,-36,73	2	0276	-- threequarters
-r?	620,515,189,36,-33,36	0	0277	-- questiondown
-`A	720,937,0,99,77,73	2	0300	-- Agrave
-'A	720,937,0,99,77,73	2	0301	-- Aacute
-^A	720,915,0,99,77,73	2	0302	-- Acircumflex
-~A	720,875,0,99,77,73	2	0303	-- Atilde
-:A	720,900,0,99,77,73	2	0304	-- Adieresis
-oA	720,941,0,99,77,73	2	0305	-- Aring
-AE	1140,681,0,117,77,73	2	0306	-- AE
-,C	700,698,220,104,-28,73	3	0307	-- Ccedilla
-`E	720,937,0,107,36,73	2	0310	-- Egrave
-'E	720,937,0,107,36,73	2	0311	-- Eacute
-^E	720,915,0,107,36,73	2	0312	-- Ecircumflex
-:E	720,900,0,107,36,73	2	0313	-- Edieresis
-`I	380,937,0,155,36,73	2	0314	-- Igrave
-'I	380,937,0,155,36,73	2	0315	-- Iacute
-^I	380,915,0,163,36,73	2	0316	-- Icircumflex
-:I	380,900,0,169,36,73	2	0317	-- Idieresis
--D	760,681,0,95,36,73	2	0320	-- Eth
-~N	740,875,0,155,36,73	2	0321	-- Ntilde
-`O	760,937,17,96,-28,73	2	0322	-- Ograve
-'O	760,937,17,96,-28,73	2	0323	-- Oacute
-^O	760,915,17,96,-28,73	2	0324	-- Ocircumflex
-~O	760,875,17,96,-28,73	2	0325	-- Otilde
-:O	760,900,17,96,-28,73	2	0326	-- Odieresis
-tmu	600,514,0,45,-41,45	0	0327	-- multiply
-/O	760,725,29,137,29,73	2	0330	-- Oslash
-`U	740,937,17,165,-62,73	2	0331	-- Ugrave
-'U	740,937,17,165,-62,73	2	0332	-- Uacute
-^U	740,915,17,165,-62,73	2	0333	-- Ucircumflex
-:U	740,900,17,165,-62,73	2	0334	-- Udieresis
-'Y	660,937,0,207,-22,73	2	0335	-- Yacute
-TP	640,681,0,111,56,73	2	0336	-- Thorn
-ss	660,741,213,92,281,73	3	0337	-- germandbls
-`a	680,771,8,105,-34,73	2	0340	-- agrave
-'a	680,771,8,105,-34,73	2	0341	-- aacute
-^a	680,749,8,105,-34,73	2	0342	-- acircumflex
-~a	680,709,8,105,-34,73	2	0343	-- atilde
-:a	680,734,8,105,-34,73	2	0344	-- adieresis
-oa	680,775,8,105,-34,73	2	0345	-- aring
-ae	880,515,8,83,11,73	0	0346	-- ae
-,c	560,515,220,87,-8,73	1	0347	-- ccedilla
-`e	560,771,8,86,-9,73	2	0350	-- egrave
-'e	560,771,8,86,-9,73	2	0351	-- eacute
-^e	560,749,8,86,-9,73	2	0352	-- ecircumflex
-:e	560,734,8,86,-9,73	2	0353	-- edieresis
-`i	380,771,8,94,-33,73	2	0354	-- igrave
-'i	380,771,8,90,-33,73	2	0355	-- iacute
-^i	380,749,8,103,-33,73	2	0356	-- icircumflex
-:i	380,734,8,149,-33,73	2	0357	-- idieresis
-Sd	600,741,8,112,-9,73	2	0360	-- eth
-~n	680,709,8,85,-33,73	2	0361	-- ntilde
-`o	600,771,8,77,-9,73	2	0362	-- ograve
-'o	600,771,8,77,-9,73	2	0363	-- oacute
-^o	600,749,8,77,-9,73	2	0364	-- ocircumflex
-~o	600,709,8,77,-9,73	2	0365	-- otilde
-:o	600,734,8,77,-9,73	2	0366	-- odieresis
-tdi	600,521,0,45,-41,45	0	0367	-- divide
-/o	600,571,54,111,33,73	0	0370	-- oslash
-`u	680,771,8,90,-33,73	2	0371	-- ugrave
-'u	680,771,8,90,-33,73	2	0372	-- uacute
-^u	680,749,8,90,-33,73	2	0373	-- ucircumflex
-:u	680,734,8,90,-33,73	2	0374	-- udieresis
-'y	600,771,213,92,25,73	3	0375	-- yacute
-Tp	660,732,213,72,74,72	3	0376	-- thorn
-:y	600,734,213,92,25,73	3	0377	-- ydieresis
+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
+bu	360,511,0,94,-10,73	0	131	bullet
+Fn	680,741,199,113,78,73	2	132	florin
+f/	120,681,0,312,194,73	2	133	fraction
+%0	1360,698,17,23,-56,23	2	134	perthousand
+dg	420,698,137,96,-39,73	2	135	dagger
+dd	420,698,137,116,-29,73	2	136	daggerdbl
+en	500,311,0,123,10,73	0	137	endash
+em	1000,311,0,123,10,73	0	138	emdash
+fi	820,741,213,80,241,73	3	140	fi
+fl	820,741,213,80,241,73	3	141	fl
+.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
+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
+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
+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
+r!	320,515,191,74,-14,73	0	161	exclamdown
+ct	680,718,0,0,-111	2	162	cent
+Po	680,698,17,157,50,73	2	163	sterling
+Cs	680,571,0,7,-98,7	0	164	currency
+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
+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
+tno	620,421,0,15,-31,15	0	172	logicalnot
+\-	600,323,0,45,-41,45	0	173	minus
+rg	780,698,17,53,-33,53	2	174	registered
+a-	480,691,0,101,-127,73	2	175	macron
+de	400,698,0,80,-80,73	2	176	degree
+t+-	600,514,0,45,-41,45	0	177	plusminus
+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
+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
+S1	408,688,0,48,-68,48	2	185	onesuperior
+Om	440,685,0,65,-77,65	2	186	ordmasculine
+fc	220,503,0,79,-12,73	0	187	guilsinglright
+14	1020,681,0,84,-68,73	2	188	onequarter
+12	1020,681,0,66,-68,66	2	189	onehalf
+34	1020,691,0,84,-36,73	2	190	threequarters
+r?	620,515,189,36,-33,36	0	191	questiondown
+`A	720,937,0,99,77,73	2	192	Agrave
+'A	720,937,0,99,77,73	2	193	Aacute
+^A	720,915,0,99,77,73	2	194	Acircumflex
+~A	720,875,0,99,77,73	2	195	Atilde
+:A	720,900,0,99,77,73	2	196	Adieresis
+oA	720,941,0,99,77,73	2	197	Aring
+AE	1140,681,0,117,77,73	2	198	AE
+,C	700,698,220,104,-28,73	3	199	Ccedilla
+`E	720,937,0,107,36,73	2	200	Egrave
+'E	720,937,0,107,36,73	2	201	Eacute
+^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,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
+~N	740,875,0,155,36,73	2	209	Ntilde
+`O	760,937,17,96,-28,73	2	210	Ograve
+'O	760,937,17,96,-28,73	2	211	Oacute
+^O	760,915,17,96,-28,73	2	212	Ocircumflex
+~O	760,875,17,96,-28,73	2	213	Otilde
+:O	760,900,17,96,-28,73	2	214	Odieresis
+tmu	600,514,0,45,-41,45	0	215	multiply
+/O	760,725,29,137,29,73	2	216	Oslash
+`U	740,937,17,165,-62,73	2	217	Ugrave
+'U	740,937,17,165,-62,73	2	218	Uacute
+^U	740,915,17,165,-62,73	2	219	Ucircumflex
+:U	740,900,17,165,-62,73	2	220	Udieresis
+'Y	660,937,0,207,-22,73	2	221	Yacute
+TP	640,681,0,111,56,73	2	222	Thorn
+ss	660,741,213,92,281,73	3	223	germandbls
+`a	680,771,8,105,-34,73	2	224	agrave
+'a	680,771,8,105,-34,73	2	225	aacute
+^a	680,749,8,105,-34,73	2	226	acircumflex
+~a	680,709,8,105,-34,73	2	227	atilde
+:a	680,734,8,105,-34,73	2	228	adieresis
+oa	680,775,8,105,-34,73	2	229	aring
+ae	880,515,8,83,11,73	0	230	ae
+,c	560,515,220,87,-8,73	1	231	ccedilla
+`e	560,771,8,86,-9,73	2	232	egrave
+'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	237	iacute
+^i	380,749,8,103,-33,73	2	238	icircumflex
+:i	380,734,8,149,-33,73	2	239	idieresis
+Sd	600,741,8,112,-9,73	2	240	eth
+~n	680,709,8,85,-33,73	2	241	ntilde
+`o	600,771,8,77,-9,73	2	242	ograve
+'o	600,771,8,77,-9,73	2	243	oacute
+^o	600,749,8,77,-9,73	2	244	ocircumflex
+~o	600,709,8,77,-9,73	2	245	otilde
+:o	600,734,8,77,-9,73	2	246	odieresis
+tdi	600,521,0,45,-41,45	0	247	divide
+/o	600,571,54,111,33,73	0	248	oslash
+`u	680,771,8,90,-33,73	2	249	ugrave
+'u	680,771,8,90,-33,73	2	250	uacute
+^u	680,749,8,90,-33,73	2	251	ucircumflex
+:u	680,734,8,90,-33,73	2	252	udieresis
+'y	600,771,213,92,25,73	3	253	yacute
+Tp	660,732,213,72,74,72	3	254	thorn
+:y	600,734,213,92,25,73	3	255	ydieresis
+u2026	1000,177,8,0,-36	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMI b/contrib/groff/font/devps/BMI
index b75e1b4..7ed66f4 100644
--- a/contrib/groff/font/devps/BMI
+++ b/contrib/groff/font/devps/BMI
@@ -96,246 +96,247 @@ r d -9
 r , -143
 r c -8
 charset
-ha	600,681,0,49,-47,49	2	0000	-- asciicircum
-ti	600,386,0,45,-41,45	0	0001	-- asciitilde
-vS	640,861,17,78,-11,70	2	0002	-- Scaron
-vZ	580,861,0,165,42,70	2	0003	-- Zcaron
-vs	540,684,8,57,-15,57	2	0004	-- scaron
-vz	520,684,8,91,12,70	2	0005	-- zcaron
-:Y	660,865,0,199,-37,70	2	0006	-- Ydieresis
-tm	980,681,0,35,-19,35	2	0007	-- trademark
-aq	200,698,0,97,-49,70	2	0010	-- quotesingle
-space	300	0	0040
-!	320,698,8,72,-53,70	2	0041	-- exclam
-"	360,698,0,92,-57,70	2	0042	-- quotedbl
+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
+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
+space	300	0	32	space
+!	320,698,8,72,-53,70	2	33	exclam
+"	360,698,0,92,-57,70	2	34	quotedbl
 dq	"
-#	620,681,0,28,-57,28	2	0043	-- numbersign
+#	620,681,0,28,-57,28	2	35	numbersign
 sh	"
-$	620,762,85,49,-28,49	2	0044	-- dollar
+$	620,762,85,49,-28,49	2	36	dollar
 Do	"
-%	800,691,8,61,-6,61	2	0045	-- percent
-&	820,698,18,78,-15,70	2	0046	-- ampersand
-'	280,698,0,58,-98,58	2	0047	-- quoteright
+%	800,691,8,61,-6,61	2	37	percent
+&	820,698,18,78,-15,70	2	38	ampersand
+'	280,698,0,58,-98,58	2	39	quoteright
 cq	"
-(	280,727,146,153,-46,70	2	0050	-- parenleft
-)	280,727,146,49,58,49	2	0051	-- parenright
-*	440,698,0,115,-89,70	2	0052	-- asterisk
-+	600,548,0,45,-41,45	0	0053	-- plus
-,	300,112,115,0,-38	0	0054	-- comma
--	320,325,0,66,-28,66	0	0055	-- hyphen
+(	280,727,146,153,-46,70	2	40	parenleft
+)	280,727,146,49,58,49	2	41	parenright
+*	440,698,0,115,-89,70	2	42	asterisk
++	600,548,0,45,-41,45	0	43	plus
+,	300,112,115,0,-38	0	44	comma
+-	320,325,0,66,-28,66	0	45	hyphen
 hy	"
-.	300,127,8,0,-46	0	0056	-- period
-/	600,717,149,12,-54,12	2	0057	-- slash
+.	300,127,8,0,-46	0	46	period
+/	600,717,149,12,-54,12	2	47	slash
 sl	"
-0	620,698,17,76,-36,70	2	0060	-- zero
-1	620,681,0,0,-104	2	0061	-- one
-2	620,698,0,66,-16,66	2	0062	-- two
-3	620,698,17,52,-5,52	2	0063	-- three
-4	620,681,0,64,-19,64	2	0064	-- four
-5	620,681,17,44,-20,44	2	0065	-- five
-6	620,698,17,87,-39,70	2	0066	-- six
-7	620,681,0,102,-93,70	2	0067	-- seven
-8	620,698,17,85,-11,70	2	0070	-- eight
-9	620,698,17,79,-27,70	2	0071	-- nine
-:	300,494,8,42,-46,42	0	0072	-- colon
-;	300,494,114,42,-38,42	0	0073	-- semicolon
-<	600,561,0,38,-29,38	0	0074	-- less
-=	600,433,0,45,-41,45	0	0075	-- equal
->	600,561,0,52,-43,52	0	0076	-- greater
-?	540,698,8,114,-64,70	2	0077	-- question
-@	780,698,17,72,-52,70	2	0100	-- at
+0	620,698,17,76,-36,70	2	48	zero
+1	620,681,0,0,-104	2	49	one
+2	620,698,0,66,-16,66	2	50	two
+3	620,698,17,52,-5,52	2	51	three
+4	620,681,0,64,-19,64	2	52	four
+5	620,681,17,44,-20,44	2	53	five
+6	620,698,17,87,-39,70	2	54	six
+7	620,681,0,102,-93,70	2	55	seven
+8	620,698,17,85,-11,70	2	56	eight
+9	620,698,17,79,-27,70	2	57	nine
+:	300,494,8,42,-46,42	0	58	colon
+;	300,494,114,42,-38,42	0	59	semicolon
+<	600,561,0,38,-29,38	0	60	less
+=	600,433,0,45,-41,45	0	61	equal
+>	600,561,0,52,-43,52	0	62	greater
+?	540,698,8,114,-64,70	2	63	question
+@	780,698,17,72,-52,70	2	64	at
 at	"
-A	700,681,0,70,75,70	2	0101	-- A
-B	720,681,0,76,29,70	2	0102	-- B
-C	720,698,17,76,-38,70	2	0103	-- C
-D	740,681,0,92,29,70	2	0104	-- D
-E	680,681,0,106,29,70	2	0105	-- E
-F	620,681,0,173,29,70	2	0106	-- F
-G	760,698,17,103,-38,70	2	0107	-- G
-H	800,681,0,138,29,70	2	0110	-- H
-I	320,681,0,142,29,70	2	0111	-- I
-J	560,681,17,156,52,70	2	0112	-- J
-K	720,681,0,134,29,70	2	0113	-- K
-L	580,681,0,126,29,70	2	0114	-- L
-M	860,681,0,146,32,70	2	0115	-- M
-N	720,681,0,153,32,70	2	0116	-- N
-O	760,698,17,89,-38,70	2	0117	-- O
-P	600,681,0,131,29,70	2	0120	-- P
-Q	780,698,191,82,-11,70	2	0121	-- Q
-R	700,681,0,86,29,70	2	0122	-- R
-S	640,698,17,78,-11,70	2	0123	-- S
-T	600,681,0,175,0,70	2	0124	-- T
-U	720,681,17,172,-68,70	2	0125	-- U
-V	680,681,0,185,-37,70	2	0126	-- V
-W	960,681,0,185,-37,70	2	0127	-- W
-X	700,681,0,165,75,70	2	0130	-- X
-Y	660,681,0,199,-37,70	2	0131	-- Y
-Z	580,681,0,165,42,70	2	0132	-- Z
-[	260,717,136,141,-6,70	2	0133	-- bracketleft
+A	700,681,0,70,75,70	2	65	A
+B	720,681,0,76,29,70	2	66	B
+C	720,698,17,76,-38,70	2	67	C
+D	740,681,0,92,29,70	2	68	D
+E	680,681,0,106,29,70	2	69	E
+F	620,681,0,173,29,70	2	70	F
+G	760,698,17,103,-38,70	2	71	G
+H	800,681,0,138,29,70	2	72	H
+I	320,681,0,142,29,70	2	73	I
+J	560,681,17,156,52,70	2	74	J
+K	720,681,0,134,29,70	2	75	K
+L	580,681,0,126,29,70	2	76	L
+M	860,681,0,146,32,70	2	77	M
+N	720,681,0,153,32,70	2	78	N
+O	760,698,17,89,-38,70	2	79	O
+P	600,681,0,131,29,70	2	80	P
+Q	780,698,191,82,-11,70	2	81	Q
+R	700,681,0,86,29,70	2	82	R
+S	640,698,17,78,-11,70	2	83	S
+T	600,681,0,175,0,70	2	84	T
+U	720,681,17,172,-68,70	2	85	U
+V	680,681,0,185,-37,70	2	86	V
+W	960,681,0,185,-37,70	2	87	W
+X	700,681,0,165,75,70	2	88	X
+Y	660,681,0,199,-37,70	2	89	Y
+Z	580,681,0,165,42,70	2	90	Z
+[	260,717,136,141,-6,70	2	91	bracketleft
 lB	"
-\	600,717,0,0,-34	2	0134	-- backslash
+\	600,717,0,0,-34	2	92	backslash
 rs	"
-]	260,717,136,99,35,70	2	0135	-- bracketright
+]	260,717,136,99,35,70	2	93	bracketright
 rB	"
-a^	440,685,0,89,-126,70	2	0136	-- circumflex
+a^	440,685,0,89,-126,70	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	280,698,0,100,-141,70	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	280,698,0,100,-141,70	2	96	quoteleft
 oq	"
-a	620,494,8,116,-21,70	0	0141	-- a
-b	600,717,8,71,-38,70	2	0142	-- b
-c	480,494,8,92,-15,70	0	0143	-- c
-d	640,717,8,105,-15,70	2	0144	-- d
-e	540,494,8,85,-15,70	0	0145	-- e
-f	340,725,218,267,210,70	3	0146	-- f
-g	560,494,221,71,46,70	1	0147	-- g
-h	620,717,8,119,-38,70	2	0150	-- h
-i	280,663,8,121,-38,70	2	0151	-- i
-j	280,663,221,78,250,70	3	0152	-- j
-k	600,717,8,107,-38,70	2	0153	-- k
-l	280,717,8,112,-50,70	2	0154	-- l
-m	880,494,8,122,-38,70	0	0155	-- m
-n	620,494,8,103,-38,70	0	0156	-- n
-o	540,494,8,82,-15,70	0	0157	-- o
-p	600,494,212,70,74,70	1	0160	-- p
-q	560,494,212,74,-15,70	1	0161	-- q
-r	400,494,0,131,-38,70	0	0162	-- r
-s	540,494,8,57,-15,57	0	0163	-- s
-t	340,664,8,121,-38,70	2	0164	-- t
-u	620,484,8,116,-38,70	0	0165	-- u
-v	540,494,8,72,-38,70	0	0166	-- v
-w	880,494,8,63,-38,63	0	0167	-- w
-x	540,494,8,136,41,70	0	0170	-- x
-y	600,484,221,59,-10,59	1	0171	-- y
-z	520,494,8,91,12,70	0	0172	-- z
-lC	360,717,191,132,-72,70	2	0173	-- braceleft
+a	620,494,8,116,-21,70	0	97	a
+b	600,717,8,71,-38,70	2	98	b
+c	480,494,8,92,-15,70	0	99	c
+d	640,717,8,105,-15,70	2	100	d
+e	540,494,8,85,-15,70	0	101	e
+f	340,725,218,267,210,70	3	102	f
+g	560,494,221,71,46,70	1	103	g
+h	620,717,8,119,-38,70	2	104	h
+i	280,663,8,121,-38,70	2	105	i
+j	280,663,221,78,250,70	3	106	j
+k	600,717,8,107,-38,70	2	107	k
+l	280,717,8,112,-50,70	2	108	l
+m	880,494,8,122,-38,70	0	109	m
+n	620,494,8,103,-38,70	0	110	n
+o	540,494,8,82,-15,70	0	111	o
+p	600,494,212,70,74,70	1	112	p
+q	560,494,212,74,-15,70	1	113	q
+r	400,494,0,131,-38,70	0	114	r
+s	540,494,8,57,-15,57	0	115	s
+t	340,664,8,121,-38,70	2	116	t
+u	620,484,8,116,-38,70	0	117	u
+v	540,494,8,72,-38,70	0	118	v
+w	880,494,8,63,-38,63	0	119	w
+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	0174	-- bar
+ba	600,750,250,0,-244	3	124	bar
 |	"
-rC	380,717,191,3,37,3	2	0175	-- braceright
+rC	380,717,191,3,37,3	2	125	braceright
 }	"
-a~	440,671,0,98,-130,70	2	0176	-- tilde
+a~	440,671,0,98,-130,70	2	126	tilde
 ~	"
-bq	320,113,114,0,-37	0	0200	-- quotesinglbase
-Fo	300,434,0,63,-20,63	0	0201	-- guillemotleft
-Fc	300,434,0,53,-10,53	0	0202	-- guillemotright
-bu	460,511,0,34,-50,34	0	0203	-- bullet
-Fn	620,725,218,122,76,70	3	0204	-- florin
-f/	20,681,0,353,278,70	2	0205	-- fraction
-%0	1180,691,8,69,-6,69	2	0206	-- perthousand
-dg	620,698,130,0,-142	2	0207	-- dagger
-dd	620,698,122,0,-94	2	0210	-- daggerdbl
-en	500,325,0,111,17,70	0	0211	-- endash
-em	1000,325,0,111,17,70	0	0212	-- emdash
-fi	640,725,222,119,209,70	3	0214	-- fi
-fl	660,725,218,103,209,70	3	0215	-- fl
-.i	280,484,8,121,-38,70	0	0220	-- dotlessi
-ga	340,706,0,87,-132,70	2	0222	-- grave
-a"	340,738,0,112,-117,70	2	0223	-- hungarumlaut
-a.	260,664,0,80,-119,70	2	0224	-- dotaccent
-ab	440,680,0,110,-141,70	2	0225	-- breve
-ah	440,684,0,91,-128,70	2	0226	-- caron
-ao	300,706,0,84,-128,70	2	0227	-- ring
-ho	260,0,173,0,-1	0	0230	-- ogonek
-lq	440,698,0,103,-141,70	2	0231	-- quotedblleft
-rq	440,698,0,61,-98,61	2	0232	-- quotedblright
-oe	900,494,8,98,-15,70	0	0233	-- oe
-/l	340,717,8,108,0,70	2	0234	-- lslash
-Bq	480,113,114,0,-37	0	0235	-- quotedblbase
-OE	1180,698,17,107,-38,70	2	0236	-- OE
-/L	580,681,0,126,29,70	2	0237	-- Lslash
-r!	320,494,213,31,-23,31	1	0241	-- exclamdown
-ct	620,715,29,26,-98,26	2	0242	-- cent
-Po	620,698,17,132,46,70	2	0243	-- sterling
-Cs	620,591,0,35,-50,35	0	0244	-- currency
-Ye	620,681,0,165,-21,70	2	0245	-- yen
-bb	600,675,175,0,-244	2	0246	-- brokenbar
-sc	620,698,178,68,12,68	2	0247	-- section
-ad	420,688,0,97,-135,70	2	0250	-- dieresis
-co	740,698,17,94,-34,70	2	0251	-- copyright
-Of	440,698,0,123,-80,70	2	0252	-- ordfeminine
-fo	180,434,0,78,-25,70	0	0253	-- guilsinglleft
-no	600,433,0,45,-41,45	0	0254	-- logicalnot
-\-	600,335,0,45,-41,45	0	0255	-- minus
-rg	740,698,17,94,-34,70	2	0256	-- registered
-a-	440,658,0,94,-128,70	0	0257	-- macron
-de	400,698,0,70,-70,70	2	0260	-- degree
-t+-	600,548,0,45,-41,45	0	0261	-- plusminus
-S2	372,698,0,117,-18,70	2	0262	-- twosuperior
-S3	372,698,0,117,-20,70	2	0263	-- threesuperior
-aa	320,706,0,103,-128,70	2	0264	-- acute
-mc	620,484,221,116,-3,70	1	0265	-- mu
-ps	620,681,0,148,-62,70	2	0266	-- paragraph
-pc	300,364,0,22,-87,22	0	0267	-- periodcentered
-ac	320,0,178,0,5	0	0270	-- cedilla
-S1	372,688,0,17,-64,17	2	0271	-- onesuperior
-Om	400,698,0,105,-89,70	2	0272	-- ordmasculine
-fc	180,434,0,73,-20,70	0	0273	-- guilsinglright
-14	930,681,0,33,-41,33	2	0274	-- onequarter
-12	930,681,0,45,-41,45	2	0275	-- onehalf
-34	930,691,0,33,-49,33	2	0276	-- threequarters
-r?	540,494,212,18,32,18	1	0277	-- questiondown
-`A	700,883,0,70,75,70	2	0300	-- Agrave
-'A	700,883,0,70,75,70	2	0301	-- Aacute
-^A	700,862,0,70,75,70	2	0302	-- Acircumflex
-~A	700,848,0,70,75,70	2	0303	-- Atilde
-:A	700,865,0,70,75,70	2	0304	-- Adieresis
-oA	700,883,0,70,75,70	2	0305	-- Aring
-AE	1220,681,0,99,95,70	2	0306	-- AE
-,C	720,698,178,76,-38,70	2	0307	-- Ccedilla
-`E	680,883,0,106,29,70	2	0310	-- Egrave
-'E	680,883,0,106,29,70	2	0311	-- Eacute
-^E	680,862,0,106,29,70	2	0312	-- Ecircumflex
-:E	680,865,0,106,29,70	2	0313	-- Edieresis
-`I	320,883,0,142,29,70	2	0314	-- Igrave
-'I	320,883,0,142,29,70	2	0315	-- Iacute
-^I	320,862,0,179,29,70	2	0316	-- Icircumflex
-:I	320,865,0,177,29,70	2	0317	-- Idieresis
--D	740,681,0,92,29,70	2	0320	-- Eth
-~N	720,848,0,153,32,70	2	0321	-- Ntilde
-`O	760,883,17,89,-38,70	2	0322	-- Ograve
-'O	760,883,17,89,-38,70	2	0323	-- Oacute
-^O	760,862,17,89,-38,70	2	0324	-- Ocircumflex
-~O	760,848,17,89,-38,70	2	0325	-- Otilde
-:O	760,865,17,89,-38,70	2	0326	-- Odieresis
-tmu	600,548,0,45,-41,45	0	0327	-- multiply
-/O	760,777,95,89,-38,70	2	0330	-- Oslash
-`U	720,883,17,172,-68,70	2	0331	-- Ugrave
-'U	720,883,17,172,-68,70	2	0332	-- Uacute
-^U	720,862,17,172,-68,70	2	0333	-- Ucircumflex
-:U	720,865,17,172,-68,70	2	0334	-- Udieresis
-'Y	660,883,0,199,-37,70	2	0335	-- Yacute
-TP	600,681,0,106,29,70	2	0336	-- Thorn
-ss	620,698,111,83,171,70	2	0337	-- germandbls
-`a	620,706,8,116,-21,70	2	0340	-- agrave
-'a	620,706,8,116,-21,70	2	0341	-- aacute
-^a	620,685,8,116,-21,70	2	0342	-- acircumflex
-~a	620,671,8,116,-21,70	2	0343	-- atilde
-:a	620,688,8,116,-21,70	2	0344	-- adieresis
-oa	620,706,8,116,-21,70	2	0345	-- aring
-ae	880,494,8,88,-21,70	0	0346	-- ae
-,c	480,494,178,92,-15,70	0	0347	-- ccedilla
-`e	540,706,8,85,-15,70	2	0350	-- egrave
-'e	540,706,8,85,-15,70	2	0351	-- eacute
-^e	540,685,8,85,-15,70	2	0352	-- ecircumflex
-:e	540,688,8,85,-15,70	2	0353	-- edieresis
-`i	280,706,8,121,-38,70	2	0354	-- igrave
-'i	280,706,8,121,-38,70	2	0355	-- iacute
-^i	280,685,8,149,-26,70	2	0356	-- icircumflex
-:i	280,688,8,147,-38,70	2	0357	-- idieresis
-Sd	540,725,8,152,-15,70	2	0360	-- eth
-~n	620,671,8,103,-38,70	2	0361	-- ntilde
-`o	540,706,8,82,-15,70	2	0362	-- ograve
-'o	540,706,8,82,-15,70	2	0363	-- oacute
-^o	540,685,8,82,-15,70	2	0364	-- ocircumflex
-~o	540,671,8,82,-15,70	2	0365	-- otilde
-:o	540,688,8,82,-15,70	2	0366	-- odieresis
-tdi	600,548,0,45,-41,45	0	0367	-- divide
-/o	540,532,49,81,-15,70	0	0370	-- oslash
-`u	620,706,8,116,-38,70	2	0371	-- ugrave
-'u	620,706,8,116,-38,70	2	0372	-- uacute
-^u	620,685,8,116,-38,70	2	0373	-- ucircumflex
-:u	620,688,8,116,-38,70	2	0374	-- udieresis
-'y	600,706,221,59,-10,59	3	0375	-- yacute
-Tp	600,717,212,70,74,70	3	0376	-- thorn
-:y	600,688,221,59,-10,59	3	0377	-- ydieresis
+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
+bu	460,511,0,34,-50,34	0	131	bullet
+Fn	620,725,218,122,76,70	3	132	florin
+f/	20,681,0,353,278,70	2	133	fraction
+%0	1180,691,8,69,-6,69	2	134	perthousand
+dg	620,698,130,0,-142	2	135	dagger
+dd	620,698,122,0,-94	2	136	daggerdbl
+en	500,325,0,111,17,70	0	137	endash
+em	1000,325,0,111,17,70	0	138	emdash
+fi	640,725,222,119,209,70	3	140	fi
+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
+ab	440,680,0,110,-141,70	2	149	breve
+ah	440,684,0,91,-128,70	2	150	caron
+ao	300,706,0,84,-128,70	2	151	ring
+ho	260,0,173,0,-1	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
+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
+r!	320,494,213,31,-23,31	1	161	exclamdown
+ct	620,715,29,26,-98,26	2	162	cent
+Po	620,698,17,132,46,70	2	163	sterling
+Cs	620,591,0,35,-50,35	0	164	currency
+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
+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
+tno	600,433,0,45,-41,45	0	172	logicalnot
+\-	600,335,0,45,-41,45	0	173	minus
+rg	740,698,17,94,-34,70	2	174	registered
+a-	440,658,0,94,-128,70	0	175	macron
+de	400,698,0,70,-70,70	2	176	degree
+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
+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
+S1	372,688,0,17,-64,17	2	185	onesuperior
+Om	400,698,0,105,-89,70	2	186	ordmasculine
+fc	180,434,0,73,-20,70	0	187	guilsinglright
+14	930,681,0,33,-41,33	2	188	onequarter
+12	930,681,0,45,-41,45	2	189	onehalf
+34	930,691,0,33,-49,33	2	190	threequarters
+r?	540,494,212,18,32,18	1	191	questiondown
+`A	700,883,0,70,75,70	2	192	Agrave
+'A	700,883,0,70,75,70	2	193	Aacute
+^A	700,862,0,70,75,70	2	194	Acircumflex
+~A	700,848,0,70,75,70	2	195	Atilde
+:A	700,865,0,70,75,70	2	196	Adieresis
+oA	700,883,0,70,75,70	2	197	Aring
+AE	1220,681,0,99,95,70	2	198	AE
+,C	720,698,178,76,-38,70	2	199	Ccedilla
+`E	680,883,0,106,29,70	2	200	Egrave
+'E	680,883,0,106,29,70	2	201	Eacute
+^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,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
+~N	720,848,0,153,32,70	2	209	Ntilde
+`O	760,883,17,89,-38,70	2	210	Ograve
+'O	760,883,17,89,-38,70	2	211	Oacute
+^O	760,862,17,89,-38,70	2	212	Ocircumflex
+~O	760,848,17,89,-38,70	2	213	Otilde
+:O	760,865,17,89,-38,70	2	214	Odieresis
+tmu	600,548,0,45,-41,45	0	215	multiply
+/O	760,777,95,89,-38,70	2	216	Oslash
+`U	720,883,17,172,-68,70	2	217	Ugrave
+'U	720,883,17,172,-68,70	2	218	Uacute
+^U	720,862,17,172,-68,70	2	219	Ucircumflex
+:U	720,865,17,172,-68,70	2	220	Udieresis
+'Y	660,883,0,199,-37,70	2	221	Yacute
+TP	600,681,0,106,29,70	2	222	Thorn
+ss	620,698,111,83,171,70	2	223	germandbls
+`a	620,706,8,116,-21,70	2	224	agrave
+'a	620,706,8,116,-21,70	2	225	aacute
+^a	620,685,8,116,-21,70	2	226	acircumflex
+~a	620,671,8,116,-21,70	2	227	atilde
+:a	620,688,8,116,-21,70	2	228	adieresis
+oa	620,706,8,116,-21,70	2	229	aring
+ae	880,494,8,88,-21,70	0	230	ae
+,c	480,494,178,92,-15,70	0	231	ccedilla
+`e	540,706,8,85,-15,70	2	232	egrave
+'e	540,706,8,85,-15,70	2	233	eacute
+^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,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
+~n	620,671,8,103,-38,70	2	241	ntilde
+`o	540,706,8,82,-15,70	2	242	ograve
+'o	540,706,8,82,-15,70	2	243	oacute
+^o	540,685,8,82,-15,70	2	244	ocircumflex
+~o	540,671,8,82,-15,70	2	245	otilde
+:o	540,688,8,82,-15,70	2	246	odieresis
+tdi	600,548,0,45,-41,45	0	247	divide
+/o	540,532,49,81,-15,70	0	248	oslash
+`u	620,706,8,116,-38,70	2	249	ugrave
+'u	620,706,8,116,-38,70	2	250	uacute
+^u	620,685,8,116,-38,70	2	251	ucircumflex
+:u	620,688,8,116,-38,70	2	252	udieresis
+'y	600,706,221,59,-10,59	3	253	yacute
+Tp	600,717,212,70,74,70	3	254	thorn
+:y	600,688,221,59,-10,59	3	255	ydieresis
+u2026	1000,127,8,0,-49	0	256	ellipsis
diff --git a/contrib/groff/font/devps/BMR b/contrib/groff/font/devps/BMR
index 1ce51e0..bef802a 100644
--- a/contrib/groff/font/devps/BMR
+++ b/contrib/groff/font/devps/BMR
@@ -92,246 +92,247 @@ r d 7
 r , -58
 r c 7
 charset
-ha	600,681,0,0,-52	2	0000	-- asciicircum
-ti	600,352,0,0,-52	0	0001	-- asciitilde
-vS	660,849,17,0,-28	2	0002	-- Scaron
-vZ	640,849,0,16,-10	2	0003	-- Zcaron
-vs	520,672,8,0,-40	2	0004	-- scaron
-vz	480,672,0,0,-7	2	0005	-- zcaron
-:Y	640,851,0,26,30	2	0006	-- Ydieresis
-tm	980,681,0,0,-34	2	0007	-- trademark
-aq	220,698,0,0,-67	2	0010	-- quotesingle
-space	320	0	0040
-!	300,698,8,0,-75	2	0041	-- exclam
-"	380,698,0,0,-56	2	0042	-- quotedbl
+ha	600,681	2	0	asciicircum
+ti	600,352	0	1	asciitilde
+vS	660,849,17	2	2	Scaron
+vZ	640,849,0,16	2	3	Zcaron
+vs	520,672,8	2	4	scaron
+vz	480,672	2	5	zcaron
+:Y	640,851,0,26,30	2	6	Ydieresis
+tm	980,681	2	7	trademark
+aq	220,698	2	8	quotesingle
+space	320	0	32	space
+!	300,698,8	2	33	exclam
+"	380,698	2	34	quotedbl
 dq	"
-#	620,681,0,0,-65	2	0043	-- numbersign
+#	620,681	2	35	numbersign
 sh	"
-$	620,791,109,0,-34	2	0044	-- dollar
+$	620,791,109	2	36	dollar
 Do	"
-%	900,698,8,0,-22	2	0045	-- percent
-&	800,698,17,0,-45	2	0046	-- ampersand
-'	220,698,0,0,-46	2	0047	-- quoteright
+%	900,698,8	2	37	percent
+&	800,698,17	2	38	ampersand
+'	220,698	2	39	quoteright
 cq	"
-(	300,727,145,0,-76	2	0050	-- parenleft
-)	300,727,146,0,-17	2	0051	-- parenright
-*	440,698,0,0,-54	2	0052	-- asterisk
-+	600,513,0,0,-51	0	0053	-- plus
-,	320,114,114,0,-90	0	0054	-- comma
--	400,292,0,0,-50	0	0055	-- hyphen
+(	300,727,145	2	40	parenleft
+)	300,727,146	2	41	parenright
+*	440,698	2	42	asterisk
++	600,513	0	43	plus
+,	320,114,114	0	44	comma
+-	400,292	0	45	hyphen
 hy	"
-.	320,123,8,0,-92	0	0056	-- period
-/	600,717,149,0,-74	2	0057	-- slash
+.	320,123,8	0	46	period
+/	600,717,149	2	47	slash
 sl	"
-0	620,698,17,0,-40	2	0060	-- zero
-1	620,681,0,0,-160	2	0061	-- one
-2	620,698,0,0,-42	2	0062	-- two
-3	620,698,17,0,-40	2	0063	-- three
-4	620,681,0,0,-25	2	0064	-- four
-5	620,717,17,0,-60	2	0065	-- five
-6	620,698,17,0,-45	2	0066	-- six
-7	620,681,0,0,-60	2	0067	-- seven
-8	620,698,17,0,-44	2	0070	-- eight
-9	620,698,17,0,-37	2	0071	-- nine
-:	320,494,8,0,-92	0	0072	-- colon
-;	320,494,114,0,-90	0	0073	-- semicolon
-<	600,526,2,0,-49	0	0074	-- less
-=	600,398,0,0,-51	0	0075	-- equal
->	600,526,2,0,-48	0	0076	-- greater
-?	540,698,8,0,-27	2	0077	-- question
-@	820,698,17,0,-55	2	0100	-- at
+0	620,698,17	2	48	zero
+1	620,681	2	49	one
+2	620,698	2	50	two
+3	620,698,17	2	51	three
+4	620,681	2	52	four
+5	620,717,17	2	53	five
+6	620,698,17	2	54	six
+7	620,681	2	55	seven
+8	620,698,17	2	56	eight
+9	620,698,17	2	57	nine
+:	320,494,8	0	58	colon
+;	320,494,114	0	59	semicolon
+<	600,526,2	0	60	less
+=	600,398	0	61	equal
+>	600,526,2	0	62	greater
+?	540,698,8	2	63	question
+@	820,698,17	2	64	at
 at	"
-A	680,681,0,34,37	2	0101	-- A
-B	740,681,0,0,-31	2	0102	-- B
-C	740,698,17,0,-44	2	0103	-- C
-D	800,681,0,0,-31	2	0104	-- D
-E	720,681,0,0,-31	2	0105	-- E
-F	640,681,0,14,-31	2	0106	-- F
-G	800,698,17,0,-44	2	0107	-- G
-H	800,681,0,0,-31	2	0110	-- H
-I	340,681,0,0,-31	2	0111	-- I
-J	600,681,17,0,23	2	0112	-- J
-K	720,681,0,30,-31	2	0113	-- K
-L	600,681,0,29,-31	2	0114	-- L
-M	920,681,0,0,-26	2	0115	-- M
-N	740,681,0,0,-26	2	0116	-- N
-O	800,698,17,0,-44	2	0117	-- O
-P	620,681,0,0,-31	2	0120	-- P
-Q	820,698,189,0,-44	2	0121	-- Q
-R	720,681,0,37,-31	2	0122	-- R
-S	660,698,17,0,-28	2	0123	-- S
-T	620,681,0,36,37	2	0124	-- T
-U	780,681,17,0,-25	2	0125	-- U
-V	700,681,0,25,30	2	0126	-- V
-W	960,681,0,24,30	2	0127	-- W
-X	720,681,0,35,30	2	0130	-- X
-Y	640,681,0,26,30	2	0131	-- Y
-Z	640,681,0,16,-10	2	0132	-- Z
-[	300,717,136,0,-92	2	0133	-- bracketleft
+A	680,681,0,34,37	2	65	A
+B	740,681	2	66	B
+C	740,698,17	2	67	C
+D	800,681	2	68	D
+E	720,681	2	69	E
+F	640,681,0,14	2	70	F
+G	800,698,17	2	71	G
+H	800,681	2	72	H
+I	340,681	2	73	I
+J	600,681,17,0,23	2	74	J
+K	720,681,0,30	2	75	K
+L	600,681,0,29	2	76	L
+M	920,681	2	77	M
+N	740,681	2	78	N
+O	800,698,17	2	79	O
+P	620,681	2	80	P
+Q	820,698,189	2	81	Q
+R	720,681,0,37	2	82	R
+S	660,698,17	2	83	S
+T	620,681,0,36,37	2	84	T
+U	780,681,17	2	85	U
+V	700,681,0,25,30	2	86	V
+W	960,681,0,24,30	2	87	W
+X	720,681,0,35,30	2	88	X
+Y	640,681,0,26,30	2	89	Y
+Z	640,681,0,16	2	90	Z
+[	300,717,136	2	91	bracketleft
 lB	"
-\	600,717,0,0,-74	2	0134	-- backslash
+\	600,717	2	92	backslash
 rs	"
-]	300,717,136,0,-41	2	0135	-- bracketright
+]	300,717,136	2	93	bracketright
 rB	"
-a^	420,685,0,0,-68	2	0136	-- circumflex
+a^	420,685	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	220,698,0,0,-46	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	220,698	2	96	quoteleft
 oq	"
-a	580,494,8,7,-35	0	0141	-- a
-b	620,717,8,0,2	2	0142	-- b
-c	520,494,8,0,-37	0	0143	-- c
-d	620,717,8,0,-37	2	0144	-- d
-e	520,494,8,0,-37	0	0145	-- e
-f	320,734,0,94,-20	2	0146	-- f
-g	540,567,243,2,-17	1	0147	-- g
-h	660,717,0,0,-20	2	0150	-- h
-i	300,654,0,0,-20	0	0151	-- i
-j	300,654,251,0,109	1	0152	-- j
-k	620,717,0,8,-20	2	0153	-- k
-l	300,717,0,0,-20	2	0154	-- l
-m	940,494,0,0,-17	0	0155	-- m
-n	660,494,0,0,-20	0	0156	-- n
-o	560,494,8,0,-37	0	0157	-- o
-p	620,494,228,0,-20	1	0160	-- p
-q	580,494,228,9,-37	1	0161	-- q
-r	440,494,0,7,-20	0	0162	-- r
-s	520,494,8,0,-40	0	0163	-- s
-t	380,667,8,8,-20	2	0164	-- t
-u	680,484,8,0,-20	0	0165	-- u
-v	520,484,0,14,23	0	0166	-- v
-w	780,484,0,24,19	0	0167	-- w
-x	560,484,0,16,16	0	0170	-- x
-y	540,484,236,9,23	1	0171	-- y
-z	480,484,0,0,-7	0	0172	-- z
-lC	280,717,136,0,-21	2	0173	-- braceleft
+a	580,494,8,7	0	97	a
+b	620,717,8,0,2	2	98	b
+c	520,494,8	0	99	c
+d	620,717,8	2	100	d
+e	520,494,8	0	101	e
+f	320,734,0,94	2	102	f
+g	540,567,243,2	1	103	g
+h	660,717	2	104	h
+i	300,654	0	105	i
+j	300,654,251,0,109	1	106	j
+k	620,717,0,8	2	107	k
+l	300,717	2	108	l
+m	940,494	0	109	m
+n	660,494	0	110	n
+o	560,494,8	0	111	o
+p	620,494,228	1	112	p
+q	580,494,228,9	1	113	q
+r	440,494,0,7	0	114	r
+s	520,494,8	0	115	s
+t	380,667,8,8	2	116	t
+u	680,484,8	0	117	u
+v	520,484,0,14,23	0	118	v
+w	780,484,0,24,19	0	119	w
+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,0,-264	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	280,717,136,0,-21	2	0175	-- braceright
+rC	280,717,136	2	125	braceright
 }	"
-a~	440,661,0,0,-68	0	0176	-- tilde
+a~	440,661	0	126	tilde
 ~	"
-bq	220,110,108,0,-46	0	0200	-- quotesinglbase
-Fo	360,437,0,0,-51	0	0201	-- guillemotleft
-Fc	360,437,0,0,-51	0	0202	-- guillemotright
-bu	460,511,0,0,-60	0	0203	-- bullet
-Fn	620,749,155,13,29	2	0204	-- florin
-f/	140,681,0,195,188	2	0205	-- fraction
-%0	1280,698,8,0,-22	2	0206	-- perthousand
-dg	540,698,156,0,-79	2	0207	-- dagger
-dd	540,698,156,0,-79	2	0210	-- daggerdbl
-en	500,292,0,15,15	0	0211	-- endash
-em	1000,292,0,15,15	0	0212	-- emdash
-fi	620,734,0,0,-20	2	0214	-- fi
-fl	620,734,0,0,-20	2	0215	-- fl
-.i	300,484,0,0,-20	0	0220	-- dotlessi
-ga	340,689,0,0,-68	2	0222	-- grave
-a"	380,698,0,0,-68	2	0223	-- hungarumlaut
-a.	260,672,0,0,-68	2	0224	-- dotaccent
-ab	460,687,0,0,-68	2	0225	-- breve
-ah	420,672,0,0,-68	2	0226	-- caron
-ao	320,731,0,0,-68	2	0227	-- ring
-ho	320,0,145,0,-68	0	0230	-- ogonek
-lq	400,698,0,0,-46	2	0231	-- quotedblleft
-rq	400,698,0,0,-46	2	0232	-- quotedblright
-oe	900,494,8,0,-37	0	0233	-- oe
-/l	320,717,0,0,-20	2	0234	-- lslash
-Bq	400,110,108,0,-46	0	0235	-- quotedblbase
-OE	1240,698,17,0,-44	2	0236	-- OE
-/L	600,681,0,29,-31	2	0237	-- Lslash
-r!	300,494,214,0,-75	0	0241	-- exclamdown
-ct	620,651,0,0,-116	0	0242	-- cent
-Po	620,698,17,11,-8	2	0243	-- sterling
-Cs	620,591,0,0,-58	0	0244	-- currency
-Ye	620,681,0,27,22	2	0245	-- yen
-bb	600,675,175,0,-264	2	0246	-- brokenbar
-sc	520,698,178,0,-33	2	0247	-- section
-ad	420,674,0,0,-68	2	0250	-- dieresis
-co	740,698,17,0,-24	2	0251	-- copyright
-Of	420,698,0,0,-49	2	0252	-- ordfeminine
-fo	240,437,0,0,-51	0	0253	-- guilsinglleft
-no	600,398,0,0,-51	0	0254	-- logicalnot
-\-	600,300,0,0,-51	0	0255	-- minus
-rg	740,698,17,0,-23	2	0256	-- registered
-a-	440,635,0,0,-68	0	0257	-- macron
-de	400,698,0,0,-50	2	0260	-- degree
-t+-	600,513,0,0,-51	0	0261	-- plusminus
-S2	372,698,0,0,-20	2	0262	-- twosuperior
-S3	372,698,0,0,-12	2	0263	-- threesuperior
-aa	340,689,0,0,-68	2	0264	-- acute
-mc	680,484,251,0,-20	1	0265	-- mu
-ps	600,681,0,0,-14	2	0266	-- paragraph
-pc	320,327,0,0,-92	0	0267	-- periodcentered
-ac	320,0,200,0,-68	0	0270	-- cedilla
-S1	372,688,0,0,-80	2	0271	-- onesuperior
-Om	420,698,0,0,-56	2	0272	-- ordmasculine
-fc	240,437,0,0,-51	0	0273	-- guilsinglright
-14	930,681,0,0,-80	2	0274	-- onequarter
-12	930,681,0,0,-80	2	0275	-- onehalf
-34	930,691,0,0,-52	2	0276	-- threequarters
-r?	540,494,217,0,-23	0	0277	-- questiondown
-`A	680,866,0,34,37	2	0300	-- Agrave
-'A	680,866,0,34,37	2	0301	-- Aacute
-^A	680,862,0,34,37	2	0302	-- Acircumflex
-~A	680,838,0,34,37	2	0303	-- Atilde
-:A	680,851,0,34,37	2	0304	-- Adieresis
-oA	680,908,0,34,37	2	0305	-- Aring
-AE	1260,681,0,0,36	2	0306	-- AE
-,C	740,698,200,0,-44	2	0307	-- Ccedilla
-`E	720,866,0,0,-31	2	0310	-- Egrave
-'E	720,866,0,0,-31	2	0311	-- Eacute
-^E	720,862,0,0,-31	2	0312	-- Ecircumflex
-:E	720,851,0,0,-31	2	0313	-- Edieresis
-`I	340,866,0,0,-31	2	0314	-- Igrave
-'I	340,866,0,0,-31	2	0315	-- Iacute
-^I	340,862,0,0,-28	2	0316	-- Icircumflex
-:I	340,851,0,0,-28	2	0317	-- Idieresis
--D	800,681,0,0,-31	2	0320	-- Eth
-~N	740,838,0,0,-26	2	0321	-- Ntilde
-`O	800,866,17,0,-44	2	0322	-- Ograve
-'O	800,866,17,0,-44	2	0323	-- Oacute
-^O	800,862,17,0,-44	2	0324	-- Ocircumflex
-~O	800,838,17,0,-44	2	0325	-- Otilde
-:O	800,851,17,0,-44	2	0326	-- Odieresis
-tmu	600,513,0,0,-51	0	0327	-- multiply
-/O	800,733,53,0,-44	2	0330	-- Oslash
-`U	780,866,17,0,-25	2	0331	-- Ugrave
-'U	780,866,17,0,-25	2	0332	-- Uacute
-^U	780,862,17,0,-25	2	0333	-- Ucircumflex
-:U	780,851,17,0,-25	2	0334	-- Udieresis
-'Y	640,866,0,26,30	2	0335	-- Yacute
-TP	620,681,0,0,-31	2	0336	-- Thorn
-ss	660,698,110,0,109	2	0337	-- germandbls
-`a	580,689,8,7,-35	2	0340	-- agrave
-'a	580,689,8,7,-35	2	0341	-- aacute
-^a	580,685,8,7,-35	2	0342	-- acircumflex
-~a	580,661,8,7,-35	0	0343	-- atilde
-:a	580,674,8,7,-35	2	0344	-- adieresis
-oa	580,731,8,7,-35	2	0345	-- aring
-ae	860,494,8,0,-35	0	0346	-- ae
-,c	520,494,200,0,-37	0	0347	-- ccedilla
-`e	520,689,8,0,-37	2	0350	-- egrave
-'e	520,689,8,0,-37	2	0351	-- eacute
-^e	520,685,8,0,-37	2	0352	-- ecircumflex
-:e	520,674,8,0,-37	2	0353	-- edieresis
-`i	300,689,0,0,-20	2	0354	-- igrave
-'i	300,689,0,0,-20	2	0355	-- iacute
-^i	300,685,0,0,-8	2	0356	-- icircumflex
-:i	300,674,0,0,-8	2	0357	-- idieresis
-Sd	560,734,8,0,-37	2	0360	-- eth
-~n	660,661,0,0,-20	0	0361	-- ntilde
-`o	560,689,8,0,-37	2	0362	-- ograve
-'o	560,689,8,0,-37	2	0363	-- oacute
-^o	560,685,8,0,-37	2	0364	-- ocircumflex
-~o	560,661,8,0,-37	0	0365	-- otilde
-:o	560,674,8,0,-37	2	0366	-- odieresis
-tdi	600,514,0,0,-51	0	0367	-- divide
-/o	560,534,40,0,-37	0	0370	-- oslash
-`u	680,689,8,0,-20	2	0371	-- ugrave
-'u	680,689,8,0,-20	2	0372	-- uacute
-^u	680,685,8,0,-20	2	0373	-- ucircumflex
-:u	680,674,8,0,-20	2	0374	-- udieresis
-'y	540,689,236,9,23	3	0375	-- yacute
-Tp	620,717,228,0,-20	3	0376	-- thorn
-:y	540,674,236,9,23	3	0377	-- ydieresis
+bq	220,110,108	0	128	quotesinglbase
+Fo	360,437	0	129	guillemotleft
+Fc	360,437	0	130	guillemotright
+bu	460,511	0	131	bullet
+Fn	620,749,155,13,29	2	132	florin
+f/	140,681,0,195,188	2	133	fraction
+%0	1280,698,8	2	134	perthousand
+dg	540,698,156	2	135	dagger
+dd	540,698,156	2	136	daggerdbl
+en	500,292,0,15,15	0	137	endash
+em	1000,292,0,15,15	0	138	emdash
+fi	620,734	2	140	fi
+fl	620,734	2	141	fl
+.i	300,484	0	144	dotlessi
+ga	340,689	2	146	grave
+a"	380,698	2	147	hungarumlaut
+a.	260,672	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
+lq	400,698	2	153	quotedblleft
+rq	400,698	2	154	quotedblright
+oe	900,494,8	0	155	oe
+/l	320,717	2	156	lslash
+Bq	400,110,108	0	157	quotedblbase
+OE	1240,698,17	2	158	OE
+/L	600,681,0,29	2	159	Lslash
+r!	300,494,214	0	161	exclamdown
+ct	620,651	0	162	cent
+Po	620,698,17,11	2	163	sterling
+Cs	620,591	0	164	currency
+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
+co	740,698,17	2	169	copyright
+Of	420,698	2	170	ordfeminine
+fo	240,437	0	171	guilsinglleft
+tno	600,398	0	172	logicalnot
+\-	600,300	0	173	minus
+rg	740,698,17	2	174	registered
+a-	440,635	0	175	macron
+de	400,698	2	176	degree
+t+-	600,513	0	177	plusminus
+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
+ps	600,681	2	182	paragraph
+pc	320,327	0	183	periodcentered
+ac	320,0,200	0	184	cedilla
+S1	372,688	2	185	onesuperior
+Om	420,698	2	186	ordmasculine
+fc	240,437	0	187	guilsinglright
+14	930,681	2	188	onequarter
+12	930,681	2	189	onehalf
+34	930,691	2	190	threequarters
+r?	540,494,217	0	191	questiondown
+`A	680,866,0,34,37	2	192	Agrave
+'A	680,866,0,34,37	2	193	Aacute
+^A	680,862,0,34,37	2	194	Acircumflex
+~A	680,838,0,34,37	2	195	Atilde
+:A	680,851,0,34,37	2	196	Adieresis
+oA	680,908,0,34,37	2	197	Aring
+AE	1260,681,0,0,36	2	198	AE
+,C	740,698,200	2	199	Ccedilla
+`E	720,866	2	200	Egrave
+'E	720,866	2	201	Eacute
+^E	720,862	2	202	Ecircumflex
+:E	720,851	2	203	Edieresis
+`I	340,866	2	204	Igrave
+'I	340,866	2	205	Iacute
+^I	340,862	2	206	Icircumflex
+:I	340,851	2	207	Idieresis
+-D	800,681	2	208	Eth
+~N	740,838	2	209	Ntilde
+`O	800,866,17	2	210	Ograve
+'O	800,866,17	2	211	Oacute
+^O	800,862,17	2	212	Ocircumflex
+~O	800,838,17	2	213	Otilde
+:O	800,851,17	2	214	Odieresis
+tmu	600,513	0	215	multiply
+/O	800,733,53	2	216	Oslash
+`U	780,866,17	2	217	Ugrave
+'U	780,866,17	2	218	Uacute
+^U	780,862,17	2	219	Ucircumflex
+:U	780,851,17	2	220	Udieresis
+'Y	640,866,0,26,30	2	221	Yacute
+TP	620,681	2	222	Thorn
+ss	660,698,110,0,109	2	223	germandbls
+`a	580,689,8,7	2	224	agrave
+'a	580,689,8,7	2	225	aacute
+^a	580,685,8,7	2	226	acircumflex
+~a	580,661,8,7	0	227	atilde
+:a	580,674,8,7	2	228	adieresis
+oa	580,731,8,7	2	229	aring
+ae	860,494,8	0	230	ae
+,c	520,494,200	0	231	ccedilla
+`e	520,689,8	2	232	egrave
+'e	520,689,8	2	233	eacute
+^e	520,685,8	2	234	ecircumflex
+:e	520,674,8	2	235	edieresis
+`i	300,689	2	236	igrave
+'i	300,689	2	237	iacute
+^i	300,685	2	238	icircumflex
+:i	300,674	2	239	idieresis
+Sd	560,734,8	2	240	eth
+~n	660,661	0	241	ntilde
+`o	560,689,8	2	242	ograve
+'o	560,689,8	2	243	oacute
+^o	560,685,8	2	244	ocircumflex
+~o	560,661,8	0	245	otilde
+:o	560,674,8	2	246	odieresis
+tdi	600,514	0	247	divide
+/o	560,534,40	0	248	oslash
+`u	680,689,8	2	249	ugrave
+'u	680,689,8	2	250	uacute
+^u	680,685,8	2	251	ucircumflex
+:u	680,674,8	2	252	udieresis
+'y	540,689,236,9,23	3	253	yacute
+Tp	620,717,228	3	254	thorn
+:y	540,674,236,9,23	3	255	ydieresis
+u2026	1000,123,8	0	256	ellipsis
diff --git a/contrib/groff/font/devps/CB b/contrib/groff/font/devps/CB
index 4bdd9c7..31f19b7 100644
--- a/contrib/groff/font/devps/CB
+++ b/contrib/groff/font/devps/CB
@@ -3,246 +3,279 @@ internalname Courier-Bold
 spacewidth 600
 encoding text.enc
 charset
-ha	600,616,0,0,-108	2	0000	-- asciicircum
-ti	600,356,0,0,-71	0	0001	-- asciitilde
-vS	600,790,22,0,-47	2	0002	-- Scaron
-vZ	600,790,0,0,-62	2	0003	-- Zcaron
-vs	600,667,17,0,-68	2	0004	-- scaron
-vz	600,667,0,0,-81	2	0005	-- zcaron
-:Y	600,748,0,0,-12	2	0006	-- Ydieresis
-tm	600,562,0,149,9	2	0007	-- trademark
-aq	600,562,0,0,-227	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-202	2	0041	-- exclam
-"	600,562,0,0,-135	2	0042	-- quotedbl
+ha	600,616	2	0	asciicircum
+ti	600,356	0	1	asciitilde
+vS	600,790,22	2	2	Scaron
+vZ	600,790	2	3	Zcaron
+vs	600,667,17	2	4	scaron
+vz	600,667	2	5	zcaron
+:Y	600,748	2	6	Ydieresis
+tm	600,562,0,149,9	2	7	trademark
+aq	600,562	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15	2	33	exclam
+"	600,562	2	34	quotedbl
 dq	"
-#	600,651,45,0,-56	2	0043	-- numbersign
+#	600,651,45	2	35	numbersign
 sh	"
-$	600,666,126,0,-82	2	0044	-- dollar
+$	600,666,126	2	36	dollar
 Do	"
-%	600,616,15,0,-5	2	0045	-- percent
-&	600,543,15,0,-36	0	0046	-- ampersand
-'	600,562,0,0,-171	2	0047	-- quoteright
+%	600,616,15	2	37	percent
+&	600,543,15	0	38	ampersand
+'	600,562	2	39	quoteright
 cq	"
-(	600,616,102,0,-219	2	0050	-- parenleft
-)	600,616,102,0,-139	2	0051	-- parenright
-*	600,601,0,0,-91	2	0052	-- asterisk
-+	600,478,0,0,-71	0	0053	-- plus
-,	600,174,111,0,-123	0	0054	-- comma
--	600,313,0,0,-100	0	0055	-- hyphen
+(	600,616,102	2	40	parenleft
+)	600,616,102	2	41	parenright
+*	600,601	2	42	asterisk
++	600,478	0	43	plus
+,	600,174,111	0	44	comma
+-	600,313	0	45	hyphen
 hy	"
-.	600,171,15,0,-192	0	0056	-- period
-/	600,626,77,0,-98	2	0057	-- slash
+.	600,171,15	0	46	period
+/	600,626,77	2	47	slash
 sl	"
-0	600,616,15,0,-87	2	0060	-- zero
-1	600,616,0,0,-81	2	0061	-- one
-2	600,616,0,0,-61	2	0062	-- two
-3	600,616,15,0,-63	2	0063	-- three
-4	600,616,0,0,-53	2	0064	-- four
-5	600,601,15,0,-70	2	0065	-- five
-6	600,616,15,0,-90	2	0066	-- six
-7	600,601,0,0,-55	2	0067	-- seven
-8	600,616,15,0,-83	2	0070	-- eight
-9	600,616,15,0,-79	2	0071	-- nine
-:	600,425,15,0,-191	0	0072	-- colon
-;	600,425,111,0,-123	0	0073	-- semicolon
-<	600,501,0,0,-66	0	0074	-- less
-=	600,398,0,0,-71	0	0075	-- equal
->	600,501,0,0,-77	0	0076	-- greater
-?	600,580,14,0,-98	2	0077	-- question
-@	600,616,15,0,-16	2	0100	-- at
+0	600,616,15	2	48	zero
+1	600,616	2	49	one
+2	600,616	2	50	two
+3	600,616,15	2	51	three
+4	600,616	2	52	four
+5	600,601,15	2	53	five
+6	600,616,15	2	54	six
+7	600,601	2	55	seven
+8	600,616,15	2	56	eight
+9	600,616,15	2	57	nine
+:	600,425,15	0	58	colon
+;	600,425,111	0	59	semicolon
+<	600,501	0	60	less
+=	600,398	0	61	equal
+>	600,501	0	62	greater
+?	600,580,14	2	63	question
+@	600,616,15	2	64	at
 at	"
-A	600,562,0,9,9	2	0101	-- A
-B	600,562,0,0,-30	2	0102	-- B
-C	600,580,18,0,-22	2	0103	-- C
-D	600,562,0,0,-30	2	0104	-- D
-E	600,562,0,0,-25	2	0105	-- E
-F	600,562,0,0,-39	2	0106	-- F
-G	600,580,18,0,-22	2	0107	-- G
-H	600,562,0,0,-20	2	0110	-- H
-I	600,562,0,0,-77	2	0111	-- I
-J	600,562,18,1,-37	2	0112	-- J
-K	600,562,0,0,-21	2	0113	-- K
-L	600,562,0,0,-39	2	0114	-- L
-M	600,562,0,2,2	2	0115	-- M
-N	600,562,12,10,-8	2	0116	-- N
-O	600,580,18,0,-22	2	0117	-- O
-P	600,562,0,0,-48	2	0120	-- P
-Q	600,580,138,0,-32	2	0121	-- Q
-R	600,562,0,0,-24	2	0122	-- R
-S	600,582,22,0,-47	2	0123	-- S
-T	600,562,0,0,-21	2	0124	-- T
-U	600,562,18,0,-4	2	0125	-- U
-V	600,562,0,13,13	2	0126	-- V
-W	600,562,0,18,18	2	0127	-- W
-X	600,562,0,0,-12	2	0130	-- X
-Y	600,562,0,0,-12	2	0131	-- Y
-Z	600,562,0,0,-62	2	0132	-- Z
-[	600,616,102,0,-245	2	0133	-- bracketleft
+A	600,562,0,9,9	2	65	A
+B	600,562	2	66	B
+C	600,580,18	2	67	C
+D	600,562	2	68	D
+E	600,562	2	69	E
+F	600,562	2	70	F
+G	600,580,18	2	71	G
+H	600,562	2	72	H
+I	600,562	2	73	I
+J	600,562,18,1	2	74	J
+K	600,562	2	75	K
+L	600,562	2	76	L
+M	600,562,0,2,2	2	77	M
+N	600,562,12,10	2	78	N
+O	600,580,18	2	79	O
+P	600,562	2	80	P
+Q	600,580,138	2	81	Q
+R	600,562	2	82	R
+S	600,582,22	2	83	S
+T	600,562	2	84	T
+U	600,562,18	2	85	U
+V	600,562,0,13,13	2	86	V
+W	600,562,0,18,18	2	87	W
+X	600,562	2	88	X
+Y	600,562	2	89	Y
+Z	600,562	2	90	Z
+[	600,616,102	2	91	bracketleft
 lB	"
-\	600,626,77,0,-99	2	0134	-- backslash
+\	600,626,77	2	92	backslash
 rs	"
-]	600,616,102,0,-125	2	0135	-- bracketright
+]	600,616,102	2	93	bracketright
 rB	"
-a^	600,657,0,0,-103	2	0136	-- circumflex
+a^	600,657	2	94	circumflex
 ^	"
-_	600,0,125	0	0137	-- underscore
-`	600,562,0,0,-178	2	0140	-- quoteleft
+_	600,0,125	0	95	underscore
+`	600,562	2	96	quoteleft
 oq	"
-a	600,454,15,0,-35	0	0141	-- a
-b	600,626,15	2	0142	-- b
-c	600,459,15,0,-40	0	0143	-- c
-d	600,626,15,0,-20	2	0144	-- d
-e	600,454,15,0,-40	0	0145	-- e
-f	600,626,0,0,-83	2	0146	-- f
-g	600,454,146,0,-30	1	0147	-- g
-h	600,626,0,0,-5	2	0150	-- h
-i	600,658,0,0,-77	2	0151	-- i
-j	600,658,146,0,-63	3	0152	-- j
-k	600,626,0,0,-20	2	0153	-- k
-l	600,626,0,0,-77	2	0154	-- l
-m	600,454,0,26,22	0	0155	-- m
-n	600,454,0,0,-18	0	0156	-- n
-o	600,454,15,0,-30	0	0157	-- o
-p	600,454,142,0,1	1	0160	-- p
-q	600,454,142,0,-20	1	0161	-- q
-r	600,454,0,0,-47	0	0162	-- r
-s	600,459,17,0,-68	0	0163	-- s
-t	600,562,15,0,-47	2	0164	-- t
-u	600,439,15,0,1	0	0165	-- u
-v	600,439,0,1,1	0	0166	-- v
-w	600,439,0,18,18	0	0167	-- w
-x	600,439,0,0,-6	0	0170	-- x
-y	600,439,142,1,4	1	0171	-- y
-z	600,439,0,0,-81	0	0172	-- z
-lC	600,616,102,0,-160	2	0173	-- braceleft
+a	600,454,15	0	97	a
+b	600,626,15	2	98	b
+c	600,459,15	0	99	c
+d	600,626,15	2	100	d
+e	600,454,15	0	101	e
+f	600,626	2	102	f
+g	600,454,146	1	103	g
+h	600,626	2	104	h
+i	600,658	2	105	i
+j	600,658,146	3	106	j
+k	600,626	2	107	k
+l	600,626	2	108	l
+m	600,454,0,26,22	0	109	m
+n	600,454	0	110	n
+o	600,454,15	0	111	o
+p	600,454,142,0,1	1	112	p
+q	600,454,142	1	113	q
+r	600,454	0	114	r
+s	600,459,17	0	115	s
+t	600,562,15	2	116	t
+u	600,439,15,0,1	0	117	u
+v	600,439,0,1,1	0	118	v
+w	600,439,0,18,18	0	119	w
+x	600,439	0	120	x
+y	600,439,142,1,4	1	121	y
+z	600,439	0	122	z
+lC	600,616,102	2	123	braceleft
 {	"
-ba	600,750,250,0,-255	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	600,616,102,0,-136	2	0175	-- braceright
+rC	600,616,102	2	125	braceright
 }	"
-a~	600,636,0,0,-89	2	0176	-- tilde
+a~	600,636	2	126	tilde
 ~	"
-bq	600,143,142,0,-175	1	0200	-- quotesinglbase
-Fo	600,446,0,0,-8	0	0201	-- guillemotleft
-Fc	600,446,0,0,-47	0	0202	-- guillemotright
-bu	600,430,0,0,-140	0	0203	-- bullet
-Fn	600,616,131,0,30	2	0204	-- florin
-f/	600,661,60,0,-25	2	0205	-- fraction
-%0	600,616,15,113,113	2	0206	-- perthousand
-dg	600,580,70,0,-106	2	0207	-- dagger
-dd	600,580,70,0,-106	2	0210	-- daggerdbl
-en	600,313,0,0,-65	0	0211	-- endash
-em	600,313,0,10,10	0	0212	-- emdash
-fi	600,626,0,0,-12	2	0214	-- fi
-fl	600,626,0,0,-12	2	0215	-- fl
-.i	600,439,0,0,-77	0	0220	-- dotlessi
-ga	600,661,0,0,-132	2	0222	-- grave
-a"	600,661,0,0,-68	2	0223	-- hungarumlaut
-a.	600,625,0,0,-230	2	0224	-- dotaccent
-ab	600,631,0,0,-83	2	0225	-- breve
-ah	600,667,0,0,-103	2	0226	-- caron
-ao	600,678,0,0,-198	2	0227	-- ring
-ho	600,0,199,0,-169	1	0230	-- ogonek
-lq	600,562,0,0,-71	2	0231	-- quotedblleft
-rq	600,562,0,0,-61	2	0232	-- quotedblright
-oe	600,454,15,11,18	0	0233	-- oe
-/l	600,626,0,0,-77	2	0234	-- lslash
-Bq	600,143,142,0,-65	1	0235	-- quotedblbase
-OE	600,562,0,0,25	2	0236	-- OE
-/L	600,562,0,0,-39	2	0237	-- Lslash
-r!	600,449,146,0,-202	1	0241	-- exclamdown
-ct	600,614,49,0,-66	2	0242	-- cent
-Po	600,611,28,0,-72	2	0243	-- sterling
-Cs	600,517,0,0,-54	0	0244	-- currency
-Ye	600,562,0,0,-10	2	0245	-- yen
-bb	600,675,175,0,-255	3	0246	-- brokenbar
-sc	600,580,70,0,-83	2	0247	-- section
-ad	600,625,0,0,-128	2	0250	-- dieresis
-co	600,580,18	2	0251	-- copyright
-Of	600,580,0,0,-147	2	0252	-- ordfeminine
-fo	600,446,0,0,-141	0	0253	-- guilsinglleft
-no	600,413,0,0,-71	0	0254	-- logicalnot
-\-	600,313,0,0,-71	0	0255	-- minus
-rg	600,580,18	2	0256	-- registered
-a-	600,585,0,0,-88	2	0257	-- macron
-de	600,616,0,0,-86	2	0260	-- degree
-t+-	600,515,0,0,-71	0	0261	-- plusminus
-S2	600,616,0,0,-143	2	0262	-- twosuperior
-S3	600,616,0,0,-138	2	0263	-- threesuperior
-aa	600,661,0,0,-205	2	0264	-- acute
-mc	600,439,142,0,1	1	0265	-- mu
-ps	600,580,70,0,-6	2	0266	-- paragraph
-pc	600,351,0,0,-196	0	0267	-- periodcentered
-ac	600,0,206,0,-205	1	0270	-- cedilla
-S1	600,616,0,0,-153	2	0271	-- onesuperior
-Om	600,580,0,0,-147	2	0272	-- ordmasculine
-fc	600,446,0,0,-141	0	0273	-- guilsinglright
-14	600,661,60,56,56	2	0274	-- onequarter
-12	600,661,60,48,47	2	0275	-- onehalf
-34	600,661,60,48,47	2	0276	-- threequarters
-r?	600,449,146,0,-99	1	0277	-- questiondown
-`A	600,784,0,9,9	2	0300	-- Agrave
-'A	600,784,0,9,9	2	0301	-- Aacute
-^A	600,780,0,9,9	2	0302	-- Acircumflex
-~A	600,759,0,9,9	2	0303	-- Atilde
-:A	600,748,0,9,9	2	0304	-- Adieresis
-oA	600,801,0,9,9	2	0305	-- Aring
-AE	600,562,0,2,29	2	0306	-- AE
-,C	600,580,206,0,-22	3	0307	-- Ccedilla
-`E	600,784,0,0,-25	2	0310	-- Egrave
-'E	600,784,0,0,-25	2	0311	-- Eacute
-^E	600,780,0,0,-25	2	0312	-- Ecircumflex
-:E	600,748,0,0,-25	2	0313	-- Edieresis
-`I	600,784,0,0,-77	2	0314	-- Igrave
-'I	600,784,0,0,-77	2	0315	-- Iacute
-^I	600,780,0,0,-77	2	0316	-- Icircumflex
-:I	600,748,0,0,-77	2	0317	-- Idieresis
--D	600,562,0,0,-30	2	0320	-- Eth
-~N	600,759,12,10,-8	2	0321	-- Ntilde
-`O	600,784,18,0,-22	2	0322	-- Ograve
-'O	600,784,18,0,-22	2	0323	-- Oacute
-^O	600,780,18,0,-22	2	0324	-- Ocircumflex
-~O	600,759,18,0,-22	2	0325	-- Otilde
-:O	600,748,18,0,-22	2	0326	-- Odieresis
-tmu	600,478,0,0,-81	0	0327	-- multiply
-/O	600,584,22,0,-22	2	0330	-- Oslash
-`U	600,784,18,0,-4	2	0331	-- Ugrave
-'U	600,784,18,0,-4	2	0332	-- Uacute
-^U	600,780,18,0,-4	2	0333	-- Ucircumflex
-:U	600,748,18,0,-4	2	0334	-- Udieresis
-'Y	600,784,0,0,-12	2	0335	-- Yacute
-TP	600,562,0,0,-48	2	0336	-- Thorn
-ss	600,626,15,0,-22	2	0337	-- germandbls
-`a	600,661,15,0,-35	2	0340	-- agrave
-'a	600,661,15,0,-35	2	0341	-- aacute
-^a	600,657,15,0,-35	2	0342	-- acircumflex
-~a	600,636,15,0,-35	2	0343	-- atilde
-:a	600,625,15,0,-35	2	0344	-- adieresis
-oa	600,678,15,0,-35	2	0345	-- aring
-ae	600,454,15,1,4	0	0346	-- ae
-,c	600,459,206,0,-40	1	0347	-- ccedilla
-`e	600,661,15,0,-40	2	0350	-- egrave
-'e	600,661,15,0,-40	2	0351	-- eacute
-^e	600,657,15,0,-40	2	0352	-- ecircumflex
-:e	600,625,15,0,-40	2	0353	-- edieresis
-`i	600,661,0,0,-77	2	0354	-- igrave
-'i	600,661,0,0,-77	2	0355	-- iacute
-^i	600,657,0,0,-63	2	0356	-- icircumflex
-:i	600,625,0,0,-77	2	0357	-- idieresis
-Sd	600,626,27,0,-58	2	0360	-- eth
-~n	600,636,0,0,-18	2	0361	-- ntilde
-`o	600,661,15,0,-30	2	0362	-- ograve
-'o	600,661,15,0,-30	2	0363	-- oacute
-^o	600,657,15,0,-30	2	0364	-- ocircumflex
-~o	600,636,15,0,-30	2	0365	-- otilde
-:o	600,625,15,0,-30	2	0366	-- odieresis
-tdi	600,500,0,0,-71	0	0367	-- divide
-/o	600,463,24,0,-30	0	0370	-- oslash
-`u	600,661,15,0,1	2	0371	-- ugrave
-'u	600,661,15,0,1	2	0372	-- uacute
-^u	600,657,15,0,1	2	0373	-- ucircumflex
-:u	600,625,15,0,1	2	0374	-- udieresis
-'y	600,661,142,1,4	3	0375	-- yacute
-Tp	600,626,142,0,14	3	0376	-- thorn
-:y	600,625,142,1,4	3	0377	-- ydieresis
+bq	600,143,142	1	128	quotesinglbase
+Fo	600,446	0	129	guillemotleft
+Fc	600,446	0	130	guillemotright
+bu	600,430	0	131	bullet
+Fn	600,616,131,0,30	2	132	florin
+f/	600,661,60	2	133	fraction
+%0	600,616,15,113,113	2	134	perthousand
+dg	600,580,70	2	135	dagger
+dd	600,580,70	2	136	daggerdbl
+en	600,313	0	137	endash
+em	600,313,0,10,10	0	138	emdash
+fi	600,626	2	140	fi
+fl	600,626	2	141	fl
+.i	600,439	0	144	dotlessi
+ga	600,661	2	146	grave
+a"	600,661	2	147	hungarumlaut
+a.	600,625	2	148	dotaccent
+ab	600,631	2	149	breve
+ah	600,667	2	150	caron
+ao	600,678	2	151	ring
+ho	600,0,199	1	152	ogonek
+lq	600,562	2	153	quotedblleft
+rq	600,562	2	154	quotedblright
+oe	600,454,15,11,18	0	155	oe
+/l	600,626	2	156	lslash
+Bq	600,143,142	1	157	quotedblbase
+OE	600,562,0,0,25	2	158	OE
+/L	600,562	2	159	Lslash
+r!	600,449,146	1	161	exclamdown
+ct	600,614,49	2	162	cent
+Po	600,611,28	2	163	sterling
+Cs	600,517	0	164	currency
+Ye	600,562	2	165	yen
+bb	600,675,175	3	166	brokenbar
+sc	600,580,70	2	167	section
+ad	600,625	2	168	dieresis
+co	600,580,18	2	169	copyright
+Of	600,580	2	170	ordfeminine
+fo	600,446	0	171	guilsinglleft
+tno	600,413	0	172	logicalnot
+\-	600,313	0	173	minus
+rg	600,580,18	2	174	registered
+a-	600,585	2	175	macron
+de	600,616	2	176	degree
+t+-	600,515	0	177	plusminus
+S2	600,616	2	178	twosuperior
+S3	600,616	2	179	threesuperior
+aa	600,661	2	180	acute
+mc	600,439,142,0,1	1	181	mu
+ps	600,580,70	2	182	paragraph
+pc	600,351	0	183	periodcentered
+ac	600,0,206	1	184	cedilla
+S1	600,616	2	185	onesuperior
+Om	600,580	2	186	ordmasculine
+fc	600,446	0	187	guilsinglright
+14	600,661,60,56,56	2	188	onequarter
+12	600,661,60,48,47	2	189	onehalf
+34	600,661,60,48,47	2	190	threequarters
+r?	600,449,146	1	191	questiondown
+`A	600,784,0,9,9	2	192	Agrave
+'A	600,784,0,9,9	2	193	Aacute
+^A	600,780,0,9,9	2	194	Acircumflex
+~A	600,759,0,9,9	2	195	Atilde
+:A	600,748,0,9,9	2	196	Adieresis
+oA	600,801,0,9,9	2	197	Aring
+AE	600,562,0,2,29	2	198	AE
+,C	600,580,206	3	199	Ccedilla
+`E	600,784	2	200	Egrave
+'E	600,784	2	201	Eacute
+^E	600,780	2	202	Ecircumflex
+:E	600,748	2	203	Edieresis
+`I	600,784	2	204	Igrave
+'I	600,784	2	205	Iacute
+^I	600,780	2	206	Icircumflex
+:I	600,748	2	207	Idieresis
+-D	600,562	2	208	Eth
+~N	600,759,12,10	2	209	Ntilde
+`O	600,784,18	2	210	Ograve
+'O	600,784,18	2	211	Oacute
+^O	600,780,18	2	212	Ocircumflex
+~O	600,759,18	2	213	Otilde
+:O	600,748,18	2	214	Odieresis
+tmu	600,478	0	215	multiply
+/O	600,584,22	2	216	Oslash
+`U	600,784,18	2	217	Ugrave
+'U	600,784,18	2	218	Uacute
+^U	600,780,18	2	219	Ucircumflex
+:U	600,748,18	2	220	Udieresis
+'Y	600,784	2	221	Yacute
+TP	600,562	2	222	Thorn
+ss	600,626,15	2	223	germandbls
+`a	600,661,15	2	224	agrave
+'a	600,661,15	2	225	aacute
+^a	600,657,15	2	226	acircumflex
+~a	600,636,15	2	227	atilde
+:a	600,625,15	2	228	adieresis
+oa	600,678,15	2	229	aring
+ae	600,454,15,1,4	0	230	ae
+,c	600,459,206	1	231	ccedilla
+`e	600,661,15	2	232	egrave
+'e	600,661,15	2	233	eacute
+^e	600,657,15	2	234	ecircumflex
+:e	600,625,15	2	235	edieresis
+`i	600,661	2	236	igrave
+'i	600,661	2	237	iacute
+^i	600,657	2	238	icircumflex
+:i	600,625	2	239	idieresis
+Sd	600,626,27	2	240	eth
+~n	600,636	2	241	ntilde
+`o	600,661,15	2	242	ograve
+'o	600,661,15	2	243	oacute
+^o	600,657,15	2	244	ocircumflex
+~o	600,636,15	2	245	otilde
+:o	600,625,15	2	246	odieresis
+tdi	600,500	0	247	divide
+/o	600,463,24	0	248	oslash
+`u	600,661,15,0,1	2	249	ugrave
+'u	600,661,15,0,1	2	250	uacute
+^u	600,657,15,0,1	2	251	ucircumflex
+:u	600,625,15,0,1	2	252	udieresis
+'y	600,661,142,1,4	3	253	yacute
+Tp	600,626,142,0,14	3	254	thorn
+:y	600,625,142,1,4	3	255	ydieresis
+IJ	600,562,18,22,8	2	256	IJ
+---	600,447	0	257	up
+---	600,320	0	258	dectab
+u0047_030C	600,790,18	2	259	Gcaron
+---	600,562	2	260	stop
+---	600,562	2	261	tab
+u2026	600,116,15	0	262	ellipsis
+---	600,333	0	263	largebullet
+u0073_0327	600,459,206	1	264	scedilla
+---	600,562	2	265	return
+ij	600,658,146	3	266	ij
+---	600,562,0,45,45	2	267	LL
+---	600,562	2	268	square
+da	600,608,15	2	269	arrowdown
+<-	600,455,0,34,24	0	270	arrowleft
+<>	600,455,0,24,24	0	271	arrowboth
+---	600,599	2	272	graybox
+->	600,455,0,24,34	0	273	arrowright
+u00AF	600,629	2	274	overscore
+---	600,626,0,0,12	2	275	ll
+u0067_030C	600,667,146	3	276	gcaron
+u20A4	600,611,28	2	277	lira
+---	600,580	2	278	center
+u0053_0327	600,582,206	3	279	Scedilla
+---	600,601,146	3	280	format
+ua	600,626	2	281	arrowup
+---	600,572,15	2	282	notegraphic
+u211E	600,562,15	2	283	prescription
+---	600,372	0	284	indent
+---	600,439,15	0	285	down
+---	600,371	0	286	left
+u0049_0307	600,748	2	287	Idot
+---	600,487,15	0	288	merge
diff --git a/contrib/groff/font/devps/CBI b/contrib/groff/font/devps/CBI
index b927db2..27976db 100644
--- a/contrib/groff/font/devps/CBI
+++ b/contrib/groff/font/devps/CBI
@@ -4,246 +4,279 @@ slant 12
 spacewidth 600
 encoding text.enc
 charset
-ha	600,616,0,5,-121,5	2	0000	-- asciicircum
-ti	600,356,0,39,-70,39	0	0001	-- asciitilde
-vS	600,790,22,122,-4,75	2	0002	-- Scaron
-vZ	600,790,0,109,-12,75	2	0003	-- Zcaron
-vs	600,667,17,82,-17,75	2	0004	-- scaron
-vz	600,667,0,82,-31,75	2	0005	-- zcaron
-:Y	600,748,0,158,-59,75	2	0006	-- Ydieresis
-tm	600,562,0,318,-36,75	2	0007	-- trademark
-aq	600,562,0,0,-254	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-166	2	0041	-- exclam
-"	600,562,0,34,-162,34	2	0042	-- quotedbl
+ha	600,616,0,5,-121,5	2	0	asciicircum
+ti	600,356,0,39,-70,39	0	1	asciitilde
+vS	600,790,22,122,-4,75	2	2	Scaron
+vZ	600,790,0,109,-12,75	2	3	Zcaron
+vs	600,667,17,82,-17,75	2	4	scaron
+vz	600,667,0,82,-31,75	2	5	zcaron
+:Y	600,748,0,158,-59,75	2	6	Ydieresis
+tm	600,562,0,318,-36,75	2	7	trademark
+aq	600,562,0,0,-254	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15,0,-166	2	33	exclam
+"	600,562,0,34,-162,34	2	34	quotedbl
 dq	"
-#	600,651,45,90,-38,75	2	0043	-- numbersign
+#	600,651,45,90,-38,75	2	35	numbersign
 sh	"
-$	600,666,126,79,-37,75	2	0044	-- dollar
+$	600,666,126,79,-37,75	2	36	dollar
 Do	"
-%	600,616,15,74,-52,74	2	0045	-- percent
-&	600,543,15,44,-12,44	0	0046	-- ampersand
-'	600,562,0,0,-180	2	0047	-- quoteright
+%	600,616,15,74,-52,74	2	37	percent
+&	600,543,15,44,-12,44	0	38	ampersand
+'	600,562,0,0,-180	2	39	quoteright
 cq	"
-(	600,616,102,42,-216,42	2	0050	-- parenleft
-)	600,616,102,0,-67	2	0051	-- parenright
-*	600,601,0,47,-129,47	2	0052	-- asterisk
-+	600,478,0,46,-64,46	0	0053	-- plus
-,	600,174,111,0,-49	0	0054	-- comma
--	600,313,0,17,-93,17	0	0055	-- hyphen
+(	600,616,102,42,-216,42	2	40	parenleft
+)	600,616,102,0,-67	2	41	parenright
+*	600,601,0,47,-129,47	2	42	asterisk
++	600,478,0,46,-64,46	0	43	plus
+,	600,174,111,0,-49	0	44	comma
+-	600,313,0,17,-93,17	0	45	hyphen
 hy	"
-.	600,171,15,0,-157	0	0056	-- period
-/	600,626,77,76,-41,75	2	0057	-- slash
+.	600,171,15,0,-157	0	46	period
+/	600,626,77,76,-41,75	2	47	slash
 sl	"
-0	600,616,15,42,-86,42	2	0060	-- zero
-1	600,616,0,11,-43,11	2	0061	-- one
-2	600,616,0,43,-11,43	2	0062	-- two
-3	600,616,15,21,-22,21	2	0063	-- three
-4	600,616,0,8,-32,8	2	0064	-- four
-5	600,601,15,71,-27,71	2	0065	-- five
-6	600,616,15,102,-86,75	2	0066	-- six
-7	600,601,0,72,-97,72	2	0067	-- seven
-8	600,616,15,54,-65,54	2	0070	-- eight
-9	600,616,15,42,-26,42	2	0071	-- nine
-:	600,425,15,0,-156	0	0072	-- colon
-;	600,425,111,0,-49	0	0073	-- semicolon
-<	600,501,0,62,-71,62	0	0074	-- less
-=	600,398,0,64,-46,64	0	0075	-- equal
->	600,501,0,39,-47,39	0	0076	-- greater
-?	600,580,14,41,-133,41	2	0077	-- question
-@	600,616,15,91,-16,75	2	0100	-- at
+0	600,616,15,42,-86,42	2	48	zero
+1	600,616,0,11,-43,11	2	49	one
+2	600,616,0,43,-11,43	2	50	two
+3	600,616,15,21,-22,21	2	51	three
+4	600,616,0,8,-32,8	2	52	four
+5	600,601,15,71,-27,71	2	53	five
+6	600,616,15,102,-86,75	2	54	six
+7	600,601,0,72,-97,72	2	55	seven
+8	600,616,15,54,-65,54	2	56	eight
+9	600,616,15,42,-26,42	2	57	nine
+:	600,425,15,0,-156	0	58	colon
+;	600,425,111,0,-49	0	59	semicolon
+<	600,501,0,62,-71,62	0	60	less
+=	600,398,0,64,-46,64	0	61	equal
+>	600,501,0,39,-47,39	0	62	greater
+?	600,580,14,41,-133,41	2	63	question
+@	600,616,15,91,-16,75	2	64	at
 at	"
-A	600,562,0,81,59,75	2	0101	-- A
-B	600,562,0,79,20,75	2	0102	-- B
-C	600,580,18,124,-25,75	2	0103	-- C
-D	600,562,0,114,20,75	2	0104	-- D
-E	600,562,0,119,25,75	2	0105	-- E
-F	600,562,0,133,11,75	2	0106	-- F
-G	600,580,18,124,-25,75	2	0107	-- G
-H	600,562,0,149,30,75	2	0110	-- H
-I	600,562,0,92,-27,75	2	0111	-- I
-J	600,562,18,170,-9,75	2	0112	-- J
-K	600,562,0,141,29,75	2	0113	-- K
-L	600,562,0,85,11,75	2	0114	-- L
-M	600,562,0,171,52,75	2	0115	-- M
-N	600,562,12,179,42,75	2	0116	-- N
-O	600,580,18,95,-24,75	2	0117	-- O
-P	600,562,0,92,2,75	2	0120	-- P
-Q	600,580,138,86,-34,75	2	0121	-- Q
-R	600,562,0,67,26,67	2	0122	-- R
-S	600,582,22,122,-4,75	2	0123	-- S
-T	600,562,0,128,-36,75	2	0124	-- T
-U	600,562,18,165,-51,75	2	0125	-- U
-V	600,562,0,182,-34,75	2	0126	-- V
-W	600,562,0,187,-34,75	2	0127	-- W
-X	600,562,0,139,38,75	2	0130	-- X
-Y	600,562,0,158,-59,75	2	0131	-- Y
-Z	600,562,0,86,-12,75	2	0132	-- Z
-[	600,616,102,56,-173,56	2	0133	-- bracketleft
+A	600,562,0,81,59,75	2	65	A
+B	600,562,0,79,20,75	2	66	B
+C	600,580,18,124,-25,75	2	67	C
+D	600,562,0,114,20,75	2	68	D
+E	600,562,0,119,25,75	2	69	E
+F	600,562,0,133,11,75	2	70	F
+G	600,580,18,124,-25,75	2	71	G
+H	600,562,0,149,30,75	2	72	H
+I	600,562,0,92,-27,75	2	73	I
+J	600,562,18,170,-9,75	2	74	J
+K	600,562,0,141,29,75	2	75	K
+L	600,562,0,85,11,75	2	76	L
+M	600,562,0,171,52,75	2	77	M
+N	600,562,12,179,42,75	2	78	N
+O	600,580,18,95,-24,75	2	79	O
+P	600,562,0,92,2,75	2	80	P
+Q	600,580,138,86,-34,75	2	81	Q
+R	600,562,0,67,26,67	2	82	R
+S	600,582,22,122,-4,75	2	83	S
+T	600,562,0,128,-36,75	2	84	T
+U	600,562,18,165,-51,75	2	85	U
+V	600,562,0,182,-34,75	2	86	V
+W	600,562,0,187,-34,75	2	87	W
+X	600,562,0,139,38,75	2	88	X
+Y	600,562,0,158,-59,75	2	89	Y
+Z	600,562,0,86,-12,75	2	90	Z
+[	600,616,102,56,-173,56	2	91	bracketleft
 lB	"
-\	600,626,77,0,-173	2	0134	-- backslash
+\	600,626,77,0,-173	2	92	backslash
 rs	"
-]	600,616,102,0,-53	2	0135	-- bracketright
+]	600,616,102,0,-53	2	93	bracketright
 rB	"
-a^	600,657,0,56,-162,56	2	0136	-- circumflex
+a^	600,657,0,56,-162,56	2	94	circumflex
 ^	"
-_	600,0,125,34,77,34	0	0137	-- underscore
-`	600,562,0,0,-247	2	0140	-- quoteleft
+_	600,0,125,34,77,34	0	95	underscore
+`	600,562,0,0,-247	2	96	quoteleft
 oq	"
-a	600,454,15,42,-12,42	0	0141	-- a
-b	600,626,15,86,37,75	2	0142	-- b
-c	600,459,15,81,-31,75	0	0143	-- c
-d	600,626,15,94,-11,75	2	0144	-- d
-e	600,454,15,54,-31,54	0	0145	-- e
-f	600,626,0,127,-33,75	2	0146	-- f
-g	600,454,146,123,9,75	1	0147	-- g
-h	600,626,0,64,32,64	2	0150	-- h
-i	600,658,0,0,-27	2	0151	-- i
-j	600,658,146,30,13,30	3	0152	-- j
-k	600,626,0,92,17,75	2	0153	-- k
-l	600,626,0,0,-27	2	0154	-- l
-m	600,454,0,98,72,75	0	0155	-- m
-n	600,454,0,64,32,64	0	0156	-- n
-o	600,454,15,72,-21,72	0	0157	-- o
-p	600,454,142,72,81,72	1	0160	-- p
-q	600,454,142,134,-11,75	1	0161	-- q
-r	600,454,0,104,3,75	0	0162	-- r
-s	600,459,17,57,-17,57	0	0163	-- s
-t	600,562,15,16,-68,16	2	0164	-- t
-u	600,439,15,41,-20,41	0	0165	-- u
-v	600,439,0,144,-20,75	0	0166	-- v
-w	600,439,0,161,-3,75	0	0167	-- w
-x	600,439,0,120,44,75	0	0170	-- x
-y	600,439,142,144,70,75	1	0171	-- y
-z	600,439,0,63,-31,63	0	0172	-- z
-lC	600,616,102,45,-154,45	2	0173	-- braceleft
+a	600,454,15,42,-12,42	0	97	a
+b	600,626,15,86,37,75	2	98	b
+c	600,459,15,81,-31,75	0	99	c
+d	600,626,15,94,-11,75	2	100	d
+e	600,454,15,54,-31,54	0	101	e
+f	600,626,0,127,-33,75	2	102	f
+g	600,454,146,123,9,75	1	103	g
+h	600,626,0,64,32,64	2	104	h
+i	600,658,0,0,-27	2	105	i
+j	600,658,146,30,13,30	3	106	j
+k	600,626,0,92,17,75	2	107	k
+l	600,626,0,0,-27	2	108	l
+m	600,454,0,98,72,75	0	109	m
+n	600,454,0,64,32,64	0	110	n
+o	600,454,15,72,-21,72	0	111	o
+p	600,454,142,72,81,72	1	112	p
+q	600,454,142,134,-11,75	1	113	q
+r	600,454,0,104,3,75	0	114	r
+s	600,459,17,57,-17,57	0	115	s
+t	600,562,15,16,-68,16	2	116	t
+u	600,439,15,41,-20,41	0	117	u
+v	600,439,0,144,-20,75	0	118	v
+w	600,439,0,161,-3,75	0	119	w
+x	600,439,0,120,44,75	0	120	x
+y	600,439,142,144,70,75	1	121	y
+z	600,439,0,63,-31,63	0	122	z
+lC	600,616,102,45,-154,45	2	123	braceleft
 {	"
-ba	600,750,250,0,-152	3	0174	-- bar
+ba	600,750,250,0,-152	3	124	bar
 |	"
-rC	600,616,102,0,-64	2	0175	-- braceright
+rC	600,616,102,0,-64	2	125	braceright
 }	"
-a~	600,636,0,92,-150,75	2	0176	-- tilde
+a~	600,636,0,92,-150,75	2	126	tilde
 ~	"
-bq	600,143,142,0,-95	1	0200	-- quotesinglbase
-Fo	600,446,0,88,-13,75	0	0201	-- guillemotleft
-Fc	600,446,0,97,-22,75	0	0202	-- guillemotright
-bu	600,430,0,0,-147	0	0203	-- bullet
-Fn	600,616,131,151,106,75	2	0204	-- florin
-f/	600,661,60,157,28,75	2	0205	-- fraction
-%0	600,616,15,192,94,75	2	0206	-- perthousand
-dg	600,580,70,36,-126,36	2	0207	-- dagger
-dd	600,580,70,36,-72,36	2	0210	-- daggerdbl
-en	600,313,0,52,-58,52	0	0211	-- endash
-em	600,313,0,127,17,75	0	0212	-- emdash
-fi	600,626,0,93,38,75	2	0214	-- fi
-fl	600,626,0,93,38,75	2	0215	-- fl
-.i	600,439,0,0,-27	0	0220	-- dotlessi
-ga	600,661,0,0,-222	2	0222	-- grave
-a"	600,661,0,178,-122,75	2	0223	-- hungarumlaut
-a.	600,625,0,0,-296	2	0224	-- dotaccent
-ab	600,631,0,101,-167,75	2	0225	-- breve
-ah	600,667,0,82,-188,75	2	0226	-- caron
-ao	600,678,0,0,-269	2	0227	-- ring
-ho	600,0,199,0,-94	1	0230	-- ogonek
-lq	600,562,0,44,-140,44	2	0231	-- quotedblleft
-rq	600,562,0,94,-70,75	2	0232	-- quotedblright
-oe	600,454,15,111,31,75	0	0233	-- oe
-/l	600,626,0,28,-27,28	2	0234	-- lslash
-Bq	600,143,142,9,15,9	1	0235	-- quotedblbase
-OE	600,562,0,150,24,75	2	0236	-- OE
-/L	600,562,0,85,11,75	2	0237	-- Lslash
-r!	600,449,146,0,-147	1	0241	-- exclamdown
-ct	600,614,49,54,-71,54	2	0242	-- cent
-Po	600,611,28,100,-57,75	2	0243	-- sterling
-Cs	600,517,0,93,-27,75	0	0244	-- currency
-Ye	600,562,0,159,-48,75	2	0245	-- yen
-bb	600,675,175,0,-168	3	0246	-- brokenbar
-sc	600,580,70,69,-24,69	2	0247	-- section
-ad	600,625,0,42,-194,42	2	0250	-- dieresis
-co	600,580,18,117,-3,75	2	0251	-- copyright
-Of	600,580,0,0,-139	2	0252	-- ordfeminine
-fo	600,446,0,0,-146	0	0253	-- guilsinglleft
-no	600,413,0,67,-85,67	0	0254	-- logicalnot
-\-	600,313,0,46,-64,46	0	0255	-- minus
-rg	600,580,18,117,-3,75	2	0256	-- registered
-a-	600,585,0,86,-145,75	2	0257	-- macron
-de	600,616,0,19,-123,19	2	0260	-- degree
-t+-	600,515,0,64,-26,64	0	0261	-- plusminus
-S2	600,616,0,0,-142	2	0262	-- twosuperior
-S3	600,616,0,0,-143	2	0263	-- threesuperior
-aa	600,661,0,58,-263,58	2	0264	-- acute
-mc	600,439,142,41,0,41	1	0265	-- mu
-ps	600,580,70,149,-11,75	2	0266	-- paragraph
-pc	600,351,0,0,-199	0	0267	-- periodcentered
-ac	600,0,206,0,-119	1	0270	-- cedilla
-S1	600,616,0,0,-163	2	0271	-- onesuperior
-Om	600,580,0,0,-139	2	0272	-- ordmasculine
-fc	600,446,0,0,-116	0	0273	-- guilsinglright
-14	600,661,60,156,36,75	2	0274	-- onequarter
-12	600,661,60,165,27,75	2	0275	-- onehalf
-34	600,661,60,148,42,75	2	0276	-- threequarters
-r?	600,449,146,0,-51	1	0277	-- questiondown
-`A	600,784,0,81,59,75	2	0300	-- Agrave
-'A	600,784,0,115,59,75	2	0301	-- Aacute
-^A	600,780,0,81,59,75	2	0302	-- Acircumflex
-~A	600,759,0,88,59,75	2	0303	-- Atilde
-:A	600,748,0,81,59,75	2	0304	-- Adieresis
-oA	600,801,0,81,59,75	2	0305	-- Aring
-AE	600,562,0,157,79,75	2	0306	-- AE
-,C	600,580,206,124,-24,75	3	0307	-- Ccedilla
-`E	600,784,0,119,25,75	2	0310	-- Egrave
-'E	600,784,0,119,25,75	2	0311	-- Eacute
-^E	600,780,0,119,25,75	2	0312	-- Ecircumflex
-:E	600,748,0,119,25,75	2	0313	-- Edieresis
-`I	600,784,0,92,-27,75	2	0314	-- Igrave
-'I	600,784,0,92,-27,75	2	0315	-- Iacute
-^I	600,780,0,92,-27,75	2	0316	-- Icircumflex
-:I	600,748,0,92,-27,75	2	0317	-- Idieresis
--D	600,562,0,114,20,75	2	0320	-- Eth
-~N	600,759,12,179,42,75	2	0321	-- Ntilde
-`O	600,784,18,95,-24,75	2	0322	-- Ograve
-'O	600,784,18,95,-24,75	2	0323	-- Oacute
-^O	600,780,18,95,-24,75	2	0324	-- Ocircumflex
-~O	600,759,18,118,-24,75	2	0325	-- Otilde
-:O	600,748,18,95,-24,75	2	0326	-- Odieresis
-tmu	600,478,0,56,-55,56	0	0327	-- multiply
-/O	600,584,22,122,2,75	2	0330	-- Oslash
-`U	600,784,18,165,-51,75	2	0331	-- Ugrave
-'U	600,784,18,165,-51,75	2	0332	-- Uacute
-^U	600,780,18,165,-51,75	2	0333	-- Ucircumflex
-:U	600,748,18,165,-51,75	2	0334	-- Udieresis
-'Y	600,784,0,158,-59,75	2	0335	-- Yacute
-TP	600,562,0,69,2,69	2	0336	-- Thorn
-ss	600,626,15,78,28,75	2	0337	-- germandbls
-`a	600,661,15,42,-12,42	2	0340	-- agrave
-'a	600,661,15,58,-12,58	2	0341	-- aacute
-^a	600,657,15,42,-12,42	2	0342	-- acircumflex
-~a	600,636,15,92,-12,75	2	0343	-- atilde
-:a	600,625,15,42,-12,42	2	0344	-- adieresis
-oa	600,678,15,42,-12,42	2	0345	-- aring
-ae	600,454,15,101,29,75	0	0346	-- ae
-,c	600,459,206,81,-31,75	1	0347	-- ccedilla
-`e	600,661,15,54,-31,54	2	0350	-- egrave
-'e	600,661,15,58,-31,58	2	0351	-- eacute
-^e	600,657,15,56,-31,56	2	0352	-- ecircumflex
-:e	600,625,15,54,-31,54	2	0353	-- edieresis
-`i	600,661,0,0,-27	2	0354	-- igrave
-'i	600,661,0,58,-27,58	2	0355	-- iacute
-^i	600,657,0,16,-27,16	2	0356	-- icircumflex
-:i	600,625,0,2,-27,2	2	0357	-- idieresis
-Sd	600,626,27,111,-43,75	2	0360	-- eth
-~n	600,636,0,92,32,75	2	0361	-- ntilde
-`o	600,661,15,72,-21,72	2	0362	-- ograve
-'o	600,661,15,72,-21,72	2	0363	-- oacute
-^o	600,657,15,72,-21,72	2	0364	-- ocircumflex
-~o	600,636,15,92,-21,75	2	0365	-- otilde
-:o	600,625,15,72,-21,72	2	0366	-- odieresis
-tdi	600,500,0,46,-64,46	0	0367	-- divide
-/o	600,463,24,87,-5,75	0	0370	-- oslash
-`u	600,661,15,41,-20,41	2	0371	-- ugrave
-'u	600,661,15,58,-20,58	2	0372	-- uacute
-^u	600,657,15,41,-20,41	2	0373	-- ucircumflex
-:u	600,625,15,41,-20,41	2	0374	-- udieresis
-'y	600,661,142,144,70,75	3	0375	-- yacute
-Tp	600,626,142,72,81,72	3	0376	-- thorn
-:y	600,625,142,144,70,75	3	0377	-- ydieresis
+bq	600,143,142,0,-95	1	128	quotesinglbase
+Fo	600,446,0,88,-13,75	0	129	guillemotleft
+Fc	600,446,0,97,-22,75	0	130	guillemotright
+bu	600,430,0,0,-147	0	131	bullet
+Fn	600,616,131,151,106,75	2	132	florin
+f/	600,661,60,157,28,75	2	133	fraction
+%0	600,616,15,192,94,75	2	134	perthousand
+dg	600,580,70,36,-126,36	2	135	dagger
+dd	600,580,70,36,-72,36	2	136	daggerdbl
+en	600,313,0,52,-58,52	0	137	endash
+em	600,313,0,127,17,75	0	138	emdash
+fi	600,626,0,93,38,75	2	140	fi
+fl	600,626,0,93,38,75	2	141	fl
+.i	600,439,0,0,-27	0	144	dotlessi
+ga	600,661,0,0,-222	2	146	grave
+a"	600,661,0,178,-122,75	2	147	hungarumlaut
+a.	600,625,0,0,-296	2	148	dotaccent
+ab	600,631,0,101,-167,75	2	149	breve
+ah	600,667,0,82,-188,75	2	150	caron
+ao	600,678,0,0,-269	2	151	ring
+ho	600,0,199,0,-94	1	152	ogonek
+lq	600,562,0,44,-140,44	2	153	quotedblleft
+rq	600,562,0,94,-70,75	2	154	quotedblright
+oe	600,454,15,111,31,75	0	155	oe
+/l	600,626,0,28,-27,28	2	156	lslash
+Bq	600,143,142,9,15,9	1	157	quotedblbase
+OE	600,562,0,150,24,75	2	158	OE
+/L	600,562,0,85,11,75	2	159	Lslash
+r!	600,449,146,0,-147	1	161	exclamdown
+ct	600,614,49,54,-71,54	2	162	cent
+Po	600,611,28,100,-57,75	2	163	sterling
+Cs	600,517,0,93,-27,75	0	164	currency
+Ye	600,562,0,159,-48,75	2	165	yen
+bb	600,675,175,0,-168	3	166	brokenbar
+sc	600,580,70,69,-24,69	2	167	section
+ad	600,625,0,42,-194,42	2	168	dieresis
+co	600,580,18,117,-3,75	2	169	copyright
+Of	600,580,0,0,-139	2	170	ordfeminine
+fo	600,446,0,0,-146	0	171	guilsinglleft
+tno	600,413,0,67,-85,67	0	172	logicalnot
+\-	600,313,0,46,-64,46	0	173	minus
+rg	600,580,18,117,-3,75	2	174	registered
+a-	600,585,0,86,-145,75	2	175	macron
+de	600,616,0,19,-123,19	2	176	degree
+t+-	600,515,0,64,-26,64	0	177	plusminus
+S2	600,616,0,0,-142	2	178	twosuperior
+S3	600,616,0,0,-143	2	179	threesuperior
+aa	600,661,0,58,-263,58	2	180	acute
+mc	600,439,142,41,0,41	1	181	mu
+ps	600,580,70,149,-11,75	2	182	paragraph
+pc	600,351,0,0,-199	0	183	periodcentered
+ac	600,0,206,0,-119	1	184	cedilla
+S1	600,616,0,0,-163	2	185	onesuperior
+Om	600,580,0,0,-139	2	186	ordmasculine
+fc	600,446,0,0,-116	0	187	guilsinglright
+14	600,661,60,156,36,75	2	188	onequarter
+12	600,661,60,165,27,75	2	189	onehalf
+34	600,661,60,148,42,75	2	190	threequarters
+r?	600,449,146,0,-51	1	191	questiondown
+`A	600,784,0,81,59,75	2	192	Agrave
+'A	600,784,0,115,59,75	2	193	Aacute
+^A	600,780,0,81,59,75	2	194	Acircumflex
+~A	600,759,0,88,59,75	2	195	Atilde
+:A	600,748,0,81,59,75	2	196	Adieresis
+oA	600,801,0,81,59,75	2	197	Aring
+AE	600,562,0,157,79,75	2	198	AE
+,C	600,580,206,124,-24,75	3	199	Ccedilla
+`E	600,784,0,119,25,75	2	200	Egrave
+'E	600,784,0,119,25,75	2	201	Eacute
+^E	600,780,0,119,25,75	2	202	Ecircumflex
+:E	600,748,0,119,25,75	2	203	Edieresis
+`I	600,784,0,92,-27,75	2	204	Igrave
+'I	600,784,0,92,-27,75	2	205	Iacute
+^I	600,780,0,92,-27,75	2	206	Icircumflex
+:I	600,748,0,92,-27,75	2	207	Idieresis
+-D	600,562,0,114,20,75	2	208	Eth
+~N	600,759,12,179,42,75	2	209	Ntilde
+`O	600,784,18,95,-24,75	2	210	Ograve
+'O	600,784,18,95,-24,75	2	211	Oacute
+^O	600,780,18,95,-24,75	2	212	Ocircumflex
+~O	600,759,18,118,-24,75	2	213	Otilde
+:O	600,748,18,95,-24,75	2	214	Odieresis
+tmu	600,478,0,56,-55,56	0	215	multiply
+/O	600,584,22,122,2,75	2	216	Oslash
+`U	600,784,18,165,-51,75	2	217	Ugrave
+'U	600,784,18,165,-51,75	2	218	Uacute
+^U	600,780,18,165,-51,75	2	219	Ucircumflex
+:U	600,748,18,165,-51,75	2	220	Udieresis
+'Y	600,784,0,158,-59,75	2	221	Yacute
+TP	600,562,0,69,2,69	2	222	Thorn
+ss	600,626,15,78,28,75	2	223	germandbls
+`a	600,661,15,42,-12,42	2	224	agrave
+'a	600,661,15,58,-12,58	2	225	aacute
+^a	600,657,15,42,-12,42	2	226	acircumflex
+~a	600,636,15,92,-12,75	2	227	atilde
+:a	600,625,15,42,-12,42	2	228	adieresis
+oa	600,678,15,42,-12,42	2	229	aring
+ae	600,454,15,101,29,75	0	230	ae
+,c	600,459,206,81,-31,75	1	231	ccedilla
+`e	600,661,15,54,-31,54	2	232	egrave
+'e	600,661,15,58,-31,58	2	233	eacute
+^e	600,657,15,56,-31,56	2	234	ecircumflex
+:e	600,625,15,54,-31,54	2	235	edieresis
+`i	600,661,0,0,-27	2	236	igrave
+'i	600,661,0,58,-27,58	2	237	iacute
+^i	600,657,0,16,-27,16	2	238	icircumflex
+:i	600,625,0,2,-27,2	2	239	idieresis
+Sd	600,626,27,111,-43,75	2	240	eth
+~n	600,636,0,92,32,75	2	241	ntilde
+`o	600,661,15,72,-21,72	2	242	ograve
+'o	600,661,15,72,-21,72	2	243	oacute
+^o	600,657,15,72,-21,72	2	244	ocircumflex
+~o	600,636,15,92,-21,75	2	245	otilde
+:o	600,625,15,72,-21,72	2	246	odieresis
+tdi	600,500,0,46,-64,46	0	247	divide
+/o	600,463,24,87,-5,75	0	248	oslash
+`u	600,661,15,41,-20,41	2	249	ugrave
+'u	600,661,15,58,-20,58	2	250	uacute
+^u	600,657,15,41,-20,41	2	251	ucircumflex
+:u	600,625,15,41,-20,41	2	252	udieresis
+'y	600,661,142,144,70,75	3	253	yacute
+Tp	600,626,142,72,81,72	3	254	thorn
+:y	600,625,142,144,70,75	3	255	ydieresis
+IJ	600,562,18,191,58,75	2	256	IJ
+---	600,447,0,0,-146	0	257	up
+---	600,320,0,65,42,65	0	258	dectab
+u0047_030C	600,790,18,124,-25,75	2	259	Gcaron
+---	600,562,0,150,31,75	2	260	stop
+---	600,562,0,91,31,75	2	261	tab
+u2026	600,116,15,36,15,36	0	262	ellipsis
+---	600,333,0,0,-257	0	263	largebullet
+u0073_0327	600,459,206,57,-17,57	1	264	scedilla
+---	600,562,0,150,-29,75	2	265	return
+ij	600,658,146,164,44,75	3	266	ij
+---	600,562,0,144,95,75	2	267	LL
+---	600,562,0,150,31,75	2	268	square
+da	600,608,15,0,-124	2	269	arrowdown
+<-	600,455,0,158,10,75	0	270	arrowleft
+<>	600,455,0,138,10,75	0	271	arrowboth
+---	600,599,0,102,-26,75	2	272	graybox
+->	600,455,0,138,30,75	0	273	arrowright
+u00AF	600,629,0,184,-73,75	2	274	overscore
+---	600,626,0,103,49,75	2	275	ll
+u0067_030C	600,667,146,123,9,75	3	276	gcaron
+u20A4	600,611,28,100,-57,75	2	277	lira
+---	600,580,0,73,-53,73	2	278	center
+u0053_0327	600,582,206,122,-4,75	3	279	Scedilla
+---	600,601,146,0,76	3	280	format
+ua	600,626,0,6,-194,6	2	281	arrowup
+---	600,572,15,69,-41,69	2	282	notegraphic
+u211E	600,562,15,82,26,75	2	283	prescription
+---	600,372,0,29,-49,29	0	284	indent
+---	600,439,15,0,-118	0	285	down
+---	600,371,0,39,-59,39	0	286	left
+u0049_0307	600,748,0,92,-27,75	2	287	Idot
+---	600,487,15,0,-118	0	288	merge
diff --git a/contrib/groff/font/devps/CI b/contrib/groff/font/devps/CI
index 32d7bef..7d7582d 100644
--- a/contrib/groff/font/devps/CI
+++ b/contrib/groff/font/devps/CI
@@ -4,246 +4,279 @@ slant 12
 spacewidth 600
 encoding text.enc
 charset
-ha	600,622,0,37,-125,37	2	0000	-- asciicircum
-ti	600,320,0,50,-66,50	0	0001	-- asciitilde
-vS	600,805,20,123,-26,72	2	0002	-- Scaron
-vZ	600,805,0,93,-36,72	2	0003	-- Zcaron
-vs	600,669,15,64,-28,64	2	0004	-- scaron
-vz	600,669,0,74,-49,72	2	0005	-- zcaron
-:Y	600,731,0,145,-83,72	2	0006	-- Ydieresis
-tm	600,562,0,192,-25,72	2	0007	-- trademark
-aq	600,562,0,0,-295	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-193	2	0041	-- exclam
-"	600,562,0,0,-223	2	0042	-- quotedbl
+ha	600,622,0,37,-125,37	2	0	asciicircum
+ti	600,320,0,50,-66,50	0	1	asciitilde
+vS	600,805,20,123,-26,72	2	2	Scaron
+vZ	600,805,0,93,-36,72	2	3	Zcaron
+vs	600,669,15,64,-28,64	2	4	scaron
+vz	600,669,0,74,-49,72	2	5	zcaron
+:Y	600,731,0,145,-83,72	2	6	Ydieresis
+tm	600,562,0,192,-25,72	2	7	trademark
+aq	600,562,0,0,-295	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15,0,-193	2	33	exclam
+"	600,562,0,0,-223	2	34	quotedbl
 dq	"
-#	600,639,32,46,-83,46	2	0043	-- numbersign
+#	600,639,32,46,-83,46	2	35	numbersign
 sh	"
-$	600,662,126,46,-58,46	2	0044	-- dollar
+$	600,662,126,46,-58,46	2	36	dollar
 Do	"
-%	600,622,15,49,-84,49	2	0045	-- percent
-&	600,543,15,30,-37,30	0	0046	-- ampersand
-'	600,562,0,0,-233	2	0047	-- quoteright
+%	600,622,15,49,-84,49	2	37	percent
+&	600,543,15,30,-37,30	0	38	ampersand
+'	600,562,0,0,-233	2	39	quoteright
 cq	"
-(	600,622,108,22,-263,22	2	0050	-- parenleft
-)	600,622,108,0,-87	2	0051	-- parenright
-*	600,607,0,30,-162,30	2	0052	-- asterisk
-+	600,470,0,30,-79,30	0	0053	-- plus
-,	600,122,112,0,-107	0	0054	-- comma
--	600,285,0,8,-102,8	0	0055	-- hyphen
+(	600,622,108,22,-263,22	2	40	parenleft
+)	600,622,108,0,-87	2	41	parenright
+*	600,607,0,30,-162,30	2	42	asterisk
++	600,470,0,30,-79,30	0	43	plus
+,	600,122,112,0,-107	0	44	comma
+-	600,285,0,8,-102,8	0	45	hyphen
 hy	"
-.	600,109,15,0,-188	0	0056	-- period
-/	600,629,80,54,-62,54	2	0057	-- slash
+.	600,109,15,0,-188	0	46	period
+/	600,629,80,54,-62,54	2	47	slash
 sl	"
-0	600,622,15,25,-104,25	2	0060	-- zero
-1	600,622,0,0,-48	2	0061	-- one
-2	600,622,0,18,-20,18	2	0062	-- two
-3	600,622,15,0,-32	2	0063	-- three
-4	600,622,0,0,-58	2	0064	-- four
-5	600,607,15,39,-49,39	2	0065	-- five
-6	600,622,15,79,-105,72	2	0066	-- six
-7	600,607,0,62,-132,62	2	0067	-- seven
-8	600,622,15,38,-82,38	2	0070	-- eight
-9	600,622,15,24,-43,24	2	0071	-- nine
-:	600,385,15,0,-188	0	0072	-- colon
-;	600,385,112,0,-107	0	0073	-- semicolon
-<	600,472,0,60,-46,60	0	0074	-- less
-=	600,376,0,50,-59,50	0	0075	-- equal
->	600,472,0,49,-35,49	0	0076	-- greater
-?	600,572,15,33,-172,33	2	0077	-- question
-@	600,622,15,32,-77,32	2	0100	-- at
+0	600,622,15,25,-104,25	2	48	zero
+1	600,622,0,0,-48	2	49	one
+2	600,622,0,18,-20,18	2	50	two
+3	600,622,15,0,-32	2	51	three
+4	600,622,0,0,-58	2	52	four
+5	600,607,15,39,-49,39	2	53	five
+6	600,622,15,79,-105,72	2	54	six
+7	600,607,0,62,-132,62	2	55	seven
+8	600,622,15,38,-82,38	2	56	eight
+9	600,622,15,24,-43,24	2	57	nine
+:	600,385,15,0,-188	0	58	colon
+;	600,385,112,0,-107	0	59	semicolon
+<	600,472,0,60,-46,60	0	60	less
+=	600,376,0,50,-59,50	0	61	equal
+>	600,472,0,49,-35,49	0	62	greater
+?	600,572,15,33,-172,33	2	63	question
+@	600,622,15,32,-77,32	2	64	at
 at	"
-A	600,562,0,57,47,57	2	0101	-- A
-B	600,562,0,66,7,66	2	0102	-- B
-C	600,580,18,105,-43,72	2	0103	-- C
-D	600,562,0,95,7,72	2	0104	-- D
-E	600,562,0,110,-3,72	2	0105	-- E
-F	600,562,0,110,-3,72	2	0106	-- F
-G	600,580,18,95,-33,72	2	0107	-- G
-H	600,562,0,137,18,72	2	0110	-- H
-I	600,562,0,73,-46,72	2	0111	-- I
-J	600,562,18,135,-2,72	2	0112	-- J
-K	600,562,0,121,12,72	2	0113	-- K
-L	600,562,0,57,3,57	2	0114	-- L
-M	600,562,0,165,46,72	2	0115	-- M
-N	600,562,13,162,43,72	2	0116	-- N
-O	600,580,18,75,-44,72	2	0117	-- O
-P	600,562,0,94,-29,72	2	0120	-- P
-Q	600,580,138,75,-45,72	2	0121	-- Q
-R	600,562,0,48,12,48	2	0122	-- R
-S	600,580,20,100,-26,72	2	0123	-- S
-T	600,562,0,115,-58,72	2	0124	-- T
-U	600,562,18,152,-75,72	2	0125	-- U
-V	600,562,13,173,-55,72	2	0126	-- V
-W	600,562,13,172,-56,72	2	0127	-- W
-X	600,562,0,125,27,72	2	0130	-- X
-Y	600,562,0,145,-83,72	2	0131	-- Y
-Z	600,562,0,60,-36,60	2	0132	-- Z
-[	600,622,108,24,-196,24	2	0133	-- bracketleft
+A	600,562,0,57,47,57	2	65	A
+B	600,562,0,66,7,66	2	66	B
+C	600,580,18,105,-43,72	2	67	C
+D	600,562,0,95,7,72	2	68	D
+E	600,562,0,110,-3,72	2	69	E
+F	600,562,0,110,-3,72	2	70	F
+G	600,580,18,95,-33,72	2	71	G
+H	600,562,0,137,18,72	2	72	H
+I	600,562,0,73,-46,72	2	73	I
+J	600,562,18,135,-2,72	2	74	J
+K	600,562,0,121,12,72	2	75	K
+L	600,562,0,57,3,57	2	76	L
+M	600,562,0,165,46,72	2	77	M
+N	600,562,13,162,43,72	2	78	N
+O	600,580,18,75,-44,72	2	79	O
+P	600,562,0,94,-29,72	2	80	P
+Q	600,580,138,75,-45,72	2	81	Q
+R	600,562,0,48,12,48	2	82	R
+S	600,580,20,100,-26,72	2	83	S
+T	600,562,0,115,-58,72	2	84	T
+U	600,562,18,152,-75,72	2	85	U
+V	600,562,13,173,-55,72	2	86	V
+W	600,562,13,172,-56,72	2	87	W
+X	600,562,0,125,27,72	2	88	X
+Y	600,562,0,145,-83,72	2	89	Y
+Z	600,562,0,60,-36,60	2	90	Z
+[	600,622,108,24,-196,24	2	91	bracketleft
 lB	"
-\	600,629,80,0,-199	2	0134	-- backslash
+\	600,629,80,0,-199	2	92	backslash
 rs	"
-]	600,622,108,0,-85	2	0135	-- bracketright
+]	600,622,108,0,-85	2	93	bracketright
 rB	"
-a^	600,654,0,31,-179,31	2	0136	-- circumflex
+a^	600,654,0,31,-179,31	2	94	circumflex
 ^	"
-_	600,0,125,34,77,34	0	0137	-- underscore
-`	600,562,0,0,-293	2	0140	-- quoteleft
+_	600,0,125,34,77,34	0	95	underscore
+`	600,562,0,0,-293	2	96	quoteleft
 oq	"
-a	600,441,15,19,-26,19	0	0141	-- a
-b	600,629,15,75,21,72	2	0142	-- b
-c	600,441,15,58,-56,58	0	0143	-- c
-d	600,629,15,90,-35,72	2	0144	-- d
-e	600,441,15,48,-56,48	0	0145	-- e
-f	600,629,0,112,-64,72	2	0146	-- f
-g	600,441,157,107,-11,72	1	0147	-- g
-h	600,629,0,42,17,42	2	0150	-- h
-i	600,657,0,0,-45	2	0151	-- i
-j	600,657,157,0,-2	3	0152	-- j
-k	600,629,0,83,-8,72	2	0153	-- k
-l	600,629,0,0,-45	2	0154	-- l
-m	600,441,0,65,55,65	0	0155	-- m
-n	600,441,0,35,24,35	0	0156	-- n
-o	600,441,15,38,-52,38	0	0157	-- o
-p	600,441,157,55,74,55	1	0160	-- p
-q	600,441,157,132,-35,72	1	0161	-- q
-r	600,441,0,86,-10,72	0	0162	-- r
-s	600,441,15,34,-28,34	0	0163	-- s
-t	600,561,15,11,-117,11	2	0164	-- t
-u	600,426,15,22,-51,22	0	0165	-- u
-v	600,426,10,131,-40,72	0	0166	-- v
-w	600,426,10,145,-26,72	0	0167	-- w
-x	600,426,0,105,30,72	0	0170	-- x
-y	600,426,157,133,54,72	1	0171	-- y
-z	600,426,0,43,-49,43	0	0172	-- z
-lC	600,622,108,19,-183,19	2	0173	-- braceleft
+a	600,441,15,19,-26,19	0	97	a
+b	600,629,15,75,21,72	2	98	b
+c	600,441,15,58,-56,58	0	99	c
+d	600,629,15,90,-35,72	2	100	d
+e	600,441,15,48,-56,48	0	101	e
+f	600,629,0,112,-64,72	2	102	f
+g	600,441,157,107,-11,72	1	103	g
+h	600,629,0,42,17,42	2	104	h
+i	600,657,0,0,-45	2	105	i
+j	600,657,157,0,-2	3	106	j
+k	600,629,0,83,-8,72	2	107	k
+l	600,629,0,0,-45	2	108	l
+m	600,441,0,65,55,65	0	109	m
+n	600,441,0,35,24,35	0	110	n
+o	600,441,15,38,-52,38	0	111	o
+p	600,441,157,55,74,55	1	112	p
+q	600,441,157,132,-35,72	1	113	q
+r	600,441,0,86,-10,72	0	114	r
+s	600,441,15,34,-28,34	0	115	s
+t	600,561,15,11,-117,11	2	116	t
+u	600,426,15,22,-51,22	0	117	u
+v	600,426,10,131,-40,72	0	118	v
+w	600,426,10,145,-26,72	0	119	w
+x	600,426,0,105,30,72	0	120	x
+y	600,426,157,133,54,72	1	121	y
+z	600,426,0,43,-49,43	0	122	z
+lC	600,622,108,19,-183,19	2	123	braceleft
 {	"
-ba	600,750,250,0,-172	3	0174	-- bar
+ba	600,750,250,0,-172	3	124	bar
 |	"
-rC	600,622,108,0,-90	2	0175	-- braceright
+rC	600,622,108,0,-90	2	125	braceright
 }	"
-a~	600,606,0,79,-162,72	2	0176	-- tilde
+a~	600,606,0,79,-162,72	2	126	tilde
 ~	"
-bq	600,100,134,0,-135	0	0200	-- quotesinglbase
-Fo	600,446,0,102,-42,72	0	0201	-- guillemotleft
-Fc	600,446,0,68,-8,68	0	0202	-- guillemotright
-bu	600,383,0,0,-174	0	0203	-- bullet
-Fn	600,622,143,121,76,72	2	0204	-- florin
-f/	600,665,57,96,-34,72	2	0205	-- fraction
-%0	600,622,15,77,-9,72	2	0206	-- perthousand
-dg	600,580,78,0,-167	2	0207	-- dagger
-dd	600,580,78,0,-113	2	0210	-- daggerdbl
-en	600,285,0,36,-74,36	0	0211	-- endash
-em	600,285,0,111,1,72	0	0212	-- emdash
-fi	600,629,0,69,47,69	2	0214	-- fi
-fl	600,629,0,69,47,69	2	0215	-- fl
-.i	600,426,0,0,-45	0	0220	-- dotlessi
-ga	600,672,0,0,-244	2	0222	-- grave
-a"	600,672,0,133,-189,72	2	0223	-- hungarumlaut
-a.	600,580,0,0,-310	2	0224	-- dotaccent
-ab	600,609,0,26,-229,26	2	0225	-- breve
-ah	600,669,0,64,-212,64	2	0226	-- caron
-ao	600,627,0,0,-282	2	0227	-- ring
-ho	600,0,151,0,-157	0	0230	-- ogonek
-lq	600,562,0,0,-212	2	0231	-- quotedblleft
-rq	600,562,0,26,-163,26	2	0232	-- quotedblright
-oe	600,441,15,65,-4,65	0	0233	-- oe
-/l	600,629,0,33,-45,33	2	0234	-- lslash
-Bq	600,100,134,0,-65	0	0235	-- quotedblbase
-OE	600,562,0,122,-9,72	2	0236	-- OE
-/L	600,562,0,57,3,57	2	0237	-- Lslash
-r!	600,430,157,0,-175	1	0241	-- exclamdown
-ct	600,614,49,38,-101,38	2	0242	-- cent
-Po	600,611,21,71,-74,71	2	0243	-- sterling
-Cs	600,506,0,78,-44,72	0	0244	-- currency
-Ye	600,562,0,143,-70,72	2	0245	-- yen
-bb	600,675,175,0,-188	3	0246	-- brokenbar
-sc	600,580,78,40,-54,40	2	0247	-- section
-ad	600,595,0,20,-212,20	2	0250	-- dieresis
-co	600,580,18,117,-3,72	2	0251	-- copyright
-Of	600,580,0,0,-159	2	0252	-- ordfeminine
-fo	600,446,0,0,-154	0	0253	-- guilsinglleft
-no	600,369,0,41,-105,41	0	0254	-- logicalnot
-\-	600,283,0,30,-79,30	0	0255	-- minus
-rg	600,580,18,117,-3,72	2	0256	-- registered
-a-	600,565,0,50,-182,50	2	0257	-- macron
-de	600,622,0,26,-164,26	2	0260	-- degree
-t+-	600,558,0,44,-46,44	0	0261	-- plusminus
-S2	600,622,0,0,-180	2	0262	-- twosuperior
-S3	600,622,0,0,-163	2	0263	-- threesuperior
-aa	600,672,0,62,-298,62	2	0264	-- acute
-mc	600,426,157,22,-22,22	1	0265	-- mu
-ps	600,562,78,80,-50,72	2	0266	-- paragraph
-pc	600,327,0,0,-225	0	0267	-- periodcentered
-ac	600,10,151,0,-147	0	0270	-- cedilla
-S1	600,622,0,0,-181	2	0271	-- onesuperior
-Om	600,580,0,0,-160	2	0272	-- ordmasculine
-fc	600,446,0,0,-120	0	0273	-- guilsinglright
-14	600,665,57,124,-15,72	2	0274	-- onequarter
-12	600,665,57,119,-15,72	2	0275	-- onehalf
-34	600,666,56,109,-23,72	2	0276	-- threequarters
-r?	600,430,157,0,-55	1	0277	-- questiondown
-`A	600,793,0,57,47,57	2	0300	-- Agrave
-'A	600,793,0,108,47,72	2	0301	-- Aacute
-^A	600,775,0,57,47,57	2	0302	-- Acircumflex
-~A	600,732,0,106,47,72	2	0303	-- Atilde
-:A	600,731,0,57,47,57	2	0304	-- Adieresis
-oA	600,753,0,57,47,57	2	0305	-- Aring
-AE	600,562,0,105,47,72	2	0306	-- AE
-,C	600,580,151,108,-43,72	2	0307	-- Ccedilla
-`E	600,793,0,110,-3,72	2	0310	-- Egrave
-'E	600,793,0,118,-3,72	2	0311	-- Eacute
-^E	600,775,0,110,-3,72	2	0312	-- Ecircumflex
-:E	600,731,0,110,-3,72	2	0313	-- Edieresis
-`I	600,793,0,73,-46,72	2	0314	-- Igrave
-'I	600,793,0,88,-46,72	2	0315	-- Iacute
-^I	600,775,0,73,-46,72	2	0316	-- Icircumflex
-:I	600,731,0,73,-46,72	2	0317	-- Idieresis
--D	600,562,0,95,7,72	2	0320	-- Eth
-~N	600,732,13,162,43,72	2	0321	-- Ntilde
-`O	600,793,18,75,-44,72	2	0322	-- Ograve
-'O	600,793,18,88,-44,72	2	0323	-- Oacute
-^O	600,775,18,75,-44,72	2	0324	-- Ocircumflex
-~O	600,732,18,106,-44,72	2	0325	-- Otilde
-:O	600,731,18,75,-44,72	2	0326	-- Odieresis
-tmu	600,470,0,57,-53,57	0	0327	-- multiply
-/O	600,629,80,75,-44,72	2	0330	-- Oslash
-`U	600,793,18,152,-75,72	2	0331	-- Ugrave
-'U	600,793,18,152,-75,72	2	0332	-- Uacute
-^U	600,775,18,152,-75,72	2	0333	-- Ucircumflex
-:U	600,731,18,152,-75,72	2	0334	-- Udieresis
-'Y	600,793,0,145,-83,72	2	0335	-- Yacute
-TP	600,562,0,56,-29,56	2	0336	-- Thorn
-ss	600,629,15,67,2,67	2	0337	-- germandbls
-`a	600,672,15,19,-26,19	2	0340	-- agrave
-'a	600,672,15,62,-26,62	2	0341	-- aacute
-^a	600,654,15,31,-26,31	2	0342	-- acircumflex
-~a	600,606,15,79,-26,72	2	0343	-- atilde
-:a	600,595,15,20,-26,20	2	0344	-- adieresis
-oa	600,627,15,19,-26,19	2	0345	-- aring
-ae	600,441,15,76,9,72	0	0346	-- ae
-,c	600,441,151,64,-56,64	0	0347	-- ccedilla
-`e	600,672,15,48,-56,48	2	0350	-- egrave
-'e	600,672,15,62,-56,62	2	0351	-- eacute
-^e	600,654,15,48,-56,48	2	0352	-- ecircumflex
-:e	600,595,15,48,-56,48	2	0353	-- edieresis
-`i	600,672,0,0,-45	2	0354	-- igrave
-'i	600,672,0,62,-45,62	2	0355	-- iacute
-^i	600,654,0,1,-45,1	2	0356	-- icircumflex
-:i	600,595,0,0,-45	2	0357	-- idieresis
-Sd	600,629,15,89,-52,72	2	0360	-- eth
-~n	600,606,0,79,24,72	2	0361	-- ntilde
-`o	600,672,15,38,-52,38	2	0362	-- ograve
-'o	600,672,15,62,-52,62	2	0363	-- oacute
-^o	600,654,15,38,-52,38	2	0364	-- ocircumflex
-~o	600,606,15,79,-52,72	2	0365	-- otilde
-:o	600,595,15,38,-52,38	2	0366	-- odieresis
-tdi	600,467,0,23,-86,23	0	0367	-- divide
-/o	600,506,80,38,-52,38	0	0370	-- oslash
-`u	600,672,15,22,-51,22	2	0371	-- ugrave
-'u	600,672,15,52,-51,52	2	0372	-- uacute
-^u	600,654,15,22,-51,22	2	0373	-- ucircumflex
-:u	600,595,15,22,-51,22	2	0374	-- udieresis
-'y	600,672,157,133,54,72	3	0375	-- yacute
-Tp	600,629,157,55,74,55	3	0376	-- thorn
-:y	600,595,157,133,54,72	3	0377	-- ydieresis
+bq	600,100,134,0,-135	0	128	quotesinglbase
+Fo	600,446,0,102,-42,72	0	129	guillemotleft
+Fc	600,446,0,68,-8,68	0	130	guillemotright
+bu	600,383,0,0,-174	0	131	bullet
+Fn	600,622,143,121,76,72	2	132	florin
+f/	600,665,57,96,-34,72	2	133	fraction
+%0	600,622,15,77,-9,72	2	134	perthousand
+dg	600,580,78,0,-167	2	135	dagger
+dd	600,580,78,0,-113	2	136	daggerdbl
+en	600,285,0,36,-74,36	0	137	endash
+em	600,285,0,111,1,72	0	138	emdash
+fi	600,629,0,69,47,69	2	140	fi
+fl	600,629,0,69,47,69	2	141	fl
+.i	600,426,0,0,-45	0	144	dotlessi
+ga	600,672,0,0,-244	2	146	grave
+a"	600,672,0,133,-189,72	2	147	hungarumlaut
+a.	600,580,0,0,-310	2	148	dotaccent
+ab	600,609,0,26,-229,26	2	149	breve
+ah	600,669,0,64,-212,64	2	150	caron
+ao	600,627,0,0,-282	2	151	ring
+ho	600,0,151,0,-157	0	152	ogonek
+lq	600,562,0,0,-212	2	153	quotedblleft
+rq	600,562,0,26,-163,26	2	154	quotedblright
+oe	600,441,15,65,-4,65	0	155	oe
+/l	600,629,0,33,-45,33	2	156	lslash
+Bq	600,100,134,0,-65	0	157	quotedblbase
+OE	600,562,0,122,-9,72	2	158	OE
+/L	600,562,0,57,3,57	2	159	Lslash
+r!	600,430,157,0,-175	1	161	exclamdown
+ct	600,614,49,38,-101,38	2	162	cent
+Po	600,611,21,71,-74,71	2	163	sterling
+Cs	600,506,0,78,-44,72	0	164	currency
+Ye	600,562,0,143,-70,72	2	165	yen
+bb	600,675,175,0,-188	3	166	brokenbar
+sc	600,580,78,40,-54,40	2	167	section
+ad	600,595,0,20,-212,20	2	168	dieresis
+co	600,580,18,117,-3,72	2	169	copyright
+Of	600,580,0,0,-159	2	170	ordfeminine
+fo	600,446,0,0,-154	0	171	guilsinglleft
+tno	600,369,0,41,-105,41	0	172	logicalnot
+\-	600,283,0,30,-79,30	0	173	minus
+rg	600,580,18,117,-3,72	2	174	registered
+a-	600,565,0,50,-182,50	2	175	macron
+de	600,622,0,26,-164,26	2	176	degree
+t+-	600,558,0,44,-46,44	0	177	plusminus
+S2	600,622,0,0,-180	2	178	twosuperior
+S3	600,622,0,0,-163	2	179	threesuperior
+aa	600,672,0,62,-298,62	2	180	acute
+mc	600,426,157,22,-22,22	1	181	mu
+ps	600,562,78,80,-50,72	2	182	paragraph
+pc	600,327,0,0,-225	0	183	periodcentered
+ac	600,10,151,0,-147	0	184	cedilla
+S1	600,622,0,0,-181	2	185	onesuperior
+Om	600,580,0,0,-160	2	186	ordmasculine
+fc	600,446,0,0,-120	0	187	guilsinglright
+14	600,665,57,124,-15,72	2	188	onequarter
+12	600,665,57,119,-15,72	2	189	onehalf
+34	600,666,56,109,-23,72	2	190	threequarters
+r?	600,430,157,0,-55	1	191	questiondown
+`A	600,793,0,57,47,57	2	192	Agrave
+'A	600,793,0,108,47,72	2	193	Aacute
+^A	600,775,0,57,47,57	2	194	Acircumflex
+~A	600,732,0,106,47,72	2	195	Atilde
+:A	600,731,0,57,47,57	2	196	Adieresis
+oA	600,753,0,57,47,57	2	197	Aring
+AE	600,562,0,105,47,72	2	198	AE
+,C	600,580,151,108,-43,72	2	199	Ccedilla
+`E	600,793,0,110,-3,72	2	200	Egrave
+'E	600,793,0,118,-3,72	2	201	Eacute
+^E	600,775,0,110,-3,72	2	202	Ecircumflex
+:E	600,731,0,110,-3,72	2	203	Edieresis
+`I	600,793,0,73,-46,72	2	204	Igrave
+'I	600,793,0,88,-46,72	2	205	Iacute
+^I	600,775,0,73,-46,72	2	206	Icircumflex
+:I	600,731,0,73,-46,72	2	207	Idieresis
+-D	600,562,0,95,7,72	2	208	Eth
+~N	600,732,13,162,43,72	2	209	Ntilde
+`O	600,793,18,75,-44,72	2	210	Ograve
+'O	600,793,18,88,-44,72	2	211	Oacute
+^O	600,775,18,75,-44,72	2	212	Ocircumflex
+~O	600,732,18,106,-44,72	2	213	Otilde
+:O	600,731,18,75,-44,72	2	214	Odieresis
+tmu	600,470,0,57,-53,57	0	215	multiply
+/O	600,629,80,75,-44,72	2	216	Oslash
+`U	600,793,18,152,-75,72	2	217	Ugrave
+'U	600,793,18,152,-75,72	2	218	Uacute
+^U	600,775,18,152,-75,72	2	219	Ucircumflex
+:U	600,731,18,152,-75,72	2	220	Udieresis
+'Y	600,793,0,145,-83,72	2	221	Yacute
+TP	600,562,0,56,-29,56	2	222	Thorn
+ss	600,629,15,67,2,67	2	223	germandbls
+`a	600,672,15,19,-26,19	2	224	agrave
+'a	600,672,15,62,-26,62	2	225	aacute
+^a	600,654,15,31,-26,31	2	226	acircumflex
+~a	600,606,15,79,-26,72	2	227	atilde
+:a	600,595,15,20,-26,20	2	228	adieresis
+oa	600,627,15,19,-26,19	2	229	aring
+ae	600,441,15,76,9,72	0	230	ae
+,c	600,441,151,64,-56,64	0	231	ccedilla
+`e	600,672,15,48,-56,48	2	232	egrave
+'e	600,672,15,62,-56,62	2	233	eacute
+^e	600,654,15,48,-56,48	2	234	ecircumflex
+:e	600,595,15,48,-56,48	2	235	edieresis
+`i	600,672,0,0,-45	2	236	igrave
+'i	600,672,0,62,-45,62	2	237	iacute
+^i	600,654,0,1,-45,1	2	238	icircumflex
+:i	600,595,0,0,-45	2	239	idieresis
+Sd	600,629,15,89,-52,72	2	240	eth
+~n	600,606,0,79,24,72	2	241	ntilde
+`o	600,672,15,38,-52,38	2	242	ograve
+'o	600,672,15,62,-52,62	2	243	oacute
+^o	600,654,15,38,-52,38	2	244	ocircumflex
+~o	600,606,15,79,-52,72	2	245	otilde
+:o	600,595,15,38,-52,38	2	246	odieresis
+tdi	600,467,0,23,-86,23	0	247	divide
+/o	600,506,80,38,-52,38	0	248	oslash
+`u	600,672,15,22,-51,22	2	249	ugrave
+'u	600,672,15,52,-51,52	2	250	uacute
+^u	600,654,15,22,-51,22	2	251	ucircumflex
+:u	600,595,15,22,-51,22	2	252	udieresis
+'y	600,672,157,133,54,72	3	253	yacute
+Tp	600,629,157,55,74,55	3	254	thorn
+:y	600,595,157,133,54,72	3	255	ydieresis
+IJ	600,562,18,152,18,72	2	256	IJ
+---	600,437,0,0,-173	0	257	up
+---	600,227,0,43,32,43	0	258	dectab
+u0047_030C	600,805,18,95,-33,72	2	259	Gcaron
+---	600,562,0,150,31,72	2	260	stop
+---	600,562,0,91,31,72	2	261	tab
+u2026	600,111,15,25,4,25	0	262	ellipsis
+---	600,297,0,0,-265	0	263	largebullet
+u0073_0327	600,441,151,34,-28,34	0	264	scedilla
+---	600,562,0,150,-29,72	2	265	return
+ij	600,657,157,80,13,72	3	266	ij
+---	600,562,0,97,42,72	2	267	LL
+---	600,562,0,150,31,72	2	268	square
+da	600,608,15,0,-102	2	269	arrowdown
+<-	600,483,0,143,10,72	0	270	arrowleft
+<>	600,483,0,142,14,72	0	271	arrowboth
+---	600,599,0,102,-26,72	2	272	graybox
+->	600,483,0,138,16,72	0	273	arrowright
+u00AF	600,629,0,184,-73,72	2	274	overscore
+---	600,629,0,66,17,66	2	275	ll
+u0067_030C	600,669,157,107,-11,72	3	276	gcaron
+u20A4	600,611,21,71,-68,71	2	277	lira
+---	600,580,0,73,-53,72	2	278	center
+u0053_0327	600,580,151,100,-26,72	2	279	Scedilla
+---	600,607,157,0,78	3	280	format
+ua	600,623,0,27,-159,27	2	281	arrowup
+---	600,572,15,14,-93,14	2	282	notegraphic
+u211E	600,562,15,67,23,67	2	283	prescription
+---	600,348,0,24,-58,24	0	284	indent
+---	600,426,15,0,-137	0	285	down
+---	600,348,0,30,-64,30	0	286	left
+u0049_0307	600,716,0,73,-46,72	2	287	Idot
+---	600,436,15,0,-137	0	288	merge
diff --git a/contrib/groff/font/devps/CR b/contrib/groff/font/devps/CR
index 7c4248c..df19421 100644
--- a/contrib/groff/font/devps/CR
+++ b/contrib/groff/font/devps/CR
@@ -3,246 +3,279 @@ internalname Courier
 spacewidth 600
 encoding text.enc
 charset
-ha	600,622,0,0,-94	2	0000	-- asciicircum
-ti	600,320,0,0,-63	0	0001	-- asciitilde
-vS	600,805,20,0,-72	2	0002	-- Scaron
-vZ	600,805,0,0,-86	2	0003	-- Zcaron
-vs	600,669,15,0,-80	2	0004	-- scaron
-vz	600,669,0,0,-99	2	0005	-- zcaron
-:Y	600,731,0,0,-24	2	0006	-- Ydieresis
-tm	600,562,0,23,23	2	0007	-- trademark
-aq	600,562,0,0,-259	2	0010	-- quotesingle
-space	600	0	0040
-!	600,572,15,0,-236	2	0041	-- exclam
-"	600,562,0,0,-187	2	0042	-- quotedbl
+ha	600,622	2	0	asciicircum
+ti	600,320	0	1	asciitilde
+vS	600,805,20	2	2	Scaron
+vZ	600,805	2	3	Zcaron
+vs	600,669,15	2	4	scaron
+vz	600,669	2	5	zcaron
+:Y	600,731	2	6	Ydieresis
+tm	600,562,0,23,23	2	7	trademark
+aq	600,562	2	8	quotesingle
+space	600	0	32	space
+!	600,572,15	2	33	exclam
+"	600,562	2	34	quotedbl
 dq	"
-#	600,639,32,0,-93	2	0043	-- numbersign
+#	600,639,32	2	35	numbersign
 sh	"
-$	600,662,126,0,-105	2	0044	-- dollar
+$	600,662,126	2	36	dollar
 Do	"
-%	600,622,15,0,-81	2	0045	-- percent
-&	600,543,15,0,-63	0	0046	-- ampersand
-'	600,562,0,0,-213	2	0047	-- quoteright
+%	600,622,15	2	37	percent
+&	600,543,15	0	38	ampersand
+'	600,562	2	39	quoteright
 cq	"
-(	600,622,108,0,-269	2	0050	-- parenleft
-)	600,622,108,0,-160	2	0051	-- parenright
-*	600,607,0,0,-116	2	0052	-- asterisk
-+	600,470,0,0,-80	0	0053	-- plus
-,	600,122,112,0,-181	0	0054	-- comma
--	600,285,0,0,-103	0	0055	-- hyphen
+(	600,622,108	2	40	parenleft
+)	600,622,108	2	41	parenright
+*	600,607	2	42	asterisk
++	600,470	0	43	plus
+,	600,122,112	0	44	comma
+-	600,285	0	45	hyphen
 hy	"
-.	600,109,15,0,-229	0	0056	-- period
-/	600,629,80,0,-125	2	0057	-- slash
+.	600,109,15	0	46	period
+/	600,629,80	2	47	slash
 sl	"
-0	600,622,15,0,-106	2	0060	-- zero
-1	600,622,0,0,-96	2	0061	-- one
-2	600,622,0,0,-70	2	0062	-- two
-3	600,622,15,0,-75	2	0063	-- three
-4	600,622,0,0,-78	2	0064	-- four
-5	600,607,15,0,-92	2	0065	-- five
-6	600,622,15,0,-111	2	0066	-- six
-7	600,607,0,0,-82	2	0067	-- seven
-8	600,622,15,0,-102	2	0070	-- eight
-9	600,622,15,0,-96	2	0071	-- nine
-:	600,385,15,0,-229	0	0072	-- colon
-;	600,385,112,0,-181	0	0073	-- semicolon
-<	600,472,0,0,-41	0	0074	-- less
-=	600,376,0,0,-80	0	0075	-- equal
->	600,472,0,0,-66	0	0076	-- greater
-?	600,572,15,0,-129	2	0077	-- question
-@	600,622,15,0,-77	2	0100	-- at
+0	600,622,15	2	48	zero
+1	600,622	2	49	one
+2	600,622	2	50	two
+3	600,622,15	2	51	three
+4	600,622	2	52	four
+5	600,607,15	2	53	five
+6	600,622,15	2	54	six
+7	600,607	2	55	seven
+8	600,622,15	2	56	eight
+9	600,622,15	2	57	nine
+:	600,385,15	0	58	colon
+;	600,385,112	0	59	semicolon
+<	600,472	0	60	less
+=	600,376	0	61	equal
+>	600,472	0	62	greater
+?	600,572,15	2	63	question
+@	600,622,15	2	64	at
 at	"
-A	600,562,0,0,-3	2	0101	-- A
-B	600,562,0,0,-43	2	0102	-- B
-C	600,580,18,0,-41	2	0103	-- C
-D	600,562,0,0,-43	2	0104	-- D
-E	600,562,0,0,-53	2	0105	-- E
-F	600,562,0,0,-53	2	0106	-- F
-G	600,580,18,0,-31	2	0107	-- G
-H	600,562,0,0,-32	2	0110	-- H
-I	600,562,0,0,-96	2	0111	-- I
-J	600,562,18,0,-34	2	0112	-- J
-K	600,562,0,0,-38	2	0113	-- K
-L	600,562,0,0,-47	2	0114	-- L
-M	600,562,0,0,-4	2	0115	-- M
-N	600,562,13,0,-7	2	0116	-- N
-O	600,580,18,0,-43	2	0117	-- O
-P	600,562,0,0,-79	2	0120	-- P
-Q	600,580,138,0,-43	2	0121	-- Q
-R	600,562,0,0,-38	2	0122	-- R
-S	600,580,20,0,-72	2	0123	-- S
-T	600,562,0,0,-38	2	0124	-- T
-U	600,562,18,0,-17	2	0125	-- U
-V	600,562,13,4,4	2	0126	-- V
-W	600,562,13,3,3	2	0127	-- W
-X	600,562,0,0,-23	2	0130	-- X
-Y	600,562,0,0,-24	2	0131	-- Y
-Z	600,562,0,0,-86	2	0132	-- Z
-[	600,622,108,0,-269	2	0133	-- bracketleft
+A	600,562	2	65	A
+B	600,562	2	66	B
+C	600,580,18	2	67	C
+D	600,562	2	68	D
+E	600,562	2	69	E
+F	600,562	2	70	F
+G	600,580,18	2	71	G
+H	600,562	2	72	H
+I	600,562	2	73	I
+J	600,562,18	2	74	J
+K	600,562	2	75	K
+L	600,562	2	76	L
+M	600,562	2	77	M
+N	600,562,13	2	78	N
+O	600,580,18	2	79	O
+P	600,562	2	80	P
+Q	600,580,138	2	81	Q
+R	600,562	2	82	R
+S	600,580,20	2	83	S
+T	600,562	2	84	T
+U	600,562,18	2	85	U
+V	600,562,13,4,4	2	86	V
+W	600,562,13,3,3	2	87	W
+X	600,562	2	88	X
+Y	600,562	2	89	Y
+Z	600,562	2	90	Z
+[	600,622,108	2	91	bracketleft
 lB	"
-\	600,629,80,0,-118	2	0134	-- backslash
+\	600,629,80	2	92	backslash
 rs	"
-]	600,622,108,0,-158	2	0135	-- bracketright
+]	600,622,108	2	93	bracketright
 rB	"
-a^	600,654,0,0,-124	2	0136	-- circumflex
+a^	600,654	2	94	circumflex
 ^	"
-_	600,0,125	0	0137	-- underscore
-`	600,562,0,0,-224	2	0140	-- quoteleft
+_	600,0,125	0	95	underscore
+`	600,562	2	96	quoteleft
 oq	"
-a	600,441,15,0,-53	0	0141	-- a
-b	600,629,15,0,-14	2	0142	-- b
-c	600,441,15,0,-66	0	0143	-- c
-d	600,629,15,0,-45	2	0144	-- d
-e	600,441,15,0,-66	0	0145	-- e
-f	600,629,0,0,-114	2	0146	-- f
-g	600,441,157,0,-45	1	0147	-- g
-h	600,629,0,0,-18	2	0150	-- h
-i	600,657,0,0,-95	2	0151	-- i
-j	600,657,157,0,-82	3	0152	-- j
-k	600,629,0,0,-43	2	0153	-- k
-l	600,629,0,0,-95	2	0154	-- l
-m	600,441,0,5,5	0	0155	-- m
-n	600,441,0,0,-26	0	0156	-- n
-o	600,441,15,0,-62	0	0157	-- o
-p	600,441,157,0,-9	1	0160	-- p
-q	600,441,157,0,-45	1	0161	-- q
-r	600,441,0,0,-60	0	0162	-- r
-s	600,441,15,0,-80	0	0163	-- s
-t	600,561,15,0,-87	2	0164	-- t
-u	600,426,15,0,-21	0	0165	-- u
-v	600,426,10,0,-10	0	0166	-- v
-w	600,426,10,4,4	0	0167	-- w
-x	600,426,0,0,-20	0	0170	-- x
-y	600,426,157,0,-7	1	0171	-- y
-z	600,426,0,0,-99	0	0172	-- z
-lC	600,622,108,0,-182	2	0173	-- braceleft
+a	600,441,15	0	97	a
+b	600,629,15	2	98	b
+c	600,441,15	0	99	c
+d	600,629,15	2	100	d
+e	600,441,15	0	101	e
+f	600,629	2	102	f
+g	600,441,157	1	103	g
+h	600,629	2	104	h
+i	600,657	2	105	i
+j	600,657,157	3	106	j
+k	600,629	2	107	k
+l	600,629	2	108	l
+m	600,441,0,5,5	0	109	m
+n	600,441	0	110	n
+o	600,441,15	0	111	o
+p	600,441,157	1	112	p
+q	600,441,157	1	113	q
+r	600,441	0	114	r
+s	600,441,15	0	115	s
+t	600,561,15	2	116	t
+u	600,426,15	0	117	u
+v	600,426,10	0	118	v
+w	600,426,10,4,4	0	119	w
+x	600,426	0	120	x
+y	600,426,157	1	121	y
+z	600,426	0	122	z
+lC	600,622,108	2	123	braceleft
 {	"
-ba	600,750,250,0,-275	3	0174	-- bar
+ba	600,750,250	3	124	bar
 |	"
-rC	600,622,108,0,-163	2	0175	-- braceright
+rC	600,622,108	2	125	braceright
 }	"
-a~	600,606,0,0,-105	2	0176	-- tilde
+a~	600,606	2	126	tilde
 ~	"
-bq	600,100,134,0,-213	0	0200	-- quotesinglbase
-Fo	600,446,0,0,-37	0	0201	-- guillemotleft
-Fc	600,446,0,0,-37	0	0202	-- guillemotright
-bu	600,383,0,0,-172	0	0203	-- bullet
-Fn	600,622,143,0,-4	2	0204	-- florin
-f/	600,665,57,0,-92	2	0205	-- fraction
-%0	600,622,15,0,-3	2	0206	-- perthousand
-dg	600,580,78,0,-141	2	0207	-- dagger
-dd	600,580,78,0,-141	2	0210	-- daggerdbl
-en	600,285,0,0,-75	0	0211	-- endash
-em	600,285	0	0212	-- emdash
-fi	600,629,0,0,-3	2	0214	-- fi
-fl	600,629,0,0,-3	2	0215	-- fl
-.i	600,426,0,0,-95	0	0220	-- dotlessi
-ga	600,672,0,0,-151	2	0222	-- grave
-a"	600,672,0,0,-133	2	0223	-- hungarumlaut
-a.	600,580,0,0,-249	2	0224	-- dotaccent
-ab	600,609,0,0,-153	2	0225	-- breve
-ah	600,669,0,0,-124	2	0226	-- caron
-ao	600,627,0,0,-218	2	0227	-- ring
-ho	600,0,151,0,-227	0	0230	-- ogonek
-lq	600,562,0,0,-143	2	0231	-- quotedblleft
-rq	600,562,0,0,-143	2	0232	-- quotedblright
-oe	600,441,15,0,-19	0	0233	-- oe
-/l	600,629,0,0,-95	2	0234	-- lslash
-Bq	600,100,134,0,-143	0	0235	-- quotedblbase
-OE	600,562,0,0,-7	2	0236	-- OE
-/L	600,562,0,0,-47	2	0237	-- Lslash
-r!	600,430,157,0,-236	1	0241	-- exclamdown
-ct	600,614,49,0,-96	2	0242	-- cent
-Po	600,611,21,0,-84	2	0243	-- sterling
-Cs	600,506,0,0,-73	0	0244	-- currency
-Ye	600,562,0,0,-26	2	0245	-- yen
-bb	600,675,175,0,-275	3	0246	-- brokenbar
-sc	600,580,78,0,-113	2	0247	-- section
-ad	600,595,0,0,-148	2	0250	-- dieresis
-co	600,580,18	2	0251	-- copyright
-Of	600,580,0,0,-156	2	0252	-- ordfeminine
-fo	600,446,0,0,-149	0	0253	-- guilsinglleft
-no	600,369,0,0,-87	0	0254	-- logicalnot
-\-	600,283,0,0,-80	0	0255	-- minus
-rg	600,580,18	2	0256	-- registered
-a-	600,565,0,0,-120	2	0257	-- macron
-de	600,622,0,0,-123	2	0260	-- degree
-t+-	600,558,0,0,-87	0	0261	-- plusminus
-S2	600,622,0,0,-177	2	0262	-- twosuperior
-S3	600,622,0,0,-155	2	0263	-- threesuperior
-aa	600,672,0,0,-242	2	0264	-- acute
-mc	600,426,157,0,-21	1	0265	-- mu
-ps	600,562,78,0,-50	2	0266	-- paragraph
-pc	600,327,0,0,-222	0	0267	-- periodcentered
-ac	600,10,151,0,-224	0	0270	-- cedilla
-S1	600,622,0,0,-172	2	0271	-- onesuperior
-Om	600,580,0,0,-157	2	0272	-- ordmasculine
-fc	600,446,0,0,-149	0	0273	-- guilsinglright
-14	600,665,57	2	0274	-- onequarter
-12	600,665,57,11	2	0275	-- onehalf
-34	600,666,56,0,-8	2	0276	-- threequarters
-r?	600,430,157,0,-108	1	0277	-- questiondown
-`A	600,793,0,0,-3	2	0300	-- Agrave
-'A	600,793,0,0,-3	2	0301	-- Aacute
-^A	600,775,0,0,-3	2	0302	-- Acircumflex
-~A	600,732,0,0,-3	2	0303	-- Atilde
-:A	600,731,0,0,-3	2	0304	-- Adieresis
-oA	600,753,0,0,-3	2	0305	-- Aring
-AE	600,562,0,0,-3	2	0306	-- AE
-,C	600,580,151,0,-41	2	0307	-- Ccedilla
-`E	600,793,0,0,-53	2	0310	-- Egrave
-'E	600,793,0,0,-53	2	0311	-- Eacute
-^E	600,775,0,0,-53	2	0312	-- Ecircumflex
-:E	600,731,0,0,-53	2	0313	-- Edieresis
-`I	600,793,0,0,-96	2	0314	-- Igrave
-'I	600,793,0,0,-96	2	0315	-- Iacute
-^I	600,775,0,0,-96	2	0316	-- Icircumflex
-:I	600,731,0,0,-96	2	0317	-- Idieresis
--D	600,562,0,0,-30	2	0320	-- Eth
-~N	600,732,13,0,-7	2	0321	-- Ntilde
-`O	600,793,18,0,-43	2	0322	-- Ograve
-'O	600,793,18,0,-43	2	0323	-- Oacute
-^O	600,775,18,0,-43	2	0324	-- Ocircumflex
-~O	600,732,18,0,-43	2	0325	-- Otilde
-:O	600,731,18,0,-43	2	0326	-- Odieresis
-tmu	600,470,0,0,-87	0	0327	-- multiply
-/O	600,629,80,0,-43	2	0330	-- Oslash
-`U	600,793,18,0,-17	2	0331	-- Ugrave
-'U	600,793,18,0,-17	2	0332	-- Uacute
-^U	600,775,18,0,-17	2	0333	-- Ucircumflex
-:U	600,731,18,0,-17	2	0334	-- Udieresis
-'Y	600,793,0,0,-24	2	0335	-- Yacute
-TP	600,562,0,0,-79	2	0336	-- Thorn
-ss	600,629,15,0,-48	2	0337	-- germandbls
-`a	600,672,15,0,-53	2	0340	-- agrave
-'a	600,672,15,0,-53	2	0341	-- aacute
-^a	600,654,15,0,-53	2	0342	-- acircumflex
-~a	600,606,15,0,-53	2	0343	-- atilde
-:a	600,595,15,0,-53	2	0344	-- adieresis
-oa	600,627,15,0,-53	2	0345	-- aring
-ae	600,441,15,0,-19	0	0346	-- ae
-,c	600,441,151,0,-66	0	0347	-- ccedilla
-`e	600,672,15,0,-66	2	0350	-- egrave
-'e	600,672,15,0,-66	2	0351	-- eacute
-^e	600,654,15,0,-66	2	0352	-- ecircumflex
-:e	600,595,15,0,-66	2	0353	-- edieresis
-`i	600,672,0,0,-95	2	0354	-- igrave
-'i	600,672,0,0,-95	2	0355	-- iacute
-^i	600,654,0,0,-94	2	0356	-- icircumflex
-:i	600,595,0,0,-95	2	0357	-- idieresis
-Sd	600,629,15,0,-62	2	0360	-- eth
-~n	600,606,0,0,-26	2	0361	-- ntilde
-`o	600,672,15,0,-62	2	0362	-- ograve
-'o	600,672,15,0,-62	2	0363	-- oacute
-^o	600,654,15,0,-62	2	0364	-- ocircumflex
-~o	600,606,15,0,-62	2	0365	-- otilde
-:o	600,595,15,0,-62	2	0366	-- odieresis
-tdi	600,467,0,0,-87	0	0367	-- divide
-/o	600,506,80,0,-62	0	0370	-- oslash
-`u	600,672,15,0,-21	2	0371	-- ugrave
-'u	600,672,15,0,-21	2	0372	-- uacute
-^u	600,654,15,0,-21	2	0373	-- ucircumflex
-:u	600,595,15,0,-21	2	0374	-- udieresis
-'y	600,672,157,0,-7	3	0375	-- yacute
-Tp	600,629,157,0,6	3	0376	-- thorn
-:y	600,595,157,0,-7	3	0377	-- ydieresis
+bq	600,100,134	0	128	quotesinglbase
+Fo	600,446	0	129	guillemotleft
+Fc	600,446	0	130	guillemotright
+bu	600,383	0	131	bullet
+Fn	600,622,143	2	132	florin
+f/	600,665,57	2	133	fraction
+%0	600,622,15	2	134	perthousand
+dg	600,580,78	2	135	dagger
+dd	600,580,78	2	136	daggerdbl
+en	600,285	0	137	endash
+em	600,285	0	138	emdash
+fi	600,629	2	140	fi
+fl	600,629	2	141	fl
+.i	600,426	0	144	dotlessi
+ga	600,672	2	146	grave
+a"	600,672	2	147	hungarumlaut
+a.	600,580	2	148	dotaccent
+ab	600,609	2	149	breve
+ah	600,669	2	150	caron
+ao	600,627	2	151	ring
+ho	600,0,151	0	152	ogonek
+lq	600,562	2	153	quotedblleft
+rq	600,562	2	154	quotedblright
+oe	600,441,15	0	155	oe
+/l	600,629	2	156	lslash
+Bq	600,100,134	0	157	quotedblbase
+OE	600,562	2	158	OE
+/L	600,562	2	159	Lslash
+r!	600,430,157	1	161	exclamdown
+ct	600,614,49	2	162	cent
+Po	600,611,21	2	163	sterling
+Cs	600,506	0	164	currency
+Ye	600,562	2	165	yen
+bb	600,675,175	3	166	brokenbar
+sc	600,580,78	2	167	section
+ad	600,595	2	168	dieresis
+co	600,580,18	2	169	copyright
+Of	600,580	2	170	ordfeminine
+fo	600,446	0	171	guilsinglleft
+tno	600,369	0	172	logicalnot
+\-	600,283	0	173	minus
+rg	600,580,18	2	174	registered
+a-	600,565	2	175	macron
+de	600,622	2	176	degree
+t+-	600,558	0	177	plusminus
+S2	600,622	2	178	twosuperior
+S3	600,622	2	179	threesuperior
+aa	600,672	2	180	acute
+mc	600,426,157	1	181	mu
+ps	600,562,78	2	182	paragraph
+pc	600,327	0	183	periodcentered
+ac	600,10,151	0	184	cedilla
+S1	600,622	2	185	onesuperior
+Om	600,580	2	186	ordmasculine
+fc	600,446	0	187	guilsinglright
+14	600,665,57	2	188	onequarter
+12	600,665,57,11	2	189	onehalf
+34	600,666,56	2	190	threequarters
+r?	600,430,157	1	191	questiondown
+`A	600,793	2	192	Agrave
+'A	600,793	2	193	Aacute
+^A	600,775	2	194	Acircumflex
+~A	600,732	2	195	Atilde
+:A	600,731	2	196	Adieresis
+oA	600,753	2	197	Aring
+AE	600,562	2	198	AE
+,C	600,580,151	2	199	Ccedilla
+`E	600,793	2	200	Egrave
+'E	600,793	2	201	Eacute
+^E	600,775	2	202	Ecircumflex
+:E	600,731	2	203	Edieresis
+`I	600,793	2	204	Igrave
+'I	600,793	2	205	Iacute
+^I	600,775	2	206	Icircumflex
+:I	600,731	2	207	Idieresis
+-D	600,562	2	208	Eth
+~N	600,732,13	2	209	Ntilde
+`O	600,793,18	2	210	Ograve
+'O	600,793,18	2	211	Oacute
+^O	600,775,18	2	212	Ocircumflex
+~O	600,732,18	2	213	Otilde
+:O	600,731,18	2	214	Odieresis
+tmu	600,470	0	215	multiply
+/O	600,629,80	2	216	Oslash
+`U	600,793,18	2	217	Ugrave
+'U	600,793,18	2	218	Uacute
+^U	600,775,18	2	219	Ucircumflex
+:U	600,731,18	2	220	Udieresis
+'Y	600,793	2	221	Yacute
+TP	600,562	2	222	Thorn
+ss	600,629,15	2	223	germandbls
+`a	600,672,15	2	224	agrave
+'a	600,672,15	2	225	aacute
+^a	600,654,15	2	226	acircumflex
+~a	600,606,15	2	227	atilde
+:a	600,595,15	2	228	adieresis
+oa	600,627,15	2	229	aring
+ae	600,441,15	0	230	ae
+,c	600,441,151	0	231	ccedilla
+`e	600,672,15	2	232	egrave
+'e	600,672,15	2	233	eacute
+^e	600,654,15	2	234	ecircumflex
+:e	600,595,15	2	235	edieresis
+`i	600,672	2	236	igrave
+'i	600,672	2	237	iacute
+^i	600,654	2	238	icircumflex
+:i	600,595	2	239	idieresis
+Sd	600,629,15	2	240	eth
+~n	600,606	2	241	ntilde
+`o	600,672,15	2	242	ograve
+'o	600,672,15	2	243	oacute
+^o	600,654,15	2	244	ocircumflex
+~o	600,606,15	2	245	otilde
+:o	600,595,15	2	246	odieresis
+tdi	600,467	0	247	divide
+/o	600,506,80	0	248	oslash
+`u	600,672,15	2	249	ugrave
+'u	600,672,15	2	250	uacute
+^u	600,654,15	2	251	ucircumflex
+:u	600,595,15	2	252	udieresis
+'y	600,672,157	3	253	yacute
+Tp	600,629,157,0,6	3	254	thorn
+:y	600,595,157	3	255	ydieresis
+IJ	600,562,18	2	256	IJ
+---	600,437	0	257	up
+---	600,227	0	258	dectab
+u0047_030C	600,805,18	2	259	Gcaron
+---	600,562	2	260	stop
+---	600,562	2	261	tab
+u2026	600,111,15	0	262	ellipsis
+---	600,297	0	263	largebullet
+u0073_0327	600,441,151	0	264	scedilla
+---	600,562	2	265	return
+ij	600,657,157	3	266	ij
+---	600,562	2	267	LL
+---	600,562	2	268	square
+da	600,608,15	2	269	arrowdown
+<-	600,483,0,24,24	0	270	arrowleft
+<>	600,483,0,28,28	0	271	arrowboth
+---	600,599	2	272	graybox
+->	600,483,0,24,24	0	273	arrowright
+u00AF	600,629	2	274	overscore
+---	600,629	2	275	ll
+u0067_030C	600,669,157	3	276	gcaron
+u20A4	600,611,21	2	277	lira
+---	600,580	2	278	center
+u0053_0327	600,580,151	2	279	Scedilla
+---	600,607,157	3	280	format
+ua	600,623	2	281	arrowup
+---	600,572,15	2	282	notegraphic
+u211E	600,562,15	2	283	prescription
+---	600,348	0	284	indent
+---	600,426,15	0	285	down
+---	600,348	0	286	left
+u0049_0307	600,716	2	287	Idot
+---	600,436,15	0	288	merge
diff --git a/contrib/groff/font/devps/EURO b/contrib/groff/font/devps/EURO
new file mode 100644
index 0000000..e1459e6
--- /dev/null
+++ b/contrib/groff/font/devps/EURO
@@ -0,0 +1,19 @@
+name EURO
+internalname FreeEuro
+charset
+---	750,685,12	3	0	Euro.symbol
+---	750,685,12	3	1	Euro.symbol.bold
+---	750,685,12,92	3	2	Euro.symbol.slanted
+---	750,685,12,100	3	3	Euro.symbol.bold.slanted
+---	741,676,14	3	4	Euro.serif
+---	800,691,19	3	5	Euro.serif.bold
+---	734,666,18,11	3	6	Euro.serif.italic
+---	800,691,19,8	3	7	Euro.serif.bold.italic
+---	756,709,23	3	8	Euro.sansserif
+---	796,710,22	3	9	Euro.sansserif.bold
+---	756,709,23,106	3	10	Euro.sansserif.slanted
+---	796,710,22,107	3	11	Euro.sansserif.bold.slanted
+---	600,576,16	3	12	Euro.mono
+---	600,597,14	3	13	Euro.mono.bold
+---	600,576,16,31	3	14	Euro.mono.slanted
+---	600,597,14,43	3	15	Euro.mono.bold.slanted
diff --git a/contrib/groff/font/devps/HB b/contrib/groff/font/devps/HB
index 6aec8f7..759f884 100644
--- a/contrib/groff/font/devps/HB
+++ b/contrib/groff/font/devps/HB
@@ -221,246 +221,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	584,698,0,0,-62	2	0000	-- asciicircum
-ti	584,343,0,0,-61	0	0001	-- asciitilde
-vS	667,936,19,0,-39	2	0002	-- Scaron
-vZ	611,936,0,0,-25	2	0003	-- Zcaron
-vs	556,750,14,0,-30	2	0004	-- scaron
-vz	500,750,0,0,-20	2	0005	-- zcaron
-:Y	667,915,0,0,-15	2	0006	-- Ydieresis
-tm	1000,718,0,0,-44	2	0007	-- trademark
-aq	238,718,0,0,-70	2	0010	-- quotesingle
-space	278	0	0040
-!	333,718,0,0,-90	2	0041	-- exclam
-"	474,718,0,0,-98	2	0042	-- quotedbl
+ha	584,698	2	0	asciicircum
+ti	584,343	0	1	asciitilde
+vS	667,936,19	2	2	Scaron
+vZ	611,936	2	3	Zcaron
+vs	556,750,14	2	4	scaron
+vz	500,750	2	5	zcaron
+:Y	667,915	2	6	Ydieresis
+tm	1000,718	2	7	trademark
+aq	238,718	2	8	quotesingle
+space	278	0	32	space
+!	333,718	2	33	exclam
+"	474,718	2	34	quotedbl
 dq	"
-#	556,698,0,0,-18	2	0043	-- numbersign
+#	556,698	2	35	numbersign
 sh	"
-$	556,775,115,0,-30	2	0044	-- dollar
+$	556,775,115	2	36	dollar
 Do	"
-%	889,710,19,0,-28	2	0045	-- percent
-&	722,718,19,0,-54	2	0046	-- ampersand
-'	278,718,0,0,-69	2	0047	-- quoteright
+%	889,710,19	2	37	percent
+&	722,718,19	2	38	ampersand
+'	278,718	2	39	quoteright
 cq	"
-(	333,734,208,0,-35	3	0050	-- parenleft
-)	333,734,208,0,-19	3	0051	-- parenright
-*	389,718,0,0,-27	2	0052	-- asterisk
-+	584,506,0,0,-40	0	0053	-- plus
-,	278,146,168,0,-64	0	0054	-- comma
--	333,345,0,0,-27	0	0055	-- hyphen
+(	333,734,208	3	40	parenleft
+)	333,734,208	3	41	parenright
+*	389,718	2	42	asterisk
++	584,506	0	43	plus
+,	278,146,168	0	44	comma
+-	333,345	0	45	hyphen
 hy	"
-.	278,146,0,0,-64	0	0056	-- period
-/	278,737,19,33,33	2	0057	-- slash
+.	278,146	0	46	period
+/	278,737,19,33,33	2	47	slash
 sl	"
-0	556,710,19,0,-32	2	0060	-- zero
-1	556,710,0,0,-69	2	0061	-- one
-2	556,710,0,0,-26	2	0062	-- two
-3	556,710,19,0,-27	2	0063	-- three
-4	556,710,0,0,-27	2	0064	-- four
-5	556,698,19,0,-27	2	0065	-- five
-6	556,710,19,0,-31	2	0066	-- six
-7	556,698,0,0,-25	2	0067	-- seven
-8	556,710,19,0,-32	2	0070	-- eight
-9	556,710,19,0,-30	2	0071	-- nine
-:	333,512,0,0,-92	0	0072	-- colon
-;	333,512,168,0,-92	0	0073	-- semicolon
-<	584,514,8,0,-38	0	0074	-- less
-=	584,419,0,0,-40	0	0075	-- equal
->	584,514,8,0,-38	0	0076	-- greater
-?	611,727,0,0,-60	2	0077	-- question
-@	975,737,19,0,-118	2	0100	-- at
+0	556,710,19	2	48	zero
+1	556,710	2	49	one
+2	556,710	2	50	two
+3	556,710,19	2	51	three
+4	556,710	2	52	four
+5	556,698,19	2	53	five
+6	556,710,19	2	54	six
+7	556,698	2	55	seven
+8	556,710,19	2	56	eight
+9	556,710,19	2	57	nine
+:	333,512	0	58	colon
+;	333,512,168	0	59	semicolon
+<	584,514,8	0	60	less
+=	584,419	0	61	equal
+>	584,514,8	0	62	greater
+?	611,727	2	63	question
+@	975,737,19	2	64	at
 at	"
-A	722,718,0,0,-20	2	0101	-- A
-B	722,718,0,0,-76	2	0102	-- B
-C	722,737,19,0,-44	2	0103	-- C
-D	722,718,0,0,-76	2	0104	-- D
-E	667,718,0,0,-76	2	0105	-- E
-F	611,718,0,0,-76	2	0106	-- F
-G	778,737,19,0,-44	2	0107	-- G
-H	722,718,0,0,-71	2	0110	-- H
-I	278,718,0,0,-64	2	0111	-- I
-J	556,718,18,0,-22	2	0112	-- J
-K	722,718,0,0,-87	2	0113	-- K
-L	611,718,0,0,-76	2	0114	-- L
-M	833,718,0,0,-69	2	0115	-- M
-N	722,718,0,0,-69	2	0116	-- N
-O	778,737,19,0,-44	2	0117	-- O
-P	667,718,0,0,-76	2	0120	-- P
-Q	778,737,52,0,-44	2	0121	-- Q
-R	722,718,0,0,-76	2	0122	-- R
-S	667,737,19,0,-39	2	0123	-- S
-T	611,718,0,0,-14	2	0124	-- T
-U	722,718,19,0,-72	2	0125	-- U
-V	667,718,0,0,-19	2	0126	-- V
-W	944,718,0,0,-16	2	0127	-- W
-X	667,718,0,0,-14	2	0130	-- X
-Y	667,718,0,0,-15	2	0131	-- Y
-Z	611,718,0,0,-25	2	0132	-- Z
-[	333,722,196,0,-63	2	0133	-- bracketleft
+A	722,718	2	65	A
+B	722,718	2	66	B
+C	722,737,19	2	67	C
+D	722,718	2	68	D
+E	667,718	2	69	E
+F	611,718	2	70	F
+G	778,737,19	2	71	G
+H	722,718	2	72	H
+I	278,718	2	73	I
+J	556,718,18	2	74	J
+K	722,718	2	75	K
+L	611,718	2	76	L
+M	833,718	2	77	M
+N	722,718	2	78	N
+O	778,737,19	2	79	O
+P	667,718	2	80	P
+Q	778,737,52	2	81	Q
+R	722,718	2	82	R
+S	667,737,19	2	83	S
+T	611,718	2	84	T
+U	722,718,19	2	85	U
+V	667,718	2	86	V
+W	944,718	2	87	W
+X	667,718	2	88	X
+Y	667,718	2	89	Y
+Z	611,718	2	90	Z
+[	333,722,196	2	91	bracketleft
 lB	"
-\	278,737,19,33,33	2	0134	-- backslash
+\	278,737,19,33,33	2	92	backslash
 rs	"
-]	333,722,196,0,-24	2	0135	-- bracketright
+]	333,722,196	2	93	bracketright
 rB	"
-a^	333,750,0,10,10	2	0136	-- circumflex
+a^	333,750,0,10,10	2	94	circumflex
 ^	"
-_	556,0,125	0	0137	-- underscore
-`	278,727,0,0,-69	2	0140	-- quoteleft
+_	556,0,125	0	95	underscore
+`	278,727	2	96	quoteleft
 oq	"
-a	556,546,14,0,-29	0	0141	-- a
-b	611,718,14,0,-61	2	0142	-- b
-c	556,546,14,0,-34	0	0143	-- c
-d	611,718,14,0,-34	2	0144	-- d
-e	556,546,14,0,-23	0	0145	-- e
-f	333,727,0,0,-10	2	0146	-- f
-g	611,546,217,0,-40	1	0147	-- g
-h	611,718,0,0,-65	2	0150	-- h
-i	278,725,0,0,-69	2	0151	-- i
-j	278,725,214,0,-3	3	0152	-- j
-k	556,718,0,6,-69	2	0153	-- k
-l	278,718,0,0,-69	2	0154	-- l
-m	889,546,0,0,-64	0	0155	-- m
-n	611,546,0,0,-65	0	0156	-- n
-o	611,546,14,0,-34	0	0157	-- o
-p	611,546,207,0,-62	1	0160	-- p
-q	611,546,207,0,-34	1	0161	-- q
-r	389,546,0,0,-64	0	0162	-- r
-s	556,546,14,0,-30	0	0163	-- s
-t	333,676,6,0,-10	2	0164	-- t
-u	611,532,14,0,-66	0	0165	-- u
-v	556,532,0,0,-13	0	0166	-- v
-w	778,532,0,0,-10	0	0167	-- w
-x	556,532,0,0,-15	0	0170	-- x
-y	556,532,214,0,-10	1	0171	-- y
-z	500,532,0,0,-20	0	0172	-- z
-lC	389,722,196,0,-48	2	0173	-- braceleft
+a	556,546,14	0	97	a
+b	611,718,14	2	98	b
+c	556,546,14	0	99	c
+d	611,718,14	2	100	d
+e	556,546,14	0	101	e
+f	333,727	2	102	f
+g	611,546,217	1	103	g
+h	611,718	2	104	h
+i	278,725	2	105	i
+j	278,725,214	3	106	j
+k	556,718,0,6	2	107	k
+l	278,718	2	108	l
+m	889,546	0	109	m
+n	611,546	0	110	n
+o	611,546,14	0	111	o
+p	611,546,207	1	112	p
+q	611,546,207	1	113	q
+r	389,546	0	114	r
+s	556,546,14	0	115	s
+t	333,676,6	2	116	t
+u	611,532,14	0	117	u
+v	556,532	0	118	v
+w	778,532	0	119	w
+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,737,19,0,-84	2	0174	-- bar
+ba	280,737,19	2	124	bar
 |	"
-rC	389,722,196,0,-24	2	0175	-- braceright
+rC	389,722,196	2	125	braceright
 }	"
-a~	333,737,0,17,17	2	0176	-- tilde
+a~	333,737,0,17,17	2	126	tilde
 ~	"
-bq	278,127,146,0,-69	0	0200	-- quotesinglbase
-Fo	556,484,0,0,-88	0	0201	-- guillemotleft
-Fc	556,484,0,0,-88	0	0202	-- guillemotright
-bu	350,524,0,0,-10	0	0203	-- bullet
-Fn	556,737,210,0,10	3	0204	-- florin
-f/	167,710,19,169,170	2	0205	-- fraction
-%0	1000,710,19,3,3	2	0206	-- perthousand
-dg	556,718,171,0,-36	2	0207	-- dagger
-dd	556,718,171,0,-36	2	0210	-- daggerdbl
-en	556,333	0	0211	-- endash
-em	1000,333	0	0212	-- emdash
-fi	611,727,0,0,-10	2	0214	-- fi
-fl	611,727,0,0,-10	2	0215	-- fl
-.i	278,532,0,0,-69	0	0220	-- dotlessi
-ga	333,750,0,0,23	2	0222	-- grave
-a"	333,750,0,153,-9	2	0223	-- hungarumlaut
-a.	333,729,0,0,-104	2	0224	-- dotaccent
-ab	333,750,0,2,2	2	0225	-- breve
-ah	333,750,0,10,10	2	0226	-- caron
-ao	333,776,0,0,-59	2	0227	-- ring
-ho	333,0,228,0,-71	1	0230	-- ogonek
-lq	500,727,0,0,-64	2	0231	-- quotedblleft
-rq	500,718,0,0,-64	2	0232	-- quotedblright
-oe	944,546,14,0,-34	0	0233	-- oe
-/l	278,718,0,18,18	2	0234	-- lslash
-Bq	500,127,146,0,-64	0	0235	-- quotedblbase
-OE	1000,737,19,0,-37	2	0236	-- OE
-/L	611,718,0,0,20	2	0237	-- Lslash
-r!	333,532,186,0,-90	0	0241	-- exclamdown
-ct	556,628,118,0,-34	0	0242	-- cent
-Po	556,718,16,0,-28	2	0243	-- sterling
-Cs	556,636,0,3,3	0	0244	-- currency
-Ye	556,698,0,9,9	2	0245	-- yen
-bb	280,737,19,0,-84	2	0246	-- brokenbar
-sc	556,727,184,0,-34	2	0247	-- section
-ad	333,729,0,0,-6	2	0250	-- dieresis
-co	737,737,19,12,11	2	0251	-- copyright
-Of	370,737,0,0,-22	2	0252	-- ordfeminine
-fo	333,484,0,0,-83	0	0253	-- guilsinglleft
-no	584,419,0,0,-40	0	0254	-- logicalnot
-\-	584,309,0,0,-40	0	0255	-- minus
-rg	737,737,19,11,11	2	0256	-- registered
-a-	333,678,0,6,6	2	0257	-- macron
-de	400,712,0,0,-57	2	0260	-- degree
-t+-	584,506,0,0,-40	0	0261	-- plusminus
-S2	333,710,0,0,-9	2	0262	-- twosuperior
-S3	333,710,0,0,-8	2	0263	-- threesuperior
-aa	333,750,0,23,-108	2	0264	-- acute
-mc	611,532,207,0,-66	1	0265	-- mu
-ps	556,700,191,0,8	2	0266	-- paragraph
-pc	278,334,0,0,-58	0	0267	-- periodcentered
-ac	333,0,228,0,-6	1	0270	-- cedilla
-S1	333,710,0,0,-26	2	0271	-- onesuperior
-Om	365,737,0,0,-6	2	0272	-- ordmasculine
-fc	333,484,0,0,-83	0	0273	-- guilsinglright
-14	834,710,19,0,-26	2	0274	-- onequarter
-12	834,710,19,0,-26	2	0275	-- onehalf
-34	834,710,19,0,-16	2	0276	-- threequarters
-r?	611,532,195,0,-55	0	0277	-- questiondown
-`A	722,936,0,0,-20	2	0300	-- Agrave
-'A	722,936,0,0,-20	2	0301	-- Aacute
-^A	722,936,0,0,-20	2	0302	-- Acircumflex
-~A	722,923,0,0,-20	2	0303	-- Atilde
-:A	722,915,0,0,-20	2	0304	-- Adieresis
-oA	722,962,0,0,-20	2	0305	-- Aring
-AE	1000,718,0,0,-5	2	0306	-- AE
-,C	722,737,228,0,-44	3	0307	-- Ccedilla
-`E	667,936,0,0,-76	2	0310	-- Egrave
-'E	667,936,0,0,-76	2	0311	-- Eacute
-^E	667,936,0,0,-76	2	0312	-- Ecircumflex
-:E	667,915,0,0,-76	2	0313	-- Edieresis
-`I	278,936,0,0,50	2	0314	-- Igrave
-'I	278,936,0,51,-64	2	0315	-- Iacute
-^I	278,936,0,38,37	2	0316	-- Icircumflex
-:I	278,915,0,22,21	2	0317	-- Idieresis
--D	722,718,0,0,5	2	0320	-- Eth
-~N	722,923,0,0,-69	2	0321	-- Ntilde
-`O	778,936,19,0,-44	2	0322	-- Ograve
-'O	778,936,19,0,-44	2	0323	-- Oacute
-^O	778,936,19,0,-44	2	0324	-- Ocircumflex
-~O	778,923,19,0,-44	2	0325	-- Otilde
-:O	778,915,19,0,-44	2	0326	-- Odieresis
-tmu	584,505,0,0,-40	0	0327	-- multiply
-/O	778,745,27,0,-33	2	0330	-- Oslash
-`U	722,936,19,0,-72	2	0331	-- Ugrave
-'U	722,936,19,0,-72	2	0332	-- Uacute
-^U	722,936,19,0,-72	2	0333	-- Ucircumflex
-:U	722,915,19,0,-72	2	0334	-- Udieresis
-'Y	667,936,0,0,-15	2	0335	-- Yacute
-TP	667,718,0,0,-76	2	0336	-- Thorn
-ss	611,731,14,0,-69	2	0337	-- germandbls
-`a	556,750,14,0,-29	2	0340	-- agrave
-'a	556,750,14,0,-29	2	0341	-- aacute
-^a	556,750,14,0,-29	2	0342	-- acircumflex
-~a	556,737,14,0,-29	2	0343	-- atilde
-:a	556,729,14,0,-29	2	0344	-- adieresis
-oa	556,776,14,0,-29	2	0345	-- aring
-ae	889,546,14,0,-29	0	0346	-- ae
-,c	556,546,228,0,-34	1	0347	-- ccedilla
-`e	556,750,14,0,-23	2	0350	-- egrave
-'e	556,750,14,0,-23	2	0351	-- eacute
-^e	556,750,14,0,-23	2	0352	-- ecircumflex
-:e	556,729,14,0,-23	2	0353	-- edieresis
-`i	278,750,0,0,50	2	0354	-- igrave
-'i	278,750,0,51,-69	2	0355	-- iacute
-^i	278,750,0,38,37	2	0356	-- icircumflex
-:i	278,729,0,22,21	2	0357	-- idieresis
-Sd	611,737,14,0,-34	2	0360	-- eth
-~n	611,737,0,0,-65	2	0361	-- ntilde
-`o	611,750,14,0,-34	2	0362	-- ograve
-'o	611,750,14,0,-34	2	0363	-- oacute
-^o	611,750,14,0,-34	2	0364	-- ocircumflex
-~o	611,737,14,0,-34	2	0365	-- otilde
-:o	611,729,14,0,-34	2	0366	-- odieresis
-tdi	584,548,42,0,-40	0	0367	-- divide
-/o	611,560,29,0,-22	0	0370	-- oslash
-`u	611,750,14,0,-66	2	0371	-- ugrave
-'u	611,750,14,0,-66	2	0372	-- uacute
-^u	611,750,14,0,-66	2	0373	-- ucircumflex
-:u	611,729,14,0,-66	2	0374	-- udieresis
-'y	556,750,214,0,-10	3	0375	-- yacute
-Tp	611,718,208,0,-62	3	0376	-- thorn
-:y	556,729,214,0,-10	3	0377	-- ydieresis
+bq	278,127,146	0	128	quotesinglbase
+Fo	556,484	0	129	guillemotleft
+Fc	556,484	0	130	guillemotright
+bu	350,524	0	131	bullet
+Fn	556,737,210,0,10	3	132	florin
+f/	167,710,19,169,170	2	133	fraction
+%0	1000,710,19,3,3	2	134	perthousand
+dg	556,718,171	2	135	dagger
+dd	556,718,171	2	136	daggerdbl
+en	556,333	0	137	endash
+em	1000,333	0	138	emdash
+fi	611,727	2	140	fi
+fl	611,727	2	141	fl
+.i	278,532	0	144	dotlessi
+ga	333,750,0,0,23	2	146	grave
+a"	333,750,0,153	2	147	hungarumlaut
+a.	333,729	2	148	dotaccent
+ab	333,750,0,2,2	2	149	breve
+ah	333,750,0,10,10	2	150	caron
+ao	333,776	2	151	ring
+ho	333,0,228	1	152	ogonek
+lq	500,727	2	153	quotedblleft
+rq	500,718	2	154	quotedblright
+oe	944,546,14	0	155	oe
+/l	278,718,0,18,18	2	156	lslash
+Bq	500,127,146	0	157	quotedblbase
+OE	1000,737,19	2	158	OE
+/L	611,718,0,0,20	2	159	Lslash
+r!	333,532,186	0	161	exclamdown
+ct	556,628,118	0	162	cent
+Po	556,718,16	2	163	sterling
+Cs	556,636,0,3,3	0	164	currency
+Ye	556,698,0,9,9	2	165	yen
+bb	280,737,19	2	166	brokenbar
+sc	556,727,184	2	167	section
+ad	333,729	2	168	dieresis
+co	737,737,19,12,11	2	169	copyright
+Of	370,737	2	170	ordfeminine
+fo	333,484	0	171	guilsinglleft
+tno	584,419	0	172	logicalnot
+\-	584,309	0	173	minus
+rg	737,737,19,11,11	2	174	registered
+a-	333,678,0,6,6	2	175	macron
+de	400,712	2	176	degree
+t+-	584,506	0	177	plusminus
+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
+ps	556,700,191,0,8	2	182	paragraph
+pc	278,334	0	183	periodcentered
+ac	333,0,228	1	184	cedilla
+S1	333,710	2	185	onesuperior
+Om	365,737	2	186	ordmasculine
+fc	333,484	0	187	guilsinglright
+14	834,710,19	2	188	onequarter
+12	834,710,19	2	189	onehalf
+34	834,710,19	2	190	threequarters
+r?	611,532,195	0	191	questiondown
+`A	722,936	2	192	Agrave
+'A	722,936	2	193	Aacute
+^A	722,936	2	194	Acircumflex
+~A	722,923	2	195	Atilde
+:A	722,915	2	196	Adieresis
+oA	722,962	2	197	Aring
+AE	1000,718	2	198	AE
+,C	722,737,228	3	199	Ccedilla
+`E	667,936	2	200	Egrave
+'E	667,936	2	201	Eacute
+^E	667,936	2	202	Ecircumflex
+:E	667,915	2	203	Edieresis
+`I	278,936,0,0,50	2	204	Igrave
+'I	278,936,0,51	2	205	Iacute
+^I	278,936,0,38,37	2	206	Icircumflex
+:I	278,915,0,22,21	2	207	Idieresis
+-D	722,718,0,0,5	2	208	Eth
+~N	722,923	2	209	Ntilde
+`O	778,936,19	2	210	Ograve
+'O	778,936,19	2	211	Oacute
+^O	778,936,19	2	212	Ocircumflex
+~O	778,923,19	2	213	Otilde
+:O	778,915,19	2	214	Odieresis
+tmu	584,505	0	215	multiply
+/O	778,745,27	2	216	Oslash
+`U	722,936,19	2	217	Ugrave
+'U	722,936,19	2	218	Uacute
+^U	722,936,19	2	219	Ucircumflex
+:U	722,915,19	2	220	Udieresis
+'Y	667,936	2	221	Yacute
+TP	667,718	2	222	Thorn
+ss	611,731,14	2	223	germandbls
+`a	556,750,14	2	224	agrave
+'a	556,750,14	2	225	aacute
+^a	556,750,14	2	226	acircumflex
+~a	556,737,14	2	227	atilde
+:a	556,729,14	2	228	adieresis
+oa	556,776,14	2	229	aring
+ae	889,546,14	0	230	ae
+,c	556,546,228	1	231	ccedilla
+`e	556,750,14	2	232	egrave
+'e	556,750,14	2	233	eacute
+^e	556,750,14	2	234	ecircumflex
+:e	556,729,14	2	235	edieresis
+`i	278,750,0,0,50	2	236	igrave
+'i	278,750,0,51	2	237	iacute
+^i	278,750,0,38,37	2	238	icircumflex
+:i	278,729,0,22,21	2	239	idieresis
+Sd	611,737,14	2	240	eth
+~n	611,737	2	241	ntilde
+`o	611,750,14	2	242	ograve
+'o	611,750,14	2	243	oacute
+^o	611,750,14	2	244	ocircumflex
+~o	611,737,14	2	245	otilde
+:o	611,729,14	2	246	odieresis
+tdi	584,548,42	0	247	divide
+/o	611,560,29	0	248	oslash
+`u	611,750,14	2	249	ugrave
+'u	611,750,14	2	250	uacute
+^u	611,750,14	2	251	ucircumflex
+:u	611,729,14	2	252	udieresis
+'y	556,750,214	3	253	yacute
+Tp	611,718,208	3	254	thorn
+:y	556,729,214	3	255	ydieresis
+u2026	1000,146	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HBI b/contrib/groff/font/devps/HBI
index 6a7d853..2529a52 100644
--- a/contrib/groff/font/devps/HBI
+++ b/contrib/groff/font/devps/HBI
@@ -222,246 +222,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	584,698,0,57,-81,57	2	0000	-- asciicircum
-ti	584,343,0,43,-65,43	0	0001	-- asciitilde
-vS	667,936,19,101,-31,90	2	0002	-- Scaron
-vZ	611,936,0,176,25,90	2	0003	-- Zcaron
-vs	556,750,14,108,-13,90	2	0004	-- scaron
-vz	500,750,0,136,30,90	2	0005	-- zcaron
-:Y	667,915,0,189,-118,90	2	0006	-- Ydieresis
-tm	1000,718,0,159,-129,90	2	0007	-- trademark
-aq	238,718,0,133,-115,90	2	0010	-- quotesingle
-space	278	0	0040
-!	333,718,0,114,-44,90	2	0041	-- exclam
-"	474,718,0,105,-143,90	2	0042	-- quotedbl
+ha	584,698,0,57,-81,57	2	0	asciicircum
+ti	584,343,0,43,-65,43	0	1	asciitilde
+vS	667,936,19,101,-31,90	2	2	Scaron
+vZ	611,936,0,176,25,90	2	3	Zcaron
+vs	556,750,14,108,-13,90	2	4	scaron
+vz	500,750,0,136,30,90	2	5	zcaron
+:Y	667,915,0,189,-118,90	2	6	Ydieresis
+tm	1000,718,0,159,-129,90	2	7	trademark
+aq	238,718,0,133,-115,90	2	8	quotesingle
+space	278	0	32	space
+!	333,718,0,114,-44,90	2	33	exclam
+"	474,718,0,105,-143,90	2	34	quotedbl
 dq	"
-#	556,698,0,138,-10,90	2	0043	-- numbersign
+#	556,698,0,138,-10,90	2	35	numbersign
 sh	"
-$	556,775,115,116,-17,90	2	0044	-- dollar
+$	556,775,115,116,-17,90	2	36	dollar
 Do	"
-%	889,710,19,62,-86,62	2	0045	-- percent
-&	722,718,19,60,-39,60	2	0046	-- ampersand
-'	278,718,0,134,-117,90	2	0047	-- quoteright
+%	889,710,19,62,-86,62	2	37	percent
+&	722,718,19,60,-39,60	2	38	ampersand
+'	278,718,0,134,-117,90	2	39	quoteright
 cq	"
-(	333,734,208,187,-26,90	3	0050	-- parenleft
-)	333,734,208,86,75,86	3	0051	-- parenright
-*	389,718,0,142,-96,90	2	0052	-- asterisk
-+	584,506,0,76,-32,76	0	0053	-- plus
-,	278,146,168,17,22,17	0	0054	-- comma
--	333,345,0,96,-23,90	0	0055	-- hyphen
+(	333,734,208,187,-26,90	3	40	parenleft
+)	333,734,208,86,75,86	3	41	parenright
+*	389,718,0,142,-96,90	2	42	asterisk
++	584,506,0,76,-32,76	0	43	plus
+,	278,146,168,17,22,17	0	44	comma
+-	333,345,0,96,-23,90	0	45	hyphen
 hy	"
-.	278,146,0,17,-14,17	0	0056	-- period
-/	278,737,19,240,87,90	2	0057	-- slash
+.	278,146,0,17,-14,17	0	46	period
+/	278,737,19,240,87,90	2	47	slash
 sl	"
-0	556,710,19,111,-36,90	2	0060	-- zero
-1	556,710,0,23,-123,23	2	0061	-- one
-2	556,710,0,113,24,90	2	0062	-- two
-3	556,710,19,102,-15,90	2	0063	-- three
-4	556,710,0,92,-10,90	2	0064	-- four
-5	556,698,19,130,-14,90	2	0065	-- five
-6	556,710,19,113,-35,90	2	0066	-- six
-7	556,698,0,170,-75,90	2	0067	-- seven
-8	556,710,19,110,-19,90	2	0070	-- eight
-9	556,710,19,109,-28,90	2	0071	-- nine
-:	333,512,0,68,-42,68	0	0072	-- colon
-;	333,512,168,68,-6,68	0	0073	-- semicolon
-<	584,514,8,121,-32,90	0	0074	-- less
-=	584,419,0,99,-8,90	0	0075	-- equal
->	584,514,8,75,14,75	0	0076	-- greater
-?	611,727,0,110,-115,90	2	0077	-- question
-@	975,737,19,29,-136,29	2	0100	-- at
+0	556,710,19,111,-36,90	2	48	zero
+1	556,710,0,23,-123,23	2	49	one
+2	556,710,0,113,24,90	2	50	two
+3	556,710,19,102,-15,90	2	51	three
+4	556,710,0,92,-10,90	2	52	four
+5	556,698,19,130,-14,90	2	53	five
+6	556,710,19,113,-35,90	2	54	six
+7	556,698,0,170,-75,90	2	55	seven
+8	556,710,19,110,-19,90	2	56	eight
+9	556,710,19,109,-28,90	2	57	nine
+:	333,512,0,68,-42,68	0	58	colon
+;	333,512,168,68,-6,68	0	59	semicolon
+<	584,514,8,121,-32,90	0	60	less
+=	584,419,0,99,-8,90	0	61	equal
+>	584,514,8,75,14,75	0	62	greater
+?	611,727,0,110,-115,90	2	63	question
+@	975,737,19,29,-136,29	2	64	at
 at	"
-A	722,718,0,30,30,30	2	0101	-- A
-B	722,718,0,92,-26,90	2	0102	-- B
-C	722,737,19,117,-57,90	2	0103	-- C
-D	722,718,0,105,-26,90	2	0104	-- D
-E	667,718,0,140,-26,90	2	0105	-- E
-F	611,718,0,179,-26,90	2	0106	-- F
-G	778,737,19,89,-58,89	2	0107	-- G
-H	722,718,0,132,-21,90	2	0110	-- H
-I	278,718,0,139,-14,90	2	0111	-- I
-J	556,718,18,131,-10,90	2	0112	-- J
-K	722,718,0,186,-37,90	2	0113	-- K
-L	611,718,0,50,-26,50	2	0114	-- L
-M	833,718,0,135,-19,90	2	0115	-- M
-N	722,718,0,135,-19,90	2	0116	-- N
-O	778,737,19,95,-57,90	2	0117	-- O
-P	667,718,0,121,-26,90	2	0120	-- P
-Q	778,737,52,95,-57,90	2	0121	-- Q
-R	722,718,0,106,-26,90	2	0122	-- R
-S	667,737,19,101,-31,90	2	0123	-- S
-T	611,718,0,190,-90,90	2	0124	-- T
-U	722,718,19,132,-66,90	2	0125	-- U
-V	667,718,0,184,-122,90	2	0126	-- V
-W	944,718,0,188,-119,90	2	0127	-- W
-X	667,718,0,174,36,90	2	0130	-- X
-Y	667,718,0,189,-118,90	2	0131	-- Y
-Z	611,718,0,176,25,90	2	0132	-- Z
-[	333,722,196,179,29,90	2	0133	-- bracketleft
+A	722,718,0,30,30,30	2	65	A
+B	722,718,0,92,-26,90	2	66	B
+C	722,737,19,117,-57,90	2	67	C
+D	722,718,0,105,-26,90	2	68	D
+E	667,718,0,140,-26,90	2	69	E
+F	611,718,0,179,-26,90	2	70	F
+G	778,737,19,89,-58,89	2	71	G
+H	722,718,0,132,-21,90	2	72	H
+I	278,718,0,139,-14,90	2	73	I
+J	556,718,18,131,-10,90	2	74	J
+K	722,718,0,186,-37,90	2	75	K
+L	611,718,0,50,-26,50	2	76	L
+M	833,718,0,135,-19,90	2	77	M
+N	722,718,0,135,-19,90	2	78	N
+O	778,737,19,95,-57,90	2	79	O
+P	667,718,0,121,-26,90	2	80	P
+Q	778,737,52,95,-57,90	2	81	Q
+R	722,718,0,106,-26,90	2	82	R
+S	667,737,19,101,-31,90	2	83	S
+T	611,718,0,190,-90,90	2	84	T
+U	722,718,19,132,-66,90	2	85	U
+V	667,718,0,184,-122,90	2	86	V
+W	944,718,0,188,-119,90	2	87	W
+X	667,718,0,174,36,90	2	88	X
+Y	667,718,0,189,-118,90	2	89	Y
+Z	611,718,0,176,25,90	2	90	Z
+[	333,722,196,179,29,90	2	91	bracketleft
 lB	"
-\	278,737,19,79,-74,79	2	0134	-- backslash
+\	278,737,19,79,-74,79	2	92	backslash
 rs	"
-]	333,722,196,140,68,90	2	0135	-- bracketright
+]	333,722,196,140,68,90	2	93	bracketright
 rB	"
-a^	333,750,0,188,-68,90	2	0136	-- circumflex
+a^	333,750,0,188,-68,90	2	94	circumflex
 ^	"
-_	556,0,125,34,77,34	0	0137	-- underscore
-`	278,727,0,133,-115,90	2	0140	-- quoteleft
+_	556,0,125,34,77,34	0	95	underscore
+`	278,727,0,133,-115,90	2	96	quoteleft
 oq	"
-a	556,546,14,77,-5,77	0	0141	-- a
-b	611,718,14,84,-11,84	2	0142	-- b
-c	556,546,14,93,-29,90	0	0143	-- c
-d	611,718,14,143,-32,90	2	0144	-- d
-e	556,546,14,87,-20,87	0	0145	-- e
-f	333,727,0,186,-37,90	2	0146	-- f
-g	611,546,217,105,12,90	1	0147	-- g
-h	611,718,0,68,-15,68	2	0150	-- h
-i	278,725,0,135,-19,90	2	0151	-- i
-j	278,725,214,135,92,90	3	0152	-- j
-k	556,718,0,164,-19,90	2	0153	-- k
-l	278,718,0,134,-19,90	2	0154	-- l
-m	889,546,0,70,-14,70	0	0155	-- m
-n	611,546,0,68,-15,68	0	0156	-- n
-o	611,546,14,82,-32,82	0	0157	-- o
-p	611,546,207,84,32,84	1	0160	-- p
-q	611,546,207,104,-30,90	1	0161	-- q
-r	389,546,0,150,-14,90	0	0162	-- r
-s	556,546,14,78,-13,78	0	0163	-- s
-t	333,676,6,139,-50,90	2	0164	-- t
-u	611,532,14,97,-48,90	0	0165	-- u
-v	556,532,0,150,-76,90	0	0166	-- v
-w	778,532,0,154,-73,90	0	0167	-- w
-x	556,532,0,142,35,90	0	0170	-- x
-y	556,532,214,146,8,90	1	0171	-- y
-z	500,532,0,133,30,90	0	0172	-- z
-lC	389,722,196,179,-44,90	2	0173	-- braceleft
+a	556,546,14,77,-5,77	0	97	a
+b	611,718,14,84,-11,84	2	98	b
+c	556,546,14,93,-29,90	0	99	c
+d	611,718,14,143,-32,90	2	100	d
+e	556,546,14,87,-20,87	0	101	e
+f	333,727,0,186,-37,90	2	102	f
+g	611,546,217,105,12,90	1	103	g
+h	611,718,0,68,-15,68	2	104	h
+i	278,725,0,135,-19,90	2	105	i
+j	278,725,214,135,92,90	3	106	j
+k	556,718,0,164,-19,90	2	107	k
+l	278,718,0,134,-19,90	2	108	l
+m	889,546,0,70,-14,70	0	109	m
+n	611,546,0,68,-15,68	0	110	n
+o	611,546,14,82,-32,82	0	111	o
+p	611,546,207,84,32,84	1	112	p
+q	611,546,207,104,-30,90	1	113	q
+r	389,546,0,150,-14,90	0	114	r
+s	556,546,14,78,-13,78	0	115	s
+t	333,676,6,139,-50,90	2	116	t
+u	611,532,14,97,-48,90	0	117	u
+v	556,532,0,150,-76,90	0	118	v
+w	778,532,0,154,-73,90	0	119	w
+x	556,532,0,142,35,90	0	120	x
+y	556,532,214,146,8,90	1	121	y
+z	500,532,0,133,30,90	0	122	z
+lC	389,722,196,179,-44,90	2	123	braceleft
 {	"
-ba	280,737,19,123,-30,90	2	0174	-- bar
+ba	280,737,19,123,-30,90	2	124	bar
 |	"
-rC	389,722,196,68,68,68	2	0175	-- braceright
+rC	389,722,196,68,68,68	2	125	braceright
 }	"
-a~	333,737,0,224,-63,90	2	0176	-- tilde
+a~	333,737,0,224,-63,90	2	126	tilde
 ~	"
-bq	278,127,146,8,9,8	0	0200	-- quotesinglbase
-Fo	556,484,0,65,-85,65	0	0201	-- guillemotleft
-Fc	556,484,0,34,-54,34	0	0202	-- guillemotright
-bu	350,524,0,120,-33,90	0	0203	-- bullet
-Fn	556,737,210,163,100,90	3	0204	-- florin
-f/	167,710,19,370,224,90	2	0205	-- fraction
-%0	1000,710,19,88,-26,88	2	0206	-- perthousand
-dg	556,718,171,120,-68,90	2	0207	-- dagger
-dd	556,718,171,122,4,90	2	0210	-- daggerdbl
-en	556,333,0,121,2,90	0	0211	-- endash
-em	1000,333,0,121,2,90	0	0212	-- emdash
-fi	611,727,0,135,-37,90	2	0214	-- fi
-fl	611,727,0,134,-37,90	2	0215	-- fl
-.i	278,532,0,94,-19,90	0	0220	-- dotlessi
-ga	333,750,0,70,-86,70	2	0222	-- grave
-a"	333,750,0,362,-87,90	2	0223	-- hungarumlaut
-a.	333,729,0,102,-185,90	2	0224	-- dotaccent
-ab	333,750,0,211,-106,90	2	0225	-- breve
-ah	333,750,0,219,-99,90	2	0226	-- caron
-ao	333,776,0,137,-150,90	2	0227	-- ring
-ho	333,0,228,0,9	1	0230	-- ogonek
-lq	500,727,0,138,-110,90	2	0231	-- quotedblleft
-rq	500,718,0,139,-112,90	2	0232	-- quotedblright
-oe	944,546,14,83,-32,83	0	0233	-- oe
-/l	278,718,0,179,10,90	2	0234	-- lslash
-Bq	500,127,146,13,14,13	0	0235	-- quotedblbase
-OE	1000,737,19,164,-49,90	2	0236	-- OE
-/L	611,718,0,50,16,50	2	0237	-- Lslash
-r!	333,532,186,70,0,70	0	0241	-- exclamdown
-ct	556,628,118,93,-29,90	0	0242	-- cent
-Po	556,718,16,129,0,90	2	0243	-- sterling
-Cs	556,636,0,174,23,90	0	0244	-- currency
-Ye	556,698,0,207,-10,90	2	0245	-- yen
-bb	280,737,19,123,-30,90	2	0246	-- brokenbar
-sc	556,727,184,92,-11,90	2	0247	-- section
-ad	333,729,0,199,-87,90	2	0250	-- dieresis
-co	737,737,19,148,-6,90	2	0251	-- copyright
-Of	370,737,0,145,-42,90	2	0252	-- ordfeminine
-fo	333,484,0,70,-80,70	0	0253	-- guilsinglleft
-no	584,419,0,99,-55,90	0	0254	-- logicalnot
-\-	584,309,0,76,-32,76	0	0255	-- minus
-rg	737,737,19,147,-5,90	2	0256	-- registered
-a-	333,678,0,200,-72,90	2	0257	-- macron
-de	400,712,0,117,-125,90	2	0260	-- degree
-t+-	584,506,0,91,10,90	0	0261	-- plusminus
-S2	333,710,0,166,-19,90	2	0262	-- twosuperior
-S3	333,710,0,158,-41,90	2	0263	-- threesuperior
-aa	333,750,0,232,-186,90	2	0264	-- acute
-mc	611,532,207,97,28,90	1	0265	-- mu
-ps	556,700,191,182,-48,90	2	0266	-- paragraph
-pc	278,334,0,48,-60,48	0	0267	-- periodcentered
-ac	333,0,228,0,87	1	0270	-- cedilla
-S1	333,710,0,105,-98,90	2	0271	-- onesuperior
-Om	365,737,0,170,-42,90	2	0272	-- ordmasculine
-fc	333,484,0,39,-49,39	0	0273	-- guilsinglright
-14	834,710,19,22,-82,22	2	0274	-- onequarter
-12	834,710,19,74,-82,74	2	0275	-- onehalf
-34	834,710,19,55,-49,55	2	0276	-- threequarters
-r?	611,532,195,0,-3	0	0277	-- questiondown
-`A	722,936,0,30,30,30	2	0300	-- Agrave
-'A	722,936,0,78,30,78	2	0301	-- Aacute
-^A	722,936,0,34,30,34	2	0302	-- Acircumflex
-~A	722,923,0,69,30,69	2	0303	-- Atilde
-:A	722,915,0,44,30,44	2	0304	-- Adieresis
-oA	722,962,0,30,30,30	2	0305	-- Aring
-AE	1000,718,0,150,45,90	2	0306	-- AE
-,C	722,737,228,117,-57,90	3	0307	-- Ccedilla
-`E	667,936,0,140,-26,90	2	0310	-- Egrave
-'E	667,936,0,140,-26,90	2	0311	-- Eacute
-^E	667,936,0,140,-26,90	2	0312	-- Ecircumflex
-:E	667,915,0,140,-26,90	2	0313	-- Edieresis
-`I	278,936,0,139,-14,90	2	0314	-- Igrave
-'I	278,936,0,300,-14,90	2	0315	-- Iacute
-^I	278,936,0,256,-14,90	2	0316	-- Icircumflex
-:I	278,915,0,266,-14,90	2	0317	-- Idieresis
--D	722,718,0,105,-12,90	2	0320	-- Eth
-~N	722,923,0,135,-19,90	2	0321	-- Ntilde
-`O	778,936,19,95,-57,90	2	0322	-- Ograve
-'O	778,936,19,95,-57,90	2	0323	-- Oacute
-^O	778,936,19,95,-57,90	2	0324	-- Ocircumflex
-~O	778,923,19,95,-57,90	2	0325	-- Otilde
-:O	778,915,19,95,-57,90	2	0326	-- Odieresis
-tmu	584,505,0,101,-7,90	0	0327	-- multiply
-/O	778,745,27,166,15,90	2	0330	-- Oslash
-`U	722,936,19,132,-66,90	2	0331	-- Ugrave
-'U	722,936,19,132,-66,90	2	0332	-- Uacute
-^U	722,936,19,132,-66,90	2	0333	-- Ucircumflex
-:U	722,915,19,132,-66,90	2	0334	-- Udieresis
-'Y	667,936,0,189,-118,90	2	0335	-- Yacute
-TP	667,718,0,99,-26,90	2	0336	-- Thorn
-ss	611,731,14,96,-19,90	2	0337	-- germandbls
-`a	556,750,14,77,-5,77	2	0340	-- agrave
-'a	556,750,14,121,-5,90	2	0341	-- aacute
-^a	556,750,14,77,-5,77	2	0342	-- acircumflex
-~a	556,737,14,113,-5,90	2	0343	-- atilde
-:a	556,729,14,88,-5,88	2	0344	-- adieresis
-oa	556,776,14,77,-5,77	2	0345	-- aring
-ae	889,546,14,84,-6,84	0	0346	-- ae
-,c	556,546,228,93,-29,90	1	0347	-- ccedilla
-`e	556,750,14,87,-20,87	2	0350	-- egrave
-'e	556,750,14,121,-20,90	2	0351	-- eacute
-^e	556,750,14,87,-20,87	2	0352	-- ecircumflex
-:e	556,729,14,88,-20,88	2	0353	-- edieresis
-`i	278,750,0,98,-19,90	2	0354	-- igrave
-'i	278,750,0,260,-19,90	2	0355	-- iacute
-^i	278,750,0,216,-19,90	2	0356	-- icircumflex
-:i	278,729,0,227,-19,90	2	0357	-- idieresis
-Sd	611,737,14,109,-32,90	2	0360	-- eth
-~n	611,737,0,85,-15,85	2	0361	-- ntilde
-`o	611,750,14,82,-32,82	2	0362	-- ograve
-'o	611,750,14,93,-32,90	2	0363	-- oacute
-^o	611,750,14,82,-32,82	2	0364	-- ocircumflex
-~o	611,737,14,85,-32,85	2	0365	-- otilde
-:o	611,729,14,82,-32,82	2	0366	-- odieresis
-tdi	584,548,42,76,-32,76	0	0367	-- divide
-/o	611,560,29,140,28,90	0	0370	-- oslash
-`u	611,750,14,97,-48,90	2	0371	-- ugrave
-'u	611,750,14,97,-48,90	2	0372	-- uacute
-^u	611,750,14,97,-48,90	2	0373	-- ucircumflex
-:u	611,729,14,97,-48,90	2	0374	-- udieresis
-'y	556,750,214,146,8,90	3	0375	-- yacute
-Tp	611,718,208,84,32,84	3	0376	-- thorn
-:y	556,729,214,146,8,90	3	0377	-- ydieresis
+bq	278,127,146,8,9,8	0	128	quotesinglbase
+Fo	556,484,0,65,-85,65	0	129	guillemotleft
+Fc	556,484,0,34,-54,34	0	130	guillemotright
+bu	350,524,0,120,-33,90	0	131	bullet
+Fn	556,737,210,163,100,90	3	132	florin
+f/	167,710,19,370,224,90	2	133	fraction
+%0	1000,710,19,88,-26,88	2	134	perthousand
+dg	556,718,171,120,-68,90	2	135	dagger
+dd	556,718,171,122,4,90	2	136	daggerdbl
+en	556,333,0,121,2,90	0	137	endash
+em	1000,333,0,121,2,90	0	138	emdash
+fi	611,727,0,135,-37,90	2	140	fi
+fl	611,727,0,134,-37,90	2	141	fl
+.i	278,532,0,94,-19,90	0	144	dotlessi
+ga	333,750,0,70,-86,70	2	146	grave
+a"	333,750,0,362,-87,90	2	147	hungarumlaut
+a.	333,729,0,102,-185,90	2	148	dotaccent
+ab	333,750,0,211,-106,90	2	149	breve
+ah	333,750,0,219,-99,90	2	150	caron
+ao	333,776,0,137,-150,90	2	151	ring
+ho	333,0,228,0,9	1	152	ogonek
+lq	500,727,0,138,-110,90	2	153	quotedblleft
+rq	500,718,0,139,-112,90	2	154	quotedblright
+oe	944,546,14,83,-32,83	0	155	oe
+/l	278,718,0,179,10,90	2	156	lslash
+Bq	500,127,146,13,14,13	0	157	quotedblbase
+OE	1000,737,19,164,-49,90	2	158	OE
+/L	611,718,0,50,16,50	2	159	Lslash
+r!	333,532,186,70,0,70	0	161	exclamdown
+ct	556,628,118,93,-29,90	0	162	cent
+Po	556,718,16,129,0,90	2	163	sterling
+Cs	556,636,0,174,23,90	0	164	currency
+Ye	556,698,0,207,-10,90	2	165	yen
+bb	280,737,19,123,-30,90	2	166	brokenbar
+sc	556,727,184,92,-11,90	2	167	section
+ad	333,729,0,199,-87,90	2	168	dieresis
+co	737,737,19,148,-6,90	2	169	copyright
+Of	370,737,0,145,-42,90	2	170	ordfeminine
+fo	333,484,0,70,-80,70	0	171	guilsinglleft
+tno	584,419,0,99,-55,90	0	172	logicalnot
+\-	584,309,0,76,-32,76	0	173	minus
+rg	737,737,19,147,-5,90	2	174	registered
+a-	333,678,0,200,-72,90	2	175	macron
+de	400,712,0,117,-125,90	2	176	degree
+t+-	584,506,0,91,10,90	0	177	plusminus
+S2	333,710,0,166,-19,90	2	178	twosuperior
+S3	333,710,0,158,-41,90	2	179	threesuperior
+aa	333,750,0,232,-186,90	2	180	acute
+mc	611,532,207,97,28,90	1	181	mu
+ps	556,700,191,182,-48,90	2	182	paragraph
+pc	278,334,0,48,-60,48	0	183	periodcentered
+ac	333,0,228,0,87	1	184	cedilla
+S1	333,710,0,105,-98,90	2	185	onesuperior
+Om	365,737,0,170,-42,90	2	186	ordmasculine
+fc	333,484,0,39,-49,39	0	187	guilsinglright
+14	834,710,19,22,-82,22	2	188	onequarter
+12	834,710,19,74,-82,74	2	189	onehalf
+34	834,710,19,55,-49,55	2	190	threequarters
+r?	611,532,195,0,-3	0	191	questiondown
+`A	722,936,0,30,30,30	2	192	Agrave
+'A	722,936,0,78,30,78	2	193	Aacute
+^A	722,936,0,34,30,34	2	194	Acircumflex
+~A	722,923,0,69,30,69	2	195	Atilde
+:A	722,915,0,44,30,44	2	196	Adieresis
+oA	722,962,0,30,30,30	2	197	Aring
+AE	1000,718,0,150,45,90	2	198	AE
+,C	722,737,228,117,-57,90	3	199	Ccedilla
+`E	667,936,0,140,-26,90	2	200	Egrave
+'E	667,936,0,140,-26,90	2	201	Eacute
+^E	667,936,0,140,-26,90	2	202	Ecircumflex
+:E	667,915,0,140,-26,90	2	203	Edieresis
+`I	278,936,0,139,-14,90	2	204	Igrave
+'I	278,936,0,300,-14,90	2	205	Iacute
+^I	278,936,0,256,-14,90	2	206	Icircumflex
+:I	278,915,0,266,-14,90	2	207	Idieresis
+-D	722,718,0,105,-12,90	2	208	Eth
+~N	722,923,0,135,-19,90	2	209	Ntilde
+`O	778,936,19,95,-57,90	2	210	Ograve
+'O	778,936,19,95,-57,90	2	211	Oacute
+^O	778,936,19,95,-57,90	2	212	Ocircumflex
+~O	778,923,19,95,-57,90	2	213	Otilde
+:O	778,915,19,95,-57,90	2	214	Odieresis
+tmu	584,505,0,101,-7,90	0	215	multiply
+/O	778,745,27,166,15,90	2	216	Oslash
+`U	722,936,19,132,-66,90	2	217	Ugrave
+'U	722,936,19,132,-66,90	2	218	Uacute
+^U	722,936,19,132,-66,90	2	219	Ucircumflex
+:U	722,915,19,132,-66,90	2	220	Udieresis
+'Y	667,936,0,189,-118,90	2	221	Yacute
+TP	667,718,0,99,-26,90	2	222	Thorn
+ss	611,731,14,96,-19,90	2	223	germandbls
+`a	556,750,14,77,-5,77	2	224	agrave
+'a	556,750,14,121,-5,90	2	225	aacute
+^a	556,750,14,77,-5,77	2	226	acircumflex
+~a	556,737,14,113,-5,90	2	227	atilde
+:a	556,729,14,88,-5,88	2	228	adieresis
+oa	556,776,14,77,-5,77	2	229	aring
+ae	889,546,14,84,-6,84	0	230	ae
+,c	556,546,228,93,-29,90	1	231	ccedilla
+`e	556,750,14,87,-20,87	2	232	egrave
+'e	556,750,14,121,-20,90	2	233	eacute
+^e	556,750,14,87,-20,87	2	234	ecircumflex
+:e	556,729,14,88,-20,88	2	235	edieresis
+`i	278,750,0,98,-19,90	2	236	igrave
+'i	278,750,0,260,-19,90	2	237	iacute
+^i	278,750,0,216,-19,90	2	238	icircumflex
+:i	278,729,0,227,-19,90	2	239	idieresis
+Sd	611,737,14,109,-32,90	2	240	eth
+~n	611,737,0,85,-15,85	2	241	ntilde
+`o	611,750,14,82,-32,82	2	242	ograve
+'o	611,750,14,93,-32,90	2	243	oacute
+^o	611,750,14,82,-32,82	2	244	ocircumflex
+~o	611,737,14,85,-32,85	2	245	otilde
+:o	611,729,14,82,-32,82	2	246	odieresis
+tdi	584,548,42,76,-32,76	0	247	divide
+/o	611,560,29,140,28,90	0	248	oslash
+`u	611,750,14,97,-48,90	2	249	ugrave
+'u	611,750,14,97,-48,90	2	250	uacute
+^u	611,750,14,97,-48,90	2	251	ucircumflex
+:u	611,729,14,97,-48,90	2	252	udieresis
+'y	556,750,214,146,8,90	3	253	yacute
+Tp	611,718,208,84,32,84	3	254	thorn
+:y	556,729,214,146,8,90	3	255	ydieresis
+u2026	1000,146,0,0,-42	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HI b/contrib/groff/font/devps/HI
index d1bd197..f260113 100644
--- a/contrib/groff/font/devps/HI
+++ b/contrib/groff/font/devps/HI
@@ -262,246 +262,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	469,688,0,120,8,89	2	0000	-- asciicircum
-ti	584,326,0,46,-61,46	0	0001	-- asciitilde
-vS	667,929,19,96,-40,89	2	0002	-- Scaron
-vZ	611,929,0,180,27,89	2	0003	-- Zcaron
-vs	500,734,15,102,-13,89	2	0004	-- scaron
-vz	500,734,0,121,19,89	2	0005	-- zcaron
-:Y	667,901,0,189,-117,89	2	0006	-- Ydieresis
-tm	1000,718,0,106,-136,89	2	0007	-- trademark
-aq	191,718,0,144,-107,89	2	0010	-- quotesingle
-space	278	0	0040
-!	278,718,0,112,-40,89	2	0041	-- exclam
-"	355,718,0,133,-118,89	2	0042	-- quotedbl
+ha	469,688,0,120,8,89	2	0	asciicircum
+ti	584,326,0,46,-61,46	0	1	asciitilde
+vS	667,929,19,96,-40,89	2	2	Scaron
+vZ	611,929,0,180,27,89	2	3	Zcaron
+vs	500,734,15,102,-13,89	2	4	scaron
+vz	500,734,0,121,19,89	2	5	zcaron
+:Y	667,901,0,189,-117,89	2	6	Ydieresis
+tm	1000,718,0,106,-136,89	2	7	trademark
+aq	191,718,0,144,-107,89	2	8	quotesingle
+space	278	0	32	space
+!	278,718,0,112,-40,89	2	33	exclam
+"	355,718,0,133,-118,89	2	34	quotedbl
 dq	"
-#	556,688,0,125,-23,89	2	0043	-- numbersign
+#	556,688,0,125,-23,89	2	35	numbersign
 sh	"
-$	556,775,115,111,-19,89	2	0044	-- dollar
+$	556,775,115,111,-19,89	2	36	dollar
 Do	"
-%	889,703,19,50,-97,50	2	0045	-- percent
-&	667,718,15,30,-27,30	2	0046	-- ampersand
-'	222,718,0,138,-101,89	2	0047	-- quoteright
+%	889,703,19,50,-97,50	2	37	percent
+&	667,718,15,30,-27,30	2	38	ampersand
+'	222,718,0,138,-101,89	2	39	quoteright
 cq	"
-(	333,733,207,171,-58,89	3	0050	-- parenleft
-)	333,733,207,54,59,54	3	0051	-- parenright
-*	389,718,0,136,-115,89	2	0052	-- asterisk
-+	584,505,0,72,-35,72	0	0053	-- plus
-,	278,106,147,0,-6	0	0054	-- comma
--	333,322,0,74,-43,74	0	0055	-- hyphen
+(	333,733,207,171,-58,89	3	40	parenleft
+)	333,733,207,54,59,54	3	41	parenright
+*	389,718,0,136,-115,89	2	42	asterisk
++	584,505,0,72,-35,72	0	43	plus
+,	278,106,147,0,-6	0	44	comma
+-	333,322,0,74,-43,74	0	45	hyphen
 hy	"
-.	278,106,0,0,-37	0	0056	-- period
-/	278,737,19,224,71,89	2	0057	-- slash
+.	278,106,0,0,-37	0	46	period
+/	278,737,19,224,71,89	2	47	slash
 sl	"
-0	556,703,19,102,-43,89	2	0060	-- zero
-1	556,703,0,2,-157,2	2	0061	-- one
-2	556,703,0,111,24,89	2	0062	-- two
-3	556,703,19,104,-25,89	2	0063	-- three
-4	556,703,0,70,-11,70	2	0064	-- four
-5	556,688,19,115,-18,89	2	0065	-- five
-6	556,703,19,109,-41,89	2	0066	-- six
-7	556,688,0,163,-87,89	2	0067	-- seven
-8	556,703,19,101,-24,89	2	0070	-- eight
-9	556,703,19,103,-32,89	2	0071	-- nine
-:	278,516,0,73,-37,73	0	0072	-- colon
-;	278,516,147,73,-6,73	0	0073	-- semicolon
-<	584,495,0,107,-44,89	0	0074	-- less
-=	584,390,0,94,-13,89	0	0075	-- equal
->	584,495,0,63,0,63	0	0076	-- greater
-?	556,727,0,104,-111,89	2	0077	-- question
-@	1015,737,19,0,-165	2	0100	-- at
+0	556,703,19,102,-43,89	2	48	zero
+1	556,703,0,2,-157,2	2	49	one
+2	556,703,0,111,24,89	2	50	two
+3	556,703,19,104,-25,89	2	51	three
+4	556,703,0,70,-11,70	2	52	four
+5	556,688,19,115,-18,89	2	53	five
+6	556,703,19,109,-41,89	2	54	six
+7	556,688,0,163,-87,89	2	55	seven
+8	556,703,19,101,-24,89	2	56	eight
+9	556,703,19,103,-32,89	2	57	nine
+:	278,516,0,73,-37,73	0	58	colon
+;	278,516,147,73,-6,73	0	59	semicolon
+<	584,495,0,107,-44,89	0	60	less
+=	584,390,0,94,-13,89	0	61	equal
+>	584,495,0,63,0,63	0	62	greater
+?	556,727,0,104,-111,89	2	63	question
+@	1015,737,19,0,-165	2	64	at
 at	"
-A	667,718,0,37,36,37	2	0101	-- A
-B	667,718,0,95,-24,89	2	0102	-- B
-C	722,737,19,110,-58,89	2	0103	-- C
-D	722,718,0,92,-31,89	2	0104	-- D
-E	667,718,0,145,-36,89	2	0105	-- E
-F	611,718,0,175,-36,89	2	0106	-- F
-G	778,737,19,71,-61,71	2	0107	-- G
-H	722,718,0,127,-27,89	2	0110	-- H
-I	278,718,0,113,-41,89	2	0111	-- I
-J	500,718,19,131,3,89	2	0112	-- J
-K	667,718,0,191,-26,89	2	0113	-- K
-L	556,718,0,49,-26,49	2	0114	-- L
-M	833,718,0,131,-23,89	2	0115	-- M
-N	722,718,0,127,-26,89	2	0116	-- N
-O	778,737,19,98,-55,89	2	0117	-- O
-P	667,718,0,120,-36,89	2	0120	-- P
-Q	778,737,56,98,-55,89	2	0121	-- Q
-R	722,718,0,101,-38,89	2	0122	-- R
-S	667,737,19,96,-40,89	2	0123	-- S
-T	611,718,0,189,-98,89	2	0124	-- T
-U	722,718,19,125,-73,89	2	0125	-- U
-V	667,718,0,183,-123,89	2	0126	-- V
-W	944,718,0,187,-119,89	2	0127	-- W
-X	667,718,0,173,31,89	2	0130	-- X
-Y	667,718,0,189,-117,89	2	0131	-- Y
-Z	611,718,0,180,27,89	2	0132	-- Z
-[	278,722,196,175,29,89	2	0133	-- bracketleft
+A	667,718,0,37,36,37	2	65	A
+B	667,718,0,95,-24,89	2	66	B
+C	722,737,19,110,-58,89	2	67	C
+D	722,718,0,92,-31,89	2	68	D
+E	667,718,0,145,-36,89	2	69	E
+F	611,718,0,175,-36,89	2	70	F
+G	778,737,19,71,-61,71	2	71	G
+H	722,718,0,127,-27,89	2	72	H
+I	278,718,0,113,-41,89	2	73	I
+J	500,718,19,131,3,89	2	74	J
+K	667,718,0,191,-26,89	2	75	K
+L	556,718,0,49,-26,49	2	76	L
+M	833,718,0,131,-23,89	2	77	M
+N	722,718,0,127,-26,89	2	78	N
+O	778,737,19,98,-55,89	2	79	O
+P	667,718,0,120,-36,89	2	80	P
+Q	778,737,56,98,-55,89	2	81	Q
+R	722,718,0,101,-38,89	2	82	R
+S	667,737,19,96,-40,89	2	83	S
+T	611,718,0,189,-98,89	2	84	T
+U	722,718,19,125,-73,89	2	85	U
+V	667,718,0,183,-123,89	2	86	V
+W	944,718,0,187,-119,89	2	87	W
+X	667,718,0,173,31,89	2	88	X
+Y	667,718,0,189,-117,89	2	89	Y
+Z	611,718,0,180,27,89	2	90	Z
+[	278,722,196,175,29,89	2	91	bracketleft
 lB	"
-\	278,737,19,63,-90,63	2	0134	-- backslash
+\	278,737,19,63,-90,63	2	92	backslash
 rs	"
-]	278,722,196,140,64,89	2	0135	-- bracketright
+]	278,722,196,140,64,89	2	93	bracketright
 rB	"
-a^	333,734,0,155,-97,89	2	0136	-- circumflex
+a^	333,734,0,155,-97,89	2	94	circumflex
 ^	"
-_	556,0,125,34,77,34	0	0137	-- underscore
-`	222,725,0,151,-115,89	2	0140	-- quoteleft
+_	556,0,125,34,77,34	0	95	underscore
+`	222,725,0,151,-115,89	2	96	quoteleft
 oq	"
-a	556,538,15,53,-11,53	0	0141	-- a
-b	556,718,15,78,-8,78	2	0142	-- b
-c	500,538,15,103,-24,89	0	0143	-- c
-d	556,718,15,146,-34,89	2	0144	-- d
-e	556,538,15,72,-34,72	0	0145	-- e
-f	278,728,0,188,-36,89	2	0146	-- f
-g	556,538,220,104,8,89	1	0147	-- g
-h	556,718,0,67,-15,67	2	0150	-- h
-i	222,718,0,136,-17,89	2	0151	-- i
-j	222,718,210,136,110,89	3	0152	-- j
-k	500,718,0,150,-17,89	2	0153	-- k
-l	222,718,0,136,-17,89	2	0154	-- l
-m	833,538,0,69,-15,69	0	0155	-- m
-n	556,538,0,67,-15,67	0	0156	-- n
-o	556,538,14,79,-33,79	0	0157	-- o
-p	556,538,207,78,36,78	1	0160	-- p
-q	556,538,207,99,-34,89	1	0161	-- q
-r	333,538,0,163,-27,89	0	0162	-- r
-s	500,538,15,79,-13,79	0	0163	-- s
-t	278,669,7,140,-52,89	2	0164	-- t
-u	556,523,15,94,-44,89	0	0165	-- u
-v	500,523,0,153,-69,89	0	0166	-- v
-w	722,523,0,148,-75,89	0	0167	-- w
-x	500,523,0,144,39,89	0	0170	-- x
-y	500,523,214,150,35,89	1	0171	-- y
-z	500,523,0,121,19,89	0	0172	-- z
-lC	334,722,196,161,-42,89	2	0173	-- braceleft
+a	556,538,15,53,-11,53	0	97	a
+b	556,718,15,78,-8,78	2	98	b
+c	500,538,15,103,-24,89	0	99	c
+d	556,718,15,146,-34,89	2	100	d
+e	556,538,15,72,-34,72	0	101	e
+f	278,728,0,188,-36,89	2	102	f
+g	556,538,220,104,8,89	1	103	g
+h	556,718,0,67,-15,67	2	104	h
+i	222,718,0,136,-17,89	2	105	i
+j	222,718,210,136,110,89	3	106	j
+k	500,718,0,150,-17,89	2	107	k
+l	222,718,0,136,-17,89	2	108	l
+m	833,538,0,69,-15,69	0	109	m
+n	556,538,0,67,-15,67	0	110	n
+o	556,538,14,79,-33,79	0	111	o
+p	556,538,207,78,36,78	1	112	p
+q	556,538,207,99,-34,89	1	113	q
+r	333,538,0,163,-27,89	0	114	r
+s	500,538,15,79,-13,79	0	115	s
+t	278,669,7,140,-52,89	2	116	t
+u	556,523,15,94,-44,89	0	117	u
+v	500,523,0,153,-69,89	0	118	v
+w	722,523,0,148,-75,89	0	119	w
+x	500,523,0,144,39,89	0	120	x
+y	500,523,214,150,35,89	1	121	y
+z	500,523,0,121,19,89	0	122	z
+lC	334,722,196,161,-42,89	2	123	braceleft
 {	"
-ba	260,737,19,114,-40,89	2	0174	-- bar
+ba	260,737,19,114,-40,89	2	124	bar
 |	"
-rC	334,722,196,70,50,70	2	0175	-- braceright
+rC	334,722,196,70,50,70	2	125	braceright
 }	"
-a~	333,722,0,207,-75,89	2	0176	-- tilde
+a~	333,722,0,207,-75,89	2	126	tilde
 ~	"
-bq	222,106,149,8,29,8	0	0200	-- quotesinglbase
-Fo	556,446,0,48,-96,48	0	0201	-- guillemotleft
-Fc	556,446,0,22,-70,22	0	0202	-- guillemotright
-bu	350,517,0,113,-41,89	0	0203	-- bullet
-Fn	556,737,207,148,102,89	3	0204	-- florin
-f/	167,703,19,365,220,89	2	0205	-- fraction
-%0	1000,703,19,79,-38,79	2	0206	-- perthousand
-dg	556,718,159,116,-85,89	2	0207	-- dagger
-dd	556,718,159,117,-2,89	2	0210	-- daggerdbl
-en	556,313,0,117,-1,89	0	0211	-- endash
-em	1000,313,0,117,-1,89	0	0212	-- emdash
-fi	500,728,0,137,-36,89	2	0214	-- fi
-fl	500,728,0,135,-36,89	2	0215	-- fl
-.i	278,523,0,66,-45,66	0	0220	-- dotlessi
-ga	333,734,0,54,-120,54	2	0222	-- grave
-a"	333,734,0,282,-107,89	2	0223	-- hungarumlaut
-a.	333,706,0,79,-199,79	2	0224	-- dotaccent
-ab	333,731,0,193,-117,89	2	0225	-- breve
-ah	333,734,0,185,-127,89	2	0226	-- caron
-ao	333,756,0,119,-164,89	2	0227	-- ring
-ho	333,0,225,0,7	1	0230	-- ogonek
-lq	333,725,0,178,-88,89	2	0231	-- quotedblleft
-rq	333,718,0,165,-74,89	2	0232	-- quotedblright
-oe	944,538,15,70,-33,70	0	0233	-- oe
-/l	222,718,0,175,9,89	2	0234	-- lslash
-Bq	333,106,149,35,56,35	0	0235	-- quotedblbase
-OE	1000,737,19,166,-48,89	2	0236	-- OE
-/L	556,718,0,49,9,49	2	0237	-- Lslash
-r!	333,523,195,43,-27,43	0	0241	-- exclamdown
-ct	556,623,115,78,-45,78	0	0242	-- cent
-Po	556,718,16,128,1,89	2	0243	-- sterling
-Cs	556,603,0,140,-10,89	0	0244	-- currency
-Ye	556,688,0,193,-31,89	2	0245	-- yen
-bb	260,737,19,114,-40,89	2	0246	-- brokenbar
-sc	556,737,191,78,-26,78	2	0247	-- section
-ad	333,706,0,160,-118,89	2	0250	-- dieresis
-co	737,737,19,150,-4,89	2	0251	-- copyright
-Of	370,737,0,129,-50,89	2	0252	-- ordfeminine
-fo	333,446,0,57,-87,57	0	0253	-- guilsinglleft
-no	584,390,0,94,-56,89	0	0254	-- logicalnot
-\-	584,289,0,72,-35,72	0	0255	-- minus
-rg	737,737,19,150,-4,89	2	0256	-- registered
-a-	333,684,0,185,-93,89	2	0257	-- macron
-de	400,703,0,118,-119,89	2	0260	-- degree
-t+-	584,506,0,84,11,84	0	0261	-- plusminus
-S2	333,703,0,166,-14,89	2	0262	-- twosuperior
-S3	333,703,0,153,-40,89	2	0263	-- threesuperior
-aa	333,734,0,192,-198,89	2	0264	-- acute
-mc	556,523,207,94,26,89	1	0265	-- mu
-ps	537,718,173,163,-76,89	2	0266	-- paragraph
-pc	278,315,0,29,-79,29	0	0267	-- periodcentered
-ac	333,0,225,0,48	1	0270	-- cedilla
-S1	333,703,0,88,-116,88	2	0271	-- onesuperior
-Om	365,737,0,153,-50,89	2	0272	-- ordmasculine
-fc	333,446,0,31,-61,31	0	0273	-- guilsinglright
-14	834,703,19,18,-100,18	2	0274	-- onequarter
-12	834,703,19,55,-64,55	2	0275	-- onehalf
-34	834,703,19,77,-80,77	2	0276	-- threequarters
-r?	611,525,201,0,-35	0	0277	-- questiondown
-`A	667,929,0,37,36,37	2	0300	-- Agrave
-'A	667,929,0,66,36,66	2	0301	-- Aacute
-^A	667,929,0,37,36,37	2	0302	-- Acircumflex
-~A	667,917,0,82,36,82	2	0303	-- Atilde
-:A	667,901,0,37,36,37	2	0304	-- Adieresis
-oA	667,931,0,37,36,37	2	0305	-- Aring
-AE	1000,718,0,147,42,89	2	0306	-- AE
-,C	722,737,225,110,-58,89	3	0307	-- Ccedilla
-`E	667,929,0,145,-36,89	2	0310	-- Egrave
-'E	667,929,0,145,-36,89	2	0311	-- Eacute
-^E	667,929,0,145,-36,89	2	0312	-- Ecircumflex
-:E	667,901,0,145,-36,89	2	0313	-- Edieresis
-`I	278,929,0,123,-41,89	2	0314	-- Igrave
-'I	278,929,0,261,-41,89	2	0315	-- Iacute
-^I	278,929,0,224,-41,89	2	0316	-- Icircumflex
-:I	278,901,0,230,-41,89	2	0317	-- Idieresis
--D	722,718,0,92,-19,89	2	0320	-- Eth
-~N	722,917,0,127,-26,89	2	0321	-- Ntilde
-`O	778,929,19,98,-55,89	2	0322	-- Ograve
-'O	778,929,19,98,-55,89	2	0323	-- Oacute
-^O	778,929,19,98,-55,89	2	0324	-- Ocircumflex
-~O	778,917,19,98,-55,89	2	0325	-- Otilde
-:O	778,901,19,98,-55,89	2	0326	-- Odieresis
-tmu	584,506,0,108,0,89	0	0327	-- multiply
-/O	778,737,19,162,7,89	2	0330	-- Oslash
-`U	722,929,19,125,-73,89	2	0331	-- Ugrave
-'U	722,929,19,125,-73,89	2	0332	-- Uacute
-^U	722,929,19,125,-73,89	2	0333	-- Ucircumflex
-:U	722,901,19,125,-73,89	2	0334	-- Udieresis
-'Y	667,929,0,189,-117,89	2	0335	-- Yacute
-TP	667,718,0,95,-36,89	2	0336	-- Thorn
-ss	611,728,15,97,-17,89	2	0337	-- germandbls
-`a	556,734,15,53,-11,53	2	0340	-- agrave
-'a	556,734,15,81,-11,81	2	0341	-- aacute
-^a	556,734,15,53,-11,53	2	0342	-- acircumflex
-~a	556,722,15,86,-11,86	2	0343	-- atilde
-:a	556,706,15,53,-11,53	2	0344	-- adieresis
-oa	556,756,15,53,-11,53	2	0345	-- aring
-ae	889,538,15,70,-11,70	0	0346	-- ae
-,c	500,538,225,103,-24,89	1	0347	-- ccedilla
-`e	556,734,15,72,-34,72	2	0350	-- egrave
-'e	556,734,15,81,-34,81	2	0351	-- eacute
-^e	556,734,15,72,-34,72	2	0352	-- ecircumflex
-:e	556,706,15,72,-34,72	2	0353	-- edieresis
-`i	278,734,0,82,-45,82	2	0354	-- igrave
-'i	278,734,0,220,-45,89	2	0355	-- iacute
-^i	278,734,0,183,-45,89	2	0356	-- icircumflex
-:i	278,706,0,188,-45,89	2	0357	-- idieresis
-Sd	556,737,15,111,-31,89	2	0360	-- eth
-~n	556,722,0,86,-15,86	2	0361	-- ntilde
-`o	556,734,14,79,-33,79	2	0362	-- ograve
-'o	556,734,14,81,-33,81	2	0363	-- oacute
-^o	556,734,14,79,-33,79	2	0364	-- ocircumflex
-~o	556,722,14,96,-33,89	2	0365	-- otilde
-:o	556,706,14,79,-33,79	2	0366	-- odieresis
-tdi	584,524,19,72,-35,72	0	0367	-- divide
-/o	611,545,22,86,21,86	0	0370	-- oslash
-`u	556,734,15,94,-44,89	2	0371	-- ugrave
-'u	556,734,15,94,-44,89	2	0372	-- uacute
-^u	556,734,15,94,-44,89	2	0373	-- ucircumflex
-:u	556,706,15,94,-44,89	2	0374	-- udieresis
-'y	500,734,214,150,35,89	3	0375	-- yacute
-Tp	556,718,207,78,36,78	3	0376	-- thorn
-:y	500,706,214,150,35,89	3	0377	-- ydieresis
+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,-70,22	0	130	guillemotright
+bu	350,517,0,113,-41,89	0	131	bullet
+Fn	556,737,207,148,102,89	3	132	florin
+f/	167,703,19,365,220,89	2	133	fraction
+%0	1000,703,19,79,-38,79	2	134	perthousand
+dg	556,718,159,116,-85,89	2	135	dagger
+dd	556,718,159,117,-2,89	2	136	daggerdbl
+en	556,313,0,117,-1,89	0	137	endash
+em	1000,313,0,117,-1,89	0	138	emdash
+fi	500,728,0,137,-36,89	2	140	fi
+fl	500,728,0,135,-36,89	2	141	fl
+.i	278,523,0,66,-45,66	0	144	dotlessi
+ga	333,734,0,54,-120,54	2	146	grave
+a"	333,734,0,282,-107,89	2	147	hungarumlaut
+a.	333,706,0,79,-199,79	2	148	dotaccent
+ab	333,731,0,193,-117,89	2	149	breve
+ah	333,734,0,185,-127,89	2	150	caron
+ao	333,756,0,119,-164,89	2	151	ring
+ho	333,0,225,0,7	1	152	ogonek
+lq	333,725,0,178,-88,89	2	153	quotedblleft
+rq	333,718,0,165,-74,89	2	154	quotedblright
+oe	944,538,15,70,-33,70	0	155	oe
+/l	222,718,0,175,9,89	2	156	lslash
+Bq	333,106,149,35,56,35	0	157	quotedblbase
+OE	1000,737,19,166,-48,89	2	158	OE
+/L	556,718,0,49,9,49	2	159	Lslash
+r!	333,523,195,43,-27,43	0	161	exclamdown
+ct	556,623,115,78,-45,78	0	162	cent
+Po	556,718,16,128,1,89	2	163	sterling
+Cs	556,603,0,140,-10,89	0	164	currency
+Ye	556,688,0,193,-31,89	2	165	yen
+bb	260,737,19,114,-40,89	2	166	brokenbar
+sc	556,737,191,78,-26,78	2	167	section
+ad	333,706,0,160,-118,89	2	168	dieresis
+co	737,737,19,150,-4,89	2	169	copyright
+Of	370,737,0,129,-50,89	2	170	ordfeminine
+fo	333,446,0,57,-87,57	0	171	guilsinglleft
+tno	584,390,0,94,-56,89	0	172	logicalnot
+\-	584,289,0,72,-35,72	0	173	minus
+rg	737,737,19,150,-4,89	2	174	registered
+a-	333,684,0,185,-93,89	2	175	macron
+de	400,703,0,118,-119,89	2	176	degree
+t+-	584,506,0,84,11,84	0	177	plusminus
+S2	333,703,0,166,-14,89	2	178	twosuperior
+S3	333,703,0,153,-40,89	2	179	threesuperior
+aa	333,734,0,192,-198,89	2	180	acute
+mc	556,523,207,94,26,89	1	181	mu
+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,48	1	184	cedilla
+S1	333,703,0,88,-116,88	2	185	onesuperior
+Om	365,737,0,153,-50,89	2	186	ordmasculine
+fc	333,446,0,31,-61,31	0	187	guilsinglright
+14	834,703,19,18,-100,18	2	188	onequarter
+12	834,703,19,55,-64,55	2	189	onehalf
+34	834,703,19,77,-80,77	2	190	threequarters
+r?	611,525,201,0,-35	0	191	questiondown
+`A	667,929,0,37,36,37	2	192	Agrave
+'A	667,929,0,66,36,66	2	193	Aacute
+^A	667,929,0,37,36,37	2	194	Acircumflex
+~A	667,917,0,82,36,82	2	195	Atilde
+:A	667,901,0,37,36,37	2	196	Adieresis
+oA	667,931,0,37,36,37	2	197	Aring
+AE	1000,718,0,147,42,89	2	198	AE
+,C	722,737,225,110,-58,89	3	199	Ccedilla
+`E	667,929,0,145,-36,89	2	200	Egrave
+'E	667,929,0,145,-36,89	2	201	Eacute
+^E	667,929,0,145,-36,89	2	202	Ecircumflex
+:E	667,901,0,145,-36,89	2	203	Edieresis
+`I	278,929,0,123,-41,89	2	204	Igrave
+'I	278,929,0,261,-41,89	2	205	Iacute
+^I	278,929,0,224,-41,89	2	206	Icircumflex
+:I	278,901,0,230,-41,89	2	207	Idieresis
+-D	722,718,0,92,-19,89	2	208	Eth
+~N	722,917,0,127,-26,89	2	209	Ntilde
+`O	778,929,19,98,-55,89	2	210	Ograve
+'O	778,929,19,98,-55,89	2	211	Oacute
+^O	778,929,19,98,-55,89	2	212	Ocircumflex
+~O	778,917,19,98,-55,89	2	213	Otilde
+:O	778,901,19,98,-55,89	2	214	Odieresis
+tmu	584,506,0,108,0,89	0	215	multiply
+/O	778,737,19,162,7,89	2	216	Oslash
+`U	722,929,19,125,-73,89	2	217	Ugrave
+'U	722,929,19,125,-73,89	2	218	Uacute
+^U	722,929,19,125,-73,89	2	219	Ucircumflex
+:U	722,901,19,125,-73,89	2	220	Udieresis
+'Y	667,929,0,189,-117,89	2	221	Yacute
+TP	667,718,0,95,-36,89	2	222	Thorn
+ss	611,728,15,97,-17,89	2	223	germandbls
+`a	556,734,15,53,-11,53	2	224	agrave
+'a	556,734,15,81,-11,81	2	225	aacute
+^a	556,734,15,53,-11,53	2	226	acircumflex
+~a	556,722,15,86,-11,86	2	227	atilde
+:a	556,706,15,53,-11,53	2	228	adieresis
+oa	556,756,15,53,-11,53	2	229	aring
+ae	889,538,15,70,-11,70	0	230	ae
+,c	500,538,225,103,-24,89	1	231	ccedilla
+`e	556,734,15,72,-34,72	2	232	egrave
+'e	556,734,15,81,-34,81	2	233	eacute
+^e	556,734,15,72,-34,72	2	234	ecircumflex
+:e	556,706,15,72,-34,72	2	235	edieresis
+`i	278,734,0,82,-45,82	2	236	igrave
+'i	278,734,0,220,-45,89	2	237	iacute
+^i	278,734,0,183,-45,89	2	238	icircumflex
+:i	278,706,0,188,-45,89	2	239	idieresis
+Sd	556,737,15,111,-31,89	2	240	eth
+~n	556,722,0,86,-15,86	2	241	ntilde
+`o	556,734,14,79,-33,79	2	242	ograve
+'o	556,734,14,81,-33,81	2	243	oacute
+^o	556,734,14,79,-33,79	2	244	ocircumflex
+~o	556,722,14,96,-33,89	2	245	otilde
+:o	556,706,14,79,-33,79	2	246	odieresis
+tdi	584,524,19,72,-35,72	0	247	divide
+/o	611,545,22,86,21,86	0	248	oslash
+`u	556,734,15,94,-44,89	2	249	ugrave
+'u	556,734,15,94,-44,89	2	250	uacute
+^u	556,734,15,94,-44,89	2	251	ucircumflex
+:u	556,706,15,94,-44,89	2	252	udieresis
+'y	500,734,214,150,35,89	3	253	yacute
+Tp	556,718,207,78,36,78	3	254	thorn
+:y	500,706,214,150,35,89	3	255	ydieresis
+u2026	1000,106,0,0,-65	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNB b/contrib/groff/font/devps/HNB
index 2a117f4..f4131f9 100644
--- a/contrib/groff/font/devps/HNB
+++ b/contrib/groff/font/devps/HNB
@@ -221,246 +221,247 @@ y , -65
 y a -24
 z e 8
 charset
-ha	479,698,0,0,-51	2	0000	-- asciicircum
-ti	479,343,0,0,-50	0	0001	-- asciitilde
-vS	547,936,19,0,-32	2	0002	-- Scaron
-vZ	501,936,0,0,-20	2	0003	-- Zcaron
-vs	456,750,14,0,-25	2	0004	-- scaron
-vz	410,750,0,0,-16	2	0005	-- zcaron
-:Y	547,915,0,0,-12	2	0006	-- Ydieresis
-tm	820,718,0,0,-36	2	0007	-- trademark
-aq	195,718,0,0,-57	2	0010	-- quotesingle
-space	228	0	0040
-!	273,718,0,0,-74	2	0041	-- exclam
-"	389,718,0,0,-80	2	0042	-- quotedbl
+ha	479,698	2	0	asciicircum
+ti	479,343	0	1	asciitilde
+vS	547,936,19	2	2	Scaron
+vZ	501,936	2	3	Zcaron
+vs	456,750,14	2	4	scaron
+vz	410,750	2	5	zcaron
+:Y	547,915	2	6	Ydieresis
+tm	820,718	2	7	trademark
+aq	195,718	2	8	quotesingle
+space	228	0	32	space
+!	273,718	2	33	exclam
+"	389,718	2	34	quotedbl
 dq	"
-#	456,698,0,0,-15	2	0043	-- numbersign
+#	456,698	2	35	numbersign
 sh	"
-$	456,775,115,0,-25	2	0044	-- dollar
+$	456,775,115	2	36	dollar
 Do	"
-%	729,710,19,0,-23	2	0045	-- percent
-&	592,718,19,0,-44	2	0046	-- ampersand
-'	228,718,0,0,-57	2	0047	-- quoteright
+%	729,710,19	2	37	percent
+&	592,718,19	2	38	ampersand
+'	228,718	2	39	quoteright
 cq	"
-(	273,734,208,0,-29	3	0050	-- parenleft
-)	273,734,208,0,-16	3	0051	-- parenright
-*	319,718,0,0,-22	2	0052	-- asterisk
-+	479,506,0,0,-33	0	0053	-- plus
-,	228,146,168,0,-52	0	0054	-- comma
--	273,345,0,0,-22	0	0055	-- hyphen
+(	273,734,208	3	40	parenleft
+)	273,734,208	3	41	parenright
+*	319,718	2	42	asterisk
++	479,506	0	43	plus
+,	228,146,168	0	44	comma
+-	273,345	0	45	hyphen
 hy	"
-.	228,146,0,0,-52	0	0056	-- period
-/	228,737,19,27,27	2	0057	-- slash
+.	228,146	0	46	period
+/	228,737,19,27,27	2	47	slash
 sl	"
-0	456,710,19,0,-26	2	0060	-- zero
-1	456,710,0,0,-57	2	0061	-- one
-2	456,710,0,0,-21	2	0062	-- two
-3	456,710,19,0,-22	2	0063	-- three
-4	456,710,0,0,-22	2	0064	-- four
-5	456,698,19,0,-22	2	0065	-- five
-6	456,710,19,0,-25	2	0066	-- six
-7	456,698,0,0,-20	2	0067	-- seven
-8	456,710,19,0,-26	2	0070	-- eight
-9	456,710,19,0,-25	2	0071	-- nine
-:	273,512,0,0,-75	0	0072	-- colon
-;	273,512,168,0,-75	0	0073	-- semicolon
-<	479,514,8,0,-31	0	0074	-- less
-=	479,419,0,0,-33	0	0075	-- equal
->	479,514,8,0,-31	0	0076	-- greater
-?	501,727,0,0,-49	2	0077	-- question
-@	800,737,19,0,-97	2	0100	-- at
+0	456,710,19	2	48	zero
+1	456,710	2	49	one
+2	456,710	2	50	two
+3	456,710,19	2	51	three
+4	456,710	2	52	four
+5	456,698,19	2	53	five
+6	456,710,19	2	54	six
+7	456,698	2	55	seven
+8	456,710,19	2	56	eight
+9	456,710,19	2	57	nine
+:	273,512	0	58	colon
+;	273,512,168	0	59	semicolon
+<	479,514,8	0	60	less
+=	479,419	0	61	equal
+>	479,514,8	0	62	greater
+?	501,727	2	63	question
+@	800,737,19	2	64	at
 at	"
-A	592,718,0,0,-16	2	0101	-- A
-B	592,718,0,0,-62	2	0102	-- B
-C	592,737,19,0,-36	2	0103	-- C
-D	592,718,0,0,-62	2	0104	-- D
-E	547,718,0,0,-62	2	0105	-- E
-F	501,718,0,0,-62	2	0106	-- F
-G	638,737,19,0,-36	2	0107	-- G
-H	592,718,0,0,-58	2	0110	-- H
-I	228,718,0,0,-52	2	0111	-- I
-J	456,718,18,0,-18	2	0112	-- J
-K	592,718,0,0,-71	2	0113	-- K
-L	501,718,0,0,-62	2	0114	-- L
-M	683,718,0,0,-57	2	0115	-- M
-N	592,718,0,0,-57	2	0116	-- N
-O	638,737,19,0,-36	2	0117	-- O
-P	547,718,0,0,-62	2	0120	-- P
-Q	638,737,52,0,-36	2	0121	-- Q
-R	592,718,0,0,-62	2	0122	-- R
-S	547,737,19,0,-32	2	0123	-- S
-T	501,718,0,0,-11	2	0124	-- T
-U	592,718,19,0,-59	2	0125	-- U
-V	547,718,0,0,-16	2	0126	-- V
-W	774,718,0,0,-13	2	0127	-- W
-X	547,718,0,0,-11	2	0130	-- X
-Y	547,718,0,0,-12	2	0131	-- Y
-Z	501,718,0,0,-20	2	0132	-- Z
-[	273,722,196,0,-52	2	0133	-- bracketleft
+A	592,718	2	65	A
+B	592,718	2	66	B
+C	592,737,19	2	67	C
+D	592,718	2	68	D
+E	547,718	2	69	E
+F	501,718	2	70	F
+G	638,737,19	2	71	G
+H	592,718	2	72	H
+I	228,718	2	73	I
+J	456,718,18	2	74	J
+K	592,718	2	75	K
+L	501,718	2	76	L
+M	683,718	2	77	M
+N	592,718	2	78	N
+O	638,737,19	2	79	O
+P	547,718	2	80	P
+Q	638,737,52	2	81	Q
+R	592,718	2	82	R
+S	547,737,19	2	83	S
+T	501,718	2	84	T
+U	592,718,19	2	85	U
+V	547,718	2	86	V
+W	774,718	2	87	W
+X	547,718	2	88	X
+Y	547,718	2	89	Y
+Z	501,718	2	90	Z
+[	273,722,196	2	91	bracketleft
 lB	"
-\	228,737,19,27,27	2	0134	-- backslash
+\	228,737,19,27,27	2	92	backslash
 rs	"
-]	273,722,196,0,-20	2	0135	-- bracketright
+]	273,722,196	2	93	bracketright
 rB	"
-a^	273,750,0,8,8	2	0136	-- circumflex
+a^	273,750,0,8,8	2	94	circumflex
 ^	"
-_	456,0,125	0	0137	-- underscore
-`	228,727,0,0,-57	2	0140	-- quoteleft
+_	456,0,125	0	95	underscore
+`	228,727	2	96	quoteleft
 oq	"
-a	456,546,14,0,-24	0	0141	-- a
-b	501,718,14,0,-50	2	0142	-- b
-c	456,546,14,0,-28	0	0143	-- c
-d	501,718,14,0,-28	2	0144	-- d
-e	456,546,14,0,-19	0	0145	-- e
-f	273,727,0,0,-8	2	0146	-- f
-g	501,546,217,0,-33	1	0147	-- g
-h	501,718,0,0,-53	2	0150	-- h
-i	228,725,0,0,-57	2	0151	-- i
-j	228,725,214,0,-2	3	0152	-- j
-k	456,718,0,5,-57	2	0153	-- k
-l	228,718,0,0,-57	2	0154	-- l
-m	729,546,0,0,-52	0	0155	-- m
-n	501,546,0,0,-53	0	0156	-- n
-o	501,546,14,0,-28	0	0157	-- o
-p	501,546,207,0,-51	1	0160	-- p
-q	501,546,207,0,-28	1	0161	-- q
-r	319,546,0,0,-52	0	0162	-- r
-s	456,546,14,0,-25	0	0163	-- s
-t	273,676,6,0,-8	2	0164	-- t
-u	501,532,14,0,-54	0	0165	-- u
-v	456,532,0,0,-11	0	0166	-- v
-w	638,532,0,0,-8	0	0167	-- w
-x	456,532,0,0,-12	0	0170	-- x
-y	456,532,214,0,-8	1	0171	-- y
-z	410,532,0,0,-16	0	0172	-- z
-lC	319,722,196,0,-39	2	0173	-- braceleft
+a	456,546,14	0	97	a
+b	501,718,14	2	98	b
+c	456,546,14	0	99	c
+d	501,718,14	2	100	d
+e	456,546,14	0	101	e
+f	273,727	2	102	f
+g	501,546,217	1	103	g
+h	501,718	2	104	h
+i	228,725	2	105	i
+j	228,725,214	3	106	j
+k	456,718,0,5	2	107	k
+l	228,718	2	108	l
+m	729,546	0	109	m
+n	501,546	0	110	n
+o	501,546,14	0	111	o
+p	501,546,207	1	112	p
+q	501,546,207	1	113	q
+r	319,546	0	114	r
+s	456,546,14	0	115	s
+t	273,676,6	2	116	t
+u	501,532,14	0	117	u
+v	456,532	0	118	v
+w	638,532	0	119	w
+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,737,19,0,-69	2	0174	-- bar
+ba	230,737,19	2	124	bar
 |	"
-rC	319,722,196,0,-20	2	0175	-- braceright
+rC	319,722,196	2	125	braceright
 }	"
-a~	273,737,0,14,14	2	0176	-- tilde
+a~	273,737,0,14,14	2	126	tilde
 ~	"
-bq	228,127,146,0,-57	0	0200	-- quotesinglbase
-Fo	456,484,0,0,-72	0	0201	-- guillemotleft
-Fc	456,484,0,0,-72	0	0202	-- guillemotright
-bu	287,524,0,0,-8	0	0203	-- bullet
-Fn	456,737,210,0,8	3	0204	-- florin
-f/	137,710,19,139,139	2	0205	-- fraction
-%0	820,710,19,2,2	2	0206	-- perthousand
-dg	456,718,171,0,-30	2	0207	-- dagger
-dd	456,718,171,0,-30	2	0210	-- daggerdbl
-en	456,333	0	0211	-- endash
-em	820,333	0	0212	-- emdash
-fi	501,727,0,0,-8	2	0214	-- fi
-fl	501,727,0,0,-8	2	0215	-- fl
-.i	228,532,0,0,-57	0	0220	-- dotlessi
-ga	273,750,0,0,19	2	0222	-- grave
-a"	273,750,0,126,-7	2	0223	-- hungarumlaut
-a.	273,729,0,0,-85	2	0224	-- dotaccent
-ab	273,750,0,2,2	2	0225	-- breve
-ah	273,750,0,8,8	2	0226	-- caron
-ao	273,776,0,0,-48	2	0227	-- ring
-ho	273,0,228,0,-58	1	0230	-- ogonek
-lq	410,727,0,0,-52	2	0231	-- quotedblleft
-rq	410,718,0,0,-52	2	0232	-- quotedblright
-oe	774,546,14,0,-28	0	0233	-- oe
-/l	228,718,0,15,15	2	0234	-- lslash
-Bq	410,127,146,0,-52	0	0235	-- quotedblbase
-OE	820,737,19,0,-30	2	0236	-- OE
-/L	501,718,0,0,16	2	0237	-- Lslash
-r!	273,532,186,0,-74	0	0241	-- exclamdown
-ct	456,628,118,0,-28	0	0242	-- cent
-Po	456,718,16,0,-23	2	0243	-- sterling
-Cs	456,636,0,2,2	0	0244	-- currency
-Ye	456,698,0,7,7	2	0245	-- yen
-bb	230,737,19,0,-69	2	0246	-- brokenbar
-sc	456,727,184,0,-28	2	0247	-- section
-ad	273,729,0,0,-5	2	0250	-- dieresis
-co	604,737,19,10,9	2	0251	-- copyright
-Of	303,737,0,0,-18	2	0252	-- ordfeminine
-fo	273,484,0,0,-68	0	0253	-- guilsinglleft
-no	479,419,0,0,-33	0	0254	-- logicalnot
-\-	479,309,0,0,-33	0	0255	-- minus
-rg	604,737,19,9,9	2	0256	-- registered
-a-	273,678,0,5,5	2	0257	-- macron
-de	328,712,0,0,-47	2	0260	-- degree
-t+-	479,506,0,0,-33	0	0261	-- plusminus
-S2	273,710,0,0,-7	2	0262	-- twosuperior
-S3	273,710,0,0,-7	2	0263	-- threesuperior
-aa	273,750,0,19,-89	2	0264	-- acute
-mc	501,532,207,0,-54	1	0265	-- mu
-ps	456,700,191,0,7	2	0266	-- paragraph
-pc	228,334,0,0,-48	0	0267	-- periodcentered
-ac	273,0,228,0,-5	1	0270	-- cedilla
-S1	273,710,0,0,-21	2	0271	-- onesuperior
-Om	299,737,0,0,-5	2	0272	-- ordmasculine
-fc	273,484,0,0,-68	0	0273	-- guilsinglright
-14	684,710,19,0,-21	2	0274	-- onequarter
-12	684,710,19,0,-21	2	0275	-- onehalf
-34	684,710,19,0,-13	2	0276	-- threequarters
-r?	501,532,195,0,-45	0	0277	-- questiondown
-`A	592,936,0,0,-16	2	0300	-- Agrave
-'A	592,936,0,0,-16	2	0301	-- Aacute
-^A	592,936,0,0,-16	2	0302	-- Acircumflex
-~A	592,923,0,0,-16	2	0303	-- Atilde
-:A	592,915,0,0,-16	2	0304	-- Adieresis
-oA	592,962,0,0,-16	2	0305	-- Aring
-AE	820,718,0,0,-4	2	0306	-- AE
-,C	592,737,228,0,-36	3	0307	-- Ccedilla
-`E	547,936,0,0,-62	2	0310	-- Egrave
-'E	547,936,0,0,-62	2	0311	-- Eacute
-^E	547,936,0,0,-62	2	0312	-- Ecircumflex
-:E	547,915,0,0,-62	2	0313	-- Edieresis
-`I	228,936,0,0,41	2	0314	-- Igrave
-'I	228,936,0,42,-52	2	0315	-- Iacute
-^I	228,936,0,31,30	2	0316	-- Icircumflex
-:I	228,915,0,18,17	2	0317	-- Idieresis
--D	592,718,0,0,4	2	0320	-- Eth
-~N	592,923,0,0,-57	2	0321	-- Ntilde
-`O	638,936,19,0,-36	2	0322	-- Ograve
-'O	638,936,19,0,-36	2	0323	-- Oacute
-^O	638,936,19,0,-36	2	0324	-- Ocircumflex
-~O	638,923,19,0,-36	2	0325	-- Otilde
-:O	638,915,19,0,-36	2	0326	-- Odieresis
-tmu	479,505,0,0,-33	0	0327	-- multiply
-/O	638,745,27,0,-27	2	0330	-- Oslash
-`U	592,936,19,0,-59	2	0331	-- Ugrave
-'U	592,936,19,0,-59	2	0332	-- Uacute
-^U	592,936,19,0,-59	2	0333	-- Ucircumflex
-:U	592,915,19,0,-59	2	0334	-- Udieresis
-'Y	547,936,0,0,-12	2	0335	-- Yacute
-TP	547,718,0,0,-62	2	0336	-- Thorn
-ss	501,731,14,0,-57	2	0337	-- germandbls
-`a	456,750,14,0,-24	2	0340	-- agrave
-'a	456,750,14,0,-24	2	0341	-- aacute
-^a	456,750,14,0,-24	2	0342	-- acircumflex
-~a	456,737,14,0,-24	2	0343	-- atilde
-:a	456,729,14,0,-24	2	0344	-- adieresis
-oa	456,776,14,0,-24	2	0345	-- aring
-ae	729,546,14,0,-24	0	0346	-- ae
-,c	456,546,228,0,-28	1	0347	-- ccedilla
-`e	456,750,14,0,-19	2	0350	-- egrave
-'e	456,750,14,0,-19	2	0351	-- eacute
-^e	456,750,14,0,-19	2	0352	-- ecircumflex
-:e	456,729,14,0,-19	2	0353	-- edieresis
-`i	228,750,0,0,41	2	0354	-- igrave
-'i	228,750,0,42,-57	2	0355	-- iacute
-^i	228,750,0,31,30	2	0356	-- icircumflex
-:i	228,729,0,18,17	2	0357	-- idieresis
-Sd	501,737,14,0,-28	2	0360	-- eth
-~n	501,737,0,0,-53	2	0361	-- ntilde
-`o	501,750,14,0,-28	2	0362	-- ograve
-'o	501,750,14,0,-28	2	0363	-- oacute
-^o	501,750,14,0,-28	2	0364	-- ocircumflex
-~o	501,737,14,0,-28	2	0365	-- otilde
-:o	501,729,14,0,-28	2	0366	-- odieresis
-tdi	479,548,42,0,-33	0	0367	-- divide
-/o	501,560,29,0,-18	0	0370	-- oslash
-`u	501,750,14,0,-54	2	0371	-- ugrave
-'u	501,750,14,0,-54	2	0372	-- uacute
-^u	501,750,14,0,-54	2	0373	-- ucircumflex
-:u	501,729,14,0,-54	2	0374	-- udieresis
-'y	456,750,214,0,-8	3	0375	-- yacute
-Tp	501,718,208,0,-51	3	0376	-- thorn
-:y	456,729,214,0,-8	3	0377	-- ydieresis
+bq	228,127,146	0	128	quotesinglbase
+Fo	456,484	0	129	guillemotleft
+Fc	456,484	0	130	guillemotright
+bu	287,524	0	131	bullet
+Fn	456,737,210,0,8	3	132	florin
+f/	137,710,19,139,139	2	133	fraction
+%0	820,710,19,2,2	2	134	perthousand
+dg	456,718,171	2	135	dagger
+dd	456,718,171	2	136	daggerdbl
+en	456,333	0	137	endash
+em	820,333	0	138	emdash
+fi	501,727	2	140	fi
+fl	501,727	2	141	fl
+.i	228,532	0	144	dotlessi
+ga	273,750,0,0,19	2	146	grave
+a"	273,750,0,126	2	147	hungarumlaut
+a.	273,729	2	148	dotaccent
+ab	273,750,0,2,2	2	149	breve
+ah	273,750,0,8,8	2	150	caron
+ao	273,776	2	151	ring
+ho	273,0,228	1	152	ogonek
+lq	410,727	2	153	quotedblleft
+rq	410,718	2	154	quotedblright
+oe	774,546,14	0	155	oe
+/l	228,718,0,15,15	2	156	lslash
+Bq	410,127,146	0	157	quotedblbase
+OE	820,737,19	2	158	OE
+/L	501,718,0,0,16	2	159	Lslash
+r!	273,532,186	0	161	exclamdown
+ct	456,628,118	0	162	cent
+Po	456,718,16	2	163	sterling
+Cs	456,636,0,2,2	0	164	currency
+Ye	456,698,0,7,7	2	165	yen
+bb	230,737,19	2	166	brokenbar
+sc	456,727,184	2	167	section
+ad	273,729	2	168	dieresis
+co	604,737,19,10,9	2	169	copyright
+Of	303,737	2	170	ordfeminine
+fo	273,484	0	171	guilsinglleft
+tno	479,419	0	172	logicalnot
+\-	479,309	0	173	minus
+rg	604,737,19,9,9	2	174	registered
+a-	273,678,0,5,5	2	175	macron
+de	328,712	2	176	degree
+t+-	479,506	0	177	plusminus
+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
+ps	456,700,191,0,7	2	182	paragraph
+pc	228,334	0	183	periodcentered
+ac	273,0,228	1	184	cedilla
+S1	273,710	2	185	onesuperior
+Om	299,737	2	186	ordmasculine
+fc	273,484	0	187	guilsinglright
+14	684,710,19	2	188	onequarter
+12	684,710,19	2	189	onehalf
+34	684,710,19	2	190	threequarters
+r?	501,532,195	0	191	questiondown
+`A	592,936	2	192	Agrave
+'A	592,936	2	193	Aacute
+^A	592,936	2	194	Acircumflex
+~A	592,923	2	195	Atilde
+:A	592,915	2	196	Adieresis
+oA	592,962	2	197	Aring
+AE	820,718	2	198	AE
+,C	592,737,228	3	199	Ccedilla
+`E	547,936	2	200	Egrave
+'E	547,936	2	201	Eacute
+^E	547,936	2	202	Ecircumflex
+:E	547,915	2	203	Edieresis
+`I	228,936,0,0,41	2	204	Igrave
+'I	228,936,0,42	2	205	Iacute
+^I	228,936,0,31,30	2	206	Icircumflex
+:I	228,915,0,18,17	2	207	Idieresis
+-D	592,718,0,0,4	2	208	Eth
+~N	592,923	2	209	Ntilde
+`O	638,936,19	2	210	Ograve
+'O	638,936,19	2	211	Oacute
+^O	638,936,19	2	212	Ocircumflex
+~O	638,923,19	2	213	Otilde
+:O	638,915,19	2	214	Odieresis
+tmu	479,505	0	215	multiply
+/O	638,745,27	2	216	Oslash
+`U	592,936,19	2	217	Ugrave
+'U	592,936,19	2	218	Uacute
+^U	592,936,19	2	219	Ucircumflex
+:U	592,915,19	2	220	Udieresis
+'Y	547,936	2	221	Yacute
+TP	547,718	2	222	Thorn
+ss	501,731,14	2	223	germandbls
+`a	456,750,14	2	224	agrave
+'a	456,750,14	2	225	aacute
+^a	456,750,14	2	226	acircumflex
+~a	456,737,14	2	227	atilde
+:a	456,729,14	2	228	adieresis
+oa	456,776,14	2	229	aring
+ae	729,546,14	0	230	ae
+,c	456,546,228	1	231	ccedilla
+`e	456,750,14	2	232	egrave
+'e	456,750,14	2	233	eacute
+^e	456,750,14	2	234	ecircumflex
+:e	456,729,14	2	235	edieresis
+`i	228,750,0,0,41	2	236	igrave
+'i	228,750,0,42	2	237	iacute
+^i	228,750,0,31,30	2	238	icircumflex
+:i	228,729,0,18,17	2	239	idieresis
+Sd	501,737,14	2	240	eth
+~n	501,737	2	241	ntilde
+`o	501,750,14	2	242	ograve
+'o	501,750,14	2	243	oacute
+^o	501,750,14	2	244	ocircumflex
+~o	501,737,14	2	245	otilde
+:o	501,729,14	2	246	odieresis
+tdi	479,548,42	0	247	divide
+/o	501,560,29	0	248	oslash
+`u	501,750,14	2	249	ugrave
+'u	501,750,14	2	250	uacute
+^u	501,750,14	2	251	ucircumflex
+:u	501,729,14	2	252	udieresis
+'y	456,750,214	3	253	yacute
+Tp	501,718,208	3	254	thorn
+:y	456,729,214	3	255	ydieresis
+u2026	820,146	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNBI b/contrib/groff/font/devps/HNBI
index e7e8349..771dd75 100644
--- a/contrib/groff/font/devps/HNBI
+++ b/contrib/groff/font/devps/HNBI
@@ -222,246 +222,247 @@ y , -80
 y a -30
 z e 10
 charset
-ha	479,698,0,55,-57,55	2	0000	-- asciicircum
-ti	479,343,0,44,-44,44	0	0001	-- asciitilde
-vS	547,936,19,91,-16,90	2	0002	-- Scaron
-vZ	501,936,0,153,30,90	2	0003	-- Zcaron
-vs	456,750,14,98,-2,90	2	0004	-- scaron
-vz	410,750,0,121,34,90	2	0005	-- zcaron
-:Y	547,915,0,164,-87,90	2	0006	-- Ydieresis
-tm	820,718,0,139,-96,90	2	0007	-- trademark
-aq	195,718,0,118,-85,90	2	0010	-- quotesingle
-space	228	0	0040
-!	273,718,0,102,-27,90	2	0041	-- exclam
-"	389,718,0,94,-108,90	2	0042	-- quotedbl
+ha	479,698,0,55,-57,55	2	0	asciicircum
+ti	479,343,0,44,-44,44	0	1	asciitilde
+vS	547,936,19,91,-16,90	2	2	Scaron
+vZ	501,936,0,153,30,90	2	3	Zcaron
+vs	456,750,14,98,-2,90	2	4	scaron
+vz	410,750,0,121,34,90	2	5	zcaron
+:Y	547,915,0,164,-87,90	2	6	Ydieresis
+tm	820,718,0,139,-96,90	2	7	trademark
+aq	195,718,0,118,-85,90	2	8	quotesingle
+space	228	0	32	space
+!	273,718,0,102,-27,90	2	33	exclam
+"	389,718,0,94,-108,90	2	34	quotedbl
 dq	"
-#	456,698,0,122,1,90	2	0043	-- numbersign
+#	456,698,0,122,1,90	2	35	numbersign
 sh	"
-$	456,775,115,104,-5,90	2	0044	-- dollar
+$	456,775,115,104,-5,90	2	36	dollar
 Do	"
-%	729,710,19,60,-62,60	2	0045	-- percent
-&	592,718,19,58,-23,58	2	0046	-- ampersand
-'	228,718,0,119,-87,90	2	0047	-- quoteright
+%	729,710,19,60,-62,60	2	37	percent
+&	592,718,19,58,-23,58	2	38	ampersand
+'	228,718,0,119,-87,90	2	39	quoteright
 cq	"
-(	273,734,208,162,-12,90	3	0050	-- parenleft
-)	273,734,208,79,71,79	3	0051	-- parenright
-*	319,718,0,125,-70,90	2	0052	-- asterisk
-+	479,506,0,71,-17,71	0	0053	-- plus
-,	228,146,168,23,27,23	0	0054	-- comma
--	273,345,0,88,-10,88	0	0055	-- hyphen
+(	273,734,208,162,-12,90	3	40	parenleft
+)	273,734,208,79,71,79	3	41	parenright
+*	319,718,0,125,-70,90	2	42	asterisk
++	479,506,0,71,-17,71	0	43	plus
+,	228,146,168,23,27,23	0	44	comma
+-	273,345,0,88,-10,88	0	45	hyphen
 hy	"
-.	228,146,0,23,-2,23	0	0056	-- period
-/	228,737,19,205,80,90	2	0057	-- slash
+.	228,146,0,23,-2,23	0	46	period
+/	228,737,19,205,80,90	2	47	slash
 sl	"
-0	456,710,19,100,-21,90	2	0060	-- zero
-1	456,710,0,28,-92,28	2	0061	-- one
-2	456,710,0,102,29,90	2	0062	-- two
-3	456,710,19,93,-4,90	2	0063	-- three
-4	456,710,0,84,0,84	2	0064	-- four
-5	456,698,19,116,-3,90	2	0065	-- five
-6	456,710,19,101,-20,90	2	0066	-- six
-7	456,698,0,149,-52,90	2	0067	-- seven
-8	456,710,19,99,-7,90	2	0070	-- eight
-9	456,710,19,98,-14,90	2	0071	-- nine
-:	273,512,0,65,-25,65	0	0072	-- colon
-;	273,512,168,65,4,65	0	0073	-- semicolon
-<	479,514,8,108,-17,90	0	0074	-- less
-=	479,419,0,90,2,90	0	0075	-- equal
->	479,514,8,71,20,71	0	0076	-- greater
-?	501,727,0,99,-85,90	2	0077	-- question
-@	800,737,19,32,-102,32	2	0100	-- at
+0	456,710,19,100,-21,90	2	48	zero
+1	456,710,0,28,-92,28	2	49	one
+2	456,710,0,102,29,90	2	50	two
+3	456,710,19,93,-4,90	2	51	three
+4	456,710,0,84,0,84	2	52	four
+5	456,698,19,116,-3,90	2	53	five
+6	456,710,19,101,-20,90	2	54	six
+7	456,698,0,149,-52,90	2	55	seven
+8	456,710,19,99,-7,90	2	56	eight
+9	456,710,19,98,-14,90	2	57	nine
+:	273,512,0,65,-25,65	0	58	colon
+;	273,512,168,65,4,65	0	59	semicolon
+<	479,514,8,108,-17,90	0	60	less
+=	479,419,0,90,2,90	0	61	equal
+>	479,514,8,71,20,71	0	62	greater
+?	501,727,0,99,-85,90	2	63	question
+@	800,737,19,32,-102,32	2	64	at
 at	"
-A	592,718,0,34,34,34	2	0101	-- A
-B	592,718,0,84,-12,84	2	0102	-- B
-C	592,737,19,105,-38,90	2	0103	-- C
-D	592,718,0,95,-12,90	2	0104	-- D
-E	547,718,0,123,-12,90	2	0105	-- E
-F	501,718,0,155,-12,90	2	0106	-- F
-G	638,737,19,82,-39,82	2	0107	-- G
-H	592,718,0,117,-8,90	2	0110	-- H
-I	228,718,0,123,-2,90	2	0111	-- I
-J	456,718,18,116,1,90	2	0112	-- J
-K	592,718,0,161,-21,90	2	0113	-- K
-L	501,718,0,50,-12,50	2	0114	-- L
-M	683,718,0,119,-7,90	2	0115	-- M
-N	592,718,0,119,-7,90	2	0116	-- N
-O	638,737,19,87,-38,87	2	0117	-- O
-P	547,718,0,108,-12,90	2	0120	-- P
-Q	638,737,52,87,-38,87	2	0121	-- Q
-R	592,718,0,96,-12,90	2	0122	-- R
-S	547,737,19,91,-16,90	2	0123	-- S
-T	501,718,0,164,-64,90	2	0124	-- T
-U	592,718,19,117,-46,90	2	0125	-- U
-V	547,718,0,159,-91,90	2	0126	-- V
-W	774,718,0,163,-88,90	2	0127	-- W
-X	547,718,0,151,39,90	2	0130	-- X
-Y	547,718,0,164,-87,90	2	0131	-- Y
-Z	501,718,0,153,30,90	2	0132	-- Z
-[	273,722,196,156,33,90	2	0133	-- bracketleft
+A	592,718,0,34,34,34	2	65	A
+B	592,718,0,84,-12,84	2	66	B
+C	592,737,19,105,-38,90	2	67	C
+D	592,718,0,95,-12,90	2	68	D
+E	547,718,0,123,-12,90	2	69	E
+F	501,718,0,155,-12,90	2	70	F
+G	638,737,19,82,-39,82	2	71	G
+H	592,718,0,117,-8,90	2	72	H
+I	228,718,0,123,-2,90	2	73	I
+J	456,718,18,116,1,90	2	74	J
+K	592,718,0,161,-21,90	2	75	K
+L	501,718,0,50,-12,50	2	76	L
+M	683,718,0,119,-7,90	2	77	M
+N	592,718,0,119,-7,90	2	78	N
+O	638,737,19,87,-38,87	2	79	O
+P	547,718,0,108,-12,90	2	80	P
+Q	638,737,52,87,-38,87	2	81	Q
+R	592,718,0,96,-12,90	2	82	R
+S	547,737,19,91,-16,90	2	83	S
+T	501,718,0,164,-64,90	2	84	T
+U	592,718,19,117,-46,90	2	85	U
+V	547,718,0,159,-91,90	2	86	V
+W	774,718,0,163,-88,90	2	87	W
+X	547,718,0,151,39,90	2	88	X
+Y	547,718,0,164,-87,90	2	89	Y
+Z	501,718,0,153,30,90	2	90	Z
+[	273,722,196,156,33,90	2	91	bracketleft
 lB	"
-\	228,737,19,74,-51,74	2	0134	-- backslash
+\	228,737,19,74,-51,74	2	92	backslash
 rs	"
-]	273,722,196,124,64,90	2	0135	-- bracketright
+]	273,722,196,124,64,90	2	93	bracketright
 rB	"
-a^	273,750,0,164,-47,90	2	0136	-- circumflex
+a^	273,750,0,164,-47,90	2	94	circumflex
 ^	"
-_	456,0,125,37,72,37	0	0137	-- underscore
-`	228,727,0,118,-86,90	2	0140	-- quoteleft
+_	456,0,125,37,72,37	0	95	underscore
+`	228,727,0,118,-86,90	2	96	quoteleft
 oq	"
-a	456,546,14,72,5,72	0	0141	-- a
-b	501,718,14,78,0,78	2	0142	-- b
-c	456,546,14,85,-15,85	0	0143	-- c
-d	501,718,14,126,-17,90	2	0144	-- d
-e	456,546,14,80,-8,80	0	0145	-- e
-f	273,727,0,162,-21,90	2	0146	-- f
-g	501,546,217,95,19,90	1	0147	-- g
-h	501,718,0,65,-3,65	2	0150	-- h
-i	228,725,0,120,-7,90	2	0151	-- i
-j	228,725,214,120,85,90	3	0152	-- j
-k	456,718,0,143,-7,90	2	0153	-- k
-l	228,718,0,119,-7,90	2	0154	-- l
-m	729,546,0,67,-2,67	0	0155	-- m
-n	501,546,0,65,-3,65	0	0156	-- n
-o	501,546,14,76,-17,76	0	0157	-- o
-p	501,546,207,78,35,78	1	0160	-- p
-q	501,546,207,94,-16,90	1	0161	-- q
-r	319,546,0,132,-2,90	0	0162	-- r
-s	456,546,14,73,-2,73	0	0163	-- s
-t	273,676,6,123,-32,90	2	0164	-- t
-u	501,532,14,89,-30,89	0	0165	-- u
-v	456,532,0,132,-53,90	0	0166	-- v
-w	638,532,0,135,-51,90	0	0167	-- w
-x	456,532,0,125,38,90	0	0170	-- x
-y	456,532,214,129,16,90	1	0171	-- y
-z	410,532,0,118,34,90	0	0172	-- z
-lC	319,722,196,156,-27,90	2	0173	-- braceleft
+a	456,546,14,72,5,72	0	97	a
+b	501,718,14,78,0,78	2	98	b
+c	456,546,14,85,-15,85	0	99	c
+d	501,718,14,126,-17,90	2	100	d
+e	456,546,14,80,-8,80	0	101	e
+f	273,727,0,162,-21,90	2	102	f
+g	501,546,217,95,19,90	1	103	g
+h	501,718,0,65,-3,65	2	104	h
+i	228,725,0,120,-7,90	2	105	i
+j	228,725,214,120,85,90	3	106	j
+k	456,718,0,143,-7,90	2	107	k
+l	228,718,0,119,-7,90	2	108	l
+m	729,546,0,67,-2,67	0	109	m
+n	501,546,0,65,-3,65	0	110	n
+o	501,546,14,76,-17,76	0	111	o
+p	501,546,207,78,35,78	1	112	p
+q	501,546,207,94,-16,90	1	113	q
+r	319,546,0,132,-2,90	0	114	r
+s	456,546,14,73,-2,73	0	115	s
+t	273,676,6,123,-32,90	2	116	t
+u	501,532,14,89,-30,89	0	117	u
+v	456,532,0,132,-53,90	0	118	v
+w	638,532,0,135,-51,90	0	119	w
+x	456,532,0,125,38,90	0	120	x
+y	456,532,214,129,16,90	1	121	y
+z	410,532,0,118,34,90	0	122	z
+lC	319,722,196,156,-27,90	2	123	braceleft
 {	"
-ba	230,737,19,109,-16,90	2	0174	-- bar
+ba	230,737,19,109,-16,90	2	124	bar
 |	"
-rC	319,722,196,64,64,64	2	0175	-- braceright
+rC	319,722,196,64,64,64	2	125	braceright
 }	"
-a~	273,737,0,192,-42,90	2	0176	-- tilde
+a~	273,737,0,192,-42,90	2	126	tilde
 ~	"
-bq	228,127,146,16,16,16	0	0200	-- quotesinglbase
-Fo	456,484,0,62,-61,62	0	0201	-- guillemotleft
-Fc	456,484,0,37,-35,37	0	0202	-- guillemotright
-bu	287,524,0,108,-18,90	0	0203	-- bullet
-Fn	456,737,210,142,91,90	3	0204	-- florin
-f/	137,710,19,312,193,90	2	0205	-- fraction
-%0	820,710,19,81,-12,81	2	0206	-- perthousand
-dg	456,718,171,107,-47,90	2	0207	-- dagger
-dd	456,718,171,109,12,90	2	0210	-- daggerdbl
-en	456,333,0,108,10,90	0	0211	-- endash
-em	820,333,0,108,10,90	0	0212	-- emdash
-fi	501,727,0,120,-21,90	2	0214	-- fi
-fl	501,727,0,119,-21,90	2	0215	-- fl
-.i	228,532,0,86,-7,86	0	0220	-- dotlessi
-ga	273,750,0,67,-62,67	2	0222	-- grave
-a"	273,750,0,306,-63,90	2	0223	-- hungarumlaut
-a.	273,729,0,93,-142,90	2	0224	-- dotaccent
-ab	273,750,0,182,-78,90	2	0225	-- breve
-ah	273,750,0,189,-73,90	2	0226	-- caron
-ao	273,776,0,121,-114,90	2	0227	-- ring
-ho	273,0,228,0,17	1	0230	-- ogonek
-lq	410,727,0,122,-82,90	2	0231	-- quotedblleft
-rq	410,718,0,123,-82,90	2	0232	-- quotedblright
-oe	774,546,14,77,-17,77	0	0233	-- oe
-/l	228,718,0,156,17,90	2	0234	-- lslash
-Bq	410,127,146,20,21,20	0	0235	-- quotedblbase
-OE	820,737,19,143,-31,90	2	0236	-- OE
-/L	501,718,0,50,22,50	2	0237	-- Lslash
-r!	273,532,186,67,9,67	0	0241	-- exclamdown
-ct	456,628,118,85,-15,85	0	0242	-- cent
-Po	456,718,16,114,9,90	2	0243	-- sterling
-Cs	456,636,0,152,28,90	0	0244	-- currency
-Ye	456,698,0,179,1,90	2	0245	-- yen
-bb	230,737,19,109,-16,90	2	0246	-- brokenbar
-sc	456,727,184,85,0,85	2	0247	-- section
-ad	273,729,0,172,-62,90	2	0250	-- dieresis
-co	604,737,19,131,4,90	2	0251	-- copyright
-Of	303,737,0,128,-25,90	2	0252	-- ordfeminine
-fo	273,484,0,66,-56,66	0	0253	-- guilsinglleft
-no	479,419,0,90,-36,90	0	0254	-- logicalnot
-\-	479,309,0,71,-17,71	0	0255	-- minus
-rg	604,737,19,130,5,90	2	0256	-- registered
-a-	273,678,0,173,-50,90	2	0257	-- macron
-de	328,712,0,105,-93,90	2	0260	-- degree
-t+-	479,506,0,83,17,83	0	0261	-- plusminus
-S2	273,710,0,145,-7,90	2	0262	-- twosuperior
-S3	273,710,0,138,-25,90	2	0263	-- threesuperior
-aa	273,750,0,200,-144,90	2	0264	-- acute
-mc	501,532,207,89,32,89	1	0265	-- mu
-ps	456,700,191,158,-30,90	2	0266	-- paragraph
-pc	228,334,0,48,-40,48	0	0267	-- periodcentered
-ac	273,0,228,0,80	1	0270	-- cedilla
-S1	273,710,0,95,-71,90	2	0271	-- onesuperior
-Om	299,737,0,149,-25,90	2	0272	-- ordmasculine
-fc	273,484,0,41,-31,41	0	0273	-- guilsinglright
-14	684,710,19,27,-58,27	2	0274	-- onequarter
-12	684,710,19,70,-58,70	2	0275	-- onehalf
-34	684,710,19,54,-32,54	2	0276	-- threequarters
-r?	501,532,195,8,6,8	0	0277	-- questiondown
-`A	592,936,0,34,34,34	2	0300	-- Agrave
-'A	592,936,0,73,34,73	2	0301	-- Aacute
-^A	592,936,0,37,34,37	2	0302	-- Acircumflex
-~A	592,923,0,66,34,66	2	0303	-- Atilde
-:A	592,915,0,46,34,46	2	0304	-- Adieresis
-oA	592,962,0,34,34,34	2	0305	-- Aring
-AE	820,718,0,132,46,90	2	0306	-- AE
-,C	592,737,228,105,-38,90	3	0307	-- Ccedilla
-`E	547,936,0,123,-12,90	2	0310	-- Egrave
-'E	547,936,0,123,-12,90	2	0311	-- Eacute
-^E	547,936,0,123,-12,90	2	0312	-- Ecircumflex
-:E	547,915,0,123,-12,90	2	0313	-- Edieresis
-`I	228,936,0,123,-2,90	2	0314	-- Igrave
-'I	228,936,0,255,-2,90	2	0315	-- Iacute
-^I	228,936,0,219,-2,90	2	0316	-- Icircumflex
-:I	228,915,0,227,-2,90	2	0317	-- Idieresis
--D	592,718,0,95,-1,90	2	0320	-- Eth
-~N	592,923,0,119,-7,90	2	0321	-- Ntilde
-`O	638,936,19,87,-38,87	2	0322	-- Ograve
-'O	638,936,19,87,-38,87	2	0323	-- Oacute
-^O	638,936,19,87,-38,87	2	0324	-- Ocircumflex
-~O	638,923,19,87,-38,87	2	0325	-- Otilde
-:O	638,915,19,87,-38,87	2	0326	-- Odieresis
-tmu	479,505,0,91,3,90	0	0327	-- multiply
-/O	638,745,27,145,21,90	2	0330	-- Oslash
-`U	592,936,19,117,-46,90	2	0331	-- Ugrave
-'U	592,936,19,117,-46,90	2	0332	-- Uacute
-^U	592,936,19,117,-46,90	2	0333	-- Ucircumflex
-:U	592,915,19,117,-46,90	2	0334	-- Udieresis
-'Y	547,936,0,164,-87,90	2	0335	-- Yacute
-TP	547,718,0,91,-12,90	2	0336	-- Thorn
-ss	501,731,14,88,-7,88	2	0337	-- germandbls
-`a	456,750,14,72,5,72	2	0340	-- agrave
-'a	456,750,14,108,5,90	2	0341	-- aacute
-^a	456,750,14,72,5,72	2	0342	-- acircumflex
-~a	456,737,14,101,5,90	2	0343	-- atilde
-:a	456,729,14,81,5,81	2	0344	-- adieresis
-oa	456,776,14,72,5,72	2	0345	-- aring
-ae	729,546,14,78,4,78	0	0346	-- ae
-,c	456,546,228,85,-15,85	1	0347	-- ccedilla
-`e	456,750,14,80,-8,80	2	0350	-- egrave
-'e	456,750,14,108,-8,90	2	0351	-- eacute
-^e	456,750,14,80,-8,80	2	0352	-- ecircumflex
-:e	456,729,14,81,-8,81	2	0353	-- edieresis
-`i	228,750,0,90,-7,90	2	0354	-- igrave
-'i	228,750,0,222,-7,90	2	0355	-- iacute
-^i	228,750,0,186,-7,90	2	0356	-- icircumflex
-:i	228,729,0,195,-7,90	2	0357	-- idieresis
-Sd	501,737,14,98,-17,90	2	0360	-- eth
-~n	501,737,0,78,-3,78	2	0361	-- ntilde
-`o	501,750,14,76,-17,76	2	0362	-- ograve
-'o	501,750,14,86,-17,86	2	0363	-- oacute
-^o	501,750,14,76,-17,76	2	0364	-- ocircumflex
-~o	501,737,14,78,-17,78	2	0365	-- otilde
-:o	501,729,14,76,-17,76	2	0366	-- odieresis
-tdi	479,548,42,71,-17,71	0	0367	-- divide
-/o	501,560,29,124,32,90	0	0370	-- oslash
-`u	501,750,14,89,-30,89	2	0371	-- ugrave
-'u	501,750,14,89,-30,89	2	0372	-- uacute
-^u	501,750,14,89,-30,89	2	0373	-- ucircumflex
-:u	501,729,14,89,-30,89	2	0374	-- udieresis
-'y	456,750,214,129,16,90	3	0375	-- yacute
-Tp	501,718,208,78,35,78	3	0376	-- thorn
-:y	456,729,214,129,16,90	3	0377	-- ydieresis
+bq	228,127,146,16,16,16	0	128	quotesinglbase
+Fo	456,484,0,62,-61,62	0	129	guillemotleft
+Fc	456,484,0,37,-35,37	0	130	guillemotright
+bu	287,524,0,108,-18,90	0	131	bullet
+Fn	456,737,210,142,91,90	3	132	florin
+f/	137,710,19,312,193,90	2	133	fraction
+%0	820,710,19,81,-12,81	2	134	perthousand
+dg	456,718,171,107,-47,90	2	135	dagger
+dd	456,718,171,109,12,90	2	136	daggerdbl
+en	456,333,0,108,10,90	0	137	endash
+em	820,333,0,108,10,90	0	138	emdash
+fi	501,727,0,120,-21,90	2	140	fi
+fl	501,727,0,119,-21,90	2	141	fl
+.i	228,532,0,86,-7,86	0	144	dotlessi
+ga	273,750,0,67,-62,67	2	146	grave
+a"	273,750,0,306,-63,90	2	147	hungarumlaut
+a.	273,729,0,93,-142,90	2	148	dotaccent
+ab	273,750,0,182,-78,90	2	149	breve
+ah	273,750,0,189,-73,90	2	150	caron
+ao	273,776,0,121,-114,90	2	151	ring
+ho	273,0,228,0,17	1	152	ogonek
+lq	410,727,0,122,-82,90	2	153	quotedblleft
+rq	410,718,0,123,-82,90	2	154	quotedblright
+oe	774,546,14,77,-17,77	0	155	oe
+/l	228,718,0,156,17,90	2	156	lslash
+Bq	410,127,146,20,21,20	0	157	quotedblbase
+OE	820,737,19,143,-31,90	2	158	OE
+/L	501,718,0,50,22,50	2	159	Lslash
+r!	273,532,186,67,9,67	0	161	exclamdown
+ct	456,628,118,85,-15,85	0	162	cent
+Po	456,718,16,114,9,90	2	163	sterling
+Cs	456,636,0,152,28,90	0	164	currency
+Ye	456,698,0,179,1,90	2	165	yen
+bb	230,737,19,109,-16,90	2	166	brokenbar
+sc	456,727,184,85,0,85	2	167	section
+ad	273,729,0,172,-62,90	2	168	dieresis
+co	604,737,19,131,4,90	2	169	copyright
+Of	303,737,0,128,-25,90	2	170	ordfeminine
+fo	273,484,0,66,-56,66	0	171	guilsinglleft
+tno	479,419,0,90,-36,90	0	172	logicalnot
+\-	479,309,0,71,-17,71	0	173	minus
+rg	604,737,19,130,5,90	2	174	registered
+a-	273,678,0,173,-50,90	2	175	macron
+de	328,712,0,105,-93,90	2	176	degree
+t+-	479,506,0,83,17,83	0	177	plusminus
+S2	273,710,0,145,-7,90	2	178	twosuperior
+S3	273,710,0,138,-25,90	2	179	threesuperior
+aa	273,750,0,200,-144,90	2	180	acute
+mc	501,532,207,89,32,89	1	181	mu
+ps	456,700,191,158,-30,90	2	182	paragraph
+pc	228,334,0,48,-40,48	0	183	periodcentered
+ac	273,0,228,0,80	1	184	cedilla
+S1	273,710,0,95,-71,90	2	185	onesuperior
+Om	299,737,0,149,-25,90	2	186	ordmasculine
+fc	273,484,0,41,-31,41	0	187	guilsinglright
+14	684,710,19,27,-58,27	2	188	onequarter
+12	684,710,19,70,-58,70	2	189	onehalf
+34	684,710,19,54,-32,54	2	190	threequarters
+r?	501,532,195,8,6,8	0	191	questiondown
+`A	592,936,0,34,34,34	2	192	Agrave
+'A	592,936,0,73,34,73	2	193	Aacute
+^A	592,936,0,37,34,37	2	194	Acircumflex
+~A	592,923,0,66,34,66	2	195	Atilde
+:A	592,915,0,46,34,46	2	196	Adieresis
+oA	592,962,0,34,34,34	2	197	Aring
+AE	820,718,0,132,46,90	2	198	AE
+,C	592,737,228,105,-38,90	3	199	Ccedilla
+`E	547,936,0,123,-12,90	2	200	Egrave
+'E	547,936,0,123,-12,90	2	201	Eacute
+^E	547,936,0,123,-12,90	2	202	Ecircumflex
+:E	547,915,0,123,-12,90	2	203	Edieresis
+`I	228,936,0,123,-2,90	2	204	Igrave
+'I	228,936,0,255,-2,90	2	205	Iacute
+^I	228,936,0,219,-2,90	2	206	Icircumflex
+:I	228,915,0,227,-2,90	2	207	Idieresis
+-D	592,718,0,95,-1,90	2	208	Eth
+~N	592,923,0,119,-7,90	2	209	Ntilde
+`O	638,936,19,87,-38,87	2	210	Ograve
+'O	638,936,19,87,-38,87	2	211	Oacute
+^O	638,936,19,87,-38,87	2	212	Ocircumflex
+~O	638,923,19,87,-38,87	2	213	Otilde
+:O	638,915,19,87,-38,87	2	214	Odieresis
+tmu	479,505,0,91,3,90	0	215	multiply
+/O	638,745,27,145,21,90	2	216	Oslash
+`U	592,936,19,117,-46,90	2	217	Ugrave
+'U	592,936,19,117,-46,90	2	218	Uacute
+^U	592,936,19,117,-46,90	2	219	Ucircumflex
+:U	592,915,19,117,-46,90	2	220	Udieresis
+'Y	547,936,0,164,-87,90	2	221	Yacute
+TP	547,718,0,91,-12,90	2	222	Thorn
+ss	501,731,14,88,-7,88	2	223	germandbls
+`a	456,750,14,72,5,72	2	224	agrave
+'a	456,750,14,108,5,90	2	225	aacute
+^a	456,750,14,72,5,72	2	226	acircumflex
+~a	456,737,14,101,5,90	2	227	atilde
+:a	456,729,14,81,5,81	2	228	adieresis
+oa	456,776,14,72,5,72	2	229	aring
+ae	729,546,14,78,4,78	0	230	ae
+,c	456,546,228,85,-15,85	1	231	ccedilla
+`e	456,750,14,80,-8,80	2	232	egrave
+'e	456,750,14,108,-8,90	2	233	eacute
+^e	456,750,14,80,-8,80	2	234	ecircumflex
+:e	456,729,14,81,-8,81	2	235	edieresis
+`i	228,750,0,90,-7,90	2	236	igrave
+'i	228,750,0,222,-7,90	2	237	iacute
+^i	228,750,0,186,-7,90	2	238	icircumflex
+:i	228,729,0,195,-7,90	2	239	idieresis
+Sd	501,737,14,98,-17,90	2	240	eth
+~n	501,737,0,78,-3,78	2	241	ntilde
+`o	501,750,14,76,-17,76	2	242	ograve
+'o	501,750,14,86,-17,86	2	243	oacute
+^o	501,750,14,76,-17,76	2	244	ocircumflex
+~o	501,737,14,78,-17,78	2	245	otilde
+:o	501,729,14,76,-17,76	2	246	odieresis
+tdi	479,548,42,71,-17,71	0	247	divide
+/o	501,560,29,124,32,90	0	248	oslash
+`u	501,750,14,89,-30,89	2	249	ugrave
+'u	501,750,14,89,-30,89	2	250	uacute
+^u	501,750,14,89,-30,89	2	251	ucircumflex
+:u	501,729,14,89,-30,89	2	252	udieresis
+'y	456,750,214,129,16,90	3	253	yacute
+Tp	501,718,208,78,35,78	3	254	thorn
+:y	456,729,214,129,16,90	3	255	ydieresis
+u2026	820,146,0,0,-25	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNI b/contrib/groff/font/devps/HNI
index 64a5376..1c63dfe 100644
--- a/contrib/groff/font/devps/HNI
+++ b/contrib/groff/font/devps/HNI
@@ -262,246 +262,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	385,688,0,107,15,89	2	0000	-- asciicircum
-ti	479,326,0,47,-41,47	0	0001	-- asciitilde
-vS	547,929,19,87,-24,87	2	0002	-- Scaron
-vZ	501,929,0,156,31,89	2	0003	-- Zcaron
-vs	410,734,15,93,-2,89	2	0004	-- scaron
-vz	410,734,0,108,25,89	2	0005	-- zcaron
-:Y	547,901,0,164,-87,89	2	0006	-- Ydieresis
-tm	820,718,0,96,-102,89	2	0007	-- trademark
-aq	157,718,0,126,-79,89	2	0010	-- quotesingle
-space	228	0	0040
-!	228,718,0,100,-24,89	2	0041	-- exclam
-"	291,718,0,118,-88,89	2	0042	-- quotedbl
+ha	385,688,0,107,15,89	2	0	asciicircum
+ti	479,326,0,47,-41,47	0	1	asciitilde
+vS	547,929,19,87,-24,87	2	2	Scaron
+vZ	501,929,0,156,31,89	2	3	Zcaron
+vs	410,734,15,93,-2,89	2	4	scaron
+vz	410,734,0,108,25,89	2	5	zcaron
+:Y	547,901,0,164,-87,89	2	6	Ydieresis
+tm	820,718,0,96,-102,89	2	7	trademark
+aq	157,718,0,126,-79,89	2	8	quotesingle
+space	228	0	32	space
+!	228,718,0,100,-24,89	2	33	exclam
+"	291,718,0,118,-88,89	2	34	quotedbl
 dq	"
-#	456,688,0,111,-10,89	2	0043	-- numbersign
+#	456,688,0,111,-10,89	2	35	numbersign
 sh	"
-$	456,775,115,100,-7,89	2	0044	-- dollar
+$	456,775,115,100,-7,89	2	36	dollar
 Do	"
-%	729,703,19,50,-70,50	2	0045	-- percent
-&	547,718,15,33,-13,33	2	0046	-- ampersand
-'	182,718,0,122,-74,89	2	0047	-- quoteright
+%	729,703,19,50,-70,50	2	37	percent
+&	547,718,15,33,-13,33	2	38	ampersand
+'	182,718,0,122,-74,89	2	39	quoteright
 cq	"
-(	273,733,207,149,-39,89	3	0050	-- parenleft
-)	273,733,207,53,57,53	3	0051	-- parenright
-*	319,718,0,120,-85,89	2	0052	-- asterisk
-+	479,505,0,68,-20,68	0	0053	-- plus
-,	228,106,147,0,4	0	0054	-- comma
--	273,322,0,70,-27,70	0	0055	-- hyphen
+(	273,733,207,149,-39,89	3	40	parenleft
+)	273,733,207,53,57,53	3	41	parenright
+*	319,718,0,120,-85,89	2	42	asterisk
++	479,505,0,68,-20,68	0	43	plus
+,	228,106,147,0,4	0	44	comma
+-	273,322,0,70,-27,70	0	45	hyphen
 hy	"
-.	228,106,0,0,-21	0	0056	-- period
-/	228,737,19,192,67,89	2	0057	-- slash
+.	228,106,0,0,-21	0	46	period
+/	228,737,19,192,67,89	2	47	slash
 sl	"
-0	456,703,19,93,-27,89	2	0060	-- zero
-1	456,703,0,11,-120,11	2	0061	-- one
-2	456,703,0,100,29,89	2	0062	-- two
-3	456,703,19,94,-11,89	2	0063	-- three
-4	456,703,0,66,0,66	2	0064	-- four
-5	456,688,19,103,-5,89	2	0065	-- five
-6	456,703,19,98,-24,89	2	0066	-- six
-7	456,688,0,143,-62,89	2	0067	-- seven
-8	456,703,19,91,-10,89	2	0070	-- eight
-9	456,703,19,93,-17,89	2	0071	-- nine
-:	228,516,0,69,-21,69	0	0072	-- colon
-;	228,516,147,69,4,69	0	0073	-- semicolon
-<	479,495,0,97,-27,89	0	0074	-- less
-=	479,390,0,86,-2,86	0	0075	-- equal
->	479,495,0,61,9,61	0	0076	-- greater
-?	456,727,0,94,-82,89	2	0077	-- question
-@	832,737,19,9,-126,9	2	0100	-- at
+0	456,703,19,93,-27,89	2	48	zero
+1	456,703,0,11,-120,11	2	49	one
+2	456,703,0,100,29,89	2	50	two
+3	456,703,19,94,-11,89	2	51	three
+4	456,703,0,66,0,66	2	52	four
+5	456,688,19,103,-5,89	2	53	five
+6	456,703,19,98,-24,89	2	54	six
+7	456,688,0,143,-62,89	2	55	seven
+8	456,703,19,91,-10,89	2	56	eight
+9	456,703,19,93,-17,89	2	57	nine
+:	228,516,0,69,-21,69	0	58	colon
+;	228,516,147,69,4,69	0	59	semicolon
+<	479,495,0,97,-27,89	0	60	less
+=	479,390,0,86,-2,86	0	61	equal
+>	479,495,0,61,9,61	0	62	greater
+?	456,727,0,94,-82,89	2	63	question
+@	832,737,19,9,-126,9	2	64	at
 at	"
-A	547,718,0,39,39,39	2	0101	-- A
-B	547,718,0,86,-11,86	2	0102	-- B
-C	592,737,19,98,-38,89	2	0103	-- C
-D	592,718,0,84,-16,84	2	0104	-- D
-E	547,718,0,128,-21,89	2	0105	-- E
-F	501,718,0,152,-21,89	2	0106	-- F
-G	638,737,19,67,-41,67	2	0107	-- G
-H	592,718,0,113,-13,89	2	0110	-- H
-I	228,718,0,101,-25,89	2	0111	-- I
-J	410,718,19,116,11,89	2	0112	-- J
-K	547,718,0,165,-12,89	2	0113	-- K
-L	456,718,0,49,-12,49	2	0114	-- L
-M	683,718,0,116,-10,89	2	0115	-- M
-N	592,718,0,113,-12,89	2	0116	-- N
-O	638,737,19,89,-36,89	2	0117	-- O
-P	547,718,0,107,-21,89	2	0120	-- P
-Q	638,737,56,89,-36,89	2	0121	-- Q
-R	592,718,0,92,-22,89	2	0122	-- R
-S	547,737,19,87,-24,87	2	0123	-- S
-T	501,718,0,164,-72,89	2	0124	-- T
-U	592,718,19,111,-51,89	2	0125	-- U
-V	547,718,0,159,-92,89	2	0126	-- V
-W	774,718,0,162,-88,89	2	0127	-- W
-X	547,718,0,150,34,89	2	0130	-- X
-Y	547,718,0,164,-87,89	2	0131	-- Y
-Z	501,718,0,156,31,89	2	0132	-- Z
-[	228,722,196,153,33,89	2	0133	-- bracketleft
+A	547,718,0,39,39,39	2	65	A
+B	547,718,0,86,-11,86	2	66	B
+C	592,737,19,98,-38,89	2	67	C
+D	592,718,0,84,-16,84	2	68	D
+E	547,718,0,128,-21,89	2	69	E
+F	501,718,0,152,-21,89	2	70	F
+G	638,737,19,67,-41,67	2	71	G
+H	592,718,0,113,-13,89	2	72	H
+I	228,718,0,101,-25,89	2	73	I
+J	410,718,19,116,11,89	2	74	J
+K	547,718,0,165,-12,89	2	75	K
+L	456,718,0,49,-12,49	2	76	L
+M	683,718,0,116,-10,89	2	77	M
+N	592,718,0,113,-12,89	2	78	N
+O	638,737,19,89,-36,89	2	79	O
+P	547,718,0,107,-21,89	2	80	P
+Q	638,737,56,89,-36,89	2	81	Q
+R	592,718,0,92,-22,89	2	82	R
+S	547,737,19,87,-24,87	2	83	S
+T	501,718,0,164,-72,89	2	84	T
+U	592,718,19,111,-51,89	2	85	U
+V	547,718,0,159,-92,89	2	86	V
+W	774,718,0,162,-88,89	2	87	W
+X	547,718,0,150,34,89	2	88	X
+Y	547,718,0,164,-87,89	2	89	Y
+Z	501,718,0,156,31,89	2	90	Z
+[	228,722,196,153,33,89	2	91	bracketleft
 lB	"
-\	228,737,19,61,-65,61	2	0134	-- backslash
+\	228,737,19,61,-65,61	2	92	backslash
 rs	"
-]	228,722,196,124,61,89	2	0135	-- bracketright
+]	228,722,196,124,61,89	2	93	bracketright
 rB	"
-a^	273,734,0,136,-71,89	2	0136	-- circumflex
+a^	273,734,0,136,-71,89	2	94	circumflex
 ^	"
-_	456,0,125,37,72,37	0	0137	-- underscore
-`	182,725,0,133,-85,89	2	0140	-- quoteleft
+_	456,0,125,37,72,37	0	95	underscore
+`	182,725,0,133,-85,89	2	96	quoteleft
 oq	"
-a	456,538,15,52,0,52	0	0141	-- a
-b	456,718,15,73,2,73	2	0142	-- b
-c	410,538,15,94,-11,89	0	0143	-- c
-d	456,718,15,128,-19,89	2	0144	-- d
-e	456,538,15,68,-19,68	0	0145	-- e
-f	228,728,0,163,-21,89	2	0146	-- f
-g	456,538,220,94,16,89	1	0147	-- g
-h	456,718,0,64,-3,64	2	0150	-- h
-i	182,718,0,120,-5,89	2	0151	-- i
-j	182,718,210,120,99,89	3	0152	-- j
-k	410,718,0,132,-5,89	2	0153	-- k
-l	182,718,0,120,-5,89	2	0154	-- l
-m	683,538,0,66,-3,66	0	0155	-- m
-n	456,538,0,64,-3,64	0	0156	-- n
-o	456,538,14,73,-18,73	0	0157	-- o
-p	456,538,207,73,39,73	1	0160	-- p
-q	456,538,207,90,-19,89	1	0161	-- q
-r	273,538,0,142,-13,89	0	0162	-- r
-s	410,538,15,74,-2,74	0	0163	-- s
-t	228,669,7,124,-34,89	2	0164	-- t
-u	456,523,15,86,-27,86	0	0165	-- u
-v	410,523,0,135,-48,89	0	0166	-- v
-w	592,523,0,131,-53,89	0	0167	-- w
-x	410,523,0,127,41,89	0	0170	-- x
-y	410,523,214,132,38,89	1	0171	-- y
-z	410,523,0,108,25,89	0	0172	-- z
-lC	274,722,196,141,-25,89	2	0173	-- braceleft
+a	456,538,15,52,0,52	0	97	a
+b	456,718,15,73,2,73	2	98	b
+c	410,538,15,94,-11,89	0	99	c
+d	456,718,15,128,-19,89	2	100	d
+e	456,538,15,68,-19,68	0	101	e
+f	228,728,0,163,-21,89	2	102	f
+g	456,538,220,94,16,89	1	103	g
+h	456,718,0,64,-3,64	2	104	h
+i	182,718,0,120,-5,89	2	105	i
+j	182,718,210,120,99,89	3	106	j
+k	410,718,0,132,-5,89	2	107	k
+l	182,718,0,120,-5,89	2	108	l
+m	683,538,0,66,-3,66	0	109	m
+n	456,538,0,64,-3,64	0	110	n
+o	456,538,14,73,-18,73	0	111	o
+p	456,538,207,73,39,73	1	112	p
+q	456,538,207,90,-19,89	1	113	q
+r	273,538,0,142,-13,89	0	114	r
+s	410,538,15,74,-2,74	0	115	s
+t	228,669,7,124,-34,89	2	116	t
+u	456,523,15,86,-27,86	0	117	u
+v	410,523,0,135,-48,89	0	118	v
+w	592,523,0,131,-53,89	0	119	w
+x	410,523,0,127,41,89	0	120	x
+y	410,523,214,132,38,89	1	121	y
+z	410,523,0,108,25,89	0	122	z
+lC	274,722,196,141,-25,89	2	123	braceleft
 {	"
-ba	213,737,19,102,-24,89	2	0174	-- bar
+ba	213,737,19,102,-24,89	2	124	bar
 |	"
-rC	274,722,196,67,50,67	2	0175	-- braceright
+rC	274,722,196,67,50,67	2	125	braceright
 }	"
-a~	273,722,0,179,-52,89	2	0176	-- tilde
+a~	273,722,0,179,-52,89	2	126	tilde
 ~	"
-bq	182,106,149,15,33,15	0	0200	-- quotesinglbase
-Fo	456,446,0,48,-70,48	0	0201	-- guillemotleft
-Fc	456,446,0,27,-48,27	0	0202	-- guillemotright
-bu	287,517,0,102,-24,89	0	0203	-- bullet
-Fn	456,737,207,131,93,89	3	0204	-- florin
-f/	137,703,19,309,189,89	2	0205	-- fraction
-%0	820,703,19,74,-22,74	2	0206	-- perthousand
-dg	456,718,159,104,-60,89	2	0207	-- dagger
-dd	456,718,159,105,7,89	2	0210	-- daggerdbl
-en	456,313,0,104,8,89	0	0211	-- endash
-em	820,313,0,105,8,89	0	0212	-- emdash
-fi	410,728,0,121,-21,89	2	0214	-- fi
-fl	410,728,0,119,-21,89	2	0215	-- fl
-.i	228,523,0,63,-28,63	0	0220	-- dotlessi
-ga	273,734,0,53,-89,53	2	0222	-- grave
-a"	273,734,0,240,-79,89	2	0223	-- hungarumlaut
-a.	273,706,0,74,-154,74	2	0224	-- dotaccent
-ab	273,731,0,168,-87,89	2	0225	-- breve
-ah	273,734,0,161,-95,89	2	0226	-- caron
-ao	273,756,0,107,-125,89	2	0227	-- ring
-ho	273,0,225,0,15	1	0230	-- ogonek
-lq	273,725,0,155,-63,89	2	0231	-- quotedblleft
-rq	273,718,0,144,-52,89	2	0232	-- quotedblright
-oe	774,538,15,67,-18,67	0	0233	-- oe
-/l	182,718,0,152,16,89	2	0234	-- lslash
-Bq	273,106,149,37,55,37	0	0235	-- quotedblbase
-OE	820,737,19,145,-30,89	2	0236	-- OE
-/L	456,718,0,49,16,49	2	0237	-- Lslash
-r!	273,523,195,44,-13,44	0	0241	-- exclamdown
-ct	456,623,115,73,-28,73	0	0242	-- cent
-Po	456,718,16,114,10,89	2	0243	-- sterling
-Cs	456,603,0,124,1,89	0	0244	-- currency
-Ye	456,688,0,167,-17,89	2	0245	-- yen
-bb	213,737,19,102,-24,89	2	0246	-- brokenbar
-sc	456,737,191,73,-13,73	2	0247	-- section
-ad	273,706,0,140,-88,89	2	0250	-- dieresis
-co	604,737,19,133,6,89	2	0251	-- copyright
-Of	303,737,0,115,-32,89	2	0252	-- ordfeminine
-fo	273,446,0,56,-62,56	0	0253	-- guilsinglleft
-no	479,390,0,86,-37,86	0	0254	-- logicalnot
-\-	479,289,0,68,-20,68	0	0255	-- minus
-rg	604,737,19,133,6,89	2	0256	-- registered
-a-	273,684,0,161,-67,89	2	0257	-- macron
-de	328,703,0,106,-88,89	2	0260	-- degree
-t+-	479,506,0,78,18,78	0	0261	-- plusminus
-S2	273,703,0,145,-2,89	2	0262	-- twosuperior
-S3	273,703,0,135,-24,89	2	0263	-- threesuperior
-aa	273,734,0,167,-153,89	2	0264	-- acute
-mc	456,523,207,86,30,86	1	0265	-- mu
-ps	440,718,173,143,-53,89	2	0266	-- paragraph
-pc	228,315,0,33,-56,33	0	0267	-- periodcentered
-ac	273,0,225,0,48	1	0270	-- cedilla
-S1	273,703,0,82,-86,82	2	0271	-- onesuperior
-Om	299,737,0,135,-32,89	2	0272	-- ordmasculine
-fc	273,446,0,34,-41,34	0	0273	-- guilsinglright
-14	684,703,19,24,-73,24	2	0274	-- onequarter
-12	684,703,19,54,-43,54	2	0275	-- onehalf
-34	684,703,19,72,-56,72	2	0276	-- threequarters
-r?	501,525,201,0,-20	0	0277	-- questiondown
-`A	547,929,0,39,39,39	2	0300	-- Agrave
-'A	547,929,0,63,39,63	2	0301	-- Aacute
-^A	547,929,0,39,39,39	2	0302	-- Acircumflex
-~A	547,917,0,76,39,76	2	0303	-- Atilde
-:A	547,901,0,39,39,39	2	0304	-- Adieresis
-oA	547,931,0,39,39,39	2	0305	-- Aring
-AE	820,718,0,129,43,89	2	0306	-- AE
-,C	592,737,225,98,-38,89	3	0307	-- Ccedilla
-`E	547,929,0,128,-21,89	2	0310	-- Egrave
-'E	547,929,0,128,-21,89	2	0311	-- Eacute
-^E	547,929,0,128,-21,89	2	0312	-- Ecircumflex
-:E	547,901,0,128,-21,89	2	0313	-- Edieresis
-`I	228,929,0,110,-25,89	2	0314	-- Igrave
-'I	228,929,0,223,-25,89	2	0315	-- Iacute
-^I	228,929,0,193,-25,89	2	0316	-- Icircumflex
-:I	228,901,0,197,-25,89	2	0317	-- Idieresis
--D	592,718,0,84,-7,84	2	0320	-- Eth
-~N	592,917,0,113,-12,89	2	0321	-- Ntilde
-`O	638,929,19,89,-36,89	2	0322	-- Ograve
-'O	638,929,19,89,-36,89	2	0323	-- Oacute
-^O	638,929,19,89,-36,89	2	0324	-- Ocircumflex
-~O	638,917,19,89,-36,89	2	0325	-- Otilde
-:O	638,901,19,89,-36,89	2	0326	-- Odieresis
-tmu	479,506,0,97,9,89	0	0327	-- multiply
-/O	638,737,19,142,15,89	2	0330	-- Oslash
-`U	592,929,19,111,-51,89	2	0331	-- Ugrave
-'U	592,929,19,111,-51,89	2	0332	-- Uacute
-^U	592,929,19,111,-51,89	2	0333	-- Ucircumflex
-:U	592,901,19,111,-51,89	2	0334	-- Udieresis
-'Y	547,929,0,164,-87,89	2	0335	-- Yacute
-TP	547,718,0,87,-21,87	2	0336	-- Thorn
-ss	501,728,15,88,-5,88	2	0337	-- germandbls
-`a	456,734,15,52,0,52	2	0340	-- agrave
-'a	456,734,15,75,0,75	2	0341	-- aacute
-^a	456,734,15,52,0,52	2	0342	-- acircumflex
-~a	456,722,15,80,0,80	2	0343	-- atilde
-:a	456,706,15,52,0,52	2	0344	-- adieresis
-oa	456,756,15,52,0,52	2	0345	-- aring
-ae	729,538,15,67,0,67	0	0346	-- ae
-,c	410,538,225,94,-11,89	1	0347	-- ccedilla
-`e	456,734,15,68,-19,68	2	0350	-- egrave
-'e	456,734,15,75,-19,75	2	0351	-- eacute
-^e	456,734,15,68,-19,68	2	0352	-- ecircumflex
-:e	456,706,15,68,-19,68	2	0353	-- edieresis
-`i	228,734,0,76,-28,76	2	0354	-- igrave
-'i	228,734,0,189,-28,89	2	0355	-- iacute
-^i	228,734,0,159,-28,89	2	0356	-- icircumflex
-:i	228,706,0,163,-28,89	2	0357	-- idieresis
-Sd	456,737,15,100,-17,89	2	0360	-- eth
-~n	456,722,0,80,-3,80	2	0361	-- ntilde
-`o	456,734,14,73,-18,73	2	0362	-- ograve
-'o	456,734,14,75,-18,75	2	0363	-- oacute
-^o	456,734,14,73,-18,73	2	0364	-- ocircumflex
-~o	456,722,14,88,-18,88	2	0365	-- otilde
-:o	456,706,14,73,-18,73	2	0366	-- odieresis
-tdi	479,524,19,68,-20,68	0	0367	-- divide
-/o	501,545,22,80,26,80	0	0370	-- oslash
-`u	456,734,15,86,-27,86	2	0371	-- ugrave
-'u	456,734,15,86,-27,86	2	0372	-- uacute
-^u	456,734,15,86,-27,86	2	0373	-- ucircumflex
-:u	456,706,15,86,-27,86	2	0374	-- udieresis
-'y	410,734,214,132,38,89	3	0375	-- yacute
-Tp	456,718,207,73,39,73	3	0376	-- thorn
-:y	410,706,214,132,38,89	3	0377	-- ydieresis
+bq	182,106,149,15,33,15	0	128	quotesinglbase
+Fo	456,446,0,48,-70,48	0	129	guillemotleft
+Fc	456,446,0,27,-48,27	0	130	guillemotright
+bu	287,517,0,102,-24,89	0	131	bullet
+Fn	456,737,207,131,93,89	3	132	florin
+f/	137,703,19,309,189,89	2	133	fraction
+%0	820,703,19,74,-22,74	2	134	perthousand
+dg	456,718,159,104,-60,89	2	135	dagger
+dd	456,718,159,105,7,89	2	136	daggerdbl
+en	456,313,0,104,8,89	0	137	endash
+em	820,313,0,105,8,89	0	138	emdash
+fi	410,728,0,121,-21,89	2	140	fi
+fl	410,728,0,119,-21,89	2	141	fl
+.i	228,523,0,63,-28,63	0	144	dotlessi
+ga	273,734,0,53,-89,53	2	146	grave
+a"	273,734,0,240,-79,89	2	147	hungarumlaut
+a.	273,706,0,74,-154,74	2	148	dotaccent
+ab	273,731,0,168,-87,89	2	149	breve
+ah	273,734,0,161,-95,89	2	150	caron
+ao	273,756,0,107,-125,89	2	151	ring
+ho	273,0,225,0,15	1	152	ogonek
+lq	273,725,0,155,-63,89	2	153	quotedblleft
+rq	273,718,0,144,-52,89	2	154	quotedblright
+oe	774,538,15,67,-18,67	0	155	oe
+/l	182,718,0,152,16,89	2	156	lslash
+Bq	273,106,149,37,55,37	0	157	quotedblbase
+OE	820,737,19,145,-30,89	2	158	OE
+/L	456,718,0,49,16,49	2	159	Lslash
+r!	273,523,195,44,-13,44	0	161	exclamdown
+ct	456,623,115,73,-28,73	0	162	cent
+Po	456,718,16,114,10,89	2	163	sterling
+Cs	456,603,0,124,1,89	0	164	currency
+Ye	456,688,0,167,-17,89	2	165	yen
+bb	213,737,19,102,-24,89	2	166	brokenbar
+sc	456,737,191,73,-13,73	2	167	section
+ad	273,706,0,140,-88,89	2	168	dieresis
+co	604,737,19,133,6,89	2	169	copyright
+Of	303,737,0,115,-32,89	2	170	ordfeminine
+fo	273,446,0,56,-62,56	0	171	guilsinglleft
+tno	479,390,0,86,-37,86	0	172	logicalnot
+\-	479,289,0,68,-20,68	0	173	minus
+rg	604,737,19,133,6,89	2	174	registered
+a-	273,684,0,161,-67,89	2	175	macron
+de	328,703,0,106,-88,89	2	176	degree
+t+-	479,506,0,78,18,78	0	177	plusminus
+S2	273,703,0,145,-2,89	2	178	twosuperior
+S3	273,703,0,135,-24,89	2	179	threesuperior
+aa	273,734,0,167,-153,89	2	180	acute
+mc	456,523,207,86,30,86	1	181	mu
+ps	440,718,173,143,-53,89	2	182	paragraph
+pc	228,315,0,33,-56,33	0	183	periodcentered
+ac	273,0,225,0,48	1	184	cedilla
+S1	273,703,0,82,-86,82	2	185	onesuperior
+Om	299,737,0,135,-32,89	2	186	ordmasculine
+fc	273,446,0,34,-41,34	0	187	guilsinglright
+14	684,703,19,24,-73,24	2	188	onequarter
+12	684,703,19,54,-43,54	2	189	onehalf
+34	684,703,19,72,-56,72	2	190	threequarters
+r?	501,525,201,0,-20	0	191	questiondown
+`A	547,929,0,39,39,39	2	192	Agrave
+'A	547,929,0,63,39,63	2	193	Aacute
+^A	547,929,0,39,39,39	2	194	Acircumflex
+~A	547,917,0,76,39,76	2	195	Atilde
+:A	547,901,0,39,39,39	2	196	Adieresis
+oA	547,931,0,39,39,39	2	197	Aring
+AE	820,718,0,129,43,89	2	198	AE
+,C	592,737,225,98,-38,89	3	199	Ccedilla
+`E	547,929,0,128,-21,89	2	200	Egrave
+'E	547,929,0,128,-21,89	2	201	Eacute
+^E	547,929,0,128,-21,89	2	202	Ecircumflex
+:E	547,901,0,128,-21,89	2	203	Edieresis
+`I	228,929,0,110,-25,89	2	204	Igrave
+'I	228,929,0,223,-25,89	2	205	Iacute
+^I	228,929,0,193,-25,89	2	206	Icircumflex
+:I	228,901,0,197,-25,89	2	207	Idieresis
+-D	592,718,0,84,-7,84	2	208	Eth
+~N	592,917,0,113,-12,89	2	209	Ntilde
+`O	638,929,19,89,-36,89	2	210	Ograve
+'O	638,929,19,89,-36,89	2	211	Oacute
+^O	638,929,19,89,-36,89	2	212	Ocircumflex
+~O	638,917,19,89,-36,89	2	213	Otilde
+:O	638,901,19,89,-36,89	2	214	Odieresis
+tmu	479,506,0,97,9,89	0	215	multiply
+/O	638,737,19,142,15,89	2	216	Oslash
+`U	592,929,19,111,-51,89	2	217	Ugrave
+'U	592,929,19,111,-51,89	2	218	Uacute
+^U	592,929,19,111,-51,89	2	219	Ucircumflex
+:U	592,901,19,111,-51,89	2	220	Udieresis
+'Y	547,929,0,164,-87,89	2	221	Yacute
+TP	547,718,0,87,-21,87	2	222	Thorn
+ss	501,728,15,88,-5,88	2	223	germandbls
+`a	456,734,15,52,0,52	2	224	agrave
+'a	456,734,15,75,0,75	2	225	aacute
+^a	456,734,15,52,0,52	2	226	acircumflex
+~a	456,722,15,80,0,80	2	227	atilde
+:a	456,706,15,52,0,52	2	228	adieresis
+oa	456,756,15,52,0,52	2	229	aring
+ae	729,538,15,67,0,67	0	230	ae
+,c	410,538,225,94,-11,89	1	231	ccedilla
+`e	456,734,15,68,-19,68	2	232	egrave
+'e	456,734,15,75,-19,75	2	233	eacute
+^e	456,734,15,68,-19,68	2	234	ecircumflex
+:e	456,706,15,68,-19,68	2	235	edieresis
+`i	228,734,0,76,-28,76	2	236	igrave
+'i	228,734,0,189,-28,89	2	237	iacute
+^i	228,734,0,159,-28,89	2	238	icircumflex
+:i	228,706,0,163,-28,89	2	239	idieresis
+Sd	456,737,15,100,-17,89	2	240	eth
+~n	456,722,0,80,-3,80	2	241	ntilde
+`o	456,734,14,73,-18,73	2	242	ograve
+'o	456,734,14,75,-18,75	2	243	oacute
+^o	456,734,14,73,-18,73	2	244	ocircumflex
+~o	456,722,14,88,-18,88	2	245	otilde
+:o	456,706,14,73,-18,73	2	246	odieresis
+tdi	479,524,19,68,-20,68	0	247	divide
+/o	501,545,22,80,26,80	0	248	oslash
+`u	456,734,15,86,-27,86	2	249	ugrave
+'u	456,734,15,86,-27,86	2	250	uacute
+^u	456,734,15,86,-27,86	2	251	ucircumflex
+:u	456,706,15,86,-27,86	2	252	udieresis
+'y	410,734,214,132,38,89	3	253	yacute
+Tp	456,718,207,73,39,73	3	254	thorn
+:y	410,706,214,132,38,89	3	255	ydieresis
+u2026	820,106,0,0,-44	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HNR b/contrib/groff/font/devps/HNR
index 15737bc..5acaac0 100644
--- a/contrib/groff/font/devps/HNR
+++ b/contrib/groff/font/devps/HNR
@@ -261,246 +261,247 @@ y a -15
 z o -11
 z e -11
 charset
-ha	385,688,0,11,11	2	0000	-- asciicircum
-ti	479,326,0,0,-50	0	0001	-- asciitilde
-vS	547,929,19,0,-40	2	0002	-- Scaron
-vZ	501,929,0,0,-19	2	0003	-- Zcaron
-vs	410,734,15,0,-26	2	0004	-- scaron
-vz	410,734,0,0,-25	2	0005	-- zcaron
-:Y	547,901,0,0,-11	2	0006	-- Ydieresis
-tm	820,718,0,0,-38	2	0007	-- trademark
-aq	157,718,0,0,-48	2	0010	-- quotesingle
-space	228	0	0040
-!	228,718,0,0,-74	2	0041	-- exclam
-"	291,718,0,0,-57	2	0042	-- quotedbl
+ha	385,688,0,11,11	2	0	asciicircum
+ti	479,326	0	1	asciitilde
+vS	547,929,19	2	2	Scaron
+vZ	501,929	2	3	Zcaron
+vs	410,734,15	2	4	scaron
+vz	410,734	2	5	zcaron
+:Y	547,901	2	6	Ydieresis
+tm	820,718	2	7	trademark
+aq	157,718	2	8	quotesingle
+space	228	0	32	space
+!	228,718	2	33	exclam
+"	291,718	2	34	quotedbl
 dq	"
-#	456,688,0,0,-23	2	0043	-- numbersign
+#	456,688	2	35	numbersign
 sh	"
-$	456,775,115,0,-26	2	0044	-- dollar
+$	456,775,115	2	36	dollar
 Do	"
-%	729,703,19,0,-32	2	0045	-- percent
-&	547,718,15,0,-36	2	0046	-- ampersand
-'	182,718,0,0,-43	2	0047	-- quoteright
+%	729,703,19	2	37	percent
+&	547,718,15	2	38	ampersand
+'	182,718	2	39	quoteright
 cq	"
-(	273,733,207,0,-56	3	0050	-- parenleft
-)	273,733,207,0,-28	3	0051	-- parenright
-*	319,718,0,0,-32	2	0052	-- asterisk
-+	479,505,0,0,-32	0	0053	-- plus
-,	228,106,147,0,-71	0	0054	-- comma
--	273,322,0,0,-36	0	0055	-- hyphen
+(	273,733,207	3	40	parenleft
+)	273,733,207	3	41	parenright
+*	319,718	2	42	asterisk
++	479,505	0	43	plus
+,	228,106,147	0	44	comma
+-	273,322	0	45	hyphen
 hy	"
-.	228,106,0,0,-71	0	0056	-- period
-/	228,737,19,14,14	2	0057	-- slash
+.	228,106	0	46	period
+/	228,737,19,14,14	2	47	slash
 sl	"
-0	456,703,19,0,-30	2	0060	-- zero
-1	456,703,0,0,-83	2	0061	-- one
-2	456,703,0,0,-21	2	0062	-- two
-3	456,703,19,0,-28	2	0063	-- three
-4	456,703,0,0,-20	2	0064	-- four
-5	456,688,19,0,-26	2	0065	-- five
-6	456,703,19,0,-31	2	0066	-- six
-7	456,688,0,0,-30	2	0067	-- seven
-8	456,703,19,0,-31	2	0070	-- eight
-9	456,703,19,0,-34	2	0071	-- nine
-:	228,516,0,0,-71	0	0072	-- colon
-;	228,516,147,0,-71	0	0073	-- semicolon
-<	479,495,0,0,-39	0	0074	-- less
-=	479,390,0,0,-32	0	0075	-- equal
->	479,495,0,0,-39	0	0076	-- greater
-?	456,727,0,0,-46	2	0077	-- question
-@	832,737,19,0,-121	2	0100	-- at
+0	456,703,19	2	48	zero
+1	456,703	2	49	one
+2	456,703	2	50	two
+3	456,703,19	2	51	three
+4	456,703	2	52	four
+5	456,688,19	2	53	five
+6	456,703,19	2	54	six
+7	456,688	2	55	seven
+8	456,703,19	2	56	eight
+9	456,703,19	2	57	nine
+:	228,516	0	58	colon
+;	228,516,147	0	59	semicolon
+<	479,495	0	60	less
+=	479,390	0	61	equal
+>	479,495	0	62	greater
+?	456,727	2	63	question
+@	832,737,19	2	64	at
 at	"
-A	547,718,0,0,-11	2	0101	-- A
-B	547,718,0,0,-61	2	0102	-- B
-C	592,737,19,0,-36	2	0103	-- C
-D	592,718,0,0,-66	2	0104	-- D
-E	547,718,0,0,-71	2	0105	-- E
-F	501,718,0,0,-71	2	0106	-- F
-G	638,737,19,0,-39	2	0107	-- G
-H	592,718,0,0,-63	2	0110	-- H
-I	228,718,0,0,-75	2	0111	-- I
-J	410,718,19,0,-14	2	0112	-- J
-K	547,718,0,0,-62	2	0113	-- K
-L	456,718,0,0,-62	2	0114	-- L
-M	683,718,0,0,-60	2	0115	-- M
-N	592,718,0,0,-62	2	0116	-- N
-O	638,737,19,0,-32	2	0117	-- O
-P	547,718,0,0,-71	2	0120	-- P
-Q	638,737,56,0,-32	2	0121	-- Q
-R	592,718,0,0,-72	2	0122	-- R
-S	547,737,19,0,-40	2	0123	-- S
-T	501,718,0,0,-11	2	0124	-- T
-U	592,718,19,0,-65	2	0125	-- U
-V	547,718,0,0,-16	2	0126	-- V
-W	774,718,0,0,-13	2	0127	-- W
-X	547,718,0,0,-16	2	0130	-- X
-Y	547,718,0,0,-11	2	0131	-- Y
-Z	501,718,0,0,-19	2	0132	-- Z
-[	228,722,196,0,-52	2	0133	-- bracketleft
+A	547,718	2	65	A
+B	547,718	2	66	B
+C	592,737,19	2	67	C
+D	592,718	2	68	D
+E	547,718	2	69	E
+F	501,718	2	70	F
+G	638,737,19	2	71	G
+H	592,718	2	72	H
+I	228,718	2	73	I
+J	410,718,19	2	74	J
+K	547,718	2	75	K
+L	456,718	2	76	L
+M	683,718	2	77	M
+N	592,718	2	78	N
+O	638,737,19	2	79	O
+P	547,718	2	80	P
+Q	638,737,56	2	81	Q
+R	592,718	2	82	R
+S	547,737,19	2	83	S
+T	501,718	2	84	T
+U	592,718,19	2	85	U
+V	547,718	2	86	V
+W	774,718	2	87	W
+X	547,718	2	88	X
+Y	547,718	2	89	Y
+Z	501,718	2	90	Z
+[	228,722,196	2	91	bracketleft
 lB	"
-\	228,737,19,14,14	2	0134	-- backslash
+\	228,737,19,14,14	2	92	backslash
 rs	"
-]	228,722,196,0,-23	2	0135	-- bracketright
+]	228,722,196	2	93	bracketright
 rB	"
-a^	273,734,0,0,-17	2	0136	-- circumflex
+a^	273,734	2	94	circumflex
 ^	"
-_	456,0,125	0	0137	-- underscore
-`	182,725,0,0,-53	2	0140	-- quoteleft
+_	456,0,125	0	95	underscore
+`	182,725	2	96	quoteleft
 oq	"
-a	456,538,15,0,-30	0	0141	-- a
-b	456,718,15,0,-48	2	0142	-- b
-c	410,538,15,0,-25	0	0143	-- c
-d	456,718,15,0,-29	2	0144	-- d
-e	456,538,15,0,-33	0	0145	-- e
-f	228,728,0,0,-11	2	0146	-- f
-g	456,538,220,0,-33	1	0147	-- g
-h	456,718,0,0,-53	2	0150	-- h
-i	182,718,0,0,-55	2	0151	-- i
-j	182,718,210,0,13	3	0152	-- j
-k	410,718,0,1,-55	2	0153	-- k
-l	182,718,0,0,-55	2	0154	-- l
-m	683,538,0,0,-53	0	0155	-- m
-n	456,538,0,0,-53	0	0156	-- n
-o	456,538,14,0,-29	0	0157	-- o
-p	456,538,207,0,-48	1	0160	-- p
-q	456,538,207,0,-29	1	0161	-- q
-r	273,538,0,0,-63	0	0162	-- r
-s	410,538,15,0,-26	0	0163	-- s
-t	228,669,7,0,-11	2	0164	-- t
-u	456,523,15,0,-56	0	0165	-- u
-v	410,523,0,0,-7	0	0166	-- v
-w	592,523,0,0,-11	0	0167	-- w
-x	410,523,0,0,-9	0	0170	-- x
-y	410,523,214,0,-9	1	0171	-- y
-z	410,523,0,0,-25	0	0172	-- z
-lC	274,722,196,0,-34	2	0173	-- braceleft
+a	456,538,15	0	97	a
+b	456,718,15	2	98	b
+c	410,538,15	0	99	c
+d	456,718,15	2	100	d
+e	456,538,15	0	101	e
+f	228,728	2	102	f
+g	456,538,220	1	103	g
+h	456,718	2	104	h
+i	182,718	2	105	i
+j	182,718,210,0,13	3	106	j
+k	410,718,0,1	2	107	k
+l	182,718	2	108	l
+m	683,538	0	109	m
+n	456,538	0	110	n
+o	456,538,14	0	111	o
+p	456,538,207	1	112	p
+q	456,538,207	1	113	q
+r	273,538	0	114	r
+s	410,538,15	0	115	s
+t	228,669,7	2	116	t
+u	456,523,15	0	117	u
+v	410,523	0	118	v
+w	592,523	0	119	w
+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,737,19,0,-77	2	0174	-- bar
+ba	213,737,19	2	124	bar
 |	"
-rC	274,722,196,0,-34	2	0175	-- braceright
+rC	274,722,196	2	125	braceright
 }	"
-a~	273,722,0,3,3	2	0176	-- tilde
+a~	273,722,0,3,3	2	126	tilde
 ~	"
-bq	182,106,149,0,-43	0	0200	-- quotesinglbase
-Fo	456,446,0,0,-80	0	0201	-- guillemotleft
-Fc	456,446,0,0,-80	0	0202	-- guillemotright
-bu	287,517,0,0,-15	0	0203	-- bullet
-Fn	456,737,207,0,9	3	0204	-- florin
-f/	137,703,19,136,136	2	0205	-- fraction
-%0	820,703,19,0,-6	2	0206	-- perthousand
-dg	456,718,159,0,-35	2	0207	-- dagger
-dd	456,718,159,0,-35	2	0210	-- daggerdbl
-en	456,313	0	0211	-- endash
-em	820,313	0	0212	-- emdash
-fi	410,728,0,0,-11	2	0214	-- fi
-fl	410,728,0,0,-11	2	0215	-- fl
-.i	228,523,0,0,-78	0	0220	-- dotlessi
-ga	273,734,0,0,-11	2	0222	-- grave
-a"	273,734,0,62,-25	2	0223	-- hungarumlaut
-a.	273,706,0,0,-99	2	0224	-- dotaccent
-ab	273,731,0,0,-11	2	0225	-- breve
-ah	273,734,0,0,-17	2	0226	-- caron
-ao	273,756,0,0,-61	2	0227	-- ring
-ho	273,0,225,0,-60	1	0230	-- ogonek
-lq	273,725,0,0,-31	2	0231	-- quotedblleft
-rq	273,718,0,0,-21	2	0232	-- quotedblright
-oe	774,538,15,0,-29	0	0233	-- oe
-/l	182,718,0,16,16	2	0234	-- lslash
-Bq	273,106,149,0,-21	0	0235	-- quotedblbase
-OE	820,737,19,0,-30	2	0236	-- OE
-/L	456,718,0,0,16	2	0237	-- Lslash
-r!	273,523,195,0,-97	0	0241	-- exclamdown
-ct	456,623,115,0,-42	0	0242	-- cent
-Po	456,718,16,0,-27	2	0243	-- sterling
-Cs	456,603,0,0,-23	0	0244	-- currency
-Ye	456,688,0,0,-2	2	0245	-- yen
-bb	213,737,19,0,-77	2	0246	-- brokenbar
-sc	456,737,191,0,-35	2	0247	-- section
-ad	273,706,0,0,-33	2	0250	-- dieresis
-co	604,737,19,13,11	2	0251	-- copyright
-Of	303,737,0,0,-20	2	0252	-- ordfeminine
-fo	273,446,0,0,-72	0	0253	-- guilsinglleft
-no	479,390,0,0,-32	0	0254	-- logicalnot
-\-	479,289,0,0,-32	0	0255	-- minus
-rg	604,737,19,13,11	2	0256	-- registered
-a-	273,684,0,0,-8	2	0257	-- macron
-de	328,703,0,0,-44	2	0260	-- degree
-t+-	479,506,0,0,-32	0	0261	-- plusminus
-S2	273,703,0,0,-3	2	0262	-- twosuperior
-S3	273,703,0,0,-4	2	0263	-- threesuperior
-aa	273,734,0,0,-100	2	0264	-- acute
-mc	456,523,207,0,-56	1	0265	-- mu
-ps	440,718,173,0,-15	2	0266	-- paragraph
-pc	228,315,0,0,-63	0	0267	-- periodcentered
-ac	273,0,225,0,-37	1	0270	-- cedilla
-S1	273,703,0,0,-35	2	0271	-- onesuperior
-Om	299,737,0,0,-20	2	0272	-- ordmasculine
-fc	273,446,0,0,-72	0	0273	-- guilsinglright
-14	684,703,19,0,-60	2	0274	-- onequarter
-12	684,703,19,0,-35	2	0275	-- onehalf
-34	684,703,19,0,-37	2	0276	-- threequarters
-r?	501,525,201,0,-75	0	0277	-- questiondown
-`A	547,929,0,0,-11	2	0300	-- Agrave
-'A	547,929,0,0,-11	2	0301	-- Aacute
-^A	547,929,0,0,-11	2	0302	-- Acircumflex
-~A	547,917,0,0,-11	2	0303	-- Atilde
-:A	547,901,0,0,-11	2	0304	-- Adieresis
-oA	547,931,0,0,-11	2	0305	-- Aring
-AE	820,718,0,0,-7	2	0306	-- AE
-,C	592,737,225,0,-36	3	0307	-- Ccedilla
-`E	547,929,0,0,-71	2	0310	-- Egrave
-'E	547,929,0,0,-71	2	0311	-- Eacute
-^E	547,929,0,0,-71	2	0312	-- Ecircumflex
-:E	547,901,0,0,-71	2	0313	-- Edieresis
-`I	228,929,0,0,11	2	0314	-- Igrave
-'I	228,929,0,11,-75	2	0315	-- Iacute
-^I	228,929,0,6,5	2	0316	-- Icircumflex
-:I	228,901,0,0,-11	2	0317	-- Idieresis
--D	592,718	2	0320	-- Eth
-~N	592,917,0,0,-62	2	0321	-- Ntilde
-`O	638,929,19,0,-32	2	0322	-- Ograve
-'O	638,929,19,0,-32	2	0323	-- Oacute
-^O	638,929,19,0,-32	2	0324	-- Ocircumflex
-~O	638,917,19,0,-32	2	0325	-- Otilde
-:O	638,901,19,0,-32	2	0326	-- Odieresis
-tmu	479,506,0,0,-32	0	0327	-- multiply
-/O	638,737,19,0,-32	2	0330	-- Oslash
-`U	592,929,19,0,-65	2	0331	-- Ugrave
-'U	592,929,19,0,-65	2	0332	-- Uacute
-^U	592,929,19,0,-65	2	0333	-- Ucircumflex
-:U	592,901,19,0,-65	2	0334	-- Udieresis
-'Y	547,929,0,0,-11	2	0335	-- Yacute
-TP	547,718,0,0,-71	2	0336	-- Thorn
-ss	501,728,15,0,-55	2	0337	-- germandbls
-`a	456,734,15,0,-30	2	0340	-- agrave
-'a	456,734,15,0,-30	2	0341	-- aacute
-^a	456,734,15,0,-30	2	0342	-- acircumflex
-~a	456,722,15,0,-30	2	0343	-- atilde
-:a	456,706,15,0,-30	2	0344	-- adieresis
-oa	456,756,15,0,-30	2	0345	-- aring
-ae	729,538,15,0,-30	0	0346	-- ae
-,c	410,538,225,0,-25	1	0347	-- ccedilla
-`e	456,734,15,0,-33	2	0350	-- egrave
-'e	456,734,15,0,-33	2	0351	-- eacute
-^e	456,734,15,0,-33	2	0352	-- ecircumflex
-:e	456,706,15,0,-33	2	0353	-- edieresis
-`i	228,734,0,0,11	2	0354	-- igrave
-'i	228,734,0,11,-78	2	0355	-- iacute
-^i	228,734,0,6,5	2	0356	-- icircumflex
-:i	228,706,0,0,-11	2	0357	-- idieresis
-Sd	456,737,15,0,-29	2	0360	-- eth
-~n	456,722,0,0,-53	2	0361	-- ntilde
-`o	456,734,14,0,-29	2	0362	-- ograve
-'o	456,734,14,0,-29	2	0363	-- oacute
-^o	456,734,14,0,-29	2	0364	-- ocircumflex
-~o	456,722,14,0,-29	2	0365	-- otilde
-:o	456,706,14,0,-29	2	0366	-- odieresis
-tdi	479,524,19,0,-32	0	0367	-- divide
-/o	501,545,22,0,-23	0	0370	-- oslash
-`u	456,734,15,0,-56	2	0371	-- ugrave
-'u	456,734,15,0,-56	2	0372	-- uacute
-^u	456,734,15,0,-56	2	0373	-- ucircumflex
-:u	456,706,15,0,-56	2	0374	-- udieresis
-'y	410,734,214,0,-9	3	0375	-- yacute
-Tp	456,718,207,0,-48	3	0376	-- thorn
-:y	410,706,214,0,-9	3	0377	-- ydieresis
+bq	182,106,149	0	128	quotesinglbase
+Fo	456,446	0	129	guillemotleft
+Fc	456,446	0	130	guillemotright
+bu	287,517	0	131	bullet
+Fn	456,737,207,0,9	3	132	florin
+f/	137,703,19,136,136	2	133	fraction
+%0	820,703,19	2	134	perthousand
+dg	456,718,159	2	135	dagger
+dd	456,718,159	2	136	daggerdbl
+en	456,313	0	137	endash
+em	820,313	0	138	emdash
+fi	410,728	2	140	fi
+fl	410,728	2	141	fl
+.i	228,523	0	144	dotlessi
+ga	273,734	2	146	grave
+a"	273,734,0,62	2	147	hungarumlaut
+a.	273,706	2	148	dotaccent
+ab	273,731	2	149	breve
+ah	273,734	2	150	caron
+ao	273,756	2	151	ring
+ho	273,0,225	1	152	ogonek
+lq	273,725	2	153	quotedblleft
+rq	273,718	2	154	quotedblright
+oe	774,538,15	0	155	oe
+/l	182,718,0,16,16	2	156	lslash
+Bq	273,106,149	0	157	quotedblbase
+OE	820,737,19	2	158	OE
+/L	456,718,0,0,16	2	159	Lslash
+r!	273,523,195	0	161	exclamdown
+ct	456,623,115	0	162	cent
+Po	456,718,16	2	163	sterling
+Cs	456,603	0	164	currency
+Ye	456,688	2	165	yen
+bb	213,737,19	2	166	brokenbar
+sc	456,737,191	2	167	section
+ad	273,706	2	168	dieresis
+co	604,737,19,13,11	2	169	copyright
+Of	303,737	2	170	ordfeminine
+fo	273,446	0	171	guilsinglleft
+tno	479,390	0	172	logicalnot
+\-	479,289	0	173	minus
+rg	604,737,19,13,11	2	174	registered
+a-	273,684	2	175	macron
+de	328,703	2	176	degree
+t+-	479,506	0	177	plusminus
+S2	273,703	2	178	twosuperior
+S3	273,703	2	179	threesuperior
+aa	273,734	2	180	acute
+mc	456,523,207	1	181	mu
+ps	440,718,173	2	182	paragraph
+pc	228,315	0	183	periodcentered
+ac	273,0,225	1	184	cedilla
+S1	273,703	2	185	onesuperior
+Om	299,737	2	186	ordmasculine
+fc	273,446	0	187	guilsinglright
+14	684,703,19	2	188	onequarter
+12	684,703,19	2	189	onehalf
+34	684,703,19	2	190	threequarters
+r?	501,525,201	0	191	questiondown
+`A	547,929	2	192	Agrave
+'A	547,929	2	193	Aacute
+^A	547,929	2	194	Acircumflex
+~A	547,917	2	195	Atilde
+:A	547,901	2	196	Adieresis
+oA	547,931	2	197	Aring
+AE	820,718	2	198	AE
+,C	592,737,225	3	199	Ccedilla
+`E	547,929	2	200	Egrave
+'E	547,929	2	201	Eacute
+^E	547,929	2	202	Ecircumflex
+:E	547,901	2	203	Edieresis
+`I	228,929,0,0,11	2	204	Igrave
+'I	228,929,0,11	2	205	Iacute
+^I	228,929,0,6,5	2	206	Icircumflex
+:I	228,901	2	207	Idieresis
+-D	592,718	2	208	Eth
+~N	592,917	2	209	Ntilde
+`O	638,929,19	2	210	Ograve
+'O	638,929,19	2	211	Oacute
+^O	638,929,19	2	212	Ocircumflex
+~O	638,917,19	2	213	Otilde
+:O	638,901,19	2	214	Odieresis
+tmu	479,506	0	215	multiply
+/O	638,737,19	2	216	Oslash
+`U	592,929,19	2	217	Ugrave
+'U	592,929,19	2	218	Uacute
+^U	592,929,19	2	219	Ucircumflex
+:U	592,901,19	2	220	Udieresis
+'Y	547,929	2	221	Yacute
+TP	547,718	2	222	Thorn
+ss	501,728,15	2	223	germandbls
+`a	456,734,15	2	224	agrave
+'a	456,734,15	2	225	aacute
+^a	456,734,15	2	226	acircumflex
+~a	456,722,15	2	227	atilde
+:a	456,706,15	2	228	adieresis
+oa	456,756,15	2	229	aring
+ae	729,538,15	0	230	ae
+,c	410,538,225	1	231	ccedilla
+`e	456,734,15	2	232	egrave
+'e	456,734,15	2	233	eacute
+^e	456,734,15	2	234	ecircumflex
+:e	456,706,15	2	235	edieresis
+`i	228,734,0,0,11	2	236	igrave
+'i	228,734,0,11	2	237	iacute
+^i	228,734,0,6,5	2	238	icircumflex
+:i	228,706	2	239	idieresis
+Sd	456,737,15	2	240	eth
+~n	456,722	2	241	ntilde
+`o	456,734,14	2	242	ograve
+'o	456,734,14	2	243	oacute
+^o	456,734,14	2	244	ocircumflex
+~o	456,722,14	2	245	otilde
+:o	456,706,14	2	246	odieresis
+tdi	479,524,19	0	247	divide
+/o	501,545,22	0	248	oslash
+`u	456,734,15	2	249	ugrave
+'u	456,734,15	2	250	uacute
+^u	456,734,15	2	251	ucircumflex
+:u	456,706,15	2	252	udieresis
+'y	410,734,214	3	253	yacute
+Tp	456,718,207	3	254	thorn
+:y	410,706,214	3	255	ydieresis
+u2026	820,106	0	256	ellipsis
diff --git a/contrib/groff/font/devps/HR b/contrib/groff/font/devps/HR
index 45f2c0e..469f47f 100644
--- a/contrib/groff/font/devps/HR
+++ b/contrib/groff/font/devps/HR
@@ -261,246 +261,247 @@ y a -20
 z o -15
 z e -15
 charset
-ha	469,688,0,14,14	2	0000	-- asciicircum
-ti	584,326,0,0,-61	0	0001	-- asciitilde
-vS	667,929,19,0,-49	2	0002	-- Scaron
-vZ	611,929,0,0,-23	2	0003	-- Zcaron
-vs	500,734,15,0,-32	2	0004	-- scaron
-vz	500,734,0,0,-31	2	0005	-- zcaron
-:Y	667,901,0,0,-14	2	0006	-- Ydieresis
-tm	1000,718,0,0,-46	2	0007	-- trademark
-aq	191,718,0,0,-59	2	0010	-- quotesingle
-space	278	0	0040
-!	278,718,0,0,-90	2	0041	-- exclam
-"	355,718,0,0,-70	2	0042	-- quotedbl
+ha	469,688,0,14,14	2	0	asciicircum
+ti	584,326	0	1	asciitilde
+vS	667,929,19	2	2	Scaron
+vZ	611,929	2	3	Zcaron
+vs	500,734,15	2	4	scaron
+vz	500,734	2	5	zcaron
+:Y	667,901	2	6	Ydieresis
+tm	1000,718	2	7	trademark
+aq	191,718	2	8	quotesingle
+space	278	0	32	space
+!	278,718	2	33	exclam
+"	355,718	2	34	quotedbl
 dq	"
-#	556,688,0,0,-28	2	0043	-- numbersign
+#	556,688	2	35	numbersign
 sh	"
-$	556,775,115,0,-32	2	0044	-- dollar
+$	556,775,115	2	36	dollar
 Do	"
-%	889,703,19,0,-39	2	0045	-- percent
-&	667,718,15,0,-44	2	0046	-- ampersand
-'	222,718,0,0,-53	2	0047	-- quoteright
+%	889,703,19	2	37	percent
+&	667,718,15	2	38	ampersand
+'	222,718	2	39	quoteright
 cq	"
-(	333,733,207,0,-68	3	0050	-- parenleft
-)	333,733,207,0,-34	3	0051	-- parenright
-*	389,718,0,0,-39	2	0052	-- asterisk
-+	584,505,0,0,-39	0	0053	-- plus
-,	278,106,147,0,-87	0	0054	-- comma
--	333,322,0,0,-44	0	0055	-- hyphen
+(	333,733,207	3	40	parenleft
+)	333,733,207	3	41	parenright
+*	389,718	2	42	asterisk
++	584,505	0	43	plus
+,	278,106,147	0	44	comma
+-	333,322	0	45	hyphen
 hy	"
-.	278,106,0,0,-87	0	0056	-- period
-/	278,737,19,17,17	2	0057	-- slash
+.	278,106	0	46	period
+/	278,737,19,17,17	2	47	slash
 sl	"
-0	556,703,19,0,-37	2	0060	-- zero
-1	556,703,0,0,-101	2	0061	-- one
-2	556,703,0,0,-26	2	0062	-- two
-3	556,703,19,0,-34	2	0063	-- three
-4	556,703,0,0,-25	2	0064	-- four
-5	556,688,19,0,-32	2	0065	-- five
-6	556,703,19,0,-38	2	0066	-- six
-7	556,688,0,0,-37	2	0067	-- seven
-8	556,703,19,0,-38	2	0070	-- eight
-9	556,703,19,0,-42	2	0071	-- nine
-:	278,516,0,0,-87	0	0072	-- colon
-;	278,516,147,0,-87	0	0073	-- semicolon
-<	584,495,0,0,-48	0	0074	-- less
-=	584,390,0,0,-39	0	0075	-- equal
->	584,495,0,0,-48	0	0076	-- greater
-?	556,727,0,0,-56	2	0077	-- question
-@	1015,737,19,0,-147	2	0100	-- at
+0	556,703,19	2	48	zero
+1	556,703	2	49	one
+2	556,703	2	50	two
+3	556,703,19	2	51	three
+4	556,703	2	52	four
+5	556,688,19	2	53	five
+6	556,703,19	2	54	six
+7	556,688	2	55	seven
+8	556,703,19	2	56	eight
+9	556,703,19	2	57	nine
+:	278,516	0	58	colon
+;	278,516,147	0	59	semicolon
+<	584,495	0	60	less
+=	584,390	0	61	equal
+>	584,495	0	62	greater
+?	556,727	2	63	question
+@	1015,737,19	2	64	at
 at	"
-A	667,718,0,0,-14	2	0101	-- A
-B	667,718,0,0,-74	2	0102	-- B
-C	722,737,19,0,-44	2	0103	-- C
-D	722,718,0,0,-81	2	0104	-- D
-E	667,718,0,0,-86	2	0105	-- E
-F	611,718,0,0,-86	2	0106	-- F
-G	778,737,19,0,-48	2	0107	-- G
-H	722,718,0,0,-77	2	0110	-- H
-I	278,718,0,0,-91	2	0111	-- I
-J	500,718,19,0,-17	2	0112	-- J
-K	667,718,0,0,-76	2	0113	-- K
-L	556,718,0,0,-76	2	0114	-- L
-M	833,718,0,0,-73	2	0115	-- M
-N	722,718,0,0,-76	2	0116	-- N
-O	778,737,19,0,-39	2	0117	-- O
-P	667,718,0,0,-86	2	0120	-- P
-Q	778,737,56,0,-39	2	0121	-- Q
-R	722,718,0,0,-88	2	0122	-- R
-S	667,737,19,0,-49	2	0123	-- S
-T	611,718,0,0,-14	2	0124	-- T
-U	722,718,19,0,-79	2	0125	-- U
-V	667,718,0,0,-20	2	0126	-- V
-W	944,718,0,0,-16	2	0127	-- W
-X	667,718,0,0,-19	2	0130	-- X
-Y	667,718,0,0,-14	2	0131	-- Y
-Z	611,718,0,0,-23	2	0132	-- Z
-[	278,722,196,0,-63	2	0133	-- bracketleft
+A	667,718	2	65	A
+B	667,718	2	66	B
+C	722,737,19	2	67	C
+D	722,718	2	68	D
+E	667,718	2	69	E
+F	611,718	2	70	F
+G	778,737,19	2	71	G
+H	722,718	2	72	H
+I	278,718	2	73	I
+J	500,718,19	2	74	J
+K	667,718	2	75	K
+L	556,718	2	76	L
+M	833,718	2	77	M
+N	722,718	2	78	N
+O	778,737,19	2	79	O
+P	667,718	2	80	P
+Q	778,737,56	2	81	Q
+R	722,718	2	82	R
+S	667,737,19	2	83	S
+T	611,718	2	84	T
+U	722,718,19	2	85	U
+V	667,718	2	86	V
+W	944,718	2	87	W
+X	667,718	2	88	X
+Y	667,718	2	89	Y
+Z	611,718	2	90	Z
+[	278,722,196	2	91	bracketleft
 lB	"
-\	278,737,19,17,17	2	0134	-- backslash
+\	278,737,19,17,17	2	92	backslash
 rs	"
-]	278,722,196,0,-28	2	0135	-- bracketright
+]	278,722,196	2	93	bracketright
 rB	"
-a^	333,734,0,0,-21	2	0136	-- circumflex
+a^	333,734	2	94	circumflex
 ^	"
-_	556,0,125	0	0137	-- underscore
-`	222,725,0,0,-65	2	0140	-- quoteleft
+_	556,0,125	0	95	underscore
+`	222,725	2	96	quoteleft
 oq	"
-a	556,538,15,0,-36	0	0141	-- a
-b	556,718,15,0,-58	2	0142	-- b
-c	500,538,15,0,-30	0	0143	-- c
-d	556,718,15,0,-35	2	0144	-- d
-e	556,538,15,0,-40	0	0145	-- e
-f	278,728,0,0,-14	2	0146	-- f
-g	556,538,220,0,-40	1	0147	-- g
-h	556,718,0,0,-65	2	0150	-- h
-i	222,718,0,0,-67	2	0151	-- i
-j	222,718,210,0,16	3	0152	-- j
-k	500,718,0,1,-67	2	0153	-- k
-l	222,718,0,0,-67	2	0154	-- l
-m	833,538,0,0,-65	0	0155	-- m
-n	556,538,0,0,-65	0	0156	-- n
-o	556,538,14,0,-35	0	0157	-- o
-p	556,538,207,0,-58	1	0160	-- p
-q	556,538,207,0,-35	1	0161	-- q
-r	333,538,0,0,-77	0	0162	-- r
-s	500,538,15,0,-32	0	0163	-- s
-t	278,669,7,0,-14	2	0164	-- t
-u	556,523,15,0,-68	0	0165	-- u
-v	500,523,0,0,-8	0	0166	-- v
-w	722,523,0,0,-14	0	0167	-- w
-x	500,523,0,0,-11	0	0170	-- x
-y	500,523,214,0,-11	1	0171	-- y
-z	500,523,0,0,-31	0	0172	-- z
-lC	334,722,196,0,-42	2	0173	-- braceleft
+a	556,538,15	0	97	a
+b	556,718,15	2	98	b
+c	500,538,15	0	99	c
+d	556,718,15	2	100	d
+e	556,538,15	0	101	e
+f	278,728	2	102	f
+g	556,538,220	1	103	g
+h	556,718	2	104	h
+i	222,718	2	105	i
+j	222,718,210,0,16	3	106	j
+k	500,718,0,1	2	107	k
+l	222,718	2	108	l
+m	833,538	0	109	m
+n	556,538	0	110	n
+o	556,538,14	0	111	o
+p	556,538,207	1	112	p
+q	556,538,207	1	113	q
+r	333,538	0	114	r
+s	500,538,15	0	115	s
+t	278,669,7	2	116	t
+u	556,523,15	0	117	u
+v	500,523	0	118	v
+w	722,523	0	119	w
+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,737,19,0,-94	2	0174	-- bar
+ba	260,737,19	2	124	bar
 |	"
-rC	334,722,196,0,-42	2	0175	-- braceright
+rC	334,722,196	2	125	braceright
 }	"
-a~	333,722,0,4,4	2	0176	-- tilde
+a~	333,722,0,4,4	2	126	tilde
 ~	"
-bq	222,106,149,0,-53	0	0200	-- quotesinglbase
-Fo	556,446,0,0,-97	0	0201	-- guillemotleft
-Fc	556,446,0,0,-97	0	0202	-- guillemotright
-bu	350,517,0,0,-18	0	0203	-- bullet
-Fn	556,737,207,0,11	3	0204	-- florin
-f/	167,703,19,166,166	2	0205	-- fraction
-%0	1000,703,19,0,-7	2	0206	-- perthousand
-dg	556,718,159,0,-43	2	0207	-- dagger
-dd	556,718,159,0,-43	2	0210	-- daggerdbl
-en	556,313	0	0211	-- endash
-em	1000,313	0	0212	-- emdash
-fi	500,728,0,0,-14	2	0214	-- fi
-fl	500,728,0,0,-14	2	0215	-- fl
-.i	278,523,0,0,-95	0	0220	-- dotlessi
-ga	333,734,0,0,-14	2	0222	-- grave
-a"	333,734,0,76,-31	2	0223	-- hungarumlaut
-a.	333,706,0,0,-121	2	0224	-- dotaccent
-ab	333,731,0,0,-13	2	0225	-- breve
-ah	333,734,0,0,-21	2	0226	-- caron
-ao	333,756,0,0,-75	2	0227	-- ring
-ho	333,0,225,0,-73	1	0230	-- ogonek
-lq	333,725,0,0,-38	2	0231	-- quotedblleft
-rq	333,718,0,0,-26	2	0232	-- quotedblright
-oe	944,538,15,0,-35	0	0233	-- oe
-/l	222,718,0,20,20	2	0234	-- lslash
-Bq	333,106,149,0,-26	0	0235	-- quotedblbase
-OE	1000,737,19,0,-36	2	0236	-- OE
-/L	556,718,0,0,20	2	0237	-- Lslash
-r!	333,523,195,0,-118	0	0241	-- exclamdown
-ct	556,623,115,0,-51	0	0242	-- cent
-Po	556,718,16,0,-33	2	0243	-- sterling
-Cs	556,603,0,0,-28	0	0244	-- currency
-Ye	556,688,0,0,-3	2	0245	-- yen
-bb	260,737,19,0,-94	2	0246	-- brokenbar
-sc	556,737,191,0,-43	2	0247	-- section
-ad	333,706,0,0,-40	2	0250	-- dieresis
-co	737,737,19,15,14	2	0251	-- copyright
-Of	370,737,0,0,-24	2	0252	-- ordfeminine
-fo	333,446,0,0,-88	0	0253	-- guilsinglleft
-no	584,390,0,0,-39	0	0254	-- logicalnot
-\-	584,289,0,0,-39	0	0255	-- minus
-rg	737,737,19,15,14	2	0256	-- registered
-a-	333,684,0,0,-10	2	0257	-- macron
-de	400,703,0,0,-54	2	0260	-- degree
-t+-	584,506,0,0,-39	0	0261	-- plusminus
-S2	333,703,0,0,-4	2	0262	-- twosuperior
-S3	333,703,0,0,-5	2	0263	-- threesuperior
-aa	333,734,0,0,-122	2	0264	-- acute
-mc	556,523,207,0,-68	1	0265	-- mu
-ps	537,718,173,0,-18	2	0266	-- paragraph
-pc	278,315,0,0,-77	0	0267	-- periodcentered
-ac	333,0,225,0,-45	1	0270	-- cedilla
-S1	333,703,0,0,-43	2	0271	-- onesuperior
-Om	365,737,0,0,-25	2	0272	-- ordmasculine
-fc	333,446,0,0,-88	0	0273	-- guilsinglright
-14	834,703,19,0,-73	2	0274	-- onequarter
-12	834,703,19,0,-43	2	0275	-- onehalf
-34	834,703,19,0,-45	2	0276	-- threequarters
-r?	611,525,201,0,-91	0	0277	-- questiondown
-`A	667,929,0,0,-14	2	0300	-- Agrave
-'A	667,929,0,0,-14	2	0301	-- Aacute
-^A	667,929,0,0,-14	2	0302	-- Acircumflex
-~A	667,917,0,0,-14	2	0303	-- Atilde
-:A	667,901,0,0,-14	2	0304	-- Adieresis
-oA	667,931,0,0,-14	2	0305	-- Aring
-AE	1000,718,0,0,-8	2	0306	-- AE
-,C	722,737,225,0,-44	3	0307	-- Ccedilla
-`E	667,929,0,0,-86	2	0310	-- Egrave
-'E	667,929,0,0,-86	2	0311	-- Eacute
-^E	667,929,0,0,-86	2	0312	-- Ecircumflex
-:E	667,901,0,0,-86	2	0313	-- Edieresis
-`I	278,929,0,0,13	2	0314	-- Igrave
-'I	278,929,0,14,-91	2	0315	-- Iacute
-^I	278,929,0,7,6	2	0316	-- Icircumflex
-:I	278,901,0,0,-13	2	0317	-- Idieresis
--D	722,718	2	0320	-- Eth
-~N	722,917,0,0,-76	2	0321	-- Ntilde
-`O	778,929,19,0,-39	2	0322	-- Ograve
-'O	778,929,19,0,-39	2	0323	-- Oacute
-^O	778,929,19,0,-39	2	0324	-- Ocircumflex
-~O	778,917,19,0,-39	2	0325	-- Otilde
-:O	778,901,19,0,-39	2	0326	-- Odieresis
-tmu	584,506,0,0,-39	0	0327	-- multiply
-/O	778,737,19,0,-39	2	0330	-- Oslash
-`U	722,929,19,0,-79	2	0331	-- Ugrave
-'U	722,929,19,0,-79	2	0332	-- Uacute
-^U	722,929,19,0,-79	2	0333	-- Ucircumflex
-:U	722,901,19,0,-79	2	0334	-- Udieresis
-'Y	667,929,0,0,-14	2	0335	-- Yacute
-TP	667,718,0,0,-86	2	0336	-- Thorn
-ss	611,728,15,0,-67	2	0337	-- germandbls
-`a	556,734,15,0,-36	2	0340	-- agrave
-'a	556,734,15,0,-36	2	0341	-- aacute
-^a	556,734,15,0,-36	2	0342	-- acircumflex
-~a	556,722,15,0,-36	2	0343	-- atilde
-:a	556,706,15,0,-36	2	0344	-- adieresis
-oa	556,756,15,0,-36	2	0345	-- aring
-ae	889,538,15,0,-36	0	0346	-- ae
-,c	500,538,225,0,-30	1	0347	-- ccedilla
-`e	556,734,15,0,-40	2	0350	-- egrave
-'e	556,734,15,0,-40	2	0351	-- eacute
-^e	556,734,15,0,-40	2	0352	-- ecircumflex
-:e	556,706,15,0,-40	2	0353	-- edieresis
-`i	278,734,0,0,13	2	0354	-- igrave
-'i	278,734,0,14,-95	2	0355	-- iacute
-^i	278,734,0,7,6	2	0356	-- icircumflex
-:i	278,706,0,0,-13	2	0357	-- idieresis
-Sd	556,737,15,0,-35	2	0360	-- eth
-~n	556,722,0,0,-65	2	0361	-- ntilde
-`o	556,734,14,0,-35	2	0362	-- ograve
-'o	556,734,14,0,-35	2	0363	-- oacute
-^o	556,734,14,0,-35	2	0364	-- ocircumflex
-~o	556,722,14,0,-35	2	0365	-- otilde
-:o	556,706,14,0,-35	2	0366	-- odieresis
-tdi	584,524,19,0,-39	0	0367	-- divide
-/o	611,545,22,0,-28	0	0370	-- oslash
-`u	556,734,15,0,-68	2	0371	-- ugrave
-'u	556,734,15,0,-68	2	0372	-- uacute
-^u	556,734,15,0,-68	2	0373	-- ucircumflex
-:u	556,706,15,0,-68	2	0374	-- udieresis
-'y	500,734,214,0,-11	3	0375	-- yacute
-Tp	556,718,207,0,-58	3	0376	-- thorn
-:y	500,706,214,0,-11	3	0377	-- ydieresis
+bq	222,106,149	0	128	quotesinglbase
+Fo	556,446	0	129	guillemotleft
+Fc	556,446	0	130	guillemotright
+bu	350,517	0	131	bullet
+Fn	556,737,207,0,11	3	132	florin
+f/	167,703,19,166,166	2	133	fraction
+%0	1000,703,19	2	134	perthousand
+dg	556,718,159	2	135	dagger
+dd	556,718,159	2	136	daggerdbl
+en	556,313	0	137	endash
+em	1000,313	0	138	emdash
+fi	500,728	2	140	fi
+fl	500,728	2	141	fl
+.i	278,523	0	144	dotlessi
+ga	333,734	2	146	grave
+a"	333,734,0,76	2	147	hungarumlaut
+a.	333,706	2	148	dotaccent
+ab	333,731	2	149	breve
+ah	333,734	2	150	caron
+ao	333,756	2	151	ring
+ho	333,0,225	1	152	ogonek
+lq	333,725	2	153	quotedblleft
+rq	333,718	2	154	quotedblright
+oe	944,538,15	0	155	oe
+/l	222,718,0,20,20	2	156	lslash
+Bq	333,106,149	0	157	quotedblbase
+OE	1000,737,19	2	158	OE
+/L	556,718,0,0,20	2	159	Lslash
+r!	333,523,195	0	161	exclamdown
+ct	556,623,115	0	162	cent
+Po	556,718,16	2	163	sterling
+Cs	556,603	0	164	currency
+Ye	556,688	2	165	yen
+bb	260,737,19	2	166	brokenbar
+sc	556,737,191	2	167	section
+ad	333,706	2	168	dieresis
+co	737,737,19,15,14	2	169	copyright
+Of	370,737	2	170	ordfeminine
+fo	333,446	0	171	guilsinglleft
+tno	584,390	0	172	logicalnot
+\-	584,289	0	173	minus
+rg	737,737,19,15,14	2	174	registered
+a-	333,684	2	175	macron
+de	400,703	2	176	degree
+t+-	584,506	0	177	plusminus
+S2	333,703	2	178	twosuperior
+S3	333,703	2	179	threesuperior
+aa	333,734	2	180	acute
+mc	556,523,207	1	181	mu
+ps	537,718,173	2	182	paragraph
+pc	278,315	0	183	periodcentered
+ac	333,0,225	1	184	cedilla
+S1	333,703	2	185	onesuperior
+Om	365,737	2	186	ordmasculine
+fc	333,446	0	187	guilsinglright
+14	834,703,19	2	188	onequarter
+12	834,703,19	2	189	onehalf
+34	834,703,19	2	190	threequarters
+r?	611,525,201	0	191	questiondown
+`A	667,929	2	192	Agrave
+'A	667,929	2	193	Aacute
+^A	667,929	2	194	Acircumflex
+~A	667,917	2	195	Atilde
+:A	667,901	2	196	Adieresis
+oA	667,931	2	197	Aring
+AE	1000,718	2	198	AE
+,C	722,737,225	3	199	Ccedilla
+`E	667,929	2	200	Egrave
+'E	667,929	2	201	Eacute
+^E	667,929	2	202	Ecircumflex
+:E	667,901	2	203	Edieresis
+`I	278,929,0,0,13	2	204	Igrave
+'I	278,929,0,14	2	205	Iacute
+^I	278,929,0,7,6	2	206	Icircumflex
+:I	278,901	2	207	Idieresis
+-D	722,718	2	208	Eth
+~N	722,917	2	209	Ntilde
+`O	778,929,19	2	210	Ograve
+'O	778,929,19	2	211	Oacute
+^O	778,929,19	2	212	Ocircumflex
+~O	778,917,19	2	213	Otilde
+:O	778,901,19	2	214	Odieresis
+tmu	584,506	0	215	multiply
+/O	778,737,19	2	216	Oslash
+`U	722,929,19	2	217	Ugrave
+'U	722,929,19	2	218	Uacute
+^U	722,929,19	2	219	Ucircumflex
+:U	722,901,19	2	220	Udieresis
+'Y	667,929	2	221	Yacute
+TP	667,718	2	222	Thorn
+ss	611,728,15	2	223	germandbls
+`a	556,734,15	2	224	agrave
+'a	556,734,15	2	225	aacute
+^a	556,734,15	2	226	acircumflex
+~a	556,722,15	2	227	atilde
+:a	556,706,15	2	228	adieresis
+oa	556,756,15	2	229	aring
+ae	889,538,15	0	230	ae
+,c	500,538,225	1	231	ccedilla
+`e	556,734,15	2	232	egrave
+'e	556,734,15	2	233	eacute
+^e	556,734,15	2	234	ecircumflex
+:e	556,706,15	2	235	edieresis
+`i	278,734,0,0,13	2	236	igrave
+'i	278,734,0,14	2	237	iacute
+^i	278,734,0,7,6	2	238	icircumflex
+:i	278,706	2	239	idieresis
+Sd	556,737,15	2	240	eth
+~n	556,722	2	241	ntilde
+`o	556,734,14	2	242	ograve
+'o	556,734,14	2	243	oacute
+^o	556,734,14	2	244	ocircumflex
+~o	556,722,14	2	245	otilde
+:o	556,706,14	2	246	odieresis
+tdi	584,524,19	0	247	divide
+/o	611,545,22	0	248	oslash
+`u	556,734,15	2	249	ugrave
+'u	556,734,15	2	250	uacute
+^u	556,734,15	2	251	ucircumflex
+:u	556,706,15	2	252	udieresis
+'y	500,734,214	3	253	yacute
+Tp	556,718,207	3	254	thorn
+:y	500,706,214	3	255	ydieresis
+u2026	1000,106	0	256	ellipsis
diff --git a/contrib/groff/font/devps/Makefile.sub b/contrib/groff/font/devps/Makefile.sub
index 434a0ac..337ae12 100644
--- a/contrib/groff/font/devps/Makefile.sub
+++ b/contrib/groff/font/devps/Makefile.sub
@@ -2,12 +2,15 @@ DEV=ps
 DISTFILES=text.enc download \
   S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
   CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
-  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
+  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI \
+  EURO freeeuro.pfa
 PSFILES=prologue symbolsl.pfa zapfdr.pfa
-DEVGENFILES=generate/Makefile generate/afmname generate/dingbats.map \
-  generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+DEVGENFILES=generate/Makefile generate/dingbats.map \
+  generate/dingbats.rmap generate/lgreekmap \
   generate/symbolchars generate/symbolsl.afm generate/textmap
+DEVGENSCRIPTS=generate/afmname generate/symbol.sed
 DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
+DEVSCRIPTS=$(DEVGENSCRIPTS)
 
 CLEANADD=DESC $(PSFILES)
 
diff --git a/contrib/groff/font/devps/NB b/contrib/groff/font/devps/NB
index 10313f0..66c2793 100644
--- a/contrib/groff/font/devps/NB
+++ b/contrib/groff/font/devps/NB
@@ -133,246 +133,247 @@ w , -100
 y . -100
 y , -100
 charset
-ha	606,690,0,0,-66	2	0000	-- asciicircum
-ti	606,346,0,0,-72	0	0001	-- asciitilde
-vS	667,952,15,0,-51	2	0002	-- Scaron
-vZ	667,952,0,0,-28	2	0003	-- Zcaron
-vs	500,725,15,0,-48	2	0004	-- scaron
-vz	537,725,0,0,-38	2	0005	-- zcaron
-:Y	722,921,0,12,12	2	0006	-- Ydieresis
-tm	1000,722,0,0,-6	2	0007	-- trademark
-aq	241,737,0,0,-53	2	0010	-- quotesingle
-space	287	0	0040
-!	296,737,15,0,-53	2	0041	-- exclam
-"	333,737	2	0042	-- quotedbl
+ha	606,690	2	0	asciicircum
+ti	606,346	0	1	asciitilde
+vS	667,952,15	2	2	Scaron
+vZ	667,952	2	3	Zcaron
+vs	500,725,15	2	4	scaron
+vz	537,725	2	5	zcaron
+:Y	722,921,0,12,12	2	6	Ydieresis
+tm	1000,722	2	7	trademark
+aq	241,737	2	8	quotesingle
+space	287	0	32	space
+!	296,737,15	2	33	exclam
+"	333,737	2	34	quotedbl
 dq	"
-#	574,690,0,0,-36	2	0043	-- numbersign
+#	574,690	2	35	numbersign
 sh	"
-$	574,810,141,0,-25	2	0044	-- dollar
+$	574,810,141	2	36	dollar
 Do	"
-%	833,705,15,0,-14	2	0045	-- percent
-&	852,737,15,0,-34	2	0046	-- ampersand
-'	241,737,0,0,-22	2	0047	-- quoteright
+%	833,705,15	2	37	percent
+&	852,737,15	2	38	ampersand
+'	241,737	2	39	quoteright
 cq	"
-(	389,745,117,0,-77	2	0050	-- parenleft
-)	389,745,117,0,-44	2	0051	-- parenright
-*	500,737,0,0,-54	2	0052	-- asterisk
-+	606,506,0,0,-50	0	0053	-- plus
-,	278,175,184,0,-40	0	0054	-- comma
--	333,302,0,0,-42	0	0055	-- hyphen
+(	389,745,117	2	40	parenleft
+)	389,745,117	2	41	parenright
+*	500,737	2	42	asterisk
++	606,506	0	43	plus
+,	278,175,184	0	44	comma
+-	333,302	0	45	hyphen
 hy	"
-.	278,175,15,0,-44	0	0056	-- period
-/	278,737,15,42,42	2	0057	-- slash
+.	278,175,15	0	46	period
+/	278,737,15,42,42	2	47	slash
 sl	"
-0	574,705,15,0,-27	2	0060	-- zero
-1	574,705,0,0,-83	2	0061	-- one
-2	574,705,0,0,-19	2	0062	-- two
-3	574,705,15,0,-23	2	0063	-- three
-4	574,705,0,0,-19	2	0064	-- four
-5	574,705,15,0,-32	2	0065	-- five
-6	574,705,15,0,-27	2	0066	-- six
-7	574,705,15,0,-45	2	0067	-- seven
-8	574,705,15,0,-27	2	0070	-- eight
-9	574,705,15,0,-27	2	0071	-- nine
-:	278,485,15,0,-44	0	0072	-- colon
-;	278,485,184,0,-40	0	0073	-- semicolon
-<	606,515,9,0,-50	0	0074	-- less
-=	606,403,0,0,-50	0	0075	-- equal
->	606,515,9,0,-50	0	0076	-- greater
-?	500,737,15,0,-23	2	0077	-- question
-@	747,737,15,3,2	2	0100	-- at
+0	574,705,15	2	48	zero
+1	574,705	2	49	one
+2	574,705	2	50	two
+3	574,705,15	2	51	three
+4	574,705	2	52	four
+5	574,705,15	2	53	five
+6	574,705,15	2	54	six
+7	574,705,15	2	55	seven
+8	574,705,15	2	56	eight
+9	574,705,15	2	57	nine
+:	278,485,15	0	58	colon
+;	278,485,184	0	59	semicolon
+<	606,515,9	0	60	less
+=	606,403	0	61	equal
+>	606,515,9	0	62	greater
+?	500,737,15	2	63	question
+@	747,737,15,3,2	2	64	at
 at	"
-A	759,737,0,19,19	2	0101	-- A
-B	778,722,0,0,-19	2	0102	-- B
-C	778,737,15,0,-39	2	0103	-- C
-D	833,722,0,0,-19	2	0104	-- D
-E	759,722,0,0,-19	2	0105	-- E
-F	722,722,0,0,-19	2	0106	-- F
-G	833,737,15,0,-39	2	0107	-- G
-H	870,722,0,0,-19	2	0110	-- H
-I	444,722,0,0,-29	2	0111	-- I
-J	648,722,15,0,-6	2	0112	-- J
-K	815,722,0,7,-19	2	0113	-- K
-L	722,722,0,0,-19	2	0114	-- L
-M	981,722,0,0,-10	2	0115	-- M
-N	833,722,10,0,-5	2	0116	-- N
-O	833,737,15,0,-39	2	0117	-- O
-P	759,722,0,0,-24	2	0120	-- P
-Q	833,737,189,0,-39	2	0121	-- Q
-R	815,722,15,0,-19	2	0122	-- R
-S	667,737,15,0,-51	2	0123	-- S
-T	722,722,0,0,-16	2	0124	-- T
-U	833,722,15,0,-14	2	0125	-- U
-V	759,722,10,19,19	2	0126	-- V
-W	981,722,10,0,-7	2	0127	-- W
-X	722,722,0,12,12	2	0130	-- X
-Y	722,722,0,12,12	2	0131	-- Y
-Z	667,722,0,0,-28	2	0132	-- Z
-[	389,737,109,0,-84	2	0133	-- bracketleft
+A	759,737,0,19,19	2	65	A
+B	778,722	2	66	B
+C	778,737,15	2	67	C
+D	833,722	2	68	D
+E	759,722	2	69	E
+F	722,722	2	70	F
+G	833,737,15	2	71	G
+H	870,722	2	72	H
+I	444,722	2	73	I
+J	648,722,15	2	74	J
+K	815,722,0,7	2	75	K
+L	722,722	2	76	L
+M	981,722	2	77	M
+N	833,722,10	2	78	N
+O	833,737,15	2	79	O
+P	759,722	2	80	P
+Q	833,737,189	2	81	Q
+R	815,722,15	2	82	R
+S	667,737,15	2	83	S
+T	722,722	2	84	T
+U	833,722,15	2	85	U
+V	759,722,10,19,19	2	86	V
+W	981,722,10	2	87	W
+X	722,722,0,12,12	2	88	X
+Y	722,722,0,12,12	2	89	Y
+Z	667,722	2	90	Z
+[	389,737,109	2	91	bracketleft
 lB	"
-\	606,737,15,0,-122	2	0134	-- backslash
+\	606,737,15	2	92	backslash
 rs	"
-]	389,737,109,0,-50	2	0135	-- bracketright
+]	389,737,109	2	93	bracketright
 rB	"
-a^	333,725,0,11,10	2	0136	-- circumflex
+a^	333,725,0,11,10	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	241,737,0,0,-22	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	241,737	2	96	quoteleft
 oq	"
-a	611,485,15,0,-40	0	0141	-- a
-b	648,737,15,0,-4	2	0142	-- b
-c	556,485,15,0,-32	0	0143	-- c
-d	667,737,15,0,-32	2	0144	-- d
-e	574,485,15,0,-32	0	0145	-- e
-f	389,737,0,72,-11	2	0146	-- f
-g	611,535,205,12,-30	1	0147	-- g
-h	685,737,0,0,-17	2	0150	-- h
-i	370,737,0,0,-26	2	0151	-- i
-j	352,737,205,0,86	3	0152	-- j
-k	667,737,0,0,-17	2	0153	-- k
-l	352,737,0,0,-17	2	0154	-- l
-m	963,485,0,0,-17	0	0155	-- m
-n	685,485,0,0,-17	0	0156	-- n
-o	611,485,15,0,-32	0	0157	-- o
-p	667,485,205,0,-17	1	0160	-- p
-q	648,485,205,0,-32	1	0161	-- q
-r	519,485,0,0,-17	0	0162	-- r
-s	500,485,15,0,-48	0	0163	-- s
-t	426,675,15,0,-21	2	0164	-- t
-u	685,475,15,0,-17	0	0165	-- u
-v	611,475,10,0,-12	0	0166	-- v
-w	889,475,10,0,-16	0	0167	-- w
-x	611,475,0,0,-12	0	0170	-- x
-y	611,475,205,0,-12	1	0171	-- y
-z	537,475,0,0,-38	0	0172	-- z
-lC	389,737,109,0,-36	2	0173	-- braceleft
+a	611,485,15	0	97	a
+b	648,737,15	2	98	b
+c	556,485,15	0	99	c
+d	667,737,15	2	100	d
+e	574,485,15	0	101	e
+f	389,737,0,72	2	102	f
+g	611,535,205,12	1	103	g
+h	685,737	2	104	h
+i	370,737	2	105	i
+j	352,737,205,0,86	3	106	j
+k	667,737	2	107	k
+l	352,737	2	108	l
+m	963,485	0	109	m
+n	685,485	0	110	n
+o	611,485,15	0	111	o
+p	667,485,205	1	112	p
+q	648,485,205	1	113	q
+r	519,485	0	114	r
+s	500,485,15	0	115	s
+t	426,675,15	2	116	t
+u	685,475,15	0	117	u
+v	611,475,10	0	118	v
+w	889,475,10	0	119	w
+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,0,-249	3	0174	-- bar
+ba	606,750,250	3	124	bar
 |	"
-rC	389,737,109,0,-76	2	0175	-- braceright
+rC	389,737,109	2	125	braceright
 }	"
-a~	333,705,0,24,24	2	0176	-- tilde
+a~	333,705,0,24,24	2	126	tilde
 ~	"
-bq	241,175,184,0,-22	0	0200	-- quotesinglbase
-Fo	500,397,0,0,-46	0	0201	-- guillemotleft
-Fc	500,397,0,0,-46	0	0202	-- guillemotright
-bu	606,542,0,0,-122	0	0203	-- bullet
-Fn	574,737,205,0,-14	3	0204	-- florin
-f/	167,705,15,165,165	2	0205	-- fraction
-%0	1000,705,15,0,-7	2	0206	-- perthousand
-dg	500,737,101,0,-39	2	0207	-- dagger
-dd	500,737,89,0,-39	2	0210	-- daggerdbl
-en	500,292	0	0211	-- endash
-em	1000,292	0	0212	-- emdash
-fi	685,737,0,0,-11	2	0214	-- fi
-fl	685,737,0,0,-11	2	0215	-- fl
-.i	370,475,0,0,-26	0	0220	-- dotlessi
-ga	333,737,0,0,-2	2	0222	-- grave
-a"	333,737,0,98,16	2	0223	-- hungarumlaut
-a.	333,694,0,0,-95	2	0224	-- dotaccent
-ab	333,714,0,0,-9	2	0225	-- breve
-ah	333,725,0,11,10	2	0226	-- caron
-ao	333,761,0,0,-58	2	0227	-- ring
-ho	333,3,163,13,-168	0	0230	-- ogonek
-lq	481,737,0,0,-22	2	0231	-- quotedblleft
-rq	481,737,0,0,-22	2	0232	-- quotedblright
-oe	907,485,15,0,-32	0	0233	-- oe
-/l	352,737,0,0,-17	2	0234	-- lslash
-Bq	481,175,184,0,-22	0	0235	-- quotedblbase
-OE	1000,722	2	0236	-- OE
-/L	722,722,0,0,-19	2	0237	-- Lslash
-r!	296,547,205,0,-53	1	0241	-- exclamdown
-ct	574,572,102,0,-32	0	0242	-- cent
-Po	574,705,15,0,-16	2	0243	-- sterling
-Cs	574,605,0,0,-27	0	0244	-- currency
-Ye	574,690,0,10,10	2	0245	-- yen
-bb	606,675,175,0,-249	2	0246	-- brokenbar
-sc	500,737,86,0,-62	2	0247	-- section
-ad	333,694,0,12,12	2	0250	-- dieresis
-co	747,737,15,3,2	2	0251	-- copyright
-Of	367,705,0,26,-1	2	0252	-- ordfeminine
-fo	333,397,0,0,-62	0	0253	-- guilsinglleft
-no	606,403,0,0,-50	0	0254	-- logicalnot
-\-	606,307,0,0,-50	0	0255	-- minus
-rg	747,737,15,3,2	2	0256	-- registered
-a-	333,664,0,6,6	0	0257	-- macron
-de	400,705,0,0,-57	2	0260	-- degree
-t+-	606,506,0,0,-50	0	0261	-- plusminus
-S2	344,705,0,6,3	2	0262	-- twosuperior
-S3	344,705,0,11,3	2	0263	-- threesuperior
-aa	333,737,0,0,-84	2	0264	-- acute
-mc	685,475,205,0,-17	1	0265	-- mu
-ps	747,722,71,0,-96	2	0266	-- paragraph
-pc	278,372,0,0,-53	0	0267	-- periodcentered
-ac	333,0,224,0,-17	1	0270	-- cedilla
-S1	344,705,0,0,-31	2	0271	-- onesuperior
-Om	367,705,0,0,-1	2	0272	-- ordmasculine
-fc	333,397,0,0,-62	0	0273	-- guilsinglright
-14	861,705,15,0,-31	2	0274	-- onequarter
-12	861,705,15,0,-31	2	0275	-- onehalf
-34	861,705,15,0,-15	2	0276	-- threequarters
-r?	500,547,205,0,-23	1	0277	-- questiondown
-`A	759,964,0,19,19	2	0300	-- Agrave
-'A	759,964,0,19,19	2	0301	-- Aacute
-^A	759,952,0,19,19	2	0302	-- Acircumflex
-~A	759,932,0,19,19	2	0303	-- Atilde
-:A	759,921,0,19,19	2	0304	-- Adieresis
-oA	759,988,0,19,19	2	0305	-- Aring
-AE	981,722,0,0,29	2	0306	-- AE
-,C	778,737,224,0,-39	3	0307	-- Ccedilla
-`E	759,964,0,0,-19	2	0310	-- Egrave
-'E	759,964,0,0,-19	2	0311	-- Eacute
-^E	759,952,0,0,-19	2	0312	-- Ecircumflex
-:E	759,921,0,0,-19	2	0313	-- Edieresis
-`I	444,964,0,0,-29	2	0314	-- Igrave
-'I	444,964,0,0,-29	2	0315	-- Iacute
-^I	444,952,0,0,-29	2	0316	-- Icircumflex
-:I	444,921,0,0,-29	2	0317	-- Idieresis
--D	833,722,0,0,-19	2	0320	-- Eth
-~N	833,932,10,0,-5	2	0321	-- Ntilde
-`O	833,964,15,0,-39	2	0322	-- Ograve
-'O	833,964,15,0,-39	2	0323	-- Oacute
-^O	833,952,15,0,-39	2	0324	-- Ocircumflex
-~O	833,932,15,0,-39	2	0325	-- Otilde
-:O	833,921,15,0,-39	2	0326	-- Odieresis
-tmu	606,491,0,0,-65	0	0327	-- multiply
-/O	833,775,53,0,-39	2	0330	-- Oslash
-`U	833,964,15,0,-14	2	0331	-- Ugrave
-'U	833,964,15,0,-14	2	0332	-- Uacute
-^U	833,952,15,0,-14	2	0333	-- Ucircumflex
-:U	833,921,15,0,-14	2	0334	-- Udieresis
-'Y	722,964,0,12,12	2	0335	-- Yacute
-TP	759,722,0,0,-24	2	0336	-- Thorn
-ss	611,737,15,0,2	2	0337	-- germandbls
-`a	611,737,15,0,-40	2	0340	-- agrave
-'a	611,737,15,0,-40	2	0341	-- aacute
-^a	611,725,15,0,-40	2	0342	-- acircumflex
-~a	611,705,15,0,-40	2	0343	-- atilde
-:a	611,694,15,0,-40	2	0344	-- adieresis
-oa	611,761,15,0,-40	2	0345	-- aring
-ae	870,485,15,0,-32	0	0346	-- ae
-,c	556,485,224,0,-32	1	0347	-- ccedilla
-`e	574,737,15,0,-32	2	0350	-- egrave
-'e	574,737,15,0,-32	2	0351	-- eacute
-^e	574,725,15,0,-32	2	0352	-- ecircumflex
-:e	574,694,15,0,-32	2	0353	-- edieresis
-`i	370,737,0,0,-21	2	0354	-- igrave
-'i	370,737,0,0,-26	2	0355	-- iacute
-^i	370,725,0,0,-9	2	0356	-- icircumflex
-:i	370,694,0,0,-7	2	0357	-- idieresis
-Sd	611,737,15,0,-32	2	0360	-- eth
-~n	685,705,0,0,-17	2	0361	-- ntilde
-`o	611,737,15,0,-32	2	0362	-- ograve
-'o	611,737,15,0,-32	2	0363	-- oacute
-^o	611,725,15,0,-32	2	0364	-- ocircumflex
-~o	611,705,15,0,-32	2	0365	-- otilde
-:o	611,694,15,0,-32	2	0366	-- odieresis
-tdi	606,546,40,0,-50	0	0367	-- divide
-/o	611,573,103,0,-32	0	0370	-- oslash
-`u	685,737,15,0,-17	2	0371	-- ugrave
-'u	685,737,15,0,-17	2	0372	-- uacute
-^u	685,725,15,0,-17	2	0373	-- ucircumflex
-:u	685,694,15,0,-17	2	0374	-- udieresis
-'y	611,737,205,0,-12	3	0375	-- yacute
-Tp	667,737,205,0,-17	3	0376	-- thorn
-:y	611,694,205,0,-12	3	0377	-- ydieresis
+bq	241,175,184	0	128	quotesinglbase
+Fo	500,397	0	129	guillemotleft
+Fc	500,397	0	130	guillemotright
+bu	606,542	0	131	bullet
+Fn	574,737,205	3	132	florin
+f/	167,705,15,165,165	2	133	fraction
+%0	1000,705,15	2	134	perthousand
+dg	500,737,101	2	135	dagger
+dd	500,737,89	2	136	daggerdbl
+en	500,292	0	137	endash
+em	1000,292	0	138	emdash
+fi	685,737	2	140	fi
+fl	685,737	2	141	fl
+.i	370,475	0	144	dotlessi
+ga	333,737	2	146	grave
+a"	333,737,0,98,16	2	147	hungarumlaut
+a.	333,694	2	148	dotaccent
+ab	333,714	2	149	breve
+ah	333,725,0,11,10	2	150	caron
+ao	333,761	2	151	ring
+ho	333,3,163,13	0	152	ogonek
+lq	481,737	2	153	quotedblleft
+rq	481,737	2	154	quotedblright
+oe	907,485,15	0	155	oe
+/l	352,737	2	156	lslash
+Bq	481,175,184	0	157	quotedblbase
+OE	1000,722	2	158	OE
+/L	722,722	2	159	Lslash
+r!	296,547,205	1	161	exclamdown
+ct	574,572,102	0	162	cent
+Po	574,705,15	2	163	sterling
+Cs	574,605	0	164	currency
+Ye	574,690,0,10,10	2	165	yen
+bb	606,675,175	2	166	brokenbar
+sc	500,737,86	2	167	section
+ad	333,694,0,12,12	2	168	dieresis
+co	747,737,15,3,2	2	169	copyright
+Of	367,705,0,26	2	170	ordfeminine
+fo	333,397	0	171	guilsinglleft
+tno	606,403	0	172	logicalnot
+\-	606,307	0	173	minus
+rg	747,737,15,3,2	2	174	registered
+a-	333,664,0,6,6	0	175	macron
+de	400,705	2	176	degree
+t+-	606,506	0	177	plusminus
+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
+ps	747,722,71	2	182	paragraph
+pc	278,372	0	183	periodcentered
+ac	333,0,224	1	184	cedilla
+S1	344,705	2	185	onesuperior
+Om	367,705	2	186	ordmasculine
+fc	333,397	0	187	guilsinglright
+14	861,705,15	2	188	onequarter
+12	861,705,15	2	189	onehalf
+34	861,705,15	2	190	threequarters
+r?	500,547,205	1	191	questiondown
+`A	759,964,0,19,19	2	192	Agrave
+'A	759,964,0,19,19	2	193	Aacute
+^A	759,952,0,19,19	2	194	Acircumflex
+~A	759,932,0,19,19	2	195	Atilde
+:A	759,921,0,19,19	2	196	Adieresis
+oA	759,988,0,19,19	2	197	Aring
+AE	981,722,0,0,29	2	198	AE
+,C	778,737,224	3	199	Ccedilla
+`E	759,964	2	200	Egrave
+'E	759,964	2	201	Eacute
+^E	759,952	2	202	Ecircumflex
+:E	759,921	2	203	Edieresis
+`I	444,964	2	204	Igrave
+'I	444,964	2	205	Iacute
+^I	444,952	2	206	Icircumflex
+:I	444,921	2	207	Idieresis
+-D	833,722	2	208	Eth
+~N	833,932,10	2	209	Ntilde
+`O	833,964,15	2	210	Ograve
+'O	833,964,15	2	211	Oacute
+^O	833,952,15	2	212	Ocircumflex
+~O	833,932,15	2	213	Otilde
+:O	833,921,15	2	214	Odieresis
+tmu	606,491	0	215	multiply
+/O	833,775,53	2	216	Oslash
+`U	833,964,15	2	217	Ugrave
+'U	833,964,15	2	218	Uacute
+^U	833,952,15	2	219	Ucircumflex
+:U	833,921,15	2	220	Udieresis
+'Y	722,964,0,12,12	2	221	Yacute
+TP	759,722	2	222	Thorn
+ss	611,737,15,0,2	2	223	germandbls
+`a	611,737,15	2	224	agrave
+'a	611,737,15	2	225	aacute
+^a	611,725,15	2	226	acircumflex
+~a	611,705,15	2	227	atilde
+:a	611,694,15	2	228	adieresis
+oa	611,761,15	2	229	aring
+ae	870,485,15	0	230	ae
+,c	556,485,224	1	231	ccedilla
+`e	574,737,15	2	232	egrave
+'e	574,737,15	2	233	eacute
+^e	574,725,15	2	234	ecircumflex
+:e	574,694,15	2	235	edieresis
+`i	370,737	2	236	igrave
+'i	370,737	2	237	iacute
+^i	370,725	2	238	icircumflex
+:i	370,694	2	239	idieresis
+Sd	611,737,15	2	240	eth
+~n	685,705	2	241	ntilde
+`o	611,737,15	2	242	ograve
+'o	611,737,15	2	243	oacute
+^o	611,725,15	2	244	ocircumflex
+~o	611,705,15	2	245	otilde
+:o	611,694,15	2	246	odieresis
+tdi	606,546,40	0	247	divide
+/o	611,573,103	0	248	oslash
+`u	685,737,15	2	249	ugrave
+'u	685,737,15	2	250	uacute
+^u	685,725,15	2	251	ucircumflex
+:u	685,694,15	2	252	udieresis
+'y	611,737,205	3	253	yacute
+Tp	667,737,205	3	254	thorn
+:y	611,694,205	3	255	ydieresis
+u2026	1000,175,15	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NBI b/contrib/groff/font/devps/NBI
index d6ecc03..e633e6e 100644
--- a/contrib/groff/font/devps/NBI
+++ b/contrib/groff/font/devps/NBI
@@ -253,246 +253,247 @@ y , -25
 y a 8
 z e 4
 charset
-ha	606,690,0,0,-16	2	0000	-- asciicircum
-ti	606,346,0,0,-22	0	0001	-- asciitilde
-vS	685,930,15,31,49,31	2	0002	-- Scaron
-vZ	704,930,0,57,83,57	2	0003	-- Zcaron
-vs	481,705,15,46,50,46	2	0004	-- scaron
-vz	519,695,15,4,69,4	2	0005	-- zcaron
-:Y	704,915,0,121,37,109	2	0006	-- Ydieresis
-tm	950,722,0,117,8,109	2	0007	-- trademark
-aq	287,737,0,13,-62,13	2	0010	-- quotesingle
-space	287	0	0040
-!	333,737,15,50,50,50	2	0041	-- exclam
-"	400,737,0,78,-16,78	2	0042	-- quotedbl
+ha	606,690,0,0,-16	2	0	asciicircum
+ti	606,346,0,0,-22	0	1	asciitilde
+vS	685,930,15,31,49,31	2	2	Scaron
+vZ	704,930,0,57,83,57	2	3	Zcaron
+vs	481,705,15,46,50,46	2	4	scaron
+vz	519,695,15,4,69,4	2	5	zcaron
+:Y	704,915,0,121,37,109	2	6	Ydieresis
+tm	950,722,0,117,8,109	2	7	trademark
+aq	287,737,0,13,-62,13	2	8	quotesingle
+space	287	0	32	space
+!	333,737,15,50,50,50	2	33	exclam
+"	400,737,0,78,-16,78	2	34	quotedbl
 dq	"
-#	574,690,0,20,20,20	2	0043	-- numbersign
+#	574,690,0,20,20,20	2	35	numbersign
 sh	"
-$	574,810,120,41,41,41	2	0044	-- dollar
+$	574,810,120,41,41,41	2	36	dollar
 Do	"
-%	889,727,28,0,-4	2	0045	-- percent
-&	889,737,15,0,18	2	0046	-- ampersand
-'	259,737,0,66,2,66	2	0047	-- quoteright
+%	889,727,28,0,-4	2	37	percent
+&	889,737,15,0,18	2	38	ampersand
+'	259,737,0,66,2,66	2	39	quoteright
 cq	"
-(	407,745,117,97,-22,97	2	0050	-- parenleft
-)	407,745,117,0,120	2	0051	-- parenright
-*	500,737,0,48,-8,48	2	0052	-- asterisk
-+	606,506	0	0053	-- plus
-,	287,157,192,0,107	0	0054	-- comma
--	333,299,0,0,48	0	0055	-- hyphen
+(	407,745,117,97,-22,97	2	40	parenleft
+)	407,745,117,0,120	2	41	parenright
+*	500,737,0,48,-8,48	2	42	asterisk
++	606,506	0	43	plus
+,	287,157,192,0,107	0	44	comma
+-	333,299,0,0,48	0	45	hyphen
 hy	"
-.	287,157,15,0,70	0	0056	-- period
-/	278,737,15,92,91,92	2	0057	-- slash
+.	287,157,15,0,70	0	46	period
+/	278,737,15,92,91,92	2	47	slash
 sl	"
-0	574,705,15,29,29,29	2	0060	-- zero
-1	574,705,0,0,25	2	0061	-- one
-2	574,705,3,14,88,14	2	0062	-- two
-3	574,705,15,12,57,12	2	0063	-- three
-4	574,705,0,20,63,20	2	0064	-- four
-5	574,705,15,50,50,50	2	0065	-- five
-6	574,705,15,50,19,50	2	0066	-- six
-7	574,705,15,69,-14,69	2	0067	-- seven
-8	574,705,15,28,50,28	2	0070	-- eight
-9	574,705,15,19,50,19	2	0071	-- nine
-:	287,477,15,0,70	0	0072	-- colon
-;	287,477,192,0,107	0	0073	-- semicolon
-<	606,515,9	0	0074	-- less
-=	606,403	0	0075	-- equal
->	606,514,8	0	0076	-- greater
-?	481,737,15,20,-29,20	2	0077	-- question
-@	747,737,15,54,54,54	2	0100	-- at
+0	574,705,15,29,29,29	2	48	zero
+1	574,705,0,0,25	2	49	one
+2	574,705,3,14,88,14	2	50	two
+3	574,705,15,12,57,12	2	51	three
+4	574,705,0,20,63,20	2	52	four
+5	574,705,15,50,50,50	2	53	five
+6	574,705,15,50,19,50	2	54	six
+7	574,705,15,69,-14,69	2	55	seven
+8	574,705,15,28,50,28	2	56	eight
+9	574,705,15,19,50,19	2	57	nine
+:	287,477,15,0,70	0	58	colon
+;	287,477,192,0,107	0	59	semicolon
+<	606,515,9	0	60	less
+=	606,403	0	61	equal
+>	606,514,8	0	62	greater
+?	481,737,15,20,-29,20	2	63	question
+@	747,737,15,54,54,54	2	64	at
 at	"
-A	741,737,0,25,125,25	2	0101	-- A
-B	759,722,0,12,100,12	2	0102	-- B
-C	759,737,15,50,13,50	2	0103	-- C
-D	833,722,0,13,97,13	2	0104	-- D
-E	741,722,0,39,91,39	2	0105	-- E
-F	704,722,0,76,91,76	2	0106	-- F
-G	815,737,15,40,13,40	2	0107	-- G
-H	870,722,0,91,91,91	2	0110	-- H
-I	444,722,0,91,91,91	2	0111	-- I
-J	667,722,15,91,70,91	2	0112	-- J
-K	778,722,0,104,91,104	2	0113	-- K
-L	704,722,0,16,91,16	2	0114	-- L
-M	944,722,0,94,94,94	2	0115	-- M
-N	852,722,10,111,111,109	2	0116	-- N
-O	833,737,15,13,13,13	2	0117	-- O
-P	741,722,0,39,91,39	2	0120	-- P
-Q	833,737,189,13,13,13	2	0121	-- Q
-R	796,722,15,3,91,3	2	0122	-- R
-S	685,737,15,31,49,31	2	0123	-- S
-T	722,722,0,87,9,87	2	0124	-- T
-U	833,722,15,117,-38,109	2	0125	-- U
-V	741,722,10,111,18,109	2	0126	-- V
-W	944,722,10,106,10,106	2	0127	-- W
-X	741,722,0,110,132,109	2	0130	-- X
-Y	704,722,0,121,37,109	2	0131	-- Y
-Z	704,722,0,57,83,57	2	0132	-- Z
-[	407,737,109,107,49,107	2	0133	-- bracketleft
+A	741,737,0,25,125,25	2	65	A
+B	759,722,0,12,100,12	2	66	B
+C	759,737,15,50,13,50	2	67	C
+D	833,722,0,13,97,13	2	68	D
+E	741,722,0,39,91,39	2	69	E
+F	704,722,0,76,91,76	2	70	F
+G	815,737,15,40,13,40	2	71	G
+H	870,722,0,91,91,91	2	72	H
+I	444,722,0,91,91,91	2	73	I
+J	667,722,15,91,70,91	2	74	J
+K	778,722,0,104,91,104	2	75	K
+L	704,722,0,16,91,16	2	76	L
+M	944,722,0,94,94,94	2	77	M
+N	852,722,10,111,111,109	2	78	N
+O	833,737,15,13,13,13	2	79	O
+P	741,722,0,39,91,39	2	80	P
+Q	833,737,189,13,13,13	2	81	Q
+R	796,722,15,3,91,3	2	82	R
+S	685,737,15,31,49,31	2	83	S
+T	722,722,0,87,9,87	2	84	T
+U	833,722,15,117,-38,109	2	85	U
+V	741,722,10,111,18,109	2	86	V
+W	944,722,10,106,10,106	2	87	W
+X	741,722,0,110,132,109	2	88	X
+Y	704,722,0,121,37,109	2	89	Y
+Z	704,722,0,57,83,57	2	90	Z
+[	407,737,109,107,49,107	2	91	bracketleft
 lB	"
-\	606,737,15,0,-111	2	0134	-- backslash
+\	606,737,15,0,-111	2	92	backslash
 rs	"
-]	407,737,109,5,151,5	2	0135	-- bracketright
+]	407,737,109,5,151,5	2	93	bracketright
 rB	"
-a^	333,705,0,82,27,82	2	0136	-- circumflex
+a^	333,705,0,82,27,82	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	259,737,0,65,3,65	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	259,737,0,65,3,65	2	96	quoteleft
 oq	"
-a	667,477,15,19,44,19	0	0141	-- a
-b	611,737,15,0,21	2	0142	-- b
-c	537,477,15,0,50	0	0143	-- c
-d	667,737,15,43,50,43	2	0144	-- d
-e	519,477,15,10,50,10	0	0145	-- e
-f	389,737,205,211,98,109	3	0146	-- f
-g	611,528,205,43,113,43	1	0147	-- g
-h	685,737,15,4,50,4	2	0150	-- h
-i	389,737,15,6,18,6	2	0151	-- i
-j	370,737,205,27,255,27	3	0152	-- j
-k	648,737,15,0,61	2	0153	-- k
-l	389,737,15,36,18,36	2	0154	-- l
-m	944,477,15,15,50,15	0	0155	-- m
-n	685,477,15,4,50,4	0	0156	-- n
-o	574,477,15,6,50,6	0	0157	-- o
-p	648,477,205,0,169	1	0160	-- p
-q	630,477,205,7,50,7	1	0161	-- q
-r	519,486,0,58,50,58	0	0162	-- r
-s	481,477,15,4,50,4	0	0163	-- s
-t	407,650,15,46,26,46	2	0164	-- t
-u	685,477,15,0,20	0	0165	-- u
-v	556,477,15,0,20	0	0166	-- v
-w	833,477,15,0,20	0	0167	-- w
-x	574,477,15,50,96,50	0	0170	-- x
-y	519,477,205,24,116,24	1	0171	-- y
-z	519,477,15,4,69,4	0	0172	-- z
-lC	407,737,109,51,-2,51	2	0173	-- braceleft
+a	667,477,15,19,44,19	0	97	a
+b	611,737,15,0,21	2	98	b
+c	537,477,15,0,50	0	99	c
+d	667,737,15,43,50,43	2	100	d
+e	519,477,15,10,50,10	0	101	e
+f	389,737,205,211,98,109	3	102	f
+g	611,528,205,43,113,43	1	103	g
+h	685,737,15,4,50,4	2	104	h
+i	389,737,15,6,18,6	2	105	i
+j	370,737,205,27,255,27	3	106	j
+k	648,737,15,0,61	2	107	k
+l	389,737,15,36,18,36	2	108	l
+m	944,477,15,15,50,15	0	109	m
+n	685,477,15,4,50,4	0	110	n
+o	574,477,15,6,50,6	0	111	o
+p	648,477,205,0,169	1	112	p
+q	630,477,205,7,50,7	1	113	q
+r	519,486,0,58,50,58	0	114	r
+s	481,477,15,4,50,4	0	115	s
+t	407,650,15,46,26,46	2	116	t
+u	685,477,15,0,20	0	117	u
+v	556,477,15,0,20	0	118	v
+w	833,477,15,0,20	0	119	w
+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	0174	-- bar
+ba	606,750,250,0,-199	3	124	bar
 |	"
-rC	407,737,109,0,75	2	0175	-- braceright
+rC	407,737,109,0,75	2	125	braceright
 }	"
-a~	333,690,0,115,22,109	2	0176	-- tilde
+a~	333,690,0,115,22,109	2	126	tilde
 ~	"
-bq	259,157,192,0,107	0	0200	-- quotesinglbase
-Fo	481,407,0,18,85,18	0	0201	-- guillemotleft
-Fc	481,407,0,22,81,22	0	0202	-- guillemotright
-bu	606,542,0,0,-72	0	0203	-- bullet
-Fn	574,737,205,51,93,51	3	0204	-- florin
-f/	167,705,15,216,216,109	2	0205	-- fraction
-%0	1167,727,28,30,30,30	2	0206	-- perthousand
-dg	500,737,146,58,2,58	2	0207	-- dagger
-dd	500,737,150,58,110,58	2	0210	-- daggerdbl
-en	500,287,0,29,97,29	0	0211	-- endash
-em	1000,287,0,29,97,29	0	0212	-- emdash
-fi	685,737,205,6,120,6	3	0214	-- fi
-fl	685,737,205,36,120,36	3	0215	-- fl
-.i	389,477,15,6,18,6	0	0220	-- dotlessi
-ga	333,722,0,11,-24,11	2	0222	-- grave
-a"	333,722,0,197,35,109	2	0223	-- hungarumlaut
-a.	333,690,0,6,-95,6	2	0224	-- dotaccent
-ab	333,698,0,107,-17,107	2	0225	-- breve
-ah	333,705,0,120,-10,109	2	0226	-- caron
-ao	333,746,0,52,-61,52	2	0227	-- ring
-ho	333,0,155,0,-18	0	0230	-- ogonek
-lq	481,737,0,90,-4,90	2	0231	-- quotedblleft
-rq	481,737,0,79,7,79	2	0232	-- quotedblright
-oe	852,477,15,10,56,10	0	0233	-- oe
-/l	389,737,15,51,45,51	2	0234	-- lslash
-Bq	481,157,192,0,107	0	0235	-- quotedblbase
-OE	963,722,0,76,21,76	2	0236	-- OE
-/L	704,722,0,16,91,16	2	0237	-- Lslash
-r!	333,547,205,6,94,6	1	0241	-- exclamdown
-ct	574,578,144,0,20	0	0242	-- cent
-Po	574,705,15,42,68,42	2	0243	-- sterling
-Cs	574,605,0,23,23,23	0	0244	-- currency
-Ye	574,690,0,105,33,105	2	0245	-- yen
-bb	606,675,175,0,-199	2	0246	-- brokenbar
-sc	500,737,146,65,80,65	2	0247	-- section
-ad	333,690,0,110,17,109	2	0250	-- dieresis
-co	747,737,15,53,52,53	2	0251	-- copyright
-Of	412,705,0,98,3,98	2	0252	-- ordfeminine
-fo	278,407,0,16,75,16	0	0253	-- guilsinglleft
-no	606,403	0	0254	-- logicalnot
-\-	606,307	0	0255	-- minus
-rg	747,737,15,53,52,53	2	0256	-- registered
-a-	333,649,0,121,3,109	2	0257	-- macron
-de	400,705,0,22,-36,22	2	0260	-- degree
-t+-	606,506	0	0261	-- plusminus
-S2	344,705,0,68,67,68	2	0262	-- twosuperior
-S3	344,705,0,67,47,67	2	0263	-- threesuperior
-aa	333,722,0,89,-73,89	2	0264	-- acute
-mc	685,477,205,0,139	1	0265	-- mu
-ps	650,722,131,81,25,81	2	0266	-- paragraph
-pc	287,372,0,0,-7	0	0267	-- periodcentered
-ac	333,3,220,0,71	1	0270	-- cedilla
-S1	344,705,0,32,31,32	2	0271	-- onesuperior
-Om	356,705,0,88,8,88	2	0272	-- ordmasculine
-fc	278,407,0,15,76,15	0	0273	-- guilsinglright
-14	861,705,15,0,33	2	0274	-- onequarter
-12	861,705,15,0,33	2	0275	-- onehalf
-34	861,705,15,0,15	2	0276	-- threequarters
-r?	481,547,205,0,50	1	0277	-- questiondown
-`A	741,947,0,25,125,25	2	0300	-- Agrave
-'A	741,947,0,25,125,25	2	0301	-- Aacute
-^A	741,930,0,25,125,25	2	0302	-- Acircumflex
-~A	741,915,0,25,125,25	2	0303	-- Atilde
-:A	741,915,0,25,125,25	2	0304	-- Adieresis
-oA	741,991,0,25,125,25	2	0305	-- Aring
-AE	889,722,0,76,136,76	2	0306	-- AE
-,C	759,737,220,50,13,50	3	0307	-- Ccedilla
-`E	741,947,0,39,91,39	2	0310	-- Egrave
-'E	741,947,0,39,91,39	2	0311	-- Eacute
-^E	741,930,0,39,91,39	2	0312	-- Ecircumflex
-:E	741,915,0,39,91,39	2	0313	-- Edieresis
-`I	444,947,0,91,91,91	2	0314	-- Igrave
-'I	444,947,0,94,91,94	2	0315	-- Iacute
-^I	444,930,0,91,91,91	2	0316	-- Icircumflex
-:I	444,915,0,115,91,109	2	0317	-- Idieresis
--D	833,722,0,13,97,13	2	0320	-- Eth
-~N	852,915,10,111,111,109	2	0321	-- Ntilde
-`O	833,947,15,13,13,13	2	0322	-- Ograve
-'O	833,947,15,13,13,13	2	0323	-- Oacute
-^O	833,930,15,13,13,13	2	0324	-- Ocircumflex
-~O	833,915,15,13,13,13	2	0325	-- Otilde
-:O	833,915,15,13,13,13	2	0326	-- Odieresis
-tmu	606,491,0,0,-15	0	0327	-- multiply
-/O	833,790,68,15,15,15	2	0330	-- Oslash
-`U	833,947,15,117,-38,109	2	0331	-- Ugrave
-'U	833,947,15,117,-38,109	2	0332	-- Uacute
-^U	833,930,15,117,-38,109	2	0333	-- Ucircumflex
-:U	833,915,15,117,-38,109	2	0334	-- Udieresis
-'Y	704,947,0,121,37,109	2	0335	-- Yacute
-TP	741,722,0,0,91	2	0336	-- Thorn
-ss	574,737,205,16,141,16	3	0337	-- germandbls
-`a	667,722,15,19,44,19	2	0340	-- agrave
-'a	667,722,15,19,44,19	2	0341	-- aacute
-^a	667,705,15,19,44,19	2	0342	-- acircumflex
-~a	667,690,15,19,44,19	2	0343	-- atilde
-:a	667,690,15,19,44,19	2	0344	-- adieresis
-oa	667,746,15,19,44,19	2	0345	-- aring
-ae	815,477,15,10,68,10	0	0346	-- ae
-,c	537,477,220,0,50	1	0347	-- ccedilla
-`e	519,722,15,10,50,10	2	0350	-- egrave
-'e	519,722,15,10,50,10	2	0351	-- eacute
-^e	519,705,15,10,50,10	2	0352	-- ecircumflex
-:e	519,690,15,17,50,17	2	0353	-- edieresis
-`i	389,715,15,6,18,6	2	0354	-- igrave
-'i	389,715,15,31,18,31	2	0355	-- iacute
-^i	389,698,15,24,29,24	2	0356	-- icircumflex
-:i	389,683,15,52,19,52	2	0357	-- idieresis
-Sd	574,752,15,6,50,6	2	0360	-- eth
-~n	685,690,15,4,50,4	2	0361	-- ntilde
-`o	574,722,15,6,50,6	2	0362	-- ograve
-'o	574,722,15,6,50,6	2	0363	-- oacute
-^o	574,705,15,6,50,6	2	0364	-- ocircumflex
-~o	574,690,15,6,50,6	2	0365	-- otilde
-:o	574,690,15,6,50,6	2	0366	-- odieresis
-tdi	606,546,40	0	0367	-- divide
-/o	574,583,121,6,50,6	0	0370	-- oslash
-`u	685,722,15,0,20	2	0371	-- ugrave
-'u	685,722,15,0,20	2	0372	-- uacute
-^u	685,705,15,0,20	2	0373	-- ucircumflex
-:u	685,690,15,0,20	2	0374	-- udieresis
-'y	519,722,205,24,116,24	3	0375	-- yacute
-Tp	648,737,205,0,169	3	0376	-- thorn
-:y	519,690,205,24,116,24	3	0377	-- ydieresis
+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
+bu	606,542,0,0,-72	0	131	bullet
+Fn	574,737,205,51,93,51	3	132	florin
+f/	167,705,15,216,216,109	2	133	fraction
+%0	1167,727,28,30,30,30	2	134	perthousand
+dg	500,737,146,58,2,58	2	135	dagger
+dd	500,737,150,58,110,58	2	136	daggerdbl
+en	500,287,0,29,97,29	0	137	endash
+em	1000,287,0,29,97,29	0	138	emdash
+fi	685,737,205,6,120,6	3	140	fi
+fl	685,737,205,36,120,36	3	141	fl
+.i	389,477,15,6,18,6	0	144	dotlessi
+ga	333,722,0,11,-24,11	2	146	grave
+a"	333,722,0,197,35,109	2	147	hungarumlaut
+a.	333,690,0,6,-95,6	2	148	dotaccent
+ab	333,698,0,107,-17,107	2	149	breve
+ah	333,705,0,120,-10,109	2	150	caron
+ao	333,746,0,52,-61,52	2	151	ring
+ho	333,0,155,0,-18	0	152	ogonek
+lq	481,737,0,90,-4,90	2	153	quotedblleft
+rq	481,737,0,79,7,79	2	154	quotedblright
+oe	852,477,15,10,56,10	0	155	oe
+/l	389,737,15,51,45,51	2	156	lslash
+Bq	481,157,192,0,107	0	157	quotedblbase
+OE	963,722,0,76,21,76	2	158	OE
+/L	704,722,0,16,91,16	2	159	Lslash
+r!	333,547,205,6,94,6	1	161	exclamdown
+ct	574,578,144,0,20	0	162	cent
+Po	574,705,15,42,68,42	2	163	sterling
+Cs	574,605,0,23,23,23	0	164	currency
+Ye	574,690,0,105,33,105	2	165	yen
+bb	606,675,175,0,-199	2	166	brokenbar
+sc	500,737,146,65,80,65	2	167	section
+ad	333,690,0,110,17,109	2	168	dieresis
+co	747,737,15,53,52,53	2	169	copyright
+Of	412,705,0,98,3,98	2	170	ordfeminine
+fo	278,407,0,16,75,16	0	171	guilsinglleft
+tno	606,403	0	172	logicalnot
+\-	606,307	0	173	minus
+rg	747,737,15,53,52,53	2	174	registered
+a-	333,649,0,121,3,109	2	175	macron
+de	400,705,0,22,-36,22	2	176	degree
+t+-	606,506	0	177	plusminus
+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,139	1	181	mu
+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
+S1	344,705,0,32,31,32	2	185	onesuperior
+Om	356,705,0,88,8,88	2	186	ordmasculine
+fc	278,407,0,15,76,15	0	187	guilsinglright
+14	861,705,15,0,33	2	188	onequarter
+12	861,705,15,0,33	2	189	onehalf
+34	861,705,15,0,15	2	190	threequarters
+r?	481,547,205,0,50	1	191	questiondown
+`A	741,947,0,25,125,25	2	192	Agrave
+'A	741,947,0,25,125,25	2	193	Aacute
+^A	741,930,0,25,125,25	2	194	Acircumflex
+~A	741,915,0,25,125,25	2	195	Atilde
+:A	741,915,0,25,125,25	2	196	Adieresis
+oA	741,991,0,25,125,25	2	197	Aring
+AE	889,722,0,76,136,76	2	198	AE
+,C	759,737,220,50,13,50	3	199	Ccedilla
+`E	741,947,0,39,91,39	2	200	Egrave
+'E	741,947,0,39,91,39	2	201	Eacute
+^E	741,930,0,39,91,39	2	202	Ecircumflex
+:E	741,915,0,39,91,39	2	203	Edieresis
+`I	444,947,0,91,91,91	2	204	Igrave
+'I	444,947,0,94,91,94	2	205	Iacute
+^I	444,930,0,91,91,91	2	206	Icircumflex
+:I	444,915,0,115,91,109	2	207	Idieresis
+-D	833,722,0,13,97,13	2	208	Eth
+~N	852,915,10,111,111,109	2	209	Ntilde
+`O	833,947,15,13,13,13	2	210	Ograve
+'O	833,947,15,13,13,13	2	211	Oacute
+^O	833,930,15,13,13,13	2	212	Ocircumflex
+~O	833,915,15,13,13,13	2	213	Otilde
+:O	833,915,15,13,13,13	2	214	Odieresis
+tmu	606,491,0,0,-15	0	215	multiply
+/O	833,790,68,15,15,15	2	216	Oslash
+`U	833,947,15,117,-38,109	2	217	Ugrave
+'U	833,947,15,117,-38,109	2	218	Uacute
+^U	833,930,15,117,-38,109	2	219	Ucircumflex
+:U	833,915,15,117,-38,109	2	220	Udieresis
+'Y	704,947,0,121,37,109	2	221	Yacute
+TP	741,722,0,0,91	2	222	Thorn
+ss	574,737,205,16,141,16	3	223	germandbls
+`a	667,722,15,19,44,19	2	224	agrave
+'a	667,722,15,19,44,19	2	225	aacute
+^a	667,705,15,19,44,19	2	226	acircumflex
+~a	667,690,15,19,44,19	2	227	atilde
+:a	667,690,15,19,44,19	2	228	adieresis
+oa	667,746,15,19,44,19	2	229	aring
+ae	815,477,15,10,68,10	0	230	ae
+,c	537,477,220,0,50	1	231	ccedilla
+`e	519,722,15,10,50,10	2	232	egrave
+'e	519,722,15,10,50,10	2	233	eacute
+^e	519,705,15,10,50,10	2	234	ecircumflex
+:e	519,690,15,17,50,17	2	235	edieresis
+`i	389,715,15,6,18,6	2	236	igrave
+'i	389,715,15,31,18,31	2	237	iacute
+^i	389,698,15,24,29,24	2	238	icircumflex
+:i	389,683,15,52,19,52	2	239	idieresis
+Sd	574,752,15,6,50,6	2	240	eth
+~n	685,690,15,4,50,4	2	241	ntilde
+`o	574,722,15,6,50,6	2	242	ograve
+'o	574,722,15,6,50,6	2	243	oacute
+^o	574,705,15,6,50,6	2	244	ocircumflex
+~o	574,690,15,6,50,6	2	245	otilde
+:o	574,690,15,6,50,6	2	246	odieresis
+tdi	606,546,40	0	247	divide
+/o	574,583,121,6,50,6	0	248	oslash
+`u	685,722,15,0,20	2	249	ugrave
+'u	685,722,15,0,20	2	250	uacute
+^u	685,705,15,0,20	2	251	ucircumflex
+:u	685,690,15,0,20	2	252	udieresis
+'y	519,722,205,24,116,24	3	253	yacute
+Tp	648,737,205,0,169	3	254	thorn
+:y	519,690,205,24,116,24	3	255	ydieresis
+u2026	1000,157,15,0,-31	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NI b/contrib/groff/font/devps/NI
index 09aa5a4..b27ce51 100644
--- a/contrib/groff/font/devps/NI
+++ b/contrib/groff/font/devps/NI
@@ -194,246 +194,247 @@ w , -75
 y . -75
 y , -75
 charset
-ha	606,690,0,0,-39	2	0000	-- asciicircum
-ti	606,322,0,0,-22	0	0001	-- asciitilde
-vS	667,946,15,21,56,21	2	0002	-- Scaron
-vZ	667,946,0,50,75,50	2	0003	-- Zcaron
-vs	444,690,15,40,48,40	2	0004	-- scaron
-vz	463,690,15,30,83,30	2	0005	-- zcaron
-:Y	685,902,0,125,19,107	2	0006	-- Ydieresis
-tm	950,722,0,68,18,68	2	0007	-- trademark
-aq	278,737,0,9,-101,9	2	0010	-- quotesingle
-space	278	0	0040
-!	333,737,15,20,33,20	2	0041	-- exclam
-"	400,737,0,13,-77,13	2	0042	-- quotedbl
+ha	606,690,0,0,-39	2	0	asciicircum
+ti	606,322,0,0,-22	0	1	asciitilde
+vS	667,946,15,21,56,21	2	2	Scaron
+vZ	667,946,0,50,75,50	2	3	Zcaron
+vs	444,690,15,40,48,40	2	4	scaron
+vz	463,690,15,30,83,30	2	5	zcaron
+:Y	685,902,0,125,19,107	2	6	Ydieresis
+tm	950,722,0,68,18,68	2	7	trademark
+aq	278,737,0,9,-101,9	2	8	quotesingle
+space	278	0	32	space
+!	333,737,15,20,33,20	2	33	exclam
+"	400,737,0,13,-77,13	2	34	quotedbl
 dq	"
-#	556,690,0,22,22,22	2	0043	-- numbersign
+#	556,690,0,22,22,22	2	35	numbersign
 sh	"
-$	556,808,142,30,46,30	2	0044	-- dollar
+$	556,808,142,30,46,30	2	36	dollar
 Do	"
-%	833,705,15,7,7,7	2	0045	-- percent
-&	852,737,15,0,26	2	0046	-- ampersand
-'	204,737,0,75,11,75	2	0047	-- quoteright
+%	833,705,15,7,7,7	2	37	percent
+&	852,737,15,0,26	2	38	ampersand
+'	204,737,0,75,11,75	2	39	quoteright
 cq	"
-(	333,745,117,128,-3,107	2	0050	-- parenleft
-)	333,745,117,0,143	2	0051	-- parenright
-*	500,737,0,50,-30,50	2	0052	-- asterisk
-+	606,506	0	0053	-- plus
-,	278,109,165,0,89	0	0054	-- comma
--	333,274,0,0,18	0	0055	-- hyphen
+(	333,745,117,128,-3,107	2	40	parenleft
+)	333,745,117,0,143	2	41	parenright
+*	500,737,0,50,-30,50	2	42	asterisk
++	606,506	0	43	plus
+,	278,109,165,0,89	0	44	comma
+-	333,274,0,0,18	0	45	hyphen
 hy	"
-.	278,109,15,0,33	0	0056	-- period
-/	606,737,15,0,-82	2	0057	-- slash
+.	278,109,15,0,33	0	46	period
+/	606,737,15,0,-82	2	47	slash
 sl	"
-0	556,705,15,20,20,20	2	0060	-- zero
-1	556,705	2	0061	-- one
-2	556,705,0,0,87	2	0062	-- two
-3	556,705,15,0,52	2	0063	-- three
-4	556,705,0,6,58,6	2	0064	-- four
-5	556,705,15,34,46,34	2	0065	-- five
-6	556,705,15,42,14,42	2	0066	-- six
-7	556,705,15,55,-19,55	2	0067	-- seven
-8	556,705,15,20,44,20	2	0070	-- eight
-9	556,705,15,14,42,14	2	0071	-- nine
-:	278,466,15,1,33,1	0	0072	-- colon
-;	278,466,165,1,89,1	0	0073	-- semicolon
-<	606,514,8,0,14	0	0074	-- less
-=	606,389	0	0075	-- equal
->	606,514,8,14,-14,14	0	0076	-- greater
-?	444,737,15,23,-52,23	2	0077	-- question
-@	747,737,15,53,52,53	2	0100	-- at
+0	556,705,15,20,20,20	2	48	zero
+1	556,705	2	49	one
+2	556,705,0,0,87	2	50	two
+3	556,705,15,0,52	2	51	three
+4	556,705,0,6,58,6	2	52	four
+5	556,705,15,34,46,34	2	53	five
+6	556,705,15,42,14,42	2	54	six
+7	556,705,15,55,-19,55	2	55	seven
+8	556,705,15,20,44,20	2	56	eight
+9	556,705,15,14,42,14	2	57	nine
+:	278,466,15,1,33,1	0	58	colon
+;	278,466,165,1,89,1	0	59	semicolon
+<	606,514,8,0,14	0	60	less
+=	606,389	0	61	equal
+>	606,514,8,14,-14,14	0	62	greater
+?	444,737,15,23,-52,23	2	63	question
+@	747,737,15,53,52,53	2	64	at
 at	"
-A	704,737,0,14,137,14	2	0101	-- A
-B	722,722,0,0,83	2	0102	-- B
-C	722,737,15,40,10,40	2	0103	-- C
-D	778,722,0,10,83,10	2	0104	-- D
-E	722,722,0,28,83,28	2	0105	-- E
-F	667,722,0,83,83,83	2	0106	-- F
-G	778,737,15,35,10,35	2	0107	-- G
-H	833,722,0,83,83,83	2	0110	-- H
-I	407,722,0,78,83,78	2	0111	-- I
-J	611,722,15,90,64,90	2	0112	-- J
-K	741,722,0,125,83,107	2	0113	-- K
-L	667,722,0,10,83,10	2	0114	-- L
-M	944,722,0,83,83,83	2	0115	-- M
-N	815,722,15,101,101,101	2	0116	-- N
-O	778,737,15,10,10,10	2	0117	-- O
-P	667,722,0,50,83,50	2	0120	-- P
-Q	778,737,190,10,10,10	2	0121	-- Q
-R	741,722,15,1,95,1	2	0122	-- R
-S	667,737,15,21,56,21	2	0123	-- S
-T	685,722,0,90,10,90	2	0124	-- T
-U	815,722,15,102,-43,102	2	0125	-- U
-V	704,722,10,125,14,107	2	0126	-- V
-W	926,722,10,102,-3,102	2	0127	-- W
-X	704,722,0,125,125,107	2	0130	-- X
-Y	685,722,0,125,19,107	2	0131	-- Y
-Z	667,722,0,50,75,50	2	0132	-- Z
-[	333,737,109,105,105,105	2	0133	-- bracketleft
+A	704,737,0,14,137,14	2	65	A
+B	722,722,0,0,83	2	66	B
+C	722,737,15,40,10,40	2	67	C
+D	778,722,0,10,83,10	2	68	D
+E	722,722,0,28,83,28	2	69	E
+F	667,722,0,83,83,83	2	70	F
+G	778,737,15,35,10,35	2	71	G
+H	833,722,0,83,83,83	2	72	H
+I	407,722,0,78,83,78	2	73	I
+J	611,722,15,90,64,90	2	74	J
+K	741,722,0,125,83,107	2	75	K
+L	667,722,0,10,83,10	2	76	L
+M	944,722,0,83,83,83	2	77	M
+N	815,722,15,101,101,101	2	78	N
+O	778,737,15,10,10,10	2	79	O
+P	667,722,0,50,83,50	2	80	P
+Q	778,737,190,10,10,10	2	81	Q
+R	741,722,15,1,95,1	2	82	R
+S	667,737,15,21,56,21	2	83	S
+T	685,722,0,90,10,90	2	84	T
+U	815,722,15,102,-43,102	2	85	U
+V	704,722,10,125,14,107	2	86	V
+W	926,722,10,102,-3,102	2	87	W
+X	704,722,0,125,125,107	2	88	X
+Y	685,722,0,125,19,107	2	89	Y
+Z	667,722,0,50,75,50	2	90	Z
+[	333,737,109,105,105,105	2	91	bracketleft
 lB	"
-\	606,737,15,0,-82	2	0134	-- backslash
+\	606,737,15,0,-82	2	92	backslash
 rs	"
-]	333,737,109,83,127,83	2	0135	-- bracketright
+]	333,737,109,83,127,83	2	93	bracketright
 rB	"
-a^	333,690,0,48,13,48	2	0136	-- circumflex
+a^	333,690,0,48,13,48	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	204,737,0,75,11,75	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	204,737,0,75,11,75	2	96	quoteleft
 oq	"
-a	574,466,15,0,48	0	0141	-- a
-b	556,737,15,0,18	2	0142	-- b
-c	444,466,15,0,48	0	0143	-- c
-d	611,737,15,24,48,24	2	0144	-- d
-e	444,466,15,0,56	0	0145	-- e
-f	333,737,205,187,118,107	3	0146	-- f
-g	537,497,205,36,129,36	1	0147	-- g
-h	611,737,15,1,36,1	2	0150	-- h
-i	333,715,15,0,21	2	0151	-- i
-j	315,715,205,53,216,53	3	0152	-- j
-k	556,737,15,0,50	2	0153	-- k
-l	333,737,15,9,36,9	2	0154	-- l
-m	889,466,15,1,36,1	0	0155	-- m
-n	611,466,15,1,36,1	0	0156	-- n
-o	500,466,15,0,48	0	0157	-- o
-p	574,466,205,0,151	1	0160	-- p
-q	556,466,205,0,48	1	0161	-- q
-r	444,466,0,40,40,40	0	0162	-- r
-s	444,466,15,0,48	0	0163	-- s
-t	352,619,15,26,26,26	2	0164	-- t
-u	611,466,15,0,6	0	0165	-- u
-v	519,466,15,0,19	0	0166	-- v
-w	778,466,15,0,19	0	0167	-- w
-x	500,466,15,21,83,21	0	0170	-- x
-y	500,466,205,0,133	1	0171	-- y
-z	463,466,15,3,83,3	0	0172	-- z
-lC	333,737,109,111,12,107	2	0173	-- braceleft
+a	574,466,15,0,48	0	97	a
+b	556,737,15,0,18	2	98	b
+c	444,466,15,0,48	0	99	c
+d	611,737,15,24,48,24	2	100	d
+e	444,466,15,0,56	0	101	e
+f	333,737,205,187,118,107	3	102	f
+g	537,497,205,36,129,36	1	103	g
+h	611,737,15,1,36,1	2	104	h
+i	333,715,15,0,21	2	105	i
+j	315,715,205,53,216,53	3	106	j
+k	556,737,15,0,50	2	107	k
+l	333,737,15,9,36,9	2	108	l
+m	889,466,15,1,36,1	0	109	m
+n	611,466,15,1,36,1	0	110	n
+o	500,466,15,0,48	0	111	o
+p	574,466,205,0,151	1	112	p
+q	556,466,205,0,48	1	113	q
+r	444,466,0,40,40,40	0	114	r
+s	444,466,15,0,48	0	115	s
+t	352,619,15,26,26,26	2	116	t
+u	611,466,15,0,6	0	117	u
+v	519,466,15,0,19	0	118	v
+w	778,466,15,0,19	0	119	w
+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	0174	-- bar
+ba	606,750,250,0,-217	3	124	bar
 |	"
-rC	333,737,109,0,137	2	0175	-- braceright
+rC	333,737,109,0,137	2	125	braceright
 }	"
-a~	333,649,0,100,-2,100	2	0176	-- tilde
+a~	333,649,0,100,-2,100	2	126	tilde
 ~	"
-bq	204,109,165,0,128	0	0200	-- quotesinglbase
-Fo	426,402,0,26,65,26	0	0201	-- guillemotleft
-Fc	426,402,0,26,65,26	0	0202	-- guillemotright
-bu	606,542,0,0,-72	0	0203	-- bullet
-Fn	556,737,205,63,108,63	3	0204	-- florin
-f/	167,705,15,184,184,107	2	0205	-- fraction
-%0	1000,705,15,44,44,44	2	0206	-- perthousand
-dg	500,737,147,56,-1,56	2	0207	-- dagger
-dd	500,737,147,56,104,56	2	0210	-- daggerdbl
-en	500,268,0,37,77,37	0	0211	-- endash
-em	1000,268,0,37,77,37	0	0212	-- emdash
-fi	611,737,205,0,118	3	0214	-- fi
-fl	611,737,205,26,118,26	3	0215	-- fl
-.i	333,466,15,0,21	0	0220	-- dotlessi
-ga	333,690,0,0,-21	2	0222	-- grave
-a"	333,690,0,172,18,107	2	0223	-- hungarumlaut
-a.	333,646,0,0,-96	2	0224	-- dotaccent
-ab	333,677,0,87,-19,87	2	0225	-- breve
-ah	333,690,0,95,-23,95	2	0226	-- caron
-ao	333,712,0,31,-64,31	2	0227	-- ring
-ho	333,0,215,0,-18	1	0230	-- ogonek
-lq	389,737,0,67,11,67	2	0231	-- quotedblleft
-rq	389,737,0,67,11,67	2	0232	-- quotedblright
-oe	778,466,15,0,48	0	0233	-- oe
-/l	333,737,15,57,75,57	2	0234	-- lslash
-Bq	389,109,165,0,128	0	0235	-- quotedblbase
-OE	981,722,0,44,10,44	2	0236	-- OE
-/L	667,722,0,10,83,10	2	0237	-- Lslash
-r!	333,547,205,0,72	1	0241	-- exclamdown
-ct	556,580,144,0,-12	0	0242	-- cent
-Po	556,705,15,38,63,38	2	0243	-- sterling
-Cs	556,597,0,24,24,24	0	0244	-- currency
-Ye	556,690,0,118,10,107	2	0245	-- yen
-bb	606,675,175,0,-217	2	0246	-- brokenbar
-sc	500,737,147,30,60,30	2	0247	-- section
-ad	333,646,0,76,-9,76	2	0250	-- dieresis
-co	747,737,15,53,52,53	2	0251	-- copyright
-Of	422,705,0,48,-22,48	2	0252	-- ordfeminine
-fo	333,402,0,0,10	0	0253	-- guilsinglleft
-no	606,389	0	0254	-- logicalnot
-\-	606,289	0	0255	-- minus
-rg	747,737,15,53,52,53	2	0256	-- registered
-a-	333,610,0,80,-2,80	0	0257	-- macron
-de	400,705,0,22,-36,22	2	0260	-- degree
-t+-	606,506	0	0261	-- plusminus
-S2	333,705,0,76,50,76	2	0262	-- twosuperior
-S3	333,705,0,76,28,76	2	0263	-- threesuperior
-aa	333,690,0,72,-82,72	2	0264	-- acute
-mc	611,466,205,0,110	1	0265	-- mu
-ps	650,722,132,65,2,65	2	0266	-- paragraph
-pc	278,374,0,0,-21	0	0267	-- periodcentered
-ac	333,0,215,0,47	1	0270	-- cedilla
-S1	333,705,0,28,16,28	2	0271	-- onesuperior
-Om	372,705,0,48,-16,48	2	0272	-- ordmasculine
-fc	333,402,0,0,10	0	0273	-- guilsinglright
-14	834,705,15,0,16	2	0274	-- onequarter
-12	834,705,15,0,16	2	0275	-- onehalf
-34	834,705,15,0,28	2	0276	-- threequarters
-r?	444,547,205,0,53	1	0277	-- questiondown
-`A	704,946,0,14,137,14	2	0300	-- Agrave
-'A	704,946,0,14,137,14	2	0301	-- Aacute
-^A	704,946,0,14,137,14	2	0302	-- Acircumflex
-~A	704,905,0,14,137,14	2	0303	-- Atilde
-:A	704,902,0,14,137,14	2	0304	-- Adieresis
-oA	704,958,0,14,137,14	2	0305	-- Aring
-AE	870,722,0,68,137,68	2	0306	-- AE
-,C	722,737,215,40,10,40	3	0307	-- Ccedilla
-`E	722,946,0,28,83,28	2	0310	-- Egrave
-'E	722,946,0,28,83,28	2	0311	-- Eacute
-^E	722,946,0,28,83,28	2	0312	-- Ecircumflex
-:E	722,902,0,28,83,28	2	0313	-- Edieresis
-`I	407,946,0,78,83,78	2	0314	-- Igrave
-'I	407,946,0,95,83,95	2	0315	-- Iacute
-^I	407,946,0,78,83,78	2	0316	-- Icircumflex
-:I	407,902,0,99,83,99	2	0317	-- Idieresis
--D	778,722,0,10,83,10	2	0320	-- Eth
-~N	815,905,15,101,101,101	2	0321	-- Ntilde
-`O	778,946,15,10,10,10	2	0322	-- Ograve
-'O	778,946,15,10,10,10	2	0323	-- Oacute
-^O	778,946,15,10,10,10	2	0324	-- Ocircumflex
-~O	778,905,15,10,10,10	2	0325	-- Otilde
-:O	778,902,15,10,10,10	2	0326	-- Odieresis
-tmu	606,482,0,0,-24	0	0327	-- multiply
-/O	778,780,68,20,34,20	2	0330	-- Oslash
-`U	815,946,15,102,-43,102	2	0331	-- Ugrave
-'U	815,946,15,102,-43,102	2	0332	-- Uacute
-^U	815,946,15,102,-43,102	2	0333	-- Ucircumflex
-:U	815,902,15,102,-43,102	2	0334	-- Udieresis
-'Y	685,946,0,125,19,107	2	0335	-- Yacute
-TP	667,722,0,10,83,10	2	0336	-- Thorn
-ss	556,737,205,19,126,19	3	0337	-- germandbls
-`a	574,690,15,0,48	2	0340	-- agrave
-'a	574,690,15,0,48	2	0341	-- aacute
-^a	574,690,15,0,48	2	0342	-- acircumflex
-~a	574,649,15,0,48	2	0343	-- atilde
-:a	574,646,15,0,48	2	0344	-- adieresis
-oa	574,712,15,0,48	2	0345	-- aring
-ae	722,466,15,0,68	0	0346	-- ae
-,c	444,466,215,0,48	1	0347	-- ccedilla
-`e	444,690,15,0,56	2	0350	-- egrave
-'e	444,690,15,17,56,17	2	0351	-- eacute
-^e	444,690,15,0,56	2	0352	-- ecircumflex
-:e	444,646,15,21,56,21	2	0353	-- edieresis
-`i	333,690,15,0,21	2	0354	-- igrave
-'i	333,690,15,72,21,72	2	0355	-- iacute
-^i	333,690,15,48,21,48	2	0356	-- icircumflex
-:i	333,646,15,76,21,76	2	0357	-- idieresis
-Sd	500,737,15,0,48	2	0360	-- eth
-~n	611,649,15,1,36,1	2	0361	-- ntilde
-`o	500,690,15,0,48	2	0362	-- ograve
-'o	500,690,15,0,48	2	0363	-- oacute
-^o	500,690,15,0,48	2	0364	-- ocircumflex
-~o	500,649,15,17,48,17	2	0365	-- otilde
-:o	500,646,15,0,48	2	0366	-- odieresis
-tdi	606,528,22	0	0367	-- divide
-/o	500,549,121,0,48	0	0370	-- oslash
-`u	611,690,15,0,6	2	0371	-- ugrave
-'u	611,690,15,0,6	2	0372	-- uacute
-^u	611,690,15,0,6	2	0373	-- ucircumflex
-:u	611,646,15,0,6	2	0374	-- udieresis
-'y	500,690,205,0,133	3	0375	-- yacute
-Tp	574,737,205,0,151	3	0376	-- thorn
-:y	500,646,205,0,133	3	0377	-- ydieresis
+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
+bu	606,542,0,0,-72	0	131	bullet
+Fn	556,737,205,63,108,63	3	132	florin
+f/	167,705,15,184,184,107	2	133	fraction
+%0	1000,705,15,44,44,44	2	134	perthousand
+dg	500,737,147,56,-1,56	2	135	dagger
+dd	500,737,147,56,104,56	2	136	daggerdbl
+en	500,268,0,37,77,37	0	137	endash
+em	1000,268,0,37,77,37	0	138	emdash
+fi	611,737,205,0,118	3	140	fi
+fl	611,737,205,26,118,26	3	141	fl
+.i	333,466,15,0,21	0	144	dotlessi
+ga	333,690,0,0,-21	2	146	grave
+a"	333,690,0,172,18,107	2	147	hungarumlaut
+a.	333,646,0,0,-96	2	148	dotaccent
+ab	333,677,0,87,-19,87	2	149	breve
+ah	333,690,0,95,-23,95	2	150	caron
+ao	333,712,0,31,-64,31	2	151	ring
+ho	333,0,215,0,-18	1	152	ogonek
+lq	389,737,0,67,11,67	2	153	quotedblleft
+rq	389,737,0,67,11,67	2	154	quotedblright
+oe	778,466,15,0,48	0	155	oe
+/l	333,737,15,57,75,57	2	156	lslash
+Bq	389,109,165,0,128	0	157	quotedblbase
+OE	981,722,0,44,10,44	2	158	OE
+/L	667,722,0,10,83,10	2	159	Lslash
+r!	333,547,205,0,72	1	161	exclamdown
+ct	556,580,144,0,-12	0	162	cent
+Po	556,705,15,38,63,38	2	163	sterling
+Cs	556,597,0,24,24,24	0	164	currency
+Ye	556,690,0,118,10,107	2	165	yen
+bb	606,675,175,0,-217	2	166	brokenbar
+sc	500,737,147,30,60,30	2	167	section
+ad	333,646,0,76,-9,76	2	168	dieresis
+co	747,737,15,53,52,53	2	169	copyright
+Of	422,705,0,48,-22,48	2	170	ordfeminine
+fo	333,402,0,0,10	0	171	guilsinglleft
+tno	606,389	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	747,737,15,53,52,53	2	174	registered
+a-	333,610,0,80,-2,80	0	175	macron
+de	400,705,0,22,-36,22	2	176	degree
+t+-	606,506	0	177	plusminus
+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,110	1	181	mu
+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
+S1	333,705,0,28,16,28	2	185	onesuperior
+Om	372,705,0,48,-16,48	2	186	ordmasculine
+fc	333,402,0,0,10	0	187	guilsinglright
+14	834,705,15,0,16	2	188	onequarter
+12	834,705,15,0,16	2	189	onehalf
+34	834,705,15,0,28	2	190	threequarters
+r?	444,547,205,0,53	1	191	questiondown
+`A	704,946,0,14,137,14	2	192	Agrave
+'A	704,946,0,14,137,14	2	193	Aacute
+^A	704,946,0,14,137,14	2	194	Acircumflex
+~A	704,905,0,14,137,14	2	195	Atilde
+:A	704,902,0,14,137,14	2	196	Adieresis
+oA	704,958,0,14,137,14	2	197	Aring
+AE	870,722,0,68,137,68	2	198	AE
+,C	722,737,215,40,10,40	3	199	Ccedilla
+`E	722,946,0,28,83,28	2	200	Egrave
+'E	722,946,0,28,83,28	2	201	Eacute
+^E	722,946,0,28,83,28	2	202	Ecircumflex
+:E	722,902,0,28,83,28	2	203	Edieresis
+`I	407,946,0,78,83,78	2	204	Igrave
+'I	407,946,0,95,83,95	2	205	Iacute
+^I	407,946,0,78,83,78	2	206	Icircumflex
+:I	407,902,0,99,83,99	2	207	Idieresis
+-D	778,722,0,10,83,10	2	208	Eth
+~N	815,905,15,101,101,101	2	209	Ntilde
+`O	778,946,15,10,10,10	2	210	Ograve
+'O	778,946,15,10,10,10	2	211	Oacute
+^O	778,946,15,10,10,10	2	212	Ocircumflex
+~O	778,905,15,10,10,10	2	213	Otilde
+:O	778,902,15,10,10,10	2	214	Odieresis
+tmu	606,482,0,0,-24	0	215	multiply
+/O	778,780,68,20,34,20	2	216	Oslash
+`U	815,946,15,102,-43,102	2	217	Ugrave
+'U	815,946,15,102,-43,102	2	218	Uacute
+^U	815,946,15,102,-43,102	2	219	Ucircumflex
+:U	815,902,15,102,-43,102	2	220	Udieresis
+'Y	685,946,0,125,19,107	2	221	Yacute
+TP	667,722,0,10,83,10	2	222	Thorn
+ss	556,737,205,19,126,19	3	223	germandbls
+`a	574,690,15,0,48	2	224	agrave
+'a	574,690,15,0,48	2	225	aacute
+^a	574,690,15,0,48	2	226	acircumflex
+~a	574,649,15,0,48	2	227	atilde
+:a	574,646,15,0,48	2	228	adieresis
+oa	574,712,15,0,48	2	229	aring
+ae	722,466,15,0,68	0	230	ae
+,c	444,466,215,0,48	1	231	ccedilla
+`e	444,690,15,0,56	2	232	egrave
+'e	444,690,15,17,56,17	2	233	eacute
+^e	444,690,15,0,56	2	234	ecircumflex
+:e	444,646,15,21,56,21	2	235	edieresis
+`i	333,690,15,0,21	2	236	igrave
+'i	333,690,15,72,21,72	2	237	iacute
+^i	333,690,15,48,21,48	2	238	icircumflex
+:i	333,646,15,76,21,76	2	239	idieresis
+Sd	500,737,15,0,48	2	240	eth
+~n	611,649,15,1,36,1	2	241	ntilde
+`o	500,690,15,0,48	2	242	ograve
+'o	500,690,15,0,48	2	243	oacute
+^o	500,690,15,0,48	2	244	ocircumflex
+~o	500,649,15,17,48,17	2	245	otilde
+:o	500,646,15,0,48	2	246	odieresis
+tdi	606,528,22	0	247	divide
+/o	500,549,121,0,48	0	248	oslash
+`u	611,690,15,0,6	2	249	ugrave
+'u	611,690,15,0,6	2	250	uacute
+^u	611,690,15,0,6	2	251	ucircumflex
+:u	611,646,15,0,6	2	252	udieresis
+'y	500,690,205,0,133	3	253	yacute
+Tp	574,737,205,0,151	3	254	thorn
+:y	500,646,205,0,133	3	255	ydieresis
+u2026	1000,109,15,0,-9	0	256	ellipsis
diff --git a/contrib/groff/font/devps/NR b/contrib/groff/font/devps/NR
index 7e148c8..ae9e2ff 100644
--- a/contrib/groff/font/devps/NR
+++ b/contrib/groff/font/devps/NR
@@ -181,246 +181,247 @@ w a -18
 y . -125
 y , -125
 charset
-ha	606,690,0,0,-89	2	0000	-- asciicircum
-ti	606,322,0,0,-72	0	0001	-- asciitilde
-vS	630,933,15,0,-47	2	0002	-- Scaron
-vZ	611,933,0,0,-24	2	0003	-- Zcaron
-vs	463,695,15,0,-46	2	0004	-- scaron
-vz	481,695,0,0,-42	2	0005	-- zcaron
-:Y	704,883,0,11,11	2	0006	-- Ydieresis
-tm	1000,722,0,0,-32	2	0007	-- trademark
-aq	204,737,0,0,-59	2	0010	-- quotesingle
-space	278	0	0040
-!	296,737,15,0,-86	2	0041	-- exclam
-"	389,737,0,0,-61	2	0042	-- quotedbl
+ha	606,690	2	0	asciicircum
+ti	606,322	0	1	asciitilde
+vS	630,933,15	2	2	Scaron
+vZ	611,933	2	3	Zcaron
+vs	463,695,15	2	4	scaron
+vz	481,695	2	5	zcaron
+:Y	704,883,0,11,11	2	6	Ydieresis
+tm	1000,722	2	7	trademark
+aq	204,737	2	8	quotesingle
+space	278	0	32	space
+!	296,737,15	2	33	exclam
+"	389,737	2	34	quotedbl
 dq	"
-#	556,690,0,0,-28	2	0043	-- numbersign
+#	556,690	2	35	numbersign
 sh	"
-$	556,813,138,0,-45	2	0044	-- dollar
+$	556,813,138	2	36	dollar
 Do	"
-%	833,705,15,0,-43	2	0045	-- percent
-&	815,737,15,0,-51	2	0046	-- ampersand
-'	204,737,0,0,-25	2	0047	-- quoteright
+%	833,705,15	2	37	percent
+&	815,737,15	2	38	ampersand
+'	204,737	2	39	quoteright
 cq	"
-(	333,745,117,0,-40	2	0050	-- parenleft
-)	333,745,117,0,-54	2	0051	-- parenright
-*	500,737,0,0,-57	2	0052	-- asterisk
-+	606,506,0,0,-50	0	0053	-- plus
-,	278,109,185,0,-62	0	0054	-- comma
--	333,277,0,0,-42	0	0055	-- hyphen
+(	333,745,117	2	40	parenleft
+)	333,745,117	2	41	parenright
+*	500,737	2	42	asterisk
++	606,506	0	43	plus
+,	278,109,185	0	44	comma
+-	333,277	0	45	hyphen
 hy	"
-.	278,109,15,0,-77	0	0056	-- period
-/	278,737,15,32,32	2	0057	-- slash
+.	278,109,15	0	46	period
+/	278,737,15,32,32	2	47	slash
 sl	"
-0	556,705,15,0,-42	2	0060	-- zero
-1	556,705,0,0,-100	2	0061	-- one
-2	556,705,0,0,-35	2	0062	-- two
-3	556,705,15,0,-42	2	0063	-- three
-4	556,705,0,0,-28	2	0064	-- four
-5	556,705,15,0,-46	2	0065	-- five
-6	556,705,15,0,-41	2	0066	-- six
-7	556,705,15,0,-59	2	0067	-- seven
-8	556,705,15,0,-42	2	0070	-- eight
-9	556,705,15,0,-41	2	0071	-- nine
-:	278,474,15,0,-77	0	0072	-- colon
-;	278,474,185,0,-62	0	0073	-- semicolon
-<	606,514,8,0,-50	0	0074	-- less
-=	606,389,0,0,-50	0	0075	-- equal
->	606,514,8,0,-50	0	0076	-- greater
-?	444,737,15,0,-29	2	0077	-- question
-@	737,737,15,7,8	2	0100	-- at
+0	556,705,15	2	48	zero
+1	556,705	2	49	one
+2	556,705	2	50	two
+3	556,705,15	2	51	three
+4	556,705	2	52	four
+5	556,705,15	2	53	five
+6	556,705,15	2	54	six
+7	556,705,15	2	55	seven
+8	556,705,15	2	56	eight
+9	556,705,15	2	57	nine
+:	278,474,15	0	58	colon
+;	278,474,185	0	59	semicolon
+<	606,514,8	0	60	less
+=	606,389	0	61	equal
+>	606,514,8	0	62	greater
+?	444,737,15	2	63	question
+@	737,737,15,7,8	2	64	at
 at	"
-A	722,737,0,8,8	2	0101	-- A
-B	722,722,0,0,-29	2	0102	-- B
-C	722,737,15,0,-45	2	0103	-- C
-D	778,722,0,0,-29	2	0104	-- D
-E	722,722,0,0,-29	2	0105	-- E
-F	667,722,0,0,-29	2	0106	-- F
-G	778,737,15,0,-45	2	0107	-- G
-H	833,722,0,0,-29	2	0110	-- H
-I	407,722,0,0,-38	2	0111	-- I
-J	556,722,15,0,-5	2	0112	-- J
-K	778,722,0,25,-29	2	0113	-- K
-L	667,722,0,0,-29	2	0114	-- L
-M	944,722,0,0,-29	2	0115	-- M
-N	815,722,15,0,-24	2	0116	-- N
-O	778,737,15,0,-45	2	0117	-- O
-P	667,722,0,0,-29	2	0120	-- P
-Q	778,737,190,0,-45	2	0121	-- Q
-R	722,722,15,0,-29	2	0122	-- R
-S	630,737,15,0,-47	2	0123	-- S
-T	667,722,0,0,-19	2	0124	-- T
-U	815,722,15,0,-16	2	0125	-- U
-V	722,722,10,8,8	2	0126	-- V
-W	981,722,10,0,-5	2	0127	-- W
-X	704,722,0,8,8	2	0130	-- X
-Y	704,722,0,11,11	2	0131	-- Y
-Z	611,722,0,0,-24	2	0132	-- Z
-[	333,737,109,0,-126	2	0133	-- bracketleft
+A	722,737,0,8,8	2	65	A
+B	722,722	2	66	B
+C	722,737,15	2	67	C
+D	778,722	2	68	D
+E	722,722	2	69	E
+F	667,722	2	70	F
+G	778,737,15	2	71	G
+H	833,722	2	72	H
+I	407,722	2	73	I
+J	556,722,15	2	74	J
+K	778,722,0,25	2	75	K
+L	667,722	2	76	L
+M	944,722	2	77	M
+N	815,722,15	2	78	N
+O	778,737,15	2	79	O
+P	667,722	2	80	P
+Q	778,737,190	2	81	Q
+R	722,722,15	2	82	R
+S	630,737,15	2	83	S
+T	667,722	2	84	T
+U	815,722,15	2	85	U
+V	722,722,10,8,8	2	86	V
+W	981,722,10	2	87	W
+X	704,722,0,8,8	2	88	X
+Y	704,722,0,11,11	2	89	Y
+Z	611,722	2	90	Z
+[	333,737,109	2	91	bracketleft
 lB	"
-\	606,737,15,0,-132	2	0134	-- backslash
+\	606,737,15	2	92	backslash
 rs	"
-]	333,737,109,0,-18	2	0135	-- bracketright
+]	333,737,109	2	93	bracketright
 rB	"
-a^	333,695,0,0,-10	2	0136	-- circumflex
+a^	333,695	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	204,737,0,0,-25	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	204,737	2	96	quoteleft
 oq	"
-a	556,479,15,0,-44	0	0141	-- a
-b	556,737,15,0,-10	2	0142	-- b
-c	444,479,15,0,-34	0	0143	-- c
-d	574,737,15,0,-34	2	0144	-- d
-e	500,479,15,0,-34	0	0145	-- e
-f	333,737,0,104,-18	2	0146	-- f
-g	537,494,205,5,-23	1	0147	-- g
-h	611,737,0,0,-7	2	0150	-- h
-i	315,722,0,0,-18	2	0151	-- i
-j	296,722,205,0,86	3	0152	-- j
-k	593,737,0,0,-10	2	0153	-- k
-l	315,737,0,0,-18	2	0154	-- l
-m	889,479,0,0,-26	0	0155	-- m
-n	611,479,0,0,-22	0	0156	-- n
-o	500,479,15,0,-34	0	0157	-- o
-p	574,479,205,0,-22	1	0160	-- p
-q	556,479,205,0,-34	1	0161	-- q
-r	444,479,0,0,-18	0	0162	-- r
-s	463,479,15,0,-46	0	0163	-- s
-t	389,666,15,0,-18	2	0164	-- t
-u	611,464,15,0,-22	0	0165	-- u
-v	537,464,10,0,6	0	0166	-- v
-w	778,464,10,0,-1	0	0167	-- w
-x	537,464,0,0,-8	0	0170	-- x
-y	537,464,205,0,-4	1	0171	-- y
-z	481,464,0,0,-42	0	0172	-- z
-lC	333,737,109,0,-54	2	0173	-- braceleft
+a	556,479,15	0	97	a
+b	556,737,15	2	98	b
+c	444,479,15	0	99	c
+d	574,737,15	2	100	d
+e	500,479,15	0	101	e
+f	333,737,0,104	2	102	f
+g	537,494,205,5	1	103	g
+h	611,737	2	104	h
+i	315,722	2	105	i
+j	296,722,205,0,86	3	106	j
+k	593,737	2	107	k
+l	315,737	2	108	l
+m	889,479	0	109	m
+n	611,479	0	110	n
+o	500,479,15	0	111	o
+p	574,479,205	1	112	p
+q	556,479,205	1	113	q
+r	444,479	0	114	r
+s	463,479,15	0	115	s
+t	389,666,15	2	116	t
+u	611,464,15	0	117	u
+v	537,464,10,0,6	0	118	v
+w	778,464,10	0	119	w
+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,0,-267	3	0174	-- bar
+ba	606,750,250	3	124	bar
 |	"
-rC	333,737,109,0,-54	2	0175	-- braceright
+rC	333,737,109	2	125	braceright
 }	"
-a~	333,655,0,0,-1	0	0176	-- tilde
+a~	333,655	0	126	tilde
 ~	"
-bq	204,109,185,0,-25	0	0200	-- quotesinglbase
-Fo	426,398,0,0,-39	0	0201	-- guillemotleft
-Fc	426,398,0,0,-39	0	0202	-- guillemotright
-bu	606,542,0,0,-122	0	0203	-- bullet
-Fn	556,737,205	3	0204	-- florin
-f/	167,705,15,195,195	2	0205	-- fraction
-%0	1000,705,15,0,-6	2	0206	-- perthousand
-dg	500,737,147,0,-42	2	0207	-- dagger
-dd	500,737,149,0,-42	2	0210	-- daggerdbl
-en	556,268	0	0211	-- endash
-em	1000,268	0	0212	-- emdash
-fi	611,737,0,0,-18	2	0214	-- fi
-fl	611,737,0,0,-18	2	0215	-- fl
-.i	315,464,0,0,-18	0	0220	-- dotlessi
-ga	333,699,0,0,-17	2	0222	-- grave
-a"	333,699,0,83,9	2	0223	-- hungarumlaut
-a.	333,645,0,0,-116	0	0224	-- dotaccent
-ab	333,685,0,0,-25	2	0225	-- breve
-ah	333,695,0,0,-10	2	0226	-- caron
-ao	333,722,0,0,-66	2	0227	-- ring
-ho	333,0,215,0,-68	1	0230	-- ogonek
-lq	389,737,0,0,-25	2	0231	-- quotedblleft
-rq	389,737,0,0,-25	2	0232	-- quotedblright
-oe	833,479,15,0,-34	0	0233	-- oe
-/l	315,737,0,0,-18	2	0234	-- lslash
-Bq	389,109,185,0,-25	0	0235	-- quotedblbase
-OE	1000,722,0,0,-21	2	0236	-- OE
-/L	667,722,0,0,-29	2	0237	-- Lslash
-r!	296,547,205,0,-86	1	0241	-- exclamdown
-ct	556,584,141,0,-74	0	0242	-- cent
-Po	556,705,15,0,-18	2	0243	-- sterling
-Cs	556,597,0,0,-26	0	0244	-- currency
-Ye	556,690,0,1,1	2	0245	-- yen
-bb	606,675,175,0,-267	2	0246	-- brokenbar
-sc	500,737,147,0,-55	2	0247	-- section
-ad	333,645,0,0,-16	0	0250	-- dieresis
-co	737,737,15,7,8	2	0251	-- copyright
-Of	334,705,0,4,4	2	0252	-- ordfeminine
-fo	259,398,0,0,-39	0	0253	-- guilsinglleft
-no	606,389,0,0,-50	0	0254	-- logicalnot
-\-	606,289,0,0,-50	0	0255	-- minus
-rg	737,737,15,7,8	2	0256	-- registered
-a-	333,623,0,0,-10	0	0257	-- macron
-de	400,705,0,0,-57	2	0260	-- degree
-t+-	606,506,0,0,-50	0	0261	-- plusminus
-S2	333,705,0,0,-14	2	0262	-- twosuperior
-S3	333,705,0,0,-18	2	0263	-- threesuperior
-aa	333,699,0,0,-91	2	0264	-- acute
-mc	611,464,205,0,-22	1	0265	-- mu
-ps	606,722,132,0,-60	2	0266	-- paragraph
-pc	278,374,0,0,-71	0	0267	-- periodcentered
-ac	333,0,215,0,-29	1	0270	-- cedilla
-S1	333,705,0,0,-39	2	0271	-- onesuperior
-Om	300,705,0,0,-4	2	0272	-- ordmasculine
-fc	259,398,0,0,-39	0	0273	-- guilsinglright
-14	834,705,15,0,-39	2	0274	-- onequarter
-12	834,705,15,0,-39	2	0275	-- onehalf
-34	834,705,15,0,-28	2	0276	-- threequarters
-r?	444,547,205,0,-29	1	0277	-- questiondown
-`A	722,937,0,8,8	2	0300	-- Agrave
-'A	722,937,0,8,8	2	0301	-- Aacute
-^A	722,933,0,8,8	2	0302	-- Acircumflex
-~A	722,893,0,8,8	2	0303	-- Atilde
-:A	722,883,0,8,8	2	0304	-- Adieresis
-oA	722,965,0,8,8	2	0305	-- Aring
-AE	1000,722	2	0306	-- AE
-,C	722,737,215,0,-45	3	0307	-- Ccedilla
-`E	722,937,0,0,-29	2	0310	-- Egrave
-'E	722,937,0,0,-29	2	0311	-- Eacute
-^E	722,933,0,0,-29	2	0312	-- Ecircumflex
-:E	722,883,0,0,-29	2	0313	-- Edieresis
-`I	407,937,0,0,-38	2	0314	-- Igrave
-'I	407,937,0,0,-38	2	0315	-- Iacute
-^I	407,933,0,0,-38	2	0316	-- Icircumflex
-:I	407,883,0,0,-38	2	0317	-- Idieresis
--D	778,722,0,0,-29	2	0320	-- Eth
-~N	815,893,15,0,-24	2	0321	-- Ntilde
-`O	778,937,15,0,-45	2	0322	-- Ograve
-'O	778,937,15,0,-45	2	0323	-- Oacute
-^O	778,933,15,0,-45	2	0324	-- Ocircumflex
-~O	778,893,15,0,-45	2	0325	-- Otilde
-:O	778,883,15,0,-45	2	0326	-- Odieresis
-tmu	606,482,0,0,-74	0	0327	-- multiply
-/O	778,778,56,0,-45	2	0330	-- Oslash
-`U	815,937,15,0,-16	2	0331	-- Ugrave
-'U	815,937,15,0,-16	2	0332	-- Uacute
-^U	815,933,15,0,-16	2	0333	-- Ucircumflex
-:U	815,883,15,0,-16	2	0334	-- Udieresis
-'Y	704,937,0,11,11	2	0335	-- Yacute
-TP	667,722,0,0,-29	2	0336	-- Thorn
-ss	574,737,15,0,-30	2	0337	-- germandbls
-`a	556,699,15,0,-44	2	0340	-- agrave
-'a	556,699,15,0,-44	2	0341	-- aacute
-^a	556,695,15,0,-44	2	0342	-- acircumflex
-~a	556,655,15,0,-44	0	0343	-- atilde
-:a	556,645,15,0,-44	0	0344	-- adieresis
-oa	556,732,15,0,-44	2	0345	-- aring
-ae	796,479,15,0,-34	0	0346	-- ae
-,c	444,479,215,0,-34	1	0347	-- ccedilla
-`e	500,699,15,0,-34	2	0350	-- egrave
-'e	500,699,15,0,-34	2	0351	-- eacute
-^e	500,695,15,0,-34	2	0352	-- ecircumflex
-:e	500,645,15,0,-34	0	0353	-- edieresis
-`i	315,699,0,0,-8	2	0354	-- igrave
-'i	315,699,0,0,-18	2	0355	-- iacute
-^i	315,695,0,0,-1	2	0356	-- icircumflex
-:i	315,645,0,0,-7	0	0357	-- idieresis
-Sd	500,752,15,0,-34	2	0360	-- eth
-~n	611,655,0,0,-22	0	0361	-- ntilde
-`o	500,699,15,0,-34	2	0362	-- ograve
-'o	500,699,15,0,-34	2	0363	-- oacute
-^o	500,695,15,0,-34	2	0364	-- ocircumflex
-~o	500,655,15,0,-34	0	0365	-- otilde
-:o	500,645,15,0,-34	0	0366	-- odieresis
-tdi	606,528,22,0,-50	0	0367	-- divide
-/o	500,561,97,0,-34	0	0370	-- oslash
-`u	611,699,15,0,-22	2	0371	-- ugrave
-'u	611,699,15,0,-22	2	0372	-- uacute
-^u	611,695,15,0,-22	2	0373	-- ucircumflex
-:u	611,645,15,0,-22	0	0374	-- udieresis
-'y	537,699,205,0,-4	3	0375	-- yacute
-Tp	574,737,205,0,-22	3	0376	-- thorn
-:y	537,645,205,0,-4	1	0377	-- ydieresis
+bq	204,109,185	0	128	quotesinglbase
+Fo	426,398	0	129	guillemotleft
+Fc	426,398	0	130	guillemotright
+bu	606,542	0	131	bullet
+Fn	556,737,205	3	132	florin
+f/	167,705,15,195,195	2	133	fraction
+%0	1000,705,15	2	134	perthousand
+dg	500,737,147	2	135	dagger
+dd	500,737,149	2	136	daggerdbl
+en	556,268	0	137	endash
+em	1000,268	0	138	emdash
+fi	611,737	2	140	fi
+fl	611,737	2	141	fl
+.i	315,464	0	144	dotlessi
+ga	333,699	2	146	grave
+a"	333,699,0,83,9	2	147	hungarumlaut
+a.	333,645	0	148	dotaccent
+ab	333,685	2	149	breve
+ah	333,695	2	150	caron
+ao	333,722	2	151	ring
+ho	333,0,215	1	152	ogonek
+lq	389,737	2	153	quotedblleft
+rq	389,737	2	154	quotedblright
+oe	833,479,15	0	155	oe
+/l	315,737	2	156	lslash
+Bq	389,109,185	0	157	quotedblbase
+OE	1000,722	2	158	OE
+/L	667,722	2	159	Lslash
+r!	296,547,205	1	161	exclamdown
+ct	556,584,141	0	162	cent
+Po	556,705,15	2	163	sterling
+Cs	556,597	0	164	currency
+Ye	556,690,0,1,1	2	165	yen
+bb	606,675,175	2	166	brokenbar
+sc	500,737,147	2	167	section
+ad	333,645	0	168	dieresis
+co	737,737,15,7,8	2	169	copyright
+Of	334,705,0,4,4	2	170	ordfeminine
+fo	259,398	0	171	guilsinglleft
+tno	606,389	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	737,737,15,7,8	2	174	registered
+a-	333,623	0	175	macron
+de	400,705	2	176	degree
+t+-	606,506	0	177	plusminus
+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
+ps	606,722,132	2	182	paragraph
+pc	278,374	0	183	periodcentered
+ac	333,0,215	1	184	cedilla
+S1	333,705	2	185	onesuperior
+Om	300,705	2	186	ordmasculine
+fc	259,398	0	187	guilsinglright
+14	834,705,15	2	188	onequarter
+12	834,705,15	2	189	onehalf
+34	834,705,15	2	190	threequarters
+r?	444,547,205	1	191	questiondown
+`A	722,937,0,8,8	2	192	Agrave
+'A	722,937,0,8,8	2	193	Aacute
+^A	722,933,0,8,8	2	194	Acircumflex
+~A	722,893,0,8,8	2	195	Atilde
+:A	722,883,0,8,8	2	196	Adieresis
+oA	722,965,0,8,8	2	197	Aring
+AE	1000,722	2	198	AE
+,C	722,737,215	3	199	Ccedilla
+`E	722,937	2	200	Egrave
+'E	722,937	2	201	Eacute
+^E	722,933	2	202	Ecircumflex
+:E	722,883	2	203	Edieresis
+`I	407,937	2	204	Igrave
+'I	407,937	2	205	Iacute
+^I	407,933	2	206	Icircumflex
+:I	407,883	2	207	Idieresis
+-D	778,722	2	208	Eth
+~N	815,893,15	2	209	Ntilde
+`O	778,937,15	2	210	Ograve
+'O	778,937,15	2	211	Oacute
+^O	778,933,15	2	212	Ocircumflex
+~O	778,893,15	2	213	Otilde
+:O	778,883,15	2	214	Odieresis
+tmu	606,482	0	215	multiply
+/O	778,778,56	2	216	Oslash
+`U	815,937,15	2	217	Ugrave
+'U	815,937,15	2	218	Uacute
+^U	815,933,15	2	219	Ucircumflex
+:U	815,883,15	2	220	Udieresis
+'Y	704,937,0,11,11	2	221	Yacute
+TP	667,722	2	222	Thorn
+ss	574,737,15	2	223	germandbls
+`a	556,699,15	2	224	agrave
+'a	556,699,15	2	225	aacute
+^a	556,695,15	2	226	acircumflex
+~a	556,655,15	0	227	atilde
+:a	556,645,15	0	228	adieresis
+oa	556,732,15	2	229	aring
+ae	796,479,15	0	230	ae
+,c	444,479,215	1	231	ccedilla
+`e	500,699,15	2	232	egrave
+'e	500,699,15	2	233	eacute
+^e	500,695,15	2	234	ecircumflex
+:e	500,645,15	0	235	edieresis
+`i	315,699	2	236	igrave
+'i	315,699	2	237	iacute
+^i	315,695	2	238	icircumflex
+:i	315,645	0	239	idieresis
+Sd	500,752,15	2	240	eth
+~n	611,655	0	241	ntilde
+`o	500,699,15	2	242	ograve
+'o	500,699,15	2	243	oacute
+^o	500,695,15	2	244	ocircumflex
+~o	500,655,15	0	245	otilde
+:o	500,645,15	0	246	odieresis
+tdi	606,528,22	0	247	divide
+/o	500,561,97	0	248	oslash
+`u	611,699,15	2	249	ugrave
+'u	611,699,15	2	250	uacute
+^u	611,695,15	2	251	ucircumflex
+:u	611,645,15	0	252	udieresis
+'y	537,699,205	3	253	yacute
+Tp	574,737,205	3	254	thorn
+:y	537,645,205	1	255	ydieresis
+u2026	1000,109,15	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PB b/contrib/groff/font/devps/PB
index cd1a5c1..e105758 100644
--- a/contrib/groff/font/devps/PB
+++ b/contrib/groff/font/devps/PB
@@ -120,246 +120,247 @@ w , -92
 y . -92
 y , -92
 charset
-ha	606,678,0,0,-52	2	0000	-- asciicircum
-ti	606,342,0,0,-51	0	0001	-- asciitilde
-vS	611,909,17,0,-57	2	0002	-- Scaron
-vZ	667,909,3,0,-24	2	0003	-- Zcaron
-vs	444,693,17,0,-39	2	0004	-- scaron
-vz	500,693,3,0,-16	2	0005	-- zcaron
-:Y	667,895,3,0,-15	2	0006	-- Ydieresis
-tm	998,678,0,0,-38	2	0007	-- trademark
-aq	227,695,0,0,-45	2	0010	-- quotesingle
-space	250	0	0040
-!	278,688,12,0,-63	2	0041	-- exclam
-"	402,695,0,0,-22	2	0042	-- quotedbl
+ha	606,678	2	0	asciicircum
+ti	606,342	0	1	asciitilde
+vS	611,909,17	2	2	Scaron
+vZ	667,909,3	2	3	Zcaron
+vs	444,693,17	2	4	scaron
+vz	500,693,3	2	5	zcaron
+:Y	667,895,3	2	6	Ydieresis
+tm	998,678	2	7	trademark
+aq	227,695	2	8	quotesingle
+space	250	0	32	space
+!	278,688,12	2	33	exclam
+"	402,695	2	34	quotedbl
 dq	"
-#	500,673,0,0,-4	2	0043	-- numbersign
+#	500,673	2	35	numbersign
 sh	"
-$	500,721,114,0,-28	2	0044	-- dollar
+$	500,721,114	2	36	dollar
 Do	"
-%	889,714,9,0,-61	2	0045	-- percent
-&	833,684,17,0,-52	2	0046	-- ampersand
-'	278,695,0,0,-29	2	0047	-- quoteright
+%	889,714,9	2	37	percent
+&	833,684,17	2	38	ampersand
+'	278,695	2	39	quoteright
 cq	"
-(	333,723,104,0,-65	2	0050	-- parenleft
-)	333,723,104,0,-28	2	0051	-- parenright
-*	444,695,0,0,-44	2	0052	-- asterisk
-+	606,505,0,0,-51	0	0053	-- plus
-,	250,141,166,0,6	0	0054	-- comma
--	333,305,0,0,-16	0	0055	-- hyphen
+(	333,723,104	2	40	parenleft
+)	333,723,104	2	41	parenright
+*	444,695	2	42	asterisk
++	606,505	0	43	plus
+,	250,141,166,0,6	0	44	comma
+-	333,305	0	45	hyphen
 hy	"
-.	250,144,12,0,-47	0	0056	-- period
-/	296,720,17,9,9	2	0057	-- slash
+.	250,144,12	0	46	period
+/	296,720,17,9,9	2	47	slash
 sl	"
-0	500,660,17,0,-33	2	0060	-- zero
-1	500,670,3,0,-35	2	0061	-- one
-2	500,660,3,0,-25	2	0062	-- two
-3	500,660,17,0,-22	2	0063	-- three
-4	500,672,3,0,-12	2	0064	-- four
-5	500,656,17,0,-42	2	0065	-- five
-6	500,660,17,0,-37	2	0066	-- six
-7	500,656,3,0,-46	2	0067	-- seven
-8	500,660,17,0,-34	2	0070	-- eight
-9	500,660,17,0,-31	2	0071	-- nine
-:	250,454,12,0,-47	0	0072	-- colon
-;	250,454,166,0,6	0	0073	-- semicolon
-<	606,519,15,0,-49	0	0074	-- less
-=	606,396,0,0,-51	0	0075	-- equal
->	606,519,15,0,-49	0	0076	-- greater
-?	444,687,12,0,-43	2	0077	-- question
-@	747,681,12,0,-42	2	0100	-- at
+0	500,660,17	2	48	zero
+1	500,670,3	2	49	one
+2	500,660,3	2	50	two
+3	500,660,17	2	51	three
+4	500,672,3	2	52	four
+5	500,656,17	2	53	five
+6	500,660,17	2	54	six
+7	500,656,3	2	55	seven
+8	500,660,17	2	56	eight
+9	500,660,17	2	57	nine
+:	250,454,12	0	58	colon
+;	250,454,166,0,6	0	59	semicolon
+<	606,519,15	0	60	less
+=	606,396	0	61	equal
+>	606,519,15	0	62	greater
+?	444,687,12	2	63	question
+@	747,681,12	2	64	at
 at	"
-A	778,686,3,0,-24	2	0101	-- A
-B	667,681,3,0,-39	2	0102	-- B
-C	722,695,17,0,-44	2	0103	-- C
-D	833,681,3,0,-35	2	0104	-- D
-E	611,681,4,0,-39	2	0105	-- E
-F	556,681,3,0,-28	2	0106	-- F
-G	833,695,17,0,-47	2	0107	-- G
-H	833,681,3,0,-36	2	0110	-- H
-I	389,681,3,0,-39	2	0111	-- I
-J	389,681,213,0,11	2	0112	-- J
-K	778,681,3,0,-39	2	0113	-- K
-L	611,681,4,0,-39	2	0114	-- L
-M	1000,681,10,0,-32	2	0115	-- M
-N	833,681,16,0,-35	2	0116	-- N
-O	833,695,17,0,-47	2	0117	-- O
-P	611,681,3,0,-39	2	0120	-- P
-Q	833,695,184,0,-47	2	0121	-- Q
-R	722,681,3,0,-39	2	0122	-- R
-S	611,695,17,0,-57	2	0123	-- S
-T	667,681,3,0,-17	2	0124	-- T
-U	778,681,17,0,-26	2	0125	-- U
-V	778,681,3,0,-20	2	0126	-- V
-W	1000,686,3,0,-17	2	0127	-- W
-X	667,695,3,0,-17	2	0130	-- X
-Y	667,695,3,0,-15	2	0131	-- Y
-Z	667,681,3,0,-24	2	0132	-- Z
-[	333,720,104,0,-73	2	0133	-- bracketleft
+A	778,686,3	2	65	A
+B	667,681,3	2	66	B
+C	722,695,17	2	67	C
+D	833,681,3	2	68	D
+E	611,681,4	2	69	E
+F	556,681,3	2	70	F
+G	833,695,17	2	71	G
+H	833,681,3	2	72	H
+I	389,681,3	2	73	I
+J	389,681,213,0,11	2	74	J
+K	778,681,3	2	75	K
+L	611,681,4	2	76	L
+M	1000,681,10	2	77	M
+N	833,681,16	2	78	N
+O	833,695,17	2	79	O
+P	611,681,3	2	80	P
+Q	833,695,184	2	81	Q
+R	722,681,3	2	82	R
+S	611,695,17	2	83	S
+T	667,681,3	2	84	T
+U	778,681,17	2	85	U
+V	778,681,3	2	86	V
+W	1000,686,3	2	87	W
+X	667,695,3	2	88	X
+Y	667,695,3	2	89	Y
+Z	667,681,3	2	90	Z
+[	333,720,104	2	91	bracketleft
 lB	"
-\	606,720,0,0,-72	2	0134	-- backslash
+\	606,720	2	92	backslash
 rs	"
-]	333,720,104,0,-42	2	0135	-- bracketright
+]	333,720,104	2	93	bracketright
 rB	"
-a^	333,681,0,2,2	2	0136	-- circumflex
+a^	333,681,0,2,2	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	278,695,0,0,-29	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	278,695	2	96	quoteleft
 oq	"
-a	500,471,17,0,-40	0	0141	-- a
-b	611,720,17,0,-10	2	0142	-- b
-c	444,471,17,0,-37	0	0143	-- c
-d	611,720,17,0,-42	2	0144	-- d
-e	500,471,17,0,-42	0	0145	-- e
-f	389,720,3,0,-34	2	0146	-- f
-g	556,471,266,0,-26	1	0147	-- g
-h	611,720,3,0,-24	2	0150	-- h
-i	333,706,3,0,-34	2	0151	-- i
-j	333,706,266,0,-3	3	0152	-- j
-k	611,720,3,0,-21	2	0153	-- k
-l	333,720,3,0,-24	2	0154	-- l
-m	889,471,3,0,-24	0	0155	-- m
-n	611,471,3,0,-24	0	0156	-- n
-o	556,471,17,0,-40	0	0157	-- o
-p	611,471,258,0,-29	1	0160	-- p
-q	611,471,258,0,-52	1	0161	-- q
-r	389,471,3,0,-30	0	0162	-- r
-s	444,471,17,0,-39	0	0163	-- s
-t	333,632,17,0,-22	2	0164	-- t
-u	611,471,17,0,-25	0	0165	-- u
-v	556,459,3,0,-11	0	0166	-- v
-w	833,471,3,0,-13	0	0167	-- w
-x	500,471,3,0,-20	0	0170	-- x
-y	556,459,266,0,-10	1	0171	-- y
-z	500,459,3,0,-16	0	0172	-- z
-lC	310,725,117,0,-5	2	0173	-- braceleft
+a	500,471,17	0	97	a
+b	611,720,17	2	98	b
+c	444,471,17	0	99	c
+d	611,720,17	2	100	d
+e	500,471,17	0	101	e
+f	389,720,3	2	102	f
+g	556,471,266	1	103	g
+h	611,720,3	2	104	h
+i	333,706,3	2	105	i
+j	333,706,266	3	106	j
+k	611,720,3	2	107	k
+l	333,720,3	2	108	l
+m	889,471,3	0	109	m
+n	611,471,3	0	110	n
+o	556,471,17	0	111	o
+p	611,471,258	1	112	p
+q	611,471,258	1	113	q
+r	389,471,3	0	114	r
+s	444,471,17	0	115	s
+t	333,632,17	2	116	t
+u	611,471,17	0	117	u
+v	556,459,3	0	118	v
+w	833,471,3	0	119	w
+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,720,0,0,-260	2	0174	-- bar
+ba	606,720	2	124	bar
 |	"
-rC	310,725,117,0,-22	2	0175	-- braceright
+rC	310,725,117	2	125	braceright
 }	"
-a~	333,661,0,16,16	2	0176	-- tilde
+a~	333,661,0,16,16	2	126	tilde
 ~	"
-bq	333,130,160,0,-56	0	0200	-- quotesinglbase
-Fo	500,438,0,0,-36	0	0201	-- guillemotleft
-Fc	500,438,0,0,-37	0	0202	-- guillemotright
-bu	606,516,0,0,-131	0	0203	-- bullet
-Fn	500,703,242,0,-11	2	0204	-- florin
-f/	167,660,0,153,152	2	0205	-- fraction
-%0	1000,724,9,0,-33	2	0206	-- perthousand
-dg	500,682,6,0,-29	2	0207	-- dagger
-dd	500,682,245,0,-32	2	0210	-- daggerdbl
-en	500,291	0	0211	-- endash
-em	1000,291	0	0212	-- emdash
-fi	611,720,3,0,-10	2	0214	-- fi
-fl	611,720,3,0,-17	2	0215	-- fl
-.i	333,471,3,0,-34	0	0220	-- dotlessi
-ga	333,691,0,0,-18	2	0222	-- grave
-a"	333,691,0,57,56	2	0223	-- hungarumlaut
-a.	333,671,0,0,-100	2	0224	-- dotaccent
-ab	333,669,0,0,-15	2	0225	-- breve
-ah	333,685,0,2,2	2	0226	-- caron
-ao	333,700,0,0,-67	2	0227	-- ring
-ho	333,0,246,0,-60	0	0230	-- ogonek
-lq	500,695,0,0,-34	2	0231	-- quotedblleft
-rq	500,695,0,0,-34	2	0232	-- quotedblright
-oe	833,471,17,0,-48	0	0233	-- oe
-/l	333,720,3,1,4	2	0234	-- lslash
-Bq	500,130,160,0,-34	0	0235	-- quotedblbase
-OE	1000,695,17,0,-43	2	0236	-- OE
-/L	611,681,4,0,-16	2	0237	-- Lslash
-r!	278,471,227,0,-59	0	0241	-- exclamdown
-ct	500,554,106,0,-73	0	0242	-- cent
-Po	500,676,19,1,2	2	0243	-- sterling
-Cs	500,533,0,0,-32	0	0244	-- currency
-Ye	500,695,3,0,-17	2	0245	-- yen
-bb	606,720,0,0,-260	2	0246	-- brokenbar
-sc	500,695,217,0,-30	2	0247	-- section
-ad	333,671,0,8,8	2	0250	-- dieresis
-co	747,695,17,0,-26	2	0251	-- copyright
-Of	438,660,0,0,-77	2	0252	-- ordfeminine
-fo	389,438,0,0,-82	0	0253	-- guilsinglleft
-no	606,396,0,0,-51	0	0254	-- logicalnot
-\-	606,298,0,0,-51	0	0255	-- minus
-rg	747,695,17,0,-26	2	0256	-- registered
-a-	333,609,0,0,-1	0	0257	-- macron
-de	400,660,0,0,-50	2	0260	-- degree
-t+-	606,505,0,0,-51	0	0261	-- plusminus
-S2	300,660,0,0,-5	2	0262	-- twosuperior
-S3	300,667,0,0,-9	2	0263	-- threesuperior
-aa	333,691,0,0,-78	2	0264	-- acute
-mc	611,471,225,0,-25	0	0265	-- mu
-ps	641,683,161,0,-19	2	0266	-- paragraph
-pc	250,335,0,0,-47	0	0267	-- periodcentered
-ac	333,0,225,0,-73	0	0270	-- cedilla
-S1	300,665,0,0,-14	2	0271	-- onesuperior
-Om	488,660,0,0,-89	2	0272	-- ordmasculine
-fc	389,438,0,0,-82	0	0273	-- guilsinglright
-14	750,665,2,0,-19	2	0274	-- onequarter
-12	750,665,2,0,-9	2	0275	-- onehalf
-34	750,667,2,0,-15	2	0276	-- threequarters
-r?	444,471,231,0,-33	0	0277	-- questiondown
-`A	778,915,3,0,-24	2	0300	-- Agrave
-'A	778,915,3,0,-24	2	0301	-- Aacute
-^A	778,905,3,0,-24	2	0302	-- Acircumflex
-~A	778,885,3,0,-24	2	0303	-- Atilde
-:A	778,895,3,0,-24	2	0304	-- Adieresis
-oA	778,924,3,0,-24	2	0305	-- Aring
-AE	1000,681,4,0,-12	2	0306	-- AE
-,C	722,695,225,0,-44	2	0307	-- Ccedilla
-`E	611,915,4,0,-39	2	0310	-- Egrave
-'E	611,915,4,0,-39	2	0311	-- Eacute
-^E	611,905,4,0,-39	2	0312	-- Ecircumflex
-:E	611,895,4,0,-39	2	0313	-- Edieresis
-`I	389,915,3,0,-39	2	0314	-- Igrave
-'I	389,915,3,0,-39	2	0315	-- Iacute
-^I	389,905,3,0,-26	2	0316	-- Icircumflex
-:I	389,895,3,0,-20	2	0317	-- Idieresis
--D	833,681,3,0,-10	2	0320	-- Eth
-~N	833,885,16,0,-35	2	0321	-- Ntilde
-`O	833,915,17,0,-47	2	0322	-- Ograve
-'O	833,915,17,0,-47	2	0323	-- Oacute
-^O	833,905,17,0,-47	2	0324	-- Ocircumflex
-~O	833,885,17,0,-47	2	0325	-- Otilde
-:O	833,895,17,0,-47	2	0326	-- Odieresis
-tmu	606,483,0,0,-72	0	0327	-- multiply
-/O	833,698,20,0,-32	2	0330	-- Oslash
-`U	778,915,17,0,-26	2	0331	-- Ugrave
-'U	778,915,17,0,-26	2	0332	-- Uacute
-^U	778,905,17,0,-26	2	0333	-- Ucircumflex
-:U	778,895,17,0,-26	2	0334	-- Udieresis
-'Y	667,915,3,0,-15	2	0335	-- Yacute
-TP	611,681,3,0,-39	2	0336	-- Thorn
-ss	611,720,17,0,-30	2	0337	-- germandbls
-`a	500,711,17,0,-40	2	0340	-- agrave
-'a	500,711,17,0,-40	2	0341	-- aacute
-^a	500,701,17,0,-40	2	0342	-- acircumflex
-~a	500,673,17,0,-40	2	0343	-- atilde
-:a	500,691,17,0,-40	2	0344	-- adieresis
-oa	500,700,17,0,-40	2	0345	-- aring
-ae	778,471,17,0,-46	0	0346	-- ae
-,c	444,471,225,0,-37	0	0347	-- ccedilla
-`e	500,711,17,0,-42	2	0350	-- egrave
-'e	500,711,17,0,-42	2	0351	-- eacute
-^e	500,701,17,0,-42	2	0352	-- ecircumflex
-:e	500,691,17,0,-42	2	0353	-- edieresis
-`i	333,711,3,0,-18	2	0354	-- igrave
-'i	333,711,3,0,-34	2	0355	-- iacute
-^i	333,701,3,2,2	2	0356	-- icircumflex
-:i	333,691,3,8,8	2	0357	-- idieresis
-Sd	556,720,17,0,-40	2	0360	-- eth
-~n	611,673,3,0,-24	2	0361	-- ntilde
-`o	556,711,17,0,-40	2	0362	-- ograve
-'o	556,711,17,0,-40	2	0363	-- oacute
-^o	556,701,17,0,-40	2	0364	-- ocircumflex
-~o	556,673,17,0,-40	2	0365	-- otilde
-:o	556,691,17,0,-40	2	0366	-- odieresis
-tdi	606,510,0,0,-51	0	0367	-- divide
-/o	556,471,18,0,-23	0	0370	-- oslash
-`u	611,711,17,0,-25	2	0371	-- ugrave
-'u	611,711,17,0,-25	2	0372	-- uacute
-^u	611,701,17,0,-25	2	0373	-- ucircumflex
-:u	611,691,17,0,-25	2	0374	-- udieresis
-'y	556,711,266,0,-10	3	0375	-- yacute
-Tp	611,720,258,0,-17	3	0376	-- thorn
-:y	556,691,266,0,-10	3	0377	-- ydieresis
+bq	333,130,160	0	128	quotesinglbase
+Fo	500,438	0	129	guillemotleft
+Fc	500,438	0	130	guillemotright
+bu	606,516	0	131	bullet
+Fn	500,703,242	2	132	florin
+f/	167,660,0,153,152	2	133	fraction
+%0	1000,724,9	2	134	perthousand
+dg	500,682,6	2	135	dagger
+dd	500,682,245	2	136	daggerdbl
+en	500,291	0	137	endash
+em	1000,291	0	138	emdash
+fi	611,720,3	2	140	fi
+fl	611,720,3	2	141	fl
+.i	333,471,3	0	144	dotlessi
+ga	333,691	2	146	grave
+a"	333,691,0,57,56	2	147	hungarumlaut
+a.	333,671	2	148	dotaccent
+ab	333,669	2	149	breve
+ah	333,685,0,2,2	2	150	caron
+ao	333,700	2	151	ring
+ho	333,0,246	0	152	ogonek
+lq	500,695	2	153	quotedblleft
+rq	500,695	2	154	quotedblright
+oe	833,471,17	0	155	oe
+/l	333,720,3,1,4	2	156	lslash
+Bq	500,130,160	0	157	quotedblbase
+OE	1000,695,17	2	158	OE
+/L	611,681,4	2	159	Lslash
+r!	278,471,227	0	161	exclamdown
+ct	500,554,106	0	162	cent
+Po	500,676,19,1,2	2	163	sterling
+Cs	500,533	0	164	currency
+Ye	500,695,3	2	165	yen
+bb	606,720	2	166	brokenbar
+sc	500,695,217	2	167	section
+ad	333,671,0,8,8	2	168	dieresis
+co	747,695,17	2	169	copyright
+Of	438,660	2	170	ordfeminine
+fo	389,438	0	171	guilsinglleft
+tno	606,396	0	172	logicalnot
+\-	606,298	0	173	minus
+rg	747,695,17	2	174	registered
+a-	333,609	0	175	macron
+de	400,660	2	176	degree
+t+-	606,505	0	177	plusminus
+S2	300,660	2	178	twosuperior
+S3	300,667	2	179	threesuperior
+aa	333,691	2	180	acute
+mc	611,471,225	0	181	mu
+ps	641,683,161	2	182	paragraph
+pc	250,335	0	183	periodcentered
+ac	333,0,225	0	184	cedilla
+S1	300,665	2	185	onesuperior
+Om	488,660	2	186	ordmasculine
+fc	389,438	0	187	guilsinglright
+14	750,665,2	2	188	onequarter
+12	750,665,2	2	189	onehalf
+34	750,667,2	2	190	threequarters
+r?	444,471,231	0	191	questiondown
+`A	778,915,3	2	192	Agrave
+'A	778,915,3	2	193	Aacute
+^A	778,905,3	2	194	Acircumflex
+~A	778,885,3	2	195	Atilde
+:A	778,895,3	2	196	Adieresis
+oA	778,924,3	2	197	Aring
+AE	1000,681,4	2	198	AE
+,C	722,695,225	2	199	Ccedilla
+`E	611,915,4	2	200	Egrave
+'E	611,915,4	2	201	Eacute
+^E	611,905,4	2	202	Ecircumflex
+:E	611,895,4	2	203	Edieresis
+`I	389,915,3	2	204	Igrave
+'I	389,915,3	2	205	Iacute
+^I	389,905,3	2	206	Icircumflex
+:I	389,895,3	2	207	Idieresis
+-D	833,681,3	2	208	Eth
+~N	833,885,16	2	209	Ntilde
+`O	833,915,17	2	210	Ograve
+'O	833,915,17	2	211	Oacute
+^O	833,905,17	2	212	Ocircumflex
+~O	833,885,17	2	213	Otilde
+:O	833,895,17	2	214	Odieresis
+tmu	606,483	0	215	multiply
+/O	833,698,20	2	216	Oslash
+`U	778,915,17	2	217	Ugrave
+'U	778,915,17	2	218	Uacute
+^U	778,905,17	2	219	Ucircumflex
+:U	778,895,17	2	220	Udieresis
+'Y	667,915,3	2	221	Yacute
+TP	611,681,3	2	222	Thorn
+ss	611,720,17	2	223	germandbls
+`a	500,711,17	2	224	agrave
+'a	500,711,17	2	225	aacute
+^a	500,701,17	2	226	acircumflex
+~a	500,673,17	2	227	atilde
+:a	500,691,17	2	228	adieresis
+oa	500,700,17	2	229	aring
+ae	778,471,17	0	230	ae
+,c	444,471,225	0	231	ccedilla
+`e	500,711,17	2	232	egrave
+'e	500,711,17	2	233	eacute
+^e	500,701,17	2	234	ecircumflex
+:e	500,691,17	2	235	edieresis
+`i	333,711,3	2	236	igrave
+'i	333,711,3	2	237	iacute
+^i	333,701,3,2,2	2	238	icircumflex
+:i	333,691,3,8,8	2	239	idieresis
+Sd	556,720,17	2	240	eth
+~n	611,673,3	2	241	ntilde
+`o	556,711,17	2	242	ograve
+'o	556,711,17	2	243	oacute
+^o	556,701,17	2	244	ocircumflex
+~o	556,673,17	2	245	otilde
+:o	556,691,17	2	246	odieresis
+tdi	606,510	0	247	divide
+/o	556,471,18	0	248	oslash
+`u	611,711,17	2	249	ugrave
+'u	611,711,17	2	250	uacute
+^u	611,701,17	2	251	ucircumflex
+:u	611,691,17	2	252	udieresis
+'y	556,711,266	3	253	yacute
+Tp	611,720,258	3	254	thorn
+:y	556,691,266	3	255	ydieresis
+u2026	1000,144,12	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PBI b/contrib/groff/font/devps/PBI
index 55784ba..31f5019 100644
--- a/contrib/groff/font/devps/PBI
+++ b/contrib/groff/font/devps/PBI
@@ -124,246 +124,247 @@ w , -55
 y . -37
 y , -37
 charset
-ha	606,678,0,0,-13	2	0000	-- asciicircum
-ti	606,346,0,0,-1	0	0001	-- asciitilde
-vS	556,896,17,51,0,51	2	0002	-- Scaron
-vZ	667,896,3,59,49,59	2	0003	-- Zcaron
-vs	444,692,17,95,25,66	2	0004	-- scaron
-vz	500,692,17,67,19,66	2	0005	-- zcaron
-:Y	611,880,3,114,-4,66	2	0006	-- Ydieresis
-tm	1000,678,0,11,12,11	2	0007	-- trademark
-aq	250,720,0,93,-77,66	2	0010	-- quotesingle
-space	250	0	0040
-!	333,695,17,39,-8,39	2	0041	-- exclam
-"	500,720,0,43,-87,43	2	0042	-- quotedbl
+ha	606,678,0,0,-13	2	0	asciicircum
+ti	606,346,0,0,-1	0	1	asciitilde
+vS	556,896,17,51,0,51	2	2	Scaron
+vZ	667,896,3,59,49,59	2	3	Zcaron
+vs	444,692,17,95,25,66	2	4	scaron
+vz	500,692,17,67,19,66	2	5	zcaron
+:Y	611,880,3,114,-4,66	2	6	Ydieresis
+tm	1000,678,0,11,12,11	2	7	trademark
+aq	250,720,0,93,-77,66	2	8	quotesingle
+space	250	0	32	space
+!	333,695,17,39,-8,39	2	33	exclam
+"	500,720,0,43,-87,43	2	34	quotedbl
 dq	"
-#	500,673,0,46,46,46	2	0043	-- numbersign
+#	500,673,0,46,46,46	2	35	numbersign
 sh	"
-$	500,737,108,27,30,27	2	0044	-- dollar
+$	500,737,108,27,30,27	2	36	dollar
 Do	"
-%	889,697,17,0,-6	2	0045	-- percent
-&	833,695,17,28,-24,28	2	0046	-- ampersand
-'	278,720,0,74,-26,66	2	0047	-- quoteright
+%	889,697,17,0,-6	2	37	percent
+&	833,695,17,28,-24,28	2	38	ampersand
+'	278,720,0,74,-26,66	2	39	quoteright
 cq	"
-(	333,723,129,85,-8,66	2	0050	-- parenleft
-)	333,723,129,15,62,15	2	0051	-- parenright
-*	444,695,0,45,-34,45	2	0052	-- asterisk
-+	606,501,5	0	0053	-- plus
-,	250,147,164,8,83,8	0	0054	-- comma
--	389,300,0,23,13,23	0	0055	-- hyphen
+(	333,723,129,85,-8,66	2	40	parenleft
+)	333,723,129,15,62,15	2	41	parenright
+*	444,695,0,45,-34,45	2	42	asterisk
++	606,501,5	0	43	plus
+,	250,147,164,8,83,8	0	44	comma
+-	389,300,0,23,13,23	0	45	hyphen
 hy	"
-.	250,135,17,0,2	0	0056	-- period
-/	315,720,17,50,49,50	2	0057	-- slash
+.	250,135,17,0,2	0	46	period
+/	315,720,17,50,49,50	2	47	slash
 sl	"
-0	500,683,17,40,8,40	2	0060	-- zero
-1	500,678,3,0,9	2	0061	-- one
-2	500,683,3,4,49,4	2	0062	-- two
-3	500,683,17,0,42	2	0063	-- three
-4	500,683,3,37,47,37	2	0064	-- four
-5	500,675,17,31,36,31	2	0065	-- five
-6	500,683,17,38,11,38	2	0066	-- six
-7	500,674,3,94,-19,66	2	0067	-- seven
-8	500,683,17,34,24,34	2	0070	-- eight
-9	500,683,17,41,23,41	2	0071	-- nine
-:	250,452,17,36,12,36	0	0072	-- colon
-;	250,452,164,47,83,47	0	0073	-- semicolon
-<	606,517,21,2,1,2	0	0074	-- less
-=	606,390,0,0,-1	0	0075	-- equal
->	606,517,21,1,2,1	0	0076	-- greater
-?	444,695,17,56,-41,56	2	0077	-- question
-@	833,681,12,0,-32	2	0100	-- at
+0	500,683,17,40,8,40	2	48	zero
+1	500,678,3,0,9	2	49	one
+2	500,683,3,4,49,4	2	50	two
+3	500,683,17,0,42	2	51	three
+4	500,683,3,37,47,37	2	52	four
+5	500,675,17,31,36,31	2	53	five
+6	500,683,17,38,11,38	2	54	six
+7	500,674,3,94,-19,66	2	55	seven
+8	500,683,17,34,24,34	2	56	eight
+9	500,683,17,41,23,41	2	57	nine
+:	250,452,17,36,12,36	0	58	colon
+;	250,452,164,47,83,47	0	59	semicolon
+<	606,517,21,2,1,2	0	60	less
+=	606,390,0,0,-1	0	61	equal
+>	606,517,21,1,2,1	0	62	greater
+?	444,695,17,56,-41,56	2	63	question
+@	833,681,12,0,-32	2	64	at
 at	"
-A	722,683,3,13,85,13	2	0101	-- A
-B	667,681,3,12,42,12	2	0102	-- B
-C	685,695,17,60,-19,60	2	0103	-- C
-D	778,682,3,19,50,19	2	0104	-- D
-E	611,681,3,45,39,45	2	0105	-- E
-F	556,681,3,87,56,66	2	0106	-- F
-G	778,695,17,22,-22,22	2	0107	-- G
-H	778,681,3,98,62,66	2	0110	-- H
-I	389,681,3,73,51,66	2	0111	-- I
-J	389,681,207,78,79,66	2	0112	-- J
-K	722,681,3,74,60,66	2	0113	-- K
-L	611,681,3,17,24,17	2	0114	-- L
-M	944,681,17,91,73,66	2	0115	-- M
-N	778,681,3,101,52,66	2	0116	-- N
-O	833,695,17,11,-26,11	2	0117	-- O
-P	667,681,3,56,39,56	2	0120	-- P
-Q	833,695,222,11,-26,11	2	0121	-- Q
-R	722,681,3,25,46,25	2	0122	-- R
-S	556,695,17,11,0,11	2	0123	-- S
-T	611,681,3,113,-6,66	2	0124	-- T
-U	778,681,17,97,-33,66	2	0125	-- U
-V	667,681,3,128,-17,66	2	0126	-- V
-W	1000,689,3,123,-17,66	2	0127	-- W
-X	722,681,3,100,59,66	2	0130	-- X
-Y	611,695,3,114,-4,66	2	0131	-- Y
-Z	667,681,3,59,49,59	2	0132	-- Z
-[	333,723,102,98,5,66	2	0133	-- bracketleft
+A	722,683,3,13,85,13	2	65	A
+B	667,681,3,12,42,12	2	66	B
+C	685,695,17,60,-19,60	2	67	C
+D	778,682,3,19,50,19	2	68	D
+E	611,681,3,45,39,45	2	69	E
+F	556,681,3,87,56,66	2	70	F
+G	778,695,17,22,-22,22	2	71	G
+H	778,681,3,98,62,66	2	72	H
+I	389,681,3,73,51,66	2	73	I
+J	389,681,207,78,79,66	2	74	J
+K	722,681,3,74,60,66	2	75	K
+L	611,681,3,17,24,17	2	76	L
+M	944,681,17,91,73,66	2	77	M
+N	778,681,3,101,52,66	2	78	N
+O	833,695,17,11,-26,11	2	79	O
+P	667,681,3,56,39,56	2	80	P
+Q	833,695,222,11,-26,11	2	81	Q
+R	722,681,3,25,46,25	2	82	R
+S	556,695,17,11,0,11	2	83	S
+T	611,681,3,113,-6,66	2	84	T
+U	778,681,17,97,-33,66	2	85	U
+V	667,681,3,128,-17,66	2	86	V
+W	1000,689,3,123,-17,66	2	87	W
+X	722,681,3,100,59,66	2	88	X
+Y	611,695,3,114,-4,66	2	89	Y
+Z	667,681,3,59,49,59	2	90	Z
+[	333,723,102,98,5,66	2	91	bracketleft
 lB	"
-\	606,720,0,0,-22	2	0134	-- backslash
+\	606,720,0,0,-22	2	92	backslash
 rs	"
-]	333,723,102,32,71,32	2	0135	-- bracketright
+]	333,723,102,32,71,32	2	93	bracketright
 rB	"
-a^	333,684,0,132,-38,66	2	0136	-- circumflex
+a^	333,684,0,132,-38,66	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	278,720,0,63,-15,63	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	278,720,0,63,-15,63	2	96	quoteleft
 oq	"
-a	556,470,17,13,6,13	0	0141	-- a
-b	537,726,17,7,6,7	2	0142	-- b
-c	444,469,17,42,18,42	0	0143	-- c
-d	556,726,17,44,12,44	2	0144	-- d
-e	444,469,17,24,22,24	0	0145	-- e
-f	333,726,271,166,180,66	3	0146	-- f
-g	500,469,271,79,100,66	1	0147	-- g
-h	556,726,17,16,28,16	2	0150	-- h
-i	333,695,17,29,24,29	2	0151	-- i
-j	333,695,271,40,114,40	3	0152	-- j
-k	556,726,17,22,16,22	2	0153	-- k
-l	333,726,17,35,-14,35	2	0154	-- l
-m	833,469,17,20,31,20	0	0155	-- m
-n	556,469,17,15,33,15	0	0156	-- n
-o	556,469,17,0,2	0	0157	-- o
-p	556,469,271,10,71,10	1	0160	-- p
-q	537,469,271,26,18,26	1	0161	-- q
-r	389,469,17,72,30,66	0	0162	-- r
-s	444,469,17,12,25,12	0	0163	-- s
-t	389,636,17,70,8,66	2	0164	-- t
-u	556,469,17,15,28,15	0	0165	-- u
-v	556,469,17,7,31,7	0	0166	-- v
-w	833,469,17,19,23,19	0	0167	-- w
-x	500,469,17,50,58,50	0	0170	-- x
-y	556,469,271,35,37,35	1	0171	-- y
-z	500,469,17,20,19,20	0	0172	-- z
-lC	333,720,105,51,32,51	2	0173	-- braceleft
+a	556,470,17,13,6,13	0	97	a
+b	537,726,17,7,6,7	2	98	b
+c	444,469,17,42,18,42	0	99	c
+d	556,726,17,44,12,44	2	100	d
+e	444,469,17,24,22,24	0	101	e
+f	333,726,271,166,180,66	3	102	f
+g	500,469,271,79,100,66	1	103	g
+h	556,726,17,16,28,16	2	104	h
+i	333,695,17,29,24,29	2	105	i
+j	333,695,271,40,114,40	3	106	j
+k	556,726,17,22,16,22	2	107	k
+l	333,726,17,35,-14,35	2	108	l
+m	833,469,17,20,31,20	0	109	m
+n	556,469,17,15,33,15	0	110	n
+o	556,469,17,0,2	0	111	o
+p	556,469,271,10,71,10	1	112	p
+q	537,469,271,26,18,26	1	113	q
+r	389,469,17,72,30,66	0	114	r
+s	444,469,17,12,25,12	0	115	s
+t	389,636,17,70,8,66	2	116	t
+u	556,469,17,15,28,15	0	117	u
+v	556,469,17,7,31,7	0	118	v
+w	833,469,17,19,23,19	0	119	w
+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,720,0,0,-209	2	0174	-- bar
+ba	606,720,0,0,-209	2	124	bar
 |	"
-rC	333,720,105,32,51,32	2	0175	-- braceright
+rC	333,720,105,32,51,32	2	125	braceright
 }	"
-a~	333,654,0,158,-32,66	2	0176	-- tilde
+a~	333,654,0,158,-32,66	2	126	tilde
 ~	"
-bq	250,145,144,20,53,20	0	0200	-- quotesinglbase
-Fo	500,446,0,8,15,8	0	0201	-- guillemotleft
-Fc	500,443,0,8,15,8	0	0202	-- guillemotright
-bu	606,516,0,0,-81	0	0203	-- bullet
-Fn	500,690,242,29,42,29	2	0204	-- florin
-f/	167,683,0,221,220,66	2	0205	-- fraction
-%0	1000,691,17,0,-15	2	0206	-- perthousand
-dg	556,685,3,0,-17	2	0207	-- dagger
-dd	556,693,153,31,17,31	2	0210	-- daggerdbl
-en	500,282,0,62,62,62	0	0211	-- endash
-em	1000,282,0,62,62,62	0	0212	-- emdash
-fi	611,726,271,27,180,27	3	0214	-- fi
-fl	611,726,271,70,180,66	3	0215	-- fl
-.i	333,469,17,10,24,10	0	0220	-- dotlessi
-ga	333,699,0,39,-60,39	2	0222	-- grave
-a"	333,699,0,126,78,66	2	0223	-- hungarumlaut
-a.	333,668,0,42,-152,42	2	0224	-- dotaccent
-ab	333,680,0,129,-46,66	2	0225	-- breve
-ah	333,684,0,162,-63,66	2	0226	-- caron
-ao	556,714,0,0,-227	2	0227	-- ring
-ho	333,0,206,0,18	0	0230	-- ogonek
-lq	500,720,0,61,-15,61	2	0231	-- quotedblleft
-rq	500,720,0,69,-23,66	2	0232	-- quotedblright
-oe	778,469,17,27,2,27	0	0233	-- oe
-/l	333,726,17,82,37,66	2	0234	-- lslash
-Bq	500,145,144,0,68	0	0235	-- quotedblbase
-OE	944,695,17,67,11,66	2	0236	-- OE
-/L	611,681,3,17,44,17	2	0237	-- Lslash
-r!	333,479,225,0,48	0	0241	-- exclamdown
-ct	500,547,105,6,-2,6	0	0242	-- cent
-Po	500,683,5,51,29,51	2	0243	-- sterling
-Cs	500,533,0,18,18,18	0	0244	-- currency
-Ye	500,695,3,88,39,66	2	0245	-- yen
-bb	606,720,0,0,-209	2	0246	-- brokenbar
-sc	556,695,151,0,3	2	0247	-- section
-ad	333,668,0,143,-40,66	2	0250	-- dieresis
-co	747,695,17,23,24,23	2	0251	-- copyright
-Of	333,684,0,72,3,66	2	0252	-- ordfeminine
-fo	333,446,0,9,-10,9	0	0253	-- guilsinglleft
-no	606,390,0,0,-1	0	0254	-- logicalnot
-\-	606,292,0,0,-1	0	0255	-- minus
-rg	747,695,17,23,24,23	2	0256	-- registered
-a-	333,608,0,135,-26,66	0	0257	-- macron
-de	400,683	2	0260	-- degree
-t+-	606,501	0	0261	-- plusminus
-S2	300,683,0,71,24,66	2	0262	-- twosuperior
-S3	300,683,0,60,27,60	2	0263	-- threesuperior
-aa	333,699,0,109,-103,66	2	0264	-- acute
-mc	556,469,232,15,65,15	0	0265	-- mu
-ps	556,681,204,123,36,66	2	0266	-- paragraph
-pc	250,324,0,6,-17,6	0	0267	-- periodcentered
-ac	333,5,218,0,38	0	0270	-- cedilla
-S1	300,680,0,48,9,48	2	0271	-- onesuperior
-Om	333,683,0,63,-1,63	2	0272	-- ordmasculine
-fc	333,443,0,0,15	0	0273	-- guilsinglright
-14	750,683,2,32,32,32	2	0274	-- onequarter
-12	750,683,2,36,36,36	2	0275	-- onehalf
-34	750,683,2,32,32,32	2	0276	-- threequarters
-r?	444,479,226,0,62	0	0277	-- questiondown
-`A	722,911,3,13,85,13	2	0300	-- Agrave
-'A	722,911,3,13,85,13	2	0301	-- Aacute
-^A	722,896,3,13,85,13	2	0302	-- Acircumflex
-~A	722,866,3,13,85,13	2	0303	-- Atilde
-:A	722,880,3,13,85,13	2	0304	-- Adieresis
-oA	722,926,3,13,85,13	2	0305	-- Aring
-AE	944,681,3,33,79,33	2	0306	-- AE
-,C	685,695,218,60,-19,60	2	0307	-- Ccedilla
-`E	611,911,3,45,39,45	2	0310	-- Egrave
-'E	611,911,3,45,39,45	2	0311	-- Eacute
-^E	611,896,3,45,39,45	2	0312	-- Ecircumflex
-:E	611,880,3,45,39,45	2	0313	-- Edieresis
-`I	389,911,3,73,51,66	2	0314	-- Igrave
-'I	389,911,3,81,51,66	2	0315	-- Iacute
-^I	389,896,3,104,51,66	2	0316	-- Icircumflex
-:I	389,880,3,115,51,66	2	0317	-- Idieresis
--D	778,682,3,19,50,19	2	0320	-- Eth
-~N	778,866,3,101,52,66	2	0321	-- Ntilde
-`O	833,911,17,11,-26,11	2	0322	-- Ograve
-'O	833,911,17,11,-26,11	2	0323	-- Oacute
-^O	833,896,17,11,-26,11	2	0324	-- Ocircumflex
-~O	833,866,17,11,-26,11	2	0325	-- Otilde
-:O	833,880,17,11,-26,11	2	0326	-- Odieresis
-tmu	606,479,0,0,-22	0	0327	-- multiply
-/O	833,730,54,14,-7,14	2	0330	-- Oslash
-`U	778,911,17,97,-33,66	2	0331	-- Ugrave
-'U	778,911,17,97,-33,66	2	0332	-- Uacute
-^U	778,896,17,97,-33,66	2	0333	-- Ucircumflex
-:U	778,880,17,97,-33,66	2	0334	-- Udieresis
-'Y	611,911,3,114,-4,66	2	0335	-- Yacute
-TP	667,681,3,27,39,27	2	0336	-- Thorn
-ss	556,726,271,43,181,43	3	0337	-- germandbls
-`a	556,719,17,13,6,13	2	0340	-- agrave
-'a	556,719,17,13,6,13	2	0341	-- aacute
-^a	556,704,17,21,6,21	2	0342	-- acircumflex
-~a	556,666,17,47,6,47	2	0343	-- atilde
-:a	556,688,17,32,6,32	2	0344	-- adieresis
-oa	556,714,17,13,6,13	2	0345	-- aring
-ae	738,469,17,23,6,23	0	0346	-- ae
-,c	444,469,218,42,18,42	0	0347	-- ccedilla
-`e	444,719,17,24,22,24	2	0350	-- egrave
-'e	444,719,17,54,22,54	2	0351	-- eacute
-^e	444,704,17,77,22,66	2	0352	-- ecircumflex
-:e	444,688,17,88,22,66	2	0353	-- edieresis
-`i	333,719,17,39,24,39	2	0354	-- igrave
-'i	333,719,17,109,24,66	2	0355	-- iacute
-^i	333,704,17,120,24,66	2	0356	-- icircumflex
-:i	333,688,17,143,24,66	2	0357	-- idieresis
-Sd	556,726,17,40,2,40	2	0360	-- eth
-~n	556,666,17,47,33,47	2	0361	-- ntilde
-`o	556,719,17,0,2	2	0362	-- ograve
-'o	556,719,17,0,2	2	0363	-- oacute
-^o	556,704,17,9,2,9	2	0364	-- ocircumflex
-~o	556,666,17,47,2,47	2	0365	-- otilde
-:o	556,688,17,32,2,32	2	0366	-- odieresis
-tdi	606,501,5	0	0367	-- divide
-/o	556,506,50,16,36,16	0	0370	-- oslash
-`u	556,719,17,15,28,15	2	0371	-- ugrave
-'u	556,719,17,15,28,15	2	0372	-- uacute
-^u	556,704,17,15,28,15	2	0373	-- ucircumflex
-:u	556,688,17,32,28,32	2	0374	-- udieresis
-'y	556,719,271,35,37,35	3	0375	-- yacute
-Tp	556,726,271,10,71,10	3	0376	-- thorn
-:y	556,688,271,35,37,35	3	0377	-- ydieresis
+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
+bu	606,516,0,0,-81	0	131	bullet
+Fn	500,690,242,29,42,29	2	132	florin
+f/	167,683,0,221,220,66	2	133	fraction
+%0	1000,691,17,0,-15	2	134	perthousand
+dg	556,685,3,0,-17	2	135	dagger
+dd	556,693,153,31,17,31	2	136	daggerdbl
+en	500,282,0,62,62,62	0	137	endash
+em	1000,282,0,62,62,62	0	138	emdash
+fi	611,726,271,27,180,27	3	140	fi
+fl	611,726,271,70,180,66	3	141	fl
+.i	333,469,17,10,24,10	0	144	dotlessi
+ga	333,699,0,39,-60,39	2	146	grave
+a"	333,699,0,126,78,66	2	147	hungarumlaut
+a.	333,668,0,42,-152,42	2	148	dotaccent
+ab	333,680,0,129,-46,66	2	149	breve
+ah	333,684,0,162,-63,66	2	150	caron
+ao	556,714,0,0,-227	2	151	ring
+ho	333,0,206,0,18	0	152	ogonek
+lq	500,720,0,61,-15,61	2	153	quotedblleft
+rq	500,720,0,69,-23,66	2	154	quotedblright
+oe	778,469,17,27,2,27	0	155	oe
+/l	333,726,17,82,37,66	2	156	lslash
+Bq	500,145,144,0,68	0	157	quotedblbase
+OE	944,695,17,67,11,66	2	158	OE
+/L	611,681,3,17,44,17	2	159	Lslash
+r!	333,479,225,0,48	0	161	exclamdown
+ct	500,547,105,6,-2,6	0	162	cent
+Po	500,683,5,51,29,51	2	163	sterling
+Cs	500,533,0,18,18,18	0	164	currency
+Ye	500,695,3,88,39,66	2	165	yen
+bb	606,720,0,0,-209	2	166	brokenbar
+sc	556,695,151,0,3	2	167	section
+ad	333,668,0,143,-40,66	2	168	dieresis
+co	747,695,17,23,24,23	2	169	copyright
+Of	333,684,0,72,3,66	2	170	ordfeminine
+fo	333,446,0,9,-10,9	0	171	guilsinglleft
+tno	606,390,0,0,-1	0	172	logicalnot
+\-	606,292,0,0,-1	0	173	minus
+rg	747,695,17,23,24,23	2	174	registered
+a-	333,608,0,135,-26,66	0	175	macron
+de	400,683	2	176	degree
+t+-	606,501	0	177	plusminus
+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	556,469,232,15,65,15	0	181	mu
+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
+S1	300,680,0,48,9,48	2	185	onesuperior
+Om	333,683,0,63,-1,63	2	186	ordmasculine
+fc	333,443,0,0,15	0	187	guilsinglright
+14	750,683,2,32,32,32	2	188	onequarter
+12	750,683,2,36,36,36	2	189	onehalf
+34	750,683,2,32,32,32	2	190	threequarters
+r?	444,479,226,0,62	0	191	questiondown
+`A	722,911,3,13,85,13	2	192	Agrave
+'A	722,911,3,13,85,13	2	193	Aacute
+^A	722,896,3,13,85,13	2	194	Acircumflex
+~A	722,866,3,13,85,13	2	195	Atilde
+:A	722,880,3,13,85,13	2	196	Adieresis
+oA	722,926,3,13,85,13	2	197	Aring
+AE	944,681,3,33,79,33	2	198	AE
+,C	685,695,218,60,-19,60	2	199	Ccedilla
+`E	611,911,3,45,39,45	2	200	Egrave
+'E	611,911,3,45,39,45	2	201	Eacute
+^E	611,896,3,45,39,45	2	202	Ecircumflex
+:E	611,880,3,45,39,45	2	203	Edieresis
+`I	389,911,3,73,51,66	2	204	Igrave
+'I	389,911,3,81,51,66	2	205	Iacute
+^I	389,896,3,104,51,66	2	206	Icircumflex
+:I	389,880,3,115,51,66	2	207	Idieresis
+-D	778,682,3,19,50,19	2	208	Eth
+~N	778,866,3,101,52,66	2	209	Ntilde
+`O	833,911,17,11,-26,11	2	210	Ograve
+'O	833,911,17,11,-26,11	2	211	Oacute
+^O	833,896,17,11,-26,11	2	212	Ocircumflex
+~O	833,866,17,11,-26,11	2	213	Otilde
+:O	833,880,17,11,-26,11	2	214	Odieresis
+tmu	606,479,0,0,-22	0	215	multiply
+/O	833,730,54,14,-7,14	2	216	Oslash
+`U	778,911,17,97,-33,66	2	217	Ugrave
+'U	778,911,17,97,-33,66	2	218	Uacute
+^U	778,896,17,97,-33,66	2	219	Ucircumflex
+:U	778,880,17,97,-33,66	2	220	Udieresis
+'Y	611,911,3,114,-4,66	2	221	Yacute
+TP	667,681,3,27,39,27	2	222	Thorn
+ss	556,726,271,43,181,43	3	223	germandbls
+`a	556,719,17,13,6,13	2	224	agrave
+'a	556,719,17,13,6,13	2	225	aacute
+^a	556,704,17,21,6,21	2	226	acircumflex
+~a	556,666,17,47,6,47	2	227	atilde
+:a	556,688,17,32,6,32	2	228	adieresis
+oa	556,714,17,13,6,13	2	229	aring
+ae	738,469,17,23,6,23	0	230	ae
+,c	444,469,218,42,18,42	0	231	ccedilla
+`e	444,719,17,24,22,24	2	232	egrave
+'e	444,719,17,54,22,54	2	233	eacute
+^e	444,704,17,77,22,66	2	234	ecircumflex
+:e	444,688,17,88,22,66	2	235	edieresis
+`i	333,719,17,39,24,39	2	236	igrave
+'i	333,719,17,109,24,66	2	237	iacute
+^i	333,704,17,120,24,66	2	238	icircumflex
+:i	333,688,17,143,24,66	2	239	idieresis
+Sd	556,726,17,40,2,40	2	240	eth
+~n	556,666,17,47,33,47	2	241	ntilde
+`o	556,719,17,0,2	2	242	ograve
+'o	556,719,17,0,2	2	243	oacute
+^o	556,704,17,9,2,9	2	244	ocircumflex
+~o	556,666,17,47,2,47	2	245	otilde
+:o	556,688,17,32,2,32	2	246	odieresis
+tdi	606,501,5	0	247	divide
+/o	556,506,50,16,36,16	0	248	oslash
+`u	556,719,17,15,28,15	2	249	ugrave
+'u	556,719,17,15,28,15	2	250	uacute
+^u	556,704,17,15,28,15	2	251	ucircumflex
+:u	556,688,17,32,28,32	2	252	udieresis
+'y	556,719,271,35,37,35	3	253	yacute
+Tp	556,726,271,10,71,10	3	254	thorn
+:y	556,688,271,35,37,35	3	255	ydieresis
+u2026	1000,135,17,0,-41	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PI b/contrib/groff/font/devps/PI
index 602f47a..4942dc0 100644
--- a/contrib/groff/font/devps/PI
+++ b/contrib/groff/font/devps/PI
@@ -125,246 +125,247 @@ w , -55
 y . -37
 y , -37
 charset
-ha	606,689,0,0,-1	2	0000	-- asciicircum
-ti	606,339,0,0,-1	0	0001	-- asciitilde
-vS	556,907,18,33,8,33	2	0002	-- Scaron
-vZ	667,907,3,20,30,20	2	0003	-- Zcaron
-vs	389,687,11,80,41,68	2	0004	-- scaron
-vz	444,687,11,53,51,53	2	0005	-- zcaron
-:Y	667,847,3,58,-2,58	2	0006	-- Ydieresis
-tm	1000,689,0,1,-2,1	2	0007	-- trademark
-aq	333,733,0,5,-90,5	2	0010	-- quotesingle
-space	250	0	0040
-!	333,733,8,9,-26,9	2	0041	-- exclam
-"	500,733,0,5,-90,5	2	0042	-- quotedbl
+ha	606,689,0,0,-1	2	0	asciicircum
+ti	606,339,0,0,-1	0	1	asciitilde
+vS	556,907,18,33,8,33	2	2	Scaron
+vZ	667,907,3,20,30,20	2	3	Zcaron
+vs	389,687,11,80,41,68	2	4	scaron
+vz	444,687,11,53,51,53	2	5	zcaron
+:Y	667,847,3,58,-2,58	2	6	Ydieresis
+tm	1000,689,0,1,-2,1	2	7	trademark
+aq	333,733,0,5,-90,5	2	8	quotesingle
+space	250	0	32	space
+!	333,733,8,9,-26,9	2	33	exclam
+"	500,733,0,5,-90,5	2	34	quotedbl
 dq	"
-#	500,692,0,45,46,45	2	0043	-- numbersign
+#	500,692,0,45,46,45	2	35	numbersign
 sh	"
-$	500,733,113,2,35,2	2	0044	-- dollar
+$	500,733,113,2,35,2	2	36	dollar
 Do	"
-%	889,710,7,0,-24	2	0045	-- percent
-&	778,692,18,38,3,38	2	0046	-- ampersand
-'	278,733,0,30,-28,30	2	0047	-- quoteright
+%	889,710,7,0,-24	2	37	percent
+&	778,692,18,38,3,38	2	38	ampersand
+'	278,733,0,30,-28,30	2	39	quoteright
 cq	"
-(	333,733,106,48,-4,48	2	0050	-- parenleft
-)	333,733,106,0,48	2	0051	-- parenright
-*	389,706,0,61,-26,61	2	0052	-- asterisk
-+	606,504,0,0,-1	0	0053	-- plus
-,	250,123,143,3,42,3	0	0054	-- comma
--	333,281,0,21,31,21	0	0055	-- hyphen
+(	333,733,106,48,-4,48	2	40	parenleft
+)	333,733,106,0,48	2	41	parenright
+*	389,706,0,61,-26,61	2	42	asterisk
++	606,504,0,0,-1	0	43	plus
+,	250,123,143,3,42,3	0	44	comma
+-	333,281,0,21,31,21	0	45	hyphen
 hy	"
-.	250,112,5,0,-3	0	0056	-- period
-/	296,733,119,146,90,68	2	0057	-- slash
+.	250,112,5,0,-3	0	46	period
+/	296,733,119,146,90,68	2	47	slash
 sl	"
-0	500,699,11,30,14,30	2	0060	-- zero
-1	500,699,3,0,-4	2	0061	-- one
-2	500,699,3,0,38	2	0062	-- two
-3	500,699,11,0,28	2	0063	-- three
-4	500,699,3,28,35,28	2	0064	-- four
-5	500,693,11,41,36,41	2	0065	-- five
-6	500,699,11,19,1,19	2	0066	-- six
-7	500,692,3,52,-3,52	2	0067	-- seven
-8	500,699,11,19,14,19	2	0070	-- eight
-9	500,699,11,18,18,18	2	0071	-- nine
-:	250,458,5,7,6,7	0	0072	-- colon
-;	250,456,146,19,59,19	0	0073	-- semicolon
-<	606,516,6,0,-3	0	0074	-- less
-=	606,378,0,0,-1	0	0075	-- equal
->	606,516,6,0,-3	0	0076	-- greater
-?	500,706,8,0,-64	2	0077	-- question
-@	747,706,18,21,23,21	2	0100	-- at
+0	500,699,11,30,14,30	2	48	zero
+1	500,699,3,0,-4	2	49	one
+2	500,699,3,0,38	2	50	two
+3	500,699,11,0,28	2	51	three
+4	500,699,3,28,35,28	2	52	four
+5	500,693,11,41,36,41	2	53	five
+6	500,699,11,19,1,19	2	54	six
+7	500,692,3,52,-3,52	2	55	seven
+8	500,699,11,19,14,19	2	56	eight
+9	500,699,11,18,18,18	2	57	nine
+:	250,458,5,7,6,7	0	58	colon
+;	250,456,146,19,59,19	0	59	semicolon
+<	606,516,6,0,-3	0	60	less
+=	606,378,0,0,-1	0	61	equal
+>	606,516,6,0,-3	0	62	greater
+?	500,706,8,0,-64	2	63	question
+@	747,706,18,21,23,21	2	64	at
 at	"
-A	722,705,3,5,69,5	2	0101	-- A
-B	611,692,6,0,24	2	0102	-- B
-C	667,706,18,34,5,34	2	0103	-- C
-D	778,692,3,13,22,13	2	0104	-- D
-E	611,692,3,9,20,9	2	0105	-- E
-F	556,692,3,42,50,42	2	0106	-- F
-G	722,706,18,22,0,22	2	0107	-- G
-H	778,692,3,72,53,68	2	0110	-- H
-I	333,692,3,71,43,68	2	0111	-- I
-J	333,692,206,75,85,68	2	0112	-- J
-K	667,692,3,66,37,66	2	0113	-- K
-L	556,692,3,17,34,17	2	0114	-- L
-M	944,692,18,46,69,46	2	0115	-- M
-N	778,692,11,76,48,68	2	0116	-- N
-O	778,706,18,20,-3,20	2	0117	-- O
-P	611,692,3,33,41,33	2	0120	-- P
-Q	778,706,201,20,-3,20	2	0121	-- Q
-R	667,692,3,22,41,22	2	0122	-- R
-S	556,706,18,0,8	2	0123	-- S
-T	611,692,3,74,-3,68	2	0124	-- T
-U	778,692,18,70,-38,68	2	0125	-- U
-V	722,692,8,82,-25,68	2	0126	-- V
-W	944,700,8,86,-21,68	2	0127	-- W
-X	722,692,3,62,30,62	2	0130	-- X
-Y	667,705,3,58,-2,58	2	0131	-- Y
-Z	667,692,3,20,30,20	2	0132	-- Z
-[	333,733,100,43,32,43	2	0133	-- bracketleft
+A	722,705,3,5,69,5	2	65	A
+B	611,692,6,0,24	2	66	B
+C	667,706,18,34,5,34	2	67	C
+D	778,692,3,13,22,13	2	68	D
+E	611,692,3,9,20,9	2	69	E
+F	556,692,3,42,50,42	2	70	F
+G	722,706,18,22,0,22	2	71	G
+H	778,692,3,72,53,68	2	72	H
+I	333,692,3,71,43,68	2	73	I
+J	333,692,206,75,85,68	2	74	J
+K	667,692,3,66,37,66	2	75	K
+L	556,692,3,17,34,17	2	76	L
+M	944,692,18,46,69,46	2	77	M
+N	778,692,11,76,48,68	2	78	N
+O	778,706,18,20,-3,20	2	79	O
+P	611,692,3,33,41,33	2	80	P
+Q	778,706,201,20,-3,20	2	81	Q
+R	667,692,3,22,41,22	2	82	R
+S	556,706,18,0,8	2	83	S
+T	611,692,3,74,-3,68	2	84	T
+U	778,692,18,70,-38,68	2	85	U
+V	722,692,8,82,-25,68	2	86	V
+W	944,700,8,86,-21,68	2	87	W
+X	722,692,3,62,30,62	2	88	X
+Y	667,705,3,58,-2,58	2	89	Y
+Z	667,692,3,20,30,20	2	90	Z
+[	333,733,100,43,32,43	2	91	bracketleft
 lB	"
-\	606,733,0,0,-31	2	0134	-- backslash
+\	606,733,0,0,-31	2	92	backslash
 rs	"
-]	333,733,100,32,43,32	2	0135	-- bracketright
+]	333,733,100,32,43,32	2	93	bracketright
 rB	"
-a^	333,679,0,67,-6,67	2	0136	-- circumflex
+a^	333,679,0,67,-6,67	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	278,733,0,30,-28,30	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	278,733,0,30,-28,30	2	96	quoteleft
 oq	"
-a	444,482,11,12,46,12	0	0141	-- a
-b	463,733,11,20,13,20	2	0142	-- b
-c	407,482,11,32,25,32	0	0143	-- c
-d	500,733,11,33,33,33	2	0144	-- d
-e	389,482,11,35,35,35	0	0145	-- e
-f	278,733,276,185,212,68	3	0146	-- f
-g	500,482,276,48,87,48	1	0147	-- g
-h	500,733,9,21,40,21	2	0150	-- h
-i	278,712,9,36,16,36	2	0151	-- i
-j	278,712,276,37,120,37	3	0152	-- j
-k	444,733,9,55,42,55	2	0153	-- k
-l	278,733,9,23,14,23	2	0154	-- l
-m	778,482,9,12,26,12	0	0155	-- m
-n	556,482,9,8,26,8	0	0156	-- n
-o	444,482,11,17,33,17	0	0157	-- o
-p	500,482,276,15,57,15	1	0160	-- p
-q	463,482,276,19,26,19	1	0161	-- q
-r	389,482,9,45,24,45	0	0162	-- r
-s	389,482,11,6,41,6	0	0163	-- s
-t	333,646,9,27,9,27	2	0164	-- t
-u	556,482,11,6,18,6	0	0165	-- u
-v	500,482,11,27,29,27	0	0166	-- v
-w	722,482,11,27,29,27	0	0167	-- w
-x	500,482,11,34,41,34	0	0170	-- x
-y	500,482,276,40,58,40	1	0171	-- y
-z	444,482,11,22,51,22	0	0172	-- z
-lC	333,733,100,36,35,36	2	0173	-- braceleft
+a	444,482,11,12,46,12	0	97	a
+b	463,733,11,20,13,20	2	98	b
+c	407,482,11,32,25,32	0	99	c
+d	500,733,11,33,33,33	2	100	d
+e	389,482,11,35,35,35	0	101	e
+f	278,733,276,185,212,68	3	102	f
+g	500,482,276,48,87,48	1	103	g
+h	500,733,9,21,40,21	2	104	h
+i	278,712,9,36,16,36	2	105	i
+j	278,712,276,37,120,37	3	106	j
+k	444,733,9,55,42,55	2	107	k
+l	278,733,9,23,14,23	2	108	l
+m	778,482,9,12,26,12	0	109	m
+n	556,482,9,8,26,8	0	110	n
+o	444,482,11,17,33,17	0	111	o
+p	500,482,276,15,57,15	1	112	p
+q	463,482,276,19,26,19	1	113	q
+r	389,482,9,45,24,45	0	114	r
+s	389,482,11,6,41,6	0	115	s
+t	333,646,9,27,9,27	2	116	t
+u	556,482,11,6,18,6	0	117	u
+v	500,482,11,27,29,27	0	118	v
+w	722,482,11,27,29,27	0	119	w
+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,733,0,0,-225	2	0174	-- bar
+ba	606,733,0,0,-225	2	124	bar
 |	"
-rC	333,733,100,35,36,35	2	0175	-- braceright
+rC	333,733,100,35,36,35	2	125	braceright
 }	"
-a~	333,638,0,107,-13,68	0	0176	-- tilde
+a~	333,638,0,107,-13,68	0	126	tilde
 ~	"
-bq	278,120,122,0,23	0	0200	-- quotesinglbase
-Fo	500,440,0,0,-7	0	0201	-- guillemotleft
-Fc	500,440,0,0,-13	0	0202	-- guillemotright
-bu	500,526,0,0,-36	0	0203	-- bullet
-Fn	500,708,276,20,45,20	3	0204	-- florin
-f/	167,699,0,220,220,68	2	0205	-- fraction
-%0	1000,717,6,0,-22	2	0206	-- perthousand
-dg	500,692,0,19,2,19	2	0207	-- dagger
-dd	500,692,162,44,40,44	2	0210	-- daggerdbl
-en	500,278,0,60,60,60	0	0211	-- endash
-em	1000,278,0,60,60,60	0	0212	-- emdash
-fi	528,733,276,24,212,24	3	0214	-- fi
-fl	545,733,276,25,212,25	3	0215	-- fl
-.i	278,482,9,13,16,13	0	0220	-- dotlessi
-ga	333,687,0,27,-36,27	2	0222	-- grave
-a"	333,730,0,102,4,68	2	0223	-- hungarumlaut
-a.	333,645,0,0,-125	2	0224	-- dotaccent
-ab	333,677,0,110,-42,68	2	0225	-- breve
-ah	333,679,0,126,-54,68	2	0226	-- caron
-ao	333,708,0,76,-109,68	2	0227	-- ring
-ho	333,0,207,0,12	0	0230	-- ogonek
-lq	500,733,0,25,-48,25	2	0231	-- quotedblleft
-rq	500,733,0,25,-48,25	2	0232	-- quotedblright
-oe	669,482,11,35,33,35	0	0233	-- oe
-/l	278,733,9,74,60,68	2	0234	-- lslash
-Bq	500,120,122,0,7	0	0235	-- quotedblbase
-OE	1028,706,18,11,-6,11	2	0236	-- OE
-/L	556,692,3,17,66,17	2	0237	-- Lslash
-r!	333,467,276,0,35	1	0241	-- exclamdown
-ct	500,551,96,0,-6	0	0242	-- cent
-Po	500,708,18,29,48,29	2	0243	-- sterling
-Cs	500,577,0,36,36,36	0	0244	-- currency
-Ye	500,699,3,62,15,62	2	0245	-- yen
-bb	606,733,0,0,-225	2	0246	-- brokenbar
-sc	500,706,220,13,36,13	2	0247	-- section
-ad	333,637,0,95,-28,68	0	0250	-- dieresis
-co	747,706,18,39,39,39	2	0251	-- copyright
-Of	333,699,0,38,-10,38	2	0252	-- ordfeminine
-fo	333,440,0,0,-7	0	0253	-- guilsinglleft
-no	606,378,0,0,-1	0	0254	-- logicalnot
-\-	606,280,0,0,-1	0	0255	-- minus
-rg	747,706,18,39,39,39	2	0256	-- registered
-a-	333,589,0,103,-24,68	0	0257	-- macron
-de	400,689,0,40,-40,40	2	0260	-- degree
-t+-	606,504,0,0,-1	0	0261	-- plusminus
-S2	300,699,0,40,37,40	2	0262	-- twosuperior
-S3	300,699,0,54,22,54	2	0263	-- threesuperior
-aa	333,687,0,63,-72,63	2	0264	-- acute
-mc	556,482,226,6,35,6	0	0265	-- mu
-ps	500,692,224,161,17,68	2	0266	-- paragraph
-pc	250,312,0,0,-3	0	0267	-- periodcentered
-ac	333,0,216,0,59	0	0270	-- cedilla
-S1	300,699,0,35,-11,35	2	0271	-- onesuperior
-Om	333,699,0,39,-16,39	2	0272	-- ordmasculine
-fc	333,440,0,0,-13	0	0273	-- guilsinglright
-14	750,699,2,15,19,15	2	0274	-- onequarter
-12	750,699,2,21,19,21	2	0275	-- onehalf
-34	750,699,2,15,15,15	2	0276	-- threequarters
-r?	500,467,246,0,-7	0	0277	-- questiondown
-`A	722,897,3,5,69,5	2	0300	-- Agrave
-'A	722,897,3,5,69,5	2	0301	-- Aacute
-^A	722,889,3,5,69,5	2	0302	-- Acircumflex
-~A	722,866,3,5,69,5	2	0303	-- Atilde
-:A	722,847,3,5,69,5	2	0304	-- Adieresis
-oA	722,918,3,5,69,5	2	0305	-- Aring
-AE	941,692,3,11,54,11	2	0306	-- AE
-,C	667,706,216,34,5,34	2	0307	-- Ccedilla
-`E	611,897,3,9,20,9	2	0310	-- Egrave
-'E	611,897,3,9,20,9	2	0311	-- Eacute
-^E	611,889,3,9,20,9	2	0312	-- Ecircumflex
-:E	611,847,3,9,20,9	2	0313	-- Edieresis
-`I	333,897,3,71,43,68	2	0314	-- Igrave
-'I	333,897,3,123,43,68	2	0315	-- Iacute
-^I	333,889,3,107,43,68	2	0316	-- Icircumflex
-:I	333,847,3,135,43,68	2	0317	-- Idieresis
--D	778,692,3,13,31,13	2	0320	-- Eth
-~N	778,866,11,76,48,68	2	0321	-- Ntilde
-`O	778,897,18,20,-3,20	2	0322	-- Ograve
-'O	778,897,18,20,-3,20	2	0323	-- Oacute
-^O	778,889,18,20,-3,20	2	0324	-- Ocircumflex
-~O	778,866,18,20,-3,20	2	0325	-- Otilde
-:O	778,847,18,20,-3,20	2	0326	-- Odieresis
-tmu	606,474,0,0,-33	0	0327	-- multiply
-/O	778,721,39,34,18,34	2	0330	-- Oslash
-`U	778,897,18,70,-38,68	2	0331	-- Ugrave
-'U	778,897,18,70,-38,68	2	0332	-- Uacute
-^U	778,889,18,70,-38,68	2	0333	-- Ucircumflex
-:U	778,847,18,70,-38,68	2	0334	-- Udieresis
-'Y	667,897,3,58,-2,58	2	0335	-- Yacute
-TP	611,692,3,9,41,9	2	0336	-- Thorn
-ss	500,733,276,38,210,38	3	0337	-- germandbls
-`a	444,707,11,12,46,12	2	0340	-- agrave
-'a	444,707,11,20,46,20	2	0341	-- aacute
-^a	444,699,11,12,46,12	2	0342	-- acircumflex
-~a	444,650,11,52,46,52	2	0343	-- atilde
-:a	444,657,11,40,46,40	2	0344	-- adieresis
-oa	444,728,11,12,46,12	2	0345	-- aring
-ae	638,482,11,35,49,35	0	0346	-- ae
-,c	407,482,216,32,25,32	0	0347	-- ccedilla
-`e	389,707,11,35,35,35	2	0350	-- egrave
-'e	389,707,11,55,35,55	2	0351	-- eacute
-^e	389,699,11,59,35,59	2	0352	-- ecircumflex
-:e	389,657,11,67,35,67	2	0353	-- edieresis
-`i	278,707,9,43,16,43	2	0354	-- igrave
-'i	278,707,9,103,16,68	2	0355	-- iacute
-^i	278,699,9,95,21,68	2	0356	-- icircumflex
-:i	278,657,9,123,16,68	2	0357	-- idieresis
-Sd	444,733,11,84,33,68	2	0360	-- eth
-~n	556,650,9,8,26,8	2	0361	-- ntilde
-`o	444,707,11,17,33,17	2	0362	-- ograve
-'o	444,707,11,20,33,20	2	0363	-- oacute
-^o	444,699,11,17,33,17	2	0364	-- ocircumflex
-~o	444,650,11,52,33,52	2	0365	-- otilde
-:o	444,657,11,40,33,40	2	0366	-- odieresis
-tdi	606,504,0,0,-1	0	0367	-- divide
-/o	444,510,24,66,68,66	0	0370	-- oslash
-`u	556,707,11,6,18,6	2	0371	-- ugrave
-'u	556,707,11,6,18,6	2	0372	-- uacute
-^u	556,699,11,6,18,6	2	0373	-- ucircumflex
-:u	556,657,11,6,18,6	2	0374	-- udieresis
-'y	500,707,276,40,58,40	3	0375	-- yacute
-Tp	500,733,276,0,89	3	0376	-- thorn
-:y	500,657,276,40,58,40	3	0377	-- ydieresis
+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
+bu	500,526,0,0,-36	0	131	bullet
+Fn	500,708,276,20,45,20	3	132	florin
+f/	167,699,0,220,220,68	2	133	fraction
+%0	1000,717,6,0,-22	2	134	perthousand
+dg	500,692,0,19,2,19	2	135	dagger
+dd	500,692,162,44,40,44	2	136	daggerdbl
+en	500,278,0,60,60,60	0	137	endash
+em	1000,278,0,60,60,60	0	138	emdash
+fi	528,733,276,24,212,24	3	140	fi
+fl	545,733,276,25,212,25	3	141	fl
+.i	278,482,9,13,16,13	0	144	dotlessi
+ga	333,687,0,27,-36,27	2	146	grave
+a"	333,730,0,102,4,68	2	147	hungarumlaut
+a.	333,645,0,0,-125	2	148	dotaccent
+ab	333,677,0,110,-42,68	2	149	breve
+ah	333,679,0,126,-54,68	2	150	caron
+ao	333,708,0,76,-109,68	2	151	ring
+ho	333,0,207,0,12	0	152	ogonek
+lq	500,733,0,25,-48,25	2	153	quotedblleft
+rq	500,733,0,25,-48,25	2	154	quotedblright
+oe	669,482,11,35,33,35	0	155	oe
+/l	278,733,9,74,60,68	2	156	lslash
+Bq	500,120,122,0,7	0	157	quotedblbase
+OE	1028,706,18,11,-6,11	2	158	OE
+/L	556,692,3,17,66,17	2	159	Lslash
+r!	333,467,276,0,35	1	161	exclamdown
+ct	500,551,96,0,-6	0	162	cent
+Po	500,708,18,29,48,29	2	163	sterling
+Cs	500,577,0,36,36,36	0	164	currency
+Ye	500,699,3,62,15,62	2	165	yen
+bb	606,733,0,0,-225	2	166	brokenbar
+sc	500,706,220,13,36,13	2	167	section
+ad	333,637,0,95,-28,68	0	168	dieresis
+co	747,706,18,39,39,39	2	169	copyright
+Of	333,699,0,38,-10,38	2	170	ordfeminine
+fo	333,440,0,0,-7	0	171	guilsinglleft
+tno	606,378,0,0,-1	0	172	logicalnot
+\-	606,280,0,0,-1	0	173	minus
+rg	747,706,18,39,39,39	2	174	registered
+a-	333,589,0,103,-24,68	0	175	macron
+de	400,689,0,40,-40,40	2	176	degree
+t+-	606,504,0,0,-1	0	177	plusminus
+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	556,482,226,6,35,6	0	181	mu
+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
+S1	300,699,0,35,-11,35	2	185	onesuperior
+Om	333,699,0,39,-16,39	2	186	ordmasculine
+fc	333,440,0,0,-13	0	187	guilsinglright
+14	750,699,2,15,19,15	2	188	onequarter
+12	750,699,2,21,19,21	2	189	onehalf
+34	750,699,2,15,15,15	2	190	threequarters
+r?	500,467,246,0,-7	0	191	questiondown
+`A	722,897,3,5,69,5	2	192	Agrave
+'A	722,897,3,5,69,5	2	193	Aacute
+^A	722,889,3,5,69,5	2	194	Acircumflex
+~A	722,866,3,5,69,5	2	195	Atilde
+:A	722,847,3,5,69,5	2	196	Adieresis
+oA	722,918,3,5,69,5	2	197	Aring
+AE	941,692,3,11,54,11	2	198	AE
+,C	667,706,216,34,5,34	2	199	Ccedilla
+`E	611,897,3,9,20,9	2	200	Egrave
+'E	611,897,3,9,20,9	2	201	Eacute
+^E	611,889,3,9,20,9	2	202	Ecircumflex
+:E	611,847,3,9,20,9	2	203	Edieresis
+`I	333,897,3,71,43,68	2	204	Igrave
+'I	333,897,3,123,43,68	2	205	Iacute
+^I	333,889,3,107,43,68	2	206	Icircumflex
+:I	333,847,3,135,43,68	2	207	Idieresis
+-D	778,692,3,13,31,13	2	208	Eth
+~N	778,866,11,76,48,68	2	209	Ntilde
+`O	778,897,18,20,-3,20	2	210	Ograve
+'O	778,897,18,20,-3,20	2	211	Oacute
+^O	778,889,18,20,-3,20	2	212	Ocircumflex
+~O	778,866,18,20,-3,20	2	213	Otilde
+:O	778,847,18,20,-3,20	2	214	Odieresis
+tmu	606,474,0,0,-33	0	215	multiply
+/O	778,721,39,34,18,34	2	216	Oslash
+`U	778,897,18,70,-38,68	2	217	Ugrave
+'U	778,897,18,70,-38,68	2	218	Uacute
+^U	778,889,18,70,-38,68	2	219	Ucircumflex
+:U	778,847,18,70,-38,68	2	220	Udieresis
+'Y	667,897,3,58,-2,58	2	221	Yacute
+TP	611,692,3,9,41,9	2	222	Thorn
+ss	500,733,276,38,210,38	3	223	germandbls
+`a	444,707,11,12,46,12	2	224	agrave
+'a	444,707,11,20,46,20	2	225	aacute
+^a	444,699,11,12,46,12	2	226	acircumflex
+~a	444,650,11,52,46,52	2	227	atilde
+:a	444,657,11,40,46,40	2	228	adieresis
+oa	444,728,11,12,46,12	2	229	aring
+ae	638,482,11,35,49,35	0	230	ae
+,c	407,482,216,32,25,32	0	231	ccedilla
+`e	389,707,11,35,35,35	2	232	egrave
+'e	389,707,11,55,35,55	2	233	eacute
+^e	389,699,11,59,35,59	2	234	ecircumflex
+:e	389,657,11,67,35,67	2	235	edieresis
+`i	278,707,9,43,16,43	2	236	igrave
+'i	278,707,9,103,16,68	2	237	iacute
+^i	278,699,9,95,21,68	2	238	icircumflex
+:i	278,657,9,123,16,68	2	239	idieresis
+Sd	444,733,11,84,33,68	2	240	eth
+~n	556,650,9,8,26,8	2	241	ntilde
+`o	444,707,11,17,33,17	2	242	ograve
+'o	444,707,11,20,33,20	2	243	oacute
+^o	444,699,11,17,33,17	2	244	ocircumflex
+~o	444,650,11,52,33,52	2	245	otilde
+:o	444,657,11,40,33,40	2	246	odieresis
+tdi	606,504,0,0,-1	0	247	divide
+/o	444,510,24,66,68,66	0	248	oslash
+`u	556,707,11,6,18,6	2	249	ugrave
+'u	556,707,11,6,18,6	2	250	uacute
+^u	556,699,11,6,18,6	2	251	ucircumflex
+:u	556,657,11,6,18,6	2	252	udieresis
+'y	500,707,276,40,58,40	3	253	yacute
+Tp	500,733,276,0,89	3	254	thorn
+:y	500,657,276,40,58,40	3	255	ydieresis
+u2026	1000,112,5,0,-52	0	256	ellipsis
diff --git a/contrib/groff/font/devps/PR b/contrib/groff/font/devps/PR
index 5ba7578..a4e4447 100644
--- a/contrib/groff/font/devps/PR
+++ b/contrib/groff/font/devps/PR
@@ -125,246 +125,247 @@ w , -92
 y . -111
 y , -111
 charset
-ha	606,689,0,0,-51	2	0000	-- asciicircum
-ti	606,347,0,0,-51	0	0001	-- asciitilde
-vS	525,908,20,0,-24	2	0002	-- Scaron
-vZ	667,908,3,0,-15	2	0003	-- Zcaron
-vs	424,685,20,0,-30	2	0004	-- scaron
-vz	500,685,3,0,-16	2	0005	-- zcaron
-:Y	667,868,3,0,-9	2	0006	-- Ydieresis
-tm	979,689,0,0,-40	2	0007	-- trademark
-aq	208,709,0,0,-61	2	0010	-- quotesingle
-space	250	0	0040
-!	278,694,5,0,-81	2	0041	-- exclam
-"	371,709,0,0,-52	2	0042	-- quotedbl
+ha	606,689	2	0	asciicircum
+ti	606,347	0	1	asciitilde
+vS	525,908,20	2	2	Scaron
+vZ	667,908,3	2	3	Zcaron
+vs	424,685,20	2	4	scaron
+vz	500,685,3	2	5	zcaron
+:Y	667,868,3	2	6	Ydieresis
+tm	979,689	2	7	trademark
+aq	208,709	2	8	quotesingle
+space	250	0	32	space
+!	278,694,5	2	33	exclam
+"	371,709	2	34	quotedbl
 dq	"
-#	500,684,0,0,-4	2	0043	-- numbersign
+#	500,684	2	35	numbersign
 sh	"
-$	500,731,116,0,-30	2	0044	-- dollar
+$	500,731,116	2	36	dollar
 Do	"
-%	840,709,20,0,-39	2	0045	-- percent
-&	778,689,20,0,-43	2	0046	-- ampersand
-'	278,709,0,0,-45	2	0047	-- quoteright
+%	840,709,20	2	37	percent
+&	778,689,20	2	38	ampersand
+'	278,709	2	39	quoteright
 cq	"
-(	333,726,215,0,-60	2	0050	-- parenleft
-)	333,726,215,0,-32	2	0051	-- parenright
-*	389,689,0,0,-32	2	0052	-- asterisk
-+	606,512,0,0,-51	0	0053	-- plus
-,	250,123,155,0,-16	0	0054	-- comma
--	333,287,0,0,-17	0	0055	-- hyphen
+(	333,726,215	2	40	parenleft
+)	333,726,215	2	41	parenright
+*	389,689	2	42	asterisk
++	606,512	0	43	plus
+,	250,123,155	0	44	comma
+-	333,287	0	45	hyphen
 hy	"
-.	250,111,5,0,-67	0	0056	-- period
-/	606,726,119,0,-87	2	0057	-- slash
+.	250,111,5	0	46	period
+/	606,726,119	2	47	slash
 sl	"
-0	500,689,20,0,-29	2	0060	-- zero
-1	500,694,3,0,-60	2	0061	-- one
-2	500,689,3,0,-16	2	0062	-- two
-3	500,689,20,0,-15	2	0063	-- three
-4	500,694,3,0,-2	2	0064	-- four
-5	500,689,20,0,-13	2	0065	-- five
-6	500,689,20,0,-32	2	0066	-- six
-7	500,689,3,0,-44	2	0067	-- seven
-8	500,689,20,0,-30	2	0070	-- eight
-9	500,689,20,0,-20	2	0071	-- nine
-:	250,456,5,0,-66	0	0072	-- colon
-;	250,456,153,0,-16	0	0073	-- semicolon
-<	606,522,0,0,-57	0	0074	-- less
-=	606,386,0,0,-51	0	0075	-- equal
->	606,522,0,0,-48	0	0076	-- greater
-?	444,694,5,0,-43	2	0077	-- question
-@	747,694,20,0,-24	2	0100	-- at
+0	500,689,20	2	48	zero
+1	500,694,3	2	49	one
+2	500,689,3	2	50	two
+3	500,689,20	2	51	three
+4	500,694,3	2	52	four
+5	500,689,20	2	53	five
+6	500,689,20	2	54	six
+7	500,689,3	2	55	seven
+8	500,689,20	2	56	eight
+9	500,689,20	2	57	nine
+:	250,456,5	0	58	colon
+;	250,456,153	0	59	semicolon
+<	606,522	0	60	less
+=	606,386	0	61	equal
+>	606,522	0	62	greater
+?	444,694,5	2	63	question
+@	747,694,20	2	64	at
 at	"
-A	778,700,3,0,-15	2	0101	-- A
-B	611,692,3,0,-26	2	0102	-- B
-C	709,709,20,0,-22	2	0103	-- C
-D	774,692,3,0,-22	2	0104	-- D
-E	611,692,3,0,-22	2	0105	-- E
-F	556,692,3,0,-22	2	0106	-- F
-G	763,709,20,0,-22	2	0107	-- G
-H	832,692,3,0,-22	2	0110	-- H
-I	337,692,3,0,-22	2	0111	-- I
-J	333,692,194,0,15	2	0112	-- J
-K	726,692,3,0,-22	2	0113	-- K
-L	611,692,3,0,-22	2	0114	-- L
-M	946,692,13,0,-16	2	0115	-- M
-N	831,692,20,0,-17	2	0116	-- N
-O	786,709,20,0,-22	2	0117	-- O
-P	604,692,3,0,-22	2	0120	-- P
-Q	786,709,176,0,-22	2	0121	-- Q
-R	668,692,3,1,-22	2	0122	-- R
-S	525,709,20,0,-24	2	0123	-- S
-T	613,692,3,0,-18	2	0124	-- T
-U	778,692,20,0,-12	2	0125	-- U
-V	722,692,9,0,-8	2	0126	-- V
-W	1000,700,9,0,-8	2	0127	-- W
-X	667,700,3,0,-14	2	0130	-- X
-Y	667,704,3,0,-9	2	0131	-- Y
-Z	667,692,3,0,-15	2	0132	-- Z
-[	333,726,184,0,-79	2	0133	-- bracketleft
+A	778,700,3	2	65	A
+B	611,692,3	2	66	B
+C	709,709,20	2	67	C
+D	774,692,3	2	68	D
+E	611,692,3	2	69	E
+F	556,692,3	2	70	F
+G	763,709,20	2	71	G
+H	832,692,3	2	72	H
+I	337,692,3	2	73	I
+J	333,692,194,0,15	2	74	J
+K	726,692,3	2	75	K
+L	611,692,3	2	76	L
+M	946,692,13	2	77	M
+N	831,692,20	2	78	N
+O	786,709,20	2	79	O
+P	604,692,3	2	80	P
+Q	786,709,176	2	81	Q
+R	668,692,3,1	2	82	R
+S	525,709,20	2	83	S
+T	613,692,3	2	84	T
+U	778,692,20	2	85	U
+V	722,692,9	2	86	V
+W	1000,700,9	2	87	W
+X	667,700,3	2	88	X
+Y	667,704,3	2	89	Y
+Z	667,692,3	2	90	Z
+[	333,726,184	2	91	bracketleft
 lB	"
-\	606,726,0,0,-81	2	0134	-- backslash
+\	606,726	2	92	backslash
 rs	"
-]	333,726,184,0,-45	2	0135	-- bracketright
+]	333,726,184	2	93	bracketright
 rB	"
-a^	333,677,0,0,-11	2	0136	-- circumflex
+a^	333,677	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	278,709,0,0,-45	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	278,709	2	96	quoteleft
 oq	"
-a	500,469,12,0,-32	0	0141	-- a
-b	553,726,12,0,15	2	0142	-- b
-c	444,469,20,0,-26	0	0143	-- c
-d	611,726,12,0,-35	2	0144	-- d
-e	479,469,20,0,-26	0	0145	-- e
-f	333,728,3,8,-23	2	0146	-- f
-g	556,469,283,0,-32	1	0147	-- g
-h	582,726,3,0,-6	2	0150	-- h
-i	291,687,3,0,-21	2	0151	-- i
-j	234,688,283,0,40	3	0152	-- j
-k	556,726,12,0,-21	2	0153	-- k
-l	291,726,3,0,-21	2	0154	-- l
-m	883,469,3,0,-16	0	0155	-- m
-n	582,469,3,0,-6	0	0156	-- n
-o	546,469,20,0,-32	0	0157	-- o
-p	601,469,281,0,-8	1	0160	-- p
-q	560,469,281,0,-35	1	0161	-- q
-r	395,469,3,0,-21	0	0162	-- r
-s	424,469,20,0,-30	0	0163	-- s
-t	326,621,12,0,-22	2	0164	-- t
-u	603,469,12,0,-18	0	0165	-- u
-v	565,459,7,0,-6	0	0166	-- v
-w	834,469,7,0,-6	0	0167	-- w
-x	516,469,3,0,-20	0	0170	-- x
-y	556,459,283,0,-12	1	0171	-- y
-z	500,462,3,0,-16	0	0172	-- z
-lC	333,726,175,0,-58	2	0173	-- braceleft
+a	500,469,12	0	97	a
+b	553,726,12,0,15	2	98	b
+c	444,469,20	0	99	c
+d	611,726,12	2	100	d
+e	479,469,20	0	101	e
+f	333,728,3,8	2	102	f
+g	556,469,283	1	103	g
+h	582,726,3	2	104	h
+i	291,687,3	2	105	i
+j	234,688,283,0,40	3	106	j
+k	556,726,12	2	107	k
+l	291,726,3	2	108	l
+m	883,469,3	0	109	m
+n	582,469,3	0	110	n
+o	546,469,20	0	111	o
+p	601,469,281	1	112	p
+q	560,469,281	1	113	q
+r	395,469,3	0	114	r
+s	424,469,20	0	115	s
+t	326,621,12	2	116	t
+u	603,469,12	0	117	u
+v	565,459,7	0	118	v
+w	834,469,7	0	119	w
+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,726,0,0,-275	2	0174	-- bar
+ba	606,726	2	124	bar
 |	"
-rC	333,726,175,0,-44	2	0175	-- braceright
+rC	333,726,175	2	125	braceright
 }	"
-a~	333,640,0,0,-2	2	0176	-- tilde
+a~	333,640	2	126	tilde
 ~	"
-bq	278,110,153,0,-22	0	0200	-- quotesinglbase
-Fo	500,428,0,0,-50	0	0201	-- guillemotleft
-Fc	500,428,0,0,-50	0	0202	-- guillemotright
-bu	606,516,0,0,-131	0	0203	-- bullet
-Fn	500,706,262	2	0204	-- florin
-f/	167,689,0,170,166	2	0205	-- fraction
-%0	1144,709,20,0,-123	2	0206	-- perthousand
-dg	500,694,5,0,-34	2	0207	-- dagger
-dd	500,694,249,0,-34	2	0210	-- daggerdbl
-en	500,277	0	0211	-- endash
-em	1000,277	0	0212	-- emdash
-fi	605,728,3,0,-23	2	0214	-- fi
-fl	608,728,3,0,-23	2	0215	-- fl
-.i	287,469,3,0,-21	0	0220	-- dotlessi
-ga	333,677,0,0,-31	2	0222	-- grave
-a"	380,687,0,0,-3	2	0223	-- hungarumlaut
-a.	250,637,0,0,-75	2	0224	-- dotaccent
-ab	333,664,0,0,-26	2	0225	-- breve
-ah	333,677,0,0,-11	2	0226	-- caron
-ao	333,696,0,0,-67	2	0227	-- ring
-ho	313,0,165,0,-68	0	0230	-- ogonek
-lq	500,709,0,0,-51	2	0231	-- quotedblleft
-rq	500,709,0,0,-51	2	0232	-- quotedblright
-oe	827,469,20,0,-32	0	0233	-- oe
-/l	291,726,3,15,14	2	0234	-- lslash
-Bq	500,110,153,0,-51	0	0235	-- quotedblbase
-OE	998,709,20,0,-22	2	0236	-- OE
-/L	611,692,3,0,-6	2	0237	-- Lslash
-r!	278,469,225,0,-81	0	0241	-- exclamdown
-ct	500,562,101,0,-61	0	0242	-- cent
-Po	500,694,13,0,-12	2	0243	-- sterling
-Cs	500,531,0,0,-30	0	0244	-- currency
-Ye	500,701,3,0,-5	2	0245	-- yen
-bb	606,726,0,0,-275	2	0246	-- brokenbar
-sc	500,709,219,0,-26	2	0247	-- section
-ad	333,637,0,0,-17	2	0250	-- dieresis
-co	747,706,18,0,-11	2	0251	-- copyright
-Of	333,709,0,0,-24	2	0252	-- ordfeminine
-fo	331,428,0,0,-66	0	0253	-- guilsinglleft
-no	606,386,0,0,-51	0	0254	-- logicalnot
-\-	606,289,0,0,-51	0	0255	-- minus
-rg	747,706,18,0,-11	2	0256	-- registered
-a-	333,591,0,0,-11	0	0257	-- macron
-de	400,689,0,0,-50	2	0260	-- degree
-t+-	606,512,0,0,-51	0	0261	-- plusminus
-S2	300,689,0,1	2	0262	-- twosuperior
-S3	300,689,0,0,-1	2	0263	-- threesuperior
-aa	333,677,0,0,-78	2	0264	-- acute
-mc	603,469,236,0,-18	0	0265	-- mu
-ps	628,694,150,0,-39	2	0266	-- paragraph
-pc	250,319,0,0,-67	0	0267	-- periodcentered
-ac	333,0,225,0,-96	0	0270	-- cedilla
-S1	300,692,0,0,-31	2	0271	-- onesuperior
-Om	333,709,0,0,-10	2	0272	-- ordmasculine
-fc	331,428,0,0,-66	0	0273	-- guilsinglright
-14	750,692,3,0,-30	2	0274	-- onequarter
-12	750,692,3,0,-15	2	0275	-- onehalf
-34	750,689,3,0,-15	2	0276	-- threequarters
-r?	444,469,231,0,-43	0	0277	-- questiondown
-`A	778,908,3,0,-15	2	0300	-- Agrave
-'A	778,908,3,0,-15	2	0301	-- Aacute
-^A	778,908,3,0,-15	2	0302	-- Acircumflex
-~A	778,871,3,0,-15	2	0303	-- Atilde
-:A	778,868,3,0,-15	2	0304	-- Adieresis
-oA	778,927,3,0,-15	2	0305	-- Aring
-AE	944,692,3,0,10	2	0306	-- AE
-,C	709,709,225,0,-22	2	0307	-- Ccedilla
-`E	611,908,3,0,-22	2	0310	-- Egrave
-'E	611,908,3,0,-22	2	0311	-- Eacute
-^E	611,908,3,0,-22	2	0312	-- Ecircumflex
-:E	611,868,3,0,-22	2	0313	-- Edieresis
-`I	337,908,3,0,-22	2	0314	-- Igrave
-'I	337,908,3,0,-22	2	0315	-- Iacute
-^I	337,908,3,0,-13	2	0316	-- Icircumflex
-:I	337,868,3,0,-19	2	0317	-- Idieresis
--D	774,692,3,0,-14	2	0320	-- Eth
-~N	831,871,20,0,-17	2	0321	-- Ntilde
-`O	786,908,20,0,-22	2	0322	-- Ograve
-'O	786,908,20,0,-22	2	0323	-- Oacute
-^O	786,908,20,0,-22	2	0324	-- Ocircumflex
-~O	786,883,20,0,-22	2	0325	-- Otilde
-:O	786,868,20,0,-22	2	0326	-- Odieresis
-tmu	606,474,0,0,-83	0	0327	-- multiply
-/O	833,709,20,0,-30	2	0330	-- Oslash
-`U	778,908,20,0,-12	2	0331	-- Ugrave
-'U	778,908,20,0,-12	2	0332	-- Uacute
-^U	778,908,20,0,-12	2	0333	-- Ucircumflex
-:U	778,868,20,0,-12	2	0334	-- Udieresis
-'Y	667,908,3,0,-9	2	0335	-- Yacute
-TP	604,692,3,0,-32	2	0336	-- Thorn
-ss	556,731,9,0,-23	2	0337	-- germandbls
-`a	500,697,12,0,-32	2	0340	-- agrave
-'a	500,697,12,0,-32	2	0341	-- aacute
-^a	500,697,12,0,-32	2	0342	-- acircumflex
-~a	500,652,12,0,-32	2	0343	-- atilde
-:a	500,657,12,0,-32	2	0344	-- adieresis
-oa	500,716,12,0,-32	2	0345	-- aring
-ae	758,469,20,0,-30	0	0346	-- ae
-,c	444,469,225,0,-26	0	0347	-- ccedilla
-`e	479,697,20,0,-26	2	0350	-- egrave
-'e	479,697,20,0,-26	2	0351	-- eacute
-^e	479,697,20,0,-26	2	0352	-- ecircumflex
-:e	479,657,20,0,-26	2	0353	-- edieresis
-`i	287,697,3,0,-8	2	0354	-- igrave
-'i	287,697,3,0,-21	2	0355	-- iacute
-^i	287,697,3,13,12	2	0356	-- icircumflex
-:i	287,657,3,6,6	2	0357	-- idieresis
-Sd	546,728,20,0,-32	2	0360	-- eth
-~n	582,652,3,0,-6	2	0361	-- ntilde
-`o	546,697,20,0,-32	2	0362	-- ograve
-'o	546,697,20,0,-32	2	0363	-- oacute
-^o	546,697,20,0,-32	2	0364	-- ocircumflex
-~o	546,652,20,0,-32	2	0365	-- otilde
-:o	546,657,20,0,-32	2	0366	-- odieresis
-tdi	606,512,0,0,-51	0	0367	-- divide
-/o	556,474,23,0,-16	0	0370	-- oslash
-`u	603,697,12,0,-18	2	0371	-- ugrave
-'u	603,697,12,0,-18	2	0372	-- uacute
-^u	603,697,12,0,-18	2	0373	-- ucircumflex
-:u	603,657,12,0,-18	2	0374	-- udieresis
-'y	556,697,283,0,-12	3	0375	-- yacute
-Tp	601,726,281,0,2	3	0376	-- thorn
-:y	556,657,283,0,-12	3	0377	-- ydieresis
+bq	278,110,153	0	128	quotesinglbase
+Fo	500,428	0	129	guillemotleft
+Fc	500,428	0	130	guillemotright
+bu	606,516	0	131	bullet
+Fn	500,706,262	2	132	florin
+f/	167,689,0,170,166	2	133	fraction
+%0	1144,709,20	2	134	perthousand
+dg	500,694,5	2	135	dagger
+dd	500,694,249	2	136	daggerdbl
+en	500,277	0	137	endash
+em	1000,277	0	138	emdash
+fi	605,728,3	2	140	fi
+fl	608,728,3	2	141	fl
+.i	287,469,3	0	144	dotlessi
+ga	333,677	2	146	grave
+a"	380,687	2	147	hungarumlaut
+a.	250,637	2	148	dotaccent
+ab	333,664	2	149	breve
+ah	333,677	2	150	caron
+ao	333,696	2	151	ring
+ho	313,0,165	0	152	ogonek
+lq	500,709	2	153	quotedblleft
+rq	500,709	2	154	quotedblright
+oe	827,469,20	0	155	oe
+/l	291,726,3,15,14	2	156	lslash
+Bq	500,110,153	0	157	quotedblbase
+OE	998,709,20	2	158	OE
+/L	611,692,3	2	159	Lslash
+r!	278,469,225	0	161	exclamdown
+ct	500,562,101	0	162	cent
+Po	500,694,13	2	163	sterling
+Cs	500,531	0	164	currency
+Ye	500,701,3	2	165	yen
+bb	606,726	2	166	brokenbar
+sc	500,709,219	2	167	section
+ad	333,637	2	168	dieresis
+co	747,706,18	2	169	copyright
+Of	333,709	2	170	ordfeminine
+fo	331,428	0	171	guilsinglleft
+tno	606,386	0	172	logicalnot
+\-	606,289	0	173	minus
+rg	747,706,18	2	174	registered
+a-	333,591	0	175	macron
+de	400,689	2	176	degree
+t+-	606,512	0	177	plusminus
+S2	300,689,0,1	2	178	twosuperior
+S3	300,689	2	179	threesuperior
+aa	333,677	2	180	acute
+mc	603,469,236	0	181	mu
+ps	628,694,150	2	182	paragraph
+pc	250,319	0	183	periodcentered
+ac	333,0,225	0	184	cedilla
+S1	300,692	2	185	onesuperior
+Om	333,709	2	186	ordmasculine
+fc	331,428	0	187	guilsinglright
+14	750,692,3	2	188	onequarter
+12	750,692,3	2	189	onehalf
+34	750,689,3	2	190	threequarters
+r?	444,469,231	0	191	questiondown
+`A	778,908,3	2	192	Agrave
+'A	778,908,3	2	193	Aacute
+^A	778,908,3	2	194	Acircumflex
+~A	778,871,3	2	195	Atilde
+:A	778,868,3	2	196	Adieresis
+oA	778,927,3	2	197	Aring
+AE	944,692,3,0,10	2	198	AE
+,C	709,709,225	2	199	Ccedilla
+`E	611,908,3	2	200	Egrave
+'E	611,908,3	2	201	Eacute
+^E	611,908,3	2	202	Ecircumflex
+:E	611,868,3	2	203	Edieresis
+`I	337,908,3	2	204	Igrave
+'I	337,908,3	2	205	Iacute
+^I	337,908,3	2	206	Icircumflex
+:I	337,868,3	2	207	Idieresis
+-D	774,692,3	2	208	Eth
+~N	831,871,20	2	209	Ntilde
+`O	786,908,20	2	210	Ograve
+'O	786,908,20	2	211	Oacute
+^O	786,908,20	2	212	Ocircumflex
+~O	786,883,20	2	213	Otilde
+:O	786,868,20	2	214	Odieresis
+tmu	606,474	0	215	multiply
+/O	833,709,20	2	216	Oslash
+`U	778,908,20	2	217	Ugrave
+'U	778,908,20	2	218	Uacute
+^U	778,908,20	2	219	Ucircumflex
+:U	778,868,20	2	220	Udieresis
+'Y	667,908,3	2	221	Yacute
+TP	604,692,3	2	222	Thorn
+ss	556,731,9	2	223	germandbls
+`a	500,697,12	2	224	agrave
+'a	500,697,12	2	225	aacute
+^a	500,697,12	2	226	acircumflex
+~a	500,652,12	2	227	atilde
+:a	500,657,12	2	228	adieresis
+oa	500,716,12	2	229	aring
+ae	758,469,20	0	230	ae
+,c	444,469,225	0	231	ccedilla
+`e	479,697,20	2	232	egrave
+'e	479,697,20	2	233	eacute
+^e	479,697,20	2	234	ecircumflex
+:e	479,657,20	2	235	edieresis
+`i	287,697,3	2	236	igrave
+'i	287,697,3	2	237	iacute
+^i	287,697,3,13,12	2	238	icircumflex
+:i	287,657,3,6,6	2	239	idieresis
+Sd	546,728,20	2	240	eth
+~n	582,652,3	2	241	ntilde
+`o	546,697,20	2	242	ograve
+'o	546,697,20	2	243	oacute
+^o	546,697,20	2	244	ocircumflex
+~o	546,652,20	2	245	otilde
+:o	546,657,20	2	246	odieresis
+tdi	606,512	0	247	divide
+/o	556,474,23	0	248	oslash
+`u	603,697,12	2	249	ugrave
+'u	603,697,12	2	250	uacute
+^u	603,697,12	2	251	ucircumflex
+:u	603,657,12	2	252	udieresis
+'y	556,697,283	3	253	yacute
+Tp	601,726,281,0,2	3	254	thorn
+:y	556,657,283	3	255	ydieresis
+u2026	1000,111,5	0	256	ellipsis
diff --git a/contrib/groff/font/devps/S b/contrib/groff/font/devps/S
index 52d7fd6..527379f 100644
--- a/contrib/groff/font/devps/S
+++ b/contrib/groff/font/devps/S
@@ -3,223 +3,227 @@ internalname Symbol
 special
 spacewidth 250
 charset
-space	250	0	0040
-!	333,672,17,0,-128	3	0041	-- exclam
-fa	713,705,0,0,-31	3	0042	-- universal
-#	500,673,16,0,-20	3	0043	-- numbersign
+space	250	0	32	space
+!	333,672,17	3	33	exclam
+fa	713,705	3	34	universal
+#	500,673,16	3	35	numbersign
 sh	"
-te	549,707,0,0,-25	3	0044	-- existential
-%	833,655,36,0,-63	3	0045	-- percent
-&	778,661,18,0,-41	3	0046	-- ampersand
-st	439,500,17,0,-48	3	0047	-- suchthat
-(	333,673,191,0,-53	3	0050	-- parenleft
-)	333,673,191,0,-30	3	0051	-- parenright
-**	500,551,0,0,-65	3	0052	-- asteriskmath
-+	549,533,0,0,-10	3	0053	-- plus
+te	549,707	3	36	existential
+%	833,655,36	3	37	percent
+&	778,661,18	3	38	ampersand
+st	439,500,17	3	39	suchthat
+(	333,673,191	3	40	parenleft
+)	333,673,191	3	41	parenright
+**	500,551	3	42	asteriskmath
++	549,533	3	43	plus
 pl	"
-,	250,104,152,0,-56	3	0054	-- comma
-\-	549,288,0,0,-11	3	0055	-- minus
+,	250,104,152	3	44	comma
+\-	549,288	3	45	minus
 mi	"
-.	250,95,17,0,-69	3	0056	-- period
-/	278,646,18	3	0057	-- slash
+.	250,95,17	3	46	period
+/	278,646,18	3	47	slash
 sl	"
-0	500,685,17,0,-23	3	0060	-- zero
-1	500,673,0,0,-117	3	0061	-- one
-2	500,686,0,0,-25	3	0062	-- two
-3	500,685,17,0,-39	3	0063	-- three
-4	500,685,0,0,-16	3	0064	-- four
-5	500,685,17,0,-29	3	0065	-- five
-6	500,685,17,0,-36	3	0066	-- six
-7	500,673,16,0,-24	3	0067	-- seven
-8	500,685,18,0,-54	3	0070	-- eight
-9	500,685,18,0,-31	3	0071	-- nine
-:	278,460,17,0,-81	3	0072	-- colon
-;	278,460,152,0,-83	3	0073	-- semicolon
-<	549,522,0,0,-26	3	0074	-- less
-=	549,390,0,0,-11	3	0075	-- equal
+0	500,685,17	3	48	zero
+1	500,673	3	49	one
+2	500,686	3	50	two
+3	500,685,17	3	51	three
+4	500,685	3	52	four
+5	500,685,17	3	53	five
+6	500,685,17	3	54	six
+7	500,673,16	3	55	seven
+8	500,685,18	3	56	eight
+9	500,685,18	3	57	nine
+:	278,460,17	3	58	colon
+;	278,460,152	3	59	semicolon
+<	549,522	3	60	less
+=	549,390	3	61	equal
 eq	"
->	549,522,0,0,-26	3	0076	-- greater
-?	444,686,17,0,-70	3	0077	-- question
-=~	549,475,0,0,-11	3	0100	-- congruent
-*A	722,673,0,0,-4	3	0101	-- Alpha
-*B	667,673,0,0,-29	3	0102	-- Beta
-*X	722,673,0,0,9	3	0103	-- Chi
-*D	612,688,0,0,-6	3	0104	-- Delta
-*E	611,673,0,6,-32	3	0105	-- Epsilon
-*F	763,673,0,0,-26	3	0106	-- Phi
-*G	603,673,0,6,-24	3	0107	-- Gamma
-*Y	722,673,0,7,-39	3	0110	-- Eta
-*I	333,673,0,0,-32	3	0111	-- Iota
-+h	631,689,18,0,-18	3	0112	-- theta1
-*K	722,673,0,0,-35	3	0113	-- Kappa
-*L	686,688,0,0,-6	3	0114	-- Lambda
-*M	889,673,0,0,-28	3	0115	-- Mu
-*N	722,673,8,0,-29	3	0116	-- Nu
-*O	722,685,17,0,-41	3	0117	-- Omicron
-*P	768,673,0,0,-25	3	0120	-- Pi
-*H	741,685,17,0,-41	3	0121	-- Theta
-*R	556,673,0,7,-28	3	0122	-- Rho
-*S	592,673,0,0,-5	3	0123	-- Sigma
-*T	611,673,0,0,-33	3	0124	-- Tau
----	690,673,0,4,8	3	0125	-- Upsilon
-ts	439,500,233,0,-40	3	0126	-- sigma1
-*W	768,688,0,0,-34	3	0127	-- Omega
-*C	645,673,0,0,-40	3	0130	-- Xi
-*Q	795,684,0,0,-15	3	0131	-- Psi
-*Z	611,673,0,25,-44	3	0132	-- Zeta
-[	333,674,155,0,-86	3	0133	-- bracketleft
+>	549,522	3	62	greater
+?	444,686,17	3	63	question
+=~	549,475	3	64	congruent
+*A	722,673	3	65	Alpha
+*B	667,673	3	66	Beta
+*X	722,673,0,0,9	3	67	Chi
+*D	612,688	3	68	Delta
+*E	611,673,0,6	3	69	Epsilon
+*F	763,673	3	70	Phi
+*G	603,673,0,6	3	71	Gamma
+*Y	722,673,0,7	3	72	Eta
+*I	333,673	3	73	Iota
++h	631,689,18	3	74	theta1
+*K	722,673	3	75	Kappa
+*L	686,688	3	76	Lambda
+*M	889,673	3	77	Mu
+*N	722,673,8	3	78	Nu
+*O	722,685,17	3	79	Omicron
+*P	768,673	3	80	Pi
+*H	741,685,17	3	81	Theta
+*R	556,673,0,7	3	82	Rho
+*S	592,673	3	83	Sigma
+*T	611,673	3	84	Tau
+---	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
+*Q	795,684	3	89	Psi
+*Z	611,673,0,25	3	90	Zeta
+[	333,674,155	3	91	bracketleft
 lB	"
-3d	863,478,0,0,-163	3	0134	-- therefore
+3d	863,478	3	92	therefore
 tf	"
-]	333,674,155,0,-33	3	0135	-- bracketright
+]	333,674,155	3	93	bracketright
 rB	"
-pp	658,674,0,0,-15	3	0136	-- perpendicular
-_	500,0,252,2,2	3	0137	-- underscore
-radicalex	500,917,0,590,-480	3	0140	-- radicalex
-*a	631,500,18,0,-41	3	0141	-- alpha
-*b	549,741,223,0,-61	3	0142	-- beta
-*x	549,499,231,0,-12	3	0143	-- chi
-*d	494,740,19,0,-40	3	0144	-- delta
-*e	439,502,19,0,-22	3	0145	-- epsilon
-*f	521,671,224,0,-27	3	0146	-- phi
-*g	411,499,225,73,-5	3	0147	-- gamma
-*y	603,514,202	3	0150	-- eta
-*i	329,503,17	3	0151	-- iota
-+f	603,499,224,0,-36	3	0152	-- phi1
-*k	549,501,0,9,-33	3	0153	-- kappa
-*l	549,739,17,0,-24	3	0154	-- lambda
-mc	576,500,223,0,-33	3	0155	-- mu
+pp	658,674	3	94	perpendicular
+_	500,0,252,2,2	3	95	underscore
+radicalex	500,917,0,590	3	96	radicalex
+*a	631,500,18	3	97	alpha
+*b	549,741,223	3	98	beta
+*x	549,499,231	3	99	chi
+*d	494,740,19	3	100	delta
+*e	439,502,19	3	101	epsilon
+*f	521,671,224	3	102	phi
+*g	411,499,225,73	3	103	gamma
+*y	603,514,202	3	104	eta
+*i	329,503,17	3	105	iota
++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	"
-*n	521,507,16,0,9	3	0156	-- nu
-*o	549,499,19,0,-35	3	0157	-- omicron
-*p	549,487,19,0,-10	3	0160	-- pi
-*h	521,690,17,0,-43	3	0161	-- theta
-*r	549,499,230,0,-50	3	0162	-- rho
-*s	603,500,21,0,-30	3	0163	-- sigma
-*t	439,500,19,0,-10	3	0164	-- tau
-*u	576,507,18,0,-7	3	0165	-- upsilon
-+p	713,583,18,0,-12	3	0166	-- omega1
-*w	686,500,17,0,-42	3	0167	-- omega
-*c	493,766,224,0,-27	3	0170	-- xi
-*q	686,500,228,15,-12	3	0171	-- psi
-*z	494,756,225,0,-60	3	0172	-- zeta
-lC	480,673,183,0,-58	3	0173	-- braceleft
+*n	521,507,16,0,9	3	110	nu
+*o	549,499,19	3	111	omicron
+*p	549,487,19	3	112	pi
+*h	521,690,17	3	113	theta
+*r	549,499,230	3	114	rho
+*s	603,500,21	3	115	sigma
+*t	439,500,19	3	116	tau
+*u	576,507,18	3	117	upsilon
++p	713,583,18	3	118	omega1
+*w	686,500,17	3	119	omega
+*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,673,177,0,-65	3	0174	-- bar
+ba	200,673,177	3	124	bar
 |	"
-rC	480,673,183,0,-79	3	0175	-- braceright
+rC	480,673,183	3	125	braceright
 }	"
-ap	549,307,0,0,-17	3	0176	-- similar
-*U	620,685,0,0,2	3	0241	-- Upsilon1
-fm	247,735,0,0,-27	3	0242	-- minute
-<=	549,639,0,0,-29	3	0243	-- lessequal
-f/	167,677,12,173,180	3	0244	-- fraction
-if	713,404,0,0,-26	3	0245	-- infinity
-Fn	500,686,193,0,-2	3	0246	-- florin
-CL	753,533,26,0,-86	3	0247	-- club
-DI	753,550,36,0,-142	3	0250	-- diamond
-HE	753,532,33,0,-117	3	0251	-- heart
-SP	753,548,36,0,-113	3	0252	-- spade
-<>	1042,511,15,0,-24	3	0253	-- arrowboth
-<-	987,511,15,0,-32	3	0254	-- arrowleft
-ua	603,910,0,0,-45	3	0255	-- arrowup
+ap	549,307	3	126	similar
+*U	620,685,0,0,2	3	161	Upsilon1
+fm	247,735	3	162	minute
+<=	549,639	3	163	lessequal
+f/	167,677,12,173,180	3	164	fraction
+if	713,404	3	165	infinity
+Fn	500,686,193	3	166	florin
+CL	753,533,26	3	167	club
+DI	753,550,36	3	168	diamond
+HE	753,532,33	3	169	heart
+SP	753,548,36	3	170	spade
+<>	1042,511,15	3	171	arrowboth
+<-	987,511,15	3	172	arrowleft
+ua	603,910	3	173	arrowup
 arrowverttp	"
-->	987,511,15,0,-49	3	0256	-- arrowright
-da	603,888,22,0,-45	3	0257	-- arrowdown
+->	987,511,15	3	174	arrowright
+da	603,888,22	3	175	arrowdown
 arrowvertbt	"
-de	400,685,0,0,-50	3	0260	-- degree
-t+-	549,645,0,0,-10	3	0261	-- plusminus
+de	400,685	3	176	degree
+t+-	549,645	3	177	plusminus
 +-	"
-sd	411,737,0,2,-20	3	0262	-- second
->=	549,639,0,0,-29	3	0263	-- greaterequal
-tmu	549,524,0,0,-17	3	0264	-- multiply
+sd	411,737,0,2	3	178	second
+>=	549,639	3	179	greaterequal
+tmu	549,524	3	180	multiply
 mu	"
-pt	713,404,0,0,-27	3	0265	-- proportional
-pd	494,746,20,0,-26	3	0266	-- partialdiff
-bu	460,473,0,0,-50	3	0267	-- bullet
-tdi	549,456,0,0,-10	3	0270	-- divide
+pt	713,404	3	181	proportional
+pd	494,746,20	3	182	partialdiff
+bu	460,473	3	183	bullet
+tdi	549,456	3	184	divide
 di	"
-!=	549,549,25,0,-15	3	0271	-- notequal
-==	549,443,0,0,-14	3	0272	-- equivalence
-~~	549,394,0,0,-14	3	0273	-- approxequal
+!=	549,549,25	3	185	notequal
+==	549,443	3	186	equivalence
+~~	549,394	3	187	approxequal
 ~=	"
----	1000,95,17,0,-111	3	0274	-- ellipsis
-arrowvertex	603,1010,120,0,-280	3	0275	-- arrowvertex
-an	1000,276,0,50,60	3	0276	-- arrowhorizex
-CR	658,629,16,0,-15	3	0277	-- carriagereturn
-Ah	823,658,18,0,-175	3	0300	-- aleph
-Im	686,740,53,0,-10	3	0301	-- Ifraktur
-Re	795,734,15,0,-26	3	0302	-- Rfraktur
-wp	987,573,211,0,-159	3	0303	-- weierstrass
-c*	768,673,17,0,-43	3	0304	-- circlemultiply
-c+	768,675,15,0,-43	3	0305	-- circleplus
-es	823,719,24,0,-39	3	0306	-- emptyset
-ca	768,509,0,0,-40	3	0307	-- intersection
-cu	768,492,17,0,-40	3	0310	-- union
-sp	713,470,0,0,-20	3	0311	-- propersuperset
-ip	713,470,125,0,-20	3	0312	-- reflexsuperset
-nb	713,540,70,0,-36	3	0313	-- notsubset
-sb	713,470,0,0,-37	3	0314	-- propersubset
-ib	713,470,125,0,-37	3	0315	-- reflexsubset
-mo	713,468,0,0,-45	3	0316	-- element
-nm	713,555,58,0,-45	3	0317	-- notelement
-/_	768,673,0,0,-26	3	0320	-- angle
-gr	713,718,19,0,-36	3	0321	-- gradient
----	790,673,17,0,-50	3	0322	-- registerserif
----	790,675,15,0,-51	3	0323	-- copyrightserif
----	890,673,0,0,-18	3	0324	-- trademarkserif
-product	823,751,101,0,-25	3	0325	-- product
-sr	549,917,38,0,-10	3	0326	-- radical
-md	250,310,0,0,-69	3	0327	-- dotmath
-no	713,288,0,0,-15	3	0330	-- logicalnot
-AN	603,454,0,0,-23	3	0331	-- logicaland
-OR	603,477,0,0,-30	3	0332	-- logicalor
-hA	1042,510,20,0,-27	3	0333	-- arrowdblboth
-lA	987,513,15,0,-30	3	0334	-- arrowdblleft
-uA	603,911,0,0,-39	3	0335	-- arrowdblup
-rA	987,508,20,0,-45	3	0336	-- arrowdblright
-dA	603,890,19,0,-44	3	0337	-- arrowdbldown
-lz	494,745,0,0,-18	3	0340	-- lozenge
-la	329,746,198,0,-25	3	0341	-- angleleft
----	790,670,20,0,-50	3	0342	-- registersans
----	790,675,15,0,-49	3	0343	-- copyrightsans
----	786,673,0,0,-5	3	0344	-- trademarksans
-sum	713,752,108,0,-14	3	0345	-- summation
-parenlefttp	384,926,293,52,-40	3	0346	-- parenlefttp
-parenleftex	384,920,80,0,-40	3	0347	-- parenleftex
-parenleftbt	384,920,293,52,-40	3	0350	-- parenleftbt
-bracketlefttp	384,925,75	3	0351	-- bracketlefttp
+---	1000,95,17	3	188	ellipsis
+arrowvertex	603,1010,120	3	189	arrowvertex
+an	1000,276,0,50,60	3	190	arrowhorizex
+CR	658,629,16	3	191	carriagereturn
+Ah	823,658,18	3	192	aleph
+Im	686,740,53	3	193	Ifraktur
+Re	795,734,15	3	194	Rfraktur
+wp	987,573,211	3	195	weierstrass
+c*	768,673,17	3	196	circlemultiply
+c+	768,675,15	3	197	circleplus
+es	823,719,24	3	198	emptyset
+ca	768,509	3	199	intersection
+cu	768,492,17	3	200	union
+sp	713,470	3	201	propersuperset
+ip	713,470,125	3	202	reflexsuperset
+nb	713,540,70	3	203	notsubset
+sb	713,470	3	204	propersubset
+ib	713,470,125	3	205	reflexsubset
+mo	713,468	3	206	element
+nm	713,555,58	3	207	notelement
+/_	768,673	3	208	angle
+gr	713,718,19	3	209	gradient
+---	790,673,17	3	210	registerserif
+---	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	"
+md	250,310	3	215	dotmath
+tno	713,288	3	216	logicalnot
+no	"
+AN	603,454	3	217	logicaland
+OR	603,477	3	218	logicalor
+hA	1042,510,20	3	219	arrowdblboth
+lA	987,513,15	3	220	arrowdblleft
+uA	603,911	3	221	arrowdblup
+rA	987,508,20	3	222	arrowdblright
+dA	603,890,19	3	223	arrowdbldown
+lz	494,745	3	224	lozenge
+la	329,746,198	3	225	angleleft
+---	790,670,20	3	226	registersans
+---	790,675,15	3	227	copyrightsans
+---	786,673	3	228	trademarksans
+sum	713,752,108	3	229	summation
+parenlefttp	384,926,293,52	3	230	parenlefttp
+parenleftex	384,920,80	3	231	parenleftex
+parenleftbt	384,920,293,52	3	232	parenleftbt
+bracketlefttp	384,925,75	3	233	bracketlefttp
 lc	"
-bracketleftex	384,925,75	3	0352	-- bracketleftex
-bracketleftbt	384,925,75	3	0353	-- bracketleftbt
+bracketleftex	384,925,75	3	234	bracketleftex
+bracketleftbt	384,925,75	3	235	bracketleftbt
 lf	"
-bracelefttp	494,925,75,0,-201	3	0354	-- bracelefttp
+bracelefttp	494,925,75	3	236	bracelefttp
 lt	"
-braceleftmid	494,925,75,0,-14	3	0355	-- braceleftmid
+braceleftmid	494,925,75	3	237	braceleftmid
 lk	"
-braceleftbt	494,925,75,0,-201	3	0356	-- braceleftbt
+braceleftbt	494,925,75	3	238	braceleftbt
 lb	"
-braceex	494,925,75,0,-201	3	0357	-- braceex
+braceex	494,925,75	3	239	braceex
 bracerightex	"
 braceleftex	"
 barex	"
 bv	"
-ra	329,746,198,0,-21	3	0361	-- angleright
-is	274,916,107,67,52,-10	3	0362	-- integral
----	686,921,83,29,-332	3	0363	-- integraltp
----	686,975,88,0,-332	3	0364	-- integralex
----	686,921,81,0,-39	3	0365	-- integralbt
-parenrighttp	384,926,293,66,-54	3	0366	-- parenrighttp
-parenrightex	384,920,80,66,-398	3	0367	-- parenrightex
-parenrightbt	384,920,293,66,-54	3	0370	-- parenrightbt
-bracketrighttp	384,925,75,0,-22	3	0371	-- bracketrighttp
+ra	329,746,198	3	241	angleright
+is	274,916,107,67,52,-10	3	242	integral
+integral	"
+---	686,921,83,29	3	243	integraltp
+---	686,975,88	3	244	integralex
+---	686,921,81	3	245	integralbt
+parenrighttp	384,926,293,66	3	246	parenrighttp
+parenrightex	384,920,80,66	3	247	parenrightex
+parenrightbt	384,920,293,66	3	248	parenrightbt
+bracketrighttp	384,925,75	3	249	bracketrighttp
 rc	"
-bracketrightex	384,925,75,0,-305	3	0372	-- bracketrightex
-bracketrightbt	384,925,75,0,-20	3	0373	-- bracketrightbt
+bracketrightex	384,925,75	3	250	bracketrightex
+bracketrightbt	384,925,75	3	251	bracketrightbt
 rf	"
-bracerighttp	494,925,75,0,-17	3	0374	-- bracerighttp
+bracerighttp	494,925,75	3	252	bracerighttp
 rt	"
-bracerightmid	494,925,75,0,-201	3	0375	-- bracerightmid
+bracerightmid	494,925,75	3	253	bracerightmid
 rk	"
-bracerightbt	494,925,75,0,-17	3	0376	-- bracerightbt
+bracerightbt	494,925,75	3	254	bracerightbt
 rb	"
+---	790,808,3	3	256	apple
diff --git a/contrib/groff/font/devps/SS b/contrib/groff/font/devps/SS
index 933eb1c..5eb6b9b 100644
--- a/contrib/groff/font/devps/SS
+++ b/contrib/groff/font/devps/SS
@@ -4,191 +4,192 @@ special
 slant 15.5
 spacewidth 223
 charset
-space	223	0	0040
----	296,599,15,137,-72,99	3	0041	-- exclam
----	635,627,0,216,-173,99	3	0042	-- universal
----	445,599,15,162,-21,99	3	0043	-- numbersign
----	489,629,0,183,28,99	3	0044	-- existential
----	741,583,32,75,-97,75	3	0045	-- percent
----	692,589,16,103,-18,99	3	0046	-- ampersand
----	391,444,15,109,6,99	3	0047	-- suchthat
----	296,599,170,203,-39,99	3	0050	-- parenleft
----	296,600,170,93,72,93	3	0051	-- parenright
----	445,490,0,105,-76,99	3	0052	-- asteriskmath
----	489,474,0,123,-26,99	3	0053	-- plus
----	223,93,136,10,41,10	3	0054	-- comma
----	489,256,0,117,-24,99	3	0055	-- minus
----	223,85,15,1,-20,1	3	0056	-- period
----	247,575,15,208,55,99	3	0057	-- slash
----	445,610,15,142,-40,99	3	0060	-- zero
----	445,599,0,56,-57,56	3	0061	-- one
----	445,611,0,129,28,99	3	0062	-- two
----	445,611,16,115,-6,99	3	0063	-- three
----	445,610,0,135,-8,99	3	0064	-- four
----	445,610,15,188,14,99	3	0065	-- five
----	445,610,16,193,-37,99	3	0066	-- six
----	445,599,15,190,-101,99	3	0067	-- seven
----	445,611,16,141,-32,99	3	0070	-- eight
----	445,609,15,140,-2,99	3	0071	-- nine
----	247,409,15,89,-31,89	3	0072	-- colon
----	247,409,136,99,17,99	3	0073	-- semicolon
----	489,464,0,171,-37,99	3	0074	-- less
----	489,347,0,147,1,99	3	0075	-- equal
----	489,464,0,108,27,99	3	0076	-- greater
----	395,610,15,172,-113,99	3	0077	-- question
----	489,423,0,158,40,99	3	0100	-- congruent
----	643,599,0,21,47,21	3	0101	-- Alpha
----	594,598,0,101,24,99	3	0102	-- Beta
----	643,599,0,205,58,99	3	0103	-- Chi
----	545,612,0,46,45,46	3	0104	-- Delta
----	544,599,0,194,22,99	3	0105	-- Epsilon
----	679,598,0,132,-55,99	3	0106	-- Phi
----	537,599,0,227,19,99	3	0107	-- Gamma
----	643,599,0,243,15,99	3	0110	-- Eta
----	296,599,0,222,22,99	3	0111	-- Iota
-+h	562,614,15,133,-58,99	3	0112	-- theta1
----	643,598,0,185,19,99	3	0113	-- Kappa
----	611,612,0,49,45,49	3	0114	-- Lambda
----	791,599,0,233,22,99	3	0115	-- Mu
----	643,599,7,234,24,99	3	0116	-- Nu
----	643,610,15,154,-62,99	3	0117	-- Omicron
----	684,599,0,213,28,99	3	0120	-- Pi
----	659,610,15,138,-62,99	3	0121	-- Theta
----	495,599,0,200,25,99	3	0122	-- Rho
----	527,599,0,186,45,99	3	0123	-- Sigma
----	544,599,0,229,-109,99	3	0124	-- Tau
----	614,599,0,240,-125,99	3	0125	-- Upsilon
-ts	391,445,208,151,-28,99	3	0126	-- sigma1
----	684,612,0,126,20,99	3	0127	-- Omega
----	574,598,0,176,14,99	3	0130	-- Xi
----	708,608,0,227,-138,99	3	0131	-- Psi
----	544,599,0,231,11,99	3	0132	-- Zeta
----	296,599,138,207,16,99	3	0133	-- bracketleft
----	768,426,0,0,-110	3	0134	-- therefore
----	296,599,138,159,64,99	3	0135	-- bracketright
----	586,600,0,60,37,60	3	0136	-- perpendicular
----	445,0,224,0,122	3	0137	-- underscore
----	445,816,0,829,-622,99	3	0140	-- radicalex
-*a	562,445,15,146,-34,99	3	0141	-- alpha
-*b	489,659,198,139,57,99	3	0142	-- beta
-*x	489,445,206,134,98,99	3	0143	-- chi
-*d	440,658,16,181,-33,99	3	0144	-- delta
-*e	391,447,17,127,1,99	3	0145	-- epsilon
-*f	464,596,200,103,-28,99	3	0146	-- phi
-*g	366,444,200,252,-42,99	3	0147	-- gamma
-*y	537,457,180,68,-50,68	3	0150	-- eta
-*i	293,448,16,53,-47,53	3	0151	-- iota
-+f	537,444,199,117,-42,99	3	0152	-- phi1
-*k	489,447,0,182,-56,99	3	0153	-- kappa
-*l	489,658,16,91,29,91	3	0154	-- lambda
-*m	513,445,198,70,68,70	3	0155	-- mu
-*n	464,451,15,134,-69,99	3	0156	-- nu
-*o	489,444,17,87,-36,87	3	0157	-- omicron
-*p	489,433,18,160,-8,99	3	0160	-- pi
-*h	464,614,16,140,-53,99	3	0161	-- theta
-*r	489,444,205,82,69,82	3	0162	-- rho
-*s	537,445,19,175,-37,99	3	0163	-- sigma
-*t	391,445,16,170,-45,99	3	0164	-- tau
-*u	513,451,15,95,-55,95	3	0165	-- upsilon
-+p	635,519,15,173,-28,99	3	0166	-- omega1
-*w	611,445,16,126,-35,99	3	0167	-- omega
-*c	439,681,200,126,-20,99	3	0170	-- xi
-*q	611,445,203,198,-91,99	3	0171	-- psi
-*z	440,673,200,190,-50,99	3	0172	-- zeta
----	427,599,163,163,-66,99	3	0173	-- braceleft
----	178,599,158,179,41,99	3	0174	-- bar
----	427,599,163,67,31,67	3	0175	-- braceright
----	489,273,0,110,-28,99	3	0176	-- similar
----	552,609,0,208,-84,99	3	0241	-- Upsilon1
----	220,654,0,223,-106,99	3	0242	-- minute
----	489,569,0,206,24,99	3	0243	-- lessequal
----	149,603,11,391,214,99	3	0244	-- fraction
----	635,360,0,107,-41,99	3	0245	-- infinity
----	445,612,172,219,86,99	3	0246	-- florin
----	670,474,23,25,-69,25	3	0247	-- club
----	670,490,32,0,-148	3	0250	-- diamond
----	670,473,29,59,-155,59	3	0251	-- heart
----	670,488,32,0,-82	3	0252	-- spade
----	927,455,13,103,-40,99	3	0253	-- arrowboth
----	878,455,13,87,-47,87	3	0254	-- arrowleft
----	537,810,0,204,-173,99	3	0255	-- arrowup
----	878,455,13,94,-55,94	3	0256	-- arrowright
----	537,790,20,85,-54,85	3	0257	-- arrowdown
----	356,609,0,160,-137,99	3	0260	-- degree
----	489,574,0,154,41,99	3	0261	-- plusminus
----	366,656,0,244,-100,99	3	0262	-- second
----	489,569,0,143,24,99	3	0263	-- greaterequal
----	489,466,0,170,22,99	3	0264	-- multiply
----	635,360,0,82,-40,82	3	0265	-- proportional
----	440,664,18,152,-12,99	3	0266	-- partialdiff
----	409,421,0,95,-68,95	3	0267	-- bullet
----	489,406,0,119,-24,99	3	0270	-- divide
----	489,489,22,148,-1,99	3	0271	-- notequal
----	489,394,0,163,15,99	3	0272	-- equivalence
----	489,351,0,133,-7,99	3	0273	-- approxequal
----	890,85,15,0,-57	3	0274	-- ellipsis
----	537,899,107,92,-166,92	3	0275	-- arrowvertex
----	890,246,0,171,42,99	3	0276	-- arrowhorizex
----	586,560,14,174,10,99	3	0277	-- carriagereturn
----	732,586,16,58,-109,58	3	0300	-- aleph
----	611,659,47,123,24,99	3	0301	-- Ifraktur
----	708,653,13,175,-21,99	3	0302	-- Rfraktur
----	878,510,188,50,-62,50	3	0303	-- weierstrass
----	684,599,15,124,-64,99	3	0304	-- circlemultiply
----	684,601,13,125,-65,99	3	0305	-- circleplus
----	732,640,21,202,12,99	3	0306	-- emptyset
----	684,453,0,80,14,80	3	0307	-- intersection
----	684,438,15,154,-60,99	3	0310	-- union
----	635,418,0,90,32,90	3	0311	-- propersuperset
----	635,418,111,89,67,89	3	0312	-- reflexsuperset
----	635,481,62,159,-37,99	3	0313	-- notsubset
----	635,418,0,159,-37,99	3	0314	-- propersubset
----	635,418,111,159,34,99	3	0315	-- reflexsubset
----	635,417,0,0,-43	3	0316	-- element
----	635,494,52,0,-24	3	0317	-- notelement
----	684,599,0,199,27,99	3	0320	-- angle
----	635,639,17,220,-181,99	3	0321	-- gradient
----	703,596,18,110,-70,99	3	0322	-- registerserif
----	703,601,13,113,-72,99	3	0323	-- copyrightserif
----	792,599,0,205,-119,99	3	0324	-- trademarkserif
----	732,668,90,238,56,99	3	0325	-- product
----	489,816,34,272,-84,99	3	0326	-- radical
----	223,276,0,52,-81,52	3	0327	-- dotmath
----	635,256,0,100,-28,99	3	0330	-- logicalnot
----	537,404,0,32,29,32	3	0331	-- logicaland
----	537,424,0,152,-101,99	3	0332	-- logicalor
----	927,454,18,101,-42,99	3	0333	-- arrowdblboth
----	878,457,13,114,-46,99	3	0334	-- arrowdblleft
----	537,811,0,201,-102,99	3	0335	-- arrowdblup
----	878,452,18,89,-21,89	3	0336	-- arrowdblright
----	537,792,17,152,-53,99	3	0337	-- arrowdbldown
----	440,663,0,129,-71,99	3	0340	-- lozenge
----	293,664,176,229,-48,99	3	0341	-- angleleft
----	703,596,18,110,-70,99	3	0342	-- registersans
----	703,601,13,111,-70,99	3	0343	-- copyrightsans
----	700,599,0,182,-129,99	3	0344	-- trademarksans
----	635,669,96,171,65,99	3	0345	-- summation
----	342,824,261,350,96,99	3	0346	-- parenlefttp
----	342,823,76,46,38,46	3	0347	-- parenleftex
----	342,824,261,47,-63,47	3	0350	-- parenleftbt
----	342,824,71,268,72,99	3	0351	-- bracketlefttp
----	342,823,70,13,72,13	3	0352	-- bracketleftex
----	342,824,71,14,72,14	3	0353	-- bracketleftbt
----	440,824,67,258,-108,99	3	0354	-- bracelefttp
----	440,832,76,96,-76,96	3	0355	-- braceleftmid
----	440,824,62,94,-169,94	3	0356	-- braceleftbt
----	440,832,71,96,-107,96	3	0357	-- braceex
----	293,664,176,102,79,99	3	0361	-- angleright
----	244,815,95,305,63,99	3	0362	-- integral
----	611,820,74,312,-222,99	3	0363	-- integraltp
----	611,868,78,79,-221,79	3	0364	-- integralex
----	611,820,72,64,20,64	3	0365	-- integralbt
----	342,824,261,206,-223,99	3	0366	-- parenrighttp
----	342,823,76,365,-281,99	3	0367	-- parenrightex
----	342,824,261,365,80,99	3	0370	-- parenrightbt
----	342,824,71,285,-199,99	3	0371	-- bracketrighttp
----	342,823,70,285,-200,99	3	0372	-- bracketrightex
----	342,824,71,285,54,99	3	0373	-- bracketrightbt
----	440,824,67,35,-108,35	3	0374	-- bracerighttp
----	440,832,76,127,-105,99	3	0375	-- bracerightmid
----	440,824,62,94,54,94	3	0376	-- bracerightbt
+space	223	0	32	space
+---	296,599,15,137,-72,99	3	33	exclam
+---	635,627,0,216,-173,99	3	34	universal
+---	445,599,15,162,-21,99	3	35	numbersign
+---	489,629,0,183,28,99	3	36	existential
+---	741,583,32,75,-97,75	3	37	percent
+---	692,589,16,103,-18,99	3	38	ampersand
+---	391,444,15,109,6,99	3	39	suchthat
+---	296,599,170,203,-39,99	3	40	parenleft
+---	296,600,170,93,72,93	3	41	parenright
+---	445,490,0,105,-76,99	3	42	asteriskmath
+---	489,474,0,123,-26,99	3	43	plus
+---	223,93,136,10,41,10	3	44	comma
+---	489,256,0,117,-24,99	3	45	minus
+---	223,85,15,1,-20,1	3	46	period
+---	247,575,15,208,55,99	3	47	slash
+---	445,610,15,142,-40,99	3	48	zero
+---	445,599,0,56,-57,56	3	49	one
+---	445,611,0,129,28,99	3	50	two
+---	445,611,16,115,-6,99	3	51	three
+---	445,610,0,135,-8,99	3	52	four
+---	445,610,15,188,14,99	3	53	five
+---	445,610,16,193,-37,99	3	54	six
+---	445,599,15,190,-101,99	3	55	seven
+---	445,611,16,141,-32,99	3	56	eight
+---	445,609,15,140,-2,99	3	57	nine
+---	247,409,15,89,-31,89	3	58	colon
+---	247,409,136,99,17,99	3	59	semicolon
+---	489,464,0,171,-37,99	3	60	less
+---	489,347,0,147,1,99	3	61	equal
+---	489,464,0,108,27,99	3	62	greater
+---	395,610,15,172,-113,99	3	63	question
+---	489,423,0,158,40,99	3	64	congruent
+---	643,599,0,21,47,21	3	65	Alpha
+---	594,598,0,101,24,99	3	66	Beta
+---	643,599,0,205,58,99	3	67	Chi
+---	545,612,0,46,45,46	3	68	Delta
+---	544,599,0,194,22,99	3	69	Epsilon
+---	679,598,0,132,-55,99	3	70	Phi
+---	537,599,0,227,19,99	3	71	Gamma
+---	643,599,0,243,15,99	3	72	Eta
+---	296,599,0,222,22,99	3	73	Iota
++h	562,614,15,133,-58,99	3	74	theta1
+---	643,598,0,185,19,99	3	75	Kappa
+---	611,612,0,49,45,49	3	76	Lambda
+---	791,599,0,233,22,99	3	77	Mu
+---	643,599,7,234,24,99	3	78	Nu
+---	643,610,15,154,-62,99	3	79	Omicron
+---	684,599,0,213,28,99	3	80	Pi
+---	659,610,15,138,-62,99	3	81	Theta
+---	495,599,0,200,25,99	3	82	Rho
+---	527,599,0,186,45,99	3	83	Sigma
+---	544,599,0,229,-109,99	3	84	Tau
+---	614,599,0,240,-125,99	3	85	Upsilon
+ts	391,445,208,151,-28,99	3	86	sigma1
+---	684,612,0,126,20,99	3	87	Omega
+---	574,598,0,176,14,99	3	88	Xi
+---	708,608,0,227,-138,99	3	89	Psi
+---	544,599,0,231,11,99	3	90	Zeta
+---	296,599,138,207,16,99	3	91	bracketleft
+---	768,426,0,0,-110	3	92	therefore
+---	296,599,138,159,64,99	3	93	bracketright
+---	586,600,0,60,37,60	3	94	perpendicular
+---	445,0,224,0,122	3	95	underscore
+---	445,816,0,829,-622,99	3	96	radicalex
+*a	562,445,15,146,-34,99	3	97	alpha
+*b	489,659,198,139,57,99	3	98	beta
+*x	489,445,206,134,98,99	3	99	chi
+*d	440,658,16,181,-33,99	3	100	delta
+*e	391,447,17,127,1,99	3	101	epsilon
+*f	464,596,200,103,-28,99	3	102	phi
+*g	366,444,200,252,-42,99	3	103	gamma
+*y	537,457,180,68,-50,68	3	104	eta
+*i	293,448,16,53,-47,53	3	105	iota
++f	537,444,199,117,-42,99	3	106	phi1
+*k	489,447,0,182,-56,99	3	107	kappa
+*l	489,658,16,91,29,91	3	108	lambda
+*m	513,445,198,70,68,70	3	109	mu
+*n	464,451,15,134,-69,99	3	110	nu
+*o	489,444,17,87,-36,87	3	111	omicron
+*p	489,433,18,160,-8,99	3	112	pi
+*h	464,614,16,140,-53,99	3	113	theta
+*r	489,444,205,82,69,82	3	114	rho
+*s	537,445,19,175,-37,99	3	115	sigma
+*t	391,445,16,170,-45,99	3	116	tau
+*u	513,451,15,95,-55,95	3	117	upsilon
++p	635,519,15,173,-28,99	3	118	omega1
+*w	611,445,16,126,-35,99	3	119	omega
+*c	439,681,200,126,-20,99	3	120	xi
+*q	611,445,203,198,-91,99	3	121	psi
+*z	440,673,200,190,-50,99	3	122	zeta
+---	427,599,163,163,-66,99	3	123	braceleft
+---	178,599,158,179,41,99	3	124	bar
+---	427,599,163,67,31,67	3	125	braceright
+---	489,273,0,110,-28,99	3	126	similar
+---	552,609,0,208,-84,99	3	161	Upsilon1
+---	220,654,0,223,-106,99	3	162	minute
+---	489,569,0,206,24,99	3	163	lessequal
+---	149,603,11,391,214,99	3	164	fraction
+---	635,360,0,107,-41,99	3	165	infinity
+---	445,612,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,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
+---	878,455,13,87,-47,87	3	172	arrowleft
+---	537,810,0,204,-173,99	3	173	arrowup
+---	878,455,13,94,-55,94	3	174	arrowright
+---	537,790,20,85,-54,85	3	175	arrowdown
+---	356,609,0,160,-137,99	3	176	degree
+---	489,574,0,154,41,99	3	177	plusminus
+---	366,656,0,244,-100,99	3	178	second
+---	489,569,0,143,24,99	3	179	greaterequal
+---	489,466,0,170,22,99	3	180	multiply
+---	635,360,0,82,-40,82	3	181	proportional
+---	440,664,18,152,-12,99	3	182	partialdiff
+---	409,421,0,95,-68,95	3	183	bullet
+---	489,406,0,119,-24,99	3	184	divide
+---	489,489,22,148,-1,99	3	185	notequal
+---	489,394,0,163,15,99	3	186	equivalence
+---	489,351,0,133,-7,99	3	187	approxequal
+---	890,85,15,0,-57	3	188	ellipsis
+---	537,899,107,92,-166,92	3	189	arrowvertex
+---	890,246,0,171,42,99	3	190	arrowhorizex
+---	586,560,14,174,10,99	3	191	carriagereturn
+---	732,586,16,58,-109,58	3	192	aleph
+---	611,659,47,123,24,99	3	193	Ifraktur
+---	708,653,13,175,-21,99	3	194	Rfraktur
+---	878,510,188,50,-62,50	3	195	weierstrass
+---	684,599,15,124,-64,99	3	196	circlemultiply
+---	684,601,13,125,-65,99	3	197	circleplus
+---	732,640,21,202,12,99	3	198	emptyset
+---	684,453,0,80,14,80	3	199	intersection
+---	684,438,15,154,-60,99	3	200	union
+---	635,418,0,90,32,90	3	201	propersuperset
+---	635,418,111,89,67,89	3	202	reflexsuperset
+---	635,481,62,159,-37,99	3	203	notsubset
+---	635,418,0,159,-37,99	3	204	propersubset
+---	635,418,111,159,34,99	3	205	reflexsubset
+---	635,417,0,0,-43	3	206	element
+---	635,494,52,0,-24	3	207	notelement
+---	684,599,0,199,27,99	3	208	angle
+---	635,639,17,220,-181,99	3	209	gradient
+---	703,596,18,110,-70,99	3	210	registerserif
+---	703,601,13,113,-72,99	3	211	copyrightserif
+---	792,599,0,205,-119,99	3	212	trademarkserif
+---	732,668,90,238,56,99	3	213	product
+---	489,816,34,272,-84,99	3	214	radical
+---	223,276,0,52,-81,52	3	215	dotmath
+---	635,256,0,100,-28,99	3	216	logicalnot
+---	537,404,0,32,29,32	3	217	logicaland
+---	537,424,0,152,-101,99	3	218	logicalor
+---	927,454,18,101,-42,99	3	219	arrowdblboth
+---	878,457,13,114,-46,99	3	220	arrowdblleft
+---	537,811,0,201,-102,99	3	221	arrowdblup
+---	878,452,18,89,-21,89	3	222	arrowdblright
+---	537,792,17,152,-53,99	3	223	arrowdbldown
+---	440,663,0,129,-71,99	3	224	lozenge
+---	293,664,176,229,-48,99	3	225	angleleft
+---	703,596,18,110,-70,99	3	226	registersans
+---	703,601,13,111,-70,99	3	227	copyrightsans
+---	700,599,0,182,-129,99	3	228	trademarksans
+---	635,669,96,171,65,99	3	229	summation
+---	342,824,261,350,96,99	3	230	parenlefttp
+---	342,823,76,46,38,46	3	231	parenleftex
+---	342,824,261,47,-63,47	3	232	parenleftbt
+---	342,824,71,268,72,99	3	233	bracketlefttp
+---	342,823,70,13,72,13	3	234	bracketleftex
+---	342,824,71,14,72,14	3	235	bracketleftbt
+---	440,824,67,258,-108,99	3	236	bracelefttp
+---	440,832,76,96,-76,96	3	237	braceleftmid
+---	440,824,62,94,-169,94	3	238	braceleftbt
+---	440,832,71,96,-107,96	3	239	braceex
+---	293,664,176,102,79,99	3	241	angleright
+---	244,815,95,305,63,99	3	242	integral
+---	611,820,74,312,-222,99	3	243	integraltp
+---	611,868,78,79,-221,79	3	244	integralex
+---	611,820,72,64,20,64	3	245	integralbt
+---	342,824,261,206,-223,99	3	246	parenrighttp
+---	342,823,76,365,-281,99	3	247	parenrightex
+---	342,824,261,365,80,99	3	248	parenrightbt
+---	342,824,71,285,-199,99	3	249	bracketrighttp
+---	342,823,70,285,-200,99	3	250	bracketrightex
+---	342,824,71,285,54,99	3	251	bracketrightbt
+---	440,824,67,35,-108,35	3	252	bracerighttp
+---	440,832,76,127,-105,99	3	253	bracerightmid
+---	440,824,62,94,54,94	3	254	bracerightbt
+---	703,719,2,131,-86,99	3	256	apple
diff --git a/contrib/groff/font/devps/TB b/contrib/groff/font/devps/TB
index 69d2d52..fba840d 100644
--- a/contrib/groff/font/devps/TB
+++ b/contrib/groff/font/devps/TB
@@ -207,246 +207,247 @@ y o -25
 y e -10
 y , -55
 charset
-ha	581,676,0,0,-73	2	0000	-- asciicircum
-ti	520,333,0,0,-29	0	0001	-- asciitilde
-vS	556,914,19,0,-35	2	0002	-- Scaron
-vZ	667,914,0,0,-28	2	0003	-- Zcaron
-vs	389,704,14,0,-25	2	0004	-- scaron
-vz	444,704,0,0,-21	2	0005	-- zcaron
-:Y	722,877,0,0,-15	2	0006	-- Ydieresis
-tm	1000,676,0,0,-24	2	0007	-- trademark
-aq	278,691,0,0,-75	2	0010	-- quotesingle
-space	250	0	0040
-!	333,691,13,0,-81	2	0041	-- exclam
-"	555,691,0,0,-83	2	0042	-- quotedbl
+ha	581,676	2	0	asciicircum
+ti	520,333	0	1	asciitilde
+vS	556,914,19	2	2	Scaron
+vZ	667,914	2	3	Zcaron
+vs	389,704,14	2	4	scaron
+vz	444,704	2	5	zcaron
+:Y	722,877	2	6	Ydieresis
+tm	1000,676	2	7	trademark
+aq	278,691	2	8	quotesingle
+space	250	0	32	space
+!	333,691,13	2	33	exclam
+"	555,691	2	34	quotedbl
 dq	"
-#	500,700,0,0,-4	2	0043	-- numbersign
+#	500,700	2	35	numbersign
 sh	"
-$	500,750,99,0,-29	2	0044	-- dollar
+$	500,750,99	2	36	dollar
 Do	"
-%	1000,692,14,0,-124	2	0045	-- percent
-&	833,691,16,0,-62	2	0046	-- ampersand
-'	333,691,0,0,-79	2	0047	-- quoteright
+%	1000,692,14	2	37	percent
+&	833,691,16	2	38	ampersand
+'	333,691	2	39	quoteright
 cq	"
-(	333,694,168,0,-46	2	0050	-- parenleft
-)	333,694,168,0,-27	2	0051	-- parenright
-*	500,691,0,0,-56	2	0052	-- asterisk
-+	570,506,0,0,-33	0	0053	-- plus
-,	250,155,180,0,-39	0	0054	-- comma
--	333,287,0,0,-44	0	0055	-- hyphen
+(	333,694,168	2	40	parenleft
+)	333,694,168	2	41	parenright
+*	500,691	2	42	asterisk
++	570,506	0	43	plus
+,	250,155,180	0	44	comma
+-	333,287	0	45	hyphen
 hy	"
-.	250,156,13,0,-41	0	0056	-- period
-/	278,691,19,24,24	2	0057	-- slash
+.	250,156,13	0	46	period
+/	278,691,19,24,24	2	47	slash
 sl	"
-0	500,688,13,0,-24	2	0060	-- zero
-1	500,688,0,0,-65	2	0061	-- one
-2	500,688,0,0,-17	2	0062	-- two
-3	500,688,14,0,-16	2	0063	-- three
-4	500,688,0,0,-19	2	0064	-- four
-5	500,676,8,0,-22	2	0065	-- five
-6	500,688,13,0,-28	2	0066	-- six
-7	500,676,0,0,-17	2	0067	-- seven
-8	500,688,13,0,-28	2	0070	-- eight
-9	500,688,13,0,-26	2	0071	-- nine
-:	333,472,13,0,-82	0	0072	-- colon
-;	333,472,180,0,-82	0	0073	-- semicolon
-<	570,514,8,0,-31	0	0074	-- less
-=	570,399,0,0,-33	0	0075	-- equal
->	570,514,8,0,-31	0	0076	-- greater
-?	500,689,13,0,-57	2	0077	-- question
-@	930,691,19,0,-108	2	0100	-- at
+0	500,688,13	2	48	zero
+1	500,688	2	49	one
+2	500,688	2	50	two
+3	500,688,14	2	51	three
+4	500,688	2	52	four
+5	500,676,8	2	53	five
+6	500,688,13	2	54	six
+7	500,676	2	55	seven
+8	500,688,13	2	56	eight
+9	500,688,13	2	57	nine
+:	333,472,13	0	58	colon
+;	333,472,180	0	59	semicolon
+<	570,514,8	0	60	less
+=	570,399	0	61	equal
+>	570,514,8	0	62	greater
+?	500,689,13	2	63	question
+@	930,691,19	2	64	at
 at	"
-A	722,690,0,0,-9	2	0101	-- A
-B	667,676,0,0,-16	2	0102	-- B
-C	722,691,19,0,-49	2	0103	-- C
-D	722,676,0,0,-14	2	0104	-- D
-E	667,676,0,0,-16	2	0105	-- E
-F	611,676,0,0,-16	2	0106	-- F
-G	778,691,19,0,-37	2	0107	-- G
-H	778,676,0,0,-21	2	0110	-- H
-I	389,676,0,0,-20	2	0111	-- I
-J	500,676,96,0,-3	2	0112	-- J
-K	778,676,0,0,-30	2	0113	-- K
-L	667,676,0,0,-19	2	0114	-- L
-M	944,676,0,0,-14	2	0115	-- M
-N	722,676,18,0,-16	2	0116	-- N
-O	778,691,19,0,-35	2	0117	-- O
-P	611,676,0,0,-16	2	0120	-- P
-Q	778,691,176,0,-35	2	0121	-- Q
-R	722,676,0,0,-26	2	0122	-- R
-S	556,692,19,0,-35	2	0123	-- S
-T	667,676,0,0,-31	2	0124	-- T
-U	722,676,19,0,-16	2	0125	-- U
-V	722,676,18,0,-16	2	0126	-- V
-W	1000,676,15,0,-19	2	0127	-- W
-X	722,676,0,0,-16	2	0130	-- X
-Y	722,676,0,0,-15	2	0131	-- Y
-Z	667,676,0,0,-28	2	0132	-- Z
-[	333,678,149,0,-67	2	0133	-- bracketleft
+A	722,690	2	65	A
+B	667,676	2	66	B
+C	722,691,19	2	67	C
+D	722,676	2	68	D
+E	667,676	2	69	E
+F	611,676	2	70	F
+G	778,691,19	2	71	G
+H	778,676	2	72	H
+I	389,676	2	73	I
+J	500,676,96	2	74	J
+K	778,676	2	75	K
+L	667,676	2	76	L
+M	944,676	2	77	M
+N	722,676,18	2	78	N
+O	778,691,19	2	79	O
+P	611,676	2	80	P
+Q	778,691,176	2	81	Q
+R	722,676	2	82	R
+S	556,692,19	2	83	S
+T	667,676	2	84	T
+U	722,676,19	2	85	U
+V	722,676,18	2	86	V
+W	1000,676,15	2	87	W
+X	722,676	2	88	X
+Y	722,676	2	89	Y
+Z	667,676	2	90	Z
+[	333,678,149	2	91	bracketleft
 lB	"
-\	278,691,19,25,25	2	0134	-- backslash
+\	278,691,19,25,25	2	92	backslash
 rs	"
-]	333,678,149,0,-32	2	0135	-- bracketright
+]	333,678,149	2	93	bracketright
 rB	"
-a^	333,704,0,2,2	2	0136	-- circumflex
+a^	333,704,0,2,2	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	333,691,0,0,-70	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	333,691	2	96	quoteleft
 oq	"
-a	500,473,14,0,-25	0	0141	-- a
-b	556,676,14,0,-17	2	0142	-- b
-c	444,473,14,0,-25	0	0143	-- c
-d	556,676,14,0,-25	2	0144	-- d
-e	444,473,14,0,-25	0	0145	-- e
-f	333,691,0,56,-14	2	0146	-- f
-g	500,473,206,0,-28	1	0147	-- g
-h	556,676,0,0,-16	2	0150	-- h
-i	278,691,0,0,-16	2	0151	-- i
-j	333,691,203,0,57	3	0152	-- j
-k	556,676,0,0,-22	2	0153	-- k
-l	278,676,0,0,-16	2	0154	-- l
-m	833,473,0,0,-16	0	0155	-- m
-n	556,473,0,0,-21	0	0156	-- n
-o	500,473,14,0,-25	0	0157	-- o
-p	556,473,205,0,-19	1	0160	-- p
-q	556,473,205,0,-34	1	0161	-- q
-r	444,473,0,0,-29	0	0162	-- r
-s	389,473,14,0,-25	0	0163	-- s
-t	333,630,12,0,-20	2	0164	-- t
-u	556,461,14,0,-16	0	0165	-- u
-v	500,461,14,0,-21	0	0166	-- v
-w	722,461,14,0,-23	0	0167	-- w
-x	500,461,0,0,-12	0	0170	-- x
-y	500,461,205,0,-16	1	0171	-- y
-z	444,461,0,0,-21	0	0172	-- z
-lC	394,698,175,0,-22	2	0173	-- braceleft
+a	500,473,14	0	97	a
+b	556,676,14	2	98	b
+c	444,473,14	0	99	c
+d	556,676,14	2	100	d
+e	444,473,14	0	101	e
+f	333,691,0,56	2	102	f
+g	500,473,206	1	103	g
+h	556,676	2	104	h
+i	278,691	2	105	i
+j	333,691,203,0,57	3	106	j
+k	556,676	2	107	k
+l	278,676	2	108	l
+m	833,473	0	109	m
+n	556,473	0	110	n
+o	500,473,14	0	111	o
+p	556,473,205	1	112	p
+q	556,473,205	1	113	q
+r	444,473	0	114	r
+s	389,473,14	0	115	s
+t	333,630,12	2	116	t
+u	556,461,14	0	117	u
+v	500,461,14	0	118	v
+w	722,461,14	0	119	w
+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,691,19,0,-66	2	0174	-- bar
+ba	220,691,19	2	124	bar
 |	"
-rC	394,698,175,0,-54	2	0175	-- braceright
+rC	394,698,175	2	125	braceright
 }	"
-a~	333,674,0,16,16	2	0176	-- tilde
+a~	333,674,0,16,16	2	126	tilde
 ~	"
-bq	333,155,180,0,-79	0	0200	-- quotesinglbase
-Fo	500,415,0,0,-23	0	0201	-- guillemotleft
-Fc	500,415,0,0,-27	0	0202	-- guillemotright
-bu	350,478,0,0,-35	0	0203	-- bullet
-Fn	500,706,155	2	0204	-- florin
-f/	167,688,12,162,168	2	0205	-- fraction
-%0	1000,706,29,0,-7	2	0206	-- perthousand
-dg	500,691,134,0,-47	2	0207	-- dagger
-dd	500,691,132,0,-45	2	0210	-- daggerdbl
-en	500,271	0	0211	-- endash
-em	1000,271	0	0212	-- emdash
-fi	556,691,0,0,-14	2	0214	-- fi
-fl	556,691,0,0,-14	2	0215	-- fl
-.i	278,461,0,0,-16	0	0220	-- dotlessi
-ga	333,713,0,0,-8	2	0222	-- grave
-a"	333,713,0,92,13	2	0223	-- hungarumlaut
-a.	333,667,0,0,-103	2	0224	-- dotaccent
-ab	333,691,0,0,-15	2	0225	-- breve
-ah	333,704,0,2,2	2	0226	-- caron
-ao	333,740,0,0,-60	2	0227	-- ring
-ho	333,44,173,0,-90	0	0230	-- ogonek
-lq	500,691,0,0,-32	2	0231	-- quotedblleft
-rq	500,691,0,0,-14	2	0232	-- quotedblright
-oe	722,473,14,0,-22	0	0233	-- oe
-/l	278,676,0,25,22	2	0234	-- lslash
-Bq	500,155,180,0,-14	0	0235	-- quotedblbase
-OE	1000,684,5,0,-22	2	0236	-- OE
-/L	667,676,0,0,-19	2	0237	-- Lslash
-r!	333,501,203,0,-82	1	0241	-- exclamdown
-ct	500,588,140,0,-53	0	0242	-- cent
-Po	500,684,14,0,-21	2	0243	-- sterling
-Cs	500,613,0,26,26	0	0244	-- currency
-Ye	500,676,0,47,64	2	0245	-- yen
-bb	220,691,19,0,-66	2	0246	-- brokenbar
-sc	500,691,132,0,-57	2	0247	-- section
-ad	333,667,0,2,2	2	0250	-- dieresis
-co	747,691,19,0,-26	2	0251	-- copyright
-Of	300,688,0,1,1	2	0252	-- ordfeminine
-fo	333,415,0,0,-51	0	0253	-- guilsinglleft
-no	570,399,0,0,-33	0	0254	-- logicalnot
-\-	570,297,0,0,-33	0	0255	-- minus
-rg	747,691,19,0,-26	2	0256	-- registered
-a-	333,637,0,0,-1	2	0257	-- macron
-de	400,688,0,0,-57	2	0260	-- degree
-t+-	570,506,0,0,-33	0	0261	-- plusminus
-S2	300,688	2	0262	-- twosuperior
-S3	300,688,0,0,-3	2	0263	-- threesuperior
-aa	333,713,0,0,-86	2	0264	-- acute
-mc	556,461,206,0,-33	1	0265	-- mu
-ps	540,676,186	2	0266	-- paragraph
-pc	250,417,0,0,-41	0	0267	-- periodcentered
-ac	333,0,218,0,-68	1	0270	-- cedilla
-S1	300,688,0,0,-28	2	0271	-- onesuperior
-Om	330,688,0,0,-18	2	0272	-- ordmasculine
-fc	333,415,0,0,-28	0	0273	-- guilsinglright
-14	750,688,12,0,-28	2	0274	-- onequarter
-12	750,688,12,25,7	2	0275	-- onehalf
-34	750,688,12,0,-23	2	0276	-- threequarters
-r?	500,501,201,0,-55	0	0277	-- questiondown
-`A	722,923,0,0,-9	2	0300	-- Agrave
-'A	722,923,0,0,-9	2	0301	-- Aacute
-^A	722,914,0,0,-9	2	0302	-- Acircumflex
-~A	722,884,0,0,-9	2	0303	-- Atilde
-:A	722,877,0,0,-9	2	0304	-- Adieresis
-oA	722,935,0,0,-9	2	0305	-- Aring
-AE	1000,676,0,0,-4	2	0306	-- AE
-,C	722,691,218,0,-49	3	0307	-- Ccedilla
-`E	667,923,0,0,-16	2	0310	-- Egrave
-'E	667,923,0,0,-16	2	0311	-- Eacute
-^E	667,914,0,0,-16	2	0312	-- Ecircumflex
-:E	667,877,0,0,-16	2	0313	-- Edieresis
-`I	389,923,0,0,-20	2	0314	-- Igrave
-'I	389,923,0,0,-20	2	0315	-- Iacute
-^I	389,914,0,0,-20	2	0316	-- Icircumflex
-:I	389,877,0,0,-20	2	0317	-- Idieresis
--D	722,676,0,0,-6	2	0320	-- Eth
-~N	722,884,18,0,-16	2	0321	-- Ntilde
-`O	778,923,19,0,-35	2	0322	-- Ograve
-'O	778,923,19,0,-35	2	0323	-- Oacute
-^O	778,914,19,0,-35	2	0324	-- Ocircumflex
-~O	778,884,19,0,-35	2	0325	-- Otilde
-:O	778,877,19,0,-35	2	0326	-- Odieresis
-tmu	570,490,0,0,-48	0	0327	-- multiply
-/O	778,737,74,0,-35	2	0330	-- Oslash
-`U	722,923,19,0,-16	2	0331	-- Ugrave
-'U	722,923,19,0,-16	2	0332	-- Uacute
-^U	722,914,19,0,-16	2	0333	-- Ucircumflex
-:U	722,877,19,0,-16	2	0334	-- Udieresis
-'Y	722,928,0,0,-15	2	0335	-- Yacute
-TP	611,676,0,0,-16	2	0336	-- Thorn
-ss	556,691,12,0,-19	2	0337	-- germandbls
-`a	500,713,14,0,-25	2	0340	-- agrave
-'a	500,713,14,0,-25	2	0341	-- aacute
-^a	500,704,14,0,-25	2	0342	-- acircumflex
-~a	500,674,14,0,-25	2	0343	-- atilde
-:a	500,667,14,0,-25	2	0344	-- adieresis
-oa	500,740,14,0,-25	2	0345	-- aring
-ae	722,473,14,0,-33	0	0346	-- ae
-,c	444,473,218,0,-25	1	0347	-- ccedilla
-`e	444,713,14,0,-25	2	0350	-- egrave
-'e	444,713,14,0,-25	2	0351	-- eacute
-^e	444,704,14,0,-25	2	0352	-- ecircumflex
-:e	444,667,14,0,-25	2	0353	-- edieresis
-`i	278,713,0,0,26	2	0354	-- igrave
-'i	278,713,0,12,-16	2	0355	-- iacute
-^i	278,704,0,23,36	2	0356	-- icircumflex
-:i	278,667,0,23,36	2	0357	-- idieresis
-Sd	500,691,14,0,-25	2	0360	-- eth
-~n	556,674,0,0,-21	2	0361	-- ntilde
-`o	500,713,14,0,-25	2	0362	-- ograve
-'o	500,713,14,0,-25	2	0363	-- oacute
-^o	500,704,14,0,-25	2	0364	-- ocircumflex
-~o	500,674,14,0,-25	2	0365	-- otilde
-:o	500,667,14,0,-25	2	0366	-- odieresis
-tdi	570,537,31,0,-33	0	0367	-- divide
-/o	500,549,92,0,-25	0	0370	-- oslash
-`u	556,713,14,0,-16	2	0371	-- ugrave
-'u	556,713,14,0,-16	2	0372	-- uacute
-^u	556,704,14,0,-16	2	0373	-- ucircumflex
-:u	556,667,14,0,-16	2	0374	-- udieresis
-'y	500,713,205,0,-16	3	0375	-- yacute
-Tp	556,676,205,0,-19	3	0376	-- thorn
-:y	500,667,205,0,-16	3	0377	-- ydieresis
+bq	333,155,180	0	128	quotesinglbase
+Fo	500,415	0	129	guillemotleft
+Fc	500,415	0	130	guillemotright
+bu	350,478	0	131	bullet
+Fn	500,706,155	2	132	florin
+f/	167,688,12,162,168	2	133	fraction
+%0	1000,706,29	2	134	perthousand
+dg	500,691,134	2	135	dagger
+dd	500,691,132	2	136	daggerdbl
+en	500,271	0	137	endash
+em	1000,271	0	138	emdash
+fi	556,691	2	140	fi
+fl	556,691	2	141	fl
+.i	278,461	0	144	dotlessi
+ga	333,713	2	146	grave
+a"	333,713,0,92,13	2	147	hungarumlaut
+a.	333,667	2	148	dotaccent
+ab	333,691	2	149	breve
+ah	333,704,0,2,2	2	150	caron
+ao	333,740	2	151	ring
+ho	333,44,173	0	152	ogonek
+lq	500,691	2	153	quotedblleft
+rq	500,691	2	154	quotedblright
+oe	722,473,14	0	155	oe
+/l	278,676,0,25,22	2	156	lslash
+Bq	500,155,180	0	157	quotedblbase
+OE	1000,684,5	2	158	OE
+/L	667,676	2	159	Lslash
+r!	333,501,203	1	161	exclamdown
+ct	500,588,140	0	162	cent
+Po	500,684,14	2	163	sterling
+Cs	500,613,0,26,26	0	164	currency
+Ye	500,676,0,47,64	2	165	yen
+bb	220,691,19	2	166	brokenbar
+sc	500,691,132	2	167	section
+ad	333,667,0,2,2	2	168	dieresis
+co	747,691,19	2	169	copyright
+Of	300,688,0,1,1	2	170	ordfeminine
+fo	333,415	0	171	guilsinglleft
+tno	570,399	0	172	logicalnot
+\-	570,297	0	173	minus
+rg	747,691,19	2	174	registered
+a-	333,637	2	175	macron
+de	400,688	2	176	degree
+t+-	570,506	0	177	plusminus
+S2	300,688	2	178	twosuperior
+S3	300,688	2	179	threesuperior
+aa	333,713	2	180	acute
+mc	556,461,206	1	181	mu
+ps	540,676,186	2	182	paragraph
+pc	250,417	0	183	periodcentered
+ac	333,0,218	1	184	cedilla
+S1	300,688	2	185	onesuperior
+Om	330,688	2	186	ordmasculine
+fc	333,415	0	187	guilsinglright
+14	750,688,12	2	188	onequarter
+12	750,688,12,25,7	2	189	onehalf
+34	750,688,12	2	190	threequarters
+r?	500,501,201	0	191	questiondown
+`A	722,923	2	192	Agrave
+'A	722,923	2	193	Aacute
+^A	722,914	2	194	Acircumflex
+~A	722,884	2	195	Atilde
+:A	722,877	2	196	Adieresis
+oA	722,935	2	197	Aring
+AE	1000,676	2	198	AE
+,C	722,691,218	3	199	Ccedilla
+`E	667,923	2	200	Egrave
+'E	667,923	2	201	Eacute
+^E	667,914	2	202	Ecircumflex
+:E	667,877	2	203	Edieresis
+`I	389,923	2	204	Igrave
+'I	389,923	2	205	Iacute
+^I	389,914	2	206	Icircumflex
+:I	389,877	2	207	Idieresis
+-D	722,676	2	208	Eth
+~N	722,884,18	2	209	Ntilde
+`O	778,923,19	2	210	Ograve
+'O	778,923,19	2	211	Oacute
+^O	778,914,19	2	212	Ocircumflex
+~O	778,884,19	2	213	Otilde
+:O	778,877,19	2	214	Odieresis
+tmu	570,490	0	215	multiply
+/O	778,737,74	2	216	Oslash
+`U	722,923,19	2	217	Ugrave
+'U	722,923,19	2	218	Uacute
+^U	722,914,19	2	219	Ucircumflex
+:U	722,877,19	2	220	Udieresis
+'Y	722,928	2	221	Yacute
+TP	611,676	2	222	Thorn
+ss	556,691,12	2	223	germandbls
+`a	500,713,14	2	224	agrave
+'a	500,713,14	2	225	aacute
+^a	500,704,14	2	226	acircumflex
+~a	500,674,14	2	227	atilde
+:a	500,667,14	2	228	adieresis
+oa	500,740,14	2	229	aring
+ae	722,473,14	0	230	ae
+,c	444,473,218	1	231	ccedilla
+`e	444,713,14	2	232	egrave
+'e	444,713,14	2	233	eacute
+^e	444,704,14	2	234	ecircumflex
+:e	444,667,14	2	235	edieresis
+`i	278,713,0,0,26	2	236	igrave
+'i	278,713,0,12	2	237	iacute
+^i	278,704,0,23,36	2	238	icircumflex
+:i	278,667,0,23,36	2	239	idieresis
+Sd	500,691,14	2	240	eth
+~n	556,674	2	241	ntilde
+`o	500,713,14	2	242	ograve
+'o	500,713,14	2	243	oacute
+^o	500,704,14	2	244	ocircumflex
+~o	500,674,14	2	245	otilde
+:o	500,667,14	2	246	odieresis
+tdi	570,537,31	0	247	divide
+/o	500,549,92	0	248	oslash
+`u	556,713,14	2	249	ugrave
+'u	556,713,14	2	250	uacute
+^u	556,704,14	2	251	ucircumflex
+:u	556,667,14	2	252	udieresis
+'y	500,713,205	3	253	yacute
+Tp	556,676,205	3	254	thorn
+:y	500,667,205	3	255	ydieresis
+u2026	1000,156,13	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TBI b/contrib/groff/font/devps/TBI
index 1b07ee3..0f883d9 100644
--- a/contrib/groff/font/devps/TBI
+++ b/contrib/groff/font/devps/TBI
@@ -191,246 +191,247 @@ x e -10
 y . -37
 y , -37
 charset
-ha	570,669,0,0,-17	2	0000	-- asciicircum
-ti	570,333,0,0,-4	0	0001	-- asciitilde
-vS	556,897,18,20,48,20	2	0002	-- Scaron
-vZ	611,897,0,29,61,29	2	0003	-- Zcaron
-vs	389,690,13,100,69,99	2	0004	-- scaron
-vz	389,690,78,85,93,85	2	0005	-- zcaron
-:Y	611,862,0,98,-23,98	2	0006	-- Ydieresis
-tm	1000,669,0,18,18,18	2	0007	-- trademark
-aq	278,685,0,40,-78,40	2	0010	-- quotesingle
-space	250	0	0040
-!	389,684,13,31,-17,31	2	0041	-- exclam
-"	555,685,0,31,-86,31	2	0042	-- quotedbl
+ha	570,669,0,0,-17	2	0	asciicircum
+ti	570,333,0,0,-4	0	1	asciitilde
+vS	556,897,18,20,48,20	2	2	Scaron
+vZ	611,897,0,29,61,29	2	3	Zcaron
+vs	389,690,13,100,69,99	2	4	scaron
+vz	389,690,78,85,93,85	2	5	zcaron
+:Y	611,862,0,98,-23,98	2	6	Ydieresis
+tm	1000,669,0,18,18,18	2	7	trademark
+aq	278,685,0,40,-78,40	2	8	quotesingle
+space	250	0	32	space
+!	389,684,13,31,-17,31	2	33	exclam
+"	555,685,0,31,-86,31	2	34	quotedbl
 dq	"
-#	500,700,0,83,83,83	2	0043	-- numbersign
+#	500,700,0,83,83,83	2	35	numbersign
 sh	"
-$	500,733,100,47,70,47	2	0044	-- dollar
+$	500,733,100,47,70,47	2	36	dollar
 Do	"
-%	833,692,10,10,11,10	2	0045	-- percent
-&	778,682,19,0,45	2	0046	-- ampersand
-'	333,685,0,19,-48,19	2	0047	-- quoteright
+%	833,692,10,10,11,10	2	37	percent
+&	778,682,19,0,45	2	38	ampersand
+'	333,685,0,19,-48,19	2	39	quoteright
 cq	"
-(	333,685,179,61,22,61	2	0050	-- parenleft
-)	333,685,179,0,94	2	0051	-- parenright
-*	500,685,0,6,-15,6	2	0052	-- asterisk
-+	570,506,0,17,17,17	0	0053	-- plus
-,	250,134,182,0,110	0	0054	-- comma
--	333,282,0,0,48	0	0055	-- hyphen
+(	333,685,179,61,22,61	2	40	parenleft
+)	333,685,179,0,94	2	41	parenright
+*	500,685,0,6,-15,6	2	42	asterisk
++	570,506,0,17,17,17	0	43	plus
+,	250,134,182,0,110	0	44	comma
+-	333,282,0,0,48	0	45	hyphen
 hy	"
-.	250,135,13,0,59	0	0056	-- period
-/	278,685,18,114,114,99	2	0057	-- slash
+.	250,135,13,0,59	0	46	period
+/	278,685,18,114,114,99	2	47	slash
 sl	"
-0	500,683,14,27,33,27	2	0060	-- zero
-1	500,683,0,0,45	2	0061	-- one
-2	500,683,0,0,77	2	0062	-- two
-3	500,683,13,0,65	2	0063	-- three
-4	500,683,0,53,65,53	2	0064	-- four
-5	500,669,13,37,61,37	2	0065	-- five
-6	500,679,15,59,27,59	2	0066	-- six
-7	500,669,0,75,-2,75	2	0067	-- seven
-8	500,683,13,26,47,26	2	0070	-- eight
-9	500,683,10,25,62,25	2	0071	-- nine
-:	333,459,13,0,27	0	0072	-- colon
-;	333,459,183,0,75	0	0073	-- semicolon
-<	570,514,8,19,19,19	0	0074	-- less
-=	570,399,0,17,17,17	0	0075	-- equal
->	570,514,8,19,19,19	0	0076	-- greater
-?	500,684,13,20,-29,20	2	0077	-- question
-@	832,685,18,0,-13	2	0100	-- at
+0	500,683,14,27,33,27	2	48	zero
+1	500,683,0,0,45	2	49	one
+2	500,683,0,0,77	2	50	two
+3	500,683,13,0,65	2	51	three
+4	500,683,0,53,65,53	2	52	four
+5	500,669,13,37,61,37	2	53	five
+6	500,679,15,59,27,59	2	54	six
+7	500,669,0,75,-2,75	2	55	seven
+8	500,683,13,26,47,26	2	56	eight
+9	500,683,10,25,62,25	2	57	nine
+:	333,459,13,0,27	0	58	colon
+;	333,459,183,0,75	0	59	semicolon
+<	570,514,8,19,19,19	0	60	less
+=	570,399,0,17,17,17	0	61	equal
+>	570,514,8,19,19,19	0	62	greater
+?	500,684,13,20,-29,20	2	63	question
+@	832,685,18,0,-13	2	64	at
 at	"
-A	667,683,0,0,117	2	0101	-- A
-B	667,669,0,7,74,7	2	0102	-- B
-C	667,685,18,60,18,60	2	0103	-- C
-D	722,669,0,13,96,13	2	0104	-- D
-E	667,669,0,36,77,36	2	0105	-- E
-F	667,669,0,43,63,43	2	0106	-- F
-G	722,685,18,34,29,34	2	0107	-- G
-H	778,669,0,71,74,71	2	0110	-- H
-I	389,669,0,67,82,67	2	0111	-- I
-J	500,669,99,74,96,74	2	0112	-- J
-K	667,669,0,85,71,85	2	0113	-- K
-L	611,669,0,29,72,29	2	0114	-- L
-M	889,669,12,78,79,78	2	0115	-- M
-N	722,669,15,76,77,76	2	0116	-- N
-O	722,685,18,19,23,19	2	0117	-- O
-P	611,669,0,52,77,52	2	0120	-- P
-Q	722,685,208,19,23,19	3	0121	-- Q
-R	667,669,0,6,79,6	2	0122	-- R
-S	556,685,18,20,48,20	2	0123	-- S
-T	611,669,0,89,0,89	2	0124	-- T
-U	722,669,18,72,-17,72	2	0125	-- U
-V	667,669,18,98,-15,98	2	0126	-- V
-W	889,669,18,101,-15,99	2	0127	-- W
-X	667,669,0,77,74,77	2	0130	-- X
-Y	611,669,0,98,-23,98	2	0131	-- Y
-Z	611,669,0,29,61,29	2	0132	-- Z
-[	333,674,159,79,87,79	2	0133	-- bracketleft
+A	667,683,0,0,117	2	65	A
+B	667,669,0,7,74,7	2	66	B
+C	667,685,18,60,18,60	2	67	C
+D	722,669,0,13,96,13	2	68	D
+E	667,669,0,36,77,36	2	69	E
+F	667,669,0,43,63,43	2	70	F
+G	722,685,18,34,29,34	2	71	G
+H	778,669,0,71,74,71	2	72	H
+I	389,669,0,67,82,67	2	73	I
+J	500,669,99,74,96,74	2	74	J
+K	667,669,0,85,71,85	2	75	K
+L	611,669,0,29,72,29	2	76	L
+M	889,669,12,78,79,78	2	77	M
+N	722,669,15,76,77,76	2	78	N
+O	722,685,18,19,23,19	2	79	O
+P	611,669,0,52,77,52	2	80	P
+Q	722,685,208,19,23,19	3	81	Q
+R	667,669,0,6,79,6	2	82	R
+S	556,685,18,20,48,20	2	83	S
+T	611,669,0,89,0,89	2	84	T
+U	722,669,18,72,-17,72	2	85	U
+V	667,669,18,98,-15,98	2	86	V
+W	889,669,18,101,-15,99	2	87	W
+X	667,669,0,77,74,77	2	88	X
+Y	611,669,0,98,-23,98	2	89	Y
+Z	611,669,0,29,61,29	2	90	Z
+[	333,674,159,79,87,79	2	91	bracketleft
 lB	"
-\	278,685,18,51,51,51	2	0134	-- backslash
+\	278,685,18,51,51,51	2	92	backslash
 rs	"
-]	333,674,157,60,106,60	2	0135	-- bracketright
+]	333,674,157,60,106,60	2	93	bracketright
 rB	"
-a^	333,690,0,84,10,84	2	0136	-- circumflex
+a^	333,690,0,84,10,84	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	333,685,0,49,-78,49	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	333,685,0,49,-78,49	2	96	quoteleft
 oq	"
-a	500,462,14,5,71,5	0	0141	-- a
-b	500,699,13,0,64	2	0142	-- b
-c	444,462,13,0,55	0	0143	-- c
-d	500,699,13,67,71,67	2	0144	-- d
-e	444,462,13,4,45,4	0	0145	-- e
-f	333,698,205,163,219,99	3	0146	-- f
-g	500,462,203,28,102,28	1	0147	-- g
-h	556,699,9,0,63	2	0150	-- h
-i	278,684,9,35,48,35	2	0151	-- i
-j	278,684,207,51,239,51	3	0152	-- j
-k	500,699,8,33,73,33	2	0153	-- k
-l	278,699,9,62,48,62	2	0154	-- l
-m	778,462,9,0,64	0	0155	-- m
-n	556,462,9,0,56	0	0156	-- n
-o	500,462,13,0,53	0	0157	-- o
-p	500,462,205,0,170	1	0160	-- p
-q	500,462,205,21,49,21	1	0161	-- q
-r	389,462,0,50,71,50	0	0162	-- r
-s	389,462,13,0,69	0	0163	-- s
-t	278,594,9,53,61,53	2	0164	-- t
-u	556,462,9,0,35	0	0165	-- u
-v	444,462,13,7,34,7	0	0166	-- v
-w	667,462,13,0,34	0	0167	-- w
-x	500,462,13,19,96,19	0	0170	-- x
-y	444,462,205,0,144	1	0171	-- y
-z	389,449,78,29,93,29	0	0172	-- z
-lC	348,686,187,138,45,99	2	0173	-- braceleft
+a	500,462,14,5,71,5	0	97	a
+b	500,699,13,0,64	2	98	b
+c	444,462,13,0,55	0	99	c
+d	500,699,13,67,71,67	2	100	d
+e	444,462,13,4,45,4	0	101	e
+f	333,698,205,163,219,99	3	102	f
+g	500,462,203,28,102,28	1	103	g
+h	556,699,9,0,63	2	104	h
+i	278,684,9,35,48,35	2	105	i
+j	278,684,207,51,239,51	3	106	j
+k	500,699,8,33,73,33	2	107	k
+l	278,699,9,62,48,62	2	108	l
+m	778,462,9,0,64	0	109	m
+n	556,462,9,0,56	0	110	n
+o	500,462,13,0,53	0	111	o
+p	500,462,205,0,170	1	112	p
+q	500,462,205,21,49,21	1	113	q
+r	389,462,0,50,71,50	0	114	r
+s	389,462,13,0,69	0	115	s
+t	278,594,9,53,61,53	2	116	t
+u	556,462,9,0,35	0	117	u
+v	444,462,13,7,34,7	0	118	v
+w	667,462,13,0,34	0	119	w
+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,685,18,0,-16	2	0174	-- bar
+ba	220,685,18,0,-16	2	124	bar
 |	"
-rC	348,686,187,4,179,4	2	0175	-- braceright
+rC	348,686,187,4,179,4	2	125	braceright
 }	"
-a~	333,655,0,124,2,99	2	0176	-- tilde
+a~	333,655,0,124,2,99	2	126	tilde
 ~	"
-bq	333,134,182,0,55	0	0200	-- quotesinglbase
-Fo	500,415,0,18,38,18	0	0201	-- guillemotleft
-Fc	500,415,0,18,38,18	0	0202	-- guillemotright
-bu	350,525,0,50,50,50	0	0203	-- bullet
-Fn	500,707,156,87,137,87	2	0204	-- florin
-f/	167,683,14,207,219,99	2	0205	-- fraction
-%0	1000,706,29,46,43,46	2	0206	-- perthousand
-dg	500,685,145,44,-41,44	2	0207	-- dagger
-dd	500,685,139,43,40,43	2	0210	-- daggerdbl
-en	500,269,0,27,90,27	0	0211	-- endash
-em	1000,269,0,27,90,27	0	0212	-- emdash
-fi	556,703,205,8,238,8	3	0214	-- fi
-fl	556,704,205,47,236,47	3	0215	-- fl
-.i	278,462,9,10,48,10	0	0220	-- dotlessi
-ga	333,697,0,14,-35,14	2	0222	-- grave
-a"	333,697,0,215,-19,99	2	0223	-- hungarumlaut
-a.	333,655,0,10,-113,10	2	0224	-- dotaccent
-ab	333,678,0,104,-21,99	2	0225	-- breve
-ah	333,690,0,128,-29,99	2	0226	-- caron
-ao	333,729,0,57,-77,57	2	0227	-- ring
-ho	333,44,173,0,90	0	0230	-- ogonek
-lq	500,685,0,63,-3,63	2	0231	-- quotedblleft
-rq	500,685,0,63,-3,63	2	0232	-- quotedblright
-oe	722,462,13,2,44,2	0	0233	-- oe
-/l	278,699,9,73,63,73	2	0234	-- lslash
-Bq	500,134,182,0,107	0	0235	-- quotedblbase
-OE	944,677,8,52,27,52	2	0236	-- OE
-/L	611,669,0,29,72,29	2	0237	-- Lslash
-r!	389,492,205,0,31	1	0241	-- exclamdown
-ct	500,576,143,0,8	0	0242	-- cent
-Po	500,683,12,60,82,60	2	0243	-- sterling
-Cs	500,586,0,76,76,76	0	0244	-- currency
-Ye	500,669,0,178,17,99	2	0245	-- yen
-bb	220,685,18,0,-16	2	0246	-- brokenbar
-sc	500,685,143,9,14,9	2	0247	-- section
-ad	333,655,0,114,-5,99	2	0250	-- dieresis
-co	747,685,18,21,20,21	2	0251	-- copyright
-Of	266,685,0,114,34,99	2	0252	-- ordfeminine
-fo	333,415,0,20,18,20	0	0253	-- guilsinglleft
-no	606,399,0,0,-1	0	0254	-- logicalnot
-\-	606,297,0,0,-1	0	0255	-- minus
-rg	747,685,18,21,20,21	2	0256	-- registered
-a-	333,623,0,110,-1,99	2	0257	-- macron
-de	400,683,0,19,-33,19	2	0260	-- degree
-t+-	570,506,0,17,17,17	0	0261	-- plusminus
-S2	300,683,0,63,48,63	2	0262	-- twosuperior
-S3	300,683,0,71,33,71	2	0263	-- threesuperior
-aa	333,697,0,96,-89,96	2	0264	-- acute
-mc	576,449,207,0,110	1	0265	-- mu
-ps	500,669,193,112,107,99	2	0266	-- paragraph
-pc	250,405,0,0,-1	0	0267	-- periodcentered
-ac	333,5,218,0,130	1	0270	-- cedilla
-S1	300,683,0,51,20,51	2	0271	-- onesuperior
-Om	300,685,0,97,-6,97	2	0272	-- ordmasculine
-fc	333,415,0,0,40	0	0273	-- guilsinglright
-14	750,683,14,21,43,21	2	0274	-- onequarter
-12	750,683,14,23,59,23	2	0275	-- onehalf
-34	750,683,14,26,43,26	2	0276	-- threequarters
-r?	500,492,205,0,20	1	0277	-- questiondown
-`A	667,904,0,0,117	2	0300	-- Agrave
-'A	667,904,0,0,117	2	0301	-- Aacute
-^A	667,897,0,0,117	2	0302	-- Acircumflex
-~A	667,862,0,0,117	2	0303	-- Atilde
-:A	667,862,0,0,117	2	0304	-- Adieresis
-oA	667,921,0,0,117	2	0305	-- Aring
-AE	944,669,0,24,114,24	2	0306	-- AE
-,C	667,685,218,60,18,60	3	0307	-- Ccedilla
-`E	667,904,0,36,77,36	2	0310	-- Egrave
-'E	667,904,0,36,77,36	2	0311	-- Eacute
-^E	667,897,0,36,77,36	2	0312	-- Ecircumflex
-:E	667,862,0,36,77,36	2	0313	-- Edieresis
-`I	389,904,0,67,82,67	2	0314	-- Igrave
-'I	389,904,0,73,82,73	2	0315	-- Iacute
-^I	389,897,0,81,82,81	2	0316	-- Icircumflex
-:I	389,862,0,106,82,99	2	0317	-- Idieresis
--D	722,669,0,28,81,28	2	0320	-- Eth
-~N	722,862,15,76,77,76	2	0321	-- Ntilde
-`O	722,904,18,19,23,19	2	0322	-- Ograve
-'O	722,904,18,19,23,19	2	0323	-- Oacute
-^O	722,897,18,19,23,19	2	0324	-- Ocircumflex
-~O	722,862,18,19,23,19	2	0325	-- Otilde
-:O	722,862,18,19,23,19	2	0326	-- Odieresis
-tmu	570,490,0,2,2,2	0	0327	-- multiply
-/O	722,764,125,19,23,19	2	0330	-- Oslash
-`U	722,904,18,72,-17,72	2	0331	-- Ugrave
-'U	722,904,18,72,-17,72	2	0332	-- Uacute
-^U	722,897,18,72,-17,72	2	0333	-- Ucircumflex
-:U	722,862,18,72,-17,72	2	0334	-- Udieresis
-'Y	611,904,0,98,-23,98	2	0335	-- Yacute
-TP	611,669,0,12,77,12	2	0336	-- Thorn
-ss	500,705,200,23,250,23	2	0337	-- germandbls
-`a	500,697,14,5,71,5	2	0340	-- agrave
-'a	500,697,14,13,71,13	2	0341	-- aacute
-^a	500,690,14,5,71,5	2	0342	-- acircumflex
-~a	500,655,14,41,71,41	2	0343	-- atilde
-:a	500,655,14,21,71,21	2	0344	-- adieresis
-oa	500,729,14,5,71,5	2	0345	-- aring
-ae	722,462,13,1,55,1	0	0346	-- ae
-,c	444,462,218,0,74	1	0347	-- ccedilla
-`e	444,697,13,4,45,4	2	0350	-- egrave
-'e	444,697,13,41,45,41	2	0351	-- eacute
-^e	444,690,13,29,45,29	2	0352	-- ecircumflex
-:e	444,655,13,49,45,49	2	0353	-- edieresis
-`i	278,697,9,32,48,32	2	0354	-- igrave
-'i	278,697,9,124,48,99	2	0355	-- iacute
-^i	278,690,9,97,52,97	2	0356	-- icircumflex
-:i	278,655,9,132,48,99	2	0357	-- idieresis
-Sd	500,699,13,4,53,4	2	0360	-- eth
-~n	556,655,9,0,56	2	0361	-- ntilde
-`o	500,697,13,0,53	2	0362	-- ograve
-'o	500,697,13,13,53,13	2	0363	-- oacute
-^o	500,690,13,1,53,1	2	0364	-- ocircumflex
-~o	500,655,13,41,53,41	2	0365	-- otilde
-:o	500,655,13,16,53,16	2	0366	-- odieresis
-tdi	570,535,29,17,17,17	0	0367	-- divide
-/o	500,560,119,0,53	0	0370	-- oslash
-`u	556,697,9,0,35	2	0371	-- ugrave
-'u	556,697,9,0,35	2	0372	-- uacute
-^u	556,690,9,0,35	2	0373	-- ucircumflex
-:u	556,655,9,0,35	2	0374	-- udieresis
-'y	444,697,205,41,144,41	3	0375	-- yacute
-Tp	500,699,205,0,170	3	0376	-- thorn
-:y	444,655,205,44,144,44	3	0377	-- ydieresis
+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
+bu	350,525,0,50,50,50	0	131	bullet
+Fn	500,707,156,87,137,87	2	132	florin
+f/	167,683,14,207,219,99	2	133	fraction
+%0	1000,706,29,46,43,46	2	134	perthousand
+dg	500,685,145,44,-41,44	2	135	dagger
+dd	500,685,139,43,40,43	2	136	daggerdbl
+en	500,269,0,27,90,27	0	137	endash
+em	1000,269,0,27,90,27	0	138	emdash
+fi	556,703,205,8,238,8	3	140	fi
+fl	556,704,205,47,236,47	3	141	fl
+.i	278,462,9,10,48,10	0	144	dotlessi
+ga	333,697,0,14,-35,14	2	146	grave
+a"	333,697,0,215,-19,99	2	147	hungarumlaut
+a.	333,655,0,10,-113,10	2	148	dotaccent
+ab	333,678,0,104,-21,99	2	149	breve
+ah	333,690,0,128,-29,99	2	150	caron
+ao	333,729,0,57,-77,57	2	151	ring
+ho	333,44,173,0,90	0	152	ogonek
+lq	500,685,0,63,-3,63	2	153	quotedblleft
+rq	500,685,0,63,-3,63	2	154	quotedblright
+oe	722,462,13,2,44,2	0	155	oe
+/l	278,699,9,73,63,73	2	156	lslash
+Bq	500,134,182,0,107	0	157	quotedblbase
+OE	944,677,8,52,27,52	2	158	OE
+/L	611,669,0,29,72,29	2	159	Lslash
+r!	389,492,205,0,31	1	161	exclamdown
+ct	500,576,143,0,8	0	162	cent
+Po	500,683,12,60,82,60	2	163	sterling
+Cs	500,586,0,76,76,76	0	164	currency
+Ye	500,669,0,178,17,99	2	165	yen
+bb	220,685,18,0,-16	2	166	brokenbar
+sc	500,685,143,9,14,9	2	167	section
+ad	333,655,0,114,-5,99	2	168	dieresis
+co	747,685,18,21,20,21	2	169	copyright
+Of	266,685,0,114,34,99	2	170	ordfeminine
+fo	333,415,0,20,18,20	0	171	guilsinglleft
+tno	606,399,0,0,-1	0	172	logicalnot
+\-	606,297,0,0,-1	0	173	minus
+rg	747,685,18,21,20,21	2	174	registered
+a-	333,623,0,110,-1,99	2	175	macron
+de	400,683,0,19,-33,19	2	176	degree
+t+-	570,506,0,17,17,17	0	177	plusminus
+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	576,449,207,0,110	1	181	mu
+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
+S1	300,683,0,51,20,51	2	185	onesuperior
+Om	300,685,0,97,-6,97	2	186	ordmasculine
+fc	333,415,0,0,40	0	187	guilsinglright
+14	750,683,14,21,43,21	2	188	onequarter
+12	750,683,14,23,59,23	2	189	onehalf
+34	750,683,14,26,43,26	2	190	threequarters
+r?	500,492,205,0,20	1	191	questiondown
+`A	667,904,0,0,117	2	192	Agrave
+'A	667,904,0,0,117	2	193	Aacute
+^A	667,897,0,0,117	2	194	Acircumflex
+~A	667,862,0,0,117	2	195	Atilde
+:A	667,862,0,0,117	2	196	Adieresis
+oA	667,921,0,0,117	2	197	Aring
+AE	944,669,0,24,114,24	2	198	AE
+,C	667,685,218,60,18,60	3	199	Ccedilla
+`E	667,904,0,36,77,36	2	200	Egrave
+'E	667,904,0,36,77,36	2	201	Eacute
+^E	667,897,0,36,77,36	2	202	Ecircumflex
+:E	667,862,0,36,77,36	2	203	Edieresis
+`I	389,904,0,67,82,67	2	204	Igrave
+'I	389,904,0,73,82,73	2	205	Iacute
+^I	389,897,0,81,82,81	2	206	Icircumflex
+:I	389,862,0,106,82,99	2	207	Idieresis
+-D	722,669,0,28,81,28	2	208	Eth
+~N	722,862,15,76,77,76	2	209	Ntilde
+`O	722,904,18,19,23,19	2	210	Ograve
+'O	722,904,18,19,23,19	2	211	Oacute
+^O	722,897,18,19,23,19	2	212	Ocircumflex
+~O	722,862,18,19,23,19	2	213	Otilde
+:O	722,862,18,19,23,19	2	214	Odieresis
+tmu	570,490,0,2,2,2	0	215	multiply
+/O	722,764,125,19,23,19	2	216	Oslash
+`U	722,904,18,72,-17,72	2	217	Ugrave
+'U	722,904,18,72,-17,72	2	218	Uacute
+^U	722,897,18,72,-17,72	2	219	Ucircumflex
+:U	722,862,18,72,-17,72	2	220	Udieresis
+'Y	611,904,0,98,-23,98	2	221	Yacute
+TP	611,669,0,12,77,12	2	222	Thorn
+ss	500,705,200,23,250,23	2	223	germandbls
+`a	500,697,14,5,71,5	2	224	agrave
+'a	500,697,14,13,71,13	2	225	aacute
+^a	500,690,14,5,71,5	2	226	acircumflex
+~a	500,655,14,41,71,41	2	227	atilde
+:a	500,655,14,21,71,21	2	228	adieresis
+oa	500,729,14,5,71,5	2	229	aring
+ae	722,462,13,1,55,1	0	230	ae
+,c	444,462,218,0,74	1	231	ccedilla
+`e	444,697,13,4,45,4	2	232	egrave
+'e	444,697,13,41,45,41	2	233	eacute
+^e	444,690,13,29,45,29	2	234	ecircumflex
+:e	444,655,13,49,45,49	2	235	edieresis
+`i	278,697,9,32,48,32	2	236	igrave
+'i	278,697,9,124,48,99	2	237	iacute
+^i	278,690,9,97,52,97	2	238	icircumflex
+:i	278,655,9,132,48,99	2	239	idieresis
+Sd	500,699,13,4,53,4	2	240	eth
+~n	556,655,9,0,56	2	241	ntilde
+`o	500,697,13,0,53	2	242	ograve
+'o	500,697,13,13,53,13	2	243	oacute
+^o	500,690,13,1,53,1	2	244	ocircumflex
+~o	500,655,13,41,53,41	2	245	otilde
+:o	500,655,13,16,53,16	2	246	odieresis
+tdi	570,535,29,17,17,17	0	247	divide
+/o	500,560,119,0,53	0	248	oslash
+`u	556,697,9,0,35	2	249	ugrave
+'u	556,697,9,0,35	2	250	uacute
+^u	556,690,9,0,35	2	251	ucircumflex
+:u	556,655,9,0,35	2	252	udieresis
+'y	444,697,205,41,144,41	3	253	yacute
+Tp	500,699,205,0,170	3	254	thorn
+:y	444,655,205,44,144,44	3	255	ydieresis
+u2026	1000,135,13,0,10	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TI b/contrib/groff/font/devps/TI
index 5e2bebb..471d88d 100644
--- a/contrib/groff/font/devps/TI
+++ b/contrib/groff/font/devps/TI
@@ -203,246 +203,247 @@ w , -74
 y . -55
 y , -55
 charset
-ha	422,666,0,50,50,43	2	0000	-- asciicircum
-ti	541,323,0,11,10,11	0	0001	-- asciitilde
-vS	500,873,18,70,33,43	2	0002	-- Scaron
-vZ	556,873,0,100,56,43	2	0003	-- Zcaron
-vs	389,661,13,115,34,43	2	0004	-- scaron
-vz	389,661,81,95,52,43	2	0005	-- zcaron
-:Y	556,818,0,127,-28,43	2	0006	-- Ydieresis
-tm	980,653,0,27,20,27	2	0007	-- trademark
-aq	214,666,0,77,-82,43	2	0010	-- quotesingle
-space	250	0	0040
-!	333,667,11,19,11,19	2	0041	-- exclam
-"	420,666,0,62,-94,43	2	0042	-- quotedbl
+ha	422,666,0,50,50,43	2	0	asciicircum
+ti	541,323,0,11,10,11	0	1	asciitilde
+vS	500,873,18,70,33,43	2	2	Scaron
+vZ	556,873,0,100,56,43	2	3	Zcaron
+vs	389,661,13,115,34,43	2	4	scaron
+vz	389,661,81,95,52,43	2	5	zcaron
+:Y	556,818,0,127,-28,43	2	6	Ydieresis
+tm	980,653,0,27,20,27	2	7	trademark
+aq	214,666,0,77,-82,43	2	8	quotesingle
+space	250	0	32	space
+!	333,667,11,19,11,19	2	33	exclam
+"	420,666,0,62,-94,43	2	34	quotedbl
 dq	"
-#	500,676,0,90,48,43	2	0043	-- numbersign
+#	500,676,0,90,48,43	2	35	numbersign
 sh	"
-$	500,731,89,47,19,43	2	0044	-- dollar
+$	500,731,89,47,19,43	2	36	dollar
 Do	"
-%	833,676,13,7,-29,7	2	0045	-- percent
-&	778,666,18,0,-26	2	0046	-- ampersand
-'	333,666,0,7,-101,7	2	0047	-- quoteright
+%	833,676,13,7,-29,7	2	37	percent
+&	778,666,18,0,-26	2	38	ampersand
+'	333,666,0,7,-101,7	2	39	quoteright
 cq	"
-(	333,669,181,32,8,32	2	0050	-- parenleft
-)	333,669,180,6,34,6	2	0051	-- parenright
-*	500,666,0,42,-78,42	2	0052	-- asterisk
-+	675,506,0,0,-36	0	0053	-- plus
-,	250,101,129,0,54	0	0054	-- comma
--	333,255,0,0,1	0	0055	-- hyphen
+(	333,669,181,32,8,32	2	40	parenleft
+)	333,669,180,6,34,6	2	41	parenright
+*	500,666,0,42,-78,42	2	42	asterisk
++	675,506,0,0,-36	0	43	plus
+,	250,101,129,0,54	0	44	comma
+-	333,255,0,0,1	0	45	hyphen
 hy	"
-.	250,100,11,0,23	0	0056	-- period
-/	278,666,18,158,115,43	2	0057	-- slash
+.	250,100,11,0,23	0	46	period
+/	278,666,18,158,115,43	2	47	slash
 sl	"
-0	500,676,7,47,18,43	2	0060	-- zero
-1	500,676,0,0,1	2	0061	-- one
-2	500,676,0,2,38,2	2	0062	-- two
-3	500,676,7,15,35,15	2	0063	-- three
-4	500,676,0,29,49,29	2	0064	-- four
-5	500,666,7,41,35,41	2	0065	-- five
-6	500,686,7,71,20,43	2	0066	-- six
-7	500,666,8,87,-25,43	2	0067	-- seven
-8	500,676,7,43,20,43	2	0070	-- eight
-9	500,676,17,42,27,42	2	0071	-- nine
-:	333,441,11	0	0072	-- colon
-;	333,441,129,0,23	0	0073	-- semicolon
-<	675,514,8,0,-34	0	0074	-- less
-=	675,386,0,0,-36	0	0075	-- equal
->	675,514,8,0,-34	0	0076	-- greater
-?	500,664,12,22,-82,22	2	0077	-- question
-@	920,666,18,0,-68	2	0100	-- at
+0	500,676,7,47,18,43	2	48	zero
+1	500,676,0,0,1	2	49	one
+2	500,676,0,2,38,2	2	50	two
+3	500,676,7,15,35,15	2	51	three
+4	500,676,0,29,49,29	2	52	four
+5	500,666,7,41,35,41	2	53	five
+6	500,686,7,71,20,43	2	54	six
+7	500,666,8,87,-25,43	2	55	seven
+8	500,676,7,43,20,43	2	56	eight
+9	500,676,17,42,27,42	2	57	nine
+:	333,441,11	0	58	colon
+;	333,441,129,0,23	0	59	semicolon
+<	675,514,8,0,-34	0	60	less
+=	675,386,0,0,-36	0	61	equal
+>	675,514,8,0,-34	0	62	greater
+?	500,664,12,22,-82,22	2	63	question
+@	920,666,18,0,-68	2	64	at
 at	"
-A	611,668,0,3,101,3	2	0101	-- A
-B	611,653,0,27,58,27	2	0102	-- B
-C	667,666,18,72,-16,43	2	0103	-- C
-D	722,653,0,28,58,28	2	0104	-- D
-E	611,653,0,73,51,43	2	0105	-- E
-F	611,653,0,84,42,43	2	0106	-- F
-G	722,666,18,50,-2,43	2	0107	-- G
-H	722,653,0,95,58,43	2	0110	-- H
-I	333,653,0,101,58,43	2	0111	-- I
-J	444,653,18,97,56,43	2	0112	-- J
-K	667,653,0,105,43,43	2	0113	-- K
-L	556,653,0,53,58,43	2	0114	-- L
-M	833,653,0,90,68,43	2	0115	-- M
-N	667,653,15,110,70,43	2	0116	-- N
-O	722,666,18,27,-10,27	2	0117	-- O
-P	611,653,0,44,50,43	2	0120	-- P
-Q	722,666,182,27,-9,27	2	0121	-- Q
-R	611,653,0,27,63,27	2	0122	-- R
-S	500,667,18,58,33,43	2	0123	-- S
-T	556,653,0,127,-9,43	2	0124	-- T
-U	722,653,18,93,-52,43	2	0125	-- U
-V	611,653,18,127,-26,43	2	0126	-- V
-W	833,653,18,123,-21,43	2	0127	-- W
-X	611,653,0,94,79,43	2	0130	-- X
-Y	556,653,0,127,-28,43	2	0131	-- Y
-Z	556,653,0,100,56,43	2	0132	-- Z
-[	389,663,153,52,29,43	2	0133	-- bracketleft
+A	611,668,0,3,101,3	2	65	A
+B	611,653,0,27,58,27	2	66	B
+C	667,666,18,72,-16,43	2	67	C
+D	722,653,0,28,58,28	2	68	D
+E	611,653,0,73,51,43	2	69	E
+F	611,653,0,84,42,43	2	70	F
+G	722,666,18,50,-2,43	2	71	G
+H	722,653,0,95,58,43	2	72	H
+I	333,653,0,101,58,43	2	73	I
+J	444,653,18,97,56,43	2	74	J
+K	667,653,0,105,43,43	2	75	K
+L	556,653,0,53,58,43	2	76	L
+M	833,653,0,90,68,43	2	77	M
+N	667,653,15,110,70,43	2	78	N
+O	722,666,18,27,-10,27	2	79	O
+P	611,653,0,44,50,43	2	80	P
+Q	722,666,182,27,-9,27	2	81	Q
+R	611,653,0,27,63,27	2	82	R
+S	500,667,18,58,33,43	2	83	S
+T	556,653,0,127,-9,43	2	84	T
+U	722,653,18,93,-52,43	2	85	U
+V	611,653,18,127,-26,43	2	86	V
+W	833,653,18,123,-21,43	2	87	W
+X	611,653,0,94,79,43	2	88	X
+Y	556,653,0,127,-28,43	2	89	Y
+Z	556,653,0,100,56,43	2	90	Z
+[	389,663,153,52,29,43	2	91	bracketleft
 lB	"
-\	278,666,18,91,91,43	2	0134	-- backslash
+\	278,666,18,91,91,43	2	92	backslash
 rs	"
-]	389,663,153,43,38,43	2	0135	-- bracketright
+]	389,663,153,43,38,43	2	93	bracketright
 rB	"
-a^	333,661,0,102,-41,43	2	0136	-- circumflex
+a^	333,661,0,102,-41,43	2	94	circumflex
 ^	"
-_	500,0,125,50,50,43	0	0137	-- underscore
-`	333,666,0,27,-121,27	2	0140	-- quoteleft
+_	500,0,125,50,50,43	0	95	underscore
+`	333,666,0,27,-121,27	2	96	quoteleft
 oq	"
-a	500,441,11,26,33,26	0	0141	-- a
-b	500,683,11,23,27,23	2	0142	-- b
-c	444,441,11,31,20,31	0	0143	-- c
-d	500,683,13,77,35,43	2	0144	-- d
-e	444,441,11,18,19,18	0	0145	-- e
-f	278,678,207,196,197,43	3	0146	-- f
-g	500,441,206,22,42,22	1	0147	-- g
-h	500,683,9,28,31,28	2	0150	-- h
-i	278,654,11,36,1,36	2	0151	-- i
-j	278,654,207,48,174,43	3	0152	-- j
-k	444,683,11,67,36,43	2	0153	-- k
-l	278,683,11,51,9,43	2	0154	-- l
-m	722,441,9,32,38,32	0	0155	-- m
-n	500,441,9,24,36,24	0	0156	-- n
-o	500,441,11,18,23,18	0	0157	-- o
-p	500,441,205,19,125,19	1	0160	-- p
-q	500,441,209,33,25,33	1	0161	-- q
-r	389,441,0,73,5,43	0	0162	-- r
-s	389,442,13,27,34,27	0	0163	-- s
-t	278,546,11,68,13,43	2	0164	-- t
-u	500,441,11,25,8,25	0	0165	-- u
-v	444,441,18,32,29,32	0	0166	-- v
-w	667,441,18,31,34,31	0	0167	-- w
-x	444,441,11,53,77,43	0	0170	-- x
-y	444,441,206,32,74,32	1	0171	-- y
-z	389,428,81,41,52,41	0	0172	-- z
-lC	400,687,177,57,-1,43	2	0173	-- braceleft
+a	500,441,11,26,33,26	0	97	a
+b	500,683,11,23,27,23	2	98	b
+c	444,441,11,31,20,31	0	99	c
+d	500,683,13,77,35,43	2	100	d
+e	444,441,11,18,19,18	0	101	e
+f	278,678,207,196,197,43	3	102	f
+g	500,441,206,22,42,22	1	103	g
+h	500,683,9,28,31,28	2	104	h
+i	278,654,11,36,1,36	2	105	i
+j	278,654,207,48,174,43	3	106	j
+k	444,683,11,67,36,43	2	107	k
+l	278,683,11,51,9,43	2	108	l
+m	722,441,9,32,38,32	0	109	m
+n	500,441,9,24,36,24	0	110	n
+o	500,441,11,18,23,18	0	111	o
+p	500,441,205,19,125,19	1	112	p
+q	500,441,209,33,25,33	1	113	q
+r	389,441,0,73,5,43	0	114	r
+s	389,442,13,27,34,27	0	115	s
+t	278,546,11,68,13,43	2	116	t
+u	500,441,11,25,8,25	0	117	u
+v	444,441,18,32,29,32	0	118	v
+w	667,441,18,31,34,31	0	119	w
+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,666,18,0,-55	2	0174	-- bar
+ba	275,666,18,0,-55	2	124	bar
 |	"
-rC	400,687,177,0,57	2	0175	-- braceright
+rC	400,687,177,0,57	2	125	braceright
 }	"
-a~	333,624,0,144,-50,43	2	0176	-- tilde
+a~	333,624,0,144,-50,43	2	126	tilde
 ~	"
-bq	333,101,129,0,6	0	0200	-- quotesinglbase
-Fo	500,403,0,0,-3	0	0201	-- guillemotleft
-Fc	500,403,0,0,-5	0	0202	-- guillemotright
-bu	350,461,0,10,10,10	0	0203	-- bullet
-Fn	500,682,182,57,25,43	2	0204	-- florin
-f/	167,676,10,220,219,43	2	0205	-- fraction
-%0	1000,706,19,60,25,43	2	0206	-- perthousand
-dg	500,666,159,38,-51,38	2	0207	-- dagger
-dd	500,666,143,41,28,41	2	0210	-- daggerdbl
-en	500,243,0,55,56,43	0	0211	-- endash
-em	889,243,0,55,56,43	0	0212	-- emdash
-fi	500,681,207,31,191,31	3	0214	-- fi
-fl	500,682,204,68,191,43	3	0215	-- fl
-.i	278,441,11,7,1,7	0	0220	-- dotlessi
-ga	333,664,0,28,-71,28	2	0222	-- grave
-a"	333,664,0,203,-43,43	2	0223	-- hungarumlaut
-a.	333,606,0,22,-157,22	2	0224	-- dotaccent
-ab	333,650,0,135,-67,43	2	0225	-- breve
-ah	333,661,0,143,-71,43	2	0226	-- caron
-ao	333,691,0,72,-105,43	2	0227	-- ring
-ho	333,40,169,0,70	0	0230	-- ogonek
-lq	556,666,0,8,-116,8	2	0231	-- quotedblleft
-rq	556,666,0,0,-101	2	0232	-- quotedblright
-oe	667,441,12,29,30,29	0	0233	-- oe
-/l	278,683,11,79,13,43	2	0234	-- lslash
-Bq	556,101,129,0,-7	0	0235	-- quotedblbase
-OE	944,666,8,70,1,43	2	0236	-- OE
-/L	556,653,0,53,58,43	2	0237	-- Lslash
-r!	389,473,205,0,-9	1	0241	-- exclamdown
-ct	500,560,143,22,-27,22	2	0242	-- cent
-Po	500,670,6,67,40,43	2	0243	-- sterling
-Cs	500,597,0,72,72,43	2	0244	-- currency
-Ye	500,653,0,153,23,43	2	0245	-- yen
-bb	275,666,18,0,-55	2	0246	-- brokenbar
-sc	500,666,162,11,-3,11	2	0247	-- section
-ad	333,606,0,122,-57,43	2	0250	-- dieresis
-co	760,666,18,9,9,9	2	0251	-- copyright
-Of	276,676,0,126,8,43	2	0252	-- ordfeminine
-fo	333,403,0,0,-1	0	0253	-- guilsinglleft
-no	675,386,0,0,-36	0	0254	-- logicalnot
-\-	675,286,0,0,-36	0	0255	-- minus
-rg	760,666,18,9,9,9	2	0256	-- registered
-a-	333,583,0,128,-49,43	2	0257	-- macron
-de	400,676,0,37,-51,37	2	0260	-- degree
-t+-	675,506,0,0,-36	0	0261	-- plusminus
-S2	300,676,0,74,17,43	2	0262	-- twosuperior
-S3	300,676,0,89,7,43	2	0263	-- threesuperior
-aa	333,664,0,120,-130,43	2	0264	-- acute
-mc	500,428,209,47,80,43	1	0265	-- mu
-ps	523,653,123,143,-5,43	2	0266	-- paragraph
-pc	250,310,0,0,-20	0	0267	-- periodcentered
-ac	333,0,217,0,80	1	0270	-- cedilla
-S1	300,676,0,34,7,34	2	0271	-- onesuperior
-Om	310,676,0,102,-17,43	2	0272	-- ordmasculine
-fc	333,403,0,0,-2	0	0273	-- guilsinglright
-14	750,676,10,36,17,36	2	0274	-- onequarter
-12	750,676,10,49,16,43	2	0275	-- onehalf
-34	750,676,10,36,27,36	2	0276	-- threequarters
-r?	500,471,205,0,22	1	0277	-- questiondown
-`A	611,876,0,3,101,3	2	0300	-- Agrave
-'A	611,876,0,3,101,3	2	0301	-- Aacute
-^A	611,873,0,3,101,3	2	0302	-- Acircumflex
-~A	611,836,0,5,101,5	2	0303	-- Atilde
-:A	611,818,0,3,101,3	2	0304	-- Adieresis
-oA	611,883,0,3,101,3	2	0305	-- Aring
-AE	889,653,0,72,77,43	2	0306	-- AE
-,C	667,666,217,72,-16,43	3	0307	-- Ccedilla
-`E	611,876,0,73,51,43	2	0310	-- Egrave
-'E	611,876,0,73,51,43	2	0311	-- Eacute
-^E	611,873,0,73,51,43	2	0312	-- Ecircumflex
-:E	611,818,0,73,51,43	2	0313	-- Edieresis
-`I	333,876,0,101,58,43	2	0314	-- Igrave
-'I	333,876,0,130,58,43	2	0315	-- Iacute
-^I	333,873,0,142,58,43	2	0316	-- Icircumflex
-:I	333,818,0,152,58,43	2	0317	-- Idieresis
--D	722,653,0,28,58,28	2	0320	-- Eth
-~N	667,836,15,110,70,43	2	0321	-- Ntilde
-`O	722,876,18,27,-10,27	2	0322	-- Ograve
-'O	722,876,18,27,-10,27	2	0323	-- Oacute
-^O	722,873,18,27,-10,27	2	0324	-- Ocircumflex
-~O	722,836,18,27,-10,27	2	0325	-- Otilde
-:O	722,818,18,27,-10,27	2	0326	-- Odieresis
-tmu	675,497,0,0,-43	0	0327	-- multiply
-/O	722,722,105,27,-10,27	2	0330	-- Oslash
-`U	722,876,18,93,-52,43	2	0331	-- Ugrave
-'U	722,876,18,93,-52,43	2	0332	-- Uacute
-^U	722,873,18,93,-52,43	2	0333	-- Ucircumflex
-:U	722,818,18,93,-52,43	2	0334	-- Udieresis
-'Y	556,876,0,127,-28,43	2	0335	-- Yacute
-TP	611,653,0,8,50,8	2	0336	-- Thorn
-ss	500,679,207,43,218,43	3	0337	-- germandbls
-`a	500,664,11,26,33,26	2	0340	-- agrave
-'a	500,664,11,37,33,37	2	0341	-- aacute
-^a	500,661,11,26,33,26	2	0342	-- acircumflex
-~a	500,624,11,61,33,43	2	0343	-- atilde
-:a	500,606,11,39,33,39	2	0344	-- adieresis
-oa	500,691,11,26,33,26	2	0345	-- aring
-ae	667,441,11,23,27,23	0	0346	-- ae
-,c	444,441,217,31,24,31	1	0347	-- ccedilla
-`e	444,664,11,18,19,18	2	0350	-- egrave
-'e	444,664,11,65,19,43	2	0351	-- eacute
-^e	444,661,11,47,19,43	2	0352	-- ecircumflex
-:e	444,606,11,57,19,43	2	0353	-- edieresis
-`i	278,664,11,56,1,43	2	0354	-- igrave
-'i	278,664,11,128,1,43	2	0355	-- iacute
-^i	278,661,11,100,16,43	2	0356	-- icircumflex
-:i	278,606,11,125,1,43	2	0357	-- idieresis
-Sd	500,683,11,32,23,32	2	0360	-- eth
-~n	500,624,9,26,36,26	2	0361	-- ntilde
-`o	500,664,11,18,23,18	2	0362	-- ograve
-'o	500,664,11,37,23,37	2	0363	-- oacute
-^o	500,661,11,18,23,18	2	0364	-- ocircumflex
-~o	500,624,11,46,23,43	2	0365	-- otilde
-:o	500,606,11,39,23,39	2	0366	-- odieresis
-tdi	675,517,11,0,-36	0	0367	-- divide
-/o	500,554,135,19,22,19	2	0370	-- oslash
-`u	500,664,11,25,8,25	2	0371	-- ugrave
-'u	500,664,11,27,8,27	2	0372	-- uacute
-^u	500,661,11,25,8,25	2	0373	-- ucircumflex
-:u	500,606,11,29,8,29	2	0374	-- udieresis
-'y	444,664,206,65,74,43	3	0375	-- yacute
-Tp	500,683,205,19,125,19	3	0376	-- thorn
-:y	444,606,206,47,74,43	3	0377	-- ydieresis
+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
+bu	350,461,0,10,10,10	0	131	bullet
+Fn	500,682,182,57,25,43	2	132	florin
+f/	167,676,10,220,219,43	2	133	fraction
+%0	1000,706,19,60,25,43	2	134	perthousand
+dg	500,666,159,38,-51,38	2	135	dagger
+dd	500,666,143,41,28,41	2	136	daggerdbl
+en	500,243,0,55,56,43	0	137	endash
+em	889,243,0,55,56,43	0	138	emdash
+fi	500,681,207,31,191,31	3	140	fi
+fl	500,682,204,68,191,43	3	141	fl
+.i	278,441,11,7,1,7	0	144	dotlessi
+ga	333,664,0,28,-71,28	2	146	grave
+a"	333,664,0,203,-43,43	2	147	hungarumlaut
+a.	333,606,0,22,-157,22	2	148	dotaccent
+ab	333,650,0,135,-67,43	2	149	breve
+ah	333,661,0,143,-71,43	2	150	caron
+ao	333,691,0,72,-105,43	2	151	ring
+ho	333,40,169,0,70	0	152	ogonek
+lq	556,666,0,8,-116,8	2	153	quotedblleft
+rq	556,666,0,0,-101	2	154	quotedblright
+oe	667,441,12,29,30,29	0	155	oe
+/l	278,683,11,79,13,43	2	156	lslash
+Bq	556,101,129,0,-7	0	157	quotedblbase
+OE	944,666,8,70,1,43	2	158	OE
+/L	556,653,0,53,58,43	2	159	Lslash
+r!	389,473,205,0,-9	1	161	exclamdown
+ct	500,560,143,22,-27,22	2	162	cent
+Po	500,670,6,67,40,43	2	163	sterling
+Cs	500,597,0,72,72,43	2	164	currency
+Ye	500,653,0,153,23,43	2	165	yen
+bb	275,666,18,0,-55	2	166	brokenbar
+sc	500,666,162,11,-3,11	2	167	section
+ad	333,606,0,122,-57,43	2	168	dieresis
+co	760,666,18,9,9,9	2	169	copyright
+Of	276,676,0,126,8,43	2	170	ordfeminine
+fo	333,403,0,0,-1	0	171	guilsinglleft
+tno	675,386,0,0,-36	0	172	logicalnot
+\-	675,286,0,0,-36	0	173	minus
+rg	760,666,18,9,9,9	2	174	registered
+a-	333,583,0,128,-49,43	2	175	macron
+de	400,676,0,37,-51,37	2	176	degree
+t+-	675,506,0,0,-36	0	177	plusminus
+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	500,428,209,47,80,43	1	181	mu
+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
+S1	300,676,0,34,7,34	2	185	onesuperior
+Om	310,676,0,102,-17,43	2	186	ordmasculine
+fc	333,403,0,0,-2	0	187	guilsinglright
+14	750,676,10,36,17,36	2	188	onequarter
+12	750,676,10,49,16,43	2	189	onehalf
+34	750,676,10,36,27,36	2	190	threequarters
+r?	500,471,205,0,22	1	191	questiondown
+`A	611,876,0,3,101,3	2	192	Agrave
+'A	611,876,0,3,101,3	2	193	Aacute
+^A	611,873,0,3,101,3	2	194	Acircumflex
+~A	611,836,0,5,101,5	2	195	Atilde
+:A	611,818,0,3,101,3	2	196	Adieresis
+oA	611,883,0,3,101,3	2	197	Aring
+AE	889,653,0,72,77,43	2	198	AE
+,C	667,666,217,72,-16,43	3	199	Ccedilla
+`E	611,876,0,73,51,43	2	200	Egrave
+'E	611,876,0,73,51,43	2	201	Eacute
+^E	611,873,0,73,51,43	2	202	Ecircumflex
+:E	611,818,0,73,51,43	2	203	Edieresis
+`I	333,876,0,101,58,43	2	204	Igrave
+'I	333,876,0,130,58,43	2	205	Iacute
+^I	333,873,0,142,58,43	2	206	Icircumflex
+:I	333,818,0,152,58,43	2	207	Idieresis
+-D	722,653,0,28,58,28	2	208	Eth
+~N	667,836,15,110,70,43	2	209	Ntilde
+`O	722,876,18,27,-10,27	2	210	Ograve
+'O	722,876,18,27,-10,27	2	211	Oacute
+^O	722,873,18,27,-10,27	2	212	Ocircumflex
+~O	722,836,18,27,-10,27	2	213	Otilde
+:O	722,818,18,27,-10,27	2	214	Odieresis
+tmu	675,497,0,0,-43	0	215	multiply
+/O	722,722,105,27,-10,27	2	216	Oslash
+`U	722,876,18,93,-52,43	2	217	Ugrave
+'U	722,876,18,93,-52,43	2	218	Uacute
+^U	722,873,18,93,-52,43	2	219	Ucircumflex
+:U	722,818,18,93,-52,43	2	220	Udieresis
+'Y	556,876,0,127,-28,43	2	221	Yacute
+TP	611,653,0,8,50,8	2	222	Thorn
+ss	500,679,207,43,218,43	3	223	germandbls
+`a	500,664,11,26,33,26	2	224	agrave
+'a	500,664,11,37,33,37	2	225	aacute
+^a	500,661,11,26,33,26	2	226	acircumflex
+~a	500,624,11,61,33,43	2	227	atilde
+:a	500,606,11,39,33,39	2	228	adieresis
+oa	500,691,11,26,33,26	2	229	aring
+ae	667,441,11,23,27,23	0	230	ae
+,c	444,441,217,31,24,31	1	231	ccedilla
+`e	444,664,11,18,19,18	2	232	egrave
+'e	444,664,11,65,19,43	2	233	eacute
+^e	444,661,11,47,19,43	2	234	ecircumflex
+:e	444,606,11,57,19,43	2	235	edieresis
+`i	278,664,11,56,1,43	2	236	igrave
+'i	278,664,11,128,1,43	2	237	iacute
+^i	278,661,11,100,16,43	2	238	icircumflex
+:i	278,606,11,125,1,43	2	239	idieresis
+Sd	500,683,11,32,23,32	2	240	eth
+~n	500,624,9,26,36,26	2	241	ntilde
+`o	500,664,11,18,23,18	2	242	ograve
+'o	500,664,11,37,23,37	2	243	oacute
+^o	500,661,11,18,23,18	2	244	ocircumflex
+~o	500,624,11,46,23,43	2	245	otilde
+:o	500,606,11,39,23,39	2	246	odieresis
+tdi	675,517,11,0,-36	0	247	divide
+/o	500,554,135,19,22,19	2	248	oslash
+`u	500,664,11,25,8,25	2	249	ugrave
+'u	500,664,11,27,8,27	2	250	uacute
+^u	500,661,11,25,8,25	2	251	ucircumflex
+:u	500,606,11,29,8,29	2	252	udieresis
+'y	444,664,206,65,74,43	3	253	yacute
+Tp	500,683,205,19,125,19	3	254	thorn
+:y	444,606,206,47,74,43	3	255	ydieresis
+u2026	889,100,11,0,-7	0	256	ellipsis
diff --git a/contrib/groff/font/devps/TR b/contrib/groff/font/devps/TR
index 913e8d4..ecea19c 100644
--- a/contrib/groff/font/devps/TR
+++ b/contrib/groff/font/devps/TR
@@ -195,246 +195,247 @@ x e -15
 y . -65
 y , -65
 charset
-ha	469,662,0,0,-24	2	0000	-- asciicircum
-ti	541,323,0,0,-40	0	0001	-- asciitilde
-vS	556,886,14,0,-42	2	0002	-- Scaron
-vZ	611,886,0,0,-9	2	0003	-- Zcaron
-vs	389,674,10,0,-39	2	0004	-- scaron
-vz	444,674,0,0,-27	2	0005	-- zcaron
-:Y	722,835,0,0,-22	2	0006	-- Ydieresis
-tm	980,662,0,0,-30	2	0007	-- trademark
-aq	180,676,0,0,-48	2	0010	-- quotesingle
-space	250	0	0040
-!	333,676,9,0,-130	2	0041	-- exclam
-"	408,676,0,0,-77	2	0042	-- quotedbl
+ha	469,662	2	0	asciicircum
+ti	541,323	0	1	asciitilde
+vS	556,886,14	2	2	Scaron
+vZ	611,886	2	3	Zcaron
+vs	389,674,10	2	4	scaron
+vz	444,674	2	5	zcaron
+:Y	722,835	2	6	Ydieresis
+tm	980,662	2	7	trademark
+aq	180,676	2	8	quotesingle
+space	250	0	32	space
+!	333,676,9	2	33	exclam
+"	408,676	2	34	quotedbl
 dq	"
-#	500,662,0,0,-5	2	0043	-- numbersign
+#	500,662	2	35	numbersign
 sh	"
-$	500,727,87,0,-44	2	0044	-- dollar
+$	500,727,87	2	36	dollar
 Do	"
-%	833,676,13,0,-61	2	0045	-- percent
-&	778,676,13,0,-42	2	0046	-- ampersand
-'	333,676,0,0,-79	2	0047	-- quoteright
+%	833,676,13	2	37	percent
+&	778,676,13	2	38	ampersand
+'	333,676	2	39	quoteright
 cq	"
-(	333,676,177,0,-48	2	0050	-- parenleft
-)	333,676,177,0,-29	2	0051	-- parenright
-*	500,676,0,0,-69	2	0052	-- asterisk
-+	564,506,0,0,-30	0	0053	-- plus
-,	250,102,141,0,-56	0	0054	-- comma
--	333,257,0,0,-39	0	0055	-- hyphen
+(	333,676,177	2	40	parenleft
+)	333,676,177	2	41	parenright
+*	500,676	2	42	asterisk
++	564,506	0	43	plus
+,	250,102,141	0	44	comma
+-	333,257	0	45	hyphen
 hy	"
-.	250,100,11,0,-70	0	0056	-- period
-/	278,676,14,9,9	2	0057	-- slash
+.	250,100,11	0	46	period
+/	278,676,14,9,9	2	47	slash
 sl	"
-0	500,676,14,0,-24	2	0060	-- zero
-1	500,676,0,0,-111	2	0061	-- one
-2	500,676,0,0,-30	2	0062	-- two
-3	500,676,14,0,-43	2	0063	-- three
-4	500,676,0,0,-12	2	0064	-- four
-5	500,688,14,0,-32	2	0065	-- five
-6	500,684,14,0,-34	2	0066	-- six
-7	500,662,8,0,-20	2	0067	-- seven
-8	500,676,14,0,-56	2	0070	-- eight
-9	500,676,22,0,-30	2	0071	-- nine
-:	278,459,11,0,-81	0	0072	-- colon
-;	278,459,141,0,-80	0	0073	-- semicolon
-<	564,514,8,0,-28	0	0074	-- less
-=	564,386,0,0,-30	0	0075	-- equal
->	564,514,8,0,-28	0	0076	-- greater
-?	444,676,8,0,-68	2	0077	-- question
-@	921,676,14,0,-116	2	0100	-- at
+0	500,676,14	2	48	zero
+1	500,676	2	49	one
+2	500,676	2	50	two
+3	500,676,14	2	51	three
+4	500,676	2	52	four
+5	500,688,14	2	53	five
+6	500,684,14	2	54	six
+7	500,662,8	2	55	seven
+8	500,676,14	2	56	eight
+9	500,676,22	2	57	nine
+:	278,459,11	0	58	colon
+;	278,459,141	0	59	semicolon
+<	564,514,8	0	60	less
+=	564,386	0	61	equal
+>	564,514,8	0	62	greater
+?	444,676,8	2	63	question
+@	921,676,14	2	64	at
 at	"
-A	722,674,0,0,-15	2	0101	-- A
-B	667,662,0,0,-17	2	0102	-- B
-C	667,676,14,0,-28	2	0103	-- C
-D	722,662,0,0,-16	2	0104	-- D
-E	611,662,0,0,-12	2	0105	-- E
-F	556,662,0,0,-12	2	0106	-- F
-G	722,676,14,0,-32	2	0107	-- G
-H	722,662,0,0,-19	2	0110	-- H
-I	333,662,0,0,-18	2	0111	-- I
-J	389,662,14,0,-10	2	0112	-- J
-K	722,662,0,1,-34	2	0113	-- K
-L	611,662,0,0,-12	2	0114	-- L
-M	889,662,0,0,-12	2	0115	-- M
-N	722,662,11,0,-12	2	0116	-- N
-O	722,676,14,0,-34	2	0117	-- O
-P	556,662,0,0,-16	2	0120	-- P
-Q	722,676,178,0,-34	2	0121	-- Q
-R	667,662,0,0,-17	2	0122	-- R
-S	556,676,14,0,-42	2	0123	-- S
-T	611,662,0,0,-17	2	0124	-- T
-U	722,662,14,0,-14	2	0125	-- U
-V	722,662,11,0,-16	2	0126	-- V
-W	944,662,11,0,-5	2	0127	-- W
-X	722,662,0,0,-10	2	0130	-- X
-Y	722,662,0,0,-22	2	0131	-- Y
-Z	611,662,0,0,-9	2	0132	-- Z
-[	333,662,156,0,-88	2	0133	-- bracketleft
+A	722,674	2	65	A
+B	667,662	2	66	B
+C	667,676,14	2	67	C
+D	722,662	2	68	D
+E	611,662	2	69	E
+F	556,662	2	70	F
+G	722,676,14	2	71	G
+H	722,662	2	72	H
+I	333,662	2	73	I
+J	389,662,14	2	74	J
+K	722,662,0,1	2	75	K
+L	611,662	2	76	L
+M	889,662	2	77	M
+N	722,662,11	2	78	N
+O	722,676,14	2	79	O
+P	556,662	2	80	P
+Q	722,676,178	2	81	Q
+R	667,662	2	82	R
+S	556,676,14	2	83	S
+T	611,662	2	84	T
+U	722,662,14	2	85	U
+V	722,662,11	2	86	V
+W	944,662,11	2	87	W
+X	722,662	2	88	X
+Y	722,662	2	89	Y
+Z	611,662	2	90	Z
+[	333,662,156	2	91	bracketleft
 lB	"
-\	278,676,14,9,9	2	0134	-- backslash
+\	278,676,14,9,9	2	92	backslash
 rs	"
-]	333,662,156,0,-34	2	0135	-- bracketright
+]	333,662,156	2	93	bracketright
 rB	"
-a^	333,674,0,0,-11	2	0136	-- circumflex
+a^	333,674	2	94	circumflex
 ^	"
-_	500,0,125	0	0137	-- underscore
-`	333,676,0,0,-115	2	0140	-- quoteleft
+_	500,0,125	0	95	underscore
+`	333,676	2	96	quoteleft
 oq	"
-a	444,460,10,0,-37	0	0141	-- a
-b	500,683,10,0,-3	2	0142	-- b
-c	444,460,10,0,-25	0	0143	-- c
-d	500,683,10,0,-27	2	0144	-- d
-e	444,460,10,0,-25	0	0145	-- e
-f	333,683,0,50,-20	2	0146	-- f
-g	500,460,218,0,-28	1	0147	-- g
-h	500,683,0,0,-9	2	0150	-- h
-i	278,683,0,0,-16	2	0151	-- i
-j	278,683,218,0,70	3	0152	-- j
-k	500,683,0,5,-7	2	0153	-- k
-l	278,683,0,0,-19	2	0154	-- l
-m	778,460,0,0,-16	0	0155	-- m
-n	500,460,0,0,-16	0	0156	-- n
-o	500,460,10,0,-29	0	0157	-- o
-p	500,460,217,0,-5	1	0160	-- p
-q	500,460,217,0,-24	1	0161	-- q
-r	333,460,0,2,-5	0	0162	-- r
-s	389,460,10,0,-51	0	0163	-- s
-t	278,579,10,1,-13	2	0164	-- t
-u	500,450,10,0,-9	0	0165	-- u
-v	500,450,14,0,-19	0	0166	-- v
-w	722,450,14,0,-21	0	0167	-- w
-x	500,450,0,0,-17	0	0170	-- x
-y	500,450,218,0,-14	1	0171	-- y
-z	444,450,0,0,-27	0	0172	-- z
-lC	480,680,181,0,-100	2	0173	-- braceleft
+a	444,460,10	0	97	a
+b	500,683,10	2	98	b
+c	444,460,10	0	99	c
+d	500,683,10	2	100	d
+e	444,460,10	0	101	e
+f	333,683,0,50	2	102	f
+g	500,460,218	1	103	g
+h	500,683	2	104	h
+i	278,683	2	105	i
+j	278,683,218,0,70	3	106	j
+k	500,683,0,5	2	107	k
+l	278,683	2	108	l
+m	778,460	0	109	m
+n	500,460	0	110	n
+o	500,460,10	0	111	o
+p	500,460,217	1	112	p
+q	500,460,217	1	113	q
+r	333,460,0,2	0	114	r
+s	389,460,10	0	115	s
+t	278,579,10,1	2	116	t
+u	500,450,10	0	117	u
+v	500,450,14	0	118	v
+w	722,450,14	0	119	w
+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,676,14,0,-67	2	0174	-- bar
+ba	200,676,14	2	124	bar
 |	"
-rC	480,680,181,0,-130	2	0175	-- braceright
+rC	480,680,181	2	125	braceright
 }	"
-a~	333,638,0,0,-1	2	0176	-- tilde
+a~	333,638	2	126	tilde
 ~	"
-bq	333,102,141,0,-79	0	0200	-- quotesinglbase
-Fo	500,416,0,0,-42	0	0201	-- guillemotleft
-Fc	500,416,0,0,-44	0	0202	-- guillemotright
-bu	350,466,0,0,-40	0	0203	-- bullet
-Fn	500,676,189,0,-7	2	0204	-- florin
-f/	167,676,14,164,168	2	0205	-- fraction
-%0	1000,706,19,0,-7	2	0206	-- perthousand
-dg	500,676,149,0,-59	2	0207	-- dagger
-dd	500,676,153,0,-58	2	0210	-- daggerdbl
-en	500,250	0	0211	-- endash
-em	1000,250	0	0212	-- emdash
-fi	556,683,0,0,-31	2	0214	-- fi
-fl	556,683,0,0,-32	2	0215	-- fl
-.i	278,460,0,0,-16	0	0220	-- dotlessi
-ga	333,678,0,0,-19	2	0222	-- grave
-a"	333,678,0,44,3	2	0223	-- hungarumlaut
-a.	333,623,0,0,-118	2	0224	-- dotaccent
-ab	333,664,0,0,-26	2	0225	-- breve
-ah	333,674,0,0,-11	2	0226	-- caron
-ao	333,711,0,0,-67	2	0227	-- ring
-ho	333,0,165,0,-64	0	0230	-- ogonek
-lq	444,676,0,0,-43	2	0231	-- quotedblleft
-rq	444,676,0,0,-30	2	0232	-- quotedblright
-oe	722,460,10,0,-30	0	0233	-- oe
-/l	278,683,0,0,-19	2	0234	-- lslash
-Bq	444,102,141,0,-45	0	0235	-- quotedblbase
-OE	889,668,6,0,-30	2	0236	-- OE
-/L	611,662,0,0,-12	2	0237	-- Lslash
-r!	333,467,218,0,-97	1	0241	-- exclamdown
-ct	500,579,138,0,-53	2	0242	-- cent
-Po	500,676,8,0,-12	2	0243	-- sterling
-Cs	500,602,0,22,22	2	0244	-- currency
-Ye	500,662,0,12,53	2	0245	-- yen
-bb	200,676,14,0,-67	2	0246	-- brokenbar
-sc	500,676,148,0,-70	2	0247	-- section
-ad	333,623,0,0,-18	2	0250	-- dieresis
-co	760,676,14,0,-38	2	0251	-- copyright
-Of	276,676,0,0,-4	2	0252	-- ordfeminine
-fo	333,416,0,0,-63	0	0253	-- guilsinglleft
-no	564,386,0,0,-30	0	0254	-- logicalnot
-\-	564,286,0,0,-30	0	0255	-- minus
-rg	760,676,14,0,-38	2	0256	-- registered
-a-	333,601,0,0,-11	2	0257	-- macron
-de	400,676,0,0,-57	2	0260	-- degree
-t+-	564,506,0,0,-30	0	0261	-- plusminus
-S2	300,676,0,0,-1	2	0262	-- twosuperior
-S3	300,676,0,0,-15	2	0263	-- threesuperior
-aa	333,678,0,0,-93	2	0264	-- acute
-mc	500,450,218,12,-36	1	0265	-- mu
-ps	453,662,154,0,22	2	0266	-- paragraph
-pc	250,310,0,0,-70	0	0267	-- periodcentered
-ac	333,0,215,0,-52	0	0270	-- cedilla
-S1	300,676,0,0,-57	2	0271	-- onesuperior
-Om	310,676,0,0,-6	2	0272	-- ordmasculine
-fc	333,416,0,0,-48	0	0273	-- guilsinglright
-14	750,676,14,0,-37	2	0274	-- onequarter
-12	750,676,14,0,-31	2	0275	-- onehalf
-34	750,676,14,0,-15	2	0276	-- threequarters
-r?	444,466,218,0,-30	1	0277	-- questiondown
-`A	722,890,0,0,-15	2	0300	-- Agrave
-'A	722,890,0,0,-15	2	0301	-- Aacute
-^A	722,886,0,0,-15	2	0302	-- Acircumflex
-~A	722,850,0,0,-15	2	0303	-- Atilde
-:A	722,835,0,0,-15	2	0304	-- Adieresis
-oA	722,898,0,0,-15	2	0305	-- Aring
-AE	889,662	2	0306	-- AE
-,C	667,676,215,0,-28	2	0307	-- Ccedilla
-`E	611,890,0,0,-12	2	0310	-- Egrave
-'E	611,890,0,0,-12	2	0311	-- Eacute
-^E	611,886,0,0,-12	2	0312	-- Ecircumflex
-:E	611,835,0,0,-12	2	0313	-- Edieresis
-`I	333,890,0,0,-18	2	0314	-- Igrave
-'I	333,890,0,0,-18	2	0315	-- Iacute
-^I	333,886,0,0,-11	2	0316	-- Icircumflex
-:I	333,835,0,0,-18	2	0317	-- Idieresis
--D	722,662,0,0,-16	2	0320	-- Eth
-~N	722,850,11,0,-12	2	0321	-- Ntilde
-`O	722,890,14,0,-34	2	0322	-- Ograve
-'O	722,890,14,0,-34	2	0323	-- Oacute
-^O	722,886,14,0,-34	2	0324	-- Ocircumflex
-~O	722,850,14,0,-34	2	0325	-- Otilde
-:O	722,835,14,0,-34	2	0326	-- Odieresis
-tmu	564,497,0,0,-38	0	0327	-- multiply
-/O	722,734,80,0,-34	2	0330	-- Oslash
-`U	722,890,14,0,-14	2	0331	-- Ugrave
-'U	722,890,14,0,-14	2	0332	-- Uacute
-^U	722,886,14,0,-14	2	0333	-- Ucircumflex
-:U	722,835,14,0,-14	2	0334	-- Udieresis
-'Y	722,890,0,0,-22	2	0335	-- Yacute
-TP	556,662,0,0,-16	2	0336	-- Thorn
-ss	500,683,9,0,-12	2	0337	-- germandbls
-`a	444,678,10,0,-37	2	0340	-- agrave
-'a	444,678,10,0,-37	2	0341	-- aacute
-^a	444,674,10,0,-37	2	0342	-- acircumflex
-~a	444,638,10,0,-37	2	0343	-- atilde
-:a	444,623,10,0,-37	2	0344	-- adieresis
-oa	444,711,10,0,-37	2	0345	-- aring
-ae	667,460,10,0,-38	0	0346	-- ae
-,c	444,460,215,0,-25	0	0347	-- ccedilla
-`e	444,678,10,0,-25	2	0350	-- egrave
-'e	444,678,10,0,-25	2	0351	-- eacute
-^e	444,674,10,0,-25	2	0352	-- ecircumflex
-:e	444,623,10,0,-25	2	0353	-- edieresis
-`i	278,678,0,0,8	2	0354	-- igrave
-'i	278,678,0,12,-16	2	0355	-- iacute
-^i	278,674,0,17,16	2	0356	-- icircumflex
-:i	278,623,0,10,9	2	0357	-- idieresis
-Sd	500,686,10,0,-29	2	0360	-- eth
-~n	500,638,0,0,-16	2	0361	-- ntilde
-`o	500,678,10,0,-29	2	0362	-- ograve
-'o	500,678,10,0,-29	2	0363	-- oacute
-^o	500,674,10,0,-29	2	0364	-- ocircumflex
-~o	500,638,10,0,-29	2	0365	-- otilde
-:o	500,623,10,0,-29	2	0366	-- odieresis
-tdi	564,516,10,0,-30	0	0367	-- divide
-/o	500,551,112,0,-29	0	0370	-- oslash
-`u	500,678,10,0,-9	2	0371	-- ugrave
-'u	500,678,10,0,-9	2	0372	-- uacute
-^u	500,674,10,0,-9	2	0373	-- ucircumflex
-:u	500,623,10,0,-9	2	0374	-- udieresis
-'y	500,678,218,0,-14	3	0375	-- yacute
-Tp	500,683,217,0,-5	3	0376	-- thorn
-:y	500,623,218,0,-14	3	0377	-- ydieresis
+bq	333,102,141	0	128	quotesinglbase
+Fo	500,416	0	129	guillemotleft
+Fc	500,416	0	130	guillemotright
+bu	350,466	0	131	bullet
+Fn	500,676,189	2	132	florin
+f/	167,676,14,164,168	2	133	fraction
+%0	1000,706,19	2	134	perthousand
+dg	500,676,149	2	135	dagger
+dd	500,676,153	2	136	daggerdbl
+en	500,250	0	137	endash
+em	1000,250	0	138	emdash
+fi	556,683	2	140	fi
+fl	556,683	2	141	fl
+.i	278,460	0	144	dotlessi
+ga	333,678	2	146	grave
+a"	333,678,0,44,3	2	147	hungarumlaut
+a.	333,623	2	148	dotaccent
+ab	333,664	2	149	breve
+ah	333,674	2	150	caron
+ao	333,711	2	151	ring
+ho	333,0,165	0	152	ogonek
+lq	444,676	2	153	quotedblleft
+rq	444,676	2	154	quotedblright
+oe	722,460,10	0	155	oe
+/l	278,683	2	156	lslash
+Bq	444,102,141	0	157	quotedblbase
+OE	889,668,6	2	158	OE
+/L	611,662	2	159	Lslash
+r!	333,467,218	1	161	exclamdown
+ct	500,579,138	2	162	cent
+Po	500,676,8	2	163	sterling
+Cs	500,602,0,22,22	2	164	currency
+Ye	500,662,0,12,53	2	165	yen
+bb	200,676,14	2	166	brokenbar
+sc	500,676,148	2	167	section
+ad	333,623	2	168	dieresis
+co	760,676,14	2	169	copyright
+Of	276,676	2	170	ordfeminine
+fo	333,416	0	171	guilsinglleft
+tno	564,386	0	172	logicalnot
+\-	564,286	0	173	minus
+rg	760,676,14	2	174	registered
+a-	333,601	2	175	macron
+de	400,676	2	176	degree
+t+-	564,506	0	177	plusminus
+S2	300,676	2	178	twosuperior
+S3	300,676	2	179	threesuperior
+aa	333,678	2	180	acute
+mc	500,450,218,12	1	181	mu
+ps	453,662,154,0,22	2	182	paragraph
+pc	250,310	0	183	periodcentered
+ac	333,0,215	0	184	cedilla
+S1	300,676	2	185	onesuperior
+Om	310,676	2	186	ordmasculine
+fc	333,416	0	187	guilsinglright
+14	750,676,14	2	188	onequarter
+12	750,676,14	2	189	onehalf
+34	750,676,14	2	190	threequarters
+r?	444,466,218	1	191	questiondown
+`A	722,890	2	192	Agrave
+'A	722,890	2	193	Aacute
+^A	722,886	2	194	Acircumflex
+~A	722,850	2	195	Atilde
+:A	722,835	2	196	Adieresis
+oA	722,898	2	197	Aring
+AE	889,662	2	198	AE
+,C	667,676,215	2	199	Ccedilla
+`E	611,890	2	200	Egrave
+'E	611,890	2	201	Eacute
+^E	611,886	2	202	Ecircumflex
+:E	611,835	2	203	Edieresis
+`I	333,890	2	204	Igrave
+'I	333,890	2	205	Iacute
+^I	333,886	2	206	Icircumflex
+:I	333,835	2	207	Idieresis
+-D	722,662	2	208	Eth
+~N	722,850,11	2	209	Ntilde
+`O	722,890,14	2	210	Ograve
+'O	722,890,14	2	211	Oacute
+^O	722,886,14	2	212	Ocircumflex
+~O	722,850,14	2	213	Otilde
+:O	722,835,14	2	214	Odieresis
+tmu	564,497	0	215	multiply
+/O	722,734,80	2	216	Oslash
+`U	722,890,14	2	217	Ugrave
+'U	722,890,14	2	218	Uacute
+^U	722,886,14	2	219	Ucircumflex
+:U	722,835,14	2	220	Udieresis
+'Y	722,890	2	221	Yacute
+TP	556,662	2	222	Thorn
+ss	500,683,9	2	223	germandbls
+`a	444,678,10	2	224	agrave
+'a	444,678,10	2	225	aacute
+^a	444,674,10	2	226	acircumflex
+~a	444,638,10	2	227	atilde
+:a	444,623,10	2	228	adieresis
+oa	444,711,10	2	229	aring
+ae	667,460,10	0	230	ae
+,c	444,460,215	0	231	ccedilla
+`e	444,678,10	2	232	egrave
+'e	444,678,10	2	233	eacute
+^e	444,674,10	2	234	ecircumflex
+:e	444,623,10	2	235	edieresis
+`i	278,678,0,0,8	2	236	igrave
+'i	278,678,0,12	2	237	iacute
+^i	278,674,0,17,16	2	238	icircumflex
+:i	278,623,0,10,9	2	239	idieresis
+Sd	500,686,10	2	240	eth
+~n	500,638	2	241	ntilde
+`o	500,678,10	2	242	ograve
+'o	500,678,10	2	243	oacute
+^o	500,674,10	2	244	ocircumflex
+~o	500,638,10	2	245	otilde
+:o	500,623,10	2	246	odieresis
+tdi	564,516,10	0	247	divide
+/o	500,551,112	0	248	oslash
+`u	500,678,10	2	249	ugrave
+'u	500,678,10	2	250	uacute
+^u	500,674,10	2	251	ucircumflex
+:u	500,623,10	2	252	udieresis
+'y	500,678,218	3	253	yacute
+Tp	500,683,217	3	254	thorn
+:y	500,623,218	3	255	ydieresis
+u2026	1000,100,11	0	256	ellipsis
diff --git a/contrib/groff/font/devps/ZCMI b/contrib/groff/font/devps/ZCMI
index 1d574ad..b73175a 100644
--- a/contrib/groff/font/devps/ZCMI
+++ b/contrib/groff/font/devps/ZCMI
@@ -157,246 +157,247 @@ w o 10
 w h 20
 w , -20
 charset
-ha	520,594,0,62,-82,62	2	0000	-- asciicircum
-ti	520,320,0,69,-73,69	0	0001	-- asciitilde
-vS	460,831,81,184,5,87	2	0002	-- Scaron
-vZ	620,831,19,99,8,87	2	0003	-- Zcaron
-vs	320,659,14,194,4,87	2	0004	-- scaron
-vz	440,659,14,124,24,87	2	0005	-- zcaron
-:Y	560,762,168,264,9,87	2	0006	-- Ydieresis
-tm	1000,594,0,96,-77,87	2	0007	-- trademark
-aq	160,610,0,105,-95,87	2	0010	-- quotesingle
-space	220	0	0040
-!	280,610,14,123,-69,87	2	0041	-- exclam
-"	220,610,0,163,-70,87	2	0042	-- quotedbl
+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	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
+space	220	0	32	space
+!	280,610,14,123,-69,87	2	33	exclam
+"	220,610,0,163,-70,87	2	34	quotedbl
 dq	"
-#	440,594,0,131,-33,87	2	0043	-- numbersign
+#	440,594,0,131,-33,87	2	35	numbersign
 sh	"
-$	440,709,144,118,-10,87	2	0044	-- dollar
+$	440,709,144,118,-10,87	2	36	dollar
 Do	"
-%	680,700,160,80,-82,80	2	0045	-- percent
-&	780,610,16,185,-76,87	2	0046	-- ampersand
-'	240,610,0,148,-118,87	2	0047	-- quoteright
+%	680,700,160,80,-82,80	2	37	percent
+&	780,610,16,185,-76,87	2	38	ampersand
+'	240,610,0,148,-118,87	2	39	quoteright
 cq	"
-(	260,664,216,201,-46,87	2	0050	-- parenleft
-)	220,664,216,132,63,87	2	0051	-- parenright
-*	420,610,0,109,-89,87	2	0052	-- asterisk
-+	520,426,0,73,-67,73	0	0053	-- plus
-,	220,148,140,43,25,43	0	0054	-- comma
--	280,248,0,104,-19,87	0	0055	-- hyphen
+(	260,664,216,201,-46,87	2	40	parenleft
+)	220,664,216,132,63,87	2	41	parenright
+*	420,610,0,109,-89,87	2	42	asterisk
++	520,426,0,73,-67,73	0	43	plus
+,	220,148,140,43,25,43	0	44	comma
+-	280,248,0,104,-19,87	0	45	hyphen
 hy	"
-.	220,128,14,58,-52,58	0	0056	-- period
-/	340,610,16,168,-24,87	2	0057	-- slash
+.	220,128,14,58,-52,58	0	46	period
+/	340,610,16,168,-24,87	2	47	slash
 sl	"
-0	440,610,16,148,-29,87	2	0060	-- zero
-1	440,610,0,38,9,38	2	0061	-- one
-2	440,610,16,95,33,87	2	0062	-- two
-3	440,610,16,95,49,87	2	0063	-- three
-4	440,610,35,109,-27,87	2	0064	-- four
-5	440,679,16,205,-10,87	2	0065	-- five
-6	440,610,16,166,-40,87	2	0066	-- six
-7	440,645,33,171,-107,87	2	0067	-- seven
-8	440,610,16,139,-15,87	2	0070	-- eight
-9	440,610,16,127,18,87	2	0071	-- nine
-:	260,438,14,86,-48,86	0	0072	-- colon
-;	240,438,140,109,21,87	0	0073	-- semicolon
-<	520,468,0,57,-89,57	0	0074	-- less
-=	520,340,0,73,-67,73	0	0075	-- equal
->	520,468,0,57,-89,57	0	0076	-- greater
-?	380,610,14,125,-100,87	2	0077	-- question
-@	700,610,16,103,-77,87	2	0100	-- at
+0	440,610,16,148,-29,87	2	48	zero
+1	440,610,0,38,9,38	2	49	one
+2	440,610,16,95,33,87	2	50	two
+3	440,610,16,95,49,87	2	51	three
+4	440,610,35,109,-27,87	2	52	four
+5	440,679,16,205,-10,87	2	53	five
+6	440,610,16,166,-40,87	2	54	six
+7	440,645,33,171,-107,87	2	55	seven
+8	440,610,16,139,-15,87	2	56	eight
+9	440,610,16,127,18,87	2	57	nine
+:	260,438,14,86,-48,86	0	58	colon
+;	240,438,140,109,21,87	0	59	semicolon
+<	520,468,0,57,-89,57	0	60	less
+=	520,340,0,73,-67,73	0	61	equal
+>	520,468,0,57,-89,57	0	62	greater
+?	380,610,14,125,-100,87	2	63	question
+@	700,610,16,103,-77,87	2	64	at
 at	"
-A	620,632,16,127,37,87	2	0101	-- A
-B	600,640,6,124,-35,87	2	0102	-- B
-C	520,610,16,161,-43,87	2	0103	-- C
-D	700,640,6,118,-36,87	2	0104	-- D
-E	620,618,12,139,-41,87	2	0105	-- E
-F	580,629,118,263,-70,87	2	0106	-- F
-G	620,610,242,139,-98,87	2	0107	-- G
-H	680,708,16,248,32,87	2	0110	-- H
-I	380,594,0,174,-49,87	2	0111	-- I
-J	400,594,147,188,64,87	2	0112	-- J
-K	660,610,153,234,-3,87	2	0113	-- K
-L	580,610,16,127,-3,87	2	0114	-- L
-M	840,722,16,230,-8,87	2	0115	-- M
-N	700,708,168,265,-35,87	2	0116	-- N
-O	600,610,16,110,-44,87	2	0117	-- O
-P	540,628,0,168,8,87	2	0120	-- P
-Q	600,610,177,225,-34,87	2	0121	-- Q
-R	600,640,168,255,-8,87	2	0122	-- R
-S	460,610,81,148,5,87	2	0123	-- S
-T	500,667,0,294,-13,87	2	0124	-- T
-U	740,617,16,102,-76,87	2	0125	-- U
-V	640,714,16,220,-74,87	2	0126	-- V
-W	880,723,16,216,-44,87	2	0127	-- W
-X	560,610,16,189,80,87	2	0130	-- X
-Y	560,647,168,264,9,87	2	0131	-- Y
-Z	620,624,19,99,8,87	2	0132	-- Z
-[	240,655,207,215,63,87	2	0133	-- bracketleft
+A	620,632,16,127,37,87	2	65	A
+B	600,640,6,124,-35,87	2	66	B
+C	520,610,16,161,-43,87	2	67	C
+D	700,640,6,118,-36,87	2	68	D
+E	620,618,12,139,-41,87	2	69	E
+F	580,629,118,263,-70,87	2	70	F
+G	620,610,242,139,-98,87	2	71	G
+H	680,708,16,248,32,87	2	72	H
+I	380,594,0,174,-49,87	2	73	I
+J	400,594,147,188,64,87	2	74	J
+K	660,610,153,234,-3,87	2	75	K
+L	580,610,16,127,-3,87	2	76	L
+M	840,722,16,230,-8,87	2	77	M
+N	700,708,168,265,-35,87	2	78	N
+O	600,610,16,110,-44,87	2	79	O
+P	540,628,0,168,8,87	2	80	P
+Q	600,610,177,225,-34,87	2	81	Q
+R	600,640,168,255,-8,87	2	82	R
+S	460,610,81,148,5,87	2	83	S
+T	500,667,0,294,-13,87	2	84	T
+U	740,617,16,102,-76,87	2	85	U
+V	640,714,16,220,-74,87	2	86	V
+W	880,723,16,216,-44,87	2	87	W
+X	560,610,16,189,80,87	2	88	X
+Y	560,647,168,264,9,87	2	89	Y
+Z	620,624,19,99,8,87	2	90	Z
+[	240,655,207,215,63,87	2	91	bracketleft
 lB	"
-\	480,610,16,94,-90,87	2	0134	-- backslash
+\	480,610,16,94,-90,87	2	92	backslash
 rs	"
-]	320,655,207,121,77,87	2	0135	-- bracketright
+]	320,655,207,121,77,87	2	93	bracketright
 rB	"
-a^	340,649,0,153,-173,87	2	0136	-- circumflex
+a^	340,649,0,153,-173,87	2	94	circumflex
 ^	"
-_	500,0,125,50,50,50	0	0137	-- underscore
-`	240,610,0,149,-119,87	2	0140	-- quoteleft
+_	500,0,125,50,50,50	0	95	underscore
+`	240,610,0,149,-119,87	2	96	quoteleft
 oq	"
-a	420,438,15,115,-42,87	0	0141	-- a
-b	420,714,23,122,-32,87	2	0142	-- b
-c	340,438,14,116,-37,87	0	0143	-- c
-d	440,714,14,261,-52,87	2	0144	-- d
-e	340,438,14,113,-37,87	0	0145	-- e
-f	320,714,314,277,169,87	3	0146	-- f
-g	400,438,314,153,158,87	1	0147	-- g
-h	440,714,14,134,-5,87	2	0150	-- h
-i	240,635,14,151,-50,87	2	0151	-- i
-j	220,635,314,162,162,87	3	0152	-- j
-k	440,714,184,238,-37,87	2	0153	-- k
-l	240,714,14,290,-52,87	2	0154	-- l
-m	620,438,14,134,-36,87	0	0155	-- m
-n	460,438,14,134,-51,87	0	0156	-- n
-o	400,438,14,99,-37,87	0	0157	-- o
-p	440,432,314,94,73,87	1	0160	-- p
-q	400,510,300,140,-37,87	1	0161	-- q
-r	300,438,14,174,-51,87	0	0162	-- r
-s	320,438,14,133,4,87	0	0163	-- s
-t	320,539,14,156,-56,87	2	0164	-- t
-u	460,438,14,118,-52,87	0	0165	-- u
-v	440,488,14,143,-37,87	0	0166	-- v
-w	680,488,14,152,-37,87	0	0167	-- w
-x	420,438,195,219,-20,87	0	0170	-- x
-y	400,438,314,133,74,87	1	0171	-- y
-z	440,445,14,118,24,87	0	0172	-- z
-lC	240,655,207,193,-5,87	2	0173	-- braceleft
+a	420,438,15,115,-42,87	0	97	a
+b	420,714,23,122,-32,87	2	98	b
+c	340,438,14,116,-37,87	0	99	c
+d	440,714,14,261,-52,87	2	100	d
+e	340,438,14,113,-37,87	0	101	e
+f	320,714,314,277,169,87	3	102	f
+g	400,438,314,153,158,87	1	103	g
+h	440,714,14,134,-5,87	2	104	h
+i	240,635,14,151,-50,87	2	105	i
+j	220,635,314,162,162,87	3	106	j
+k	440,714,184,238,-37,87	2	107	k
+l	240,714,14,290,-52,87	2	108	l
+m	620,438,14,134,-36,87	0	109	m
+n	460,438,14,134,-51,87	0	110	n
+o	400,438,14,99,-37,87	0	111	o
+p	440,432,314,94,73,87	1	112	p
+q	400,510,300,140,-37,87	1	113	q
+r	300,438,14,174,-51,87	0	114	r
+s	320,438,14,133,4,87	0	115	s
+t	320,539,14,156,-56,87	2	116	t
+u	460,438,14,118,-52,87	0	117	u
+v	440,488,14,143,-37,87	0	118	v
+w	680,488,14,152,-37,87	0	119	w
+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	0174	-- bar
+ba	520,714,16,0,-270	2	124	bar
 |	"
-rC	240,655,207,128,60,87	2	0175	-- braceright
+rC	240,655,207,128,60,87	2	125	braceright
 }	"
-a~	440,619,0,132,-193,87	2	0176	-- tilde
+a~	440,619,0,132,-193,87	2	126	tilde
 ~	"
-bq	180,146,121,61,29,61	0	0200	-- quotesinglbase
-Fo	340,414,0,66,-48,66	0	0201	-- guillemotleft
-Fc	380,414,0,45,-67,45	0	0202	-- guillemotright
-bu	600,445,0,0,-178	0	0203	-- bullet
-Fn	440,610,314,192,114,87	3	0204	-- florin
-f/	60,610,16,310,231,87	2	0205	-- fraction
-%0	960,700,160,95,-62,87	2	0206	-- perthousand
-dg	460,610,37,158,-88,87	2	0207	-- dagger
-dd	480,610,59,103,-88,87	2	0210	-- daggerdbl
-en	500,239,0,115,-1,87	0	0211	-- endash
-em	1000,239,0,115,-1,87	0	0212	-- emdash
-fi	520,714,314,135,174,87	3	0214	-- fi
-fl	520,714,314,200,174,87	3	0215	-- fl
-.i	240,438,14,116,-50,87	0	0220	-- dotlessi
-ga	220,659,0,169,-143,87	2	0222	-- grave
-a"	400,659,0,145,-158,87	2	0223	-- hungarumlaut
-a.	220,610,0,158,-186,87	2	0224	-- dotaccent
-ab	440,631,0,111,-203,87	2	0225	-- breve
-ah	340,659,0,184,-204,87	2	0226	-- caron
-ao	300,659,0,166,-190,87	2	0227	-- ring
-ho	280,6,191,3,12,3	0	0230	-- ogonek
-lq	340,610,0,174,-119,87	2	0231	-- quotedblleft
-rq	360,610,0,143,-108,87	2	0232	-- quotedblright
-oe	560,438,14,118,-28,87	0	0233	-- oe
-/l	300,714,14,265,-71,87	2	0234	-- lslash
-Bq	280,146,121,51,64,51	0	0235	-- quotedblbase
-OE	820,610,16,139,-13,87	2	0236	-- OE
-/L	580,610,16,127,1,87	2	0237	-- Lslash
-r!	280,438,186,76,-22,76	0	0241	-- exclamdown
-ct	440,543,134,86,-72,86	2	0242	-- cent
-Po	440,610,52,116,66,87	2	0243	-- sterling
-Cs	440,509,0,84,0,84	0	0244	-- currency
-Ye	440,647,168,223,51,87	2	0245	-- yen
-bb	520,714,16,0,-270	2	0246	-- brokenbar
-sc	420,610,215,144,-3,87	2	0247	-- section
-ad	360,610,0,159,-193,87	2	0250	-- dieresis
-co	740,610,16,73,-87,73	2	0251	-- copyright
-Of	260,610,0,176,-61,87	2	0252	-- ordfeminine
-fo	240,414,0,68,-48,68	0	0253	-- guilsinglleft
-no	520,340,0,73,-67,73	0	0254	-- logicalnot
-\-	520,242,0,73,-67,73	0	0255	-- minus
-rg	740,610,16,73,-87,73	2	0256	-- registered
-a-	440,578,0,75,-172,75	2	0257	-- macron
-de	400,610,0,107,-121,87	2	0260	-- degree
-t+-	520,436,0,73,-67,73	0	0261	-- plusminus
-S2	264,610,0,140,-22,87	2	0262	-- twosuperior
-S3	264,610,0,134,-9,87	2	0263	-- threesuperior
-aa	300,659,0,172,-215,87	2	0264	-- acute
-mc	460,438,314,113,43,87	1	0265	-- mu
-ps	500,594,199,188,-55,87	2	0266	-- paragraph
-pc	220,310,0,71,-89,71	0	0267	-- periodcentered
-ac	300,6,191,0,38	0	0270	-- cedilla
-S1	264,610,0,97,-33,87	2	0271	-- onesuperior
-Om	260,610,0,163,-78,87	2	0272	-- ordmasculine
-fc	260,414,0,56,-56,56	0	0273	-- guilsinglright
-14	660,610,16,92,-6,87	2	0274	-- onequarter
-12	660,610,16,92,-6,87	2	0275	-- onehalf
-34	660,610,16,96,11,87	2	0276	-- threequarters
-r?	400,438,186,37,-32,37	0	0277	-- questiondown
-`A	620,821,16,127,37,87	2	0300	-- Agrave
-'A	620,821,16,132,37,87	2	0301	-- Aacute
-^A	620,821,16,127,37,87	2	0302	-- Acircumflex
-~A	620,771,16,132,37,87	2	0303	-- Atilde
-:A	620,762,16,139,37,87	2	0304	-- Adieresis
-oA	620,831,16,127,37,87	2	0305	-- Aring
-AE	740,594,16,109,71,87	2	0306	-- AE
-,C	520,610,191,161,-43,87	2	0307	-- Ccedilla
-`E	620,821,12,139,-41,87	2	0310	-- Egrave
-'E	620,821,12,139,-41,87	2	0311	-- Eacute
-^E	620,821,12,139,-41,87	2	0312	-- Ecircumflex
-:E	620,762,12,139,-41,87	2	0313	-- Edieresis
-`I	380,821,0,174,-49,87	2	0314	-- Igrave
-'I	380,821,0,202,-49,87	2	0315	-- Iacute
-^I	380,821,0,174,-49,87	2	0316	-- Icircumflex
-:I	380,762,0,189,-49,87	2	0317	-- Idieresis
--D	700,640,6,118,-36,87	2	0320	-- Eth
-~N	700,761,168,265,-35,87	2	0321	-- Ntilde
-`O	600,821,16,110,-44,87	2	0322	-- Ograve
-'O	600,821,16,110,-44,87	2	0323	-- Oacute
-^O	600,821,16,110,-44,87	2	0324	-- Ocircumflex
-~O	600,761,16,110,-44,87	2	0325	-- Otilde
-:O	600,762,16,110,-44,87	2	0326	-- Odieresis
-tmu	520,410,0,57,-83,57	0	0327	-- multiply
-/O	660,672,78,141,-33,87	2	0330	-- Oslash
-`U	740,821,16,102,-76,87	2	0331	-- Ugrave
-'U	740,821,16,102,-76,87	2	0332	-- Uacute
-^U	740,821,16,102,-76,87	2	0333	-- Ucircumflex
-:U	740,762,16,102,-76,87	2	0334	-- Udieresis
-'Y	560,821,168,264,9,87	2	0335	-- Yacute
-TP	540,623,0,157,-2,87	2	0336	-- Thorn
-ss	420,714,314,172,177,87	3	0337	-- germandbls
-`a	420,659,15,115,-42,87	2	0340	-- agrave
-'a	420,659,15,122,-42,87	2	0341	-- aacute
-^a	420,649,15,115,-42,87	2	0342	-- acircumflex
-~a	420,619,15,152,-42,87	2	0343	-- atilde
-:a	420,610,15,115,-42,87	2	0344	-- adieresis
-oa	420,659,15,115,-42,87	2	0345	-- aring
-ae	540,468,14,134,-17,87	0	0346	-- ae
-,c	340,438,191,116,-12,87	0	0347	-- ccedilla
-`e	340,659,14,113,-37,87	2	0350	-- egrave
-'e	340,659,14,172,-37,87	2	0351	-- eacute
-^e	340,649,14,143,-37,87	2	0352	-- ecircumflex
-:e	340,610,14,159,-37,87	2	0353	-- edieresis
-`i	240,659,14,116,-50,87	2	0354	-- igrave
-'i	240,659,14,202,-50,87	2	0355	-- iacute
-^i	240,649,14,173,-50,87	2	0356	-- icircumflex
-:i	240,610,14,179,-50,87	2	0357	-- idieresis
-Sd	400,714,14,172,-37,87	2	0360	-- eth
-~n	460,619,14,134,-51,87	2	0361	-- ntilde
-`o	400,659,14,99,-37,87	2	0362	-- ograve
-'o	400,659,14,132,-37,87	2	0363	-- oacute
-^o	400,649,14,103,-37,87	2	0364	-- ocircumflex
-~o	400,619,14,152,-37,87	2	0365	-- otilde
-:o	400,610,14,129,-37,87	2	0366	-- odieresis
-tdi	520,440,14,73,-67,73	0	0367	-- divide
-/o	440,488,64,150,4,87	0	0370	-- oslash
-`u	460,659,14,118,-52,87	2	0371	-- ugrave
-'u	460,659,14,118,-52,87	2	0372	-- uacute
-^u	460,649,14,118,-52,87	2	0373	-- ucircumflex
-:u	460,610,14,118,-52,87	2	0374	-- udieresis
-'y	400,659,314,133,74,87	3	0375	-- yacute
-Tp	440,714,314,115,88,87	3	0376	-- thorn
-:y	400,610,314,133,74,87	3	0377	-- ydieresis
+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
+bu	600,445,0,0,-178	0	131	bullet
+Fn	440,610,314,192,114,87	3	132	florin
+f/	60,610,16,310,231,87	2	133	fraction
+%0	960,700,160,95,-62,87	2	134	perthousand
+dg	460,610,37,158,-88,87	2	135	dagger
+dd	480,610,59,103,-88,87	2	136	daggerdbl
+en	500,239,0,115,-1,87	0	137	endash
+em	1000,239,0,115,-1,87	0	138	emdash
+fi	520,714,314,135,174,87	3	140	fi
+fl	520,714,314,200,174,87	3	141	fl
+.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
+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
+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
+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
+r!	280,438,186,76,-22,76	0	161	exclamdown
+ct	440,543,134,86,-72,86	2	162	cent
+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
+sc	420,610,215,144,-3,87	2	167	section
+ad	360,610,0,159,-193,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
+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
+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
+S1	264,610,0,97,-33,87	2	185	onesuperior
+Om	260,610,0,163,-78,87	2	186	ordmasculine
+fc	260,414,0,56,-56,56	0	187	guilsinglright
+14	660,610,16,92,-6,87	2	188	onequarter
+12	660,610,16,92,-6,87	2	189	onehalf
+34	660,610,16,96,11,87	2	190	threequarters
+r?	400,438,186,37,-32,37	0	191	questiondown
+`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
+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
+`E	620,821,12,139,-41,87	2	200	Egrave
+'E	620,821,12,139,-41,87	2	201	Eacute
+^E	620,821,12,139,-41,87	2	202	Ecircumflex
+:E	620,762,12,139,-41,87	2	203	Edieresis
+`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
+-D	700,640,6,118,-36,87	2	208	Eth
+~N	700,761,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,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
+`U	740,821,16,102,-76,87	2	217	Ugrave
+'U	740,821,16,102,-76,87	2	218	Uacute
+^U	740,821,16,102,-76,87	2	219	Ucircumflex
+:U	740,762,16,102,-76,87	2	220	Udieresis
+'Y	560,821,168,264,9,87	2	221	Yacute
+TP	540,623,0,157,-2,87	2	222	Thorn
+ss	420,714,314,172,177,87	3	223	germandbls
+`a	420,659,15,115,-42,87	2	224	agrave
+'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
+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
+`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
+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
+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
+'u	460,659,14,118,-52,87	2	250	uacute
+^u	460,649,14,118,-52,87	2	251	ucircumflex
+: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
+u2026	1000,128,14,0,-74	0	256	ellipsis
diff --git a/contrib/groff/font/devps/ZD b/contrib/groff/font/devps/ZD
index b1d6152..83f30d7 100644
--- a/contrib/groff/font/devps/ZD
+++ b/contrib/groff/font/devps/ZD
@@ -3,191 +3,205 @@ internalname ZapfDingbats
 special
 spacewidth 278
 charset
-space	278	0	0040
----	974,621,0,0,-35	3	0041	-- a1
----	961,611,0,0,-35	3	0042	-- a2
----	974,621,0,0,-35	3	0043	-- a202
----	980,692,0,0,-35	3	0044	-- a3
----	719,566,0,0,-34	3	0045	-- a4
----	789,705,14,0,-35	3	0046	-- a5
----	790,705,14,0,-35	3	0047	-- a119
----	791,705,13,0,-35	3	0050	-- a118
----	690,553,0,0,-35	3	0051	-- a117
----	960,568,0,0,-35	3	0052	-- a11
-rh	939,559,0,0,-35	3	0053	-- a12
----	549,705,11,0,-29	3	0054	-- a13
----	855,632,0,0,-34	3	0055	-- a14
----	911,642,0,0,-35	3	0056	-- a15
----	933,550,0,0,-35	3	0057	-- a16
----	911,642,0,0,-35	3	0060	-- a105
----	945,553,0,0,-35	3	0061	-- a17
----	974,587,0,0,-35	3	0062	-- a18
-OK	755,705,13,0,-34	3	0063	-- a19
----	846,705,14,0,-36	3	0064	-- a20
----	762,692,0,0,-35	3	0065	-- a21
----	761,692,0,0,-35	3	0066	-- a22
----	571,661,68,0,1	3	0067	-- a23
----	677,705,13,0,-36	3	0070	-- a24
----	763,692,0,0,-35	3	0071	-- a25
----	760,692,0,0,-35	3	0072	-- a26
----	759,692,0,0,-35	3	0073	-- a27
----	754,692,0,0,-35	3	0074	-- a28
----	494,692,0,0,-35	3	0075	-- a6
----	552,692,0,0,-35	3	0076	-- a7
----	537,692,0,0,-35	3	0077	-- a8
----	577,596,0,0,-35	3	0100	-- a9
----	692,705,14,0,-35	3	0101	-- a10
----	786,705,14,0,-35	3	0102	-- a29
----	788,705,14,0,-35	3	0103	-- a30
----	788,705,14,0,-35	3	0104	-- a31
----	790,705,14,0,-35	3	0105	-- a32
----	793,705,13,0,-35	3	0106	-- a33
----	794,705,13,0,-35	3	0107	-- a34
----	816,705,14,0,-35	3	0110	-- a35
----	823,705,14,0,-35	3	0111	-- a36
----	789,705,14,0,-35	3	0112	-- a37
----	841,705,14,0,-35	3	0113	-- a38
----	823,705,14,0,-35	3	0114	-- a39
----	833,705,14,0,-35	3	0115	-- a40
----	816,705,13,0,-35	3	0116	-- a41
----	831,705,14,0,-35	3	0117	-- a42
----	923,705,14,0,-35	3	0120	-- a43
----	744,692,0,0,-35	3	0121	-- a44
----	723,692,0,0,-35	3	0122	-- a45
----	749,692,0,0,-35	3	0123	-- a46
----	790,705,14,0,-34	3	0124	-- a47
----	792,705,14,0,-35	3	0125	-- a48
----	695,706,14,0,-35	3	0126	-- a49
----	776,699,6,0,-35	3	0127	-- a50
----	768,699,7,0,-35	3	0130	-- a51
----	792,705,14,0,-35	3	0131	-- a52
----	759,692,0,0,-35	3	0132	-- a53
----	707,704,13,0,-35	3	0133	-- a54
----	708,705,14,0,-35	3	0134	-- a55
----	682,705,14,0,-35	3	0135	-- a56
----	701,705,14,0,-35	3	0136	-- a57
----	826,705,14,0,-35	3	0137	-- a58
----	815,705,14,0,-35	3	0140	-- a59
----	789,705,14,0,-35	3	0141	-- a60
----	789,705,14,0,-35	3	0142	-- a61
----	707,705,14,0,-34	3	0143	-- a62
----	687,692,0,0,-36	3	0144	-- a63
----	696,691,0,0,-35	3	0145	-- a64
----	689,692,0,0,-35	3	0146	-- a65
----	786,705,14,0,-34	3	0147	-- a66
----	787,705,14,0,-35	3	0150	-- a67
----	713,705,14,0,-35	3	0151	-- a68
----	791,705,14,0,-35	3	0152	-- a69
----	785,705,14,0,-36	3	0153	-- a70
----	791,705,14,0,-35	3	0154	-- a71
----	873,705,14,0,-35	3	0155	-- a72
----	761,692,0,0,-35	3	0156	-- a73
----	762,692,0,0,-35	3	0157	-- a74
----	762,692,0,0,-35	3	0160	-- a203
----	759,692,0,0,-35	3	0161	-- a75
----	759,692,0,0,-35	3	0162	-- a204
----	892,705,0,0,-35	3	0163	-- a76
----	892,692,14,0,-35	3	0164	-- a77
----	788,705,14,0,-35	3	0165	-- a78
----	784,705,14,0,-35	3	0166	-- a79
----	438,705,14,0,-35	3	0167	-- a81
----	138,692,0,0,-35	3	0170	-- a82
----	277,692,0,0,-35	3	0171	-- a83
----	415,692,0,0,-35	3	0172	-- a84
----	392,705,0,0,-35	3	0173	-- a97
----	392,705,0,0,-34	3	0174	-- a98
----	668,705,0,0,-35	3	0175	-- a99
----	668,705,0,0,-36	3	0176	-- a100
----	732,806,143,0,-35	3	0241	-- a101
----	544,706,14,0,-56	3	0242	-- a102
----	544,705,14,0,-34	3	0243	-- a103
----	910,651,0,0,-35	3	0244	-- a104
----	667,705,14,0,-35	3	0245	-- a106
----	760,705,14,0,-35	3	0246	-- a107
----	760,569	3	0247	-- a108
----	776,705,0,0,-35	3	0250	-- a112
----	595,705,14,0,-34	3	0251	-- a111
----	694,705,14,0,-35	3	0252	-- a110
----	626,705,0,0,-34	3	0253	-- a109
----	788,705,14,0,-35	3	0254	-- a120
----	788,705,14,0,-35	3	0255	-- a121
----	788,705,14,0,-35	3	0256	-- a122
----	788,705,14,0,-35	3	0257	-- a123
----	788,705,14,0,-35	3	0260	-- a124
----	788,705,14,0,-35	3	0261	-- a125
----	788,705,14,0,-35	3	0262	-- a126
----	788,705,14,0,-35	3	0263	-- a127
----	788,705,14,0,-35	3	0264	-- a128
----	788,705,14,0,-35	3	0265	-- a129
----	788,705,14,0,-35	3	0266	-- a130
----	788,705,14,0,-35	3	0267	-- a131
----	788,705,14,0,-35	3	0270	-- a132
----	788,705,14,0,-35	3	0271	-- a133
----	788,705,14,0,-35	3	0272	-- a134
----	788,705,14,0,-35	3	0273	-- a135
----	788,705,14,0,-35	3	0274	-- a136
----	788,705,14,0,-35	3	0275	-- a137
----	788,705,14,0,-35	3	0276	-- a138
----	788,705,14,0,-35	3	0277	-- a139
----	788,705,14,0,-35	3	0300	-- a140
----	788,705,14,0,-35	3	0301	-- a141
----	788,705,14,0,-35	3	0302	-- a142
----	788,705,14,0,-35	3	0303	-- a143
----	788,705,14,0,-35	3	0304	-- a144
----	788,705,14,0,-35	3	0305	-- a145
----	788,705,14,0,-35	3	0306	-- a146
----	788,705,14,0,-35	3	0307	-- a147
----	788,705,14,0,-35	3	0310	-- a148
----	788,705,14,0,-35	3	0311	-- a149
----	788,705,14,0,-35	3	0312	-- a150
----	788,705,14,0,-35	3	0313	-- a151
----	788,705,14,0,-35	3	0314	-- a152
----	788,705,14,0,-35	3	0315	-- a153
----	788,705,14,0,-35	3	0316	-- a154
----	788,705,14,0,-35	3	0317	-- a155
----	788,705,14,0,-35	3	0320	-- a156
----	788,705,14,0,-35	3	0321	-- a157
----	788,705,14,0,-35	3	0322	-- a158
----	788,705,14,0,-35	3	0323	-- a159
----	894,634,0,0,-35	3	0324	-- a160
----	838,540,0,0,-35	3	0325	-- a161
----	1016,540,0,0,-34	3	0326	-- a163
----	458,820,127,0,-35	3	0327	-- a164
----	748,597,0,0,-35	3	0330	-- a196
----	924,552,0,0,-35	3	0331	-- a165
----	748,597,0,0,-35	3	0332	-- a192
----	918,526,0,0,-35	3	0333	-- a166
----	927,660,0,0,-35	3	0334	-- a167
----	928,562,0,0,-35	3	0335	-- a168
----	928,563,0,0,-35	3	0336	-- a169
----	834,537,0,0,-35	3	0337	-- a170
----	873,599,0,0,-35	3	0340	-- a171
----	828,588,0,0,-35	3	0341	-- a172
----	924,594,0,0,-35	3	0342	-- a173
----	924,594,0,0,-35	3	0343	-- a162
----	917,692,0,0,-35	3	0344	-- a174
----	930,608,0,0,-35	3	0345	-- a175
----	931,608,0,0,-35	3	0346	-- a176
----	463,791,99,0,-35	3	0347	-- a177
----	883,623,0,0,-35	3	0350	-- a178
----	836,648,0,0,-35	3	0351	-- a179
----	836,648,0,0,-35	3	0352	-- a193
----	867,591,0,0,-35	3	0353	-- a180
----	867,591,0,0,-35	3	0354	-- a199
----	696,648,0,0,-35	3	0355	-- a181
----	696,648,0,0,-35	3	0356	-- a200
----	874,619,0,0,-35	3	0357	-- a182
----	874,615,0,0,-35	3	0361	-- a201
----	760,692,0,0,-35	3	0362	-- a183
----	946,533,0,0,-35	3	0363	-- a184
----	771,655,0,0,-34	3	0364	-- a197
----	865,481,0,0,-35	3	0365	-- a185
----	771,655,0,0,-34	3	0366	-- a194
----	888,712,19,0,-34	3	0367	-- a198
----	967,568,0,0,-35	3	0370	-- a186
----	888,712,19,0,-34	3	0371	-- a195
----	831,579,0,0,-35	3	0372	-- a187
----	873,578,0,0,-36	3	0373	-- a188
----	927,542,0,0,-35	3	0374	-- a189
----	970,616,0,0,-35	3	0375	-- a190
----	918,593,0,0,-34	3	0376	-- a191
+space	278	0	32	space
+---	974,621	3	33	a1
+---	961,611	3	34	a2
+---	974,621	3	35	a202
+---	980,692	3	36	a3
+---	719,566	3	37	a4
+---	789,705,14	3	38	a5
+---	790,705,14	3	39	a119
+---	791,705,13	3	40	a118
+---	690,553	3	41	a117
+---	960,568	3	42	a11
+rh	939,559	3	43	a12
+---	549,705,11	3	44	a13
+---	855,632	3	45	a14
+---	911,642	3	46	a15
+---	933,550	3	47	a16
+---	911,642	3	48	a105
+---	945,553	3	49	a17
+---	974,587	3	50	a18
+OK	755,705,13	3	51	a19
+---	846,705,14	3	52	a20
+---	762,692	3	53	a21
+---	761,692	3	54	a22
+---	571,661,68,0,1	3	55	a23
+---	677,705,13	3	56	a24
+---	763,692	3	57	a25
+---	760,692	3	58	a26
+---	759,692	3	59	a27
+---	754,692	3	60	a28
+---	494,692	3	61	a6
+---	552,692	3	62	a7
+---	537,692	3	63	a8
+---	577,596	3	64	a9
+---	692,705,14	3	65	a10
+---	786,705,14	3	66	a29
+---	788,705,14	3	67	a30
+---	788,705,14	3	68	a31
+---	790,705,14	3	69	a32
+---	793,705,13	3	70	a33
+---	794,705,13	3	71	a34
+---	816,705,14	3	72	a35
+---	823,705,14	3	73	a36
+---	789,705,14	3	74	a37
+---	841,705,14	3	75	a38
+---	823,705,14	3	76	a39
+---	833,705,14	3	77	a40
+---	816,705,13	3	78	a41
+---	831,705,14	3	79	a42
+---	923,705,14	3	80	a43
+---	744,692	3	81	a44
+---	723,692	3	82	a45
+---	749,692	3	83	a46
+---	790,705,14	3	84	a47
+---	792,705,14	3	85	a48
+---	695,706,14	3	86	a49
+---	776,699,6	3	87	a50
+---	768,699,7	3	88	a51
+---	792,705,14	3	89	a52
+---	759,692	3	90	a53
+---	707,704,13	3	91	a54
+---	708,705,14	3	92	a55
+---	682,705,14	3	93	a56
+---	701,705,14	3	94	a57
+---	826,705,14	3	95	a58
+---	815,705,14	3	96	a59
+---	789,705,14	3	97	a60
+---	789,705,14	3	98	a61
+---	707,705,14	3	99	a62
+---	687,692	3	100	a63
+---	696,691	3	101	a64
+---	689,692	3	102	a65
+---	786,705,14	3	103	a66
+---	787,705,14	3	104	a67
+---	713,705,14	3	105	a68
+---	791,705,14	3	106	a69
+---	785,705,14	3	107	a70
+---	791,705,14	3	108	a71
+---	873,705,14	3	109	a72
+---	761,692	3	110	a73
+---	762,692	3	111	a74
+---	762,692	3	112	a203
+---	759,692	3	113	a75
+---	759,692	3	114	a204
+---	892,705	3	115	a76
+---	892,692,14	3	116	a77
+---	788,705,14	3	117	a78
+---	784,705,14	3	118	a79
+---	438,705,14	3	119	a81
+---	138,692	3	120	a82
+---	277,692	3	121	a83
+---	415,692	3	122	a84
+---	392,705	3	123	a97
+---	392,705	3	124	a98
+---	668,705	3	125	a99
+---	668,705	3	126	a100
+---	732,806,143	3	161	a101
+---	544,706,14	3	162	a102
+---	544,705,14	3	163	a103
+---	910,651	3	164	a104
+---	667,705,14	3	165	a106
+---	760,705,14	3	166	a107
+---	760,569	3	167	a108
+---	776,705	3	168	a112
+---	595,705,14	3	169	a111
+---	694,705,14	3	170	a110
+---	626,705	3	171	a109
+---	788,705,14	3	172	a120
+---	788,705,14	3	173	a121
+---	788,705,14	3	174	a122
+---	788,705,14	3	175	a123
+---	788,705,14	3	176	a124
+---	788,705,14	3	177	a125
+---	788,705,14	3	178	a126
+---	788,705,14	3	179	a127
+---	788,705,14	3	180	a128
+---	788,705,14	3	181	a129
+---	788,705,14	3	182	a130
+---	788,705,14	3	183	a131
+---	788,705,14	3	184	a132
+---	788,705,14	3	185	a133
+---	788,705,14	3	186	a134
+---	788,705,14	3	187	a135
+---	788,705,14	3	188	a136
+---	788,705,14	3	189	a137
+---	788,705,14	3	190	a138
+---	788,705,14	3	191	a139
+---	788,705,14	3	192	a140
+---	788,705,14	3	193	a141
+---	788,705,14	3	194	a142
+---	788,705,14	3	195	a143
+---	788,705,14	3	196	a144
+---	788,705,14	3	197	a145
+---	788,705,14	3	198	a146
+---	788,705,14	3	199	a147
+---	788,705,14	3	200	a148
+---	788,705,14	3	201	a149
+---	788,705,14	3	202	a150
+---	788,705,14	3	203	a151
+---	788,705,14	3	204	a152
+---	788,705,14	3	205	a153
+---	788,705,14	3	206	a154
+---	788,705,14	3	207	a155
+---	788,705,14	3	208	a156
+---	788,705,14	3	209	a157
+---	788,705,14	3	210	a158
+---	788,705,14	3	211	a159
+---	894,634	3	212	a160
+---	838,540	3	213	a161
+---	1016,540	3	214	a163
+---	458,820,127	3	215	a164
+---	748,597	3	216	a196
+---	924,552	3	217	a165
+---	748,597	3	218	a192
+---	918,526	3	219	a166
+---	927,660	3	220	a167
+---	928,562	3	221	a168
+---	928,563	3	222	a169
+---	834,537	3	223	a170
+---	873,599	3	224	a171
+---	828,588	3	225	a172
+---	924,594	3	226	a173
+---	924,594	3	227	a162
+---	917,692	3	228	a174
+---	930,608	3	229	a175
+---	931,608	3	230	a176
+---	463,791,99	3	231	a177
+---	883,623	3	232	a178
+---	836,648	3	233	a179
+---	836,648	3	234	a193
+---	867,591	3	235	a180
+---	867,591	3	236	a199
+---	696,648	3	237	a181
+---	696,648	3	238	a200
+---	874,619	3	239	a182
+---	874,615	3	241	a201
+---	760,692	3	242	a183
+---	946,533	3	243	a184
+---	771,655	3	244	a197
+---	865,481	3	245	a185
+---	771,655	3	246	a194
+---	888,712,19	3	247	a198
+---	967,568	3	248	a186
+---	888,712,19	3	249	a195
+---	831,579	3	250	a187
+---	873,578	3	251	a188
+---	927,542	3	252	a189
+---	970,616	3	253	a190
+---	918,593	3	254	a191
+---	509,692	3	256	a85
+---	410,692	3	257	a86
+---	234,705,14	3	258	a87
+---	234,705,14	3	259	a88
+---	390,705,14	3	260	a89
+---	509,692	3	261	a205
+---	410,692	3	262	a206
+---	390,705,14	3	263	a90
+---	276,692	3	264	a91
+---	276,692	3	265	a92
+---	317,692	3	266	a93
+---	317,692	3	267	a94
+---	334,692	3	268	a95
+---	334,692	3	269	a96
diff --git a/contrib/groff/font/devps/ZDR b/contrib/groff/font/devps/ZDR
index a6ca5fe..ef2ae44 100644
--- a/contrib/groff/font/devps/ZDR
+++ b/contrib/groff/font/devps/ZDR
@@ -3,191 +3,205 @@ internalname ZapfDingbats-Reverse
 special
 spacewidth 278
 charset
-space	278	0	0040
----	974,621,0,0,-35	3	0041	-- a1
----	961,611,0,0,-35	3	0042	-- a2
----	974,621,0,0,-35	3	0043	-- a202
----	980,692,0,0,-35	3	0044	-- a3
----	719,566,0,0,-34	3	0045	-- a4
----	789,705,14,0,-35	3	0046	-- a5
----	790,705,14,0,-35	3	0047	-- a119
----	791,705,13,0,-35	3	0050	-- a118
----	690,553,0,0,-35	3	0051	-- a117
----	960,568,0,0,-35	3	0052	-- a11
-lh	939,559,0,0,-35	3	0053	-- a12
----	549,705,11,0,-29	3	0054	-- a13
----	855,632,0,0,-34	3	0055	-- a14
----	911,642,0,0,-35	3	0056	-- a15
----	933,550,0,0,-35	3	0057	-- a16
----	911,642,0,0,-35	3	0060	-- a105
----	945,553,0,0,-35	3	0061	-- a17
----	974,587,0,0,-35	3	0062	-- a18
----	755,705,13,0,-34	3	0063	-- a19
----	846,705,14,0,-36	3	0064	-- a20
----	762,692,0,0,-35	3	0065	-- a21
----	761,692,0,0,-35	3	0066	-- a22
----	571,661,68,0,1	3	0067	-- a23
----	677,705,13,0,-36	3	0070	-- a24
----	763,692,0,0,-35	3	0071	-- a25
----	760,692,0,0,-35	3	0072	-- a26
----	759,692,0,0,-35	3	0073	-- a27
----	754,692,0,0,-35	3	0074	-- a28
----	494,692,0,0,-35	3	0075	-- a6
----	552,692,0,0,-35	3	0076	-- a7
----	537,692,0,0,-35	3	0077	-- a8
----	577,596,0,0,-35	3	0100	-- a9
----	692,705,14,0,-35	3	0101	-- a10
----	786,705,14,0,-35	3	0102	-- a29
----	788,705,14,0,-35	3	0103	-- a30
----	788,705,14,0,-35	3	0104	-- a31
----	790,705,14,0,-35	3	0105	-- a32
----	793,705,13,0,-35	3	0106	-- a33
----	794,705,13,0,-35	3	0107	-- a34
----	816,705,14,0,-35	3	0110	-- a35
----	823,705,14,0,-35	3	0111	-- a36
----	789,705,14,0,-35	3	0112	-- a37
----	841,705,14,0,-35	3	0113	-- a38
----	823,705,14,0,-35	3	0114	-- a39
----	833,705,14,0,-35	3	0115	-- a40
----	816,705,13,0,-35	3	0116	-- a41
----	831,705,14,0,-35	3	0117	-- a42
----	923,705,14,0,-35	3	0120	-- a43
----	744,692,0,0,-35	3	0121	-- a44
----	723,692,0,0,-35	3	0122	-- a45
----	749,692,0,0,-35	3	0123	-- a46
----	790,705,14,0,-34	3	0124	-- a47
----	792,705,14,0,-35	3	0125	-- a48
----	695,706,14,0,-35	3	0126	-- a49
----	776,699,6,0,-35	3	0127	-- a50
----	768,699,7,0,-35	3	0130	-- a51
----	792,705,14,0,-35	3	0131	-- a52
----	759,692,0,0,-35	3	0132	-- a53
----	707,704,13,0,-35	3	0133	-- a54
----	708,705,14,0,-35	3	0134	-- a55
----	682,705,14,0,-35	3	0135	-- a56
----	701,705,14,0,-35	3	0136	-- a57
----	826,705,14,0,-35	3	0137	-- a58
----	815,705,14,0,-35	3	0140	-- a59
----	789,705,14,0,-35	3	0141	-- a60
----	789,705,14,0,-35	3	0142	-- a61
----	707,705,14,0,-34	3	0143	-- a62
----	687,692,0,0,-36	3	0144	-- a63
----	696,691,0,0,-35	3	0145	-- a64
----	689,692,0,0,-35	3	0146	-- a65
----	786,705,14,0,-34	3	0147	-- a66
----	787,705,14,0,-35	3	0150	-- a67
----	713,705,14,0,-35	3	0151	-- a68
----	791,705,14,0,-35	3	0152	-- a69
----	785,705,14,0,-36	3	0153	-- a70
----	791,705,14,0,-35	3	0154	-- a71
----	873,705,14,0,-35	3	0155	-- a72
----	761,692,0,0,-35	3	0156	-- a73
----	762,692,0,0,-35	3	0157	-- a74
----	762,692,0,0,-35	3	0160	-- a203
----	759,692,0,0,-35	3	0161	-- a75
----	759,692,0,0,-35	3	0162	-- a204
----	892,705,0,0,-35	3	0163	-- a76
----	892,692,14,0,-35	3	0164	-- a77
----	788,705,14,0,-35	3	0165	-- a78
----	784,705,14,0,-35	3	0166	-- a79
----	438,705,14,0,-35	3	0167	-- a81
----	138,692,0,0,-35	3	0170	-- a82
----	277,692,0,0,-35	3	0171	-- a83
----	415,692,0,0,-35	3	0172	-- a84
----	392,705,0,0,-35	3	0173	-- a97
----	392,705,0,0,-34	3	0174	-- a98
----	668,705,0,0,-35	3	0175	-- a99
----	668,705,0,0,-36	3	0176	-- a100
----	732,806,143,0,-35	3	0241	-- a101
----	544,706,14,0,-56	3	0242	-- a102
----	544,705,14,0,-34	3	0243	-- a103
----	910,651,0,0,-35	3	0244	-- a104
----	667,705,14,0,-35	3	0245	-- a106
----	760,705,14,0,-35	3	0246	-- a107
----	760,569	3	0247	-- a108
----	776,705,0,0,-35	3	0250	-- a112
----	595,705,14,0,-34	3	0251	-- a111
----	694,705,14,0,-35	3	0252	-- a110
----	626,705,0,0,-34	3	0253	-- a109
----	788,705,14,0,-35	3	0254	-- a120
----	788,705,14,0,-35	3	0255	-- a121
----	788,705,14,0,-35	3	0256	-- a122
----	788,705,14,0,-35	3	0257	-- a123
----	788,705,14,0,-35	3	0260	-- a124
----	788,705,14,0,-35	3	0261	-- a125
----	788,705,14,0,-35	3	0262	-- a126
----	788,705,14,0,-35	3	0263	-- a127
----	788,705,14,0,-35	3	0264	-- a128
----	788,705,14,0,-35	3	0265	-- a129
----	788,705,14,0,-35	3	0266	-- a130
----	788,705,14,0,-35	3	0267	-- a131
----	788,705,14,0,-35	3	0270	-- a132
----	788,705,14,0,-35	3	0271	-- a133
----	788,705,14,0,-35	3	0272	-- a134
----	788,705,14,0,-35	3	0273	-- a135
----	788,705,14,0,-35	3	0274	-- a136
----	788,705,14,0,-35	3	0275	-- a137
----	788,705,14,0,-35	3	0276	-- a138
----	788,705,14,0,-35	3	0277	-- a139
----	788,705,14,0,-35	3	0300	-- a140
----	788,705,14,0,-35	3	0301	-- a141
----	788,705,14,0,-35	3	0302	-- a142
----	788,705,14,0,-35	3	0303	-- a143
----	788,705,14,0,-35	3	0304	-- a144
----	788,705,14,0,-35	3	0305	-- a145
----	788,705,14,0,-35	3	0306	-- a146
----	788,705,14,0,-35	3	0307	-- a147
----	788,705,14,0,-35	3	0310	-- a148
----	788,705,14,0,-35	3	0311	-- a149
----	788,705,14,0,-35	3	0312	-- a150
----	788,705,14,0,-35	3	0313	-- a151
----	788,705,14,0,-35	3	0314	-- a152
----	788,705,14,0,-35	3	0315	-- a153
----	788,705,14,0,-35	3	0316	-- a154
----	788,705,14,0,-35	3	0317	-- a155
----	788,705,14,0,-35	3	0320	-- a156
----	788,705,14,0,-35	3	0321	-- a157
----	788,705,14,0,-35	3	0322	-- a158
----	788,705,14,0,-35	3	0323	-- a159
----	894,634,0,0,-35	3	0324	-- a160
----	838,540,0,0,-35	3	0325	-- a161
----	1016,540,0,0,-34	3	0326	-- a163
----	458,820,127,0,-35	3	0327	-- a164
----	748,597,0,0,-35	3	0330	-- a196
----	924,552,0,0,-35	3	0331	-- a165
----	748,597,0,0,-35	3	0332	-- a192
----	918,526,0,0,-35	3	0333	-- a166
----	927,660,0,0,-35	3	0334	-- a167
----	928,562,0,0,-35	3	0335	-- a168
----	928,563,0,0,-35	3	0336	-- a169
----	834,537,0,0,-35	3	0337	-- a170
----	873,599,0,0,-35	3	0340	-- a171
----	828,588,0,0,-35	3	0341	-- a172
----	924,594,0,0,-35	3	0342	-- a173
----	924,594,0,0,-35	3	0343	-- a162
----	917,692,0,0,-35	3	0344	-- a174
----	930,608,0,0,-35	3	0345	-- a175
----	931,608,0,0,-35	3	0346	-- a176
----	463,791,99,0,-35	3	0347	-- a177
----	883,623,0,0,-35	3	0350	-- a178
----	836,648,0,0,-35	3	0351	-- a179
----	836,648,0,0,-35	3	0352	-- a193
----	867,591,0,0,-35	3	0353	-- a180
----	867,591,0,0,-35	3	0354	-- a199
----	696,648,0,0,-35	3	0355	-- a181
----	696,648,0,0,-35	3	0356	-- a200
----	874,619,0,0,-35	3	0357	-- a182
----	874,615,0,0,-35	3	0361	-- a201
----	760,692,0,0,-35	3	0362	-- a183
----	946,533,0,0,-35	3	0363	-- a184
----	771,655,0,0,-34	3	0364	-- a197
----	865,481,0,0,-35	3	0365	-- a185
----	771,655,0,0,-34	3	0366	-- a194
----	888,712,19,0,-34	3	0367	-- a198
----	967,568,0,0,-35	3	0370	-- a186
----	888,712,19,0,-34	3	0371	-- a195
----	831,579,0,0,-35	3	0372	-- a187
----	873,578,0,0,-36	3	0373	-- a188
----	927,542,0,0,-35	3	0374	-- a189
----	970,616,0,0,-35	3	0375	-- a190
----	918,593,0,0,-34	3	0376	-- a191
+space	278	0	32	space
+---	974,621	3	33	a1
+---	961,611	3	34	a2
+---	974,621	3	35	a202
+---	980,692	3	36	a3
+---	719,566	3	37	a4
+---	789,705,14	3	38	a5
+---	790,705,14	3	39	a119
+---	791,705,13	3	40	a118
+---	690,553	3	41	a117
+---	960,568	3	42	a11
+lh	939,559	3	43	a12
+---	549,705,11	3	44	a13
+---	855,632	3	45	a14
+---	911,642	3	46	a15
+---	933,550	3	47	a16
+---	911,642	3	48	a105
+---	945,553	3	49	a17
+---	974,587	3	50	a18
+---	755,705,13	3	51	a19
+---	846,705,14	3	52	a20
+---	762,692	3	53	a21
+---	761,692	3	54	a22
+---	571,661,68,0,1	3	55	a23
+---	677,705,13	3	56	a24
+---	763,692	3	57	a25
+---	760,692	3	58	a26
+---	759,692	3	59	a27
+---	754,692	3	60	a28
+---	494,692	3	61	a6
+---	552,692	3	62	a7
+---	537,692	3	63	a8
+---	577,596	3	64	a9
+---	692,705,14	3	65	a10
+---	786,705,14	3	66	a29
+---	788,705,14	3	67	a30
+---	788,705,14	3	68	a31
+---	790,705,14	3	69	a32
+---	793,705,13	3	70	a33
+---	794,705,13	3	71	a34
+---	816,705,14	3	72	a35
+---	823,705,14	3	73	a36
+---	789,705,14	3	74	a37
+---	841,705,14	3	75	a38
+---	823,705,14	3	76	a39
+---	833,705,14	3	77	a40
+---	816,705,13	3	78	a41
+---	831,705,14	3	79	a42
+---	923,705,14	3	80	a43
+---	744,692	3	81	a44
+---	723,692	3	82	a45
+---	749,692	3	83	a46
+---	790,705,14	3	84	a47
+---	792,705,14	3	85	a48
+---	695,706,14	3	86	a49
+---	776,699,6	3	87	a50
+---	768,699,7	3	88	a51
+---	792,705,14	3	89	a52
+---	759,692	3	90	a53
+---	707,704,13	3	91	a54
+---	708,705,14	3	92	a55
+---	682,705,14	3	93	a56
+---	701,705,14	3	94	a57
+---	826,705,14	3	95	a58
+---	815,705,14	3	96	a59
+---	789,705,14	3	97	a60
+---	789,705,14	3	98	a61
+---	707,705,14	3	99	a62
+---	687,692	3	100	a63
+---	696,691	3	101	a64
+---	689,692	3	102	a65
+---	786,705,14	3	103	a66
+---	787,705,14	3	104	a67
+---	713,705,14	3	105	a68
+---	791,705,14	3	106	a69
+---	785,705,14	3	107	a70
+---	791,705,14	3	108	a71
+---	873,705,14	3	109	a72
+---	761,692	3	110	a73
+---	762,692	3	111	a74
+---	762,692	3	112	a203
+---	759,692	3	113	a75
+---	759,692	3	114	a204
+---	892,705	3	115	a76
+---	892,692,14	3	116	a77
+---	788,705,14	3	117	a78
+---	784,705,14	3	118	a79
+---	438,705,14	3	119	a81
+---	138,692	3	120	a82
+---	277,692	3	121	a83
+---	415,692	3	122	a84
+---	392,705	3	123	a97
+---	392,705	3	124	a98
+---	668,705	3	125	a99
+---	668,705	3	126	a100
+---	732,806,143	3	161	a101
+---	544,706,14	3	162	a102
+---	544,705,14	3	163	a103
+---	910,651	3	164	a104
+---	667,705,14	3	165	a106
+---	760,705,14	3	166	a107
+---	760,569	3	167	a108
+---	776,705	3	168	a112
+---	595,705,14	3	169	a111
+---	694,705,14	3	170	a110
+---	626,705	3	171	a109
+---	788,705,14	3	172	a120
+---	788,705,14	3	173	a121
+---	788,705,14	3	174	a122
+---	788,705,14	3	175	a123
+---	788,705,14	3	176	a124
+---	788,705,14	3	177	a125
+---	788,705,14	3	178	a126
+---	788,705,14	3	179	a127
+---	788,705,14	3	180	a128
+---	788,705,14	3	181	a129
+---	788,705,14	3	182	a130
+---	788,705,14	3	183	a131
+---	788,705,14	3	184	a132
+---	788,705,14	3	185	a133
+---	788,705,14	3	186	a134
+---	788,705,14	3	187	a135
+---	788,705,14	3	188	a136
+---	788,705,14	3	189	a137
+---	788,705,14	3	190	a138
+---	788,705,14	3	191	a139
+---	788,705,14	3	192	a140
+---	788,705,14	3	193	a141
+---	788,705,14	3	194	a142
+---	788,705,14	3	195	a143
+---	788,705,14	3	196	a144
+---	788,705,14	3	197	a145
+---	788,705,14	3	198	a146
+---	788,705,14	3	199	a147
+---	788,705,14	3	200	a148
+---	788,705,14	3	201	a149
+---	788,705,14	3	202	a150
+---	788,705,14	3	203	a151
+---	788,705,14	3	204	a152
+---	788,705,14	3	205	a153
+---	788,705,14	3	206	a154
+---	788,705,14	3	207	a155
+---	788,705,14	3	208	a156
+---	788,705,14	3	209	a157
+---	788,705,14	3	210	a158
+---	788,705,14	3	211	a159
+---	894,634	3	212	a160
+---	838,540	3	213	a161
+---	1016,540	3	214	a163
+---	458,820,127	3	215	a164
+---	748,597	3	216	a196
+---	924,552	3	217	a165
+---	748,597	3	218	a192
+---	918,526	3	219	a166
+---	927,660	3	220	a167
+---	928,562	3	221	a168
+---	928,563	3	222	a169
+---	834,537	3	223	a170
+---	873,599	3	224	a171
+---	828,588	3	225	a172
+---	924,594	3	226	a173
+---	924,594	3	227	a162
+---	917,692	3	228	a174
+---	930,608	3	229	a175
+---	931,608	3	230	a176
+---	463,791,99	3	231	a177
+---	883,623	3	232	a178
+---	836,648	3	233	a179
+---	836,648	3	234	a193
+---	867,591	3	235	a180
+---	867,591	3	236	a199
+---	696,648	3	237	a181
+---	696,648	3	238	a200
+---	874,619	3	239	a182
+---	874,615	3	241	a201
+---	760,692	3	242	a183
+---	946,533	3	243	a184
+---	771,655	3	244	a197
+---	865,481	3	245	a185
+---	771,655	3	246	a194
+---	888,712,19	3	247	a198
+---	967,568	3	248	a186
+---	888,712,19	3	249	a195
+---	831,579	3	250	a187
+---	873,578	3	251	a188
+---	927,542	3	252	a189
+---	970,616	3	253	a190
+---	918,593	3	254	a191
+---	509,692	3	256	a85
+---	410,692	3	257	a86
+---	234,705,14	3	258	a87
+---	234,705,14	3	259	a88
+---	390,705,14	3	260	a89
+---	509,692	3	261	a205
+---	410,692	3	262	a206
+---	390,705,14	3	263	a90
+---	276,692	3	264	a91
+---	276,692	3	265	a92
+---	317,692	3	266	a93
+---	317,692	3	267	a94
+---	334,692	3	268	a95
+---	334,692	3	269	a96
diff --git a/contrib/groff/font/devps/download b/contrib/groff/font/devps/download
index b98885c..3f77716 100644
--- a/contrib/groff/font/devps/download
+++ b/contrib/groff/font/devps/download
@@ -3,3 +3,4 @@
 
 Symbol-Slanted		symbolsl.pfa
 ZapfDingbats-Reverse	zapfdr.pfa
+FreeEuro		freeeuro.pfa
diff --git a/contrib/groff/font/devps/freeeuro.afm b/contrib/groff/font/devps/freeeuro.afm
new file mode 100644
index 0000000..1893308
--- /dev/null
+++ b/contrib/groff/font/devps/freeeuro.afm
@@ -0,0 +1,34 @@
+StartFontMetrics 2.0
+Comment Generated by pfaedit
+Comment Creation Date: Sat Dec  7 00:17:28 2002
+FontName FreeEuro
+FullName FreeEuro
+FamilyName FreeEuro
+Weight Medium
+Notice (Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); the serif shapes are based on the Omega fonts created by Yannis Haralambous.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox 4 -23 903 710
+StartCharMetrics 16
+C 0 ; WX 750 ; N Euro.symbol ; B 32 -12 718 685 ;
+C 1 ; WX 750 ; N Euro.symbol.bold ; B 26 -12 724 685 ;
+C 2 ; WX 750 ; N Euro.symbol.slanted ; B 85 -12 842 685 ;
+C 3 ; WX 750 ; N Euro.symbol.bold.slanted ; B 73 -12 850 685 ;
+C 4 ; WX 741 ; N Euro.serif ; B 34 -14 707 676 ;
+C 5 ; WX 800 ; N Euro.serif.bold ; B 45 -19 767 691 ;
+C 6 ; WX 734 ; N Euro.serif.italic ; B 66 -18 745 666 ;
+C 7 ; WX 800 ; N Euro.serif.bold.italic ; B 17 -19 808 691 ;
+C 8 ; WX 756 ; N Euro.sansserif ; B 38 -23 731 709 ;
+C 9 ; WX 796 ; N Euro.sansserif.bold ; B 36 -22 763 710 ;
+C 10 ; WX 756 ; N Euro.sansserif.slanted ; B 86 -23 862 709 ;
+C 11 ; WX 796 ; N Euro.sansserif.bold.slanted ; B 82 -22 903 710 ;
+C 12 ; WX 600 ; N Euro.mono ; B 11 -16 534 576 ;
+C 13 ; WX 600 ; N Euro.mono.bold ; B 4 -14 539 597 ;
+C 14 ; WX 600 ; N Euro.mono.slanted ; B 61 -16 631 576 ;
+C 15 ; WX 600 ; N Euro.mono.bold.slanted ; B 54 -14 643 597 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/contrib/groff/font/devps/freeeuro.pfa b/contrib/groff/font/devps/freeeuro.pfa
new file mode 100644
index 0000000..1891d4f
--- /dev/null
+++ b/contrib/groff/font/devps/freeeuro.pfa
@@ -0,0 +1,316 @@
+%!PS-AdobeFont-1.0: FreeEuro 001.000
+%%Title: FreeEuro
+%%CreationDate: Sat Dec  7 00:17:28 2002
+%%Creator: cjk
+%%DocumentSuppliedResources: font FreeEuro
+% Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); th
+% Generated by PfaEdit 1.0 (http://pfaedit.sf.net/)
+%%EndComments
+FontDirectory/FreeEuro known{/FreeEuro findfont dup/UniqueID known{dup
+/UniqueID get 4214375 eq exch/FontType get 1 eq and}{pop false}ifelse
+{save true}{false}ifelse}{false}ifelse
+11 dict begin
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def
+/FontName /FreeEuro def
+/FontBBox [4 -23 903 710 ]readonly def
+/UniqueID 4214375 def
+/PaintType 0 def
+/FontInfo 10 dict dup begin
+ /version (001.000) readonly def
+ /Notice (Created by Werner Lemberg with PfaEdit 1.0 \050http://pfaedit.sf.net\051; the serif shapes are based on the Omega fonts created by Yannis Haralambous.) readonly def
+ /FullName (FreeEuro) readonly def
+ /FamilyName (FreeEuro) readonly def
+ /Weight (Medium) readonly def
+ /FSType 12 def
+ /ItalicAngle 0 def
+ /isFixedPitch false def
+ /UnderlinePosition -100 def
+ /UnderlineThickness 50 def
+end readonly def
+/Encoding 256 array
+ 0 1 255 { 1 index exch /.notdef put} for
+dup 0/Euro.symbol put
+dup 1/Euro.symbol.bold put
+dup 2/Euro.symbol.slanted put
+dup 3/Euro.symbol.bold.slanted put
+dup 4/Euro.serif put
+dup 5/Euro.serif.bold put
+dup 6/Euro.serif.italic put
+dup 7/Euro.serif.bold.italic put
+dup 8/Euro.sansserif put
+dup 9/Euro.sansserif.bold put
+dup 10/Euro.sansserif.slanted put
+dup 11/Euro.sansserif.bold.slanted put
+dup 12/Euro.mono put
+dup 13/Euro.mono.bold put
+dup 14/Euro.mono.slanted put
+dup 15/Euro.mono.bold.slanted put
+readonly def
+currentdict end
+currentfile eexec
+743F8413F3636CA85A9FFEFB50B4BB27302A5F6C876586CCC1670A7EF5521E6ADE15AAB4
+DD2DDDB83735311FC63DB80D2C96AECFA05BB67F865EA35934B4B79A203A8DD489B09C79
+FF6EB9DBCFD889C3E73F8C94BC342AF671D6F688870A62EE1A0DF216E150FFEC64A8C2B7
+509AD05C011599C1AD84E6C4B668E07EA219BD72663D8AF4CA8EC8E23AA90DE90BE940C6
+6DB849CEDB3B64961365A7CCE47F4FC9E30FDEE4B14B90C2E0D8C344EBC974EABF417B3D
+28251A78ACEE2BFC4212B1E3E9C7EBC3262821EE98E538713C64DF0BC13C19337B63F916
+071CB6A5AC8BFC2DC3788EFE6757CBCB8F6C6B0964E5B8B64E298260DCF69D22544C4C9A
+AAB2694F2BC33A988936E3419205B0776C4F4C10DA085BB58EDB9040578A7C542326FA48
+21346944DDE5011ED6C593867701528ADFAC1A81310F107E53D7E80D380AB29406EC81A6
+B1E3AB7A256AB446730F845C2AE0A9E5BC7D1B95E98239326BEE43352A8CBAA2938ABC8F
+CA71A312A4CA623CE886F872E8BB8DEC0FE2DD61157735BE411D22655E7F6B32B7F17F06
+3F9D197C0A6DC6D751E75EC06CF908DD78ABDCDC462D74FB774644B8C65A3652BE990BEA
+3DCA0E713CF0F97262C55AF252E7A5CEB5F8F1614565FF088A38106F7AC63CE031F3D290
+DC08D216C170295D553776062AC3801F18D2F1D5F5CBD4A70659E299DE13D4D9A12F39BA
+F4A51643F0677019235AC25DC2B29169D38308F2170A1AA0FDCC59EA2DE35ECB2E59AEF4
+26712D65FC6E009D511502BAB674960650F7E863E287FC366F03EA9FBCC7E725239D121A
+A8E7049E59D220D39D790DC7AD4C38E1738DD4D7DDA27071E79360B636071004FE9DD730
+A07E015588BAF90E19ADB3601854DB4F1E60D1739C7012FBA34FFB67C2E46A0BA81897B9
+52B9B58EBF3316F6CDA6F86B9229B6D097AF9F9D4A721CE75AED8898DD2A42E1776EDDAB
+466F2587F72BCC3BE89B1D130C9E7CA61CA17BF0C2C3F83DD310DC3C56955D9ADE4956A6
+CFB4DBCEE8FA354C27EE57ACF334C0E91BF7952EB7E3D4E452880C5F2BF9ACF9BB58FA39
+9F0F0AE89DEBC053B6EEBD52A6330BC1F0BE0CFD13E1EB04803407CE40EF22585405F487
+C2BE46742F3224F33103A0B171F1677174E7A8E655F0CA9B111C69433F5DBDB36948C7FE
+0D9099AD8FBFDEB70AAF63ABE825A828B29E7166B23359730147748F9B6F38F29503D9F8
+DA5AABDEE13F5E4DE80BCCD9200FC2207C26E99BDF0A3F8200C0FAE266D7F136B673B0BB
+93C6E76EEA685EA6383F3E62BF3F55FE3DB8180EA998FC892856D82B86AE02E44D1938E8
+1D4F2E63716B311DEB6E1D3DD2049A3EE6D68965EDCC4FF457A92F2E47C432608A1161D9
+7AD9008EBC54787C6E5163D49019CCA728B50ED47B576B733936DD31311B5734B98A3F92
+8B79D6EA5F2C0228D14A087491CBA8C0DD37C92FB93B545239D8A776664B74D081E15BAD
+3F44B162DC2ABCF7D44656E67BB00AF2D7FA83D8C94F636D4ABC7F722B84D6B31D5E1AA5
+8B565C02C041873F155C1C0F4CEEE19D9B9D129FCF4A6D530AEC02EE8A003E529CB72865
+5352A44F12DB9108A413C974535D645719357AA5B40B092C237C758DB720DBC2CA88614C
+4B78209A7917C2409C7F6754D0FC14B3FF2EA76340158F8CE8AB6B6BC084BDAB16D75442
+0F879F39C072EDCA91AB38113E3E5E5587750D1EE53342924203890EA97A6081894BBC01
+BB8331687ED0FD1D0AECE0833B7C8ED7C502AFA836130061A6580673E2B2D2AD5427033E
+FF14BF2118EDE74F495358571A69778502693C47F5361EEE27958AF7DC1B8193A1CE5DD0
+6F98F56A7DBB0786DBD6DDF121B6328C97E48AA189FC5AF35D9809A1D4E859F3C2C36DF6
+CE2E3A5D1E07BDC25F95BE1E8E4351D14BE6BEC66004FFD619CAAD555330C0853DEA3E47
+5D346A924D14F4F2964CF56D1520BF4B49DD1AB6629BD1CAAA43AC18CA12E420863C4F02
+29AAF36D75DCBBBA34AAF0D802098F411CCBF9527EFD06B42DB0D7A33B7CA8AB95A11F93
+56A1A905E4740572CAB4CF683522B62224A251964B1DD39EC873B0F79138414B3B1429F4
+B89618B94C0651F6CAA8017EB3407C8D2CBF2F01C75081CC580D3C6821351B4BE90213CD
+0010D0D66050F98D5365E34E6B2ED87AFBE756B98D470D2DF72E5CA7D8FA5AC997A27472
+CF1D2F9B00124CE73F4118811A33158A53ABA3F9A50BE3BE4D99E771EEABC64299780F7D
+F716A28E356A707F6D356093E82BAF0F7B48029A264FF00FD9CA6BE5FC5567E0E165726F
+0CEF4D14BF7A3C06C41035CC24D2BB27D910595080CD1FD7E188CF3B5725CF2418C55F42
+050C24F59F845A2AE8A774AA2DE18C7D46A148FB94512E85EEF1B17FFBF7419337D4F839
+4C7DFF5AA3A9C15A0D4CC3057B01F76DA752C2D1D504EE2EFB864ABDFC20EDAB64CDE513
+40166400E4A234DF428B83BB3EC5047BA10412905C0F4460496B763C22C79131C3267B6C
+39C009CF01853FC39C8C350E86279F116F00E40E1A4016004B904B7462BE236336D197E9
+8E93C9890F942433398E541A32EAC543620BDD57D39BBF6869E0E30B02E871A6ECBC2FBE
+1668ADC19FFD974B9282E96F55EA3C2E57D8758CB55469B67C5E3D1EB2FCD97B014DD592
+A5FF102CC98BDB42AD0A8D151D816C621C32459E74C422C39FDC7F5BF261804DEDAA856C
+8768DEB3FFF8B6970B6175A5BEB048FAA910650E865E16FF6672ADE59FB29D16EB104B90
+3F912AF4107F4BD9076B90D21B1E11A940BAD3A99C66D78F3CE377940DBCBB646B4E320E
+C2F9CAFA016708BCFDCEED11F528B4641A0C38FD220A9A991D198542CD7287671DBC7764
+DEAD19E775E1B88F13B9935A022ADD244F080CC29C6C6238E60BDF7FD339D97CEEA33A3C
+DA86A2DB8D2A02C1A6330F28759BB47E41916295EC645275A9736BD4BC738839B3EB13FC
+3E8E085DA24F6DC3B5DBC270D2AF741AD70690172FAE865C252AA7A131D196DA287755EB
+5A1E0E8AAE93EB40B84AD249FF8F7C947ABE3B3A7D7DB21AAB547EAFF14DF357C95E24BF
+72922C80ECE27FB6BC2E6A355A4EE321FD3C72C57D89779D81EA394E4C2050FB173A12B5
+02140F8CDC659EC2B5A6D14E604A4D4002218BAEE8FF000CB4E9BA22B0A2871AED1D46B6
+FC72054ACE8AF56297F688AB383BBDC7A90F4466D44F35A58D21913B1560E8B7DF6CD686
+38D872330412E04014B081CF280A64DB4888538B401FDC739457482B83CFE87DF74336D8
+535B124F600EBB34BE727C3BC5E289D141716BAF510A6551E5EA6BA43E770211B80853CB
+0435C0F67E8A857788EEBAF47394F62328A493D44B4B2DC33BB8C748EE82F6866C424DFD
+93D62BA22A8F4D30E976FB9FAE45F0D7F93FDFF41232BA60CAC314097FC7DCE9627CE249
+57E783A9ED3F496A45B17D815B326A415976B122A7238247D38CAFED1018A951FF9B1941
+7E305D3698B38BAEA4C15D57E7A9BA26568ACDD0CD723C16CE3914D52566E04764FE810A
+6AF84AA2F0DB871946A400FB9BA23A579830A50528C786EF0CE14583761FA58702E45EBF
+0B72CDFB6F1DAED7A551D0E43CD23DF336560A87915F101EFB11B2F136CA998488907950
+ECEDC2F737BCB90824F0490EFB2A50BDF21B35C381EF73ACA08D20505B15469459C00261
+0AD4DF6ADD5E31B877EEA14D2884C0D31476B97CFA80A63ED8115300B03A0B8E8F02B8E6
+F56609D0CEEF1279A1D37DD713A6AC2372430C056E0D31ACA80202E2C71829CBE1A9A417
+69F8C1C19FB96F19518A69207BF35F38CBCF76FB89D9C8CEBDCA13FCD79320898C541CC5
+1376AF391ABADE82346FE51F3B365D042380F2A059A25D078FB3022CE752EC9E20EDE640
+28BE9853A159786462E59701EBB5F9AFDE1D84F5682B82B7198647E5B189CEB1A7B0FB55
+337C67CC4DB08D48E843A8FBCB6A8B967D9D225CFE66C81B8E87C3EAA6AB16C36A376FA4
+2641CAA75A77407CCF25CC112CBB9FECF1C8878E84623BCD03003AEC832A80FFCD39A246
+8195A4F8740AF2499AA2FBFB2A48BA3D95D42E10FF6D72004D878D9E8BE5AF08151EAB6F
+3E1343ED64D18B07F7AF6E575D75B1F0E3E72041B2D7A21E400F2173AABA5AC981A2D132
+327EEA3CD7B434355B43669FFC74EC7B04AC48EED15EE1A6466398CB246FD54A5E072487
+0CF731812341144511F777FDD08EB4FCE0A5FCFF6FD37A8053CF993FE5276BFD1DB17D3F
+10CE419F10C975351148F108FE9FEBB9DEC326EA7CC30066920BA941B7191E852B91ADD0
+9A1F6539E74DC949DF7F23E54DAADF018E86B158439C8BBD9E4628F4ADC9F6BF776CB6B6
+888E5E0752FE92A53E0F3D8738A3ACBD58B7748FDCBC9EFADC49C1D5853C41A582D07E2B
+8DCF8D3F8E7ECD79C1D7C44981FF8D6DB49FE7F976C6F9B448D0CFD0448A631D874C69C0
+408828257777A6D9CCB32395139AB20962323C1D38F5A81903E6389E784D560E5F72221B
+AE4AAE68C29FCCBD8E4D7739E8C1489301D80D2F8CBAA951CA9EBA8BB2B7AAA80A30B7C4
+C9D2356DD2E6B1E5A66E3652243DC521A77CFE0E8260E3814F4197C1407866ACB9A799F4
+D2B7B6BAFCAC660AD28452B1175C808815144F01F99DDB7F7A19CCFDD522E89A1CF4EF9F
+E986CEB8F80011C4763F29DE90C76ECE678D42783B4C9402B7CB270AB0B8681469FA5C2C
+DB3651C61F1AFBC441F456533B2C0F4FBAE9A7571F2A90FFDF33587C480DA43FCF29CEBA
+FCFA080B5A44F2BABDA2044212588001E47EFE55D91ABA7EAA7C261D02027301EA28AC65
+687B3681CEBF7CB08C0D2EBA3167075B61EF0C7791A5C818028AB0CB08E56FBC45B027C7
+416FF0E6EAA615963408C5EA295BE0673C493E9903D95CFB010FCFD094F03192A9538FCA
+259B48347D79F40F3023731DE72ADA10E9038A79B9F7E2A93041AAC1F268F9439DD0BA6C
+77559ECB955103085C3900C11A926B889D8E8275D96BE1E74ADC3C95E50D9CBC9E3925F2
+3FBDF75C7117DF74F2A56F173AAB79A5B38D4E17508D85FB4E1238CCCCE2AC989009C633
+B00EA1A69DB9A9A2E7B7A97BD9E9CF7E6E1F314DAED20648034C47A0F75722072EF97745
+924A16A58D4CA4B928F334200C2B2FE463C798F1CD657F2A53B9F13B9D7B9A207F9CD12A
+A1CE977533FBAD9B2C6DFEBE1141B96786DD79169C4AD3D27B49D96F1A5ACABADE98346B
+F663DDE31A38AFB1CA50BAC527DB023DE87E06FCCB71B28106D25AF54D20897BDBC78727
+C904C638B060085637BEB4B891FC150DE1B03BF1D857C4F987E8C26941673C55D37BB64C
+9F9B1D1E66A830C33179EDAD3780AAC1A2974C240FF753E8E59B99B0B2606CF03B364317
+562C705F9107FDD892DFF9EBB3844C2E3C919B641DBAC0E2F89ACC57CB38A341CD643BB2
+47863FD8504FE8216E21F78F88B110F88BE618AB8F4D4ECB62710B811214B5906A62E385
+CD5BFB483F856560E99FEC2C962A8615FD30A9BF24E719C36FA39E6B5149BAA33E9DEC5F
+BAE0A930C2D6A1AAF801C7B7117CFC33F16DA58DCD1040C0C30B6B3C54552DB2252E2759
+7C0D86E017ECCE5E37E45FA9581C886DF5417B6DF5CC143E71C7B9ED6379A717330D763F
+4D817D66956D321B0418482C10AFA32125F79D0B57E90E54CDAC58F808D38276949007CD
+A0D8717CB3B6B1C382CE1ADCC33174EF75BFD861D568E11FDFC5A738B3CB2703A1487A23
+D662B9BB3931E8232FB3A8CAEAC02D2CFB3196357FD7692BB8A9ADAC4EFC62E55567C77F
+78D085BBB1A509506F7750791EC5AE9F21F4BE17DAECFE19CC3FE46DD8F66AB8565CC43C
+4AA4EC4D2571C238777D81F910E9E6EF9FC45482489C657591DD9727887C6B03393D095B
+914374FBFB365471B160B8C9BA13190BCE16A610D8465F6D4DAFE8866CC1611B0617550C
+D3A2209CA2D66EB64DB1098ED0080DC64D6357404EEF153A9B7592C4D25ACCBEF7A2CA34
+9CEF81963C7BAA1F24B1AC2E17D70CA2A57551216E4CC533E615D36B2E15B3400B15D29B
+89DF7881DB682DD3E4CC8C2D83FB8AE43845185C18938C4643EA356A9B9C2769094382F8
+3E1672BD0247897FD8896ECB5E850789C03840DEBBAA59F6B7D5B828D81AAE78F18711D0
+1A51F7B51BEC544C3BE6E42C3EE6CAB4008BD375319F19307760DEFDA659C11E1D0937BD
+528468C0AF9221C165616AC7C2F59551593ACEBC6D7E2EB7619AC3F34A1C704E5371EAAD
+1C0ED311416677FCED438F764C8065468F2E75C14100345766170E46CC4C82D774B3DA7B
+D1AF304235966183ECF184D2A808C2E01A79EB89C11033D5ACB3012195EE1FA6F040619F
+620045DC68049F0488B30EC6CA4193E6146FC06477960701646737690EB5F9D613548AF5
+3FB99A11560AF27C50DE034DDA6517C449953608D326A35DDBA2707C2603BE5CD32E8C23
+AB80B9A25B97DADAF3F6C3A31B3F7300D37AABF812FD3F7D07FD41DB3EFB7B4EA062F68D
+D6EAE9FCE68AB4B4890F8A65F62FB3ADFA6F9A8BE6F99542CF9C1A0C79FFC320BC992590
+E912BA10918F218A8A50E1415E8946596BC2282AA9D2549F06E4E915633CE6DABA8E5726
+99F96A04AC9C350BA4554DCE7497FA0242AA1F0A5F66978D852EE175D35D38BD89C99D59
+4150198769AF67B2E2A9E7BA5CB0E685EC0E5B9532C9338249142C7D51CBBC6D0A0C2314
+869F61B162BC7B0783831B7EB1104A3DEFB7E6304D8E77A69CADC48005E1DB0A9A8E0D63
+DF98831D291A045831A6F95820C130957011A209625C270430EF9A4D54033F97B0EBB0A6
+B2D3D7B64D02764A8D4DDFDAC7598A3E5FF505D150F074C52A927851C37C1DEE34217D23
+F59DCEC4F863556EB6C62E0236AE398C5F27F2926CBC38463FE7D3DBDAD0A8113FD9B0F4
+D93ADD64162451778D570ABFC58ABDF8FEE553E014233B11E1E30CBAAA4AAE1900F02BD6
+F3431C0E843CA6285E4AD421D71D8EB69CEA07F23D727EF5FBF7BCCD6D8598FE68A873F0
+6399306A375F9A449056BCE40B4A5756D71883F2EF7FD916C7A886F244A2C0348AA95E73
+AFDDE842E885FB89B303B7F7BE4FFC96E94D449566F199B6405C85A3F0B7F9F1514CC3A4
+40CFCB2BB97EB08AF617BC6777ECD3593C8AF65F24A7F79D438EA4996E0443E542A45115
+AB0A23A6AD9B3397C2165F9F752A57A6DA58A59396087D3ED59673B1A2FAEAAA4AAED5DE
+68FC0F75CBC05789880D1318E1DEAB239873C10495E8A861299ED082D1968A51295B3ECE
+4079D775106352FE27F00130BA4B9BED34AC5056CD1111C3BFE982DDAFA872559EAAF186
+FD3F717373EE463EB56A3A2A17653723EB24DC7E74DDF22F0EBC93BEBD7A19938D51C04D
+FF8E4F8E2539CC784840FEF56DE6B041BF8DA3617E2AECFAECEEDFC0FC7F45E18D549511
+A18E93400E5F874E54E43DDB16DC53D546AED588C8004ECDDFC88E2948CB467F88025571
+2C5ABA26CE47AC4877AAE9429300A19B4C0EB2FCC918B3DE7CDB3C38A45F2486C6B0A57B
+34F5CC21CDB809217C1577E85D8D40BAD0864A12A934E818975307AC3C6AD91B80A3BE19
+A888B6DA3910024BB94FFE3BD371887B6AF40FDF3B3A77925D16CEEA259F1C99330D5201
+80CB5ED33876C0057A160B9CA16E9401046154FD92F85F6386036067D9ECA976A504CA7D
+4278765BEE4E5D08A8832A45D3DEA2CF21AB2BEEEB74DE3263ACD8915700E10C9CD72C9E
+AB0A5DA11EF61413B33652AAA3ED73B445FD3A517F4C3FC537021726A949D70F522B3987
+938DB3D02B7029E5AE1B506FB08E73E08C09AEAD5106368D0F93C4E2551F1D792AA318A0
+F01B5891334DE63C4B63DE11A30BA6976F13CF99211438E9C1F87A857E09AD944172D38A
+DBA4247D402879D27461E5740E2DD7FECD3FB1C17911034895D24367FEAB97FCD335BAE5
+78E606D3DDBE223348EC816C29ACEA1172E7AEEEC705A0172D108D49FCD5BFA64EE7E107
+808F8EB78D4ACE4CC6121344F96EA46F9AE4289399D1C0C3274C1602CCA6E9AB0C6CF045
+DD18C4F66FA3F87D4B2F34F0B24EB4DD38D3B4088AFB1C4378C886E53F1B297A7351413A
+7D6B6023D12799BDD6E80FD9C6FBE8A8A313DDA621A4F3BD5706F28BCACE60380DFCAD8D
+818DFEB230FE4FCCDE10B8278492227826287342E3C2D8F5B4ED0F29A336562B6679E79A
+7171C5B77C576A272B008D04BFB626A5F7DDDC74DD72BAF2B735B45EA9AC33C26E33FB0C
+C87EF1743927DA31893D690E9DFBFE84D245B520D15726BCB913898C5AA7DECA2A274492
+033C03543B00DA691383798A4B5537387CAD74BB91CF1BCFDE0E315F7F661437C3E7395D
+D3DA366932BE297F25C6B2BBE0F76CEB16E107D109BA27B5FABEEDF05D1A5255DF61A325
+BEEE633F564797639EDB22D84A2ABE85B7BC3AFA1B38559DAB8ABC54F6829A16B2FE24CF
+EB4568BF63B57FD44C032DA5CF2D36717A857D99B0A8A2421BB2B20312808C4F2F049E06
+050CE4C54DE5DD872A035725AE7292824975265018D65EED0EAD72495C50506D38AD29D8
+9D379215F3A4D74F5E2C9002C4CC09F6CB1DAD731C229656977FD22CF7CCE89B325D1CF9
+344BE186517AEFC7CC0FF762AF7634C96433A846BF9493D8A2C660E78763DAE28D52F42A
+041026E22EF60CE1FFE3CB29CC5E6A39B9EEAB0B165C71705CE9C4B50D7EBBCD6C0CF1BB
+0E52F1CD1A72A63983F905458F54425A74D6389C877D252E749D7D8A9C31531D28EFBE15
+BA50F4B5085D365ECEF98A867B6D282AC4E522AA657C7607E57F71B9A8C8C309B4DFE8AF
+E949CC09A56BE3998DF780F4660AA71224EF405A644B463FBF571F0E5DFAAE229C4C8005
+E8651C7348120EE658BF6BBC236AC9439BF11852E11E066D1BA8DFD7076DB128CA90A0B0
+C9DBB9CC88E469F890E93875F21822D26A953D01E2FA00E5657A242CE0A92963E4ECA460
+784CB43806238C72280433BB5CF797A99AFDAAA022FA421A344E93CEECCA58FF39A1E856
+E9BCB2583016696484B071A1B199FFDEB29BCF6855101C4EA271A39750F368E54533089F
+EFA0EFC81B0A79DA70408E5AEE18F793BE39791C541BEC63023069CC70D9CDF618ED29F4
+2037393F69668A7358EFA69D2A7AC8722BF1FF999CA768BBF08EE757E133B01E63D5D809
+519B97CDCE80701790E558737C6F8B00B0E1341633987A842C0907979D24AA41428267D2
+2C692A1D93A0686307D79563D6264E5BD5A40F6EEEA9B91E0D98F868D2A6D43A6C909D9E
+514500C10ADCD062528AC54B4CDAD6DDB466B655EE8EC4314A16880BF009C7E4A9FBEA5F
+63AAB8A17016250D80308FCF8AD5E5BAA53F17ED902872FF01A6FD6651B7B343A73777D7
+2090F1B08554422EAE4DAB73B22F714A9E236AC2329D092400FA031883BA9E118FC2397E
+8773D8CDF7EDFEDD7BB716419C7D95A7EF9BD2E44BE071014335866A7B273252F694D0A8
+644764303EE238F0369DC9A47EC3523A48986FA44ED642FA4109FE1E87984E994C3F0D5F
+3E9B0764A8D25FAF6318CE48203A0049CA2DB950DEB8B493F66247FC9B36D80D995756A6
+8014E98A00CB1EECBCFDFA4C3E9A0A2A5B831E0B4B823542D4B4CD70630CEAAEFDF5862E
+6D09F1D0EFDD1CC7CCC1F8EF7E5619B5F5C24D0F6F65458D62354E8E2C7ACB617F275D8C
+F8048980BEEE183BDCC404443726C9309FB58D1739D57D046906CB0A8A358AEF8793CE5E
+5710BA4BD661A25C345706013E51622631217D4A5E8D0E0D349C52D1D85DD3AE715D8710
+FC51D4780572E07543A0A9E5C3C538247079B16F5FC764CA72C5B3297CB032CC9E3F3999
+AB6A1C135EA731B57219B8B32C2461F116C0402786012C6DBC39C20E3E764DA41378B602
+CE5D9E0F68B4FD5936DEF0D6271E47CB14BD2C730C9F330CEF26D141144519AEF903EE52
+8739E1FD8D338AC74F43B4B7FFC0D62FB5055610C553BC056B67C4B79BF8CB5244F1D585
+2DECFDA75EA2CAA71DACCB893BB498B22AB3E1DF96D7BBD102367DFBFF02C135C42040D0
+155BD95DA0C4AA8F0D4F5F60F2A035829B6134CDD9CBEC37DAC58568BC58756177662F43
+5DD3EEA732A8A6448CBC6D4CACCA4444E9B2ABF1C54A1E30DAA5DA323B48250B70699479
+6DFA8BD2160AC41E82B3AD3A8E592DC3246B50AF4589BE7994D06F50A93C31BEF0608DB1
+4E2E138355A23BAB7796FCEF61A2495868B1D388F211514C73F639A1ECEC450E2CD0ECE4
+2687DFF5D25965E5B727306FAB8580465A74D81E5590F27C76FA05DC7C6DFAAAE841B99D
+3CA11A614EDDCA91410C90421E5BA23092E4563BE97153F2385ABD2C37672688028FAA55
+1168C9EDDF69E1B8FA511A56BA6DB831538B3E0B59148E6EF69CC65A243FCD643906ED3B
+07FB3AFCD850688D4CA8FD6CACCE1D4B55ABCD16680387251999F558327C57AE761B0CBB
+AB668E8D555ADA713699DC39F3FA0E68D7FB005FF628342C36A1BC0E9A5EFA6896DF4D58
+E547FCEE7ED610FC5D32C8C72C24B6FA766A14BDF23F5AC9321C6908EE3B9376425E7298
+00B731FF0FBB3E5EE589F0C8037CDADB72D10C2124A14FB45D45C94C8F5EF2A40B81538C
+538BC7DEC4823B3537BB9DA406345A80EF9B132455935C90D54E1C9D35B2C25DA45B00C6
+914FE04EF91C874325D8DBC10D1F30A7BD4E9CC5E70A3519CD6CC94F52433CE636E46F62
+0083A91FDD6FECF6CCE1D9FE0546741EDC4FF0C34C79C7114C1812DC389FE9DA6E4F5F43
+F166CBB4845DD1644DB6E2243277C029AEB6336392427E1793339ECDB8BD4C156C49CAD3
+9E1231153C35503CFA86E23CFD81BBABFF24D9DB287F63D110969F71D737747013D3EA59
+7792927261F837E5F4467843297B61D754E9617B1D2EAB47BAA5D4E205E777130D625841
+8902DC1259D91624CC7DA37CE6AB44B8A951346EB2EA4AE1AAFEA05CB873E68F2C38752E
+B01B2DA0823E7BBCCE05BA73E4A01D9BB4F0A93387E4B8CF71A72F4D677072EC92714848
+A658C4FC971E3EE4958E1A7C6765A9FC7AA63793A1D371F35A9CAFFD5AFE891E8CD4B38A
+9369E3C96B2EC604AA83E8DD9C0374C4F417AE3301FF8EF9DD08D5CFBFB7718339047C1A
+88227B978D0D91AB3D20C465FD2E35634B8A36F4FBCA67207EB3018D05C7A6E68B73DC9E
+C1D3C88599DD0B11988E6AD73F39C5607CA9DD96FF81B6709F76C11683E7149572F97E67
+D2D23332B11205CBEEDDF904048334FC859F8B7A204B65E39B09C55CDDC86B8D359BDA2C
+89483BF30BACE74F95B981E37EB0065A3C1A3583B25E78498E98DD181E08E6017B72C9CC
+B471867010D3564561DC5CE90286163783F1FC3C5FD75845457BCDA205E992ED1F7BCF9D
+21252FFE5C2A90ECC12E907CC686D9AF3C57F3DBEC3D1E08C417A0811181E1D33821DC6F
+1E7F68AC0613D55289C1A94D7F1308BB27E93D7CD952E3831AA55D76DB69891C0FA49DA2
+8C237CC650E1023BB18F4E96A66B6A9EAF7D074D9BD22B9713A61C659159564DB7FBADB0
+6F15A7E107989F27482C41A96F67950EFF8012C9FC287D6AE31E87BCD8E59FDA8439F691
+12A0F0637227B92FC4EA69B84A8D923B763E445308485B5C32C18F6604B6B30FED2775B6
+88B3089B0B681B6DB87EB4EE386E9D514C3BBA853EA767ED1223BB4AFFFC648918111932
+288547788BDE5CDBB17EC628321C24E0C013DDA78F24381B2A984BA655791FC791BE162F
+60D87530E3DAB5C150E048BDA24DA97126676B948D1879FEECB2A2E304475A078CFC27B9
+E14D4A0060F1254CBE65E4864BDD242A0339B1ACC4717DB134E7764433C03F916B9F4CDA
+0A1FF1EB33F1E0FFC667594FD23EB58288AC827C247C4AE6F8F3CAA30C7D0E9DB9F23BF0
+9C81580C20B4B367B7BE85E2F48557C00353756669FE34E543FED5438C52B2F132840140
+E548F948CF9AD2B734D895539F7D4CBE52A221614F5666FFB110A1BF0B8B3A9F478BF056
+FB1080C94005310175607A3E2AB73B9A810B50838F31481707C0B2CAC918086AB06ABDF0
+A7200AD28E443E23B34B61649B19D0F834ADDC3B18937807B43C2C258532AEBD615DD853
+38394F3581E6B8A98E86057F5288FCDE9DB3107126858CB9863A19C3B765E345C816E795
+053645E472FB47304CB57B536C683EA8E74DB0E8A286363DE7456BDFBC1C75FE6943DD01
+7F62A61F0C0DF19C1C5F53C483D82647023D9043ADB1B5247A532281BFE7B3C42BBAF6AE
+883EA3CE43CF5CE4CF51FEB90575CA233084C5A2BF4498A6EFDC9C8DBA1B3992C61DA729
+2E64D1214C28D0FFCF644BFFF1BB5F61852F04AEA89C1A888AF5B45F8E2F86B362EDD544
+7AAB5338207EEBE69461DE06538E63FF050DD92DAF297FB6365234306D1910D1D7D43F55
+38116B5634F5885F98343E5D6559298CE4D7F91FF569A1D0B34CCA2A8229A98A400F23B3
+8519190109BE258672BDEF4C1038FC0621D5003588C697ECACEF2A287D5BA465D95D330F
+050119D5273DE92A6C9F324E59579BA2A5A39FC845DA4F38CEF1A47DD185CBB82D559D14
+913F16D99D3086A733A48E5056667BB858F821609D27DB01A4BBD3D1B2959B679B4D1536
+B4A2E989FD94FD94DF7A401BB241EEA7E4F83FB6BEAAF4135A836D5A3D01D0A36D0C907D
+B9B8E57F11F22D1EEE3C041BFFC4DF6D004B1554FDA6CD542CF19F8F2E082AE2C0C1DCE6
+B0648C6759895783BA7C81550E94308A8E504963D76E56673FC2597077361F9545FB2537
+66737079EFFB2F30E8E62602E7E37F7048D3E391C18E3D44394351B235985E6EF2AF267C
+B92BCE81ED8EC8DB2E2D6A56BA310F01575482366A032B003EEB72B22F677AAD0EB9E2A9
+6EB9017ABAF963F8FD8EAE59EF0283DD7733052680E42AB23BD98D10682B29869E7EFC15
+C9D6570A610D0248D548AA7DA39FDE4A19B7B5D6131FF06AC674B622725BBA0A8E9B257E
+986EEB3773A57BBE0A96C2C7C899509292775680F72BF1A084123F6172D7C210F53C385D
+644A139333B4767CD6E3347572AD
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+{restore}if
\ No newline at end of file
diff --git a/contrib/groff/font/devps/generate/Makefile b/contrib/groff/font/devps/generate/Makefile
index 5916e6a..223ce2f 100644
--- a/contrib/groff/font/devps/generate/Makefile
+++ b/contrib/groff/font/devps/generate/Makefile
@@ -37,12 +37,12 @@ GREEKFONTS=SS
 TEXTFONTS=AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR HB HBI HI HR HNB HNBI \
   HNI HNR NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
 
-FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS)
+FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS) EURO
 
 DESC=$(srcdir)/../DESC
 AFMTODIT=afmtodit -d$(DESC)
 IFLAG=-i 50
-RFLAG=-i 0
+RFLAG=-i 0 -m
 NOLIGFLAG=-n
 TEXTENC=$(srcdir)/../text.enc
 EFLAG=-e $(TEXTENC)
@@ -196,6 +196,13 @@ S: symbol.afm
 ZDR: zapfdr.afm
 	$(AFMTODIT) -s $(RFLAG) zapfdr.afm $(srcdir)/dingbats.rmap $@
 
+# the map is just a dummy
+EURO: freeeuro.afm
+	$(AFMTODIT) $(RFLAG) freeeuro.afm symbolmap $@
+
+freeeuro.afm freeeuro.pfa: generate/freeeuro.sfd
+	pfaedit -script generate/sfdtopfa.pe generate/freeeuro.sfd
+
 symbol.afm: $(srcdir)/symbol.sed
 	-rm -f $@
 	sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
diff --git a/contrib/groff/font/devps/generate/freeeuro.sfd b/contrib/groff/font/devps/generate/freeeuro.sfd
new file mode 100644
index 0000000..d40e684
--- /dev/null
+++ b/contrib/groff/font/devps/generate/freeeuro.sfd
@@ -0,0 +1,610 @@
+SplineFontDB: 1.0
+FontName: FreeEuro
+FullName: FreeEuro
+FamilyName: FreeEuro
+Weight: Medium
+Copyright: Created by Werner Lemberg with PfaEdit 1.0 (http://pfaedit.sf.net); the serif shapes are based on the Omega fonts created by Yannis Haralambous.
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -100
+UnderlineWidth: 50
+Ascent: 800
+Descent: 200
+NeedsXUIDChange: 1
+FSType: 12
+PfmFamily: 65
+TTFWeight: 500
+TTFWidth: 5
+Panose: 3 0 6 3 0 0 0 0 0 0
+LineGap: 90
+VLineGap: 0
+
+Encoding: custom
+DisplaySize: -96
+AntiAlias: 1
+BeginChars: 256 16
+StartChar: Euro.symbol
+Encoding: 0 8364
+Width: 750
+Flags: MW
+HStem: -12 58<447 497> 250 57<55 124 195 580> 366 57<55 124 195 628> 627 58<447 497>
+Fore
+134 250 m 9
+ 32 250 l 17
+ 56 307 l 1
+ 125 307 l 1
+ 124 317 124 327 124 337 c 0
+ 124 346 124 356 125 366 c 1
+ 32 366 l 1
+ 56 423 l 1
+ 134 423 l 17
+ 165 555 294 685 473 685 c 0
+ 614 685 701 601 718 582 c 9
+ 694 523 l 17
+ 644 581 567 627 472 627 c 1
+ 334 627 230 534 195 423 c 1
+ 652 423 l 9
+ 628 366 l 25
+ 183 366 l 17
+ 182 356 182 346 182 337 c 0
+ 182 327 182 317 183 307 c 1
+ 604 307 l 9
+ 580 250 l 25
+ 195 250 l 17
+ 234 124 350 46 471 46 c 1
+ 568 46 641 90 694 150 c 9
+ 694 68 l 17
+ 639 23 562 -12 472 -12 c 1
+ 325 -12 177 83 134 250 c 9
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.symbol.bold
+Encoding: 1 8364
+Width: 750
+Flags: MW
+HStem: -12 87<473 507> 220 87<59 141 254 578> 366 87<59 141 254 634> 598 87<473 507>
+Fore
+254 220 m 9
+ 578 220 l 25
+ 612 307 l 17
+ 230 307 l 1
+ 228 316 228 325 228 334 c 0
+ 228 345 228 356 230 366 c 9
+ 634 366 l 25
+ 670 453 l 17
+ 254 453 l 1
+ 304 552 402 598 488 598 c 0
+ 596 598 662 535 688 504 c 9
+ 724 594 l 17
+ 640 668 552 685 488 685 c 0
+ 320 685 198 566 160 453 c 9
+ 60 453 l 25
+ 26 366 l 1
+ 142 366 l 1
+ 142 356 140 346 140 337 c 0
+ 140 327 142 317 142 307 c 1
+ 60 307 l 1
+ 26 220 l 1
+ 160 220 l 17
+ 206 100 316 -12 496 -12 c 1
+ 564 -12 640 17 688 52 c 9
+ 688 169 l 17
+ 642 116 576 75 490 75 c 0
+ 414 75 312 110 254 220 c 9
+EndSplineSet
+MinimumDistance: x4,-1 
+EndChar
+StartChar: Euro.symbol.slanted
+Encoding: 2 8364
+Width: 750
+Flags: HW
+HStem: -12 58<467 486> 250 57<120 187 248 633> 366 57<145 203 285 706> 627 58<596 621>
+Fore
+187 250 m 9
+ 85 250 l 17
+ 121 307 l 1
+ 190 307 l 1
+ 193 327 198 346 203 366 c 1
+ 110 366 l 1
+ 146 423 l 5
+ 224 423 l 17
+ 283 555 440 685 619 685 c 0
+ 760 685 829 601 842 582 c 9
+ 805 523 l 17
+ 767 581 700 627 605 627 c 1
+ 467 627 344 534 285 423 c 1
+ 742 423 l 9
+ 706 366 l 25
+ 261 366 l 17
+ 256 346 251 328 248 307 c 1
+ 669 307 l 9
+ 633 250 l 25
+ 248 250 l 17
+ 260 124 360 46 481 46 c 1
+ 578 46 660 90 726 150 c 9
+ 708 68 l 17
+ 644 23 559 -12 469 -12 c 1
+ 322 -12 195 83 187 250 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.symbol.bold.slanted
+Encoding: 3 8364
+Width: 750
+Flags: W
+HStem: -12 87<488 507> 220 87<125 207 301 625> 366 87<156 218 351 712> 598 87<614 636>
+Fore
+301 220 m 9
+ 625 220 l 25
+ 678 307 l 17
+ 295 307 l 1
+ 296 329 301 349 307 366 c 9
+ 712 366 l 25
+ 766 453 l 17
+ 351 453 l 1
+ 422 552 529 598 616 598 c 0
+ 724 598 776 535 796 504 c 9
+ 850 594 l 17
+ 782 668 698 685 634 685 c 0
+ 466 685 319 566 257 453 c 9
+ 157 453 l 25
+ 104 366 l 1
+ 219 366 l 1
+ 214 346 210 328 207 307 c 1
+ 126 307 l 1
+ 73 220 l 1
+ 207 220 l 17
+ 227 100 314 -12 494 -12 c 1
+ 561 -12 644 17 700 52 c 9
+ 724 169 l 17
+ 667 116 592 75 505 75 c 0
+ 430 75 335 110 301 220 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.serif
+Encoding: 4 8364
+Width: 741
+Flags: MW
+HStem: -14 44<435 463> 253 46<53 102 224 568> 369 46<53 104 224 618> 636 40<433 467>
+Fore
+224 253 m 1
+ 245 130 319 30 463 30 c 0
+ 555 30 625 68 689 131 c 1
+ 707 113 l 1
+ 651 30 532 -14 436 -14 c 0
+ 257 -14 138 91 109 253 c 1
+ 34 253 l 1
+ 54 299 l 1
+ 103 299 l 1
+ 102 308 102 319 102 331 c 0
+ 102 344 103 357 104 369 c 1
+ 34 369 l 1
+ 54 415 l 1
+ 111 415 l 1
+ 145 569 272 676 442 676 c 0
+ 537 676 653 631 707 549 c 1
+ 689 531 l 1
+ 624 594 543 636 451 636 c 0
+ 394 636 342 613 301 575 c 0
+ 256 534 234 476 224 415 c 1
+ 638 415 l 1
+ 618 369 l 1
+ 219 369 l 1
+ 218 356 218 342 218 329 c 0
+ 218 319 218 309 219 299 c 1
+ 588 299 l 1
+ 568 253 l 1
+ 224 253 l 1
+EndSplineSet
+MinimumDistance: x22,-1 
+EndChar
+StartChar: Euro.serif.bold
+Encoding: 5 8364
+Width: 800
+Flags: MW
+HStem: -19 48<486 510> 231 69<72 129 313 612> 368 69<72 131 312 669> 649 42<476 510>
+Fore
+142 231 m 1
+ 45 231 l 1
+ 73 300 l 1
+ 130 300 l 1
+ 129 310 129 321 129 332 c 0
+ 129 344 130 356 131 368 c 1
+ 45 368 l 1
+ 73 437 l 1
+ 143 437 l 1
+ 183 586 310 691 483 691 c 0
+ 611 691 689 628 762 545 c 1
+ 732 520 l 1
+ 649 613 572 649 494 649 c 0
+ 377 649 328 560 312 437 c 1
+ 697 437 l 1
+ 669 368 l 1
+ 307 368 l 1
+ 306 359 306 348 306 336 c 0
+ 306 325 306 312 307 300 c 1
+ 640 300 l 1
+ 612 231 l 1
+ 313 231 l 1
+ 319 190 330 149 349 116 c 0
+ 391 44 470 29 501 29 c 0
+ 579 29 654 59 737 152 c 1
+ 767 127 l 1
+ 694 44 616 -19 488 -19 c 0
+ 300 -19 181 89 142 231 c 1
+EndSplineSet
+MinimumDistance: x16,-1 
+EndChar
+StartChar: Euro.serif.italic
+Encoding: 6 8364
+Width: 734
+Flags: W
+HStem: -18 45<403 426> 253 46<85 140 257 565> 369 46<117 161 289 636> 630 36<544 567>
+Fore
+143 299 m 1
+ 147 322 152 346 161 369 c 1
+ 98 369 l 1
+ 118 415 l 1
+ 179 415 l 1
+ 243 551 380 666 546 666 c 0
+ 694 666 734 560 745 516 c 1
+ 720 502 l 1
+ 700 549 668 630 554 630 c 0
+ 425 630 336 528 289 415 c 1
+ 656 415 l 1
+ 636 369 l 1
+ 272 369 l 1
+ 266 347 261 323 257 299 c 1
+ 585 299 l 1
+ 565 253 l 1
+ 252 253 l 1
+ 248 118 301 27 426 27 c 0
+ 539 27 609 98 657 145 c 1
+ 674 131 l 1
+ 637 87 548 -18 402 -18 c 0
+ 286 -18 140 52 140 253 c 1
+ 66 253 l 1
+ 86 299 l 1
+ 143 299 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.serif.bold.italic
+Encoding: 7 8364
+Width: 800
+Flags: W
+HStem: -19 48<400 427> 231 69<60 114 295 584> 368 69<92 135 332 673> 649 42<544 586>
+Fore
+114 231 m 1
+ 17 231 l 1
+ 61 300 l 1
+ 118 300 l 1
+ 121 324 128 347 135 368 c 1
+ 49 368 l 1
+ 93 437 l 1
+ 163 437 l 1
+ 239 586 390 691 563 691 c 0
+ 691 691 754 628 808 545 c 1
+ 772 520 l 1
+ 711 613 642 649 564 649 c 0
+ 447 649 377 560 332 437 c 1
+ 717 437 l 1
+ 673 368 l 1
+ 311 368 l 1
+ 305 349 299 323 295 300 c 1
+ 628 300 l 1
+ 584 231 l 1
+ 285 231 l 1
+ 281 190 282 149 293 116 c 0
+ 318 44 394 29 425 29 c 0
+ 503 29 585 59 690 152 c 1
+ 714 127 l 1
+ 621 44 529 -19 401 -19 c 0
+ 213 -19 119 89 114 231 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif
+Encoding: 8 8364
+Width: 756
+Flags: MW
+HStem: -23 79<485 519> 225 84<68 156 263 585> 378 84<68 156 264 643> 630 79<469 503>
+Fore
+263 225 m 9
+ 585 225 l 25
+ 617 309 l 17
+ 246 309 l 1
+ 245 320 245 332 245 344 c 0
+ 245 356 245 369 246 378 c 9
+ 643 378 l 25
+ 675 462 l 17
+ 264 462 l 1
+ 299 565 386 630 488 630 c 0
+ 598 630 659 578 696 520 c 9
+ 731 614 l 17
+ 655 692 560 709 494 709 c 0
+ 296 709 199 573 172 462 c 9
+ 69 462 l 25
+ 38 378 l 1
+ 157 378 l 1
+ 156 371 156 360 156 350 c 0
+ 156 335 156 321 157 309 c 1
+ 69 309 l 1
+ 38 225 l 1
+ 171 225 l 17
+ 207 90 318 -23 492 -23 c 1
+ 560 -23 631 -12 697 33 c 9
+ 697 136 l 17
+ 620 72 579 56 494 56 c 0
+ 389 56 300 118 263 225 c 9
+EndSplineSet
+MinimumDistance: x3,-1 
+EndChar
+StartChar: Euro.sansserif.bold
+Encoding: 9 8364
+Width: 796
+Flags: MW
+HStem: -22 123<531 565> 218 100<67 141 310 619> 372 98<68 141 310 669> 587 123<515 565>
+Fore
+724 540 m 1
+ 665 577 617 587 537 587 c 0
+ 489 587 364 571 310 470 c 1
+ 701 470 l 9
+ 669 372 l 25
+ 284 372 l 17
+ 284 362 283 354 283 345 c 0
+ 283 337 284 329 284 318 c 1
+ 651 318 l 9
+ 619 218 l 25
+ 310 218 l 17
+ 336 168 422 101 543 101 c 0
+ 646 101 686 125 716 144 c 9
+ 716 6 l 17
+ 682 -7 623 -22 540 -22 c 1
+ 332 -22 206 86 161 218 c 9
+ 36 218 l 1
+ 68 318 l 1
+ 141 318 l 1
+ 140 329 139 338 139 348 c 0
+ 139 355 140 363 141 372 c 1
+ 36 372 l 1
+ 69 470 l 25
+ 161 470 l 17
+ 192 555 283 710 544 710 c 0
+ 630 710 703 692 763 660 c 0
+ 724 540 l 1
+EndSplineSet
+MinimumDistance: x5,-1 
+EndChar
+StartChar: Euro.sansserif.slanted
+Encoding: 10 8364
+Width: 756
+Flags: WO
+HStem: -23 79<485 519> 225 84<134 219 312 633> 378 84<166 237 362 723> 630 79<620 647>
+Fore
+311 225 m 9
+ 633 225 l 25
+ 683 309 l 17
+ 312 309 l 1
+ 315 331 321 359 326 378 c 13
+ 723 378 l 25
+ 773 462 l 17
+ 362 462 l 1
+ 419 565 520 630 622 630 c 0
+ 732 630 782 578 807 520 c 9
+ 862 614 l 17
+ 802 692 711 709 645 709 c 0
+ 447 709 321 573 270 462 c 9
+ 167 462 l 25
+ 118 378 l 1
+ 237 378 l 1
+ 233 360 225 329 223 309 c 1
+ 135 309 l 1
+ 86 225 l 1
+ 219 225 l 17
+ 226 90 313 -23 487 -23 c 1
+ 555 -23 628 -12 704 33 c 9
+ 726 136 l 17
+ 635 72 591 56 506 56 c 0
+ 401 56 325 118 311 225 c 9
+EndSplineSet
+EndChar
+StartChar: Euro.sansserif.bold.slanted
+Encoding: 11 8364
+Width: 796
+Flags: HW
+HStem: -22 123<534 567> 218 100<135 207 356 666> 372 98<168 220 410 749> 587 123<660 697>
+Fore
+839 540 m 1
+ 788 577 742 587 662 587 c 0
+ 614 587 485 571 410 470 c 1
+ 801 470 l 9
+ 748 372 l 25
+ 363 372 l 17
+ 358 353 355 341 352 318 c 1
+ 719 318 l 9
+ 665 218 l 25
+ 356 218 l 17
+ 372 168 443 101 564 101 c 0
+ 667 101 713 125 747 144 c 9
+ 717 6 l 17
+ 681 -7 618 -22 535 -22 c 1
+ 327 -22 224 86 207 218 c 9
+ 82 218 l 1
+ 136 318 l 1
+ 209 318 l 1
+ 211 339 213 354 220 372 c 1
+ 115 372 l 1
+ 169 470 l 25
+ 261 470 l 17
+ 310 555 434 710 695 710 c 0
+ 781 710 850 692 903 660 c 0
+ 839 540 l 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono
+Encoding: 12 8364
+Width: 600
+Flags: MW
+HStem: -16 41<314 332> 217 37<26 63 106 385> 314 37<26 63 106 430> 535 41<314 332>
+Fore
+322 576 m 0
+ 196 576 80 480 65 351 c 1
+ 33 351 l 2
+ 16 351 11 346 11 333 c 0
+ 11 319 17 314 33 314 c 2
+ 63 314 l 1
+ 63 254 l 1
+ 33 254 l 2
+ 17 254 11 249 11 236 c 0
+ 11 222 17 217 33 217 c 2
+ 65 217 l 1
+ 80 89 196 -16 322 -16 c 0
+ 386 -16 446 9 496 55 c 0
+ 522 79 534 96 534 106 c 0
+ 534 117 526 125 514 125 c 0
+ 507 125 503 123 496 115 c 0
+ 442 51 391 25 322 25 c 0
+ 216 25 124 107 106 217 c 1
+ 383 217 l 2
+ 398 217 404 222 404 236 c 0
+ 404 249 399 254 383 254 c 2
+ 104 254 l 1
+ 104 314 l 1
+ 428 314 l 2
+ 444 314 450 319 450 333 c 0
+ 450 346 444 351 428 351 c 2
+ 106 351 l 1
+ 124 460 216 535 322 535 c 0
+ 391 535 442 509 496 445 c 0
+ 503 437 507 435 514 435 c 0
+ 526 435 534 443 534 454 c 0
+ 534 464 522 481 496 505 c 0
+ 446 551 386 576 322 576 c 0
+EndSplineSet
+MinimumDistance: x23,-1 x22,25 x22,23 x21,18 x21,20 x6,9 x6,7 x5,2 x5,4 
+EndChar
+StartChar: Euro.mono.bold
+Encoding: 13 8364
+Width: 600
+Flags: W
+HStem: -14 100<307.635 341> 205 56<22.3275 59 174 388> 303 56<22.3275 59 173 426> 497 100<323 341>
+Fore
+173 359 m 1
+ 424 359 l 2
+ 442 359 452 349 452 331 c 0
+ 452 313 442 303 424 303 c 2
+ 169 303 l 1
+ 169 261 l 1
+ 386 261 l 2
+ 404 261 414 251 414 233 c 0
+ 414 215 404 205 386 205 c 2
+ 174 205 l 1
+ 190 130 247 86 329 86 c 0
+ 382 86 429 98 461 143 c 0
+ 469 154 481 159 492 159 c 0
+ 517 159 538 136 538 109 c 0
+ 538 86 521 60 490 36 c 0
+ 451 5 389 -14 325 -14 c 0
+ 187 -14 84 72 62 205 c 1
+ 31 205 l 2
+ 14 205 4 215 4 233 c 0
+ 4 251 13 261 31 261 c 2
+ 59 261 l 1
+ 59 303 l 1
+ 31 303 l 2
+ 14 303 4 313 4 331 c 0
+ 4 349 13 359 31 359 c 2
+ 62 359 l 1
+ 78 498 187 597 325 597 c 0
+ 389 597 451 582 490 551 c 1
+ 521 527 539 505 539 478 c 0
+ 539 455 517 426 492 426 c 1
+ 481 426 469 431 461 442 c 0
+ 431 482 394 497 329 497 c 0
+ 247 497 188 444 173 359 c 1
+EndSplineSet
+EndChar
+StartChar: Euro.mono.slanted
+Encoding: 14 8364
+Width: 600
+Flags: MW
+HStem: -16 41<316 334> 217 37<78 112 158 438> 314 37<98 130 181 504> 535 41<428 457>
+Fore
+541 125 m 0
+ 534 125 530 123 521 115 c 0
+ 453 51 397 25 328 25 c 0
+ 210 25 148 121 153 217 c 1
+ 430 217 l 2
+ 445 217 455 225 455 241 c 0
+ 455 250 451 254 437 254 c 2
+ 158 254 l 1
+ 171 314 l 1
+ 496 314 l 2
+ 520 314 522 333 522 339 c 0
+ 522 348 518 351 504 351 c 2
+ 181 351 l 1
+ 222 460 330 535 436 535 c 0
+ 505 535 551 509 591 445 c 0
+ 596 437 600 435 607 435 c 0
+ 619 435 631 443 631 457 c 0
+ 631 467 623 483 604 505 c 0
+ 564 551 509 576 445 576 c 0
+ 319 576 183 480 140 351 c 1
+ 108 351 l 2
+ 84 351 81 335 81 329 c 0
+ 81 317 85 314 100 314 c 2
+ 130 314 l 1
+ 117 254 l 1
+ 87 254 l 2
+ 63 254 61 238 61 232 c 0
+ 61 220 65 217 80 217 c 2
+ 112 217 l 1
+ 99 84 198 -16 319 -16 c 0
+ 383 -16 448 9 508 55 c 0
+ 538 78 557 96 557 108 c 0
+ 557 123 547 125 541 125 c 0
+EndSplineSet
+MinimumDistance: x8,-1 
+EndChar
+StartChar: Euro.mono.bold.slanted
+Encoding: 15 8364
+Width: 600
+Flags: W
+HStem: -14 100<322 348> 205 56<85 107 226 438> 303 56<101 124 250 495> 497 100<429 455>
+Fore
+250 359 m 1
+ 501 359 l 2
+ 516 359 524 352 524 339 c 0
+ 524 317 509 303 489 303 c 2
+ 234 303 l 1
+ 226 261 l 1
+ 443 261 l 2
+ 458 261 465 254 465 242 c 0
+ 465 219 450 205 431 205 c 2
+ 219 205 l 1
+ 219 130 266 86 348 86 c 0
+ 403 86 457 103 492 143 c 0
+ 501 153 516 159 527 159 c 0
+ 548 159 563 142 563 120 c 0
+ 563 89 536 61 499 36 c 0
+ 453 5 387 -14 323 -14 c 0
+ 176 -14 100 80 107 205 c 1
+ 76 205 l 2
+ 62 205 54 212 54 225 c 0
+ 54 247 68 261 88 261 c 2
+ 116 261 l 1
+ 124 303 l 1
+ 96 303 l 2
+ 82 303 74 310 74 323 c 0
+ 74 346 89 359 108 359 c 2
+ 139 359 l 1
+ 185 498 315 597 453 597 c 0
+ 517 597 576 582 608 551 c 1
+ 630 530 643 511 643 489 c 0
+ 643 459 612 426 584 426 c 1
+ 573 426 560 433 556 442 c 0
+ 535 484 497 497 436 497 c 0
+ 354 497 283 444 250 359 c 1
+EndSplineSet
+EndChar
+EndChars
+EndSplineFont
diff --git a/contrib/groff/font/devps/generate/sfdtopfa.pe b/contrib/groff/font/devps/generate/sfdtopfa.pe
new file mode 100644
index 0000000..b495458
--- /dev/null
+++ b/contrib/groff/font/devps/generate/sfdtopfa.pe
@@ -0,0 +1,9 @@
+# sfdtopfa.pe
+#
+# This script generates a PFA file from the master SFD using pfaedit.
+#
+# The argument is the name of the SFD without extension;
+# the PFA file is created in the current directory.
+
+Open($1:r + ".sfd");
+Generate(($1:t):r + ".pfa");
diff --git a/contrib/groff/font/devps/generate/symbolchars b/contrib/groff/font/devps/generate/symbolchars
index 418cced..e43bb2c 100644
--- a/contrib/groff/font/devps/generate/symbolchars
+++ b/contrib/groff/font/devps/generate/symbolchars
@@ -7,6 +7,7 @@ plusminus +-
 equal eq
 divide di
 multiply mu
+logicalnot no
 arrowup arrowverttp
 arrowdown arrowvertbt
 Alpha *A
@@ -38,6 +39,7 @@ beta *b
 chi *x
 delta *d
 epsilon *e
+uni03F5 +e
 eta *y
 gamma *g
 iota *i
diff --git a/contrib/groff/font/devps/generate/textmap b/contrib/groff/font/devps/generate/textmap
index 4fdd08b..70d322f 100644
--- a/contrib/groff/font/devps/generate/textmap
+++ b/contrib/groff/font/devps/generate/textmap
@@ -93,6 +93,7 @@ Ugrave `U
 Yacute 'Y
 Ydieresis :Y
 Zcaron vZ
+a14 rh
 aacute 'a
 acircumflex ^a
 acute aa
@@ -128,7 +129,6 @@ backslash \
 backslash rs
 bar ba
 bar |
-bell bs
 braceleft lC
 braceleft {
 braceright rC
@@ -176,7 +176,6 @@ emdash em
 emptyset es
 endash en
 equal =
-equalmath eq
 equivalence ==
 eth Sd
 exclam !
@@ -187,6 +186,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -199,9 +199,6 @@ guillemotleft Fo
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
-handleft lh
-handright rh
-hbar -h
 hungarumlaut a"
 hyphen -
 hyphen hy
@@ -212,24 +209,22 @@ igrave `i
 ij ij
 infinity if
 integral is
+integral integral
 intersection ca
 less <
 lessequal <=
 logicaland AN
-logicalnot no
+logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -241,6 +236,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -258,7 +254,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -284,17 +279,17 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
-similarequal ~=
 six 6
 slash /
 slash sl
-square sq
 sterling Po
 therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -307,6 +302,14 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni210F -h
+uni210F hbar
+uni2213 -+
+uni2243 |=
+uni2262 ne
+uni2285 nc
+uni25A1 sq
+uni261C lh
 union cu
 universal fa
 weierstrass wp
@@ -345,6 +348,7 @@ bracketrighttp bracketrighttp
 bracketrightbt bracketrightbt
 bracketrightex bracketrightex
 radical sr
+radical sqrt
 radicalex radicalex
 approxequal ~=
 bracketlefttp lc
diff --git a/contrib/groff/font/devps/prologue.ps b/contrib/groff/font/devps/prologue.ps
index 41adab2..a0cdb60 100644
--- a/contrib/groff/font/devps/prologue.ps
+++ b/contrib/groff/font/devps/prologue.ps
@@ -156,9 +156,12 @@
 
 % c m y k Fk -
 
-/Fk {
-	setcmykcolor fill
-} bind def
+/setcmykcolor where {
+	pop
+	/Fk {
+		setcmykcolor fill
+	} bind def
+} if
 
 % g Fg -
 
@@ -173,7 +176,10 @@
 /LW /setlinewidth load def
 
 /Cr /setrgbcolor load def
-/Ck /setcmykcolor load def
+/setcmykcolor where {
+	pop
+	/Ck /setcmykcolor load def
+} if
 /Cg /setgray load def
 
 % new_font_name encoding_vector old_font_name RE -
@@ -229,6 +235,11 @@
 	/CNT countdictstack def
 	userdict begin
 	/showpage {} def
+	%
+	%  Any included setpagedevice should be ignored.
+	%  See: http://www.w-beer.de/doc/ps/.
+	%
+	/setpagedevice {} def
 } bind def
 
 /PEND {
diff --git a/contrib/groff/font/devps/symbolmap b/contrib/groff/font/devps/symbolmap
index 6988c72..f3b2831 100644
--- a/contrib/groff/font/devps/symbolmap
+++ b/contrib/groff/font/devps/symbolmap
@@ -96,6 +96,7 @@ Ugrave `U
 Yacute 'Y
 Ydieresis :Y
 Zcaron vZ
+a14 rh
 aacute 'a
 acircumflex ^a
 acute aa
@@ -131,7 +132,6 @@ backslash \
 backslash rs
 bar ba
 bar |
-bell bs
 braceleft lC
 braceleft {
 braceright rC
@@ -179,7 +179,6 @@ emdash em
 emptyset es
 endash en
 equal =
-equalmath eq
 equivalence ==
 eth Sd
 exclam !
@@ -190,6 +189,7 @@ ffi Fi
 ffl Fl
 fi fi
 five 5
+fiveeighths 58
 fl fl
 florin Fn
 four 4
@@ -202,9 +202,6 @@ guillemotleft Fo
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
-handleft lh
-handright rh
-hbar -h
 hungarumlaut a"
 hyphen -
 hyphen hy
@@ -215,24 +212,22 @@ igrave `i
 ij ij
 infinity if
 integral is
+integral integral
 intersection ca
 less <
 lessequal <=
 logicaland AN
-logicalnot no
+logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
 macron a-
 minus \-
-minusplus -+
 minute fm
 mu mc
 nine 9
 notelement nm
 notequal !=
-notequivalence ne
-notpropersuperset nc
 notsubset nb
 ntilde ~n
 numbersign #
@@ -244,6 +239,7 @@ oe oe
 ogonek ho
 ograve `o
 one 1
+oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
@@ -261,7 +257,6 @@ periodcentered pc
 perthousand %0
 perpendicular pp
 plus +
-plusmath pl
 propersubset sb
 propersuperset sp
 proportional pt
@@ -287,17 +282,17 @@ second sd
 section sc
 semicolon ;
 seven 7
+seveneighths 78
 similar ap
-similarequal ~=
 six 6
 slash /
 slash sl
-square sq
 sterling Po
 therefore 3d
 therefore tf
 thorn Tp
 three 3
+threeeighths 38
 threequarters 34
 threesuperior S3
 tilde a~
@@ -310,6 +305,14 @@ ucircumflex ^u
 udieresis :u
 ugrave `u
 underscore _
+uni210F -h
+uni210F hbar
+uni2213 -+
+uni2243 |=
+uni2262 ne
+uni2285 nc
+uni25A1 sq
+uni261C lh
 union cu
 universal fa
 weierstrass wp
@@ -348,6 +351,7 @@ bracketrighttp bracketrighttp
 bracketrightbt bracketrightbt
 bracketrightex bracketrightex
 radical sr
+radical sqrt
 radicalex radicalex
 approxequal ~=
 bracketlefttp lc
@@ -377,6 +381,7 @@ plusminus +-
 equal eq
 divide di
 multiply mu
+logicalnot no
 arrowup arrowverttp
 arrowdown arrowvertbt
 Alpha *A
@@ -408,6 +413,7 @@ beta *b
 chi *x
 delta *d
 epsilon *e
+uni03F5 +e
 eta *y
 gamma *g
 iota *i
diff --git a/contrib/groff/font/devutf8/NOTES b/contrib/groff/font/devutf8/NOTES
index af64ff4..0e857e8 100644
--- a/contrib/groff/font/devutf8/NOTES
+++ b/contrib/groff/font/devutf8/NOTES
@@ -9,11 +9,6 @@ unmapped:
 Character 0x002D has not been given a name because its Unicode name
 "HYPHEN-MINUS" is so ambiguous that it's unusable for serious typographic use.
 
-The following, mentioned in the original troff manual, are only approximate:
-
-  \(lk    middle part of big left curly brace
-  \(rk    middle part of big right curly brace
-
 \(wp has been mapped to 0x2118, because according to unicode.org's
 NamesList-3.0.0.txt, U+2118 "SCRIPT CAPITAL P" is really a Weierstrass p,
 neither SCRIPT not CAPITAL.
@@ -24,12 +19,6 @@ within the TeX system).
 
 space	24	0	0x0020
 
-The following lines could be added, to define names which are known to e.g.
-"devdvi" but are not known to "devps".
-
-<<	24	0	0x226A
->>	24	0	0x226B
-
 "devps" maps \(a~ and ~ to asciitilde, which is equivalent to 0x02DC, but
 this glyph is just too small.  We map them to 0x007E instead.
 
@@ -45,9 +34,6 @@ We map it to 0x03A9.
 "devps" maps *D to Delta, which is equivalent to either 0x2206 or 0x0394.
 We map it to 0x0394.
 
-"devps" maps CR to carriagereturn, which is equivalent to 0x21B5.  We map
-it to 0x240D instead.
-
 
 Using unnamed characters
 ------------------------
diff --git a/contrib/groff/font/devutf8/R.proto b/contrib/groff/font/devutf8/R.proto
index 423bc6a..5e46622 100644
--- a/contrib/groff/font/devutf8/R.proto
+++ b/contrib/groff/font/devutf8/R.proto
@@ -2,6 +2,39 @@ name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0x0000
+---	24	0	0x0001
+---	24	0	0x0002
+---	24	0	0x0003
+---	24	0	0x0004
+---	24	0	0x0005
+---	24	0	0x0006
+---	24	0	0x0007
+---	24	0	0x0008
+---	24	0	0x0009
+---	24	0	0x000A
+---	24	0	0x000B
+---	24	0	0x000C
+---	24	0	0x000D
+---	24	0	0x000E
+---	24	0	0x000F
+---	24	0	0x0010
+---	24	0	0x0011
+---	24	0	0x0012
+---	24	0	0x0013
+---	24	0	0x0014
+---	24	0	0x0015
+---	24	0	0x0016
+---	24	0	0x0017
+---	24	0	0x0018
+---	24	0	0x0019
+---	24	0	0x001A
+---	24	0	0x001B
+---	24	0	0x001C
+---	24	0	0x001D
+---	24	0	0x001E
+---	24	0	0x001F
+---	24	0	0x0020
 !	24	0	0x0021
 "	24	0	0x0022
 dq	"
@@ -117,6 +150,40 @@ rC	24	0	0x007D
 a~	24	0	0x007E
 ~	"
 ti	"
+---	24	0	0x007F
+---	24	0	0x0080
+---	24	0	0x0081
+---	24	0	0x0082
+---	24	0	0x0083
+---	24	0	0x0084
+---	24	0	0x0085
+---	24	0	0x0086
+---	24	0	0x0087
+---	24	0	0x0088
+---	24	0	0x0089
+---	24	0	0x008A
+---	24	0	0x008B
+---	24	0	0x008C
+---	24	0	0x008D
+---	24	0	0x008E
+---	24	0	0x008F
+---	24	0	0x0090
+---	24	0	0x0091
+---	24	0	0x0092
+---	24	0	0x0093
+---	24	0	0x0094
+---	24	0	0x0095
+---	24	0	0x0096
+---	24	0	0x0097
+---	24	0	0x0098
+---	24	0	0x0099
+---	24	0	0x009A
+---	24	0	0x009B
+---	24	0	0x009C
+---	24	0	0x009D
+---	24	0	0x009E
+---	24	0	0x009F
+---	24	0	0x00A0
 r!	24	0	0x00A1
 ct	24	0	0x00A2
 Po	24	0	0x00A3
@@ -129,7 +196,8 @@ co	24	0	0x00A9
 Of	24	0	0x00AA
 Fo	24	0	0x00AB
 no	24	0	0x00AC
-shc	24	0	0x00AD
+tno	"
+---	24	0	0x00AD
 rg	24	0	0x00AE
 a-	24	0	0x00AF
 de	24	0	0x00B0
@@ -216,7 +284,11 @@ tdi	"
 'y	24	0	0x00FD
 Tp	24	0	0x00FE
 :y	24	0	0x00FF
+'C	24	0	0x0106
+'c	24	0	0x0107
 .i	24	0	0x0131
+IJ	24	0	0x0132
+ij	24	0	0x0133
 /L	24	0	0x0141
 /l	24	0	0x0142
 OE	24	0	0x0152
@@ -278,13 +350,14 @@ ts	24	0	0x03C2
 *s	24	0	0x03C3
 *t	24	0	0x03C4
 *u	24	0	0x03C5
-*f	24	0	0x03C6
++f	24	0	0x03C6
 *x	24	0	0x03C7
 *q	24	0	0x03C8
 *w	24	0	0x03C9
 +h	24	0	0x03D1
-+f	24	0	0x03D5
+*f	24	0	0x03D5
 +p	24	0	0x03D6
++e	24	0	0x03F5
 -	24	0	0x2010
 hy	"
 en	24	0	0x2013
@@ -309,21 +382,30 @@ rn	24	0	0x203E
 f/	24	0	0x2044
 eu	24	0	0x20AC
 Eu	"
+-h	24	0	0x210F
+hbar	"
 Im	24	0	0x2111
 wp	24	0	0x2118
 Re	24	0	0x211C
 tm	24	0	0x2122
 Ah	24	0	0x2135
+18	24	0	0x215B
+38	24	0	0x215C
+58	24	0	0x215D
+78	24	0	0x215E
 <-	24	0	0x2190
 ua	24	0	0x2191
 ->	24	0	0x2192
 da	24	0	0x2193
 <>	24	0	0x2194
+va	24	0	0x2195
+CR	24	0	0x21B5
 lA	24	0	0x21D0
 uA	24	0	0x21D1
 rA	24	0	0x21D2
 dA	24	0	0x21D3
 hA	24	0	0x21D4
+vA	24	0	0x21D5
 fa	24	0	0x2200
 pd	24	0	0x2202
 te	24	0	0x2203
@@ -336,8 +418,10 @@ product	24	0	0x220F
 sum	24	0	0x2211
 \-	24	0	0x2212
 mi	"
+-+	24	0	0x2213
 **	24	0	0x2217
 sr	24	0	0x221A
+sqrt	"
 pt	24	0	0x221D
 if	24	0	0x221E
 /_	24	0	0x2220
@@ -346,20 +430,25 @@ OR	24	0	0x2228
 ca	24	0	0x2229
 cu	24	0	0x222A
 is	24	0	0x222B
+integral	"
 tf	24	0	0x2234
 3d	"
-ti	24	0	0x223C
-ap	"
+ap	24	0	0x223C
+|=	24	0	0x2243
 =~	24	0	0x2245
 ~~	24	0	0x2248
 ~=	"
 !=	24	0	0x2260
 ==	24	0	0x2261
+ne	24	0	0x2262
 <=	24	0	0x2264
 >=	24	0	0x2265
+<<	24	0	0x226A
+>>	24	0	0x226B
 sb	24	0	0x2282
 sp	24	0	0x2283
 nb	24	0	0x2284
+nc	24	0	0x2285
 ib	24	0	0x2286
 ip	24	0	0x2287
 c+	24	0	0x2295
@@ -370,27 +459,48 @@ lc	24	0	0x2308
 rc	24	0	0x2309
 lf	24	0	0x230A
 rf	24	0	0x230B
-la	24	0	0x2329
-ra	24	0	0x232A
-CR	24	0	0x240D
-an	24	0	0x2500
+parenlefttp	24	0	0x239B
+parenleftex	24	0	0x239C
+parenleftbt	24	0	0x239D
+parenrighttp	24	0	0x239E
+parenrightex	24	0	0x239F
+parenrightbt	24	0	0x23A0
+bracketlefttp	24	0	0x23A1
+bracketleftex	24	0	0x23A2
+bracketleftbt	24	0	0x23A3
+bracketrighttp	24	0	0x23A4
+bracketrightex	24	0	0x23A5
+bracketrightbt	24	0	0x23A6
+lt	24	0	0x23A7
+bracelefttp	"
+lk	24	0	0x23A8
+braceleftmid	"
+lb	24	0	0x23A9
+braceleftbt	"
+bv	24	0	0x23AA
+braceex	"
+braceleftex	"
+bracerightex	"
+rt	24	0	0x23AB
+bracerighttp	"
+rk	24	0	0x23AC
+bracerightmid	"
+rb	24	0	0x23AD
+bracerightbt	"
+an	24	0	0x23AF
 br	24	0	0x2502
-bv	"
-rk	24	0	0x251D
-lk	24	0	0x2525
-lt	24	0	0x256D
-rt	24	0	0x256E
-rb	24	0	0x256F
-lb	24	0	0x2570
 sq	24	0	0x25A1
 lz	24	0	0x25CA
-ci	24	0	0x25EF
+ci	24	0	0x25CB
 lh	24	0	0x261C
 rh	24	0	0x261E
 SP	24	0	0x2660
 CL	24	0	0x2663
 HE	24	0	0x2665
 DI	24	0	0x2666
+OK	24	0	0x2713
+la	24	0	0x27E8
+ra	24	0	0x27E9
 ff	24	0	0xFB00
 fi	24	0	0xFB01
 fl	24	0	0xFB02
diff --git a/contrib/groff/man/groff.man b/contrib/groff/man/groff.man
index 1e9128d..8238717 100644
--- a/contrib/groff/man/groff.man
+++ b/contrib/groff/man/groff.man
@@ -2,11 +2,11 @@
 .ig
 groff.man
 
-Last update: 29 June 2002
+Last update: 13 Feb 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -1329,6 +1329,13 @@ If
 .I N
 is zero disable colors, otherwise enable them.
 .
+.REQ .composite from to
+Map glyph name
+.I from
+to glyph name
+.I to
+while constructing a composite glyph name.
+.
 .REQ .continue
 Finish the current iteration of a while loop.
 .
@@ -1543,6 +1550,19 @@ name to short
 name on position
 .IR n .
 .
+.REQ .fschar f c anything
+Define fallback character
+.I c
+for font
+.I f
+as string
+.IR anything .
+.
+.REQ .fspecial font
+Reset list of special fonts for
+.I font
+to be empty.
+.
 .REQ .fspecial font s1 s2 .\|.\|.\&
 When the current font is
 .IR font ,
@@ -1704,6 +1724,10 @@ If
 .I n
 is zero, disable line-tabs mode, otherwise enable it.
 .
+.REQ .lf N
+Set input line number to
+.IR N .
+.
 .REQ .lf N file
 Set input line number to
 .I N
@@ -1939,6 +1963,14 @@ Read insertion.
 .REQ .return
 Return from a macro.
 .
+.REQ .rfschar f c1 c2 .\|.\|.\&
+Remove the definitions of characters
+.IR c1 ,
+.IR c2 ,
+.I .\|.\|.\&
+for font
+.IR f .
+.
 .REQ .rj n
 Right justify the next
 .I n
@@ -1973,6 +2005,12 @@ Return
 to marked vertical place (default scaling indicator\~\c
 .scaleindicator v ).
 .
+.REQ .schar c anything
+Define global fallback character
+.I c
+as string
+.IR anything .
+.
 .REQ .shc
 Reset soft hyphen character to
 .esc (hy .
@@ -2007,6 +2045,9 @@ up or down according to sign of
 (default scaling indicator\~\c
 .scaleindicator v ).
 .
+.REQ .special
+Reset global list of special fonts to be empty.
+.
 .REQ .special s1 s2 .\|.\|.\&
 Fonts
 .IR s1 ,
@@ -2509,9 +2550,15 @@ see section
 .BR "Special Characters" .
 .
 .ESC[] "" name
-The named character with arbitrary length name
+The named character (or rather glyph) with arbitrary length name
 .IR name .
 .
+.ESC[] "" "comp1 comp2 .\|.\|."
+A composite glyph with components
+.IR comp1 ,
+.IR comp2 ,
+.I .\|.\|.
+.
 .\" --------- alphabetical escapes ---------
 .
 .ESC a
@@ -3023,6 +3070,10 @@ Text base-line high-water mark on current page or diversion.
 .REG .H
 Available horizontal resolution in basic units.
 .
+.REG .height
+The current font height as set with
+.request \[rs]H .
+.
 .REG .hla
 The current hyphenation language as set by the
 .B .hla
@@ -3106,6 +3157,9 @@ Current page offset.
 .REG .p
 Current page length.
 .
+.REG .pe
+1\~during page ejection, 0\~otherwise.
+.
 .REG .pn
 The number of the next page: either the value set by a
 .request pn
@@ -3126,6 +3180,10 @@ The number of lines to be right-justified as set by the rj request.
 .REG .s
 Current point size as a decimal fraction.
 .
+.REG .slant
+The slant of the current font as set with
+.request \[rs]S .
+.
 .REG .sr
 The last requested pointsize in points as a decimal fraction
 (string-valued).
@@ -3366,7 +3424,7 @@ be reproduced, and say which version of groff you are using.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/contrib/groff/man/groff_char.man b/contrib/groff/man/groff_char.man
index be73941..ed078e5 100644
--- a/contrib/groff/man/groff_char.man
+++ b/contrib/groff/man/groff_char.man
@@ -1,6 +1,6 @@
 .TH GROFF_CHAR @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
-groff_char \- groff character names
+groff_char \- groff glyph names
 .SH DESCRIPTION
 .\" The lines above were designed to satisfy `apropos'.
 .
@@ -17,9 +17,9 @@ groff_char(7)
 This file is part of groff (GNU roff).
 
 File position: <groff_src_top>/man/groff_char.man
-Last update: 20 July 2002
+Last update: 24 Feb 2003
 
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 written by Werner Lemberg <wl@gnu.org>
 with additions by Bernd Warken <bwarken@mayn.de>
 
@@ -49,185 +49,356 @@ FDL in the main directory of the groff source package.
 .
 .\" groff
 .if !\n(.g .ig
-.	tr \[aq]\[aq]
-.	if !c\[aq] \
-.		ds aq \'
-.	\" This is very special.  The standard devdvi fonts don't have a
-.	\" real `aq' glyph; it is defined with .char to be ' instead.
-.	\" The .tr request below in the definition of the C macro maps
-.	\" the apostrophe ' onto the `aq' glyph which would cause a
-.	\" recursive loop.  gtroff prevents this within the .char
-.	\" request, trying to access glyph `aq' directly from the font.
-.	\" Consequently, we get a warning, and nothing is printed.
-.	\"
-.	\" The following line prevents this.
-.	if '\*[.T]'dvi' \
-.		if !r ECFONTS \
-.			ds aq \'
-.	\" The same is true for X
-.	ds dev \*[.T]
-.	substring dev 0 0
-.	if '\*[dev]'X' .ds aq \'
-.	ig
+.  tr \[aq]\[aq]
+.  if !c\[aq] \
+.    ds aq \'
+.  \" This is very special.  The standard devdvi fonts don't have a
+.  \" real `aq' glyph; it is defined with .char to be ' instead.
+.  \" The .tr request below in the definition of the C macro maps
+.  \" the apostrophe ' onto the `aq' glyph which would cause a
+.  \" recursive loop.  gtroff prevents this within the .char
+.  \" request, trying to access glyph `aq' directly from the font.
+.  \" Consequently, we get a warning, and nothing is printed.
+.  \"
+.  \" The following line prevents this.
+.  if '\*[.T]'dvi' \
+.    if !r ECFONTS \
+.      ds aq \'
+.  \" The same is true for X
+.  ds dev \*[.T]
+.  substring dev 0 0
+.  if '\*[dev]'X' .ds aq \'
+.  ig
 ..
+.
 .\" --------------------------------------------------------------------
 .\" .Ac accented-char accent char (groff)
+.
 .if !\n(.g .ig
 .de Ac
-.	char \\$1 \\$3\
-\k[acc]\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
-\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\\$2\
-\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\h'|\\\\n[acc]u'
-.	hcode \\$1 \\$3
+.  if !c\\$1 \{\
+.    ie c\\$2 \
+.      char \\$1 \
+\k[acc]\
+\h'\w'\\$3'u'\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'\
+\\$3
+.    el \
+.      char \\$1 \\$3
+.    hcode \\$1 \\$3
+.  \}
 ..
-.Ac \(vc \(ah c
-.Ac \(vC \(ah C
-.
 .
 .\" --------------------------------------------------------------------
 .\" Setup Part 2
 .\" --------------------------------------------------------------------
 .
-.nr Sp 3n
-.ta \w'\fIOutput'u+\n(Spu \
-    +\w'\fIInput'u+\n(Spu \
-    +\w'\fIInput'u+\n(Spu \
-    +\w'periodcentered'u+\n(Spu
+.nr Sp 2n
 .
 .\" --------------------------------------------------------------------
-.de C0
-.	C \\$1 "" \\$1 \\$2 "\\$3"
+.\" .C2/.CN (groff)
+.
+.if !\n(.g .ig
+.de CN
+.  C \e[\\$1] "" \[\\$1] \\$2 "\\$3" "\\$4"
 ..
 .
-.\" --------------------------------------------------------------------
-.de C1
-.	C \e\\$1 "" \\\\\\$1 \\$2 "\\$3"
+.\" .Ns (groff) start .CN block
+.
+.if !\n(.g .ig
+.de Ns
+.  CN "\\$1" "\\$2" "\\$3" "\\$4"
+.  if !\n[cR] \
+.    wh (\\n[nl]u + \\n[.t]u - \\n[.V]u) Fo
 ..
 .
-.\" --------------------------------------------------------------------
-.\" .C2/.CN (groff)
+.\" .Ne (groff) end .CN block
+.
 .if !\n(.g .ig
-.de CN
-.	C \e[\\$1] "" \[\\$1] \\$2 "\\$3"
+.de Ne
+.  ch Fo
+.  CN "\\$1" "\\$2" "\\$3" "\\$4"
 ..
-.if \n(.g .als C2 CN
+.
+.if \n(.g \{\
+.  als C2 CN
+.  als 2s Ns
+.  als 2e Ne
+.\}
 .
 .\" --------------------------------------------------------------------
 .\" .C2 (non-groff)
+.
 .if \n(.g .ig
 .de C2
-.	C \e(\\$1 "" \\(\\$1 \\$2 "\\$3"
+.  C \e(\\$1 "" \\(\\$1 \\$2 "\\$3" "\\$4"
+..
+.
+.\" .2s (non-groff) start .C2 block
+.
+.if \n(.g .ig
+.de 2s
+.  C2 "\\$1" "\\$2" "\\$3" "\\$4"
+.  if !\n(cR \
+.    wh \\n(nlu+\\n(.tu-\\n(.Vu Fo
+..
+.
+.\" .2e (non-groff) end .C2 block
+.
+.if \n(.g .ig
+.de 2e
+.  ch Fo
+.  C2 "\\$1" "\\$2" "\\$3" "\\$4"
 ..
 .
 .\" --------------------------------------------------------------------
 .\" .CD (groff)
+.
 .if !\n(.g .ig
 .de CD
-.	C \[char\\$1] \\$1 \[char\\$1] \\$2 "\\$3"
+.  C \[char\\$1] \\$1 \[char\\$1] \\$2 "\\$3" "\\$4" 1
+..
+.
+.\" .Ds (groff) start .CD block
+.
+.if !\n(.g .ig
+.de Ds
+.  CD "\\$1" "\\$2" "\\$3" "\\$4"
+.  if !\n[cR] \
+.    wh (\\n[nl]u + \\n[.t]u - \\n[.V]u) Fo
+..
+.
+.\" .De (groff) end .CD block
+.
+.if !\n(.g .ig
+.de De
+.  ch Fo
+.  CD "\\$1" "\\$2" "\\$3" "\\$4"
 ..
 .
 .\" --------------------------------------------------------------------
+.
 .do if !r ECFONTS .do fspecial CR R
 .
+.\" .CT
+.
+.de CT
+.  nr c1 \w'\\$1'
+.  if \\n(c1 \
+.    nr c1 +\\n(Spu
+.  nr c2 \\n(c1+\w'\\$2'
+.  if \\n(c1<\\n(c2 \
+.    nr c2 +\\n(Spu
+.  nr c3 \\n(c2+\w'\\$3'
+.  if \\n(c2<\\n(c3 \
+.    nr c3 +\\n(Spu
+.  nr c4 \\n(c3+\w'\\$4'
+.  if \\n(c3<\\n(c4 \
+.    nr c4 +\\n(Spu
+.  nr c5 \\n(c4+\w'\\$5'
+.  if \\n(c4<\\n(c5 \
+.    nr c5 +\\n(Spu
+..
+.
+.\" .CL
+.
+.de CL
+\\$1\c
+\h'\\n(c1u-\\n(.ku'\\$2\c
+\h'\\n(c2u-\\n(.ku'\\$3\c
+\h'\\n(c3u-\\n(.ku'\\$4\c
+\h'\\n(c4u-\\n(.ku'\\$5\c
+\h'\\n(c5u-\\n(.ku'\\$6
+.  br
+..
+.
 .\" --------------------------------------------------------------------
-.\" input-name decimal-code output-name ps-name description
+.\" input-name decimal-code output-name ps-name unicode description is-char
 .\" .C (groff)
+.
 .if !\n(.g .ig
 .de C
-.	if c\\$3 \{\
-.		ft CR
-.		tr `\`'\*[aq]
-.		in 0
-.		di CH
-.		nop \&\\$1
-.		br
-.		di
-.		in
-.		ft
-.		ds CH \\*[CH]\
-.		tr ``''
-.		nop \&\\$3\t\\*[CH]\t\\$2\t\\$4\t\\$5
-.	\}
+.  nr CH 1
+.  if \\$7 \
+.    if !c\\$1 \
+.      nr CH 0
+.  ie !\\n[CH] \
+.    ds CH
+.  el \{\
+.    ft CR
+.    tr `\`'\*[aq]
+.    in 0
+.    di CH
+.    nop \&\\$1
+.    br
+.    di
+.    chop CH
+.    in
+.    ft
+.    ds CH \\*[CH]
+.    tr ``''
+.  \}
+.  di CC
+.  ie c\\$3 \{\
+.    nop \\&\\$3\c
+.    \" The \x values assure that oversized symbols don't
+.    \" overlap vertically.  The constant 1.5p is heuristic.
+.    nop \x'(\w'('*0 - ((\\n[.cht]u - \\n[rst]u - 1.5p) >? 0))'\c
+.    nop \x'((\\n[.cdp]u + \\n[rsb]u - 1.5p) >? 0)'\c
+.    nop \h'(\\n[c1]u - \\n[.k]u)'\\*[CH]\c
+.    nop \h'(\\n[c2]u - \\n[.k]u)'\\$2\c
+.  \}
+.  el \{\
+.    nop (N/A)\c
+.    nop \h'(\\n[c1]u - \\n[.k]u)'\\*[CH]\c
+.  \}
+.  nop \h'(\\n[c3]u - \\n[.k]u)'\\$4\c
+.  nop \h'(\\n[c4]u - \\n[.k]u)'\\$5\c
+.  br
+.  di
+.  \" we move upwards later on so force a page break now if necessary
+.  if (\\n[dn] >= \\n[.t]) \
+.    bp
+.  mk C1
+.  in 0
+.  CC
+.  in
+.  \" allow multiple lines for last column
+.  in +\\n[c5]u
+.  mk C2
+.  sp |\\n[C1]u
+.  nr PN \\n[%]
+.  ad l
+.  nop \\$6
+.  ad b
+.  in
+.  if (\\n[PN] == \\n[%]) \
+.    if (\\n[nl] < \\n[C2]) \
+.      sp |\\n[C2]u
 ..
 .
 .\" --------------------------------------------------------------------
 .\" .C (non-groff)
+.
 .if \n(.g .ig
 .de C
-.	if !'\\$3'' \{\
-.		ft B
-.		tr `\`'\*(aq
-.		in 0
-.		di CH
+.  ft B
+.  tr `\`'\*(aq
+.  in 0
+.  di CH
 \&\\$1
-.		br
-.		di
-.		in
-.		ft
-.		ds CH \\*(CH\
-.		tr ``''
-\&\\$3\t\\*(CH\t\\$2\t\\$4\t\\$5
-.	\}
+.  br
+.  di
+.  in
+.  ft
+.  ds CH \\*(CH\
+.  tr ``''
+.  di CC
+.  ie !'\\$3'' \{\
+\&\\$3\c
+\h'\\n(c1u-\\n(.ku)'\\*(CH\c
+\h'\\n(c2u-\\n(.ku)'\\$2\c
+\h'\\n(c3u-\\n(.ku)'\\$4\c
+.  \}
+.  el \{\
+(N/A)\c
+\h'\\n(c1u-\\n(.ku)'\\*(CH\c
+\h'\\n(c3u-\\n(.ku)'\\$4\c
+.  \}
+\h'\\n(c4u-\\n(.ku)'\\$5\c
+\h'\\n(c5u-\\n(.ku)'\\$6
+.  br
+.  di
+.  \" we move upwards later on so force a page break now if necessary
+.  if \\n(dn>=\\n(.t \
+.    bp
+.  mk C1
+.  in 0
+.  CC
+.  in
+.  \" allow multiple lines for last column
+.  in +\\n(c5u
+.  mk C2
+.  sp |\\n(C1u
+.  nr PN \\n%
+.  ad l
+\\$6
+.  ad b
+.  in
+.  if \\n(PN==\\n% \
+.    if \\n(nl<\\n(C2 \
+.      sp |\\n(C2u
 ..
 .
 .\" --------------------------------------------------------------------
+.
 .de Fo
-'bp
-.He
+'  bp
+.  He
 ..
 .
-.\" --------------------------------------------------------------------
-.de He
-.P
-'nf
-.ft I
-Output	Input	Input	PostScript	Notes
-	name	code	name
-.ft
-.P
+.de Pa
+.  P
+.  ne 3
 ..
 .
+.
+.
 .\" --------------------------------------------------------------------
 .\" .SH DESCRIPTION
 .\" --------------------------------------------------------------------
 .
 This manual page lists the standard
 .B groff
-input characters.
+glyph names and the default input mapping, \%latin-1.
 .
-The output characters in this document will look different depending
+The glyphs in this document will look different depending
 on which output device was chosen (with option
 .B \-T
 for the
 .BR man (1)
 program or the roff formatter).
 .
-Only the characters that are available for the device that
-is being used to print or view this manual page will be
-.ie \n(.g displayed (the device currently used is `\*(.T').
-.el displayed.
+Glyphs not available for the device that
+is being used to print or view this manual page will be marked with
+.ie \n(.g `(N/A)'; the device currently used is `\*(.T'.
+.el `(N/A)'.
 .
 .
 .P
 In the actual version, 
 .B groff
-provides only 8-bit characters for direct input and named characters
+provides only \%8-bit characters for direct input and named entities
 for further glyphs.
 .
-On ASCII platforms, character codes in the range 0 to 127 (decimal)
-represent the usual 7-bit ASCII characters, while codes between 127
+On ASCII platforms, input character codes in the range 0 to 127 (decimal)
+represent the usual \%7-bit ASCII characters, while codes between 127
 and 255 are interpreted as the corresponding characters in the
-.I Latin-1
-.RI ( ISO-8859-1 )
-code set.
+.I \%Latin-1
+.RI ( \%ISO-8859-1 )
+code set by default.
+.
+This mapping is contained in the file \f(CWlatin1.tmac\fP
+and can be changed by loading a different input encoding.
+.
+Note that some of the input characters are reserved by
+.BR groff ,
+either for internal use or for special input purposes.
 .
-On EBCDIC platforms, only the code page
+On EBCDIC platforms, only code page
 .B cp1047
-is supported (which contains the same characters as Latin-1).
+is supported (which contains the same characters as \%Latin-1; the
+input encoding file is called \f(CWcp1047.tmac\fP).
+.
+Again, some input characters are reserved for internal and special purposes.
 .
 It is rather straightforward (for the experienced user) to set up other
-8bit encodings like
-.IR Latin-2 ;
+\%8-bit encodings like
+.IR \%Latin-2 ;
 since
 .B groff
 will use Unicode in the next major version, no additional encodings
@@ -235,13 +406,13 @@ are provided.
 .
 .
 .P
-All roff systems provide the concept of named characters.
+All roff systems provide the concept of named glyphs.
 .
 In traditional roff systems, only names of length\ 2 were used, while
 groff also provides support for longer names.
 .
-It is strongly suggested that only named characters are used for all
-characters outside of the 7-bit ASCII range.
+It is strongly suggested that only named glyphs are used for all
+character representations outside of the printable \%7-bit ASCII range.
 .
 .
 .P
@@ -249,30 +420,21 @@ Some of the predefined groff escape sequences (with names of length\ 1)
 also produce single characters; these exist for historical reasons or
 are printable versions of syntactical characters.
 .
-They include
-.BR \e\e ,
-.BR \e' ,
-.BR \e` ,
-.BR \e- ,
-.BR \e. ,
-and
-.BR \ee ;
-see
+They include `\f(CW\e\e\fP', `\f(CW\e\'\fP', `\f(CW\e`\fP', `\f(CW\e-\fP',
+`\f(CW\e.\fP', and `\f(CW\ee\fP'; see
 .BR groff (@MAN7EXT@).
 .
 .
 .P
-In groff, all of these different types of characters can be tested
-positively with the
-.B .if\ c
-conditional.
+In groff, all of these different types of characters and glyphs can be
+tested positively with the `\f(CW.if\ c\fP' conditional.
 .
 .
 .\" --------------------------------------------------------------------
 .SH REFERENCE
 .\" --------------------------------------------------------------------
 .
-In this section, the characters in groff are specified in tabular
+In this section, the glyphs in groff are specified in tabular
 form.
 .
 The meaning of the columns is as follows.
@@ -280,719 +442,918 @@ The meaning of the columns is as follows.
 .
 .TP
 .I "Output"
-shows how the character is printed for the current device; although
+shows how the glyph is printed for the current device; although
 this can have quite a different shape on other devices, it always
 represents the same glyph.
 .
 .
 .TP
 .I "Input name"
-specifies how the character is input either directly by a key on the
+specifies how the glyph is input either directly by a key on the
 keyboard, or by a groff escape sequence.
 .
 .
 .TP
 .I "Input code"
-applies to characters which can be input with a single character, and
-gives the ISO Latin-1 decimal code of that input character.
+applies to glyphs which can be input with a single character, and
+gives the ISO \%Latin-1 decimal code of that input character.
 .
-Note that this code is equivalent to the lowest 256 Unicode characters;
-(including 7-bit ASCII in the range 0 to\ 127).
+Note that this code is equivalent to the lowest 256 Unicode characters,
+including \%7-bit ASCII in the range 0 to\ 127.
 .
 .
 .TP
 .I "PostScript name"
-gives the usual PostScript name of the output character.
+gives the usual PostScript name of the glyph.
+.
+.
+.TP
+.I "Unicode decomposed"
+is the glyph name used in composite glyph names.
+.
 .
 .
 .\" --------------------------------------------------------------------
-.SS "ASCII Characters"
+.SS "7-bit Character Codes 32-126"
 .\" --------------------------------------------------------------------
 .
-These are the basic characters having 7-bit ASCII code values.
+These are the basic glyphs having 7-bit ASCII code values assigned.
 .
-These are identical to the first 127 characters of the character
-standards ISO-8859-1 (Latin-1) and Unicode (range
+They are identical to the printable characters of the
+character standards \%ISO-8859-1 (\%Latin-1) and Unicode (range
 .IR "C0 Controls and Basic Latin" ).
 .
-To save space, not every code has an entry in the following because
-the following code ranges are well known.
+The glyph names used in composite glyph names are `u0020' up to `u007E'.
+.
+.
+.P
+Note that input characters in the range \%0\-31 and character 127 are
+.I not
+printable characters.
+.
+Most of them are invalid input characters for
+.B groff
+anyway, and the valid ones have special meaning.
+.
+For EBCDIC, the printable characters are in the range \%66\-255.
 .
-.TP
-0\-32
-Control characters (print as themselves).
 .
 .TP
 48\-57
-Decimal digits 0 to 9 (print as themselves).
+Decimal digits 0 to\ 9 (print as themselves).
+.
 .
 .TP
 65\-90
 Upper case letters A\-Z (print as themselves).
 .
+.
 .TP
 97\-122
 Lower case letters a\-z (print as themselves).
 .
-.TP
-127
-Control character (prints as itself).
 .
 .P
-The remaining ranges constitute the printable, non-alphanumeric ASCII
-characters; only these are listed below.
-.
-As can be seen in the table below, most of these characters print as
+Most of the remaining characters not in the just described ranges print as
 themselves; the only exceptions are the following characters:
 .
+.
 .TP
 .B \`
-the ISO Latin-1 `Grave Accent' (code\ 96) prints as `, a left single
-quotation mark,
+the ISO \%Latin-1 `Grave Accent' (code\ 96) prints as `, a left single
+quotation mark; the original character can be obtained with `\f(CW\e`\fP'.
+.
 .
 .TP
 .B \*(aq
-the ISO Latin-1 `Apostrophe' (code\ 39) prints as ', a right single
-quotation mark; the corresponding ISO Latin-1 characters can be obtained
-with
-.B \e`
-and
-.BR \e(aq .
+the ISO \%Latin-1 `Apostrophe' (code\ 39) prints as ', a right single
+quotation mark; the original character can be obtained with `\f(CW\e(aq\fP'.
+.
 .
 .TP
 .B -
-the ISO Latin-1 `Hyphen, Minus Sign' (code\ 45) prints as a hyphen; a
-minus sign can be obtained with
-.BR \e- .
+the ISO \%Latin-1 `Hyphen, Minus Sign' (code\ 45) prints as a hyphen; a
+minus sign can be obtained with `\f(CW\e-\fP'.
+.
 .
 .TP
 .B ~
-the ISO Latin-1 `Tilde' (code\ 126); a larger glyph can be obtained
-with
-.BR \e(ti .
+the ISO \%Latin-1 `Tilde' (code\ 126) is reduced in size to be usable as
+a diacritic; a larger glyph can be obtained with `\f(CW\e(ti\fP'.
+.
 .
 .TP
 .B ^
-the ISO Latin-1 `Circumflex Accent' (code\ 94); a larger glyph can be
-obtained with
-.BR \e(ha .
+the ISO \%Latin-1 `Circumflex Accent' (code\ 94) is reduced in size to be
+usable as a diacritic; a larger glyph can be obtained with `\f(CW\e(ha\fP'.
 .
 .
 .P
-.if !\n[cR] .wh \n(nlu+\n(.tu-\n(.Vu Fo
+.CT "\fIOutput" "\fIInput" "\fIInput" "bracketright" "decomposed"
+.de He
+.  P
+.  ne 4
+.  ft I
+.  CL "Output" "Input" "Input" "PostScript" "Unicode"    "Notes"
+.  CL ""       "name"  "code"  "name"       "decomposed" ""
+.  ft
+.  P
+..
 .He
-.CD 33 exclam
-.CD 34 quotedbl
-.CD 35 numbersign
-.CD 36 dollar
-.CD 37 percent
-.CD 38 ampersand
-.CD 39 quoteright
-.CD 40 parenleft
-.CD 41 parenright
-.CD 42 asterisk
-.CD 43 plus
-.CD 44 comma
-.CD 45 hyphen
-.CD 46 period
-.CD 47 slash
-.CD 58 colon
-.CD 59 semicolon
-.CD 60 less
-.CD 61 equal
-.CD 62 greater
-.CD 63 question
-.CD 64 at
-.CD 91 bracketleft
-.CD 92 backslash
-.CD 93 bracketright
-.CD 94 circumflex "circumflex accent"
-.CD 95 underscore
-.CD 96 quoteleft
-.CD 123 braceleft
-.CD 124 bar
-.CD 125 braceright
-.CD 126 tilde "tilde accent"
-.ch Fo
+.Ds 33 exclam u0021
+.CD 34 quotedbl u0022
+.CD 35 numbersign u0023
+.CD 36 dollar u0024
+.CD 37 percent u0025
+.CD 38 ampersand u0026
+.CD 39 quoteright u0027
+.CD 40 parenleft u0028
+.CD 41 parenright u0029
+.CD 42 asterisk u002A
+.CD 43 plus u002B
+.CD 44 comma u002C
+.CD 45 hyphen u2010
+.CD 46 period u002E
+.CD 47 slash u002F
+.CD 58 colon u003A
+.CD 59 semicolon u003B
+.CD 60 less u003C
+.CD 61 equal u003D
+.CD 62 greater u003E
+.CD 63 question u003F
+.CD 64 at u0040
+.CD 91 bracketleft u005B
+.CD 92 backslash u005C
+.CD 93 bracketright u005D
+.CD 94 circumflex u005E "circumflex accent"
+.CD 95 underscore u005F
+.CD 96 quoteleft u0060
+.CD 123 braceleft u007B
+.CD 124 bar u007C
+.CD 125 braceright u007D
+.De 126 tilde u007E "tilde accent"
 .
 .
 .\" --------------------------------------------------------------------
-.SS "Latin-1 Special Characters"
+.SS "8-bit Character Codes 160 to 255"
 .\" --------------------------------------------------------------------
 .
-These characters have character codes between 128 and\ 255.
-.
-They are interpreted as characters according to the
+They are interpreted as printable characters according to the
 .I Latin-1
 .RI ( iso-8859-1 )
 code set, being identical to the Unicode range
 .IR "C1 Controls and Latin-1 Supplement" .
 .
-.TP
-128\-159
 .
-the C1 Controls; they print as themselves, but the effect is mostly
-undefined.
+.P
+Input characters in range 128-159 (on non-EBCDIC hosts) are not printable
+characters.
+.
 .
 .TP
 160
 .
-the ISO Latin-1
+the ISO \%Latin-1
 .I no-break space
-is mapped to
-.BR `\e\ ' ,
-the escaped space character.
+is mapped to `\f(CW\e~\fP', the stretchable space character.
+.
 .
 .TP
 173
 .
-the soft hyphen control character (prints as itself).
+the soft hyphen control character.
 .
-groff never use this character for output (thus it is omitted in the table
-below); the input character\ 173 is mapped onto
-.BR \e% .
+.B groff
+never uses this character for output (thus it is omitted in the
+table below); the input character\ 173 is mapped onto `\f(CW\e%\fP'.
 .
 .
 .P
-The remaining ranges (161\-172, 174\-255), called the
-.I Latin-1 Supplement
-in Unicode, are printable characters that print as themselves.
+The remaining ranges (\%161\-172, \%174\-255)
+are printable characters that print as themselves.
 .
 Although they can be specified directly with the keyboard on systems
-with a Latin-1 code page, it is better to use their named character
-equivalent; see next section.
-.
+with a \%Latin-1 code page, it is better to use their glyph names;
+see next section.
 .
 .P
-.if !\n[cR] .wh \n(nlu+\n(.tu-\n(.Vu Fo
+.CT "\fIOutput" "\fIInput" "\fIInput" "guillemotright" "decomposed"
 .He
-.CD 161 exclamdown "inverted exclamation mark"
-.CD 162 cent
-.CD 163 sterling
-.CD 164 currency
-.CD 165 yen
-.CD 166 brokenbar
-.CD 167 section
-.CD 168 dieresis
-.CD 169 copyright
-.CD 170 ordfeminine
-.CD 171 guillemotleft
-.CD 172 logicalnot
-.CD 174 registered
-.CD 175 macron
-.CD 176 degree
-.CD 177 plusminus
-.CD 178 twosuperior
-.CD 179 threesuperior
-.CD 180 acute "acute accent"
-.CD 181 mu "micro sign"
-.CD 182 paragraph
-.CD 183 periodcentered
-.CD 184 cedilla
-.CD 185 onesuperior
-.CD 186 ordmasculine
-.CD 187 guillemotright
-.CD 188 onequarter
-.CD 189 onehalf
-.CD 190 threequarters
-.CD 191 questiondown
-.CD 192 Agrave
-.CD 193 Aacute
-.CD 194 Acircumflex
-.CD 195 Atilde
-.CD 196 Adieresis
-.CD 197 Aring
-.CD 198 AE
-.CD 199 Ccedilla
-.CD 200 Egrave
-.CD 201 Eacute
-.CD 202 Ecircumflex
-.CD 203 Edieresis
-.CD 204 Igrave
-.CD 205 Iacute
-.CD 206 Icircumflex
-.CD 207 Idieresis
-.CD 208 Eth
-.CD 209 Ntilde
-.CD 210 Ograve
-.CD 211 Oacute
-.CD 212 Ocircumflex
-.CD 213 Otilde
-.CD 214 Odieresis
-.CD 215 multiply
-.CD 216 Oslash
-.CD 217 Ugrave
-.CD 218 Uacute
-.CD 219 Ucircumflex
-.CD 220 Udieresis
-.CD 221 Yacute
-.CD 222 Thorn
-.CD 223 germandbls
-.CD 224 agrave
-.CD 225 aacute
-.CD 226 acircumflex
-.CD 227 atilde
-.CD 228 adieresis
-.CD 229 aring
-.CD 230 ae
-.CD 231 ccedilla
-.CD 232 egrave
-.CD 233 eacute
-.CD 234 ecircumflex
-.CD 235 edieresis
-.CD 236 igrave
-.CD 237 iacute
-.CD 238 icircumflex
-.CD 239 idieresis
-.CD 240 eth
-.CD 241 ntilde
-.CD 242 ograve
-.CD 243 oacute
-.CD 244 ocircumflex
-.CD 245 otilde
-.CD 246 odieresis
-.CD 247 divide
-.CD 248 oslash
-.CD 249 ugrave
-.CD 250 uacute
-.CD 251 ucircumflex
-.CD 252 udieresis
-.CD 253 yacute
-.CD 254 thorn
-.CD 255 ydieresis
-.ch Fo
+.Ds 161 exclamdown u00A1 "inverted exclamation mark"
+.CD 162 cent u00A2
+.CD 163 sterling u00A3
+.CD 164 currency u00A4
+.CD 165 yen u00A5
+.CD 166 brokenbar u00A6
+.CD 167 section u00A7
+.CD 168 dieresis u00A8
+.CD 169 copyright u00A9
+.CD 170 ordfeminine u00AA
+.CD 171 guillemotleft u00AB
+.CD 172 logicalnot u00AC
+.CD 174 registered u00AE
+.CD 175 macron u00AF
+.CD 176 degree u00B0
+.CD 177 plusminus u00B1
+.CD 178 twosuperior u00B2
+.CD 179 threesuperior u00B3
+.CD 180 acute u00B4 "acute accent"
+.CD 181 mu u00B5 "micro sign"
+.CD 182 paragraph u00B6
+.CD 183 periodcentered u00B7
+.CD 184 cedilla u00B8
+.CD 185 onesuperior u00B9
+.CD 186 ordmasculine u00BA
+.CD 187 guillemotright u00BB
+.CD 188 onequarter u00BC
+.CD 189 onehalf u00BD
+.CD 190 threequarters u00BE
+.CD 191 questiondown u00BF
+.CD 192 Agrave u0041_0300
+.CD 193 Aacute u0041_0301
+.CD 194 Acircumflex u0041_0302
+.CD 195 Atilde u0041_0303
+.CD 196 Adieresis u0041_0308
+.CD 197 Aring u0041_030A
+.CD 198 AE u00C6
+.CD 199 Ccedilla u0043_0327
+.CD 200 Egrave u0045_0300
+.CD 201 Eacute u0045_0301
+.CD 202 Ecircumflex u0045_0302
+.CD 203 Edieresis u0045_0308
+.CD 204 Igrave u0049_0300
+.CD 205 Iacute u0049_0301
+.CD 206 Icircumflex u0049_0302
+.CD 207 Idieresis u0049_0308
+.CD 208 Eth u00D0
+.CD 209 Ntilde u004E_0303
+.CD 210 Ograve u004F_0300
+.CD 211 Oacute u004F_0301
+.CD 212 Ocircumflex u004F_0302
+.CD 213 Otilde u004F_0303
+.CD 214 Odieresis u004F_0308
+.CD 215 multiply u00D7
+.CD 216 Oslash u00D8
+.CD 217 Ugrave u0055_0300
+.CD 218 Uacute u0055_0301
+.CD 219 Ucircumflex u0055_0302
+.CD 220 Udieresis u0055_0308
+.CD 221 Yacute u0059_0301
+.CD 222 Thorn u00DE
+.CD 223 germandbls u00DF
+.CD 224 agrave u0061_0300
+.CD 225 aacute u0061_0301
+.CD 226 acircumflex u0061_0302
+.CD 227 atilde u0061_0303
+.CD 228 adieresis u0061_0308
+.CD 229 aring u0061_030A
+.CD 230 ae u00E6
+.CD 231 ccedilla u0063_0327
+.CD 232 egrave u0065_0300
+.CD 233 eacute u0065_0301
+.CD 234 ecircumflex u0065_0302
+.CD 235 edieresis u0065_0308
+.CD 236 igrave u0069_0300
+.CD 237 iacute u0069_0301
+.CD 238 icircumflex u0069_0302
+.CD 239 idieresis u0069_0308
+.CD 240 eth u00F0
+.CD 241 ntilde u006E_0303
+.CD 242 ograve u006F_0300
+.CD 243 oacute u006F_0301
+.CD 244 ocircumflex u006F_0302
+.CD 245 otilde u006F_0303
+.CD 246 odieresis u006F_0308
+.CD 247 divide u00F7
+.CD 248 oslash u00F8
+.CD 249 ugrave u0075_0300
+.CD 250 uacute u0075_0301
+.CD 251 ucircumflex u0075_0302
+.CD 252 udieresis u0075_0308
+.CD 253 yacute u0079_0301
+.CD 254 thorn u00FE
+.De 255 ydieresis u0079_0308
 .
 .
 .\" --------------------------------------------------------------------
-.SS "Named Characters"
+.SS "Named Glyphs"
 .\" --------------------------------------------------------------------
 .
-The named character idiom is the standard way to specify special
-characters in roff systems.
-.
-They can be embedded into the document text by using escape sequences.
+Glyph names can be embedded into the document text by using escape
+sequences.
 .
 .BR groff (@MAN7EXT@)
 describes how these escape sequences look.
 .
-The character names can consist of quite arbitrary characters from the
-ASCII or Latin-1 code set, not only alphanumeric characters.
+Glyph names can consist of quite arbitrary characters from the
+ASCII or \%Latin-1 code set, not only alphanumeric characters.
 .
 Here some examples:
 .
 .TP
-.BI \e c
-named character having the name
+\f(CW\e\fP\fIc\fP
+A glyph having the name
 .IR c ,
 which consists of a single character (length\ 1).
 .
 .TP
-.BI \e( ch
-named character having the 2-character name
+\f(CW\e(\fP\fIch\fP
+A glyph having the 2-character name
 .IR ch .
 .
 .TP
-.BI \e[ char_name ]
-named character having the name
+\f(CW\e[\fP\fIchar_name\fP\f(CW]\fP
+A glyph having the name
 .I char_name
 (having length 1, 2, 3, .\|.\|.).
 .
+.TP
+\f(CW\e[\fP\fIbase_glyph composite_1 composite_2 .\|.\|.\fP\f(CW]\fP
+A composite glyph; see below for a more detailed description.
+.
 .
 .P
-In groff, each 8bit input character can also referred to by the construct
-.BI \en[char n ]
-where
+In groff, each \%8-bit input character can also referred to by the construct
+`\f(CW\e[char\fP\fIn\fP\f(CW]\fP' where
 .I n
 is the decimal code of the character, a number between 0 and\ 255
-without leading zeros.
+without leading zeros (those entities are
+.I not
+glyph names).
+.
+They are normally mapped onto glyphs using the \f(CW.trin\fP request.
 .
-They are mapped onto glyph entities using the
-.B .trin
-request.
+Another special convention is the handling of glyphs with names directly
+derived from a Unicode code point; this is discussed below.
 .
-Moreover, new character names can be created by the
-.B .char
-request; see
+Moreover, new glyph names can be created by the \f(CW.char\fP request; see
 .BR groff (@MAN7EXT@).
 .
+.P
+In the following, a plus sign in the `Notes' column indicates that this
+particular glyph name appears in the PS version of the original troff
+documentation, CSTR\ 54.
+.
 .
 .P
-.\" we don't use the third column
-.ta \w'\fIOutput'u+\n(Spu \
-    +\w'\fIInput'u+\n(Spu-1n \
-    +1n \
-    +\w'periodcentered'u+\n(Spu
-.if !\n[cR] .wh \n(nlu+\n(.tu-\n(.Vu Fo
+.CT "\fIOutput" "\f(CW\e[-D]" "" "Ocircumflex" "u0066_0066_006C"
 .de He
-.P
-'nf
-.ft I
-Output	Input		PostScript	Notes
-	name		name
-.ft
-.P
+.  P
+.  ne 4
+.  ft I
+.  CL "Output" "Input" "" "PostScript" "Unicode"    "Notes"
+.  CL ""       "name"  "" "name"       "decomposed" ""
+.  ft
+.  P
 ..
 .He
-.C2 -D Eth "Icelandic uppercase eth"
-.C2 Sd eth "Icelandic lowercase eth"
-.C2 TP Thorn "Icelandic uppercase thorn"
-.C2 Tp thorn "Icelandic lowercase thorn"
-.C2 ss germandbls "German sharp s"
+.2s -D Eth u00D0 "uppercase eth"
+.C2 Sd eth u00F0 "lowercase eth"
+.C2 TP Thorn u00DE "uppercase thorn"
+.C2 Tp thorn u00FE "lowercase thorn"
+.2e ss germandbls u00DF "German sharp s"
+.
+.Pa
+.I Ligatures and Other Latin Glyphs
+.P
+.2s ff ff u0066_0066 "ff ligature +"
+.C2 fi fi u0066_0069 "fi ligature +"
+.C2 fl fl u0066_006C "fl ligature +"
+.C2 Fi ffi u0066_0066_0069 "ffi ligature +"
+.C2 Fl ffl u0066_0066_006C "ffl ligature +"
+.C2 /L Lslash u0141 "(Polish)"
+.C2 /l lslash u0142 "(Polish)"
+.C2 /O Oslash u00D8 "(Scandinavic)"
+.C2 /o oslash u00F8 "(Scandinavic)"
+.C2 AE AE u00C6
+.C2 ae ae u00E6
+.C2 OE OE u0152
+.C2 oe oe u0153
+.C2 IJ IJ u0132 "(Dutch)"
+.C2 ij ij u0133 "(Dutch)"
+.C2 .i dotlessi u0131 "(Turkish)"
+.2e .j dotlessj --- "j without a dot"
+.
+.Pa
+.I Accented Characters
+.P
+.2s 'A Aacute u0041_0301
+.C2 'C Cacute u0043_0301
+.C2 'E Eacute u0045_0301
+.C2 'I Iacute u0049_0301
+.C2 'O Oacute u004F_0301
+.C2 'U Uacute u0055_0301
+.C2 'Y Yacute u0059_0301
+.C2 'a aacute u0061_0301
+.C2 'c cacute u0063_0301
+.C2 'e eacute u0065_0301
+.C2 'i iacute u0069_0301
+.C2 'o oacute u006F_0301
+.C2 'u uacute u0075_0301
+.C2 'y yacute u0079_0301
+.C2 :A Adieresis u0041_0308 "A with umlaut"
+.C2 :E Edieresis u0045_0308
+.C2 :I Idieresis u0049_0308
+.C2 :O Odieresis u004F_0308
+.C2 :U Udieresis u0055_0308
+.C2 :Y Ydieresis u0059_0308
+.C2 :a adieresis u0061_0308
+.C2 :e edieresis u0065_0308
+.C2 :i idieresis u0069_0308
+.C2 :o odieresis u006F_0308
+.C2 :u udieresis u0075_0308
+.C2 :y ydieresis u0079_0308
+.C2 ^A Acircumflex u0041_0302
+.C2 ^E Ecircumflex u0045_0302
+.C2 ^I Icircumflex u0049_0302
+.C2 ^O Ocircumflex u004F_0302
+.C2 ^U Ucircumflex u0055_0302
+.C2 ^a acircumflex u0061_0302
+.C2 ^e ecircumflex u0065_0302
+.C2 ^i icircumflex u0069_0302
+.C2 ^o ocircumflex u006F_0302
+.C2 ^u ucircumflex u0075_0302
+.C2 `A Agrave u0041_0300
+.C2 `E Egrave u0045_0300
+.C2 `I Igrave u0049_0300
+.C2 `O Ograve u004F_0300
+.C2 `U Ugrave u0055_0300
+.C2 `a agrave u0061_0300
+.C2 `e egrave u0065_0300
+.C2 `i igrave u0069_0300
+.C2 `o ograve u006F_0300
+.C2 `u ugrave u0075_0300
+.C2 ~A Atilde u0041_0303
+.C2 ~N Ntilde u004E_0303
+.C2 ~O Otilde u004F_0303
+.C2 ~a atilde u0061_0303
+.C2 ~n ntilde u006E_0303
+.C2 ~o otilde u006F_0303
+.C2 vS Scaron u0053_030C
+.C2 vs scaron u0073_030C
+.C2 vZ Zcaron u005A_030C
+.C2 vz zcaron u007A_030C
+.C2 ,C Ccedilla u0043_0327
+.C2 ,c ccedilla u0063_0327
+.C2 oA Aring u0041_030A
+.2e oa aring u0061_030A
+.
+.Pa
+.I Accents
+.P
+The
+.B composite
+request is used to map most of the accents to non-spacing glyph names;
+the values given in parentheses are the original (spacing) ones.
 .
 .P
-.I Ligatures
-.C2 ff ff "ff ligature"
-.C2 fi fi "fi ligature"
-.C2 fl fl "fl ligature"
-.C2 Fi ffi "ffi ligature"
-.C2 Fl ffl "ffl ligature"
-.C2 AE AE
-.C2 ae ae
-.C2 OE OE
-.C2 oe oe
-.C2 IJ IJ "Dutch IJ ligature"
-.C2 ij ij "Dutch ij ligature"
-.C2 .i dotlessi "i without a dot (Turkish)"
-.C2 .j dotlessj "j without a dot"
+.Ac \(vc \(ah c
+.Ac \('a \(aa a
 .
+.\" we don't use the third column
+.CT "\fIOutput" "\f(CW\e[-D]" "" "quotesinglebase" "uCCCC (uCCCC)"
+.He
+.2s a" hungarumlaut "u030B (u02DD)" "(Hungarian)"
+.C2 a- macron "u0304 (u00AF)"
+.C2 a. dotaccent "u0307 (u02D9)"
+.C2 a^ circumflex "u0302 (u005E)"
+.C2 aa acute "u0301 (u00B4)" "+"
+.C2 ga grave "u0300 (u0060)" "+"
+.C2 ab breve "u0306 (u02D8)"
+.C2 ac cedilla "u0327 (u00B8)"
+.C2 ad dieresis "u0308 (u00A8)" "umlaut"
+.C2 ah caron "u030C (u02C7)" "h\('a\(vcek"
+.C2 ao ring "u030A (u02DA)" "circle"
+.C2 a~ tilde "u0303 (u007E)"
+.C2 ho ogonek "u0328 (u02DB)" "hook"
+.C2 ha asciicircum u005E "(spacing)"
+.2e ti asciitilde u007E "(spacing)"
+.
+.Pa
+.I Quotes
 .P
-.I Accented Characters
-.C2 'A Aacute
-.C2 'C Cacute
-.C2 'E Eacute
-.C2 'I Iacute
-.C2 'O Oacute
-.C2 'U Uacute
-.C2 'Y Yacute
-.C2 'a aacute
-.C2 'c cacute
-.C2 'e eacute
-.C2 'i iacute
-.C2 'o oacute
-.C2 'u uacute
-.C2 'y yacute
-.C2 :A Adieresis "A with umlaut"
-.C2 :E Edieresis
-.C2 :I Idieresis
-.C2 :O Odieresis
-.C2 :U Udieresis
-.C2 :Y Ydieresis
-.C2 :a adieresis
-.C2 :e edieresis
-.C2 :i idieresis
-.C2 :o odieresis
-.C2 :u udieresis
-.C2 :y ydieresis
-.C2 ^A Acircumflex
-.C2 ^E Ecircumflex
-.C2 ^I Icircumflex
-.C2 ^O Ocircumflex
-.C2 ^U Ucircumflex
-.C2 ^a acircumflex
-.C2 ^e ecircumflex
-.C2 ^i icircumflex
-.C2 ^o ocircumflex
-.C2 ^u ucircumflex
-.C2 `A Agrave
-.C2 `E Egrave
-.C2 `I Igrave
-.C2 `O Ograve
-.C2 `U Ugrave
-.C2 `a agrave
-.C2 `e egrave
-.C2 `i igrave
-.C2 `o ograve
-.C2 `u ugrave
-.C2 ~A Atilde
-.C2 ~N Ntilde
-.C2 ~O Otilde
-.C2 ~a atilde
-.C2 ~n ntilde
-.C2 ~o otilde
-.C2 vS Scaron
-.C2 vs scaron
-.C2 vZ Zcaron
-.C2 vz zcaron
-.C2 ,C Ccedilla
-.C2 ,c ccedilla
-.C2 /L Lslash "Polish L with a slash"
-.C2 /l lslash "Polish l with a slash"
-.C2 /O Oslash "Scandinavic slashed O"
-.C2 /o oslash "Scandinavic slashed o"
-.C2 oA Aring
-.C2 oa aring
+.2s Bq quotedblbase u201E "low double comma quote"
+.C2 bq quotesinglbase u201A "low single comma quote"
+.C2 lq quotedblleft u201C
+.C2 rq quotedblright u201D
+.C2 oq quoteleft u2018 "single open quote"
+.C2 cq quoteright u2019 "single closing quote"
+.C2 aq quotesingle u0027 "apostrophe quote (ASCII 39)"
+.C2 dq quotedbl u0022 "double quote (ASCII 34)"
+.C2 Fo guillemotleft u00AB
+.C2 Fc guillemotright u00BB
+.C2 fo guilsinglleft u2039
+.2e fc guilsinglright u203A
+.
+.Pa
+.I Punctuation
+.P
+.2s r! exclamdown u00A1
+.C2 r? questiondown u00BF
+.C2 em emdash u2014 "+"
+.C2 en endash u2013
+.2e hy hyphen u2010 "+"
 .
+.Pa
+.I Brackets
 .P
-.I Accents
-.C2 a" hungarumlaut "Hungarian umlaut"\""
-.C2 a- macron "macron or bar accent"
-.C2 a. dotaccent "dot accent"
-.C2 a^ circumflex "circumflex accent"
-.C2 aa acute "acute accent"
-.C2 ga grave "grave accent"
-.C2 ab breve "breve accent"
-.C2 ac cedilla "cedilla accent"
-.C2 ad dieresis "umlaut or dieresis"
-.C2 ah caron "h\('a\(vcek accent"
-.C2 ao ring "ring or circle accent"
-.C2 a~ tilde "tilde accent"
-.C2 ho ogonek "hook or ogonek accent"
-.C2 ha asciicircum "\s-2ASCII\s+2 circumflex, hat, caret"
-.C2 ti asciitilde "\s-2ASCII\s0 tilde, large tilde"
+The extensible bracket pieces are font-invariant glyphs.
+.
+In classical troff only one glyph was available to vertically extend
+brackets, braces, and parentheses: `bv'.
+.
+We map it rather arbitrarily to u23AA.
 .
 .P
-.I Quotes
-.C2 Bq quotedblbase "low double comma quote"
-.C2 bq quotesinglbase "low single comma quote"
-.C2 lq quotedblleft
-.C2 rq quotedblright
-.C2 oq quoteleft "single open quote"
-.C2 cq quoteright "single closing quote (ASCII 39)"
-.C2 aq quotesingle "apostrophe quote"
-.C2 dq quotedbl "double quote (ASCII 34)"
-.C2 Fo guillemotleft
-.C2 Fc guillemotright
-.C2 fo guilsinglleft
-.C2 fc guilsinglright
+Note that not all devices contain extensible bracket pieces which can
+be piled up with `\f(CW\eb\fP' due to the restrictions of the escape's
+piling algorithm.
+.
+A general solution to build brackets out of pieces is the following
+macro:
 .
 .P
-.I Punctuation
-.C2 r! exclamdown
-.C2 r? questiondown
-.C2 em emdash "em dash"
-.C2 en endash "en dash"
-.C2 hy hyphen
+.nf
+.RS
+.ft C
+\&.\e" Make a pile centered vertically 0.5em
+\&.\e" above the baseline.
+\&.\e" The first argument is placed at the top.
+\&.\e" The pile is returned in string `pile'
+\&.eo
+\&.de pile-make
+\&.  nr pile-wd 0
+\&.  nr pile-ht 0
+\&.  ds pile-args
+\&.
+\&.  nr pile-# \en[.$]
+\&.  while \en[pile-#] \e{\e
+\&.    nr pile-wd (\en[pile-wd] >? \ew'\e$[\en[pile-#]]')
+\&.    nr pile-ht +(\en[rst] - \en[rsb])
+\&.    as pile-args \ev'\en[rsb]u'\e"
+\&.    as pile-args \eZ'\e$[\en[pile-#]]'\e"
+\&.    as pile-args \ev'-\en[rst]u'\e"
+\&.    nr pile-# -1
+\&.  \e}
+\&.
+\&.  ds pile \ev'(-0.5m + (\en[pile-ht]u / 2u))'\e"
+\&.  as pile \e*[pile-args]\e"
+\&.  as pile \ev'((\en[pile-ht]u / 2u) + 0.5m)'\e"
+\&.  as pile \eh'\en[pile-wd]u'\e"
+\&..
+\&.ec
+.ft
+.RE
+.fi
 .
 .P
-.I Brackets
-.C2 lB bracketleft
-.C2 rB bracketright
-.C2 lC braceleft
-.C2 rC braceright
-.C2 la angleleft "left angle bracket"
-.C2 ra angleright "right angle bracket"
+Another complication is the fact that some glyphs which represent bracket
+pieces in original troff can be used for other mathematical symbols also,
+for example `lf' and `rf' which provide the `floor' operator.
+.
+Other devices (most notably for DVI output) don't unify such glyphs.
+.
+For this reason, the four glyphs `lf', `rf', `lc', and `rc' are not
+unified with similarly looking bracket pieces.
+.
+In
+.BR groff ,
+only glyphs with long names are guaranteed to pile up correctly for all
+devices (provided those glyphs exist).
 .
 .P
+.CT "\fIOutput" "\f(CW\e[bracketrightex]" "" "bracketrightex" "decomposed"
+.He
+.2s lB bracketleft u005B
+.C2 rB bracketright u005D
+.C2 lC braceleft u007B
+.C2 rC braceright u007D
+.C2 la angleleft u27E8 "left angle bracket"
+.C2 ra angleright u27E9 "right angle bracket"
+.
+.C2 bv braceex u23AA "vertical extension *** +"
+.CN braceex braceex u23AA
+.
+.CN bracketlefttp bracketlefttp u23A1
+.CN bracketleftbt bracketleftbt u23A3
+.CN bracketleftex bracketleftex u23A2
+.CN bracketrighttp bracketrighttp u23A4
+.CN bracketrightbt bracketrightbt u23A6
+.CN bracketrightex bracketrightex u23A5
+.
+.C2 lt bracelefttp u23A7 "+"
+.CN bracelefttp bracelefttp u23A7
+.C2 lk braceleftmid u23A8 "+"
+.CN braceleftmid braceleftmid u23A8
+.C2 lb braceleftbt u23A9 "+"
+.CN braceleftbt braceleftbt u23A9
+.CN braceleftex braceleftex u23AA
+.C2 rt bracerighttp u23AB "+"
+.CN bracerighttp bracerighttp u23AB
+.C2 rk bracerightmid u23AC "+"
+.CN bracerightmid bracerightmid u23AC
+.C2 rb bracerightbt u23AD "+"
+.CN bracerightbt bracerightbt u23AD
+.CN bracerightex bracerightex u23AA
+.
+.CN parenlefttp parenlefttp u239B
+.CN parenleftbt parenleftbt u239D
+.CN parenleftex parenleftex u239C
+.CN parenrighttp parenrighttp u239E
+.CN parenrightbt parenrightbt u23A0
+.Ne parenrightex parenrightex u239F
+.
+.Pa
 .I Arrows
-.C2 <- arrowleft
-.C2 -> arrowright
-.C2 <> arrowboth "horizontal double-headed arrow"
-.C2 da arrowdown
-.C2 ua arrowup
-.C2 va arrowupdn "vertical double-headed arrow"
-.C2 lA arrowdblleft
-.C2 rA arrowdblright
-.C2 hA arrowdblboth "horizontal double-headed double arrow"
-.C2 dA arrowdbldown
-.C2 uA arrowdblup
-.C2 vA \& "vertical double-headed double arrow"
-.C2 an arrowhorizex "horizontal arrow extension"
-.
 .P
+.2s <- arrowleft u2190 "+"
+.C2 -> arrowright u2192 "+"
+.C2 <> arrowboth u2194 "(horizontal)"
+.C2 da arrowdown u2193 "+"
+.C2 ua arrowup u2191 "+"
+.C2 va arrowupdn u2195
+.C2 lA arrowdblleft u21D0
+.C2 rA arrowdblright u21D2
+.C2 hA arrowdblboth u21D4 "(horizontal)"
+.C2 dA arrowdbldown u21D3
+.C2 uA arrowdblup u21D1
+.C2 vA uni21D5 u21D5 "vertical double-headed double arrow"
+.2e an arrowhorizex u23AF "horizontal arrow extension"
+.
+.Pa
 .I Lines
-.C2 -h hbar
-.C2 or bar
-.C2 ba bar
-.C2 br br "box rule with traditional troff metrics"
-.C2 ru ru "baseline rule"
-.C2 ul ul "underline with traditional troff metrics"
-.C2 bv bv "bar vertical"
-.C2 bb brokenbar
-.C2 sl slash
-.C2 rs backslash
+.P
+The font-invariant glyphs `br', `ul', and `rn' form corners;
+they can be used to build boxes.
+.
+Note that both the PostScript and the Unicode-derived names of
+these three glyphs are just rough approximations.
 .
 .P
-.I Text markers
-.C2 ci circle
-.C2 bu bullet
-.C2 dd daggerdbl "double dagger sign"
-.C2 dg dagger
-.C2 lz lozenge
-.C2 sq square
-.C2 ps paragraph
-.C2 sc section
-.C2 lh handleft
-.C2 rh handright
-.C2 at at
-.C2 sh numbersign
-.C2 CR carriagereturn "carriage return symbol"
-.C2 OK a19 "check mark, tick"
+`rn' also serves in classical troff as the horizontal extension of the
+square root sign.
 .
 .P
-.I Legalize
-.C2 co copyright
-.C2 rg registered
-.C2 tm trademark
-.C2 bs bell "AT&T Bell Labs logo (not used in groff)"
+`ru' is a font-invariant glyph, namely a rule of length 0.5m.
 .
 .P
-.I Currency symbols
-.C2 Do dollar
-.C2 ct cent
-.C2 eu \& "official Euro symbol"
-.C2 Eu Euro "font-specific Euro glyph variant"
-.C2 Ye yen
-.C2 Po sterling "British currency sign"
-.C2 Cs currency "Scandinavian currency sign"
-.C2 Fn florin "Dutch currency sign"
+.CT "\fIOutput" "\f(CW\e[integral]" "" "propersuperset" "decomposed"
+.He
+.2s ba bar u007C
+.C2 br SF110000 u2502 "box rule +"
+.C2 ul underscore u005F "+"
+.C2 rn overline u203E "use `\f(CW\e[radicalex]\fP' for continuation of square root +"
+.C2 ru --- --- "baseline rule +"
+.C2 bb brokenbar u00A6
+.C2 sl slash u002F "+"
+.2e rs backslash u005C "reverse solidus"
+.
+.Pa
+.I Text markers
+.P
+.2s ci circle u25CB "+"
+.C2 bu bullet u2022 "+"
+.C2 dd daggerdbl u2021 "double dagger sign +"
+.C2 dg dagger u2020 "+"
+.C2 lz lozenge u25CA
+.C2 sq uni25A1 u25A1 "white square +"
+.C2 ps paragraph u00B6
+.C2 sc section u00A7 "+"
+.C2 lh uni261C u261C "hand pointing left +"
+.C2 rh a14 u261E "hand pointing right +"
+.C2 at at u0040
+.C2 sh numbersign u0023
+.C2 CR carriagereturn u21B5
+.2e OK a19 u2713 "check mark, tick"
+.
+.Pa
+.I Legalize
+.P
+.2s co copyright u00A9 "+"
+.C2 rg registered u00AE "+"
+.C2 tm trademark u2122
+.2e bs --- --- "AT&T Bell Labs logo (not used in groff) +"
 .
+.Pa
+.I Currency symbols
 .P
+.2s Do dollar u0024
+.C2 ct cent u00A2 "+"
+.C2 eu --- u20AC "official Euro symbol"
+.C2 Eu Euro u20AC "font-specific Euro glyph variant"
+.C2 Ye yen u00A5
+.C2 Po sterling u00A3 "British currency sign"
+.C2 Cs currency u00A4 "Scandinavian currency sign"
+.2e Fn florin u0192 "Dutch currency sign"
+.
+.Pa
 .I Units
-.C2 de degree
-.C2 %0 perthousand "per thousand, per mille sign"
-.C2 fm minute "footmark, prime"
-.C2 sd second
-.C2 mc mu "micro sign"
-.C2 Of ordfeminine
-.C2 Om ordmasculine
-.
 .P
+.2s de degree u00B0 "+"
+.C2 %0 perthousand u2030 "per thousand, per mille sign"
+.C2 fm minute u2032 "footmark, prime +"
+.C2 sd second u2033
+.C2 mc mu u00B5 "micro sign"
+.C2 Of ordfeminine u00AA
+.2e Om ordmasculine u00BA
+.
+.Pa
 .I Logical Symbols
-.C2 AN logicaland
-.C2 OR logicalor
-.C2 no logicalnot
-.C2 te existential "there exists, existential quantifier"
-.C2 fa universal "for all, universal quantifier"
-.C2 st suchthat
-.C2 3d therefore
-.C2 tf therefore
-.
 .P
+.2s AN logicaland u2227
+.C2 OR logicalor u2228
+.C2 no logicalnot u00AC "+"
+.CN tno logicalnot u00AC "text variant of `no'"
+.C2 te existential u2203 "there exists, existential quantifier"
+.C2 fa universal u2200 "for all, universal quantifier"
+.C2 st suchthat u220B
+.C2 3d therefore u2234
+.C2 tf therefore u2234
+.
+.2e or bar u007C "bitwise OR operator (as used in C) +"
+.
+.Pa
 .I Mathematical Symbols
-.C2 12 onehalf
-.C2 14 onequarter
-.C2 34 threequarters
-.C2 S1 onesuperior
-.C2 S2 twosuperior
-.C2 S3 threesuperior
-.
-.C2 pl plusmath "plus sign in special font"
-.C1 - minus "minus sign from current font"
-.C2 -+ minusplus
-.C2 +- plusminus
-.CN t+- plusminus "text variant of `+-'"
-.C2 pc periodcentered "multiplication dot"
-.C2 md dotmath
-.C2 mu multiply
-.CN tmu multiply "text variant of `mu'"
-.C2 c* circlemultiply "multiply sign in a circle"
-.C2 c+ circleplus "plus sign in a circle"
-.C2 di divide "division sign"
-.CN tdi divide "text variant of `di'"
-.C2 f/ fraction "bar for fractions"
-.C2 ** asteriskmath
-.
-.C2 <= lessequal
-.C2 >= greaterequal
-.C2 << \& "much less"
-.C2 >> \& "much greater"
-.C2 != notequal
-.C2 eq equalmath "equals sign in special font"
-.C2 == equivalence
-.C2 =~ congruent
-.C2 ap similar
-.C2 ~~ approxequal
-.C2 ~= approxequal
-.C2 pt proportional
-.
-.C2 es emptyset
-.C2 mo element
-.C2 nm notelement
-.C2 nb notsubset
-.C2 nc notpropersuperset
-.C2 ne notequivalence
-.C2 sb propersubset
-.C2 sp propersuperset
-.C2 ib reflexsubset
-.C2 ip reflexsuperset
-.C2 ca intersection "intersection, cap"
-.C2 cu union "union, cup"
-.
-.C2 /_ angle
-.C2 pp perpendicular
-.C2 is integral
-.CN sum sum
-.CN product product
-.C2 gr gradient
-.C2 sr radical "square root"
-.C2 rn \& overline "continuation of square root"
-.
-.C2 if infinity
-.C2 Ah aleph
-.C2 Im Ifraktur "Gothic I, imaginary"
-.C2 Re Rfraktur "Gothic R, real"
-.C2 wp weierstrass "Weierstrass p"
-.C2 pd partialdiff "partial differentiation sign"
-.
 .P
+.2s 12 onehalf u00BD "+"
+.C2 14 onequarter u00BC "+"
+.C2 34 threequarters u00BE "+"
+.C2 18 oneeighth u215B
+.C2 38 threeeighths u215C
+.C2 58 fiveeighths u215D
+.C2 78 seveneighths u215E
+.C2 S1 onesuperior u00B9
+.C2 S2 twosuperior u00B2
+.C2 S3 threesuperior u00B3
+.
+.C2 pl plus u002B "plus sign in special font +"
+.C2 mi minus u2212 "minus sign in special font +"
+.C2 -+ uni2213 u2213
+.C2 +- plusminus u00B1 "+"
+.CN t+- plusminus u00B1 "text variant of `+\-'"
+.C2 pc periodcentered u00B7
+.C2 md dotmath u22C5 "multiplication dot"
+.C2 mu multiply u00D7 "+"
+.CN tmu multiply u00D7 "text variant of `mu'"
+.C2 c* circlemultiply u2297 "multiply sign in a circle"
+.C2 c+ circleplus u2295 "plus sign in a circle"
+.C2 di divide u00F7 "division sign +"
+.CN tdi divide u00F7 "text variant of `di'"
+.C2 f/ fraction u2044 "bar for fractions"
+.C2 ** asteriskmath u2217 "+"
+.
+.C2 <= lessequal u2264 "+"
+.C2 >= greaterequal u2265 "+"
+.C2 << uni226A u226A "much less"
+.C2 >> uni226B u226B "much greater"
+.C2 eq equal u003D "equals sign in special font +"
+.C2 != notequal u003D_0338 "+"
+.C2 == equivalence u2261 "+"
+.C2 ne uni2262 u2261_0338
+.C2 =~ congruent u2245 "approx.\& equal"
+.C2 |= uni2243 u2243 "asymptot.\& equal to +"
+.C2 ap similar u223C "+"
+.C2 ~~ approxequal u2248 "almost equal to"
+.C2 ~= approxequal u2248
+.C2 pt proportional u221D "+"
+.
+.C2 es emptyset u2205 "+"
+.C2 mo element u2208 "+"
+.C2 nm notelement u2208_0338
+.C2 sb propersubset u2282 "+"
+.C2 nb notsubset u2282_0338
+.C2 sp propersuperset u2283 "+"
+.C2 nc uni2285 u2283_0338 "not superset"
+.C2 ib reflexsubset u2286 "+"
+.C2 ip reflexsuperset u2287 "+"
+.C2 ca intersection u2229 "intersection, cap +"
+.C2 cu union u222A "union, cup +"
+.
+.C2 /_ angle u2220
+.C2 pp perpendicular u22A5
+.C2 is integral u222B "+"
+.CN integral integral u222B "***"
+.CN sum summation u2211 "***"
+.CN product product u220F "***"
+.C2 gr gradient u2207 "+"
+.C2 sr radical u221A "square root +"
+.CN sqrt radical u221A "***"
+.CN radicalex radicalex --- "continuation of square root"
+.CN sqrtex radicalex --- "***"
+.
+.C2 lc uni2308 u2308 "left ceiling +"
+.C2 rc uni2309 u2309 "right ceiling +"
+.C2 lf uni230A u230A "left floor +"
+.C2 rf uni230B u230B "right floor +"
+.
+.C2 if infinity u221E "+"
+.C2 Ah aleph u2135
+.C2 Im Ifraktur u2111 "Gothic I, imaginary"
+.C2 Re Rfraktur u211C "Gothic R, real"
+.C2 wp weierstrass u2118 "Weierstrass p"
+.C2 pd partialdiff u2202 "partial differentiation sign +"
+.C2 -h uni210F u210F "Planck constant over two pi"
+.2e hbar uni210F u210F
+.
+.Pa
 .I Greek characters
-.C2 *A Alpha
-.C2 *B Beta
-.C2 *C Xi
-.C2 *D Delta
-.C2 *E Epsilon
-.C2 *F Phi
-.C2 *G Gamma
-.C2 *H Theta
-.C2 *I Iota
-.C2 *K Kappa
-.C2 *L Lambda
-.C2 *M Mu
-.C2 *N Nu
-.C2 *O Omicron
-.C2 *P Pi
-.C2 *Q Psi
-.C2 *R Rho
-.C2 *S Sigma
-.C2 *T Tau
-.C2 *U Upsilon
-.C2 *W Omega
-.C2 *X Chi
-.C2 *Y Eta
-.C2 *Z Zeta
-.C2 *a alpha
-.C2 *b beta
-.C2 *c xi
-.C2 *d delta
-.C2 *e epsilon
-.C2 *f phi
-.C2 +f phi1 "variant phi"
-.C2 *g gamma
-.C2 *h theta
-.C2 +h theta1 "variant theta"
-.C2 *i iota
-.C2 *k kappa
-.C2 *l lambda
-.C2 *m mu
-.C2 *n nu
-.C2 *o omicron
-.C2 *p pi
-.C2 +p omega1 "variant pi, looking like omega"
-.C2 *q psi
-.C2 *r rho
-.C2 *s sigma
-.C2 *t tau
-.C2 *u upsilon
-.C2 *w omega
-.C2 *x chi
-.C2 *y eta
-.C2 *z zeta
-.C2 ts sigma1 "terminal sigma"
+.P
+These glyphs are intended for technical use, not for real Greek; normally,
+the uppercase letters have upright shape, and the lowercase ones are
+slanted.
+.
+There is a problem with the mapping of letter phi to Unicode.
+.
+Prior to Unicode version\ 3.0, the difference between U+03C6, GREEK
+SMALL LETTER PHI, and U+03D5, GREEK PHI SYMBOL, was not clearly described;
+only the glyph shapes in the Unicode book could be used as a reference.
 .
+Starting with Unicode\ 3.0, the reference glyphs have been exchanged and
+described verbally also: In mathematical context, U+03D5 is the stroked
+variant and U+03C5 the curly glyph.
+.
+Unfortunately, most font vendors didn't update their fonts to
+this (incompatible) change in Unicode.
+.
+At the time of this writing (February 2003), it is not clear yet whether
+the Adobe Glyph Names `phi' and `phi1' also change its meaning if used for
+mathematics, thus compatibility problems are likely to happen \(en being
+conservative, groff currently assumes that `phi' in a PostScript symbol
+font is the stroked version.
 .P
+In groff, symbol `\f(CW\e[*f]\fP' always denotes the stroked version of
+phi, and `\f(CW\e[+f]\fP' the curly variant.
+.P
+.2s *A Alpha u0391 "+"
+.C2 *B Beta u0392 "+"
+.C2 *G Gamma u0393 "+"
+.C2 *D Delta u0394 "+"
+.C2 *E Epsilon u0395 "+"
+.C2 *Z Zeta u0396 "+"
+.C2 *Y Eta u0397 "+"
+.C2 *H Theta u0398 "+"
+.C2 *I Iota u0399 "+"
+.C2 *K Kappa u039A "+"
+.C2 *L Lambda u039B "+"
+.C2 *M Mu u039C "+"
+.C2 *N Nu u039D "+"
+.C2 *C Xi u039E "+"
+.C2 *O Omicron u039F "+"
+.C2 *P Pi u03A0 "+"
+.C2 *R Rho u03A1 "+"
+.C2 *S Sigma u03A3 "+"
+.C2 *T Tau u03A4 "+"
+.C2 *U Upsilon u03A5 "+"
+.C2 *F Phi u03A6 "+"
+.C2 *X Chi u03A7 "+"
+.C2 *Q Psi u03A8 "+"
+.C2 *W Omega u03A9 "+"
+.C2 *a alpha u03B1 "+"
+.C2 *b beta u03B2 "+"
+.C2 *g gamma u03B3 "+"
+.C2 *d delta u03B4 "+"
+.C2 *e epsilon u03B5 "+"
+.C2 *z zeta u03B6 "+"
+.C2 *y eta u03B7 "+"
+.C2 *h theta u03B8 "+"
+.C2 *i iota u03B9 "+"
+.C2 *k kappa u03BA "+"
+.C2 *l lambda u03BB "+"
+.C2 *m mu u03BC "+"
+.C2 *n nu u03BD "+"
+.C2 *c xi u03BE "+"
+.C2 *o omicron u03BF "+"
+.C2 *p pi u03C0 "+"
+.C2 *r rho u03C1 "+"
+.C2 ts sigma1 u03C2 "terminal sigma +"
+.C2 *s sigma u03C3 "+"
+.C2 *t tau u03C4 "+"
+.C2 *u upsilon u03C5 "+"
+.C2 *f phi u03D5 "(stroked glyph)+"
+.C2 *x chi u03C7 "+"
+.C2 *q psi u03C8 "+"
+.C2 *w omega u03C9 "+"
+.C2 +h theta1 u03D1 "variant theta"
+.C2 +f phi1 u03C6 "variant phi (curly shape)"
+.C2 +p omega1 u03D6 "variant pi, looking like omega"
+.2e +e uni03F5 u03F5 "variant epsilon"
+.
+.Pa
 .I Card symbols
-.C2 CL club "club suit"
-.C2 SP spade "spade suit"
-.C2 HE heart "heart suit"
-.C2 DI diamond "diamond suit"
-.ch Fo
+.P
+.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 DI diamond u2666 "black diamond suit"
+.2e u2661 uni2661 u2661 "white diamond suit"
 .
 .
 .\" --------------------------------------------------------------------
 .SH "AUTHOR"
 .\" --------------------------------------------------------------------
 .
-Copyright \(co 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright \(co 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/contrib/groff/man/groff_diff.man b/contrib/groff/man/groff_diff.man
index c6c1c23..eb00b44 100644
--- a/contrib/groff/man/groff_diff.man
+++ b/contrib/groff/man/groff_diff.man
@@ -3,12 +3,12 @@
 .ig
 groff_diff.man
 
-Last update : 05 July 2002
+Last update : 1 Mar 2003
 
 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 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
 written by James Clark
 
 modified by Werner Lemberg <wl@gnu.org>
@@ -143,17 +143,6 @@ and the modern
 .I groff
 documentation.
 .
-.P
-At the moment, this document is the place of the most actual
-documentation within the
-.I groff
-system.
-.
-This might change in the future.
-.
-Actually, all novelties of the groff language are first described here
-and will pervade into the other documents only at a later stage.
-.
 .
 .\" --------------------------------------------------------------------
 .SH "GROFF LANGUAGE"
@@ -171,20 +160,33 @@ are described in detail.
 .\" --------------------------------------------------------------------
 .
 The names of number registers, fonts, strings/\:macros/\:diversions,
-special characters, and colors can be of any length.
+special characters (glyphs), and colors can be of any length.
 .
 In escape sequences, additionally to the classical
 .BI ( xx
-construction for a two character name, you can use
+construction for a two-character name, you can use
 .BI [ xxx ]
-for a name of arbitrary length, for example in
+for a name of arbitrary length.
 .
-.TP \w'\[rs]f[xxx]'u+3n
+.TP
 .BI \[rs][ xxx ]
-Print the special character called
+Print the special character (glyph) called
 .IR xxx .
 .
 .TP
+.BI \[rs][ "comp1 comp2 .\|.\|." ]
+Print composite glyph consisting of multiple components.
+.
+Example: `\[rs][A\~ho]' is capital letter A with ogonek which finally maps
+to glyph name `u0041_0328'.
+.
+See the
+.I groff info file
+for details how a glyph name for a composite glyph is constructed, and
+.BR groff_char (@MAN7EXT@)
+for list of glyph name components used composite glyph names.
+.
+.TP
 .BI \[rs]f[ xxx ]
 Set font
 .IR xxx .
@@ -387,7 +389,7 @@ is empty.
 .
 .TP
 .BI \[rs]C' xxx '
-Typeset character named
+Typeset glyph named
 .IR xxx .
 Normally it is more convenient to use
 .BI \[rs][ xxx ]\f[R].
@@ -463,15 +465,15 @@ switches back to the previous color.
 .
 .TP
 .BI \[rs]N' n '
-Typeset the character with code
+Typeset the glyph with index
 .I n
 in the current font.
 .I n
 can be any integer.
 .
-Most devices only have characters with codes between 0 and 255.
+Most devices only have glyphs with indices between 0 and 255.
 .
-If the current font does not contain a character with that code,
+If the current font does not contain a glyph with that code,
 special fonts will
 .I not
 be searched.
@@ -490,12 +492,12 @@ request, for example
 .RE
 .
 .IP
-The code of each character is given in the fourth column in the font
+The index of each glyph is given in the fourth column in the font
 description file after the
 .B charset
 command.
 .
-It is possible to include unnamed characters in the font description
+It is possible to include unnamed glyphs in the font description
 file by using a name of
 .BR \-\-\- ;
 the
@@ -756,9 +758,9 @@ will print\~\c
 .
 .TP
 .B \[rs]/
-This increases the width of the preceding character so that the
-spacing between that character and the following character will be
-correct if the following character is a roman character.
+This increases the width of the preceding glyph so that the
+spacing between that glyph and the following glyph will be
+correct if the following glyph is a roman glyph.
 .
 .if t \{\
 .  nop For example, if an italic f is immediately followed by a roman
@@ -773,14 +775,14 @@ correct if the following character is a roman character.
 .  nop and avoids this problem.
 .\}
 It is a good idea to use this escape sequence whenever an italic
-character is immediately followed by a roman character without any
+glyph is immediately followed by a roman glyph without any
 intervening space.
 .
 .TP
 .B \[rs],
-This modifies the spacing of the following character so that the
-spacing between that character and the preceding character will
-correct if the preceding character is a roman character.
+This modifies the spacing of the following glyph so that the
+spacing between that glyph and the preceding glyph will
+correct if the preceding glyph is a roman glyph.
 .
 .if t \{\
 .  nop For example, inserting
@@ -791,7 +793,7 @@ correct if the preceding character is a roman character.
 .  el       \f[R](\^\f[I]f\f[R].
 .\}
 It is a good idea to use this escape sequence whenever a roman
-character is immediately followed by an italic character without any
+glyph is immediately followed by an italic glyph without any
 intervening space.
 .
 .TP
@@ -1037,19 +1039,19 @@ hyphenation codes.
 .
 .IP 4
 Lines can be broken after the character (initially characters
-.B \-\[rs](hy\[rs](em
+.B \-\[rs][hy]\[rs][em]
 have this property); a line will not be broken at a character with
 this property unless the characters on each side both have non-zero
 hyphenation codes.
 .
 .IP 8
 The character overlaps horizontally (initially characters
-.B \[rs](ul\[rs](rn\[rs](ru
+.B \[rs][ul]\[rs][rn]\[rs][ru]\[rs][radicalex]\[rs][sqrtex]
 have this property).
 .
 .IP 16
 The character overlaps vertically (initially character
-.B \[rs](br
+.B \[rs][br]
 has this property).
 .
 .IP 32
@@ -1064,11 +1066,11 @@ have this property).
 .
 .TP
 .BI .char\  c\ string
-Define character
+Define glyph
 .I c
 to be
 .IR string .
-Every time character
+Every time glyph
 .I c
 needs to be printed,
 .I string
@@ -1083,12 +1085,12 @@ while
 is being processed.
 .
 Any emboldening, constant spacing or track kerning will be applied to
-this object rather than to individual characters in
+this object rather than to individual glyphs in
 .IR string .
 .
 .IP
-A character defined by this request can be used just like a normal
-character provided by the output device.
+A glyph defined by this request can be used just like a normal
+glyph provided by the output device.
 .
 In particular other characters can be translated to it with the
 .B tr
@@ -1104,18 +1106,18 @@ correctly, if the
 request is used to give the character a hyphenation code.
 .
 .IP
-There is a special anti-recursion feature: use of character within the
-character's definition will be handled like normal characters not
+There is a special anti-recursion feature: Use of glyph within the
+glyph's definition will be handled like normal glyphs not
 defined with
 .BR char .
 .IP
-A character definition can be removed with the
+A glyph definition can be removed with the
 .B rchar
 request.
 .
 .TP
 .BI .chop\  xx
-Chop the last character off macro, string, or diversion
+Chop the last element off macro, string, or diversion
 .IR xx .
 This is useful for removing the newline from the end of diversions
 that are to be interpolated as strings.
@@ -1134,6 +1136,16 @@ See the
 request.
 .
 .TP
+.BI .composite\  glyph1\ glyph2
+Map glyph name
+.I glyph1
+to glyph name
+.I glyph2
+if it is used in
+.BI \[rs][ ... ]
+with more than one component.
+.
+.TP
 .B .continue
 Finish the current iteration of a while loop.
 .
@@ -1350,29 +1362,49 @@ request for more information on font families.
 .
 .TP
 .BI .fchar\  c\ string
-Define fallback character
+Define fallback glyph
 .I c
 to be
 .IR string .
+.
 The syntax of this request is the same as the
 .B char
-request; the only difference is that a character defined with
+request; the only difference is that a glyph defined with
 .B char
 hides the glyph with the same name in the current font, whereas a
-character defined with
+glyph defined with
 .B fchar
 is checked only if the particular glyph isn't found in the current font.
 .
 This test happens before checking special fonts.
 .
 .TP
+.BI .fschar\  f\ c\ string
+Define fallback glyph
+.I c
+for font
+.I f
+to be
+.IR string .
+.
+The syntax of this request is the same as the
+.B char
+request (with an additional argument to specify the font); a glyph
+defined with
+.B fschar
+is searched after the list of fonts declared with the
+.B fspecial
+request but before the list of fonts declared with
+.BR special .
+.
+.TP
 .BI .fspecial\  f\ s1\ s2\|.\|.\|.\&
 When the current font is
 .IR f ,
 fonts
 .IR s1 ,
 .IR s2 ,\|.\|.\|.\&
-will be special, that is, they will searched for characters not in
+will be special, that is, they will searched for glyphs not in
 the current font.
 .
 Any fonts specified in the
@@ -1381,6 +1413,8 @@ request will be searched after fonts specified in the
 .B fspecial
 request.
 .
+Without argument, reset the list of global special fonts to be empty.
+.
 .TP
 .BI .ftr\  f\ g
 Translate font
@@ -1845,7 +1879,7 @@ with a positive value which are applied after the line is output.
 .
 .TP
 .BI .rchar\  c1\ c2\|.\|.\|.\&
-Remove the definitions of characters
+Remove the definitions of glyphs
 .IR c1 ,
 .IR c2 ,\|.\|.\|.
 This undoes the effect of a
@@ -1859,6 +1893,15 @@ Within a macro, return immediately.
 No effect otherwise.
 .
 .TP
+.BI .rfschar\  c1\ c2\|.\|.\|.\&
+Remove the font-specific definitions of glyphs
+.IR c1 ,
+.IR c2 ,\|.\|.\|.
+This undoes the effect of a
+.B fschar
+request.
+.
+.TP
 .B .rj
 .TQ
 .BI .rj \~n
@@ -1887,6 +1930,21 @@ to
 .IR yy .
 .
 .TP
+.BI .schar\  c\ string
+Define global fallback glyph
+.I c
+to be
+.IR string .
+.
+The syntax of this request is the same as the
+.B char
+request; a glyph defined with
+.B schar
+is searched after the list of fonts declared with the
+.B special
+request but before the mounted special fonts.
+.
+.TP
 .BI .shc\  c
 Set the soft hyphen character to
 .IR c .
@@ -1894,11 +1952,11 @@ If
 .I c
 is omitted, the soft hyphen character will be set to the default
 .BR \[rs](hy .
-The soft hyphen character is the character which will be inserted when
+The soft hyphen character is the glyph which will be inserted when
 a word is hyphenated at a line break.
 .
 If the soft hyphen character does not exist in the font of the
-character immediately preceding a potential break point, then the line
+glyph immediately preceding a potential break point, then the line
 will not be broken at that point.
 .
 Neither definitions (specified with the
@@ -1954,9 +2012,11 @@ than a single line.
 Fonts
 .IR s1 ,
 .IR s2 ,
-are special and will be searched for characters not in the current
+are special and will be searched for glyphs not in the current
 font.
 .
+Without arguments, reset the list of special fonts to be empty.
+.
 .TP
 .BI .spreadwarn\  limit
 Make
@@ -2064,7 +2124,7 @@ Enable track kerning for font
 .IR f .
 When the current font is
 .I f
-the width of every character will be increased by an amount between
+the width of every glyph will be increased by an amount between
 .I n1
 and
 .IR n2 ;
@@ -2276,7 +2336,7 @@ For example,
 .B .warn\~0
 will disable all warnings, and
 .B .warn\~1
-will disable all warnings except that about missing characters.
+will disable all warnings except that about missing glyphs.
 .
 If
 .I n
@@ -2359,6 +2419,19 @@ is read in copy mode.
 .
 .
 .\" --------------------------------------------------------------------
+.SS "Extended escape sequences"
+.\" --------------------------------------------------------------------
+.
+.TP
+.BI \[rs]D' .\|.\|. '
+All drawing commands of groff's intermediate output are accepted.
+.
+See subsection
+.B "Drawing Commands"
+below for more information.
+.
+.
+.\" --------------------------------------------------------------------
 .SS "Extended requests"
 .\" --------------------------------------------------------------------
 .
@@ -2463,9 +2536,9 @@ The following read-only registers are available:
 .
 .TP
 .B \[rs]n[.cdp]
-The depth of the last character added to the current environment.
+The depth of the last glyph added to the current environment.
 .
-It is positive if the character extends below the baseline.
+It is positive if the glyph extends below the baseline.
 .
 .TP
 .B \[rs]n[.ce]
@@ -2475,9 +2548,9 @@ request.
 .
 .TP
 .B \[rs]n[.cht]
-The height of the last character added to the current environment.
+The height of the last glyph added to the current environment.
 .
-It is positive if the character extends above the baseline.
+It is positive if the glyph extends above the baseline.
 .
 .TP
 .B \[rs]n[.color]
@@ -2485,12 +2558,12 @@ It is positive if the character extends above the baseline.
 .
 .TP
 .B \[rs]n[.csk]
-The skew of the last character added to the current environment.
+The skew of the last glyph added to the current environment.
 .
 The
 .I skew
-of a character is how far to the right of the center of a character
-the center of an accent over that character should be placed.
+of a glyph is how far to the right of the center of a glyph
+the center of an accent over that glyph should be placed.
 .
 .TP
 .B \[rs]n[.ev]
@@ -2526,6 +2599,11 @@ Macros should use this to determine whether they are running under GNU
 troff.
 .
 .TP
+.B \[rs]n[.height]
+The current height of the font as set with
+.BR \[rs]H .
+.
+.TP
 .B \[rs]n[.hla]
 The current hyphenation language as set by the
 .B hla
@@ -2611,6 +2689,12 @@ register.
 1\~if no-space mode is active, 0\~otherwise.
 .
 .TP
+.B \[rs]n[.pe]
+1\~during a page ejection caused by the
+.B bp
+request, 0\~otherwise.
+.
+.TP
 .B \[rs]n[.pn]
 The number of the next page, either the value set by a
 .B pn
@@ -2637,6 +2721,11 @@ The number of lines to be right-justified as set by the
 request.
 .
 .TP
+.B \[rs]n[.slant]
+The slant of the current font as set with
+.BR \[rs]S .
+.
+.TP
 .B \[rs]n[.sr]
 The last requested pointsize in points as a decimal fraction.
 .
@@ -2733,19 +2822,19 @@ Like the
 .B st
 and
 .B sb
-registers, but take account of the heights and depths of characters.
+registers, but take account of the heights and depths of glyphs.
 .
 .TP
 .B \[rs]n[ssc]
 The amount of horizontal space (possibly negative) that should be
-added to the last character before a subscript.
+added to the last glyph before a subscript.
 .
 .TP
 .B \[rs]n[skw]
-How far to right of the center of the last character in the
+How far to right of the center of the last glyph in the
 .B \[rs]w
 argument, the center of an accent from a roman font should be placed
-over that character.
+over that glyph.
 .
 .P
 Other available read/write number registers are:
@@ -2860,9 +2949,9 @@ is
 .
 .P
 If the font description file contains pairwise kerning information,
-characters from that font will be kerned.
+glyphs from that font will be kerned.
 .
-Kerning between two characters can be inhibited by placing a
+Kerning between two glyphs can be inhibited by placing a
 .B \[rs]&
 between them.
 .
@@ -2932,13 +3021,13 @@ True if there is a color named
 .
 .TP
 .BI .if\ c ch
-True if there is a character
+True if there is a glyph
 .IR ch
 available;
 .I ch
 is either an
 .SM ASCII
-character or a special character
+character or a glyph (special character)
 .BI \[rs]( xx
 or
 .BI \[rs][ xxx ]\f[R];
@@ -3014,7 +3103,7 @@ command is also in scaled points.
 .
 .TP
 .BI N n
-Print character with index\~\c
+Print glyph with index\~\c
 .I n
 (a non-negative integer) of the current font.
 .
@@ -3027,12 +3116,13 @@ commands.
 .TP
 .BI t xxx
 .I xxx
-is any sequence of characters terminated by a space or a newline; the
-first character should be printed at the current position, the current
-horizontal position should be increased by the width of the first
-character, and so on for each character.
+is any sequence of characters terminated by a space or a newline (to
+be more precise, it is a sequence of glyphs which are accessed with
+the corresponding characters); the first character should be printed at
+the current position, the current horizontal position should be increased
+by the width of the first character, and so on for each character.
 .
-The width of the character is that given in the font file,
+The width of the glyph is that given in the font file,
 appropriately scaled for the current point size, and rounded so that
 it is a multiple of the horizontal resolution.
 .
@@ -3052,15 +3142,15 @@ Note that single characters can have the eighth bit set, as can the
 names of fonts and special characters.
 .
 .P
-The names of characters and fonts can be of arbitrary length; drivers
+The names of glyphs and fonts can be of arbitrary length; drivers
 should not assume that they will be only two characters long.
 .
 .P
-When a character is to be printed, that character will always be
+When a glyph is to be printed, that glyph will always be
 in the current font.
 .
 Unlike device-independent troff, it is not necessary for drivers to
-search special fonts to find a character.
+search special fonts to find a glyph.
 .
 .P
 For color support, some new commands have been added:
@@ -3139,6 +3229,13 @@ text.
 Normally this will be black, but some drivers may provide a way of
 changing this.
 .
+.IP
+The corresponding
+.BI \[rs]D'f .\|.\|. '
+command shouldn't be used since its argument is always rounded to an
+integer multiple of the horizontal resolution which can lead to
+surprising results.
+.
 .TP
 .Text \f[B]DC \f[I]d\f[R]\*[ic]\[rs]n
 Draw a solid circle with a diameter of
@@ -3230,7 +3327,9 @@ exception of
 .BR De .
 For the sake of compatibility GNU troff also follows this rule, even
 though it produces an ugly result in the case of the
-.BR Dt ,
+.B Dt
+and
+.BR Df ,
 and, to a lesser extent,
 .B DE
 commands.
@@ -3265,11 +3364,8 @@ Set the color components of the filling color similar to the
 commands above.
 .
 .P
-Note that
-.B Df
-is now mapped onto
-.BR DFg .
-The current position isn't changed by those colour commands.
+The current position isn't changed by those colour commands (contrary to
+.BR Df ).
 .
 .
 .\" --------------------------------------------------------------------
@@ -3445,10 +3541,10 @@ pointsize will be set to 10\~scaled points.
 In
 .I groff
 mode, there is a fundamental difference between unformatted input
-characters, and formatted output characters.
+characters, and formatted output characters (glyphs).
 .
-Everything that affects how an output character will be output is
-stored with the character; once an output character has been
+Everything that affects how a glyph will be output is
+stored with the glyph; once a glyph has been
 constructed it is unaffected by any subsequent requests that are
 executed, including the
 .request bd ,
@@ -3460,16 +3556,20 @@ or
 requests.
 .
 .P
-Normally output characters are constructed from input characters at
-the moment immediately before the character is added to the current
+Normally glyphs are constructed from input characters at
+the moment immediately before the glyph is added to the current
 output line.
 .
 Macros, diversions and strings are all, in fact, the same type of
-object; they contain lists of input characters and output characters
+object; they contain lists of input characters and glyphs
 in any combination.
 .
 .P
-An output character does not behave like an input character for the
+Special characters can be both; before being added to the output, they
+act as input entities, afterwards they denote glyphs.
+.
+.P
+A glyph does not behave like an input character for the
 purposes of macro processing; it does not inherit any of the special
 properties that the input character from which it was constructed
 might have had.
@@ -3496,7 +3596,7 @@ this will be printed as
 .esc \[rs] .
 So each pair of input backslashes
 .squoted \[rs]\[rs]
-is turned into a single output backslash
+is turned into a single output backslash glyph
 .squoted \[rs]
 and the resulting output backslashes are not interpreted as escape
 characters when they are reread.
@@ -3562,7 +3662,7 @@ classical "device-independent" troff did.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/contrib/groff/man/groff_font.man b/contrib/groff/man/groff_font.man
index 07fe520..462baeb 100644
--- a/contrib/groff/man/groff_font.man
+++ b/contrib/groff/man/groff_font.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-1995, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -105,20 +105,13 @@ The physical vertical dimension of the output medium in machine units.
 .
 This isn't used by
 .B troff
-itself; currently, only
-.B grops
-uses it.
+itself but by output devices.
 .
-.TP
-.BI paperwidth\  n
-The physical horizontal dimension of the output medium in machine units.
-.
-This isn't used by
-.BR troff .
+Deprecated.
 .
-Currently, only the
-.B grolbp
-output device uses it.
+Use
+.B papersize
+instead.
 .
 .TP
 .BI papersize\  string
@@ -167,6 +160,19 @@ More than one argument can be specified;
 .B groff
 scans from left to right and uses the first valid paper specification.
 .
+.TP
+.BI paperwidth\  n
+The physical horizontal dimension of the output medium in machine units.
+.
+Deprecated.
+.
+Use
+.B papersize
+instead.
+.
+This isn't used by
+.BR troff
+itself but by output devices.
 .
 .TP
 .B pass_filenames
@@ -286,10 +292,10 @@ and
 .B sizes
 lines are compulsory.
 .
-Other commands are ignored by
+Not all commands in the DESC file are used by
 .B troff
-but may be used by postprocessors to store arbitrary information
-about the device in the DESC file.
+itself; some of the keywords (or even additional ones) are used by
+postprocessors to store arbitrary information about the device.
 .
 .LP
 Here a list of obsolete keywords which are recognized by
diff --git a/contrib/groff/man/groff_out.man b/contrib/groff/man/groff_out.man
index 5fe7dcc..b45e82f 100644
--- a/contrib/groff/man/groff_out.man
+++ b/contrib/groff/man/groff_out.man
@@ -3,11 +3,11 @@
 .ig
 groff_out.5
 
-Last update: 12 Sep 2002
+Last update: 13 Apr 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 1989, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
 rewritten from scrach 2001 by Bernd Warken <bwarken@mayn.de>
 
 Permission is granted to copy, distribute and/or modify this document
@@ -719,10 +719,19 @@ red, green, and blue.
 .command N n
 Print character with index\~\c
 .argument n
-(a non-negative integer) of the current font.
+(an integer, normally non-negative) of the current font.
 .
 The print position is not changed.
 .
+If
+.B \-T\~html
+is used, negative values are emitted also to indicate an unbreakable space
+with given width.
+.
+For example,
+.B N\~-193
+represents an unbreakable space which has a width of 193u.
+.
 This command is a groff extension.
 .
 .
@@ -1290,7 +1299,7 @@ This is the second command of the prologue.
 .xsub Slant
 Set slant to\~\c
 .argument n
-(an integer in basic units\~\c
+degrees (an integer in basic units\~\c
 .unit u ).
 .
 .
@@ -1726,7 +1735,7 @@ Device description file for device
 .IR name .
 .
 .TP
-.IB \[la]groff_source_dir\[ra] /src/libs/libdriver/input.cc
+.IB \[la]groff_source_dir\[ra] /src/libs/libdriver/input.cpp
 Defines the parser and postprocessor for the intermediate output.
 .
 It is located relative to the top directory of the
@@ -1855,7 +1864,7 @@ see
 .SH "AUTHORS"
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
 .P
 This document is distributed under the terms of the FDL (GNU Free
 Documentation License) version 1.1 or later.
diff --git a/contrib/groff/man/groff_tmac.man b/contrib/groff/man/groff_tmac.man
index c0d3421..c1d8006 100644
--- a/contrib/groff/man/groff_tmac.man
+++ b/contrib/groff/man/groff_tmac.man
@@ -1,4 +1,3 @@
-.
 .TH GROFF_TMAC @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 groff_tmac \- macro files in the roff typesetting system
@@ -15,11 +14,11 @@ groff_tmac.5
 
 File position: <groff-source>/man/groff_tmac.man
 
-Last update: 21 Aug 2002
+Last update: 13 Mar 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de> and Werner Lemberg
 <wl@gnu.org>
 
@@ -314,6 +313,21 @@ directories.
 provides all classical macro packages, some more full packages, and
 some secondary packages for special purposes.
 .
+Note that it is not possible to use multiple primary macro packages at the
+same time; saying e.g.\&
+.
+.IP
+.Shell_cmd "groff \-m man \-m ms foo"
+.
+.P
+or
+.
+.IP
+.Shell_cmd "groff \-m man foo \-m ms bar"
+.
+.P
+will fail.
+.
 .
 .\" --------------------------------------------------------------------
 .SS "Man\~Pages"
@@ -394,6 +408,108 @@ macro package or to plain groff.
 .
 .
 .TP
+.B papersize
+This macro file is already loaded at start-up by
+.B @g@troff
+so it isn't necessary to call it explicitly.
+.
+It provides an interface to set the paper size on the command line with
+the option \f[B]\%\-dpaper=\f[]\f[I]size\f[].
+.
+Possible values for
+.I size
+are the same as the predefined
+.B papersize
+values in the DESC file (only lowercase; see
+.BR groff_font (@MAN5EXT@)
+for more) except
+.BR a7 - d7 .
+.
+An appended
+.B l
+(ell) character denotes landscape orientation.
+.
+Examples:
+.BR a4 ,
+.BR c3l ,
+.BR letterl .
+.
+.IP
+Most output drivers need additional command line switches
+.B \-p
+and
+.B \-l
+to override the default paper length and orientation as set in the driver
+specific DESC file.
+.
+For example, use the following for PS output on A4 paper in landscape
+orientation:
+.
+.IP
+.Shell_cmd "groff \-Tps \-dpaper=a4l \-P\-pa4 \-P\-l \-ms foo.ms > foo.ps"
+.
+.
+.TP
+.B pspic
+A single macro is provided in this file,
+.BR PSPIC ,
+to include a PostScript graphic in a document.
+.
+It makes only sense for output devices which support inclusion of PS
+images:
+.BR \-Tps ,
+.BR \-Tdvi ,
+and
+.BR \-Thtml ;
+the file is then loaded automatically.
+.
+Syntax:
+.RS
+.IP
+\&\fB.PSPIC\fP [\fB\-L\fP|\fB-R\fP|\fB\-I\fP \fIn\fP]\ \fI\|file\fP [\fIwidth\fP [\fIheight\fP]]
+.RE
+.
+.IP
+.I file
+is the name of the file containing the illustration;
+.I width
+and
+.I height
+give the desired width and height of the graphic.
+.
+The
+.I width
+and
+.I height
+arguments may have scaling indicators attached;
+the default scaling indicator is\~\c
+.BR i .
+.
+This macro will scale the graphic uniformly
+in the x and y\~directions so that it is no more than
+.I width
+wide
+and
+.I height
+high.
+.
+By default, the graphic will be horizontally centered.
+.
+The
+.BI \-L
+and
+.BI \-R
+options cause the graphic to be left-aligned and right-aligned,
+respectively.
+.
+The
+.B \-I
+option causes the graphic to be indented by\~\c
+.I n
+(default scaling indicator is\~\c
+.BR m ).
+.
+.TP
 .B tty-char
 Overrides the definition of standard troff characters and some groff
 characters for tty devices.
@@ -625,7 +741,7 @@ is used or
 .P
 In both cases, the formatter is called with
 .IP
-.Shell_cmd "troff\~\-s\~" docu.roff
+.Shell_cmd "groff\~\-s\~" docu.roff
 .
 .
 .P
@@ -796,12 +912,16 @@ say.
 .
 .P
 When calling this macro by
+.
 .P
 .Example
 .  Text .print_args arg1 arg2
 ./Example
+.
 .P
 the following text is printed to the terminal:
+.
+.P
 .Example
 .  Text \f[CI]print_args\f[] was called with the following 2 arguments:
 arg1 arg2
@@ -997,7 +1117,7 @@ All macro names must be named
 to fully use the tmac mechanism.
 .
 .BI tmac. name
-as with	classical packages is possible as well, but deprecated.
+as with classical packages is possible as well, but deprecated.
 .
 .
 .P
@@ -1060,7 +1180,7 @@ See the previous section for a detailed description.
 .SH AUTHOR
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
diff --git a/contrib/groff/man/roff.man b/contrib/groff/man/roff.man
index 5a9c5b5..621b362 100644
--- a/contrib/groff/man/roff.man
+++ b/contrib/groff/man/roff.man
@@ -1,11 +1,11 @@
 .ig
 roff.man
 
-Last update: 22 Apr 2002
+Last update: 3 Apr 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
 
@@ -269,7 +269,7 @@ operating system
 .RI ( "Compatible Time Sharing System" )
 as early as 1961.
 .
-When CTTS was further developed into the operating system
+When CTSS was further developed into the operating system
 .URL http://\:www.multicians.org "Multics" ,
 the famous predecessor of Unix from 1963,
 .I runoff
@@ -1105,9 +1105,6 @@ troff.org
 .URL http://\:www.troff.org "The historical troff site"
 provides an overview and pointers to all historical aspects of roff.
 .
-This web site is under construction; once, it will be the major source
-for roff history.
-.
 .TP
 Multics
 .URL http://\:www.multicians.org "The Multics site"
diff --git a/contrib/groff/src/devices/grodvi/Makefile.sub b/contrib/groff/src/devices/grodvi/Makefile.sub
index 74e627d..16dc24c 100644
--- a/contrib/groff/src/devices/grodvi/Makefile.sub
+++ b/contrib/groff/src/devices/grodvi/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grodvi.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=dvi.$(OBJEXT)
-CCSRCS=$(srcdir)/dvi.cc
+CCSRCS=$(srcdir)/dvi.cpp
diff --git a/contrib/groff/src/devices/grodvi/dvi.cpp b/contrib/groff/src/devices/grodvi/dvi.cpp
new file mode 100644
index 0000000..df16939
--- /dev/null
+++ b/contrib/groff/src/devices/grodvi/dvi.cpp
@@ -0,0 +1,973 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "nonposix.h"
+#include "paper.h"
+
+extern "C" const char *Version_string;
+
+#define DEFAULT_LINEWIDTH 40
+static int linewidth = DEFAULT_LINEWIDTH;
+
+static int draw_flag = 1;
+
+static int landscape_flag = 0;
+static double user_paper_length = 0;
+static double user_paper_width = 0;
+
+/* These values were chosen because:
+
+(MULTIPLIER*SIZESCALE)/(RES*UNITWIDTH) == 1/(2^20 * 72.27)
+
+and 57816 is an exact multiple of both 72.27*SIZESCALE and 72.
+
+The width in the groff font file is the product of MULTIPLIER and the
+width in the tfm file. */
+
+#define RES 57816
+#define RES_7227 (RES/7227)
+#define UNITWIDTH 131072
+#define SIZESCALE 100
+#define MULTIPLIER 1
+
+class dvi_font : public font {
+  dvi_font(const char *);
+public:
+  int checksum;
+  int design_size;
+  ~dvi_font();
+  void handle_unknown_font_command(const char *command, const char *arg,
+				   const char *filename, int lineno);
+  static dvi_font *load_dvi_font(const char *);
+};
+
+dvi_font *dvi_font::load_dvi_font(const char *s)
+{
+  dvi_font *f = new dvi_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+dvi_font::dvi_font(const char *nm)
+: font(nm), checksum(0), design_size(0)
+{
+}
+
+dvi_font::~dvi_font()
+{
+}
+
+void dvi_font::handle_unknown_font_command(const char *command,
+					   const char *arg,
+					   const char *filename, int lineno)
+{
+  char *ptr;
+  if (strcmp(command, "checksum") == 0) {
+    if (arg == 0)
+      fatal_with_file_and_line(filename, lineno,
+			       "`checksum' command requires an argument");
+    checksum = int(strtol(arg, &ptr, 10));
+    if (checksum == 0 && ptr == arg) {
+      fatal_with_file_and_line(filename, lineno, "bad checksum");
+    }
+  }
+  else if (strcmp(command, "designsize") == 0) {
+    if (arg == 0)
+      fatal_with_file_and_line(filename, lineno,
+			       "`designsize' command requires an argument");
+    design_size = int(strtol(arg, &ptr, 10));
+    if (design_size == 0 && ptr == arg) {
+      fatal_with_file_and_line(filename, lineno, "bad design size");
+    }
+  }
+}
+
+#define FONTS_MAX 256
+
+struct output_font {
+  dvi_font *f;
+  int point_size;
+  output_font() : f(0) { }
+};
+
+class dvi_printer : public printer {
+  FILE *fp;
+  int max_drift;
+  int byte_count;
+  int last_bop;
+  int page_count;
+  int cur_h;
+  int cur_v;
+  int end_h;
+  int max_h;
+  int max_v;
+  output_font output_font_table[FONTS_MAX];
+  font *cur_font;
+  int cur_point_size;
+  color cur_color;
+  int pushed;
+  int pushed_h;
+  int pushed_v;
+  int have_pushed;
+  void preamble();
+  void postamble();
+  void define_font(int);
+  void set_font(int);
+  void possibly_begin_line();
+  void set_color(color *);
+protected:
+  enum {
+    id_byte = 2,
+    set1 = 128,
+    put1 = 133,
+    put_rule = 137,
+    bop = 139,
+    eop = 140,
+    push = 141,
+    pop = 142,
+    right1 = 143,
+    down1 = 157,
+    fnt_num_0 = 171,
+    fnt1 = 235,
+    xxx1 = 239,
+    fnt_def1 = 243,
+    pre = 247,
+    post = 248,
+    post_post = 249,
+    filler = 223
+  };
+  int line_thickness;
+
+  void out1(int);
+  void out2(int);
+  void out3(int);
+  void out4(int);
+  void moveto(int, int);
+  void out_string(const char *);
+  void out_signed(unsigned char, int);
+  void out_unsigned(unsigned char, int);
+  void do_special(const char *);
+public:
+  dvi_printer();
+  ~dvi_printer();
+  font *make_font(const char *);
+  void begin_page(int);
+  void end_page(int);
+  void set_char(int, font *, const environment *, int w, const char *name);
+  void special(char *arg, const environment *env, char type);
+  void end_of_line();
+  void draw(int code, int *p, int np, const environment *env);
+};
+
+
+class draw_dvi_printer : public dvi_printer {
+  int output_pen_size;
+  void set_line_thickness(const environment *);
+  void fill_next(const environment *);
+public:
+  draw_dvi_printer();
+  ~draw_dvi_printer();
+  void draw(int code, int *p, int np, const environment *env);
+  void end_page(int);
+};
+
+dvi_printer::dvi_printer()
+: fp(stdout), byte_count(0), last_bop(-1), page_count(0), max_h(0), max_v(0),
+  cur_font(0), cur_point_size(-1), pushed(0), line_thickness(-1)
+{
+  if (font::res != RES)
+    fatal("resolution must be %1", RES);
+  if (font::unitwidth != UNITWIDTH)
+    fatal("unitwidth must be %1", UNITWIDTH);
+  if (font::hor != 1)
+    fatal("hor must be equal to 1");
+  if (font::vert != 1)
+    fatal("vert must be equal to 1");
+  if (font::sizescale != SIZESCALE)
+    fatal("sizescale must be equal to %1", SIZESCALE);
+  max_drift = font::res/1000;	// this is fairly arbitrary
+  preamble();
+}
+
+dvi_printer::~dvi_printer()
+{
+  postamble();
+}
+
+
+draw_dvi_printer::draw_dvi_printer()
+: output_pen_size(-1)
+{
+}
+
+draw_dvi_printer::~draw_dvi_printer()
+{
+}
+
+
+void dvi_printer::out1(int n)
+{
+  byte_count += 1;
+  putc(n & 0xff, fp);
+}
+
+void dvi_printer::out2(int n)
+{
+  byte_count += 2;
+  putc((n >> 8) & 0xff, fp);
+  putc(n & 0xff, fp);
+}
+
+void dvi_printer::out3(int n)
+{
+  byte_count += 3;
+  putc((n >> 16) & 0xff, fp);
+  putc((n >> 8) & 0xff, fp);
+  putc(n & 0xff, fp);
+}
+
+void dvi_printer::out4(int n)
+{
+  byte_count += 4;
+  putc((n >> 24) & 0xff, fp);
+  putc((n >> 16) & 0xff, fp);
+  putc((n >> 8) & 0xff, fp);
+  putc(n & 0xff, fp);
+}
+
+void dvi_printer::out_string(const char *s)
+{
+  out1(strlen(s));
+  while (*s != 0)
+    out1(*s++);
+}
+
+
+void dvi_printer::end_of_line()
+{
+  if (pushed) {
+    out1(pop);
+    pushed = 0;
+    cur_h = pushed_h;
+    cur_v = pushed_v;
+  }
+}
+
+void dvi_printer::possibly_begin_line()
+{
+  if (!pushed) {
+    have_pushed = pushed = 1;
+    pushed_h = cur_h;
+    pushed_v = cur_v;
+    out1(push);
+  }
+}
+
+int scale(int x, int z)
+{
+  int sw;
+  int a, b, c, d;
+  int alpha, beta;
+  alpha = 16*z; beta = 16;
+  while (z >= 040000000L) {
+    z /= 2; beta /= 2;
+  }
+  d = x & 255;
+  c = (x >> 8) & 255;
+  b = (x >> 16) & 255;
+  a = (x >> 24) & 255;
+  sw = (((((d * z) / 0400) + (c * z)) / 0400) + (b * z)) / beta;
+  if (a == 255)
+    sw -= alpha;
+  else
+    assert(a == 0);
+  return sw;
+}
+
+void dvi_printer::set_color(color *col)
+{
+  cur_color = *col;
+  char buf[256];
+  unsigned int components[4];
+  color_scheme cs = col->get_components(components);
+  switch (cs) {
+  case DEFAULT:
+    sprintf(buf, "color gray 0");
+    break;
+  case RGB:
+    sprintf(buf, "color rgb %.3g %.3g %.3g",
+		 double(Red) / color::MAX_COLOR_VAL,
+		 double(Green) / color::MAX_COLOR_VAL,
+		 double(Blue) / color::MAX_COLOR_VAL);
+    break;
+  case CMY:
+    col->get_cmyk(&Cyan, &Magenta, &Yellow, &Black);
+    // fall through
+  case CMYK:
+    sprintf(buf, "color cmyk %.3g %.3g %.3g %.3g",
+		 double(Cyan) / color::MAX_COLOR_VAL,
+		 double(Magenta) / color::MAX_COLOR_VAL,
+		 double(Yellow) / color::MAX_COLOR_VAL,
+		 double(Black) / color::MAX_COLOR_VAL);
+    break;
+  case GRAY:
+    sprintf(buf, "color gray %.3g",
+		 double(Gray) / color::MAX_COLOR_VAL);
+    break;
+  }
+  do_special(buf);
+}
+
+void dvi_printer::set_char(int index, font *f, const environment *env,
+			   int w, const char *)
+{
+  if (*env->col != cur_color)
+    set_color(env->col);
+  int code = f->get_code(index);
+  if (env->size != cur_point_size || f != cur_font) {
+    cur_font = f;
+    cur_point_size = env->size;
+    int i;
+    for (i = 0;; i++) {
+      if (i >= FONTS_MAX) {
+	fatal("too many output fonts required");
+      }
+      if (output_font_table[i].f == 0) {
+	output_font_table[i].f = (dvi_font *)cur_font;
+	output_font_table[i].point_size = cur_point_size;
+	define_font(i);
+      }
+      if (output_font_table[i].f == cur_font
+	  && output_font_table[i].point_size == cur_point_size)
+	break;
+    }
+    set_font(i);
+  }
+  int distance = env->hpos - cur_h;
+  if (env->hpos != end_h && distance != 0) {
+    out_signed(right1, distance);
+    cur_h = env->hpos;
+  }
+  else if (distance > max_drift) {
+    out_signed(right1, distance - max_drift);
+    cur_h = env->hpos - max_drift;
+  }
+  else if (distance < -max_drift) {
+    out_signed(right1, distance + max_drift);
+    cur_h = env->hpos + max_drift;
+  }
+  if (env->vpos != cur_v) {
+    out_signed(down1, env->vpos - cur_v);
+    cur_v = env->vpos;
+  }
+  possibly_begin_line();
+  end_h = env->hpos + w;
+  cur_h += scale(f->get_width(index, UNITWIDTH)/MULTIPLIER,
+		 cur_point_size*RES_7227);
+  if (cur_h > max_h)
+    max_h = cur_h;
+  if (cur_v > max_v)
+    max_v = cur_v;
+  if (code >= 0 && code <= 127)
+    out1(code);
+  else
+    out_unsigned(set1, code);
+}
+
+void dvi_printer::define_font(int i)
+{
+  out_unsigned(fnt_def1, i);
+  dvi_font *f = output_font_table[i].f;
+  out4(f->checksum);
+  out4(output_font_table[i].point_size*RES_7227);
+  out4(int((double(f->design_size)/(1<<20))*RES_7227*100 + .5));
+  const char *nm = f->get_internal_name();
+  out1(0);
+  out_string(nm);
+}
+
+void dvi_printer::set_font(int i)
+{
+  if (i >= 0 && i <= 63)
+    out1(fnt_num_0 + i);
+  else
+    out_unsigned(fnt1, i);
+}
+
+void dvi_printer::out_signed(unsigned char base, int param)
+{
+  if (-128 <= param && param < 128) {
+    out1(base);
+    out1(param);
+  }
+  else if (-32768 <= param && param < 32768) {
+    out1(base+1);
+    out2(param);
+  }
+  else if (-(1 << 23) <= param && param < (1 << 23)) {
+    out1(base+2);
+    out3(param);
+  }
+  else {
+    out1(base+3);
+    out4(param);
+  }
+}
+
+void dvi_printer::out_unsigned(unsigned char base, int param)
+{
+  if (param >= 0) {
+    if (param < 256) {
+      out1(base);
+      out1(param);
+    }
+    else if (param < 65536) {
+      out1(base+1);
+      out2(param);
+    }
+    else if (param < (1 << 24)) {
+      out1(base+2);
+      out3(param);
+    }
+    else {
+      out1(base+3);
+      out4(param);
+    }
+  }
+  else {
+    out1(base+3);
+    out4(param);
+  }
+}
+
+void dvi_printer::preamble()
+{
+  out1(pre);
+  out1(id_byte);
+  out4(254000);
+  out4(font::res);
+  out4(1000);
+  out1(0);
+}
+
+void dvi_printer::postamble()
+{
+  int tem = byte_count;
+  out1(post);
+  out4(last_bop);
+  out4(254000);
+  out4(font::res);
+  out4(1000);
+  out4(max_v);
+  out4(max_h);
+  out2(have_pushed); // stack depth
+  out2(page_count);
+  int i;
+  for (i = 0; i < FONTS_MAX && output_font_table[i].f != 0; i++)
+    define_font(i);
+  out1(post_post);
+  out4(tem);
+  out1(id_byte);
+  for (i = 0; i < 4 || byte_count % 4 != 0; i++)
+    out1(filler);
+}  
+  
+void dvi_printer::begin_page(int i)
+{
+  page_count++;
+  int tem = byte_count;
+  out1(bop);
+  out4(i);
+  for (int j = 1; j < 10; j++)
+    out4(0);
+  out4(last_bop);
+  last_bop = tem;
+  // By convention position (0,0) in a dvi file is placed at (1in, 1in).
+  cur_h = font::res;
+  cur_v = font::res;
+  end_h = 0;
+  if (page_count == 1) {
+    char buf[256];
+    // at least dvips uses this
+    double length = user_paper_length ? user_paper_length :
+					double(font::paperlength) / font::res;
+    double width = user_paper_width ? user_paper_width :
+				      double(font::paperwidth) / font::res;
+    if (width > 0 && length > 0) {
+      sprintf(buf, "papersize=%.3fin,%.3fin",
+	      landscape_flag ? length : width,
+	      landscape_flag ? width : length);
+      do_special(buf);
+    }
+  }
+  if (cur_color != default_color)
+    set_color(&cur_color);
+}
+
+void dvi_printer::end_page(int)
+{
+  set_color(&default_color);
+  if (pushed)
+    end_of_line();
+  out1(eop);
+  cur_font = 0;
+}
+
+void draw_dvi_printer::end_page(int len)
+{
+  dvi_printer::end_page(len);
+  output_pen_size = -1;
+}
+
+void dvi_printer::do_special(const char *s)
+{
+  int len = strlen(s);
+  if (len == 0)
+    return;
+  possibly_begin_line();
+  out_unsigned(xxx1, len);
+  while (*s)
+    out1(*s++);
+}
+
+void dvi_printer::special(char *arg, const environment *env, char type)
+{
+  if (type != 'p')
+    return;
+  moveto(env->hpos, env->vpos);
+  do_special(arg);
+}
+
+void dvi_printer::moveto(int h, int v)
+{
+  if (h != cur_h) {
+    out_signed(right1, h - cur_h);
+    cur_h = h;
+    if (cur_h > max_h)
+      max_h = cur_h;
+  }
+  if (v != cur_v) {
+    out_signed(down1, v - cur_v);
+    cur_v = v;
+    if (cur_v > max_v)
+      max_v = cur_v;
+  }
+  end_h = 0;
+}
+
+void dvi_printer::draw(int code, int *p, int np, const environment *env)
+{
+  if (code == 'l') {
+    int x = 0, y = 0;
+    int height = 0, width = 0;
+    int thickness;
+    if (line_thickness < 0)
+      thickness = env->size*RES_7227*linewidth/1000;
+    else if (line_thickness > 0)
+      thickness = line_thickness;
+    else
+      thickness = 1;
+    if (np != 2) {
+      error("2 arguments required for line");
+    }
+    else if (p[0] == 0) {
+      // vertical rule
+      if (p[1] > 0) {
+	x = env->hpos - thickness/2;
+	y = env->vpos + p[1] + thickness/2;
+	height = p[1] + thickness;
+	width = thickness;
+      }
+      else if (p[1] < 0) {
+	x = env->hpos - thickness/2;
+	y = env->vpos + thickness/2;
+	height = thickness - p[1];
+	width = thickness;
+      }
+    }
+    else if (p[1] == 0) {
+      if (p[0] > 0) {
+	x = env->hpos - thickness/2;
+	y = env->vpos + thickness/2;
+	height = thickness;
+	width = p[0] + thickness;
+      }
+      else if (p[0] < 0) {
+	x = env->hpos - p[0] - thickness/2;
+	y = env->vpos + thickness/2;
+	height = thickness;
+	width = thickness - p[0];
+      }
+    }
+    if (height != 0) {
+      moveto(x, y);
+      out1(put_rule);
+      out4(height);
+      out4(width);
+    }
+  }
+  else if (code == 't') {
+    if (np == 0) {
+      line_thickness = -1;
+    }
+    else {
+      // troff gratuitously adds an extra 0
+      if (np != 1 && np != 2)
+	error("0 or 1 argument required for thickness");
+      else
+	line_thickness = p[0];
+    }
+  }
+  else if (code == 'R') {
+    if (np != 2)
+      error("2 arguments required for rule");
+    else if (p[0] != 0 || p[1] != 0) {
+      int dh = p[0];
+      int dv = p[1];
+      int oh = env->hpos;
+      int ov = env->vpos;
+      if (dv > 0) {
+	ov += dv;
+	dv = -dv;
+      }
+      if (dh < 0) {
+	oh += dh;
+	dh = -dh;
+      }
+      moveto(oh, ov);
+      out1(put_rule);
+      out4(-dv);
+      out4(dh);
+    }
+  }
+}
+
+// XXX Will this overflow?
+
+inline int milliinches(int n)
+{
+  return (n*1000 + font::res/2)/font::res;
+}
+
+void draw_dvi_printer::set_line_thickness(const environment *env)
+{
+  int desired_pen_size
+    = milliinches(line_thickness < 0
+		  // Will this overflow?
+		  ? env->size*RES_7227*linewidth/1000
+		  : line_thickness);
+  if (desired_pen_size != output_pen_size) {
+    char buf[256];
+    sprintf(buf, "pn %d", desired_pen_size);
+    do_special(buf);
+    output_pen_size = desired_pen_size;
+  }
+}
+
+void draw_dvi_printer::fill_next(const environment *env)
+{
+  unsigned int g;
+  if (env->fill->is_default())
+    g = 0;
+  else {
+    // currently, only BW support
+    env->fill->get_gray(&g);
+  }
+  char buf[256];
+  sprintf(buf, "sh %.3g", 1 - double(g)/color::MAX_COLOR_VAL);
+  do_special(buf);
+}
+
+void draw_dvi_printer::draw(int code, int *p, int np, const environment *env)
+{
+  char buf[1024];
+  int fill_flag = 0;
+  switch (code) {
+  case 'C':
+    fill_flag = 1;
+    // fall through
+  case 'c':
+    // troff adds an extra argument to C
+    if (np != 1 && !(code == 'C' && np == 2)) {
+      error("1 argument required for circle");
+      break;
+    }
+    moveto(env->hpos+p[0]/2, env->vpos);
+    if (fill_flag)
+      fill_next(env);
+    else
+      set_line_thickness(env);
+    int rad;
+    rad = milliinches(p[0]/2);
+    sprintf(buf, "%s 0 0 %d %d 0 6.28319",
+	    (fill_flag ? "ia" : "ar"),
+	    rad,
+	    rad);
+    do_special(buf);
+    break;
+  case 'l':
+    if (np != 2) {
+      error("2 arguments required for line");
+      break;
+    }
+    moveto(env->hpos, env->vpos);
+    set_line_thickness(env);
+    do_special("pa 0 0");
+    sprintf(buf, "pa %d %d", milliinches(p[0]), milliinches(p[1]));
+    do_special(buf);
+    do_special("fp");
+    break;
+  case 'E':
+    fill_flag = 1;
+    // fall through
+  case 'e':
+    if (np != 2) {
+      error("2 arguments required for ellipse");
+      break;
+    }
+    moveto(env->hpos+p[0]/2, env->vpos);
+    if (fill_flag)
+      fill_next(env);
+    sprintf(buf, "%s 0 0 %d %d 0 6.28319",
+	    (fill_flag ? "ia" : "ar"),
+	    milliinches(p[0]/2),
+	    milliinches(p[1]/2));
+    do_special(buf);
+    break;
+  case 'P':
+    fill_flag = 1;
+    // fall through
+  case 'p':
+    {
+      if (np & 1) {
+	error("even number of arguments required for polygon");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for polygon");
+	break;
+      }
+      moveto(env->hpos, env->vpos);
+      if (fill_flag)
+	fill_next(env);
+      else
+	set_line_thickness(env);
+      do_special("pa 0 0");
+      int h = 0, v = 0;
+      for (int i = 0; i < np; i += 2) {
+	h += p[i];
+	v += p[i+1];
+	sprintf(buf, "pa %d %d", milliinches(h), milliinches(v));
+	do_special(buf);
+      }
+      do_special("pa 0 0");
+      do_special(fill_flag ? "ip" : "fp");
+      break;
+    }
+  case '~':
+    {
+      if (np & 1) {
+	error("even number of arguments required for spline");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for spline");
+	break;
+      }
+      moveto(env->hpos, env->vpos);
+      set_line_thickness(env);
+      do_special("pa 0 0");
+      int h = 0, v = 0;
+      for (int i = 0; i < np; i += 2) {
+	h += p[i];
+	v += p[i+1];
+	sprintf(buf, "pa %d %d", milliinches(h), milliinches(v));
+	do_special(buf);
+      }
+      do_special("sp");
+      break;
+    }
+  case 'a':
+    {
+      if (np != 4) {
+	error("4 arguments required for arc");
+	break;
+      }
+      set_line_thickness(env);
+      double c[2];
+      if (adjust_arc_center(p, c)) {
+	int rad = milliinches(int(sqrt(c[0]*c[0] + c[1]*c[1]) + .5));
+	moveto(env->hpos + int(c[0]), env->vpos + int(c[1]));
+	sprintf(buf, "ar 0 0 %d %d %f %f",
+		rad,
+		rad,
+		atan2(p[1] + p[3] - c[1], p[0] + p[2] - c[0]),
+		atan2(-c[1], -c[0]));
+	do_special(buf);
+      }
+      else {
+	moveto(env->hpos, env->vpos);
+	do_special("pa 0 0");
+	sprintf(buf,
+		"pa %d %d",
+		milliinches(p[0] + p[2]),
+		milliinches(p[1] + p[3]));
+	do_special(buf);
+	do_special("fp");
+      }
+      break;
+    }
+  case 't':
+    {
+      if (np == 0) {
+	line_thickness = -1;
+      }
+      else {
+	// troff gratuitously adds an extra 0
+	if (np != 1 && np != 2) {
+	  error("0 or 1 argument required for thickness");
+	  break;
+	}
+	line_thickness = p[0];
+      }
+      break;
+    }
+  case 'R':
+    {
+      if (np != 2) {
+	error("2 arguments required for rule");
+	break;
+      }
+      int dh = p[0];
+      if (dh == 0)
+	break;
+      int dv = p[1];
+      if (dv == 0)
+	break;
+      int oh = env->hpos;
+      int ov = env->vpos;
+      if (dv > 0) {
+	ov += dv;
+	dv = -dv;
+      }
+      if (dh < 0) {
+	oh += dh;
+	dh = -dh;
+      }
+      moveto(oh, ov);
+      out1(put_rule);
+      out4(-dv);
+      out4(dh);
+      break;
+    }
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+}
+
+font *dvi_printer::make_font(const char *nm)
+{
+  return dvi_font::load_dvi_font(nm);
+}
+
+printer *make_printer()
+{
+  if (draw_flag)
+    return new draw_dvi_printer;
+  else
+    return new dvi_printer;
+}
+
+static void usage(FILE *stream);
+
+int main(int argc, char **argv)
+{
+  setlocale(LC_NUMERIC, "C");
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "dF:lp:vw:", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'd':
+      draw_flag = 0;
+      break;
+    case 'l':
+      landscape_flag = 1;
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'p':
+      if (!font::scan_papersize(optarg, 0,
+				&user_paper_length, &user_paper_width))
+	error("invalid custom paper size `%1' ignored", optarg);
+      break;
+    case 'v':
+      {
+	printf("GNU grodvi (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'w':
+      if (sscanf(optarg, "%d", &linewidth) != 1
+	  || linewidth < 0 || linewidth > 1000) {
+	error("bad line width");
+	linewidth = DEFAULT_LINEWIDTH;
+      }
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  SET_BINARY(fileno(stdout));
+  if (optind >= argc)
+    do_file("-");
+  else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-dv] [-F dir] [-w n] [files ...]\n",
+	  program_name);
+}
diff --git a/contrib/groff/src/devices/grodvi/grodvi.man b/contrib/groff/src/devices/grodvi/grodvi.man
index f732a42..793bfe2 100644
--- a/contrib/groff/src/devices/grodvi/grodvi.man
+++ b/contrib/groff/src/devices/grodvi/grodvi.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -20,11 +20,22 @@ the original English.
 .
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .el .ds tx TeX
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
+..
+.
+.de TQ
+.  br
+.  ns
+.  TP \$1
+..
+.
+.de FT
+.  if '\\*(.T'dvi' .ft \\$1
 ..
 .
 .
@@ -36,12 +47,14 @@ grodvi \- convert groff output to TeX dvi format
 .SH SYNOPSIS
 .B grodvi
 [
-.B \-dv
-] [
-.BI \-w n
+.B \-dlv
 ] [
 .BI \-F dir
 ] [
+.BI \-p papersize
+] [
+.BI \-w n
+] [
 .IR files \|.\|.\|.\&
 ]
 .PP
@@ -60,12 +73,8 @@ Normally it should be run by
 .
 This will run
 .BR @g@troff\ \-Tdvi ;
-it will also input the macros
-.BR @MACRODIR@/dvi.tmac ;
-if the input is being preprocessed with
-.B @g@eqn
-it will also input
-.BR @FONTDIR@/devdvi/eqnchar .
+it will also input the macros in
+.BR @MACRODIR@/dvi.tmac .
 .
 .LP
 The dvi file generated by
@@ -116,8 +125,8 @@ automatically, providing the
 macro.
 .
 Please check
-.B grops (@MAN1EXT@)
-for a detailed description of this macro.
+.BR groff_tmac (@MAN5EXT@)
+for a detailed description.
 .
 .LP
 Font files for
@@ -169,6 +178,21 @@ escape sequence can be used to access characters by their position
 in the corresponding tfm file;
 all characters in the tfm file can be accessed this way.
 .
+.LP
+By design, the DVI format doesn't care about physical dimensions of the
+output medium.
+.
+Instead,
+.B grodvi
+emits the equivalent to \*(tx's
+.BI \[rs]special{papersize= width , length }
+on the first page;
+.B dvips
+(and possibly other DVI drivers) then sets the page size accordingly.
+.
+If either the page width or length is not positive, no papersize special
+is output.
+.
 .
 .SH OPTIONS
 .TP
@@ -180,6 +204,36 @@ Horizontal and vertical lines will be implemented by rules.
 Other drawing commands will be ignored.
 .
 .TP
+.BI \-F dir
+Prepend directory
+.IB dir /dev name
+to the search path for font and device description files;
+.I name
+is the name of the device, usually
+.BR dvi .
+.
+.TP
+.B \-l
+Specify landscape orientation.
+.
+.TP
+.BI \-p papersize
+Specify paper dimensions.
+.
+This overrides the
+.BR papersize ,
+.BR paperlength ,
+and
+.B paperwidth
+commands in the
+.B DESC
+file; it accepts the same arguments as the
+.B papersize
+command (see
+.BR groff_font (@MAN5EXT@)
+for details).
+.
+.TP
 .B \-v
 Print the version number.
 .
@@ -190,15 +244,6 @@ Set the default line thickness to
 thousandths of an em.
 If this option isn't specified, the line thickness defaults to 0.04\~em.
 .
-.TP
-.BI \-F dir
-Prepend directory
-.IB dir /dev name
-to the search path for font and device description files;
-.I name
-is the name of the device, usually
-.BR dvi .
-.
 .
 .SH USAGE
 There are styles called
@@ -207,17 +252,13 @@ There are styles called
 .BR B ,
 and
 .B BI
-mounted at font positions 1 to 4.
+mounted at font positions 1 to\ 4.
 The fonts are grouped into families
 .B T
 and
-.B H
+.B H\ \c
 having members in each of these styles:
 .
-.de FT
-.if '\\*(.T'dvi' .ft \\$1
-..
-.
 .RS
 .TP
 .B TR
@@ -225,43 +266,43 @@ having members in each of these styles:
 CM Roman (cmr10)
 .FT
 .
-.TP
+.TQ
 .B TI
 .FT TI
 CM Text Italic (cmti10)
 .FT
 .
-.TP
+.TQ
 .B TB
 .FT TB
 CM Bold Extended Roman (cmbx10)
 .FT
 .
-.TP
+.TQ
 .B TBI
 .FT TBI
 CM Bold Extended Text Italic (cmbxti10)
 .FT
 .
-.TP
+.TQ
 .B HR
 .FT HR
 CM Sans Serif (cmss10)
 .FT
 .
-.TP
+.TQ
 .B HI
 .FT HI
 CM Slanted Sans Serif (cmssi10)
 .FT
 .
-.TP
+.TQ
 .B HB
 .FT HB
 CM Sans Serif Bold Extended (cmssbx10)
 .FT
 .
-.TP
+.TQ
 .B HBI
 .FT HBI
 CM Slanted Sans Serif Bold Extended (cmssbxo10)
@@ -278,7 +319,7 @@ CM Typewriter Text (cmtt10)
 .FT CW
 .FT
 .
-.TP
+.TQ
 .B CWI
 CM Italic Typewriter Text (cmitt10)
 .FT CWI
@@ -293,6 +334,9 @@ Special fonts are
 (cmsy10),
 .B EX
 (cmex10),
+.B SC
+(cmtex10, only for
+.BR CW ),
 and, perhaps surprisingly,
 .BR TR ,
 .BR TI ,
@@ -318,9 +362,9 @@ These two fonts are not mounted by default.
 .LP
 Using the option
 .B \-mec
-(loading the file
+(which loads the file
 .BR ec.tmac )
-EC and TC fonts are used.
+provides the EC and TC fonts.
 .
 The design of the EC family is very similar to that of the CM fonts;
 additionally, they give a much better coverage of groff symbols.
@@ -378,7 +422,8 @@ and widths of rules be rounded.
 .BR @g@troff (@MAN1EXT@),
 .BR groff_out (@MAN5EXT@),
 .BR groff_font (@MAN5EXT@),
-.BR groff_char (@MAN7EXT@)
+.BR groff_char (@MAN7EXT@),
+.BR groff_tmac (@MAN5EXT@)
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/contrib/groff/src/devices/grohtml/Makefile.sub b/contrib/groff/src/devices/grohtml/Makefile.sub
index 33e41f8..ad673cf 100644
--- a/contrib/groff/src/devices/grohtml/Makefile.sub
+++ b/contrib/groff/src/devices/grohtml/Makefile.sub
@@ -8,10 +8,10 @@ OBJS=\
   html-text.$(OBJEXT) \
   output.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/post-html.cc \
-  $(srcdir)/html-table.cc \
-  $(srcdir)/html-text.cc \
-  $(srcdir)/output.cc
+  $(srcdir)/post-html.cpp \
+  $(srcdir)/html-table.cpp \
+  $(srcdir)/html-text.cpp \
+  $(srcdir)/output.cpp
 HDRS=\
   $(srcdir)/html.h \
   $(srcdir)/html-table.h \
diff --git a/contrib/groff/src/devices/grohtml/html-table.cpp b/contrib/groff/src/devices/grohtml/html-table.cpp
new file mode 100644
index 0000000..3585cd3
--- /dev/null
+++ b/contrib/groff/src/devices/grohtml/html-table.cpp
@@ -0,0 +1,728 @@
+// -*- C++ -*-
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.cpp
+ *
+ *  html-table.h
+ *
+ *  provides the methods necessary to handle indentation and tab
+ *  positions using html tables.
+ */
+
+/*
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "html-table.h"
+#include "ctype.h"
+#include "html.h"
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+tabs::tabs ()
+  : tab(NULL)
+{
+}
+
+tabs::~tabs ()
+{
+  delete_list();
+}
+
+/*
+ *  delete_list - frees the tab list and sets tab to NULL.
+ */
+
+void tabs::delete_list (void)
+{
+  tab_position *p = tab;
+  tab_position *q;
+
+  while (p != NULL) {
+    q = p;
+    p = p->next;
+    free(q);
+  }
+  tab = NULL;
+}
+
+void tabs::clear (void)
+{
+  delete_list();
+}
+
+/*
+ *  compatible - returns TRUE if the tab stops in, s, do
+ *               not conflict with the current tab stops.
+ *               The new tab stops are _not_ placed into
+ *               this class.
+ */
+
+int tabs::compatible (const char *s)
+{
+  char align;
+  int  total=0;
+  tab_position *last = tab;
+
+  if (last == NULL)
+    return FALSE;  // no tab stops defined
+
+  // move over tag name
+  while ((*s != (char)0) && !isspace(*s))
+    s++;
+
+  while (*s != (char)0 && last != NULL) {
+    // move over white space
+    while ((*s != (char)0) && isspace(*s))
+      s++;
+    // collect alignment
+    align = *s;
+    // move over alignment
+    s++;
+    // move over white space
+    while ((*s != (char)0) && isspace(*s))
+      s++;
+    // collect tab position
+    total += atoi(s);
+    // move over tab position
+    while ((*s != (char)0) && !isspace(*s))
+      s++;
+    if (last->alignment != align || last->position != total)
+      return FALSE;
+
+    last = last->next;
+  }
+  return TRUE;
+}
+
+/*
+ *  init - scans the string, s, and initializes the tab stops.
+ */
+
+void tabs::init (const char *s)
+{
+  char align;
+  int  total=0;
+  tab_position *last = NULL;
+
+  clear(); // remove any tab stops
+
+  // move over tag name
+  while ((*s != (char)0) && !isspace(*s))
+    s++;
+
+  while (*s != (char)0) {
+    // move over white space
+    while ((*s != (char)0) && isspace(*s))
+      s++;
+    // collect alignment
+    align = *s;
+    // move over alignment
+    s++;
+    // move over white space
+    while ((*s != (char)0) && isspace(*s))
+      s++;
+    // collect tab position
+    total = atoi(s);
+    // move over tab position
+    while ((*s != (char)0) && !isspace(*s))
+      s++;
+    if (last == NULL) {
+      tab = (tab_position *)malloc(sizeof(tab_position));
+      last = tab;
+    } else {
+      last->next = (tab_position *)malloc(sizeof(tab_position));
+      last = last->next;
+    }
+    last->alignment = align;
+    last->position = total;
+    last->next = NULL;    
+  }
+}
+
+/*
+ *  find_tab - returns the tab number corresponding to the position, pos.
+ */
+
+int tabs::find_tab (int pos)
+{
+  tab_position *p;
+  int i=0;
+
+  for (p = tab; p != NULL; p = p->next) {
+    i++;
+    if (p->position == pos)
+      return i;
+  }
+  return 0;
+}
+
+/*
+ *  get_tab_pos - returns the, nth, tab position
+ */
+
+int tabs::get_tab_pos (int n)
+{
+  tab_position *p;
+
+  n--;
+  for (p = tab; (p != NULL) && (n>0); p = p->next) {
+    n--;
+    if (n == 0)
+      return p->position;
+  }
+  return 0;
+}
+
+char tabs::get_tab_align (int n)
+{
+  tab_position *p;
+
+  n--;
+  for (p = tab; (p != NULL) && (n>0); p = p->next) {
+    n--;
+    if (n == 0)
+      return p->alignment;
+  }
+  return 'L';
+}
+
+/*
+ *  dump_tab - display tab positions
+ */
+
+void tabs::dump_tabs (void)
+{
+  int i=1;
+  tab_position *p;
+
+  for (p = tab; p != NULL; p = p->next) {
+    printf("tab %d is %d\n", i, p->position);
+    i++;
+  }
+}
+
+/*
+ *  html_table - methods
+ */
+
+html_table::html_table (simple_output *op, int linelen)
+  : columns(NULL), out(op), linelength(linelen), last_col(NULL), start_space(FALSE)
+{
+  tab_stops = new tabs();
+}
+
+html_table::~html_table ()
+{
+  cols *c;
+  if (tab_stops != NULL)
+    delete tab_stops;
+  
+  c = columns;
+  while (columns != NULL) {
+    columns = columns->next;
+    free(c);
+    c = columns;
+  }
+}
+
+/*
+ *  remove_cols - remove a list of columns as defined by, c.
+ */
+
+void html_table::remove_cols (cols *c)
+{
+  cols *p;
+
+  while (c != NULL) {
+    p = c;
+    c = c->next;
+    free(p);
+  }
+}
+
+/*
+ *  set_linelength - sets the line length value in this table.
+ *                   It also adds an extra blank column to the
+ *                   table should linelen exceed the last column.
+ */
+
+void html_table::set_linelength (int linelen)
+{
+  cols *p = NULL;
+  cols *c;
+  linelength = linelen;
+
+  for (c = columns; c != NULL; c = c->next) {
+    if (c->right > linelength) {
+      c->right = linelength;
+      remove_cols(c->next);
+      c->next = NULL;
+      return;
+    }
+    p = c;
+  }
+  if (p != NULL && p->right > 0)
+    add_column(p->no+1, p->right, linelength, 'L');
+}
+
+/*
+ *  get_effective_linelength -
+ */
+
+int html_table::get_effective_linelength (void)
+{
+  if (columns != NULL)
+    return linelength - columns->left;
+  else
+    return linelength;
+}
+
+/*
+ *  add_indent - adds the indent to a table.
+ */
+
+void html_table::add_indent (int indent)
+{
+  if (columns != NULL && columns->left > indent)
+    add_column(0, indent, columns->left, 'L');
+}
+
+/*
+ *  emit_table_header - emits the html header for this table.
+ */
+
+void html_table::emit_table_header (int space)
+{
+  if (columns == NULL)
+    return;
+
+  // dump_table();
+
+  last_col = NULL;
+  if (linelength > 0) {
+    int n = no_columns() + no_gaps();
+
+    out->nl();
+    out->nl();
+    if (space)
+      out->put_string("<p>");
+    start_space = space;
+    out->put_string("<table width=\"100%\" border=0 rules=\"none\" frame=\"void\"\n       cols=\"").put_number(n).put_string("\" cellspacing=\"0\" cellpadding=\"0\">").nl();
+    out->put_string("<tr valign=\"top\" align=\"left\">").nl();
+  }
+}
+
+/*
+ *  get_right - returns the right most position of this column.
+ */
+
+int html_table::get_right (cols *c)
+{
+  if (c != NULL && c->right > 0)
+    return c->right;
+  if (c->next != NULL)
+    return c->left;
+  return linelength;
+}
+
+/*
+ *  emit_col - moves onto column, n.
+ */
+
+void html_table::emit_col (int n)
+{
+  cols *c = columns;
+  cols *b = columns;
+  int   width = 0;
+
+  // must be a different row
+  if (last_col != NULL && n <= last_col->no)
+    emit_new_row();
+
+  while (c != NULL && c->no < n)
+    c = c->next;
+
+  // can we find column, n?
+  if (c != NULL && c->no == n) {
+    // shutdown previous column
+    if (last_col != NULL)
+      out->put_string("</td>").nl();
+
+    // find previous column
+    if (last_col == NULL)
+      b = columns;
+    else
+      b = last_col;
+    
+    // have we a gap?
+    if (last_col != NULL) {
+      if (is_gap(b))
+	out->put_string("<td width=\"")
+	    .put_number(is_gap(b))
+	    .put_string("%\"></td>")
+	    .nl();
+      b = b->next;
+    }
+
+    // move across to column n
+    while (b != c) {
+      // we compute the difference after converting positions
+      // to avoid rounding errors
+      width = (get_right(b)*100 + get_effective_linelength()/2)
+		/ get_effective_linelength()
+	      - (b->left*100 + get_effective_linelength()/2)
+		  /get_effective_linelength();
+      if (width)
+	out->put_string("<td width=\"")
+	    .put_number(width)
+	    .put_string("%\"></td>")
+	    .nl();
+      // have we a gap?
+      if (is_gap(b))
+	out->put_string("<td width=\"")
+	    .put_number(is_gap(b))
+	    .put_string("%\"></td>")
+	    .nl();
+      b = b->next;
+    }
+    width = (get_right(b)*100 + get_effective_linelength()/2)
+	      / get_effective_linelength()
+	    - (b->left*100 + get_effective_linelength()/2)
+		/get_effective_linelength();
+    switch (b->alignment) {
+    case 'C':
+      out->put_string("<td width=\"")
+	  .put_number(width)
+	  .put_string("%\" align=center>")
+	  .nl();
+      break;
+    case 'R':
+      out->put_string("<td width=\"")
+	  .put_number(width)
+	  .put_string("%\" align=right>")
+	  .nl();
+      break;
+    default:
+      out->put_string("<td width=\"")
+	  .put_number(width)
+	  .put_string("%\">")
+	  .nl();
+    }
+    // remember column, b
+    last_col = b;
+  }
+}
+
+/*
+ *  finish_row -
+ */
+
+void html_table::finish_row (void)
+{
+  int n = 0;
+  cols *c;
+
+  if (last_col != NULL) {
+    for (c = last_col->next; c != NULL; c = c->next)
+      n = c->no;
+    
+    if (n > 0)
+      emit_col(n);
+    out->put_string("</td>").nl();
+  }
+}
+
+/*
+ *  emit_new_row - move to the next row.
+ */
+
+void html_table::emit_new_row (void)
+{
+  finish_row();
+  out->put_string("<tr valign=\"top\" align=\"left\">").nl();
+  last_col = NULL;
+}
+
+void html_table::emit_finish_table (void)
+{
+  finish_row();
+  // out->put_string("linelength = ").put_number(linelength).nl();
+  out->put_string("</table>");
+  if (start_space)
+    out->put_string("</p>");
+  out->nl();
+}
+
+/*
+ *  add_column - adds a column. It returns FALSE if hstart..hend
+ *               crosses into a different columns.
+ */
+
+int html_table::add_column (int coln, int hstart, int hend, char align)
+{
+  cols *c = get_column(coln);
+
+  if (c == NULL)
+    return insert_column(coln, hstart, hend, align);
+  else
+    return modify_column(c, hstart, hend, align);
+}
+
+/*
+ *  get_column - returns the column, coln.
+ */
+
+cols *html_table::get_column (int coln)
+{
+  cols *c = columns;
+
+  while (c != NULL && coln != c->no)
+    c = c->next;
+
+  if (c != NULL && coln == c->no)
+    return c;
+  else
+    return NULL;
+}
+
+/*
+ *  insert_column - inserts a column, coln.
+ *                  It returns TRUE if it does not bump into
+ *                  another column.
+ */
+
+int html_table::insert_column (int coln, int hstart, int hend, char align)
+{
+  cols *c = columns;
+  cols *l = NULL;
+  cols *n = NULL;
+
+  while (c != NULL && c->no < coln) {
+    l = c;
+    c = c->next;
+  }
+  if ((l != NULL) && (hstart < l->right))
+    return FALSE;	// new column bumps into previous one
+  
+  if ((l != NULL) && (l->next != NULL) &&
+      (l->next->left < hend))
+    return FALSE;  // new column bumps into next one
+
+  n = (cols *)malloc(sizeof(cols));
+  if (l == NULL) {
+    n->next = columns;
+    columns = n;
+  } else {
+    n->next = l->next;
+    l->next = n;
+  }
+  n->left = hstart;
+  n->right = hend;
+  n->no = coln;
+  n->alignment = align;
+  return TRUE;
+}
+
+/*
+ *  modify_column - given a column, c, modify the width to
+ *                  contain hstart..hend.
+ *                  It returns TRUE if it does not clash with
+ *                  the next or previous column.
+ */
+
+int html_table::modify_column (cols *c, int hstart, int hend, char align)
+{
+  cols *l = columns;
+
+  while (l != NULL && l->next != c)
+    l = l->next;
+
+  if ((l != NULL) && (hstart < l->right))
+    return FALSE;	// new column bumps into previous one
+  
+  if ((c->next != NULL) && (c->next->left < hend))
+    return FALSE;  // new column bumps into next one
+
+  if (c->left > hstart)
+    c->left = hstart;
+
+  if (c->right < hend)
+    c->right = hend;
+
+  c->alignment = align;
+
+  return TRUE;
+}
+
+/*
+ *  find_tab_column - finds the column number for position, pos.
+ *                    It searches through the list tab stops.
+ */
+
+int html_table::find_tab_column (int pos)
+{
+  // remember the first column is reserved for untabbed glyphs
+  return tab_stops->find_tab(pos)+1;
+}
+
+/*
+ *  find_column - find the column number for position, pos.
+ *                It searches through the list of columns.
+ */
+
+int html_table::find_column (int pos)
+{
+  int   p=0;
+  cols *c;
+
+  for (c = columns; c != NULL; c = c->next) {
+    if (c->left > pos)
+      return p;
+    p = c->no;
+  }
+  return p;
+}
+
+/*
+ *  no_columns - returns the number of table columns (rather than tabs)
+ */
+
+int html_table::no_columns (void)
+{
+  int n=0;
+  cols *c;
+
+  for (c = columns; c != NULL; c = c->next)
+    n++;
+  return n;
+}
+
+/*
+ *  is_gap - returns the gap between column, c, and the next column.
+ */
+
+int html_table::is_gap (cols *c)
+{
+  if (c == NULL || c->right <= 0 || c->next == NULL)
+    return 0;
+  else
+    // we compute the difference after converting positions
+    // to avoid rounding errors
+    return (c->next->left*100 + get_effective_linelength()/2)
+	     / get_effective_linelength()
+	   - (c->right*100 + get_effective_linelength()/2)
+	       / get_effective_linelength();
+}
+
+/*
+ *  no_gaps - returns the number of table gaps between the columns
+ */
+
+int html_table::no_gaps (void)
+{
+  int n=0;
+  cols *c;
+
+  for (c = columns; c != NULL; c = c->next)
+    if (is_gap(c))
+      n++;
+  return n;
+}
+
+/*
+ *  get_tab_pos - returns the, nth, tab position
+ */
+
+int html_table::get_tab_pos (int n)
+{
+  return tab_stops->get_tab_pos(n);
+}
+
+char html_table::get_tab_align (int n)
+{
+  return tab_stops->get_tab_align(n);
+}
+
+
+void html_table::dump_table (void)
+{
+  if (columns != NULL) {
+    cols *c;
+    for (c = columns; c != NULL; c = c->next) {
+      printf("column %d  %d..%d  %c\n", c->no, c->left, c->right, c->alignment);
+    }
+  } else
+    tab_stops->dump_tabs();
+}
+
+/*
+ *  html_indent - creates an indent with indentation, ind, given
+ *                a line length of linelength.
+ */
+
+html_indent::html_indent (simple_output *op, int ind, int pageoffset, int linelength)
+{
+  table = new html_table(op, linelength);
+
+  table->add_column(1, ind+pageoffset, linelength, 'L');
+  table->add_indent(pageoffset);
+  in = ind;
+  pg = pageoffset;
+  ll = linelength;
+  is_used = FALSE;
+}
+
+html_indent::~html_indent (void)
+{
+  end();
+  delete table;
+}
+
+void html_indent::begin (int space)
+{
+  if (! is_used) {
+    table->emit_table_header(space);
+    table->emit_col(1);
+    is_used = TRUE;
+  }
+}
+
+void html_indent::end (void)
+{
+  if (is_used)
+    table->emit_finish_table();
+  is_used = FALSE;
+}
+
+/*
+ *  get_reg - collects the registers as supplied during initialization.
+ */
+
+void html_indent::get_reg (int *ind, int *pageoffset, int *linelength)
+{
+  *ind = in;
+  *pageoffset = pg;
+  *linelength = ll;
+}
diff --git a/contrib/groff/src/devices/grohtml/html-table.h b/contrib/groff/src/devices/grohtml/html-table.h
index 3152060..c26eb6d 100644
--- a/contrib/groff/src/devices/grohtml/html-table.h
+++ b/contrib/groff/src/devices/grohtml/html-table.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.h
  *
  *  html-table.h
  *
diff --git a/contrib/groff/src/devices/grohtml/html-text.cpp b/contrib/groff/src/devices/grohtml/html-text.cpp
new file mode 100644
index 0000000..21a79eb
--- /dev/null
+++ b/contrib/groff/src/devices/grohtml/html-text.cpp
@@ -0,0 +1,965 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cpp
+ *
+ *  html-text.cpp
+ *
+ *  provide a troff like state machine interface which
+ *  generates html text.
+ */
+
+/*
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+
+#include "html-text.h"
+
+// #define DEBUGGING
+
+html_text::html_text (simple_output *op) :
+  stackptr(NULL), lastptr(NULL), out(op), space_emitted(TRUE),
+  current_indentation(-1), pageoffset(-1), linelength(-1),
+  blank_para(TRUE), start_space(FALSE)
+{
+}
+
+html_text::~html_text ()
+{
+  flush_text();
+}
+
+
+#if defined(DEBUGGING)
+static int debugStack = FALSE;
+
+
+/*
+ *  turnDebug - flip the debugStack boolean and return the new value.
+ */
+
+static int turnDebug (void)
+{
+  debugStack = 1-debugStack;
+  return debugStack;
+}
+
+/*
+ *  dump_stack_element - display an element of the html stack, p.
+ */
+
+void html_text::dump_stack_element (tag_definition *p)
+{
+  fprintf(stderr, " | ");
+  switch (p->type) {
+
+  case P_TAG:      if (p->indent == NULL) {
+                      fprintf(stderr, "<P %s>", (char *)p->arg1); break;
+                   } else {
+                      fprintf(stderr, "<P %s [TABLE]>", (char *)p->arg1); break;
+		   }
+  case I_TAG:      fprintf(stderr, "<I>"); break;
+  case B_TAG:      fprintf(stderr, "<B>"); break;
+  case SUB_TAG:    fprintf(stderr, "<SUB>"); break;
+  case SUP_TAG:    fprintf(stderr, "<SUP>"); break;
+  case TT_TAG:     fprintf(stderr, "<TT>"); break;
+  case PRE_TAG:    if (p->indent == NULL) {
+                      fprintf(stderr, "<PRE>"); break;
+                   } else {
+                      fprintf(stderr, "<PRE [TABLE]>"); break;
+		   }
+  case SMALL_TAG:  fprintf(stderr, "<SMALL>"); break;
+  case BIG_TAG:    fprintf(stderr, "<BIG>"); break;
+  case BREAK_TAG:  fprintf(stderr, "<BREAK>"); break;
+  case COLOR_TAG:  {
+    if (p->col.is_default())
+      fprintf(stderr, "<COLOR (default)>");
+    else {
+      unsigned int r, g, b;
+      
+      p->col.get_rgb(&r, &g, &b);
+      fprintf(stderr, "<COLOR %x %x %x>", r/0x101, g/0x101, b/0x101);
+    }
+    break;
+  }
+  default: fprintf(stderr, "unknown tag");
+  }
+  if (p->text_emitted)
+    fprintf(stderr, "[t] ");
+}
+
+/*
+ *  dump_stack - debugging function only.
+ */
+
+void html_text::dump_stack (void)
+{
+  if (debugStack) {
+    tag_definition *p = stackptr;
+
+    while (p != NULL) {
+      dump_stack_element(p);
+      p = p->next;
+    }
+  }
+  fprintf(stderr, "\n");
+  fflush(stderr);
+}
+#else
+void html_text::dump_stack (void) {}
+#endif
+
+
+/*
+ *  end_tag - shuts down the tag.
+ */
+
+void html_text::end_tag (tag_definition *t)
+{
+  switch (t->type) {
+
+  case I_TAG:      out->put_string("</i>"); break;
+  case B_TAG:      out->put_string("</b>"); break;
+  case P_TAG:      out->put_string("</p>");
+                   if (t->indent != NULL) {
+		     delete t->indent;
+		     t->indent = NULL;
+		   }
+		   out->nl(); out->enable_newlines(FALSE);
+                   blank_para = TRUE; break;
+  case SUB_TAG:    out->put_string("</sub>"); break;
+  case SUP_TAG:    out->put_string("</sup>"); break;
+  case TT_TAG:     out->put_string("</tt>"); break;
+  case PRE_TAG:    out->put_string("</pre>"); out->nl(); out->enable_newlines(TRUE);
+                   blank_para = TRUE; break;
+  case SMALL_TAG:  out->put_string("</small>"); break;
+  case BIG_TAG:    out->put_string("</big>"); break;
+  case COLOR_TAG:  out->put_string("</font>"); break;
+
+  default:
+    error("unrecognised tag");
+  }
+}
+
+/*
+ *  issue_tag - writes out an html tag with argument.
+ */
+
+void html_text::issue_tag (const char *tagname, const char *arg)
+{
+  if ((arg == 0) || (strlen(arg) == 0)) {
+    out->put_string(tagname);
+    out->put_string(">");
+  } else {
+    out->put_string(tagname);
+    out->put_string(" ");
+    out->put_string(arg);
+    out->put_string(">");
+  }
+}
+
+/*
+ *  issue_color_begin - writes out an html color tag.
+ */
+
+void html_text::issue_color_begin (color *c)
+{
+  unsigned int r, g, b;
+  char buf[6+1];
+
+  out->put_string("<font color=\"#");
+  if (c->is_default())
+    sprintf(buf, "000000");
+  else {
+    c->get_rgb(&r, &g, &b);
+    // we have to scale 0..0xFFFF to 0..0xFF
+    sprintf(buf, "%.2X%.2X%.2X", r/0x101, g/0x101, b/0x101);
+  }
+  out->put_string(buf);
+  out->put_string("\">");
+}
+
+/*
+ *  start_tag - starts a tag.
+ */
+
+void html_text::start_tag (tag_definition *t)
+{
+  switch (t->type) {
+
+  case I_TAG:      issue_tag("<i", (char *)t->arg1); break;
+  case B_TAG:      issue_tag("<b", (char *)t->arg1); break;
+  case P_TAG:      if (t->indent == NULL) {
+                     out->nl();
+                     issue_tag("\n<p", (char *)t->arg1);
+                   } else {
+		     out->nl();
+		     out->simple_comment("INDENTATION");
+		     t->indent->begin(FALSE);
+		     start_space = FALSE;
+                     issue_tag("<p", (char *)t->arg1);
+		   }
+
+                   out->enable_newlines(TRUE); break;
+  case SUB_TAG:    issue_tag("<sub", (char *)t->arg1); break;
+  case SUP_TAG:    issue_tag("<sup", (char *)t->arg1); break;
+  case TT_TAG:     issue_tag("<tt", (char *)t->arg1); break;
+  case PRE_TAG:    if (t->indent != NULL) {
+                     out->nl();
+		     out->simple_comment("INDENTATION");
+		     t->indent->begin(FALSE);
+		     start_space = FALSE;
+                   }
+                   out->enable_newlines(TRUE);
+                   out->nl(); issue_tag("<pre", (char *)t->arg1);
+                   out->enable_newlines(FALSE); break;
+  case SMALL_TAG:  issue_tag("<small", (char *)t->arg1); break;
+  case BIG_TAG:    issue_tag("<big", (char *)t->arg1); break;
+  case BREAK_TAG:  break;
+  case COLOR_TAG:  issue_color_begin(&t->col); break;
+
+  default:
+    error("unrecognised tag");
+  }
+}
+
+/*
+ *  flush_text - flushes html tags which are outstanding on the html stack.
+ */
+
+void html_text::flush_text (void)
+{
+  int notext=TRUE;
+  tag_definition *p=stackptr;
+
+  while (stackptr != 0) {
+    notext = (notext && (! stackptr->text_emitted));
+    if (! notext) {
+      end_tag(stackptr);
+    }
+    p = stackptr;
+    stackptr = stackptr->next;
+    free(p);
+  }
+  lastptr = NULL;
+}
+
+/*
+ *  is_present - returns TRUE if tag is already present on the stack.
+ */
+
+int html_text::is_present (HTML_TAG t)
+{
+  tag_definition *p=stackptr;
+
+  while (p != NULL) {
+    if (t == p->type)
+      return TRUE;
+    p = p->next;
+  }
+  return FALSE;
+}
+
+extern void stop();
+
+/*
+ *  do_push - places, tag_definition, p, onto the stack
+ */
+
+void html_text::do_push (tag_definition *p)
+{
+  HTML_TAG t = p->type;
+
+#if defined(DEBUGGING)
+  if (t == PRE_TAG)
+    stop();
+  debugStack = TRUE;
+  fprintf(stderr, "\nentering do_push (");
+  dump_stack_element(p);
+  fprintf(stderr, ")\n");
+  dump_stack();
+  fprintf(stderr, ")\n");
+  fflush(stderr);
+#endif
+
+  /*
+   *  if t is a P_TAG or PRE_TAG make sure it goes on the end of the stack.
+   */
+
+  if (((t == P_TAG) || (t == PRE_TAG)) && (lastptr != NULL)) {
+    /*
+     *  store, p, at the end
+     */
+    lastptr->next = p;
+    lastptr       = p;
+    p->next       = NULL;
+  } else {
+    p->next       = stackptr;
+    if (stackptr == NULL)
+      lastptr = p;
+    stackptr      = p;
+  }
+
+#if defined(DEBUGGING)
+  dump_stack();
+  fprintf(stderr, "exiting do_push\n");
+#endif
+}
+
+/*
+ *  push_para - adds a new entry onto the html paragraph stack.
+ */
+
+void html_text::push_para (HTML_TAG t, void *arg, html_indent *in)
+{
+  tag_definition *p=(tag_definition *)malloc(sizeof(tag_definition));
+
+  p->type         = t;
+  p->arg1         = arg;
+  p->text_emitted = FALSE;
+  p->indent       = in;
+
+  if (t == PRE_TAG && is_present(PRE_TAG))
+    fatal("cannot have multiple PRE_TAGs");
+
+  do_push(p);
+}
+
+void html_text::push_para (HTML_TAG t)
+{
+  push_para(t, (void *)"", NULL);
+}
+
+void html_text::push_para (color *c)
+{
+  tag_definition *p=(tag_definition *)malloc(sizeof(tag_definition));
+
+  p->type         = COLOR_TAG;
+  p->arg1         = NULL;
+  p->col          = *c;
+  p->text_emitted = FALSE;
+  p->indent       = NULL;
+
+  do_push(p);
+}
+
+/*
+ *  do_italic - changes to italic
+ */
+
+void html_text::do_italic (void)
+{
+  if (! is_present(I_TAG))
+    push_para(I_TAG);
+}
+
+/*
+ *  do_bold - changes to bold.
+ */
+
+void html_text::do_bold (void)
+{
+  if (! is_present(B_TAG))
+    push_para(B_TAG);
+}
+
+/*
+ *  do_tt - changes to teletype.
+ */
+
+void html_text::do_tt (void)
+{
+  if ((! is_present(TT_TAG)) && (! is_present(PRE_TAG)))
+    push_para(TT_TAG);
+}
+
+/*
+ *  do_pre - changes to preformated text.
+ */
+
+void html_text::do_pre (void)
+{
+  done_tt();
+  if (is_present(P_TAG)) {
+    html_indent *i = remove_indent(P_TAG);
+    (void)done_para();
+    if (! is_present(PRE_TAG))
+      push_para(PRE_TAG, NULL, i);
+  } else if (! is_present(PRE_TAG))
+    push_para(PRE_TAG, NULL, NULL);
+  dump_stack();
+}
+
+/*
+ *  is_in_pre - returns TRUE if we are currently within a preformatted
+ *              <pre> block.
+ */
+
+int html_text::is_in_pre (void)
+{
+  return is_present(PRE_TAG);
+}
+
+/*
+ *  do_color - initiates a new color tag.
+ */
+
+void html_text::do_color (color *c)
+{
+  shutdown(COLOR_TAG);   // shutdown a previous color tag, if present
+  push_para(c);
+}
+
+/*
+ *  done_color - shutdown an outstanding color tag, if it exists.
+ */
+
+void html_text::done_color (void)
+{
+  shutdown(COLOR_TAG);
+}
+
+/*
+ *  shutdown - shuts down an html tag.
+ */
+
+char *html_text::shutdown (HTML_TAG t)
+{
+  char *arg=NULL;
+
+  if (is_present(t)) {
+    tag_definition *p    =stackptr;
+    tag_definition *temp =NULL;
+    int notext           =TRUE;
+    
+    dump_stack();
+    while ((stackptr != NULL) && (stackptr->type != t)) {
+      notext = (notext && (! stackptr->text_emitted));
+      if (! notext) {
+	end_tag(stackptr);
+      }
+
+      /*
+       *  pop tag
+       */
+      p        = stackptr;
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+    
+      /*
+       *  push tag onto temp stack
+       */
+      p->next  = temp;
+      temp     = p;
+    }
+
+    /*
+     *  and examine stackptr
+     */
+    if ((stackptr != NULL) && (stackptr->type == t)) {
+      if (stackptr->text_emitted) {
+	end_tag(stackptr);
+      }
+      if (t == P_TAG) {
+	arg = (char *)stackptr->arg1;
+      }
+      p        = stackptr;
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      if (p->indent != NULL)
+	delete p->indent;
+      free(p);
+    }
+
+    /*
+     *  and restore unaffected tags
+     */
+    while (temp != NULL) {
+      if (temp->type == COLOR_TAG)
+	push_para(&temp->col);
+      else
+	push_para(temp->type, temp->arg1, temp->indent);
+      p    = temp;
+      temp = temp->next;
+      free(p);
+    }
+  }
+  return arg;
+}
+
+/*
+ *  done_bold - shuts downs a bold tag.
+ */
+
+void html_text::done_bold (void)
+{
+  shutdown(B_TAG);
+}
+
+/*
+ *  done_italic - shuts downs an italic tag.
+ */
+
+void html_text::done_italic (void)
+{
+  shutdown(I_TAG);
+}
+
+/*
+ *  done_sup - shuts downs a sup tag.
+ */
+
+void html_text::done_sup (void)
+{
+  shutdown(SUP_TAG);
+}
+
+/*
+ *  done_sub - shuts downs a sub tag.
+ */
+
+void html_text::done_sub (void)
+{
+  shutdown(SUB_TAG);
+}
+
+/*
+ *  done_tt - shuts downs a tt tag.
+ */
+
+void html_text::done_tt (void)
+{
+  shutdown(TT_TAG);
+}
+
+/*
+ *  done_pre - shuts downs a pre tag.
+ */
+
+void html_text::done_pre (void)
+{
+  shutdown(PRE_TAG);
+}
+
+/*
+ *  done_small - shuts downs a small tag.
+ */
+
+void html_text::done_small (void)
+{
+  shutdown(SMALL_TAG);
+}
+
+/*
+ *  done_big - shuts downs a big tag.
+ */
+
+void html_text::done_big (void)
+{
+  shutdown(BIG_TAG);
+}
+
+/*
+ *  check_emit_text - ensures that all previous tags have been emitted (in order)
+ *                    before the text is written.
+ */
+
+void html_text::check_emit_text (tag_definition *t)
+{
+  if ((t != NULL) && (! t->text_emitted)) {
+    check_emit_text(t->next);
+    t->text_emitted = TRUE;
+    start_tag(t);
+  }
+}
+
+/*
+ *  do_emittext - tells the class that text was written during the current tag.
+ */
+
+void html_text::do_emittext (const char *s, int length)
+{
+  if ((! is_present(P_TAG)) && (! is_present(PRE_TAG)))
+    do_para("");
+
+  if (is_present(BREAK_TAG)) {
+    int text = remove_break();
+    check_emit_text(stackptr);
+    if (text) {
+      if (is_present(PRE_TAG)) {
+	out->nl();
+      } else {
+	out->put_string("<br>").nl();
+      }
+    }
+  } else {
+    check_emit_text(stackptr);
+  }
+  out->put_string(s, length);
+  space_emitted = FALSE;
+  blank_para = FALSE;
+}
+
+/*
+ *  do_para - starts a new paragraph
+ */
+
+void html_text::do_para (const char *arg, html_indent *in)
+{
+  if (! is_present(P_TAG)) {
+    if (is_present(PRE_TAG)) {
+      html_indent *i = remove_indent(PRE_TAG);
+      done_pre();    
+      if (i == in || in == NULL)
+	in = i;
+      else
+	delete i;
+    }
+    remove_sub_sup();
+    push_para(P_TAG, (void *)arg, in);
+    space_emitted = TRUE;
+  }
+}
+
+void html_text::do_para (const char *arg)
+{
+  do_para(arg, NULL);
+}
+
+void html_text::do_para (simple_output *op, const char *arg1,
+			 int indentation, int pageoffset, int linelength)
+{
+  html_indent *indent;
+
+  if (indentation == 0)
+    indent = NULL;
+  else
+    indent = new html_indent(op, indentation, pageoffset, linelength);
+  do_para(arg1, indent);
+}
+
+/*
+ *  done_para - shuts down a paragraph tag.
+ */
+
+char *html_text::done_para (void)
+{
+  space_emitted = TRUE;
+  return shutdown(P_TAG);
+}
+
+/*
+ *  remove_indent - returns the indent associated with, tag.
+ *                  The indent associated with tag is set to NULL.
+ */
+
+html_indent *html_text::remove_indent (HTML_TAG tag)
+{
+  tag_definition *p=stackptr;
+
+  while (p != NULL) {
+    if (tag == p->type) {
+      html_indent *i = p->indent;
+      p->indent = NULL;
+      return i;
+    }
+    p = p->next;
+  }
+  return NULL;
+}
+
+/*
+ *  do_space - issues an end of paragraph
+ */
+
+void html_text::do_space (void)
+{
+  if (is_in_pre()) {
+    if (blank_para)
+      start_space = TRUE;
+    else {
+      do_emittext("", 0);
+      out->nl();
+      space_emitted = TRUE;
+    }
+  } else {
+    html_indent *i = remove_indent(P_TAG);
+
+    do_para(done_para(), i);
+    space_emitted = TRUE;
+    start_space = TRUE;
+  }
+}
+
+/*
+ *  do_break - issue a break tag.
+ */
+
+void html_text::do_break (void)
+{
+  if (! is_present(PRE_TAG)) {
+    if (emitted_text()) {
+      if (! is_present(BREAK_TAG)) {
+	push_para(BREAK_TAG);
+      }
+    }
+  }
+  space_emitted = TRUE;
+}
+
+/*
+ *  do_newline - issue a newline providing that we are inside a <pre> tag.
+ */
+
+void html_text::do_newline (void)
+{
+  if (is_present(PRE_TAG)) {
+    do_emittext("\n", 1);
+    space_emitted = TRUE;
+  }
+}
+
+/*
+ *  emitted_text - returns FALSE if white space has just been written.
+ */
+
+int html_text::emitted_text (void)
+{
+  return !space_emitted;
+}
+
+/*
+ *  ever_emitted_text - returns TRUE if we have ever emitted text in this paragraph.
+ */
+
+int html_text::ever_emitted_text (void)
+{
+  return !blank_para;
+}
+
+/*
+ *  starts_with_space - returns TRUE if we have start this paragraph with a .sp
+ */
+
+int html_text::starts_with_space (void)
+{
+  return start_space;
+}
+
+/*
+ *  emit_space - writes a space providing that text was written beforehand.
+ */
+
+void html_text::emit_space (void)
+{
+  if (space_emitted) {
+    if (is_present(PRE_TAG)) {
+      do_emittext(" ", 1);
+    }
+  } else {
+    out->space_or_newline();
+    space_emitted = TRUE;
+  }
+}
+
+/*
+ *  remove_def - removes a definition, t, from the stack.
+ */
+
+void html_text::remove_def (tag_definition *t)
+{
+  tag_definition *p    = stackptr;
+  tag_definition *l    = 0;
+  tag_definition *q    = 0;
+    
+  while ((p != 0) && (p != t)) {
+    l = p;
+    p = p->next;
+  }
+  if ((p != 0) && (p == t)) {
+    if (p == stackptr) {
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      q = stackptr;
+    } else if (l == 0) {
+      error("stack list pointers are wrong");
+    } else {
+      l->next = p->next;
+      q = p->next;
+      if (l->next == NULL)
+	lastptr = l;
+    }
+    free(p);
+  }
+}
+
+/*
+ *  remove_tag - removes a tag from the stack.
+ */
+
+void html_text::remove_tag (HTML_TAG tag)
+{
+  tag_definition *p = stackptr;
+    
+  while ((p != 0) && (p->type != tag)) {
+    p = p->next;
+  }
+  if ((p != 0) && (p->type == tag))
+    remove_def(p);
+}
+
+/*
+ *  remove_sub_sup - removes a sub or sup tag, should either exist on the stack.
+ */
+
+void html_text::remove_sub_sup (void)
+{
+  if (is_present(SUB_TAG)) {
+    remove_tag(SUB_TAG);
+  }
+  if (is_present(SUP_TAG)) {
+    remove_tag(SUP_TAG);
+  }
+  if (is_present(PRE_TAG)) {
+    remove_tag(PRE_TAG);
+  }
+}
+
+/*
+ *  remove_break - break tags are not balanced thus remove it once it has been emitted.
+ *                 It returns TRUE if text was emitted before the <br> was issued.
+ */
+
+int html_text::remove_break (void)
+{
+  tag_definition *p    = stackptr;
+  tag_definition *l    = 0;
+  tag_definition *q    = 0;
+
+  while ((p != 0) && (p->type != BREAK_TAG)) {
+    l = p;
+    p = p->next;
+  }
+  if ((p != 0) && (p->type == BREAK_TAG)) {
+    if (p == stackptr) {
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      q = stackptr;
+    } else if (l == 0)
+      error("stack list pointers are wrong");
+    else {
+      l->next = p->next;
+      q = p->next;
+      if (l->next == NULL)
+	lastptr = l;
+    }
+    free(p);
+  }
+  /*
+   *  now determine whether text was issued before <br>
+   */
+  while (q != 0) {
+    if (q->text_emitted)
+      return TRUE;
+    else
+      q = q->next;
+  }
+  return FALSE;
+}
+
+/*
+ *  remove_para_align - removes a paragraph which has a text
+ *                      argument. If the paragraph has no text
+ *                      argument then it is left alone.
+ */
+
+void html_text::remove_para_align (void)
+{
+  if (is_present(P_TAG)) {
+    tag_definition *p=stackptr;
+
+    while (p != NULL) {
+      if (p->type == P_TAG && p->arg1 != NULL) {
+	html_indent *i = remove_indent(P_TAG);
+	done_para();
+	do_para("", i);
+	return;
+      }
+      p = p->next;
+    }
+  }
+}
+
+/*
+ *  do_small - potentially inserts a <small> tag into the html stream.
+ *             However we check for a <big> tag, if present then we terminate it.
+ *             Otherwise a <small> tag is inserted.
+ */
+
+void html_text::do_small (void)
+{
+  if (is_present(BIG_TAG))
+    done_big();
+  else
+    push_para(SMALL_TAG);
+}
+
+/*
+ *  do_big - is the mirror image of do_small.
+ */
+
+void html_text::do_big (void)
+{
+  if (is_present(SMALL_TAG))
+    done_small();
+  else
+    push_para(BIG_TAG);
+}
+
+/*
+ *  do_sup - save a superscript tag on the stack of tags.
+ */
+
+void html_text::do_sup (void)
+{
+  push_para(SUP_TAG);
+}
+
+/*
+ *  do_sub - save a subscript tag on the stack of tags.
+ */
+
+void html_text::do_sub (void)
+{
+  push_para(SUB_TAG);
+}
+
diff --git a/contrib/groff/src/devices/grohtml/html-text.h b/contrib/groff/src/devices/grohtml/html-text.h
index c43cbda..aa4dd80 100644
--- a/contrib/groff/src/devices/grohtml/html-text.h
+++ b/contrib/groff/src/devices/grohtml/html-text.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.h
  *
  *  html-text.h
  *
@@ -47,7 +47,7 @@ typedef struct tag_definition {
 
 /*
  *  the state of the current paragraph.
- *  It allows post-html.cc to request font changes, paragraph start/end
+ *  It allows post-html.cpp to request font changes, paragraph start/end
  *  and emits balanced tags with a small amount of peephole optimization.
  */
 
@@ -116,7 +116,7 @@ private:
   char  *shutdown            (HTML_TAG t);
   void   check_emit_text     (tag_definition *t);
   int    remove_break        (void);
-  void   issue_tag           (char *tagname, char *arg);
+  void   issue_tag           (const char *tagname, const char *arg);
   void   issue_color_begin   (color *c);
   void   remove_def          (tag_definition *t);
   html_indent *remove_indent (HTML_TAG tag);
diff --git a/contrib/groff/src/devices/grohtml/output.cpp b/contrib/groff/src/devices/grohtml/output.cpp
new file mode 100644
index 0000000..2705b9e
--- /dev/null
+++ b/contrib/groff/src/devices/grohtml/output.cpp
@@ -0,0 +1,356 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote output.cpp
+ *  but it owes a huge amount of ideas and raw code from
+ *  James Clark (jjc@jclark.com) grops/ps.cpp.
+ *
+ *  output.cpp
+ *
+ *  provide the simple low level output routines needed by html.cpp
+ */
+
+/*
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+
+#include <time.h>
+#include "html.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#undef DEBUGGING
+// #define DEBUGGING
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+
+#if defined(DEBUGGING)
+#  define FPUTC(X,Y)   do { fputc((X),(Y)); fputc((X), stderr); fflush(stderr); } while (0)
+#  define FPUTS(X,Y)   do { fputs((X),(Y)); fputs((X), stderr); fflush(stderr); } while (0)
+#  define PUTC(X,Y)    do { putc((X),(Y)); putc((X), stderr); fflush(stderr); } while (0)
+#else
+#  define FPUTC(X,Y)   do { fputc((X),(Y)); } while (0)
+#  define FPUTS(X,Y)   do { fputs((X),(Y)); } while (0)
+#  define PUTC(X,Y)    do { putc((X),(Y)); } while (0)
+#endif
+
+
+/*
+ *  word - initialise a word and set next to NULL
+ */
+
+word::word (const char *w, int n)
+  : next(0)
+{
+  s = (char *)malloc(n+1);
+  strncpy(s, w, n);
+  s[n] = (char)0;
+}
+
+/*
+ *  destroy word and the string copy.
+ */
+
+word::~word ()
+{
+  free(s);
+}
+
+/*
+ *  word_list - create an empty word list.
+ */
+
+word_list::word_list ()
+  : length(0), head(0), tail(0)
+{
+}
+
+/*
+ *  flush - flush a word list to a FILE, f, and return the
+ *          length of the buffered string.
+ */
+
+int word_list::flush (FILE *f)
+{
+  word *t;
+  int   len=length;
+
+  while (head != 0) {
+    t = head;
+    head = head->next;
+    FPUTS(t->s, f);
+    delete t;
+  }
+  head   = 0;
+  tail   = 0;
+  length = 0;
+#if defined(DEBUGGING)
+  fflush(f);   // just for testing
+#endif
+  return( len );
+}
+
+/*
+ *  add_word - adds a word to the outstanding word list.
+ */
+
+void word_list::add_word (const char *s, int n)
+{
+  if (head == 0) {
+    head = new word(s, n);
+    tail = head;
+  } else {
+    tail->next = new word(s, n);
+    tail       = tail->next;
+  }
+  length += n;
+}
+
+/*
+ *  get_length - returns the number of characters buffered
+ */
+
+int word_list::get_length (void)
+{
+  return( length );
+}
+
+/*
+ *  the classes and methods for simple_output manipulation
+ */
+
+simple_output::simple_output(FILE *f, int n)
+: fp(f), max_line_length(n), col(0), fixed_point(0), newlines(0)
+{
+}
+
+simple_output &simple_output::set_file(FILE *f)
+{
+  if (fp)
+    fflush(fp);
+  fp = f;
+  return *this;
+}
+
+simple_output &simple_output::copy_file(FILE *infp)
+{
+  int c;
+  while ((c = getc(infp)) != EOF)
+    PUTC(c, fp);
+  return *this;
+}
+
+simple_output &simple_output::end_line()
+{
+  flush_last_word();
+  if (col != 0) {
+    PUTC('\n', fp);
+    col = 0;
+  }
+  return *this;
+}
+
+simple_output &simple_output::special(const char *)
+{
+  return *this;
+}
+
+simple_output &simple_output::simple_comment(const char *s)
+{
+  flush_last_word();
+  if (col != 0)
+    PUTC('\n', fp);
+  FPUTS("<!-- ", fp);
+  FPUTS(s, fp);
+  FPUTS(" -->\n", fp);
+  col = 0;
+  return *this;
+}
+
+simple_output &simple_output::begin_comment(const char *s)
+{
+  flush_last_word();
+  if (col != 0)
+    PUTC('\n', fp);
+  col = 0;
+  put_string("<!--");
+  space_or_newline();
+  last_word.add_word(s, strlen(s));
+  return *this;
+}
+
+simple_output &simple_output::end_comment()
+{
+  flush_last_word();
+  space_or_newline();
+  put_string("-->").nl();
+  return *this;
+}
+
+/*
+ *  check_newline - checks to see whether we are able to issue
+ *                  a newline and that one is needed.
+ */
+
+simple_output &simple_output::check_newline(int n)
+{
+  if ((col + n + last_word.get_length() + 1 > max_line_length) && (newlines)) {
+    FPUTC('\n', fp);
+    col = last_word.flush(fp);
+  }
+  return *this;
+}
+
+/*
+ *  space_or_newline - will emit a newline or a space later on
+ *                     depending upon the current column.
+ */
+
+simple_output &simple_output::space_or_newline (void)
+{
+  if ((col + last_word.get_length() + 1 > max_line_length) && (newlines)) {
+    FPUTC('\n', fp);
+    if (last_word.get_length() > 0) {
+      col = last_word.flush(fp);
+    } else {
+      col = 0;
+    }
+  } else {
+    if (last_word.get_length() != 0) {
+      if (col > 0) {
+	FPUTC(' ', fp);
+	col++;
+      }
+      col += last_word.flush(fp);
+    }
+  }
+  return *this;
+}
+
+/*
+ *  nl - writes a newline providing that we
+ *       are not in the first column.
+ */
+
+simple_output &simple_output::nl (void)
+{
+  space_or_newline();
+  col += last_word.flush(fp);
+  if (col != 0) {
+    FPUTC('\n', fp);
+    col = 0;
+  }
+  return *this ;
+}
+
+simple_output &simple_output::set_fixed_point(int n)
+{
+  assert(n >= 0 && n <= 10);
+  fixed_point = n;
+  return *this;
+}
+
+simple_output &simple_output::put_raw_char(char c)
+{
+  col += last_word.flush(fp);
+  PUTC(c, fp);
+  col++;
+  return *this;
+}
+
+simple_output &simple_output::put_string(const char *s, int n)
+{
+  last_word.add_word(s, n);
+  return *this;
+}
+
+simple_output &simple_output::put_string(const char *s)
+{
+  last_word.add_word(s, strlen(s));
+  return *this;
+}
+
+simple_output &simple_output::put_string(const string &s)
+{
+  last_word.add_word(s.contents(), s.length());
+  return *this;
+}
+
+simple_output &simple_output::put_number(int n)
+{
+  char buf[1 + INT_DIGITS + 1];
+  sprintf(buf, "%d", n);
+  put_string(buf);
+  return *this;
+}
+
+simple_output &simple_output::put_float(double d)
+{
+  char buf[128];
+
+  sprintf(buf, "%.4f", d);
+  put_string(buf);
+  return *this;
+}
+
+simple_output &simple_output::enable_newlines (int auto_newlines)
+{
+  check_newline(0);
+  newlines = auto_newlines;
+  check_newline(0);
+  return *this;
+}
+
+/*
+ *  flush_last_word - flushes the last word and adjusts the
+ *                    col position. It will insert a newline
+ *                    before the last word if allowed and if
+ *                    necessary.
+ */
+
+void simple_output::flush_last_word (void)
+{
+  int len=last_word.get_length();
+
+  if (len > 0) {
+    if (newlines) {
+      if (col + len + 1 > max_line_length) {
+	FPUTS("\n", fp);
+	col = 0;
+      } else {
+	FPUTS(" ", fp);
+	col++;
+      }
+      len += last_word.flush(fp);
+    } else {
+      FPUTS(" ", fp);
+      col++;
+      col += last_word.flush(fp);
+    }
+  }
+}
diff --git a/contrib/groff/src/devices/grohtml/post-html.cpp b/contrib/groff/src/devices/grohtml/post-html.cpp
new file mode 100644
index 0000000..7c96deb
--- /dev/null
+++ b/contrib/groff/src/devices/grohtml/post-html.cpp
@@ -0,0 +1,3812 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cpp
+ *  but it owes a huge amount of ideas and raw code from
+ *  James Clark (jjc@jclark.com) grops/ps.cpp.
+ */
+
+/*
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "html.h"
+#include "html-text.h"
+#include "html-table.h"
+
+#include <time.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <fcntl.h>
+
+extern "C" const char *Version_string;
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+#define MAX_LINE_LENGTH                60            /* maximum characters we want in a line      */
+#define SIZE_INCREMENT                  2            /* font size increment <big> = +2            */
+#define BASE_POINT_SIZE                10            /* 10 points is the base size ie html size 3 */
+#define CENTER_TOLERANCE                2            /* how many pixels off center will we still  */
+#define ANCHOR_TEMPLATE         "heading"            /* if simple anchor is set we use this       */
+#define UNICODE_DESC_START           0x80            /* all character entities above this are     */
+                                                     /* either encoded by their glyph names or if */
+                                                     /* there is no name then we use &#nnn;       */
+typedef enum {CENTERED, LEFT, RIGHT, INLINE} TAG_ALIGNMENT;
+typedef enum {col_tag, tab_tag, tab0_tag, none} colType;
+
+#undef DEBUG_TABLES
+
+
+/*
+ *  prototypes
+ */
+
+char *get_html_translation (font *f, const string &name);
+int char_translate_to_html (font *f, char *buf, int buflen, unsigned char ch, int b, int and_single);
+
+
+static int auto_links = TRUE;                        /* by default we enable automatic links at  */
+                                                     /* top of the document.                     */
+static int auto_rule  = TRUE;                        /* by default we enable an automatic rule   */
+                                                     /* at the top and bottom of the document    */
+static int simple_anchors = FALSE;                   /* default to anchors with heading text     */
+static int manufacture_headings = FALSE;             /* default is to use the Hn html headings,  */
+                                                     /* rather than manufacture our own.         */
+static color *default_background = NULL;             /* has user requested initial bg color?     */
+
+
+/*
+ *  start with a few favorites
+ */
+
+void stop () {}
+
+static int min (int a, int b)
+{
+  if (a < b)
+    return a;
+  else
+    return b;
+}
+
+static int max (int a, int b)
+{
+  if (a > b)
+    return a;
+  else
+    return b;
+}
+
+/*
+ *  is_intersection - returns TRUE if range a1..a2 intersects with b1..b2
+ */
+
+static int is_intersection (int a1, int a2, int b1, int b2)
+{
+  // easier to prove NOT outside limits
+  return( ! ((a1 > b2) || (a2 < b1)) );
+}
+
+/*
+ *  is_digit - returns TRUE if character, ch, is a digit.
+ */
+
+static int is_digit (char ch)
+{
+  return( (ch >= '0') && (ch <= '9') );
+}
+
+/*
+ *  the classes and methods for maintaining a list of files.
+ */
+
+struct file {
+  FILE    *fp;
+  file    *next;
+
+  file     (FILE *f);
+};
+
+/*
+ *  file - initialize all fields to NULL
+ */
+
+file::file (FILE *f)
+  : fp(f), next(0)
+{
+}
+
+class files {
+public:
+            files         ();
+  FILE     *get_file      (void);
+  void      start_of_list (void);
+  void      move_next     (void);
+  void      add_new_file  (FILE *f);
+private:
+  file     *head;
+  file     *tail;
+  file     *ptr;
+};
+
+/*
+ *  files - create an empty list of files.
+ */
+
+files::files ()
+  : head(0), tail(0), ptr(0)
+{
+}
+
+/*
+ *  get_file - returns the FILE associated with ptr.
+ */
+
+FILE *files::get_file (void)
+{
+  if (ptr) {
+    return( ptr->fp );
+  } else {
+    return( 0 );
+  }
+}
+
+/*
+ *  start_of_list - reset the ptr to the start of the list.
+ */
+
+void files::start_of_list (void)
+{
+  ptr = head;
+}
+
+/*
+ *  move_next - moves the ptr to the next element on the list.
+ */
+
+void files::move_next (void)
+{
+  if (ptr != 0)
+    ptr = ptr->next;
+}
+
+/*
+ *  add_new_file - adds a new file, f, to the list.
+ */
+
+void files::add_new_file (FILE *f)
+{
+  if (head == 0) {
+    head = new file(f);
+    tail = head;
+  } else {
+    tail->next = new file(f);
+    tail       = tail->next;
+  }
+  ptr = tail;
+}
+
+/*
+ *  the class and methods for styles
+ */
+
+struct style {
+  font        *f;
+  int          point_size;
+  int          font_no;
+  int          height;
+  int          slant;
+  color        col;
+               style       ();
+               style       (font *, int, int, int, int, color);
+  int          operator == (const style &) const;
+  int          operator != (const style &) const;
+};
+
+style::style()
+  : f(0)
+{
+}
+
+style::style(font *p, int sz, int h, int sl, int no, color c)
+  : f(p), point_size(sz), font_no(no), height(h), slant(sl), col(c)
+{
+}
+
+int style::operator==(const style &s) const
+{
+  return (f == s.f && point_size == s.point_size
+	  && height == s.height && slant == s.slant && col == s.col);
+}
+
+int style::operator!=(const style &s) const
+{
+  return !(*this == s);
+}
+
+/*
+ *  the class and methods for retaining ascii text
+ */
+
+struct char_block {
+  enum { SIZE = 256 };
+  char         *buffer;
+  int           used;
+  char_block   *next;
+
+  char_block();
+  char_block(int length);
+  ~char_block();
+};
+
+char_block::char_block()
+: buffer(NULL), used(0), next(0)
+{
+}
+
+char_block::char_block(int length)
+: used(0), next(0)
+{
+  buffer = (char *)malloc(max(length, char_block::SIZE));
+  if (buffer == NULL)
+    fatal("out of memory error");
+}
+
+char_block::~char_block()
+{
+  if (buffer != NULL)
+    free(buffer);
+}
+
+class char_buffer {
+public:
+  char_buffer();
+  ~char_buffer();
+  char  *add_string(const char *, unsigned int);
+  char  *add_string(const string &);
+private:
+  char_block *head;
+  char_block *tail;
+};
+
+char_buffer::char_buffer()
+: head(0), tail(0)
+{
+}
+
+char_buffer::~char_buffer()
+{
+  while (head != 0) {
+    char_block *temp = head;
+    head = head->next;
+    delete temp;
+  }
+}
+
+char *char_buffer::add_string (const char *s, unsigned int length)
+{
+  int i=0;
+  unsigned int old_used;
+
+  if (s == NULL || length == 0)
+    return NULL;
+
+  if (tail == 0) {
+    tail = new char_block(length+1);
+    head = tail;
+  } else {
+    if (tail->used + length+1 > char_block::SIZE) {
+      tail->next  = new char_block(length+1);
+      tail        = tail->next;
+    }
+  }
+
+  old_used = tail->used;
+  do {
+    tail->buffer[tail->used] = s[i];
+    tail->used++;
+    i++;
+    length--;
+  } while (length>0);
+
+  // add terminating nul character
+
+  tail->buffer[tail->used] = '\0';
+  tail->used++;
+
+  // and return start of new string
+
+  return( &tail->buffer[old_used] );
+}
+
+char *char_buffer::add_string (const string &s)
+{
+  return add_string(s.contents(), s.length());
+}
+
+/*
+ *  the classes and methods for maintaining glyph positions.
+ */
+
+class text_glob {
+public:
+  void text_glob_html      (style *s, char *str, int length,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal);
+  void text_glob_special   (style *s, char *str, int length,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal);
+  void text_glob_line      (style *s,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal,
+			    int thickness);
+  void text_glob_auto_image(style *s, char *str, int length,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal);
+  void text_glob_tag       (style *s, char *str, int length,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal);
+		       
+  text_glob                (void);
+  ~text_glob               (void);
+  int  is_a_line           (void);
+  int  is_a_tag            (void);
+  int  is_eol              (void);
+  int  is_auto_img         (void);
+  int  is_br               (void);
+  int  is_in               (void);
+  int  is_po               (void);
+  int  is_ti               (void);
+  int  is_ce               (void);
+  int  is_eol_ce           (void);
+  int  is_col              (void);
+  int  is_tab              (void);
+  int  is_tab0             (void);
+  int  is_ta               (void);
+  int  is_tab_ts           (void);
+  int  is_tab_te           (void);
+  int  is_nf               (void);
+  int  is_fi               (void);
+  int  get_arg             (void);
+  int  get_tab_args        (char *align);
+
+  void        remember_table (html_table *t);
+  html_table *get_table      (void);
+
+  style           text_style;
+  const char     *text_string;
+  unsigned int    text_length;
+  int             minv, minh, maxv, maxh;
+  int             is_tag;               // is this a .br, .sp, .tl etc
+  int             is_img_auto;          // image created by eqn delim
+  int             is_special;           // text has come via 'x X html:'
+  int             is_line;              // is the command a <line>?
+  int             thickness;            // the thickness of a line
+  html_table     *tab;                  // table description
+
+private:
+  text_glob           (style *s, const char *str, int length,
+		       int min_vertical , int min_horizontal,
+		       int max_vertical , int max_horizontal,
+		       bool is_troff_command,
+		       bool is_auto_image, bool is_special_command,
+		       bool is_a_line    , int  thickness);
+};
+
+text_glob::text_glob (style *s, const char *str, int length,
+		      int min_vertical, int min_horizontal,
+		      int max_vertical, int max_horizontal,
+		      bool is_troff_command,
+		      bool is_auto_image, bool is_special_command,
+		      bool is_a_line, int line_thickness)
+  : text_style(*s), text_string(str), text_length(length),
+    minv(min_vertical), minh(min_horizontal), maxv(max_vertical), maxh(max_horizontal),
+    is_tag(is_troff_command), is_img_auto(is_auto_image), is_special(is_special_command),
+    is_line(is_a_line), thickness(line_thickness), tab(NULL)
+{
+}
+
+text_glob::text_glob ()
+  : text_string(0), text_length(0), minv(-1), minh(-1), maxv(-1), maxh(-1),
+    is_tag(FALSE), is_special(FALSE), is_line(FALSE), thickness(0), tab(NULL)
+{
+}
+
+text_glob::~text_glob ()
+{
+  if (tab != NULL)
+    delete tab;
+}
+
+/*
+ *  text_glob_html - used to place html text into the glob buffer.
+ */
+
+void text_glob::text_glob_html (style *s, char *str, int length,
+				int min_vertical , int min_horizontal,
+				int max_vertical , int max_horizontal)
+{
+  text_glob *g = new text_glob(s, str, length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       FALSE, FALSE, FALSE, FALSE, 0);
+  *this = *g;
+  delete g;
+}
+
+/*
+ *  text_glob_html - used to place html specials into the glob buffer.
+ *                   This text is essentially html commands coming through
+ *                   from the macro sets, with special designated sequences of
+ *                   characters translated into html. See add_and_encode.
+ */
+
+void text_glob::text_glob_special (style *s, char *str, int length,
+				   int min_vertical , int min_horizontal,
+				   int max_vertical , int max_horizontal)
+{
+  text_glob *g = new text_glob(s, str, length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       FALSE, FALSE, TRUE, FALSE, 0);
+  *this = *g;
+  delete g;
+}
+
+/*
+ *  text_glob_line - record horizontal draw line commands.
+ */
+
+void text_glob::text_glob_line (style *s,
+				int min_vertical , int min_horizontal,
+				int max_vertical , int max_horizontal,
+				int thickness)
+{
+  text_glob *g = new text_glob(s, "", 0,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       FALSE, FALSE, FALSE, TRUE, thickness);
+  *this = *g;
+  delete g;
+}
+
+/*
+ *  text_glob_auto_image - record the presence of a .auto-image tag command.
+ *                         Used to mark that an image has been created automatically
+ *                         by a preprocessor and (pre-grohtml/troff) combination.
+ *                         Under some circumstances images may not be created.
+ *                         (consider .EQ
+ *                                   delim $$
+ *                                   .EN
+ *                                   .TS
+ *                                   tab(!), center;
+ *                                   l!l.
+ *                                   $1 over x$!recripical of x
+ *                                   .TE
+ *
+ *                          the first auto-image marker is created via .EQ/.EN pair
+ *                          and no image is created.
+ *                          The second auto-image marker occurs at $1 over x$
+ *                          Currently this image will not be created
+ *                          as the whole of the table is created as an image.
+ *                          (Once html tables are handled by grohtml this will change.
+ *                           Shortly this will be the case).
+ */
+
+void text_glob::text_glob_auto_image(style *s, char *str, int length,
+				     int min_vertical, int min_horizontal,
+				     int max_vertical, int max_horizontal)
+{
+  text_glob *g = new text_glob(s, str, length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       TRUE, TRUE, FALSE, FALSE, 0);
+  *this = *g;
+  delete g;
+}
+
+/*
+ *  text_glob_tag - records a troff tag.
+ */
+
+void text_glob::text_glob_tag (style *s, char *str, int length,
+			       int min_vertical, int min_horizontal,
+			       int max_vertical, int max_horizontal)
+{
+  text_glob *g = new text_glob(s, str, length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       TRUE, FALSE, FALSE, FALSE, 0);
+  *this = *g;
+  delete g;
+}
+
+/*
+ *  is_a_line - returns TRUE if glob should be converted into an <hr>
+ */
+
+int text_glob::is_a_line (void)
+{
+  return is_line;
+}
+
+/*
+ *  is_a_tag - returns TRUE if glob contains a troff directive.
+ */
+
+int text_glob::is_a_tag (void)
+{
+  return is_tag;
+}
+
+/*
+ *  is_eol - returns TRUE if glob contains the tag eol
+ */
+
+int text_glob::is_eol (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:eol") == 0) );
+}
+
+/*
+ *  is_eol_ce - returns TRUE if glob contains the tag eol.ce
+ */
+
+int text_glob::is_eol_ce (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:eol.ce") == 0) );
+}
+
+
+/*
+ *  is_nf - returns TRUE if glob contains the tag .nf
+ */
+
+int text_glob::is_nf (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:.nf") == 0) );
+}
+
+/*
+ *  is_fi - returns TRUE if glob contains the tag .fi
+ */
+
+int text_glob::is_fi (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:.fi") == 0) );
+}
+
+/*
+ *  is_ce - returns TRUE if glob contains the tag .ce
+ */
+
+int text_glob::is_ce (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:.ce") == 0) );
+}
+
+/*
+ *  is_in - returns TRUE if glob contains the tag .in
+ */
+
+int text_glob::is_in (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:.in ", strlen("html-tag:.in ")) == 0) );
+}
+
+/*
+ *  is_po - returns TRUE if glob contains the tag .po
+ */
+
+int text_glob::is_po (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:.po ", strlen("html-tag:.po ")) == 0) );
+}
+
+/*
+ *  is_ti - returns TRUE if glob contains the tag .ti
+ */
+
+int text_glob::is_ti (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:.ti ", strlen("html-tag:.ti ")) == 0) );
+}
+
+/*
+ *  is_col - returns TRUE if glob contains the tag .col
+ */
+
+int text_glob::is_col (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:.col", strlen("html-tag:.col")) == 0) );
+}
+
+/*
+ *  is_tab_ts - returns TRUE if glob contains the tag .tab_ts
+ */
+
+int text_glob::is_tab_ts (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:.tab-ts") == 0) );
+}
+
+/*
+ *  is_tab_te - returns TRUE if glob contains the tag .tab_te
+ */
+
+int text_glob::is_tab_te (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:.tab-te") == 0) );
+}
+
+/*
+ *  is_ta - returns TRUE if glob contains the tag .ta
+ */
+
+int text_glob::is_ta (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:.ta ", strlen("html-tag:.ta ")) == 0) );
+}
+
+/*
+ *  is_tab - returns TRUE if glob contains the tag tab
+ */
+
+int text_glob::is_tab (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:tab ", strlen("html-tag:tab ")) == 0) );
+}
+
+/*
+ *  is_tab0 - returns TRUE if glob contains the tag tab0
+ */
+
+int text_glob::is_tab0 (void)
+{
+  return( is_tag && (strncmp(text_string, "html-tag:tab0", strlen("html-tag:tab0")) == 0) );
+}
+
+/*
+ *  is_auto_img - returns TRUE if the glob contains an automatically
+ *                generated image.
+ */
+
+int text_glob::is_auto_img (void)
+{
+  return is_img_auto;
+}
+
+/*
+ *  is_br - returns TRUE if the glob is a tag containing a .br
+ *          or an implied .br. Note that we do not include .nf or .fi
+ *          as grohtml will place a .br after these commands if they
+ *          should break the line.
+ */
+
+int text_glob::is_br (void)
+{
+  return( is_a_tag() && ((strcmp ("html-tag:.br", text_string) == 0) ||
+			 (strncmp("html-tag:.sp", text_string, 11) == 0) ||
+			 (strcmp ("html-tag:.ce", text_string) == 0)) );
+}
+
+int text_glob::get_arg (void)
+{
+  if (strncmp("html-tag:", text_string, strlen("html-tag:")) == 0) {
+    const char *p = text_string;
+
+    while ((*p != (char)0) && (!isspace(*p)))
+      p++;
+    while ((*p != (char)0) && (isspace(*p)))
+      p++;
+    if (*p == (char)0)
+      return -1;
+    return atoi(p);
+  }
+  return -1;
+}
+
+/*
+ *  get_tab_args - returns the tab position and alignment of the tab tag
+ */
+
+int text_glob::get_tab_args (char *align)
+{
+  if (strncmp("html-tag:", text_string, strlen("html-tag:")) == 0) {
+    const char *p = text_string;
+
+    // firstly the alignment C|R|L
+    while ((*p != (char)0) && (!isspace(*p)))
+      p++;
+    while ((*p != (char)0) && (isspace(*p)))
+      p++;
+    *align = *p;
+    // now the int value
+    while ((*p != (char)0) && (!isspace(*p)))
+      p++;
+    while ((*p != (char)0) && (isspace(*p)))
+      p++;
+    if (*p == (char)0)
+      return -1;
+    return atoi(p);
+  }
+  return -1;
+}
+
+/*
+ *  remember_table - saves table, t, in the text_glob.
+ */
+
+void text_glob::remember_table (html_table *t)
+{
+  if (tab != NULL)
+    delete tab;
+  tab = t;
+}
+
+/*
+ *  get_table - returns the stored table description.
+ */
+
+html_table *text_glob::get_table (void)
+{
+  return tab;
+}
+
+/*
+ *  the class and methods used to construct ordered double linked lists.
+ *  In a previous implementation we used templates via #include "ordered-list.h",
+ *  but this does assume that all C++ compilers can handle this feature. Pragmatically
+ *  it is safer to assume this is not the case.
+ */
+
+struct element_list {
+  element_list *right;
+  element_list *left;
+  text_glob    *datum;
+  int           lineno;
+  int           minv, minh, maxv, maxh;
+
+  element_list  (text_glob *d,
+		 int line_number,
+		 int min_vertical, int min_horizontal,
+		 int max_vertical, int max_horizontal);
+  element_list  ();
+  ~element_list ();
+};
+
+element_list::element_list ()
+  : right(0), left(0), datum(0), lineno(0), minv(-1), minh(-1), maxv(-1), maxh(-1)
+{
+}
+
+/*
+ *  element_list - create a list element assigning the datum and region parameters.
+ */
+
+element_list::element_list (text_glob *in,
+			    int line_number,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal)
+  : right(0), left(0), datum(in), lineno(line_number),
+    minv(min_vertical), minh(min_horizontal), maxv(max_vertical), maxh(max_horizontal)
+{
+}
+
+element_list::~element_list ()
+{
+  if (datum != NULL)
+    delete datum;
+}
+
+class list {
+public:
+       list             ();
+      ~list             ();
+  int  is_less          (element_list *a, element_list *b);
+  void add              (text_glob *in,
+		         int line_number,
+		         int min_vertical, int min_horizontal,
+		         int max_vertical, int max_horizontal);
+  void                  sub_move_right      (void);
+  void                  move_right          (void);
+  void                  move_left           (void);
+  int                   is_empty            (void);
+  int                   is_equal_to_tail    (void);
+  int                   is_equal_to_head    (void);
+  void                  start_from_head     (void);
+  void                  start_from_tail     (void);
+  void                  insert              (text_glob *in);
+  void                  move_to             (text_glob *in);
+  text_glob            *move_right_get_data (void);
+  text_glob            *move_left_get_data  (void);
+  text_glob            *get_data            (void);
+private:
+  element_list *head;
+  element_list *tail;
+  element_list *ptr;
+};
+
+/*
+ *  list - construct an empty list.
+ */
+
+list::list ()
+  : head(NULL), tail(NULL), ptr(NULL)
+{
+}
+
+/*
+ *  ~list - destroy a complete list.
+ */
+
+list::~list()
+{
+  element_list *temp=head;
+
+  do {
+    temp = head;
+    if (temp != NULL) {
+      head = head->right;
+      delete temp;
+    }
+  } while ((head != NULL) && (head != tail));
+}
+
+/*
+ *  is_less - returns TRUE if a is left of b if on the same line or
+ *            if a is higher up the page than b.
+ */
+
+int list::is_less (element_list *a, element_list *b)
+{
+  // was if (is_intersection(a->minv+1, a->maxv-1, b->minv+1, b->maxv-1)) {
+  if (a->lineno < b->lineno) {
+    return( TRUE );
+  } else if (a->lineno > b->lineno) {
+    return( FALSE );
+  } else if (is_intersection(a->minv, a->maxv, b->minv, b->maxv)) {
+    return( a->minh < b->minh );
+  } else {
+    return( a->maxv < b->maxv );
+  }
+}
+
+/*
+ *  add - adds a datum to the list in the order specified by the region position.
+ */
+
+void list::add (text_glob *in, int line_number, int min_vertical, int min_horizontal, int max_vertical, int max_horizontal)
+{
+  // create a new list element with datum and position fields initialized
+  element_list *t    = new element_list(in, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  element_list *last;
+
+  if (head == 0) {
+    head     = t;
+    tail     = t;
+    ptr      = t;
+    t->left  = t;
+    t->right = t;
+  } else {
+    last = tail;
+
+    while ((last != head) && (is_less(t, last))) {
+      last = last->left;
+    }
+
+    if (is_less(t, last)) {
+      t->right          = last;
+      last->left->right = t;
+      t->left           = last->left;
+      last->left        = t;
+      // now check for a new head
+      if (last == head) {
+	head = t;
+      }
+    } else {
+      // add t beyond last
+      t->right          = last->right;
+      t->left           = last;
+      last->right->left = t;
+      last->right       = t;
+      // now check for a new tail
+      if (last == tail) {
+	tail = t;
+      }
+    }
+  }
+}
+
+/*
+ *  sub_move_right - removes the element which is currently pointed to by ptr
+ *                   from the list and moves ptr to the right.
+ */
+
+void list::sub_move_right (void)
+{
+  element_list *t=ptr->right;
+
+  if (head == tail) {
+    head = 0;
+    if (tail != 0) {
+      delete tail;
+    }
+    tail = 0;
+    ptr  = 0;
+  } else {
+    if (head == ptr) {
+      head = head->right;
+    }
+    if (tail == ptr) {
+      tail = tail->left;
+    }
+    ptr->left->right = ptr->right;
+    ptr->right->left = ptr->left;
+    ptr=t;
+  }
+}
+
+/*
+ *  start_from_head - assigns ptr to the head.
+ */
+
+void list::start_from_head (void)
+{
+  ptr = head;
+}
+
+/*
+ *  start_from_tail - assigns ptr to the tail.
+ */
+
+void list::start_from_tail (void)
+{
+  ptr = tail;
+}
+
+/*
+ *  is_empty - returns TRUE if the list has no elements.
+ */
+
+int list::is_empty (void)
+{
+  return( head == 0 );
+}
+
+/*
+ *  is_equal_to_tail - returns TRUE if the ptr equals the tail.
+ */
+
+int list::is_equal_to_tail (void)
+{
+  return( ptr == tail );
+}
+
+/*
+ *  is_equal_to_head - returns TRUE if the ptr equals the head.
+ */
+
+int list::is_equal_to_head (void)
+{
+  return( ptr == head );
+}
+
+/*
+ *  move_left - moves the ptr left.
+ */
+
+void list::move_left (void)
+{
+  ptr = ptr->left;
+}
+
+/*
+ *  move_right - moves the ptr right.
+ */
+
+void list::move_right (void)
+{
+  ptr = ptr->right;
+}
+
+/*
+ *  get_datum - returns the datum referenced via ptr.
+ */
+
+text_glob* list::get_data (void)
+{
+  return( ptr->datum );
+}
+
+/*
+ *  move_right_get_data - returns the datum referenced via ptr and moves
+ *                        ptr right.
+ */
+
+text_glob* list::move_right_get_data (void)
+{
+  ptr = ptr->right;
+  if (ptr == head) {
+    return( 0 );
+  } else {
+    return( ptr->datum );
+  }
+}
+
+/*
+ *  move_left_get_data - returns the datum referenced via ptr and moves
+ *                       ptr right.
+ */
+
+text_glob* list::move_left_get_data (void)
+{
+  ptr = ptr->left;
+  if (ptr == tail) {
+    return( 0 );
+  } else {
+    return( ptr->datum );
+  }
+}
+
+/*
+ *  insert - inserts data after the current position.
+ */
+
+void list::insert (text_glob *in)
+{
+  if (is_empty())
+    fatal("list must not be empty if we are inserting data");
+  else {
+    if (ptr == 0)
+      ptr = head;
+    
+    element_list *t = new element_list(in, ptr->lineno, ptr->minv, ptr->minh, ptr->maxv, ptr->maxh);
+    if (ptr == tail)
+      tail = t;
+    ptr->right->left = t;
+    t->right = ptr->right;
+    ptr->right = t;
+    t->left = ptr;
+  }
+}
+
+/*
+ *  move_to - moves the current position to the point where data, in, exists.
+ *            This is an expensive method and should be used sparingly.
+ */
+
+void list::move_to (text_glob *in)
+{
+  ptr = head;
+  while (ptr != tail && ptr->datum != in)
+    ptr = ptr->right;
+}
+
+/*
+ *  page class and methods
+ */
+
+class page {
+public:
+                              page            (void);
+  void                        add             (style *s, const string &str,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_tag         (style *s, const string &str,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_and_encode  (style *s, const string &str,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_line        (style *s,
+					       int line_number,
+					       int x1, int y1, int x2, int y2,
+					       int thickness);
+  void                        insert_tag      (const string &str);
+  void                        dump_page       (void);   // debugging method
+
+  // and the data
+
+  list                        glyphs;         // position of glyphs and specials on page
+  char_buffer                 buffer;         // all characters for this page
+};
+
+page::page()
+{
+}
+
+/*
+ *  insert_tag - inserts a tag after the current position.
+ */
+
+void page::insert_tag (const string &str)
+{
+  if (str.length() > 0) {
+    text_glob *g=new text_glob();
+    text_glob *f=glyphs.get_data();
+    g->text_glob_tag(&f->text_style, buffer.add_string(str), str.length(),
+		     f->minv, f->minh, f->maxv, f->maxh);
+    glyphs.insert(g);
+  }
+}
+
+/*
+ *  add - add html text to the list of glyphs.
+ */
+
+void page::add (style *s, const string &str,
+		int line_number,
+		int min_vertical, int min_horizontal,
+		int max_vertical, int max_horizontal)
+{
+  if (str.length() > 0) {
+    text_glob *g=new text_glob();
+    g->text_glob_html(s, buffer.add_string(str), str.length(),
+		      min_vertical, min_horizontal, max_vertical, max_horizontal);
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  add_tag - adds a troff tag, for example: .tl .sp .br
+ */
+
+void page::add_tag (style *s, const string &str,
+		    int line_number,
+		    int min_vertical, int min_horizontal,
+		    int max_vertical, int max_horizontal)
+{
+  if (str.length() > 0) {
+    text_glob *g;
+
+    if (strncmp((str+'\0').contents(), "html-tag:.auto-image", 20) == 0) {
+      g = new text_glob();
+      g->text_glob_auto_image(s, buffer.add_string(str), str.length(),
+			      min_vertical, min_horizontal, max_vertical, max_horizontal);
+    } else {
+      g = new text_glob();
+      g->text_glob_tag(s, buffer.add_string(str), str.length(),
+		       min_vertical, min_horizontal, max_vertical, max_horizontal);
+    }
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  add_line - adds the <line> primitive providing that y1==y2
+ */
+
+void page::add_line (style *s,
+		     int line_number,
+		     int x1, int y1, int x2, int y2,
+		     int thickness)
+{
+  if (y1 == y2) {
+    text_glob *g = new text_glob();
+    g->text_glob_line(s,
+		      min(y1, y2), min(x1, y2), max(y1, y2), max(x1, x2),
+		      thickness);
+    glyphs.add(g, line_number, min(y1, y2), min(x1, y2), max(y1, y2), max(x1, x2));
+  }
+}
+
+/*
+ *  to_unicode - returns a unicode translation of int, ch.
+ */
+
+static char *to_unicode (unsigned int ch)
+{
+  static char buf[30];
+
+  sprintf(buf, "&#%u;", ch);
+  return buf;
+}
+
+/*
+ *  add_and_encode - adds a special string to the page, it translates the string
+ *                   into html glyphs. The special string will have come from x X html:
+ *                   and can contain troff character encodings which appear as
+ *                   \(char\). A sequence of \\ represents \.
+ *                   So for example we can write:
+ *                      "cost = \(Po\)3.00 file = \\foo\\bar"
+ *                   which is translated into:
+ *                      "cost = &pound;3.00 file = \foo\bar"
+ */
+
+void page::add_and_encode (style *s, const string &str,
+			   int line_number,
+			   int min_vertical, int min_horizontal,
+			   int max_vertical, int max_horizontal)
+{
+  string html_string;
+  char *html_glyph;
+  int i=0;
+
+  if (s->f == NULL)
+    return;
+  while (i < str.length()) {
+    if ((i+1<str.length()) && (str.substring(i, 2) == string("\\("))) {
+      // start of escape
+      i += 2; // move over \(
+      int a = i;
+      while ((i+1<str.length()) && (str.substring(i, 2) != string("\\)"))) {
+	i++;
+      }
+      int n = i;
+      if ((i+1<str.length()) && (str.substring(i, 2) == string("\\)")))
+	i++;
+      else
+	n = -1;
+      if (n > 0) {
+	string troff_charname = str.substring(a, n-a);
+	html_glyph = get_html_translation(s->f, troff_charname);
+	if (html_glyph)
+	  html_string += html_glyph;
+	else {
+	  int index=s->f->name_to_index((troff_charname + '\0').contents());
+	  
+	  if (s->f->contains(index) && (index != 0))
+	    html_string += s->f->get_code(index);
+	}
+      }
+    } else
+      html_string += str[i];
+    i++;
+  }
+  if (html_string.length() > 0) {
+    text_glob *g=new text_glob();
+    g->text_glob_special(s, buffer.add_string(html_string), html_string.length(),
+			 min_vertical, min_horizontal, max_vertical, max_horizontal);
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  dump_page - dump the page contents for debugging purposes.
+ */
+
+void page::dump_page(void)
+{
+#if defined(DEBUG_TABLES)
+  text_glob *old_pos = glyphs.get_data();
+  text_glob *g;
+
+  printf("\n<!--\n");
+  printf("\n\ndebugging start\n");
+  glyphs.start_from_head();
+  do {
+    g = glyphs.get_data();
+    if (g->is_tab_ts()) {
+      printf("\n\n");
+      if (g->get_table() != NULL)
+	g->get_table()->dump_table();
+    }
+    printf("%s ", g->text_string);
+    if (g->is_tab_te())
+      printf("\n\n");
+    glyphs.move_right();
+  } while (! glyphs.is_equal_to_head());
+  glyphs.move_to(old_pos);
+  printf("\ndebugging end\n\n");
+  printf("\n-->\n");
+  fflush(stdout);
+#endif
+}
+
+/*
+ *  font classes and methods
+ */
+
+class html_font : public font {
+  html_font(const char *);
+public:
+  int encoding_index;
+  char *encoding;
+  char *reencoded_name;
+  ~html_font();
+  static html_font *load_html_font(const char *);
+};
+
+html_font *html_font::load_html_font(const char *s)
+{
+  html_font *f = new html_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+html_font::html_font(const char *nm)
+: font(nm)
+{
+}
+
+html_font::~html_font()
+{
+}
+
+/*
+ *  a simple class to contain the header to this document
+ */
+
+class title_desc {
+public:
+          title_desc ();
+         ~title_desc ();
+
+  int     has_been_written;
+  int     has_been_found;
+  int     with_h1;
+  string  text;
+};
+
+
+title_desc::title_desc ()
+  : has_been_written(FALSE), has_been_found(FALSE), with_h1(FALSE)
+{
+}
+
+title_desc::~title_desc ()
+{
+}
+
+class header_desc {
+public:
+                            header_desc ();
+                           ~header_desc ();
+
+  int                       no_of_headings;      // how many headings have we found?
+  char_buffer               headings;            // all the headings used in the document
+  list                      headers;             // list of headers built from .NH and .SH
+  int                       header_level;        // current header level
+  int                       written_header;      // have we written the header yet?
+  string                    header_buffer;       // current header text
+
+  void                      write_headings (FILE *f, int force);
+};
+
+header_desc::header_desc ()
+  :   no_of_headings(0), header_level(2), written_header(0)
+{
+}
+
+header_desc::~header_desc ()
+{
+}
+
+/*
+ *  write_headings - emits a list of links for the headings in this document
+ */
+
+void header_desc::write_headings (FILE *f, int force)
+{
+  text_glob *g;
+
+  if (auto_links || force) {
+    if (! headers.is_empty()) {
+      int h=1;
+
+      headers.start_from_head();
+      do {
+	g = headers.get_data();
+	fputs("<a href=\"#", f);
+	if (simple_anchors) {
+	  string buffer(ANCHOR_TEMPLATE);
+
+	  buffer += as_string(h);
+	  buffer += '\0';
+	  fprintf(f, buffer.contents());
+	} else
+	  fputs(g->text_string, f);
+	h++;
+	fputs("\">", f);
+	fputs(g->text_string, f);
+        fputs("</a><br>\n", f);
+	headers.move_right();
+      } while (! headers.is_equal_to_head());
+      fputs("\n", f);
+    }
+  }
+}
+
+class html_printer : public printer {
+  files                file_list;
+  simple_output        html;
+  int                  res;
+  int                  space_char_index;
+  int                  space_width;
+  int                  no_of_printed_pages;
+  int                  paper_length;
+  string               sbuf;
+  int                  sbuf_start_hpos;
+  int                  sbuf_vpos;
+  int                  sbuf_end_hpos;
+  int                  sbuf_prev_hpos;
+  int                  sbuf_kern;
+  style                sbuf_style;
+  int                  last_sbuf_length;
+  int                  overstrike_detected;
+  style                output_style;
+  int                  output_hpos;
+  int                  output_vpos;
+  int                  output_vpos_max;
+  int                  output_draw_point_size;
+  int                  line_thickness;
+  int                  output_line_thickness;
+  unsigned char        output_space_code;
+  char                *inside_font_style;
+  int                  page_number;
+  title_desc           title;
+  header_desc          header;
+  int                  header_indent;
+  int                  supress_sub_sup;
+  int                  cutoff_heading;
+  page                *page_contents;
+  html_text           *current_paragraph;
+  html_indent         *indent;
+  html_table          *table;
+  int                  end_center;
+  int                  end_tempindent;
+  TAG_ALIGNMENT        next_tag;
+  int                  fill_on;
+  int                  max_linelength;
+  int                  linelength;
+  int                  pageoffset;
+  int                  indentation;
+  int                  prev_indent;
+  int                  pointsize;
+  int                  vertical_spacing;
+  int                  line_number;
+  color               *background;
+
+  void  flush_sbuf                    ();
+  void  set_style                     (const style &);
+  void  set_space_code                (unsigned char c);
+  void  do_exec                       (char *, const environment *);
+  void  do_import                     (char *, const environment *);
+  void  do_def                        (char *, const environment *);
+  void  do_mdef                       (char *, const environment *);
+  void  do_file                       (char *, const environment *);
+  void  set_line_thickness            (const environment *);
+  void  terminate_current_font        (void);
+  void  flush_font                    (void);
+  void  add_to_sbuf                   (int index, const string &s);
+  void  write_title                   (int in_head);
+  int   sbuf_continuation             (int index, const char *name, const environment *env, int w);
+  void  flush_page                    (void);
+  void  troff_tag                     (text_glob *g);
+  void  flush_globs                   (void);
+  void  emit_line                     (text_glob *g);
+  void  emit_raw                      (text_glob *g);
+  void  emit_html                     (text_glob *g);
+  void  determine_space               (text_glob *g);
+  void  start_font                    (const char *name);
+  void  end_font                      (const char *name);
+  int   is_font_courier               (font *f);
+  int   is_courier_until_eol          (void);
+  void  start_size                    (int from, int to);
+  void  do_font                       (text_glob *g);
+  void  do_center                     (char *arg);
+  void  do_break                      (void);
+  void  do_eol                        (void);
+  void  do_eol_ce                     (void);
+  void  do_title                      (void);
+  void  do_fill                       (int on);
+  void  do_heading                    (char *arg);
+  void  write_header                  (void);
+  void  determine_header_level        (int level);
+  void  do_linelength                 (char *arg);
+  void  do_pageoffset                 (char *arg);
+  void  do_indentation                (char *arg);
+  void  do_tempindent                 (char *arg);
+  void  do_indentedparagraph          (void);
+  void  do_verticalspacing            (char *arg);
+  void  do_pointsize                  (char *arg);
+  void  do_centered_image             (void);
+  void  do_left_image                 (void);
+  void  do_right_image                (void);
+  void  do_auto_image                 (text_glob *g, const char *filename);
+  void  do_links                      (void);
+  void  do_flush                      (void);
+  int   is_in_middle                  (int left, int right);
+  void  do_sup_or_sub                 (text_glob *g);
+  int   start_subscript               (text_glob *g);
+  int   end_subscript                 (text_glob *g);
+  int   start_superscript             (text_glob *g);
+  int   end_superscript               (text_glob *g);
+  void  outstanding_eol               (int n);
+  int   is_bold                       (font *f);
+  font *make_bold                     (font *f);
+  int   overstrike                    (int index, const char *name, const environment *env, int w);
+  void  do_body                       (void);
+  int   next_horiz_pos                (text_glob *g, int nf);
+  void  lookahead_for_tables          (void);
+  void  insert_tab_te                 (void);
+  text_glob *insert_tab_ts            (text_glob *where);
+  void insert_tab0_foreach_tab        (void);
+  void insert_tab_0                   (text_glob *where);
+  void do_indent                      (int in, int pageoff, int linelen);
+  void shutdown_table                 (void);
+  void do_tab_ts                      (text_glob *g);
+  void do_tab_te                      (void);
+  void do_col                         (char *s);
+  void do_tab                         (char *s);
+  void do_tab0                        (void);
+  int  calc_nf                        (text_glob *g, int nf);
+  void calc_po_in                     (text_glob *g, int nf);
+  void remove_tabs                    (void);
+  void remove_courier_tabs            (void);
+  void update_min_max                 (colType type_of_col, int *minimum, int *maximum, text_glob *g);
+  void add_table_end                  (const char *);
+  // ADD HERE
+
+public:
+  html_printer          ();
+  ~html_printer         ();
+  void set_char         (int i, font *f, const environment *env, int w, const char *name);
+  void set_numbered_char(int num, const environment *env, int *widthp);
+  void draw             (int code, int *p, int np, const environment *env);
+  void begin_page       (int);
+  void end_page         (int);
+  void special          (char *arg, const environment *env, char type);
+  font *make_font       (const char *);
+  void end_of_line      ();
+};
+
+printer *make_printer()
+{
+  return new html_printer;
+}
+
+static void usage(FILE *stream);
+
+void html_printer::set_style(const style &sty)
+{
+  const char *fontname = sty.f->get_name();
+  if (fontname == NULL)
+    fatal("no internalname specified for font");
+
+#if 0
+  change_font(fontname, (font::res/(72*font::sizescale))*sty.point_size);
+#endif
+}
+
+/*
+ *  is_bold - returns TRUE if font, f, is bold.
+ */
+
+int html_printer::is_bold (font *f)
+{
+  const char *fontname = f->get_name();
+  return (strcmp(fontname, "B") == 0) || (strcmp(fontname, "BI") == 0);
+}
+
+/*
+ *  make_bold - if a bold font of, f, exists then return it.
+ */
+
+font *html_printer::make_bold (font *f)
+{
+  const char *fontname = f->get_name();
+
+  if (strcmp(fontname, "B") == 0)
+    return f;
+  if (strcmp(fontname, "I") == 0)
+    return font::load_font("BI");
+  if (strcmp(fontname, "BI") == 0)
+    return f;
+  return NULL;
+}
+
+void html_printer::end_of_line()
+{
+  flush_sbuf();
+  line_number++;
+}
+
+/*
+ *  emit_line - writes out a horizontal rule.
+ */
+
+void html_printer::emit_line (text_glob *)
+{
+  // --fixme-- needs to know the length in percentage
+  html.put_string("<hr>");
+}
+
+/*
+ *  emit_raw - writes the raw html information directly to the device.
+ */
+
+void html_printer::emit_raw (text_glob *g)
+{
+  do_font(g);
+  if (next_tag == INLINE) {
+    determine_space(g);
+    current_paragraph->do_emittext(g->text_string, g->text_length);
+  } else {
+    current_paragraph->done_para();
+    switch (next_tag) {
+
+    case CENTERED:
+      current_paragraph->do_para("align=center");
+      break;
+    case LEFT:
+      current_paragraph->do_para(&html, "align=left", indentation, pageoffset, linelength);
+      break;
+    case RIGHT:
+      current_paragraph->do_para(&html, "align=right", indentation, pageoffset, linelength);
+      break;
+    default:
+      fatal("unknown enumeration");
+    }
+    current_paragraph->do_emittext(g->text_string, g->text_length);
+    current_paragraph->done_para();
+    next_tag        = INLINE;
+    supress_sub_sup = TRUE;
+    if (indentation > 0) {
+      /*
+       *  restore indentation
+       */
+      int newin = indentation;
+      indentation = 0;
+      do_indent(newin, pageoffset, linelength);
+    }
+  }
+}
+
+/*
+ *  do_center - handle the .ce commands from troff.
+ */
+
+void html_printer::do_center (char *arg)
+{
+  int n = atoi(arg);
+  current_paragraph->do_break();
+
+  if (n > 0) {
+    current_paragraph->done_para();
+    supress_sub_sup = TRUE;
+    current_paragraph->do_para("align=center");
+    end_center += n;
+  } else {
+    end_center = 0;
+    current_paragraph->remove_para_align();
+  }
+}
+
+/*
+ *  do_centered_image - set a flag such that the next html-tag is
+ *                      placed inside a centered paragraph.
+ */
+
+void html_printer::do_centered_image (void)
+{
+  next_tag = CENTERED;
+}
+
+/*
+ *  do_right_image - set a flag such that the next html-tag is
+ *                   placed inside a right aligned paragraph.
+ */
+
+void html_printer::do_right_image (void)
+{
+  next_tag = RIGHT;
+}
+
+/*
+ *  do_left_image - set a flag such that the next html-tag is
+ *                  placed inside a left aligned paragraph.
+ */
+
+void html_printer::do_left_image (void)
+{
+  next_tag = LEFT;
+}
+
+/*
+ *  exists - returns TRUE if filename exists.
+ */
+
+static int exists (const char *filename)
+{
+  FILE *fp = fopen(filename, "r");
+
+  if (fp == 0) {
+    return( FALSE );
+  } else {
+    fclose(fp);
+    return( TRUE );
+  }
+}
+
+/*
+ *  generate_img_src - returns a html image tag for the filename
+ *                     providing that the image exists.
+ */
+
+static string &generate_img_src (const char *filename)
+{
+  string *s = new string("");
+
+  while (filename && (filename[0] == ' ')) {
+    filename++;
+  }
+  if (exists(filename))
+    *s += string("<img src=\"") + filename + "\">";
+  return *s;
+}
+
+/*
+ *  do_auto_image - tests whether the image, indicated by filename,
+ *                  is present, if so then it emits an html image tag.
+ *                  An image tag may be passed through from pic, eqn
+ *                  but the corresponding image might not be created.
+ *                  Consider .EQ delim $$ .EN  or an empty .PS .PE.
+ */
+
+void html_printer::do_auto_image (text_glob *g, const char *filename)
+{
+  string buffer = generate_img_src(filename);
+  
+  if (! buffer.empty()) {
+    /*
+     *  utilize emit_raw by creating a new text_glob.
+     */
+    text_glob h = *g;
+
+    h.text_string = buffer.contents();
+    h.text_length = buffer.length();
+    emit_raw(&h);
+  } else
+    next_tag = INLINE;
+}
+
+/*
+ *  outstanding_eol - call do_eol, n, times.
+ */
+
+void html_printer::outstanding_eol (int n)
+{
+  while (n > 0) {
+    do_eol();
+    n--;
+  }
+}
+
+/*
+ *  do_title - handle the .tl commands from troff.
+ */
+
+void html_printer::do_title (void)
+{
+  text_glob    *t;
+  int           removed_from_head;
+  int           eol_ce = 0;
+
+  if (page_number == 1) {
+    int found_title_start  = FALSE;
+    if (! page_contents->glyphs.is_empty()) {
+      page_contents->glyphs.sub_move_right();       /* move onto next word */
+      do {
+	t = page_contents->glyphs.get_data();
+	removed_from_head = FALSE;
+	if (t->is_auto_img()) {
+	  string img = generate_img_src((char *)(t->text_string + 20));
+
+	  if (! img.empty()) {
+	    if (found_title_start)
+	      title.text += " ";
+	    found_title_start = TRUE;
+	    title.has_been_found = TRUE;
+	    title.text += img;
+	  }
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			       (page_contents->glyphs.is_equal_to_head()));
+	} else if (t->is_eol_ce()) {
+	  /*  process the eol associated with .ce
+	   */
+	  eol_ce++;
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	} else if (t->is_eol()) {
+	  /* end of title found
+	   */
+	  title.has_been_found = TRUE;
+	  outstanding_eol(eol_ce);
+	  return;
+	} else if (t->is_a_tag()) {
+	  /* end of title found, but move back so that we read this tag and process it
+	   */
+	  page_contents->glyphs.move_left();           /* move backwards to last word */
+	  title.has_been_found = TRUE;
+	  outstanding_eol(eol_ce);
+	  return;
+	} else if (found_title_start) {
+	  title.text += " " + string(t->text_string, t->text_length);
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			       (page_contents->glyphs.is_equal_to_head()));
+	} else {
+	  title.text += string(t->text_string, t->text_length);
+	  found_title_start    = TRUE;
+	  title.has_been_found = TRUE;
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			       (page_contents->glyphs.is_equal_to_head()));
+	}
+      } while ((! page_contents->glyphs.is_equal_to_head()) || (removed_from_head));
+    }
+    outstanding_eol(eol_ce);
+  }
+}
+
+void html_printer::write_header (void)
+{
+  if (! header.header_buffer.empty()) {
+    if (header.header_level > 7) {
+      header.header_level = 7;
+    }
+
+    // firstly we must terminate any font and type faces
+    current_paragraph->done_para();
+    supress_sub_sup = TRUE;
+
+    if (cutoff_heading+2 > header.header_level) {
+      // now we save the header so we can issue a list of links
+      header.no_of_headings++;
+      style st;
+
+      text_glob *h=new text_glob();
+      h->text_glob_html(&st,
+			header.headings.add_string(header.header_buffer),
+			header.header_buffer.length(),
+			header.no_of_headings, header.header_level,
+			header.no_of_headings, header.header_level);
+
+      header.headers.add(h,
+			 header.no_of_headings,
+			 header.no_of_headings, header.no_of_headings,
+			 header.no_of_headings, header.no_of_headings);   // and add this header to the header list
+
+      // lastly we generate a tag
+
+      html.nl().put_string("<a name=\"");
+      if (simple_anchors) {
+	string buffer(ANCHOR_TEMPLATE);
+
+	buffer += as_string(header.no_of_headings);
+	buffer += '\0';
+	html.put_string(buffer.contents());
+      } else {
+	html.put_string(header.header_buffer);
+      }
+      html.put_string("\"></a>").nl();
+    }
+
+    if (manufacture_headings) {
+      // line break before a header
+      if (!current_paragraph->emitted_text())
+	current_paragraph->do_space();
+      // user wants manufactured headings which look better than <Hn></Hn>
+      if (header.header_level<4) {
+	html.put_string("<b><font size=\"+1\">");
+	html.put_string(header.header_buffer);
+	html.put_string("</font></b>").nl();
+      }
+      else {
+	html.put_string("<b>");
+	html.put_string(header.header_buffer);
+	html.put_string("</b>").nl();
+      }
+    }
+    else {
+      // and now we issue the real header
+      html.put_string("<h");
+      html.put_number(header.header_level);
+      html.put_string(">");
+      html.put_string(header.header_buffer);
+      html.put_string("</h");
+      html.put_number(header.header_level);
+      html.put_string(">").nl();
+    }
+
+    current_paragraph->do_para(&html, "", indentation, pageoffset, linelength);
+  }
+}
+
+void html_printer::determine_header_level (int level)
+{
+  if (level == 0) {
+    int i;
+
+    for (i=0; ((i<header.header_buffer.length())
+	       && ((header.header_buffer[i] == '.')
+		   || is_digit(header.header_buffer[i]))) ; i++) {
+      if (header.header_buffer[i] == '.') {
+	level++;
+      }
+    }
+  }
+  header.header_level = level+1;
+}
+
+/*
+ *  do_heading - handle the .SH and .NH and equivalent commands from troff.
+ */
+
+void html_printer::do_heading (char *arg)
+{
+  text_glob *g;
+  text_glob *l = 0;
+  int  level=atoi(arg);
+
+  header.header_buffer.clear();
+  page_contents->glyphs.move_right();
+  if (! page_contents->glyphs.is_equal_to_head()) {
+    g = page_contents->glyphs.get_data();
+    do {
+      if (g->is_auto_img()) {
+	string img=generate_img_src((char *)(g->text_string + 20));
+
+	if (! img.empty()) {
+	  simple_anchors = TRUE;  // we cannot use full heading anchors with images
+	  if (l != 0)
+	    header.header_buffer += " ";
+	  
+	  l = g;
+	  header.header_buffer += img;
+	}
+      } else if (! (g->is_a_line() || g->is_a_tag())) {
+	/*
+	 *  we ignore tags commands when constructing a heading
+	 */
+	if (l != 0)
+	  header.header_buffer += " ";
+	l = g;
+
+	header.header_buffer += string(g->text_string, g->text_length);
+      }
+      page_contents->glyphs.move_right();
+      g = page_contents->glyphs.get_data();
+    } while ((! page_contents->glyphs.is_equal_to_head()) &&
+	     (! g->is_br()));
+  }
+
+  determine_header_level(level);
+  write_header();
+
+  // finally set the output to neutral for after the header
+  g = page_contents->glyphs.get_data();
+  page_contents->glyphs.move_left();     // so that next time we use old g
+}
+
+/*
+ *  is_courier_until_eol - returns TRUE if we can see a whole line which is courier
+ */
+
+int html_printer::is_courier_until_eol (void)
+{
+  text_glob *orig = page_contents->glyphs.get_data();
+  int result      = TRUE;
+  text_glob *g;
+
+  if (! page_contents->glyphs.is_equal_to_tail()) {
+    page_contents->glyphs.move_right();
+    do {
+      g = page_contents->glyphs.get_data();
+      if (! g->is_a_tag() && (! is_font_courier(g->text_style.f)))
+	result = FALSE;
+      page_contents->glyphs.move_right();
+    } while (result &&
+	     (! page_contents->glyphs.is_equal_to_head()) &&
+	     (! g->is_fi()) && (! g->is_eol()));
+    
+    /*
+     *  now restore our previous position.
+     */
+    while (page_contents->glyphs.get_data() != orig)
+      page_contents->glyphs.move_left();
+  }
+  return result;
+}
+
+/*
+ *  do_linelength - handle the .ll command from troff.
+ */
+
+void html_printer::do_linelength (char *arg)
+{
+  if (max_linelength == -1)
+    max_linelength = atoi(arg);
+
+  if (fill_on)
+    do_indent(indentation, pageoffset, atoi(arg));
+}
+
+/*
+ *  do_pageoffset - handle the .po command from troff.
+ */
+
+void html_printer::do_pageoffset (char *arg)
+{
+  if (fill_on)
+    do_indent(indentation, atoi(arg), linelength);
+}
+
+/*
+ *  do_indentation - handle the .in command from troff.
+ */
+
+void html_printer::do_indentation (char *arg)
+{
+  if (fill_on)
+    do_indent(atoi(arg), pageoffset, linelength);
+}
+
+/*
+ *  do_tempindent - handle the .ti command from troff.
+ */
+
+void html_printer::do_tempindent (char *arg)
+{
+  if (fill_on) {
+    end_tempindent = 1;
+    prev_indent    = indentation;
+    do_indent(atoi(arg), pageoffset, linelength);
+  }
+}
+
+/*
+ *  shutdown_table - shuts down the current table.
+ */
+
+void html_printer::shutdown_table (void)
+{
+  if (table != NULL) {
+    current_paragraph->done_para();
+    table->emit_finish_table();
+    // dont delete this table as it will be deleted when we destroy the text_glob
+    table = NULL;
+  }
+}
+
+/*
+ *  do_indent - remember the indent parameters and if
+ *              indent is > pageoff and indent has changed
+ *              then we start a html table to implement the indentation.
+ */
+
+void html_printer::do_indent (int in, int pageoff, int linelen)
+{
+  if ((indentation != -1) &&
+      (pageoffset+indentation != in+pageoff)) {
+    
+    current_paragraph->done_para();
+      
+    indentation = in;
+    pageoffset  = pageoff;
+    if (linelen <= max_linelength)
+      linelength  = linelen;
+
+    current_paragraph->do_para(&html, "", indentation, pageoffset, max_linelength);
+  }
+}
+
+/*
+ *  do_verticalspacing - handle the .vs command from troff.
+ */
+
+void html_printer::do_verticalspacing (char *arg)
+{
+  vertical_spacing = atoi(arg);
+}
+
+/*
+ *  do_pointsize - handle the .ps command from troff.
+ */
+
+void html_printer::do_pointsize (char *arg)
+{
+  pointsize = atoi(arg);
+}
+
+/*
+ *  do_fill - records whether troff has requested that text be filled.
+ */
+
+void html_printer::do_fill (int on)
+{
+  current_paragraph->do_break();
+  output_hpos = indentation+pageoffset;
+  supress_sub_sup = TRUE;
+
+  if (fill_on != on) {
+    if (on)
+      current_paragraph->do_para("");
+    else
+      current_paragraph->do_pre();
+    fill_on = on;
+  }
+}
+
+/*
+ *  do_eol - handle the end of line
+ */
+
+void html_printer::do_eol (void)
+{
+  if (! fill_on) {
+    if (current_paragraph->ever_emitted_text()) {
+      current_paragraph->do_newline();
+      current_paragraph->do_break();
+    }
+  }
+  output_hpos = indentation+pageoffset;
+}
+
+/*
+ *  do_eol_ce - handle end of line specifically for a .ce
+ */
+
+void html_printer::do_eol_ce (void)
+{
+  if (end_center > 0) {
+    if (end_center > 1)
+      if (current_paragraph->emitted_text())
+	current_paragraph->do_break();
+    
+    end_center--;
+    if (end_center == 0) {
+      current_paragraph->done_para();
+      supress_sub_sup = TRUE;
+    }
+  }
+}
+
+/*
+ *  do_flush - flushes all output and tags.
+ */
+
+void html_printer::do_flush (void)
+{
+  current_paragraph->done_para();
+}
+
+/*
+ *  do_links - moves onto a new temporary file and sets auto_links to FALSE.
+ */
+
+void html_printer::do_links (void)
+{
+  current_paragraph->done_para();
+  auto_links = FALSE;   /* from now on only emit under user request */
+  file_list.add_new_file(xtmpfile());
+  html.set_file(file_list.get_file());
+}
+
+/*
+ *  do_break - handles the ".br" request and also
+ *             undoes an outstanding ".ti" command.
+ */
+
+void html_printer::do_break (void)
+{
+  current_paragraph->do_break();
+  if (end_tempindent > 0) {
+    end_tempindent--;
+    if (end_tempindent == 0)
+      do_indent(prev_indent, pageoffset, linelength);
+  }
+  output_hpos = indentation+pageoffset;
+  supress_sub_sup = TRUE;
+}
+
+/*
+ *  do_tab_ts - start a table, which will have already been defined.
+ */
+
+void html_printer::do_tab_ts (text_glob *g)
+{
+  html_table *t = g->get_table();
+
+  if (t != NULL) {
+    current_paragraph->done_pre();
+    current_paragraph->done_para();
+
+    html.simple_comment("TABS");
+
+    t->set_linelength(max_linelength);
+    t->add_indent(pageoffset);
+    t->emit_table_header(FALSE);
+  }
+
+  table = t;
+}
+
+/*
+ *  do_tab_te - finish a table.
+ */
+
+void html_printer::do_tab_te (void)
+{
+  if (table) {
+    current_paragraph->done_para();
+    table->emit_finish_table();
+  }
+
+  table = NULL;
+
+  if (indentation > 0) {
+    /*
+     *  restore indentation
+     */
+    int newin = indentation;
+    indentation = 0;
+    do_indent(newin, pageoffset, linelength);
+  }
+}
+
+/*
+ *  do_tab - handle the "html-tag:tab" tag
+ */
+
+void html_printer::do_tab (char *s)
+{
+  if (table) {
+    while (isspace(*s))
+      s++;
+    s++;
+    int col = table->find_column(atoi(s) + pageoffset + indentation);
+    if (col > 0) {
+      current_paragraph->done_para();
+      table->emit_col(col);
+    }
+  }
+}
+
+/*
+ *  do_tab0 - handle the "html-tag:tab0" tag
+ */
+
+void html_printer::do_tab0 (void)
+{
+  if (table) {
+    int col = table->find_column(pageoffset+indentation);
+    if (col > 0) {
+      current_paragraph->done_para();
+      table->emit_col(col);
+    }
+  }
+}
+
+/*
+ *  do_col - start column, s.
+ */
+
+void html_printer::do_col (char *s)
+{
+  if (table) {
+    current_paragraph->done_para();
+    table->emit_col(atoi(s));
+  }
+}
+
+/*
+ *  troff_tag - processes the troff tag and manipulates the troff state machine.
+ */
+
+void html_printer::troff_tag (text_glob *g)
+{
+  /*
+   *  firstly skip over html-tag:
+   */
+  char *t=(char *)g->text_string+9;
+
+  if (g->is_eol()) {
+    do_eol();
+  } else if (g->is_eol_ce()) {
+    do_eol_ce();
+  } else if (strncmp(t, ".sp", 3) == 0) {
+    if (g->get_arg() > 0)
+      current_paragraph->do_space();
+    else
+      current_paragraph->do_break();
+    supress_sub_sup = TRUE;
+  } else if (strncmp(t, ".br", 3) == 0) {
+    do_break();
+  } else if (strcmp(t, ".centered-image") == 0) {
+    do_centered_image();
+  } else if (strcmp(t, ".right-image") == 0) {
+    do_right_image();
+  } else if (strcmp(t, ".left-image") == 0) {
+    do_left_image();
+  } else if (strncmp(t, ".auto-image", 11) == 0) {
+    char *a = (char *)t+11;
+    do_auto_image(g, a);
+  } else if (strncmp(t, ".ce", 3) == 0) {
+    char *a = (char *)t+3;
+    supress_sub_sup = TRUE;
+    do_center(a);
+  } else if (strncmp(t, ".tl", 3) == 0) {
+    supress_sub_sup = TRUE;
+    title.with_h1 = TRUE;
+    do_title();
+  } else if (strncmp(t, ".html-tl", 8) == 0) {
+    supress_sub_sup = TRUE;
+    title.with_h1 = FALSE;
+    do_title();
+  } else if (strncmp(t, ".fi", 3) == 0) {
+    do_fill(TRUE);
+  } else if (strncmp(t, ".nf", 3) == 0) {
+    do_fill(FALSE);
+  } else if ((strncmp(t, ".SH", 3) == 0) || (strncmp(t, ".NH", 3) == 0)) {
+    char *a = (char *)t+3;
+    do_heading(a);
+  } else if (strncmp(t, ".ll", 3) == 0) {
+    char *a = (char *)t+3;
+    do_linelength(a);
+  } else if (strncmp(t, ".po", 3) == 0) {
+    char *a = (char *)t+3;
+    do_pageoffset(a);
+  } else if (strncmp(t, ".in", 3) == 0) {
+    char *a = (char *)t+3;
+    do_indentation(a);
+  } else if (strncmp(t, ".ti", 3) == 0) {
+    char *a = (char *)t+3;
+    do_tempindent(a);
+  } else if (strncmp(t, ".vs", 3) == 0) {
+    char *a = (char *)t+3;
+    do_verticalspacing(a);
+  } else if (strncmp(t, ".ps", 3) == 0) {
+    char *a = (char *)t+3;
+    do_pointsize(a);
+  } else if (strcmp(t, ".links") == 0) {
+    do_links();
+  } else if (strcmp(t, ".no-auto-rule") == 0) {
+    auto_rule = FALSE;
+  } else if (strcmp(t, ".tab-ts") == 0) {
+    do_tab_ts(g);
+  } else if (strcmp(t, ".tab-te") == 0) {
+    do_tab_te();
+  } else if (strncmp(t, ".col ", 5) == 0) {
+    char *a = (char *)t+4;
+    do_col(a);
+  } else if (strncmp(t, "tab ", 4) == 0) {
+    char *a = (char *)t+3;
+    do_tab(a);
+  } else if (strncmp(t, "tab0", 4) == 0) {
+    do_tab0();
+  }
+}
+
+/*
+ *  is_in_middle - returns TRUE if the positions left..right are in the center of the page.
+ */
+
+int html_printer::is_in_middle (int left, int right)
+{
+  return( abs(abs(left-pageoffset) - abs(pageoffset+linelength-right)) <= CENTER_TOLERANCE );
+}
+
+/*
+ *  flush_globs - runs through the text glob list and emits html.
+ */
+
+void html_printer::flush_globs (void)
+{
+  text_glob *g;
+
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.start_from_head();
+    do {
+      g = page_contents->glyphs.get_data();
+
+      if (strcmp(g->text_string, "XXXXXXX") == 0)
+	stop();
+
+      if (g->is_a_tag()) {
+	troff_tag(g);
+      } else if (g->is_a_line()) {
+	emit_line(g);
+      } else {
+	emit_html(g);
+      }
+      /*
+       *  after processing the title (and removing it) the glyph list might be empty
+       */
+      if (! page_contents->glyphs.is_empty()) {
+	page_contents->glyphs.move_right();
+      }
+    } while (! page_contents->glyphs.is_equal_to_head());
+  }
+}
+
+/*
+ *  calc_nf - calculates the _no_ format flag, given the
+ *            text glob, g.
+ */
+
+int html_printer::calc_nf (text_glob *g, int nf)
+{
+  if (g != NULL) {
+    if (g->is_fi())
+      return FALSE;
+    if (g->is_nf())
+      return TRUE;
+  }
+  return nf;
+}
+
+/*
+ *  calc_po_in - calculates the, in, po, registers
+ */
+
+void html_printer::calc_po_in (text_glob *g, int nf)
+{
+  if (g->is_in())
+    indentation = g->get_arg();
+  else if (g->is_po())
+    pageoffset = g->get_arg();
+  else if (g->is_ti()) {
+    prev_indent = indentation;
+    indentation = g->get_arg();
+    end_tempindent = 1;
+  } else if (g->is_br() && ((end_tempindent > 0) || (nf && g->is_eol()))) {
+    end_tempindent = 0;
+    indentation = prev_indent;
+  }
+}
+
+/*
+ *  next_horiz_pos - returns the next horiz position.
+ *                   -1 is returned if it doesn't exist.
+ */
+
+int html_printer::next_horiz_pos (text_glob *g, int nf)
+{
+  int next     = -1;
+
+  if ((g != NULL) && (g->is_br() || (nf && g->is_eol())))
+    if (! page_contents->glyphs.is_empty()) {
+      page_contents->glyphs.move_right_get_data();
+      if (g == NULL)
+	page_contents->glyphs.start_from_head();
+      else {
+	next = g->minh;
+	page_contents->glyphs.move_left();
+      }
+    }
+  return next;
+}
+
+/*
+ *  insert_tab_ts - inserts a tab-ts before, where.
+ */
+
+text_glob *html_printer::insert_tab_ts (text_glob *where)
+{
+  text_glob *start_of_table;
+  text_glob *old_pos = page_contents->glyphs.get_data();
+
+  page_contents->glyphs.move_to(where);
+  page_contents->glyphs.move_left();
+  page_contents->insert_tag(string("html-tag:.tab-ts"));  // tab table start
+  page_contents->glyphs.move_right();
+  start_of_table = page_contents->glyphs.get_data();
+  page_contents->glyphs.move_to(old_pos);
+  return start_of_table;
+}
+
+/*
+ *  insert_tab_te - inserts a tab-te before the current position
+ *                  (it skips backwards over .sp/.br)
+ */
+
+void html_printer::insert_tab_te (void)
+{
+  text_glob *g = page_contents->glyphs.get_data();
+  page_contents->dump_page();
+
+  while (page_contents->glyphs.get_data()->is_a_tag())
+    page_contents->glyphs.move_left();
+
+  page_contents->insert_tag(string("html-tag:.tab-te"));  // tab table end
+  while (g != page_contents->glyphs.get_data())
+    page_contents->glyphs.move_right();
+  page_contents->dump_page();
+}
+
+/*
+ *  insert_tab_0 - inserts a tab0 before, where.
+ */
+
+void html_printer::insert_tab_0 (text_glob *where)
+{
+  text_glob *old_pos = page_contents->glyphs.get_data();
+
+  page_contents->glyphs.move_to(where);
+  page_contents->glyphs.move_left();
+  page_contents->insert_tag(string("html-tag:tab0"));  // tab0 start of line
+  page_contents->glyphs.move_right();
+  page_contents->glyphs.move_to(old_pos);
+}
+
+/*
+ *  remove_tabs - removes the tabs tags on this line.
+ */
+
+void html_printer::remove_tabs (void)
+{
+  text_glob *orig = page_contents->glyphs.get_data();
+  text_glob *g;
+
+  if (! page_contents->glyphs.is_equal_to_tail()) {
+    do {
+      g = page_contents->glyphs.get_data();
+      if (g->is_tab()) {
+	page_contents->glyphs.sub_move_right();
+	if (g == orig)
+	  orig = page_contents->glyphs.get_data();
+      }	else
+	page_contents->glyphs.move_right();
+    } while ((! page_contents->glyphs.is_equal_to_head()) &&
+	     (! g->is_eol()));
+    
+    /*
+     *  now restore our previous position.
+     */
+    while (page_contents->glyphs.get_data() != orig)
+      page_contents->glyphs.move_left();
+  }
+}
+
+void html_printer::remove_courier_tabs (void)
+{
+  text_glob  *g;
+  int line_start = TRUE;
+  int nf         = FALSE;
+
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.start_from_head();
+    line_start = TRUE;
+    do {
+      g = page_contents->glyphs.get_data();
+      
+      nf = calc_nf(g, nf);
+
+      if (line_start) {
+	if (line_start && nf && is_courier_until_eol()) {
+	  remove_tabs();
+	  g = page_contents->glyphs.get_data();
+	}
+      }
+
+      line_start = g->is_br() || g->is_nf() || g->is_fi() || (nf && g->is_eol());
+      page_contents->glyphs.move_right();
+    } while (! page_contents->glyphs.is_equal_to_head());
+  }
+}
+
+void html_printer::insert_tab0_foreach_tab (void)
+{
+  text_glob  *start_of_line  = NULL;
+  text_glob  *g              = NULL;
+  int seen_tab               = FALSE;
+  int seen_col               = FALSE;
+  int nf                     = FALSE;
+
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.start_from_head();
+    start_of_line = page_contents->glyphs.get_data();
+    do {
+      g = page_contents->glyphs.get_data();
+      
+      nf = calc_nf(g, nf);
+
+      if (g->is_tab())
+	seen_tab = TRUE;
+      
+      if (g->is_col())
+	seen_col = TRUE;
+
+      if (g->is_br() || (nf && g->is_eol())) {
+	do {
+	  page_contents->glyphs.move_right();
+	  g = page_contents->glyphs.get_data();
+	  nf = calc_nf(g, nf);
+	  if (page_contents->glyphs.is_equal_to_head()) {
+	    if (seen_tab && !seen_col)
+	      insert_tab_0(start_of_line);
+	    return;
+	  }
+	} while (g->is_br() || (nf && g->is_eol()) || g->is_ta());
+	// printf("\nstart_of_line is: %s\n", g->text_string);
+	if (seen_tab && !seen_col) {
+	  insert_tab_0(start_of_line);
+	  page_contents->glyphs.move_to(g);
+	}
+
+	seen_tab = FALSE;
+	seen_col = FALSE;
+	start_of_line = g;
+      }
+      page_contents->glyphs.move_right();
+    } while (! page_contents->glyphs.is_equal_to_head());
+    if (seen_tab && !seen_col)
+      insert_tab_0(start_of_line);
+
+  }
+}
+
+/*
+ *  update_min_max - updates the extent of a column, given the left and right
+ *                   extents of a glyph, g.
+ */
+
+void html_printer::update_min_max (colType type_of_col, int *minimum, int *maximum, text_glob *g)
+{
+  switch (type_of_col) {
+    
+  case tab_tag:
+    break;
+  case tab0_tag:
+    *minimum = g->minh;
+    break;
+  case col_tag:
+    *minimum = g->minh;
+    *maximum = g->maxh;
+    break;
+  default:
+    break;
+  }
+}
+
+/*
+ *  add_table_end - moves left one glyph, adds a table end tag and adds a
+ *                  debugging string.
+ */
+
+void html_printer::add_table_end (const char *
+#if defined(DEBUG_TABLES)
+  debug_string
+#endif
+)
+{
+  page_contents->glyphs.move_left();
+  insert_tab_te();
+#if defined(DEBUG_TABLES)
+  page_contents->insert_tag(string(debug_string));
+#endif
+}
+
+/*
+ *  lookahead_for_tables - checks for .col tags and inserts table start/end tags
+ */
+
+void html_printer::lookahead_for_tables (void)
+{
+  text_glob  *g;
+  text_glob  *start_of_line  = NULL;
+  text_glob  *start_of_table = NULL;
+  text_glob  *last           = NULL;
+  colType     type_of_col    = none;
+  int         left           = 0;
+  int         found_col      = FALSE;
+  int         seen_text      = FALSE;
+  int         ncol           = 0;
+  int         colmin;
+  int         colmax;
+  html_table *table          = new html_table(&html, -1);
+  const char *tab_defs       = NULL;
+  char        align          = 'L';
+  int         nf             = FALSE;
+  int         old_pageoffset = pageoffset;
+
+  remove_courier_tabs();
+  page_contents->dump_page();
+  insert_tab0_foreach_tab();
+  page_contents->dump_page();
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.start_from_head();
+    g = page_contents->glyphs.get_data();
+    do {
+#if defined(DEBUG_TABLES)
+      fprintf(stderr, " [") ;
+      fprintf(stderr, g->text_string) ;
+      fprintf(stderr, "] ") ;
+      fflush(stderr);
+      if (strcmp(g->text_string, "XXXXXXX") == 0)
+	stop();
+#endif
+
+      nf = calc_nf(g, nf);
+      calc_po_in(g, nf);
+      if (g->is_col()) {
+	if (type_of_col == tab_tag && start_of_table != NULL) {
+	  page_contents->glyphs.move_left();
+	  insert_tab_te();
+	  start_of_table->remember_table(table);
+	  table = new html_table(&html, -1);
+	  page_contents->insert_tag(string("*** TAB -> COL ***"));
+	  if (tab_defs != NULL)
+	    table->tab_stops->init(tab_defs);
+	  start_of_table = NULL;
+	  last = NULL;
+	}
+	type_of_col = col_tag;
+	found_col = TRUE;
+	ncol = g->get_arg();
+	align = 'L';
+	colmin = 0;
+	colmax = 0;
+      } else if (g->is_tab()) {
+	type_of_col = tab_tag;
+	colmin = g->get_tab_args(&align);
+	align = 'L'; // for now as 'C' and 'R' are broken
+	ncol = table->find_tab_column(colmin);
+	colmin += pageoffset + indentation;
+	colmax = table->get_tab_pos(ncol+1);
+	if (colmax > 0)
+	  colmax += pageoffset + indentation;
+      } else if (g->is_tab0()) {
+	if (type_of_col == col_tag && start_of_table != NULL) {
+	  page_contents->glyphs.move_left();
+	  insert_tab_te();
+	  start_of_table->remember_table(table);
+	  table = new html_table(&html, -1);
+	  page_contents->insert_tag(string("*** COL -> TAB ***"));
+	  start_of_table = NULL;
+	  last = NULL;
+	}
+	if (tab_defs != NULL)
+	  table->tab_stops->init(tab_defs);
+
+	type_of_col = tab0_tag;
+	ncol = 1;
+	colmin = 0;
+	colmax = table->get_tab_pos(2) + pageoffset + indentation;
+      } else if (! g->is_a_tag())
+	update_min_max(type_of_col, &colmin, &colmax, g);
+
+      if ((! g->is_a_tag()) || g->is_tab())
+	seen_text = TRUE;
+
+      if ((g->is_col() || g->is_tab() || g->is_tab0())
+	  && (start_of_line != NULL) && (start_of_table == NULL)) {
+	start_of_table = insert_tab_ts(start_of_line);
+	start_of_line = NULL;
+	seen_text = FALSE;
+      } else if (g->is_ce() && (start_of_table != NULL)) {
+	add_table_end("*** CE ***");
+	start_of_table->remember_table(table);
+	start_of_table = NULL;
+	last = NULL;
+      } else if (g->is_ta()) {
+	tab_defs = g->text_string;
+	if (!table->tab_stops->compatible(tab_defs)) {
+	  if (start_of_table != NULL) {
+	    add_table_end("*** TABS ***");
+	    start_of_table->remember_table(table);
+	    table = new html_table(&html, -1);
+	    start_of_table = NULL;
+	    type_of_col = none;
+	    last = NULL;
+	  }
+	  table->tab_stops->init(tab_defs);
+	}
+      }
+
+      if (((! g->is_a_tag()) || g->is_tab()) && (start_of_table != NULL)) {
+	// we are in a table and have a glyph
+	if ((ncol == 0) || (! table->add_column(ncol, colmin, colmax, align))) {
+	  if (ncol == 0)
+	    add_table_end("*** NCOL == 0 ***");
+	  else
+	    add_table_end("*** CROSSED COLS ***");
+
+	  start_of_table->remember_table(table);
+	  table = new html_table(&html, -1);
+	  start_of_table = NULL;
+	  type_of_col = none;
+	  last = NULL;
+	}
+      }
+      
+      /*
+       *  move onto next glob, check whether we are starting a new line
+       */
+      g = page_contents->glyphs.move_right_get_data();
+
+      if (g == NULL) {
+	if (found_col) {
+	  page_contents->glyphs.start_from_head();
+	  last = g;
+	  found_col = FALSE;
+	}
+      } else if (g->is_br() || (nf && g->is_eol())) {
+	do {
+	  g = page_contents->glyphs.move_right_get_data();
+	  nf = calc_nf(g, nf);
+	} while ((g != NULL) && (g->is_br() || (nf && g->is_eol())));
+	start_of_line = g;
+	seen_text = FALSE;
+	ncol = 0;
+	left = next_horiz_pos(g, nf);
+	if (found_col)
+	  last = g;
+	found_col = FALSE;
+      }
+    } while ((g != NULL) && (! page_contents->glyphs.is_equal_to_head()));
+
+#if defined(DEBUG_TABLES)
+    fprintf(stderr, "finished scanning for tables\n");
+#endif
+
+    page_contents->glyphs.start_from_head();
+    if (start_of_table != NULL) {
+      if (last != NULL)
+	while (last != page_contents->glyphs.get_data())
+	  page_contents->glyphs.move_left();
+
+      insert_tab_te();
+      start_of_table->remember_table(table);
+      table = NULL;
+      page_contents->insert_tag(string("*** LAST ***"));      
+    }
+  }
+  if (table != NULL)
+    delete table;
+
+  // and reset the registers
+  pageoffset = old_pageoffset;
+  indentation = 0;
+  prev_indent = 0;
+  end_tempindent = 0;
+}
+
+void html_printer::flush_page (void)
+{
+  supress_sub_sup = TRUE;
+  flush_sbuf();
+  page_contents->dump_page();
+  lookahead_for_tables();
+  page_contents->dump_page();
+
+  flush_globs();
+  current_paragraph->done_para();
+  
+  // move onto a new page
+  delete page_contents;
+#if defined(DEBUG_TABLES)
+  fprintf(stderr, "\n\n*** flushed page ***\n\n");
+
+  html.simple_comment("new page called");
+#endif
+  page_contents = new page;
+}
+
+/*
+ *  determine_space - works out whether we need to write a space.
+ *                    If last glyph is ajoining then no space emitted.
+ */
+
+void html_printer::determine_space (text_glob *g)
+{
+  if (current_paragraph->is_in_pre()) {
+    /*
+     *  .nf has been specified
+     */
+    while (output_hpos < g->minh) {
+      output_hpos += space_width;
+      current_paragraph->emit_space();
+    }
+  } else {
+    if ((output_vpos != g->minv) || (output_hpos < g->minh)) {
+      current_paragraph->emit_space();
+    }
+  }
+}
+
+/*
+ *  is_font_courier - returns TRUE if the font, f, is courier.
+ */
+
+int html_printer::is_font_courier (font *f)
+{
+  if (f != 0) {
+    const char *fontname = f->get_name();
+
+    return( (fontname != 0) && (fontname[0] == 'C') );
+  }
+  return( FALSE );
+}
+
+/*
+ *  end_font - shuts down the font corresponding to fontname.
+ */
+
+void html_printer::end_font (const char *fontname)
+{
+  if (strcmp(fontname, "B") == 0) {
+    current_paragraph->done_bold();
+  } else if (strcmp(fontname, "I") == 0) {
+    current_paragraph->done_italic();
+  } else if (strcmp(fontname, "BI") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_italic();
+  } else if (strcmp(fontname, "CR") == 0) {
+    current_paragraph->done_tt();
+  } else if (strcmp(fontname, "CI") == 0) {
+    current_paragraph->done_italic();
+    current_paragraph->done_tt();
+  } else if (strcmp(fontname, "CB") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_tt();
+  } else if (strcmp(fontname, "CBI") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_italic();
+    current_paragraph->done_tt();
+  }
+}
+
+/*
+ *  start_font - starts the font corresponding to name.
+ */
+
+void html_printer::start_font (const char *fontname)
+{
+  if (strcmp(fontname, "R") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_italic();
+    current_paragraph->done_tt();
+  } else if (strcmp(fontname, "B") == 0) {
+    current_paragraph->do_bold();
+  } else if (strcmp(fontname, "I") == 0) {
+    current_paragraph->do_italic();
+  } else if (strcmp(fontname, "BI") == 0) {
+    current_paragraph->do_bold();
+    current_paragraph->do_italic();
+  } else if (strcmp(fontname, "CR") == 0) {
+    if ((! fill_on) && (is_courier_until_eol())) {
+      current_paragraph->do_pre();
+    }
+    current_paragraph->do_tt();
+  } else if (strcmp(fontname, "CI") == 0) {
+    if ((! fill_on) && (is_courier_until_eol())) {
+      current_paragraph->do_pre();
+    }
+    current_paragraph->do_tt();
+    current_paragraph->do_italic();
+  } else if (strcmp(fontname, "CB") == 0) {
+    if ((! fill_on) && (is_courier_until_eol())) {
+      current_paragraph->do_pre();
+    }
+    current_paragraph->do_tt();
+    current_paragraph->do_bold();
+  } else if (strcmp(fontname, "CBI") == 0) {
+    if ((! fill_on) && (is_courier_until_eol())) {
+      current_paragraph->do_pre();
+    }
+    current_paragraph->do_tt();
+    current_paragraph->do_italic();
+    current_paragraph->do_bold();
+  }
+}
+
+/*
+ *  start_size - from is old font size, to is the new font size.
+ *               The html increase <big> and <small> decrease alters the
+ *               font size by 20%. We try and map these onto glyph sizes.
+ */
+
+void html_printer::start_size (int from, int to)
+{
+  if (from < to) {
+    while (from < to) {
+      current_paragraph->do_big();
+      from += SIZE_INCREMENT;
+    }
+  } else if (from > to) {
+    while (from > to) {
+      current_paragraph->do_small();
+      from -= SIZE_INCREMENT;
+    }
+  }
+}
+
+/*
+ *  do_font - checks to see whether we need to alter the html font.
+ */
+
+void html_printer::do_font (text_glob *g)
+{
+  /*
+   *  check if the output_style.point_size has not been set yet
+   *  this allow users to place .ps at the top of their troff files
+   *  and grohtml can then treat the .ps value as the base font size (3)
+   */
+  if (output_style.point_size == -1) {
+    output_style.point_size = pointsize;
+  }
+
+  if (g->text_style.f != output_style.f) {
+    if (output_style.f != 0) {
+      end_font(output_style.f->get_name());
+    }
+    output_style.f = g->text_style.f;
+    if (output_style.f != 0) {
+      start_font(output_style.f->get_name());
+    }
+  }
+  if (output_style.point_size != g->text_style.point_size) {
+    do_sup_or_sub(g);
+    if ((output_style.point_size > 0) &&
+	(g->text_style.point_size > 0)) {
+      start_size(output_style.point_size, g->text_style.point_size);
+    }
+    if (g->text_style.point_size > 0) {
+      output_style.point_size = g->text_style.point_size;
+    }
+  }
+  if (output_style.col != g->text_style.col) {
+    current_paragraph->done_color();
+    output_style.col = g->text_style.col;
+    current_paragraph->do_color(&output_style.col);
+  }
+}
+
+/*
+ *  start_subscript - returns TRUE if, g, looks like a subscript start.
+ */
+
+int html_printer::start_subscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (output_vpos < g->minv) &&
+	  (output_vpos-height > g->maxv) &&
+	  (output_style.point_size > g->text_style.point_size) );
+}
+
+/*
+ *  start_superscript - returns TRUE if, g, looks like a superscript start.
+ */
+
+int html_printer::start_superscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (output_vpos > g->minv) &&
+	  (output_vpos-height < g->maxv) &&
+	  (output_style.point_size > g->text_style.point_size) );
+}
+
+/*
+ *  end_subscript - returns TRUE if, g, looks like the end of a subscript.
+ */
+
+int html_printer::end_subscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (g->minv < output_vpos) &&
+	  (output_vpos-height > g->maxv) &&
+	  (output_style.point_size < g->text_style.point_size) );
+}
+
+/*
+ *  end_superscript - returns TRUE if, g, looks like the end of a superscript.
+ */
+
+int html_printer::end_superscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (g->minv > output_vpos) &&
+	  (output_vpos-height < g->maxv) &&
+	  (output_style.point_size < g->text_style.point_size) );
+}
+
+/*
+ *  do_sup_or_sub - checks to see whether the next glyph is a subscript/superscript
+ *                  start/end and it calls the services of html-text to issue the
+ *                  appropriate tags.
+ */
+
+void html_printer::do_sup_or_sub (text_glob *g)
+{
+  if (! supress_sub_sup) {
+    if (start_subscript(g)) {
+      current_paragraph->do_sub();
+    } else if (start_superscript(g)) {
+      current_paragraph->do_sup();
+    } else if (end_subscript(g)) {
+      current_paragraph->done_sub();
+    } else if (end_superscript(g)) {
+      current_paragraph->done_sup();
+    }
+  }
+}
+
+/*
+ *  emit_html - write out the html text
+ */
+
+void html_printer::emit_html (text_glob *g)
+{
+  do_font(g);
+  determine_space(g);
+  current_paragraph->do_emittext(g->text_string, g->text_length);
+  output_vpos     = g->minv;
+  output_hpos     = g->maxh;
+  output_vpos_max = g->maxv;
+  supress_sub_sup = FALSE;
+}
+
+/*
+ *  flush_sbuf - flushes the current sbuf into the list of glyphs.
+ */
+
+void html_printer::flush_sbuf()
+{
+  if (sbuf.length() > 0) {
+    int r=font::res;   // resolution of the device
+    set_style(sbuf_style);
+    if (overstrike_detected && (! is_bold(sbuf_style.f))) {
+      font *bold_font = make_bold(sbuf_style.f);
+      if (bold_font != NULL)
+	sbuf_style.f = bold_font;
+    }
+
+    page_contents->add(&sbuf_style, sbuf,
+		       line_number,
+		       sbuf_vpos-sbuf_style.point_size*r/72, sbuf_start_hpos,
+		       sbuf_vpos                           , sbuf_end_hpos);
+	     
+    output_hpos = sbuf_end_hpos;
+    output_vpos = sbuf_vpos;
+    last_sbuf_length = 0;
+    sbuf_prev_hpos = sbuf_end_hpos;
+    overstrike_detected = FALSE;
+    sbuf.clear();
+  }
+}
+
+void html_printer::set_line_thickness(const environment *env)
+{
+  line_thickness = env->size;
+}
+
+void html_printer::draw(int code, int *p, int np, const environment *env)
+{
+  switch (code) {
+
+  case 'l':
+# if 0
+    if (np == 2) {
+      page_contents->add_line(&sbuf_style,
+			      line_number,
+			      env->hpos, env->vpos, env->hpos+p[0], env->vpos+p[1], line_thickness);
+    } else {
+      error("2 arguments required for line");
+    }
+# endif
+    break;
+  case 't':
+    {
+      if (np == 0) {
+	line_thickness = -1;
+      } else {
+	// troff gratuitously adds an extra 0
+	if (np != 1 && np != 2) {
+	  error("0 or 1 argument required for thickness");
+	  break;
+	}
+	line_thickness = p[0];
+      }
+      break;
+    }
+
+  case 'P':
+    break;
+  case 'p':
+    break;
+  case 'E':
+    break;
+  case 'e':
+    break;
+  case 'C':
+    break;
+  case 'c':
+    break;
+  case 'a':
+    break;
+  case '~':
+    break;
+  case 'f':
+    break;
+  case 'F':
+    // fill with color env->fill
+    if (background != NULL)
+      delete background;
+    background = new color;
+    *background = *env->fill;
+    break;
+
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+}
+
+html_printer::html_printer()
+: html(0, MAX_LINE_LENGTH),
+  no_of_printed_pages(0),
+  last_sbuf_length(0),
+  overstrike_detected(FALSE),
+  output_hpos(-1),
+  output_vpos(-1),
+  output_vpos_max(-1),
+  line_thickness(-1),
+  inside_font_style(0),
+  page_number(0),
+  header_indent(-1),
+  supress_sub_sup(TRUE),
+  cutoff_heading(100),
+  indent(NULL),
+  table(NULL),
+  end_center(0),
+  end_tempindent(0),
+  next_tag(INLINE),
+  fill_on(TRUE),
+  max_linelength(-1),
+  linelength(0),
+  pageoffset(0),
+  indentation(0),
+  prev_indent(0),
+  pointsize(0),
+  line_number(0),
+  background(default_background)
+{
+  file_list.add_new_file(xtmpfile());
+  html.set_file(file_list.get_file());
+  if (font::hor != 24)
+    fatal("horizontal resolution must be 24");
+  if (font::vert != 40)
+    fatal("vertical resolution must be 40");
+#if 0
+  // should be sorted html..
+  if (font::res % (font::sizescale*72) != 0)
+    fatal("res must be a multiple of 72*sizescale");
+#endif
+  int r = font::res;
+  int point = 0;
+  while (r % 10 == 0) {
+    r /= 10;
+    point++;
+  }
+  res               = r;
+  html.set_fixed_point(point);
+  space_char_index  = font::name_to_index("space");
+  space_width       = font::hor;
+  paper_length      = font::paperlength;
+  linelength        = font::res*13/2;
+  if (paper_length == 0)
+    paper_length    = 11*font::res;
+
+  page_contents = new page();
+}
+
+/*
+ *  add_to_sbuf - adds character code or name to the sbuf.
+ */
+
+void html_printer::add_to_sbuf (int index, const string &s)
+{
+  if (sbuf_style.f == NULL)
+    return;
+
+  char *html_glyph = NULL;
+  unsigned int code = sbuf_style.f->get_code(index);
+
+  if (s.empty()) {
+    if (sbuf_style.f->contains(index))
+      html_glyph = (char *)sbuf_style.f->get_special_device_encoding(index);
+    else
+      html_glyph = NULL;
+    
+    if ((html_glyph == NULL) && (code >= UNICODE_DESC_START))
+      html_glyph = to_unicode(code);
+  } else 
+    html_glyph = get_html_translation(sbuf_style.f, s);
+
+  last_sbuf_length = sbuf.length();
+  if (html_glyph == NULL)
+    sbuf += ((char)code);
+  else
+    sbuf += html_glyph;
+}
+
+int html_printer::sbuf_continuation (int index, const char *name,
+				     const environment *env, int w)
+{
+  /*
+   *  lets see whether the glyph is closer to the end of sbuf
+   */
+  if ((sbuf_end_hpos == env->hpos)
+      || ((sbuf_prev_hpos < sbuf_end_hpos)
+	  && (env->hpos < sbuf_end_hpos)
+	  && ((sbuf_end_hpos-env->hpos < env->hpos-sbuf_prev_hpos)))) {
+    add_to_sbuf(index, name);
+    sbuf_prev_hpos = sbuf_end_hpos;
+    sbuf_end_hpos += w + sbuf_kern;
+    return TRUE;
+  } else {
+    if ((env->hpos >= sbuf_end_hpos) &&
+	((sbuf_kern == 0) || (sbuf_end_hpos - sbuf_kern != env->hpos))) {
+      /*
+       *  lets see whether a space is needed or not
+       */
+
+      if (env->hpos-sbuf_end_hpos < space_width) {
+	add_to_sbuf(index, name);
+	sbuf_prev_hpos = sbuf_end_hpos;
+	sbuf_end_hpos = env->hpos + w;
+	return TRUE;
+      }
+    }
+  }
+  return FALSE ;
+}
+
+/*
+ *  get_html_translation - given the position of the character and its name
+ *                         return the device encoding for such character.
+ */
+
+char *get_html_translation (font *f, const string &name)
+{
+  int index;
+
+  if ((f == 0) || name.empty())
+    return NULL;
+  else {
+    index = f->name_to_index((char *)(name + '\0').contents());
+    if (index == 0) {
+      error("character `%s' not found", (name + '\0').contents());
+      return NULL;
+    } else
+      if (f->contains(index))
+	return (char *)f->get_special_device_encoding(index);
+      else
+	return NULL;
+  }
+}
+
+/*
+ *  overstrike - returns TRUE if the glyph (i, name) is going to overstrike
+ *               a previous glyph in sbuf.
+ *               If TRUE the font is changed to bold and the previous sbuf
+ *               is flushed.
+ */
+
+int html_printer::overstrike(int index, const char *name, const environment *env, int w)
+{
+  if ((env->hpos < sbuf_end_hpos)
+      || ((sbuf_kern != 0) && (sbuf_end_hpos - sbuf_kern < env->hpos))) {
+    /*
+     *  at this point we have detected an overlap
+     */
+    if (overstrike_detected) {
+      /* already detected, remove previous glyph and use this glyph */
+      sbuf.set_length(last_sbuf_length);
+      add_to_sbuf(index, name);
+      sbuf_end_hpos = env->hpos + w;
+      return TRUE;
+    } else {
+      /* first time we have detected an overstrike in the sbuf */
+      sbuf.set_length(last_sbuf_length); /* remove previous glyph */
+      if (! is_bold(sbuf_style.f))
+	flush_sbuf();
+      overstrike_detected = TRUE;
+      add_to_sbuf(index, name);
+      sbuf_end_hpos = env->hpos + w;
+      return TRUE;
+    }
+  }
+  return FALSE ;
+}
+
+/*
+ *  set_char - adds a character into the sbuf if it is a continuation with the previous
+ *             word otherwise flush the current sbuf and add character anew.
+ */
+
+void html_printer::set_char(int i, font *f, const environment *env, int w, const char *name)
+{
+  style sty(f, env->size, env->height, env->slant, env->fontno, *env->col);
+  if (sty.slant != 0) {
+    if (sty.slant > 80 || sty.slant < -80) {
+      error("silly slant `%1' degrees", sty.slant);
+      sty.slant = 0;
+    }
+  }
+  if (((! sbuf.empty()) && (sty == sbuf_style) && (sbuf_vpos == env->vpos))
+      && (sbuf_continuation(i, name, env, w) || overstrike(i, name, env, w)))
+    return;
+  
+  flush_sbuf();
+  add_to_sbuf(i, name);
+  sbuf_end_hpos = env->hpos + w;
+  sbuf_start_hpos = env->hpos;
+  sbuf_prev_hpos = env->hpos;
+  sbuf_vpos = env->vpos;
+  sbuf_style = sty;
+  sbuf_kern = 0;
+}
+
+/*
+ *  set_numbered_char - handle numbered characters.
+ *                      Negative values are interpreted as unbreakable spaces;
+ *                      the value (taken positive) gives the width.
+ */
+
+void html_printer::set_numbered_char(int num, const environment *env,
+				     int *widthp)
+{
+  int nbsp_width = 0;
+  if (num < 0) {
+    nbsp_width = -num;
+    num = 160;		// &nbsp;
+  }
+  int i = font::number_to_index(num);
+  int fn = env->fontno;
+  if (fn < 0 || fn >= nfonts) {
+    error("bad font position `%1'", fn);
+    return;
+  }
+  font *f = font_table[fn];
+  if (f == 0) {
+    error("no font mounted at `%1'", fn);
+    return;
+  }
+  if (!f->contains(i)) {
+    error("font `%1' does not contain numbered character %2",
+	  f->get_name(),
+	  num);
+    return;
+  }
+  int w;
+  if (nbsp_width)
+    w = nbsp_width;
+  else
+    w = f->get_width(i, env->size);
+  if (widthp)
+    *widthp = w;
+  set_char(i, f, env, w, 0);
+}
+
+/*
+ *  write_title - writes the title to this document
+ */
+
+void html_printer::write_title (int in_head)
+{
+  if (title.has_been_found) {
+    if (in_head) {
+      html.put_string("<title>");
+      html.put_string(title.text);
+      html.put_string("</title>").nl().nl();
+    } else {
+      title.has_been_written = TRUE;
+      if (title.with_h1) {
+	html.put_string("<h1 align=center>");
+	html.put_string(title.text);
+	html.put_string("</h1>").nl().nl();
+      }
+    }
+  } else if (in_head) {
+    // place empty title tags to help conform to `tidy'
+    html.put_string("<title></title>").nl();
+  }
+}
+
+/*
+ *  write_rule - emits a html rule tag, if the auto_rule boolean is true.
+ */
+
+static void write_rule (void)
+{
+  if (auto_rule)
+    fputs("<hr>\n", stdout);
+}
+
+void html_printer::begin_page(int n)
+{
+  page_number            =  n;
+#if defined(DEBUGGING)
+  html.begin_comment("Page: ").put_string(i_to_a(page_number)).end_comment();;
+#endif
+  no_of_printed_pages++;
+
+  output_style.f         =  0;
+  output_style.point_size= -1;
+  output_space_code      = 32;
+  output_draw_point_size = -1;
+  output_line_thickness  = -1;
+  output_hpos            = -1;
+  output_vpos            = -1;
+  output_vpos_max        = -1;
+  current_paragraph      = new html_text(&html);
+  do_indent(indentation, pageoffset, linelength);
+  current_paragraph->do_para("");
+}
+
+void html_printer::end_page(int)
+{
+  flush_sbuf();
+  flush_page();
+}
+
+font *html_printer::make_font(const char *nm)
+{
+  return html_font::load_html_font(nm);
+}
+
+void html_printer::do_body (void)
+{
+  if (background == NULL)
+    fputs("<body>\n\n", stdout);
+  else {
+    unsigned int r, g, b;
+    char buf[6+1];
+
+    background->get_rgb(&r, &g, &b);
+    // we have to scale 0..0xFFFF to 0..0xFF
+    sprintf(buf, "%.2X%.2X%.2X", r/0x101, g/0x101, b/0x101);
+
+    fputs("<body bgcolor=\"#", stdout);
+    fputs(buf, stdout);
+    fputs("\">\n\n", stdout);
+  }
+}
+
+html_printer::~html_printer()
+{
+#ifdef LONG_FOR_TIME_T
+  long t;
+#else
+  time_t t;
+#endif
+
+  current_paragraph->flush_text();
+  html.end_line();
+  html.set_file(stdout);
+  html.begin_comment("Creator     : ")
+    .put_string("groff ")
+    .put_string("version ")
+    .put_string(Version_string)
+    .end_comment();
+
+  t = time(0);
+  html.begin_comment("CreationDate: ")
+    .put_string(ctime(&t), strlen(ctime(&t))-1)
+    .end_comment();
+
+  fputs("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n", stdout);
+  fputs("\"http://www.w3.org/TR/html4/loose.dtd\">\n", stdout);
+
+  fputs("<html>\n", stdout);
+  fputs("<head>\n", stdout);
+  fputs("<meta name=\"generator\" "
+	      "content=\"groff -Thtml, see www.gnu.org\">\n", stdout);
+  fputs("<meta http-equiv=\"Content-Type\" "
+	      "content=\"text/html; charset=US-ASCII\">\n", stdout);
+  fputs("<meta name=\"Content-Style\" content=\"text/css\">\n", stdout);
+  write_title(TRUE);
+  fputs("</head>\n", stdout);
+  do_body();
+
+  write_title(FALSE);
+  header.write_headings(stdout, FALSE);
+  write_rule();
+#if defined(DEBUGGING)
+  html.begin_comment("Total number of pages: ").put_string(i_to_a(no_of_printed_pages)).end_comment();
+#endif
+  html.end_line();
+  html.end_line();
+  /*
+   *  now run through the file list copying each temporary file in turn and emitting the links.
+   */
+  file_list.start_of_list();
+  while (file_list.get_file() != 0) {
+    if (fseek(file_list.get_file(), 0L, 0) < 0)
+      fatal("fseek on temporary file failed");
+    html.copy_file(file_list.get_file());
+    fclose(file_list.get_file());
+    file_list.move_next();
+    if (file_list.get_file() != 0)
+      header.write_headings(stdout, TRUE);
+  }
+  write_rule();
+  fputs("</body>\n", stdout);
+  fputs("</html>\n", stdout);
+}
+
+/*
+ *  special - handle all x X requests from troff. For post-html they allow users
+ *            to pass raw html commands, turn auto linked headings off/on and
+ *            also allow troff to emit tags to indicate when a: .br, .sp etc occurs.
+ */
+
+void html_printer::special(char *s, const environment *env, char type)
+{
+  if (type != 'p')
+    return;
+  if (s != 0) {
+    flush_sbuf();
+    if (env->fontno >= 0) {
+      style sty(get_font_from_index(env->fontno), env->size, env->height,
+		env->slant, env->fontno, *env->col);
+      sbuf_style = sty;
+    }
+
+    if (strncmp(s, "html:", 5) == 0) {
+      int r=font::res;   /* resolution of the device */
+      font *f=sbuf_style.f;
+
+      if (f == NULL) {
+	int found=FALSE;
+
+	f = font::load_font("TR", &found);
+      }
+
+      /*
+       *  need to pass rest of string through to html output during flush
+       */
+      page_contents->add_and_encode(&sbuf_style, string(&s[5]),
+				    line_number,
+				    env->vpos-env->size*r/72, env->hpos,
+				    env->vpos               , env->hpos);
+
+      /*
+       * assume that the html command has no width, if it does then hopefully troff
+       * will have fudged this in a macro by requesting that the formatting move right by
+       * the appropriate amount.
+       */
+    } else if (strncmp(s, "index:", 6) == 0) {
+      cutoff_heading = atoi(&s[6]);
+    } else if (strncmp(s, "html-tag:", 9) == 0) {
+      int r=font::res;   /* resolution of the device */
+
+      page_contents->add_tag(&sbuf_style, string(s),
+			     line_number,
+			     env->vpos-env->size*r/72, env->hpos,
+			     env->vpos               , env->hpos);
+    }
+  }
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "a:g:o:i:I:D:F:vbdhlrnp", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'v':
+      printf("GNU post-grohtml (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case 'a':
+      /* text antialiasing bits - handled by pre-html */
+      break;
+    case 'g':
+      /* graphic antialiasing bits - handled by pre-html */
+      break;
+    case 'b':
+      // set background color to white
+      default_background = new color;
+      default_background->set_gray(color::MAX_COLOR_VAL);
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'l':
+      auto_links = FALSE;
+      break;
+    case 'r':
+      auto_rule = FALSE;
+      break;
+    case 'd':
+      /* handled by pre-html */
+      break;
+    case 'h':
+      /* do not use the Hn headings of html, but manufacture our own */
+      manufacture_headings = TRUE;
+      break;
+    case 'o':
+      /* handled by pre-html */
+      break;
+    case 'p':
+      /* handled by pre-html */
+      break;
+    case 'i':
+      /* handled by pre-html */
+      break;
+    case 'I':
+      /* handled by pre-html */
+      break;
+    case 'D':
+      /* handled by pre-html */
+      break;
+    case 'n':
+      simple_anchors = TRUE;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  if (optind >= argc) {
+    do_file("-");
+  } else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-vblnh] [-D dir] [-I image_stem] [-F dir] [files ...]\n",
+	  program_name);
+}
diff --git a/contrib/groff/src/devices/grolbp/Makefile.sub b/contrib/groff/src/devices/grolbp/Makefile.sub
index d8000d1..a237293 100644
--- a/contrib/groff/src/devices/grolbp/Makefile.sub
+++ b/contrib/groff/src/devices/grolbp/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grolbp.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lbp.$(OBJEXT)
-CCSRCS=$(srcdir)/lbp.cc
+CCSRCS=$(srcdir)/lbp.cpp
diff --git a/contrib/groff/src/devices/grolbp/charset.h b/contrib/groff/src/devices/grolbp/charset.h
index adc76f4..a0cd057 100644
--- a/contrib/groff/src/devices/grolbp/charset.h
+++ b/contrib/groff/src/devices/grolbp/charset.h
@@ -1,6 +1,6 @@
 // Definition of the WP54 character set
 
-char symset[] = {
+unsigned char symset[] = {
 0x57,0x50,0x35,0x34,0x00,0x41,0x76,0x61,0x6e,0x74,0x47,0x61,
 0x72,0x64,0x65,0x2d,0x42,0x6f,0x6f,0x6b,0x00,0x41,0x76,
 0x61,0x6e,0x74,0x47,0x61,0x72,0x64,0x65,0x2d,0x44,0x65,
diff --git a/contrib/groff/src/devices/grolbp/lbp.cpp b/contrib/groff/src/devices/grolbp/lbp.cpp
new file mode 100644
index 0000000..b34a1e0
--- /dev/null
+++ b/contrib/groff/src/devices/grolbp/lbp.cpp
@@ -0,0 +1,739 @@
+// -*- C++ -*-
+/* Copyright (C) 1994, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+     Written by Francisco Andrés Verdú <pandres@dragonet.es> with many ideas
+     taken from the other groff drivers.
+
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/*
+TODO
+
+ - Add X command to include bitmaps
+*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include "driver.h"
+#include "lbp.h"
+#include "charset.h"
+#include "paper.h"
+
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+static int user_papersize = -1;		// papersize
+static int orientation = -1;		// orientation
+static double user_paperlength = 0;	// Custom Paper size
+static double user_paperwidth = 0;
+static int ncopies = 1;			// Number of copies
+
+#define DEFAULT_LINEWIDTH_FACTOR 40	// 0.04em
+static int linewidth_factor = DEFAULT_LINEWIDTH_FACTOR;
+
+static int set_papersize(const char *paperformat);
+
+class lbp_font : public font {
+public:
+  ~lbp_font();
+  void handle_unknown_font_command(const char *command, const char *arg,
+				   const char *filename, int lineno);
+  static lbp_font *load_lbp_font(const char *);
+  char *lbpname;
+  char is_scalable;
+private:
+  lbp_font(const char *);
+};
+
+class lbp_printer : public printer {
+public:
+  lbp_printer(int, double, double);
+  ~lbp_printer();
+  void set_char(int, font *, const environment *, int, const char *name);
+  void draw(int code, int *p, int np, const environment *env);
+  void begin_page(int);
+  void end_page(int page_length);
+  font *make_font(const char *);
+  void end_of_line();
+private:
+  void set_line_thickness(int size,const environment *env);
+  void vdmstart();
+  void vdmflush(); // the name vdmend was already used in lbp.h
+  void setfillmode(int mode);
+  void polygon( int hpos,int vpos,int np,int *p);
+  char *font_name(const lbp_font *f, const int siz);
+
+  int fill_pattern;
+  int fill_mode;
+  int cur_hpos;
+  int cur_vpos;
+  lbp_font *cur_font;
+  int cur_size;
+  unsigned short cur_symbol_set;
+  int line_thickness;
+  int req_linethickness; // requested line thickness
+  int papersize;
+  int paperlength;	// custom paper size
+  int paperwidth;
+};
+
+//   Compatibility section.
+//
+//   Here we define some functions not present in some of the targets
+//   platforms
+#ifndef HAVE_STRSEP
+// Solaris 8 doesn't have the strsep function
+static char *strsep(char **pcadena, const char *delim)
+{
+  char *p;
+  p = strtok(*pcadena, delim);
+  *pcadena = strtok(NULL, delim);
+  return p;
+}
+#endif
+
+lbp_font::lbp_font(const char *nm)
+: font(nm)
+{
+}
+
+lbp_font::~lbp_font()
+{
+}
+
+lbp_font *lbp_font::load_lbp_font(const char *s)
+{
+  lbp_font *f = new lbp_font(s);
+  f->lbpname = NULL;
+  f->is_scalable = 1; // Default is that fonts are scalable
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+
+void lbp_font::handle_unknown_font_command(const char *command,
+					   const char *arg,
+					   const char *filename, int lineno)
+{
+  if (strcmp(command, "lbpname") == 0) {
+    if (arg == 0)
+      fatal_with_file_and_line(filename, lineno,
+			       "`%1' command requires an argument",
+			       command);
+    this->lbpname = new char[strlen(arg) + 1];
+    strcpy(this->lbpname, arg);
+    // we recognize bitmapped fonts by the first character of its name
+    if (arg[0] == 'N')
+      this->is_scalable = 0;
+    // fprintf(stderr, "Loading font \"%s\" \n", arg);
+  }
+  // fprintf(stderr, "Loading font  %s \"%s\" in %s at %d\n",
+  //         command, arg, filename, lineno);
+}
+
+static void wp54charset()
+{
+  unsigned int i;
+  lbpputs("\033[714;100;29;0;32;120.}");
+  for (i = 0; i < sizeof(symset); i++)
+    lbpputc(symset[i]);
+  lbpputs("\033[100;0 D");
+  return;
+}
+
+lbp_printer::lbp_printer(int ps, double pw, double pl)
+: fill_pattern(1),
+  fill_mode(0),
+  cur_hpos(-1),
+  cur_font(0),
+  cur_size(0),
+  cur_symbol_set(0),
+  req_linethickness(-1)
+{
+  SET_BINARY(fileno(stdout));
+  lbpinit(stdout);
+  lbpputs("\033c\033;\033[2&z\033[7 I\033[?32h\033[?33h\033[11h");
+  wp54charset(); // Define the new symbol set
+  lbpputs("\033[7 I\033[?32h\033[?33h\033[11h");
+  // Paper size handling
+  if (orientation < 0)
+    orientation = 0;	// Default orientation is portrait
+  papersize = 14;	// Default paper size is A4
+  if (font::papersize) {
+    papersize = set_papersize(font::papersize);
+    paperlength = font::paperlength;
+    paperwidth = font::paperwidth;
+  }
+  if (ps >= 0) {
+    papersize = ps;
+    paperlength = int(pl * font::res + 0.5);
+    paperwidth = int(pw * font::res + 0.5);
+  }
+  if (papersize < 80)	// standard paper
+    lbpprintf("\033[%dp", (papersize | orientation));
+  else			// Custom paper
+    lbpprintf("\033[%d;%d;%dp", (papersize | orientation),
+	      paperlength, paperwidth);
+  // Number of copies
+  lbpprintf("\033[%dv\n", ncopies);
+  lbpputs("\033[0u\033[1u\033P1y Grolbp\033\\");
+  lbpmoveabs(0, 0);
+  lbpputs("\033[0t\033[2t");
+  lbpputs("\033('$2\033)' 1");	// Primary symbol set IBML
+				// Secondary symbol set IBMR1
+  cur_symbol_set = 0;
+}
+
+lbp_printer::~lbp_printer()
+{
+  lbpputs("\033P1y\033\\");
+  lbpputs("\033c\033<");
+}
+
+inline void lbp_printer::set_line_thickness(int size,const environment *env)
+{
+      if (size == 0)
+	line_thickness = 1;
+      else {
+      	if (size < 0)
+		// line_thickness =
+		//   (env->size * (font::res/72)) * (linewidth_factor/1000)
+		// we ought to check for overflow
+		line_thickness =
+		  env->size * linewidth_factor * font::res / 72000;
+      	else // size > 0
+        	line_thickness = size;
+      } // else from if (size == 0)
+      if (line_thickness < 1)
+	line_thickness = 1;
+      if (vdminited())
+	vdmlinewidth(line_thickness);
+      req_linethickness = size; // an size requested
+      /*  fprintf(stderr, "thickness: %d == %d, size %d, %d \n",
+        size, line_thickness, env->size,req_linethickness); */
+   return;
+}; // lbp_printer::set_line_thickness
+
+void lbp_printer::begin_page(int)
+{
+}
+
+void lbp_printer::end_page(int)
+{
+  if (vdminited())
+    vdmflush();
+  lbpputc('\f');
+  cur_hpos = -1;
+}
+
+void lbp_printer::end_of_line()
+{
+  cur_hpos = -1;		// force absolute motion
+}
+
+char *lbp_printer::font_name(const lbp_font *f, const int siz)
+{
+  static char bfont_name[255];	// The resulting font name
+  char type,	// Italic, Roman, Bold
+       ori,	// Normal or Rotated
+       *nam;	// The font name without other data.
+  int cpi;	// The font size in characters per inch
+		// (bitmapped fonts are monospaced).
+  /* Bitmap font selection is ugly in this printer, so don't expect
+     this function to be elegant. */
+  bfont_name[0] = 0x00;
+  if (orientation)	// Landscape
+    ori = 'R';
+  else			// Portrait
+    ori = 'N';
+  type = f->lbpname[strlen(f->lbpname) - 1];
+  nam = new char[strlen(f->lbpname) - 2];
+  strncpy(nam, &(f->lbpname[1]), strlen(f->lbpname) - 2);
+  nam[strlen(f->lbpname) - 2] = 0x00;
+  // fprintf(stderr, "Bitmap font '%s' %d %c %c \n", nam, siz, type, ori);
+  /* Since these fonts are available only at certain sizes,
+     10 and 17 cpi for courier,  12 and 17 cpi for elite,
+     we adjust the resulting size. */
+  cpi = 17;
+  // Fortunately there are only two bitmapped fonts shipped with the printer.
+  if (!strcasecmp(nam, "courier")) {
+    // Courier font
+    if (siz >= 12)
+      cpi = 10;
+    else cpi = 17;
+  }
+  if (!strcasecmp(nam, "elite")) {
+    if (siz >= 10)
+      cpi = 12;
+    else cpi = 17;
+  }
+  // Now that we have all the data, let's generate the font name.
+  if ((type != 'B') && (type != 'I')) // Roman font
+    sprintf(bfont_name, "%c%s%d", ori, nam, cpi);
+  else
+    sprintf(bfont_name, "%c%s%d%c", ori, nam, cpi, type);
+  return bfont_name;
+}
+
+void lbp_printer::set_char(int index, font *f, const environment *env,
+			   int w, const char *)
+{
+  int code = f->get_code(index);
+  unsigned char ch = code & 0xff;
+  unsigned short symbol_set = code >> 8;
+  if (f != cur_font) {
+    lbp_font *psf = (lbp_font *)f;
+    // fprintf(stderr, "Loading font %s \"%d\" \n", psf->lbpname, env->size);
+    if (psf->is_scalable) {
+      // Scalable font selection is different from bitmaped
+      lbpprintf("\033Pz%s.IBML\033\\\033[%d C", psf->lbpname,
+		(int)((env->size * font::res) / 72));
+    }
+    else
+      // bitmapped font
+      lbpprintf("\033Pz%s.IBML\033\\\n", font_name(psf, env->size));
+    lbpputs("\033)' 1");	// Select IBML and IBMR1 symbol set
+    cur_font = psf;
+    cur_symbol_set = 0;
+     // Update the line thickness if needed
+    if ((req_linethickness < 0 ) && (env->size != cur_size))
+  	set_line_thickness(req_linethickness,env);
+    cur_size = env->size;
+  }
+  if (symbol_set != cur_symbol_set) {
+    if (cur_symbol_set == 3)
+      // if current symbol set is Symbol we must restore the font
+      lbpprintf("\033Pz%s.IBML\033\\\033[%d C", cur_font->lbpname,
+		(int)((env->size * font::res) / 72));
+    switch (symbol_set) {
+    case 0:
+      lbpputs("\033('$2\033)' 1");	// Select IBML and IBMR1 symbol sets
+      break;
+    case 1:
+      lbpputs("\033(d\033)' 1");	// Select wp54 symbol set
+      break;
+    case 2:
+      lbpputs("\033('$2\033)'!0");	// Select IBMP symbol set
+      break;
+    case 3:
+      lbpprintf("\033PzSymbol.SYML\033\\\033[%d C",
+		(int)((env->size * font::res) / 72));
+      lbpputs("\033(\"!!0\033)\"!!1");	// Select symbol font
+      break;
+    case 4:
+      lbpputs("\033)\"! 1\033(\"!$2");	// Select PS symbol set
+      break;
+    }
+    cur_symbol_set = symbol_set;
+  }
+  if (env->size != cur_size) {
+    if (!cur_font->is_scalable)
+      lbpprintf("\033Pz%s.IBML\033\\\n", font_name(cur_font, env->size));
+    else
+      lbpprintf("\033[%d C", (int)((env->size * font::res) / 72));
+    cur_size = env->size;
+     // Update the line thickness if needed
+    if (req_linethickness < 0 ) 
+  	set_line_thickness(req_linethickness,env);
+  }
+  if ((env->hpos != cur_hpos) || (env->vpos != cur_vpos)) {
+    // lbpmoveabs(env->hpos - ((5 * 300) / 16), env->vpos);
+    lbpmoveabs(env->hpos - 64, env->vpos - 64);
+    cur_vpos = env->vpos;
+    cur_hpos = env->hpos;
+  }
+  if ((ch & 0x7F) < 32)
+    lbpputs("\033[1.v");
+  lbpputc(ch);
+  cur_hpos += w;
+}
+
+void lbp_printer::vdmstart()
+{
+  FILE *f;
+  static int changed_origin = 0;
+  errno = 0;
+  f = tmpfile();
+  // f = fopen("/tmp/gtmp","w+");
+  if (f == NULL)
+    perror("Opening temporary file");
+  vdminit(f);
+  if (!changed_origin) {	// we should change the origin only one time
+    changed_origin = 1;
+    vdmorigin(-63, 0);
+  }
+  vdmlinewidth(line_thickness);
+}
+
+void
+lbp_printer::vdmflush()
+{
+  char buffer[1024];
+  int bytes_read = 1;
+  vdmend();
+  fflush(lbpoutput);
+  /* let's copy the vdm code to the output */
+  rewind(vdmoutput);
+  do {
+    bytes_read = fread(buffer, 1, sizeof(buffer), vdmoutput);
+    bytes_read = fwrite(buffer, 1, bytes_read, lbpoutput);
+  } while (bytes_read == sizeof(buffer));
+  fclose(vdmoutput);	// This will also delete the file,
+			// since it is created by tmpfile()
+  vdmoutput = NULL;
+}
+
+inline void lbp_printer::setfillmode(int mode)
+{
+  if (mode != fill_mode) {
+    if (mode != 1)
+      vdmsetfillmode(mode, 1, 0);
+    else
+      vdmsetfillmode(mode, 1, 1);	// To get black we must use white
+					// inverted
+      fill_mode = mode;
+  }
+}
+
+inline void lbp_printer::polygon(int hpos, int vpos, int np, int *p)
+{
+  int *points, i;
+  points = new int[np + 2];
+  points[0] = hpos;
+  points[1] = vpos;
+  // fprintf(stderr, "Poligon (%d,%d) ", points[0], points[1]);
+  for (i = 0; i < np; i++)
+    points[i + 2] = p[i];
+  // for (i = 0; i < np; i++) fprintf(stderr, " %d ", p[i]);
+  // fprintf(stderr, "\n");
+  vdmpolygon((np /2) + 1, points);
+}
+
+void lbp_printer::draw(int code, int *p, int np, const environment *env)
+{
+  if ((req_linethickness < 0 ) && (env->size != cur_size))
+		set_line_thickness(req_linethickness,env);
+
+  switch (code) {
+  case 't':
+    if (np == 0)
+      line_thickness = 1;
+    else { // troff gratuitously adds an extra 0
+      if (np != 1 && np != 2) {
+	error("0 or 1 argument required for thickness");
+	break;
+      };
+    set_line_thickness(p[0],env);
+    };
+    break;
+  case 'l':	// Line
+    if (np != 2) {
+      error("2 arguments required for line");
+      break;
+    }
+    if (!vdminited())
+      vdmstart();
+    vdmline(env->hpos, env->vpos, p[0], p[1]);
+/*     fprintf(stderr, "\nline: %d,%d - %d,%d thickness %d == %d\n",
+             env->hpos - 64,env->vpos -64, env->hpos - 64 + p[0],
+             env->vpos -64 + p[1], env->size, line_thickness);*/
+    break;
+  case 'R':	// Rule
+    if (np != 2) {
+      error("2 arguments required for Rule");
+      break;
+    }
+    if (vdminited()) {
+      setfillmode(fill_pattern); // Solid Rule
+      vdmrectangle(env->hpos, env->vpos, p[0], p[1]);
+    }
+    else {
+      lbpruleabs(env->hpos - 64, env->vpos -64, p[0], p[1]);
+      cur_vpos = p[1];
+      cur_hpos = p[0];
+    }
+    // fprintf(stderr, "\nrule: thickness %d == %d\n",
+    //         env->size, line_thickness);
+    break;
+  case 'P':	// Filled Polygon
+    if (!vdminited())
+      vdmstart();
+    setfillmode(fill_pattern);
+    polygon(env->hpos, env->vpos, np, p);
+    break;
+  case 'p':	// Empty Polygon
+    if (!vdminited())
+      vdmstart();
+    setfillmode(0);
+    polygon(env->hpos, env->vpos, np, p);
+    break;
+  case 'C':	// Filled Circle
+    if (!vdminited())
+      vdmstart();
+    // fprintf(stderr, "Circle (%d,%d) Fill %d\n",
+    //         env->hpos, env->vpos, fill_pattern);
+    setfillmode(fill_pattern);
+    vdmcircle(env->hpos + (p[0]/2), env->vpos, p[0]/2);
+    break;
+  case 'c':	// Empty Circle
+    if (!vdminited())
+      vdmstart();
+    setfillmode(0);
+    vdmcircle(env->hpos + (p[0]/2), env->vpos, p[0]/2);
+    break;
+  case 'E':	// Filled Ellipse
+    if (!vdminited())
+      vdmstart();
+    setfillmode(fill_pattern);
+    vdmellipse(env->hpos + (p[0]/2), env->vpos, p[0]/2, p[1]/2, 0);
+    break;
+  case 'e':	 // Empty Ellipse
+    if (!vdminited())
+      vdmstart();
+    setfillmode(0);
+    vdmellipse(env->hpos + (p[0]/2), env->vpos, p[0]/2, p[1]/2, 0);
+    break;
+  case 'a':	// Arc
+    if (!vdminited())
+      vdmstart();
+    setfillmode(0);
+    // VDM draws arcs clockwise and pic counterclockwise
+    // We must compensate for that, exchanging the starting and
+    // ending points
+    vdmvarc(env->hpos + p[0], env->vpos+p[1],
+	    int(sqrt(double((p[0]*p[0]) + (p[1]*p[1])))),
+	    p[2], p[3],
+	    (-p[0]), (-p[1]), 1, 2);
+    break;
+  case '~':	// Spline
+    if (!vdminited())
+      vdmstart();
+    setfillmode(0);
+    vdmspline(np/2, env->hpos, env->vpos, p);
+    break;
+  case 'f':
+    if (np != 1 && np != 2) {
+      error("1 argument required for fill");
+      break;
+    }
+    // fprintf(stderr, "Fill %d\n", p[0]);
+    if ((p[0] == 1) || (p[0] >= 1000)) { // Black
+      fill_pattern = 1;
+      break;
+    }
+    if (p[0] == 0) { // White
+      fill_pattern = 0;
+      break;
+    }
+    if ((p[0] > 1) && (p[0] < 1000))
+      {
+	if (p[0] >= 990)  fill_pattern = -23;
+	else if (p[0] >= 700)  fill_pattern = -28;
+	else if (p[0] >= 500)  fill_pattern = -27;
+	else if (p[0] >= 400)  fill_pattern = -26;
+	else if (p[0] >= 300)  fill_pattern = -25;
+	else if (p[0] >= 200)  fill_pattern = -22;
+	else if (p[0] >= 100)  fill_pattern = -24;
+	else fill_pattern = -21;
+      }
+    break;
+  case 'F':
+    // not implemented yet
+    break;
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+  return;
+}
+
+font *lbp_printer::make_font(const char *nm)
+{
+  return lbp_font::load_lbp_font(nm);
+}
+
+printer *make_printer()
+{
+  return new lbp_printer(user_papersize, user_paperwidth, user_paperlength);
+}
+
+static struct {
+  const char *name;
+  int code;
+} lbp_papersizes[] =
+  {{ "A4", 14 },
+   { "letter", 30 },
+   { "legal", 32 },
+   { "executive", 40 },
+  };
+
+static int set_papersize(const char *paperformat)
+{
+  unsigned int i;
+  // First test for a standard (i.e. supported directly by the printer)
+  // paper size
+  for (i = 0 ; i < sizeof(lbp_papersizes) / sizeof(lbp_papersizes[0]); i++)
+  {
+    if (strcasecmp(lbp_papersizes[i].name,paperformat) == 0)
+      return lbp_papersizes[i].code;
+  }
+  // Otherwise, we assume a custom paper size
+  return 82;
+}
+
+static void handle_unknown_desc_command(const char *command, const char *arg,
+					const char *filename, int lineno)
+{
+  // orientation command
+  if (strcasecmp(command, "orientation") == 0) {
+    // We give priority to command line options
+    if (orientation > 0)
+      return;
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`orientation' command requires an argument");
+    else {
+      if (strcasecmp(arg, "portrait") == 0)
+	orientation = 0;
+      else {
+	if (strcasecmp(arg, "landscape") == 0)
+	  orientation = 1;
+	else
+	  error_with_file_and_line(filename, lineno,
+				   "invalid argument to `orientation' command");
+      }
+    }
+  }
+}
+
+static struct option long_options[] = {
+  { "orientation", required_argument, NULL, 'o' },
+  { "version", no_argument, NULL, 'v' },
+  { "copies", required_argument, NULL, 'c' },
+  { "landscape", no_argument, NULL, 'l' },
+  { "papersize", required_argument, NULL, 'p' },
+  { "linewidth", required_argument, NULL, 'w' },
+  { "fontdir", required_argument, NULL, 'F' },
+  { "help", no_argument, NULL, 'h' },
+  { NULL, 0, 0, 0 }
+};
+
+static void usage(FILE *stream)
+{
+  fprintf(stream,
+	  "usage: %s [-lvh] [-c n] [-p paper_size] [-F dir] [-o or]\n"
+	  "       [-w width] [files ...]\n"
+	  "\n"
+	  "  -o --orientation=[portrait|landscape]\n"
+	  "  -v --version\n"
+	  "  -c --copies=numcopies\n"
+	  "  -l --landscape\n"
+	  "  -p --papersize=paper_size\n"
+	  "  -w --linewidth=width\n"
+	  "  -F --fontdir=dir\n"
+	  "  -h --help\n",
+	  program_name);
+}
+
+int main(int argc, char **argv)
+{
+  if (program_name == NULL)
+    program_name = strsave(argv[0]);
+  font::set_unknown_desc_command_handler(handle_unknown_desc_command);
+  // command line parsing
+  int c = 0;
+  int option_index = 0;
+  while (c >= 0) {
+    c = getopt_long (argc, argv, "F:p:lvo:c:hw:",
+		     long_options, &option_index);
+    switch (c) {
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'p':
+      {
+	const char *s;
+	if (!font::scan_papersize(optarg, &s,
+				  &user_paperlength, &user_paperwidth))
+	  error("invalid paper size `%1' ignored", optarg);
+	else
+	  user_papersize = set_papersize(s);
+	break;
+      }
+    case 'l':
+      orientation = 1;
+      break;
+    case 'v':
+      printf("GNU grolbp (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case 'o':
+      if (strcasecmp(optarg, "portrait") == 0)
+	orientation = 0;
+      else {
+	if (strcasecmp(optarg, "landscape") == 0)
+	  orientation = 1;
+	else
+	  error("unknown orientation '%1'", optarg);
+      };
+      break;
+    case 'c':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if ((n <= 0) && (ptr == optarg))
+	  error("argument for -c must be a positive integer");
+	else if (n <= 0 || n > 32767)
+	  error("out of range argument for -c");
+	else
+	  ncopies = unsigned(n);
+	break;
+      }
+    case 'w':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if (n == 0 && ptr == optarg)
+	  error("argument for -w must be a non-negative integer");
+	else if (n < 0 || n > INT_MAX)
+	  error("out of range argument for -w");
+	else
+	  linewidth_factor = int(n);
+	break;
+      }
+    case 'h':
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    }
+  }
+  if (optind >= argc)
+    do_file("-");
+  while (optind < argc)
+    do_file(argv[optind++]);
+  lbpputs("\033c\033<");
+  return 0;
+}
diff --git a/contrib/groff/src/devices/grolbp/lbp.h b/contrib/groff/src/devices/grolbp/lbp.h
index 3b8a941..e669ff2 100644
--- a/contrib/groff/src/devices/grolbp/lbp.h
+++ b/contrib/groff/src/devices/grolbp/lbp.h
@@ -1,5 +1,5 @@
 // -*- C -*-
-/* Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000, 2001, 2003 Free Software Foundation, Inc.
      Written by Francisco Andrés Verdú <pandres@dragonet.es>
 
 groff is free software; you can redistribute it and/or modify it under
@@ -52,7 +52,7 @@ lbpputs(const char *data)
 };
 
 static inline void
-lbpputc(char c)
+lbpputc(unsigned char c)
 {
 	fputc(c,lbpoutput);
 };
diff --git a/contrib/groff/src/devices/grolj4/Makefile.sub b/contrib/groff/src/devices/grolj4/Makefile.sub
index 21c3780..9899b7a 100644
--- a/contrib/groff/src/devices/grolj4/Makefile.sub
+++ b/contrib/groff/src/devices/grolj4/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grolj4.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lj4.$(OBJEXT)
-CCSRCS=$(srcdir)/lj4.cc
+CCSRCS=$(srcdir)/lj4.cpp
diff --git a/contrib/groff/src/devices/grolj4/lj4.cpp b/contrib/groff/src/devices/grolj4/lj4.cpp
new file mode 100644
index 0000000..1332e19
--- /dev/null
+++ b/contrib/groff/src/devices/grolj4/lj4.cpp
@@ -0,0 +1,706 @@
+// -*- C++ -*-
+/* Copyright (C) 1994, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/*
+TODO
+
+option to use beziers for circle/ellipse/arc
+option to use lines for spline (for LJ3)
+left/top offset registration
+output bin selection option
+paper source option
+output non-integer parameters using fixed point numbers
+X command to insert contents of file
+X command to specify inline escape sequence (how to specify unprintable chars?)
+X command to include bitmap graphics
+*/
+
+#include "driver.h"
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+static struct {
+  const char *name;
+  int code;
+  // at 300dpi
+  int x_offset_portrait;
+  int x_offset_landscape;
+} paper_table[] = {
+  { "letter", 2, 75, 60 },
+  { "legal", 3, 75, 60 },
+  { "executive", 1, 75, 60 },
+  { "a4", 26, 71, 59 },
+  { "com10", 81, 75, 60 },
+  { "monarch", 80, 75, 60 },
+  { "c5", 91, 71, 59 },
+  { "b5", 100, 71, 59 },
+  { "dl", 90, 71, 59 },
+};
+
+static int user_paper_size = -1;
+static int landscape_flag = 0;
+static int duplex_flag = 0;
+
+// An upper limit on the paper size in centipoints,
+// used for setting HPGL picture frame.
+#define MAX_PAPER_WIDTH (12*720)
+#define MAX_PAPER_HEIGHT (17*720)
+
+// Dotted lines that are thinner than this don't work right.
+#define MIN_DOT_PEN_WIDTH .351
+
+#ifndef DEFAULT_LINE_WIDTH_FACTOR
+// in ems/1000
+#define DEFAULT_LINE_WIDTH_FACTOR 40
+#endif
+
+const int DEFAULT_HPGL_UNITS = 1016;
+int line_width_factor = DEFAULT_LINE_WIDTH_FACTOR;
+unsigned ncopies = 0;		// 0 means don't send ncopies command
+
+static int lookup_paper_size(const char *);
+
+class lj4_font : public font {
+public:
+  ~lj4_font();
+  void handle_unknown_font_command(const char *command, const char *arg,
+				   const char *filename, int lineno);
+  static lj4_font *load_lj4_font(const char *);
+  int weight;
+  int style;
+  int proportional;
+  int typeface;
+private:
+  lj4_font(const char *);
+};
+
+lj4_font::lj4_font(const char *nm)
+: font(nm), weight(0), style(0), proportional(0), typeface(0)
+{
+}
+
+lj4_font::~lj4_font()
+{
+}
+
+lj4_font *lj4_font::load_lj4_font(const char *s)
+{
+  lj4_font *f = new lj4_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+static struct {
+  const char *s;
+  int lj4_font::*ptr;
+  int min;
+  int max;
+} command_table[] = {
+  { "pclweight", &lj4_font::weight, -7, 7 },
+  { "pclstyle", &lj4_font::style, 0, 32767 },
+  { "pclproportional", &lj4_font::proportional, 0, 1 },
+  { "pcltypeface", &lj4_font::typeface, 0, 65535 },
+};
+
+void lj4_font::handle_unknown_font_command(const char *command,
+					   const char *arg,
+					   const char *filename, int lineno)
+{
+  for (unsigned int i = 0;
+       i < sizeof(command_table)/sizeof(command_table[0]); i++) {
+    if (strcmp(command, command_table[i].s) == 0) {
+      if (arg == 0)
+	fatal_with_file_and_line(filename, lineno,
+				 "`%1' command requires an argument",
+				 command);
+      char *ptr;
+      long n = strtol(arg, &ptr, 10);
+      if (n == 0 && ptr == arg)
+	fatal_with_file_and_line(filename, lineno,
+				 "`%1' command requires numeric argument",
+				 command);
+      if (n < command_table[i].min) {
+	error_with_file_and_line(filename, lineno,
+				 "argument for `%1' command must not be less than %2",
+				 command, command_table[i].min);
+	n = command_table[i].min;
+      }
+      else if (n > command_table[i].max) {
+	error_with_file_and_line(filename, lineno,
+				 "argument for `%1' command must not be greater than %2",
+				 command, command_table[i].max);
+	n = command_table[i].max;
+      }
+      this->*command_table[i].ptr = int(n);
+      break;
+    }
+  }
+}
+
+class lj4_printer : public printer {
+public:
+  lj4_printer(int);
+  ~lj4_printer();
+  void set_char(int, font *, const environment *, int, const char *name);
+  void draw(int code, int *p, int np, const environment *env);
+  void begin_page(int);
+  void end_page(int page_length);
+  font *make_font(const char *);
+  void end_of_line();
+private:
+  void set_line_thickness(int size, int dot = 0);
+  void hpgl_init();
+  void hpgl_start();
+  void hpgl_end();
+  int moveto(int hpos, int vpos);
+  int moveto1(int hpos, int vpos);
+
+  int cur_hpos;
+  int cur_vpos;
+  lj4_font *cur_font;
+  int cur_size;
+  unsigned short cur_symbol_set;
+  int x_offset;
+  int line_thickness;
+  double pen_width;
+  double hpgl_scale;
+  int hpgl_inited;
+  int paper_size;
+};
+
+inline
+int lj4_printer::moveto(int hpos, int vpos)
+{
+  if (cur_hpos != hpos || cur_vpos != vpos || cur_hpos < 0)
+    return moveto1(hpos, vpos);
+  else
+    return 1;
+}
+
+inline
+void lj4_printer::hpgl_start()
+{
+  fputs("\033%1B", stdout);
+}
+
+inline
+void lj4_printer::hpgl_end()
+{
+  fputs(";\033%0A", stdout);
+}
+
+lj4_printer::lj4_printer(int ps)
+: cur_hpos(-1),
+  cur_font(0),
+  cur_size(0),
+  cur_symbol_set(0),
+  line_thickness(-1),
+  pen_width(-1.0),
+  hpgl_inited(0)
+{
+  if (7200 % font::res != 0)
+    fatal("invalid resolution %1: resolution must be a factor of 7200",
+	  font::res);
+  fputs("\033E", stdout);		// reset
+  if (font::res != 300)
+    printf("\033&u%dD", font::res);	// unit of measure
+  if (ncopies > 0)
+    printf("\033&l%uX", ncopies);
+  paper_size = 0;		// default to letter
+  if (font::papersize) {
+    int n = lookup_paper_size(font::papersize);
+    if (n < 0)
+      error("unknown paper size `%1'", font::papersize);
+    else
+      paper_size = n;
+  }
+  if (ps >= 0)
+    paper_size = ps;
+  printf("\033&l%dA"		// paper size
+	 "\033&l%dO"		// orientation
+	 "\033&l0E",		// no top margin
+	 paper_table[paper_size].code,
+	 landscape_flag != 0);
+  if (landscape_flag)
+    x_offset = paper_table[paper_size].x_offset_landscape;
+  else
+    x_offset = paper_table[paper_size].x_offset_portrait;
+  x_offset = (x_offset * font::res) / 300;
+  if (duplex_flag)
+     printf("\033&l%dS", duplex_flag);
+}
+
+lj4_printer::~lj4_printer()
+{
+  fputs("\033E", stdout);
+}
+
+void lj4_printer::begin_page(int)
+{
+}
+
+void lj4_printer::end_page(int)
+{
+  putchar('\f');
+  cur_hpos = -1;
+}
+
+void lj4_printer::end_of_line()
+{
+  cur_hpos = -1;		// force absolute motion
+}
+
+inline
+int is_unprintable(unsigned char c)
+{
+  return c < 32 && (c == 0 || (7 <= c && c <= 15) || c == 27);
+}
+
+void lj4_printer::set_char(int index, font *f, const environment *env,
+			   int w, const char *)
+{
+  int code = f->get_code(index);
+
+  unsigned char ch = code & 0xff;
+  unsigned short symbol_set = code >> 8;
+  if (symbol_set != cur_symbol_set) {
+    printf("\033(%d%c", symbol_set/32, (symbol_set & 31) + 64);
+    cur_symbol_set = symbol_set;
+  }
+  if (f != cur_font) {
+    lj4_font *psf = (lj4_font *)f;
+    // FIXME only output those that are needed
+    printf("\033(s%dp%ds%db%dT",
+	   psf->proportional,
+	   psf->style,
+	   psf->weight,
+	   psf->typeface);
+    if (!psf->proportional || !cur_font || !cur_font->proportional)
+      cur_size = 0;
+    cur_font = psf;
+  }
+  if (env->size != cur_size) {
+    if (cur_font->proportional) {
+      static const char *quarters[] = { "", ".25", ".5", ".75" };
+      printf("\033(s%d%sV", env->size/4, quarters[env->size & 3]);
+    }
+    else {
+      double pitch = double(font::res)/w;
+      // PCL uses the next largest pitch, so round it down.
+      pitch = floor(pitch*100.0)/100.0;
+      printf("\033(s%.2fH", pitch);
+    }
+    cur_size = env->size;
+  }
+  if (!moveto(env->hpos, env->vpos))
+    return;
+  if (is_unprintable(ch))
+    fputs("\033&p1X", stdout);
+  putchar(ch);
+  cur_hpos += w;
+}
+
+int lj4_printer::moveto1(int hpos, int vpos)
+{
+  if (hpos < x_offset || vpos < 0)
+    return 0;
+  fputs("\033*p", stdout);
+  if (cur_hpos < 0)
+    printf("%dx%dY", hpos - x_offset, vpos);
+  else {
+    if (cur_hpos != hpos)
+      printf("%s%d%c", hpos > cur_hpos ? "+" : "",
+	     hpos - cur_hpos, vpos == cur_vpos ? 'X' : 'x');
+    if (cur_vpos != vpos)
+      printf("%s%dY", vpos > cur_vpos ? "+" : "", vpos - cur_vpos);
+  }
+  cur_hpos = hpos;
+  cur_vpos = vpos;
+  return 1;
+}
+
+void lj4_printer::draw(int code, int *p, int np, const environment *env)
+{
+  switch (code) {
+  case 'R':
+    {
+      if (np != 2) {
+	error("2 arguments required for rule");
+	break;
+      }
+      int hpos = env->hpos;
+      int vpos = env->vpos;
+      int hsize = p[0];
+      int vsize = p[1];
+      if (hsize < 0) {
+	hpos += hsize;
+	hsize = -hsize;
+      }
+      if (vsize < 0) {
+	vpos += vsize;
+	vsize = -vsize;
+      }
+      if (!moveto(hpos, vpos))
+	return;
+      printf("\033*c%da%db0P", hsize, vsize);
+      break;
+    }
+  case 'l':
+    if (np != 2) {
+      error("2 arguments required for line");
+      break;
+    }
+    hpgl_init();
+    if (!moveto(env->hpos, env->vpos))
+      return;
+    hpgl_start();
+    set_line_thickness(env->size, p[0] == 0 && p[1] == 0);
+    printf("PD%d,%d", p[0], p[1]);
+    hpgl_end();
+    break;
+  case 'p':
+  case 'P':
+    {
+      if (np & 1) {
+	error("even number of arguments required for polygon");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for polygon");
+	break;
+      }
+      hpgl_init();
+      if (!moveto(env->hpos, env->vpos))
+	return;
+      hpgl_start();
+      if (code == 'p')
+	set_line_thickness(env->size);
+      printf("PMPD%d", p[0]);
+      for (int i = 1; i < np; i++)
+	printf(",%d", p[i]);
+      printf("PM2%cP", code == 'p' ? 'E' : 'F');
+      hpgl_end();
+      break;
+    }
+  case '~':
+    {
+      if (np & 1) {
+	error("even number of arguments required for spline");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for spline");
+	break;
+      }
+      hpgl_init();
+      if (!moveto(env->hpos, env->vpos))
+	return;
+      hpgl_start();
+      set_line_thickness(env->size);
+      printf("PD%d,%d", p[0]/2, p[1]/2);
+      const int tnum = 2;
+      const int tden = 3;
+      if (np > 2) {
+	fputs("BR", stdout);
+	for (int i = 0; i < np - 2; i += 2) {
+	  if (i != 0)
+	    putchar(',');
+	  printf("%d,%d,%d,%d,%d,%d",
+		 (p[i]*tnum)/(2*tden),
+		 (p[i + 1]*tnum)/(2*tden),
+		 p[i]/2 + (p[i + 2]*(tden - tnum))/(2*tden),
+		 p[i + 1]/2 + (p[i + 3]*(tden - tnum))/(2*tden),
+		 (p[i] - p[i]/2) + p[i + 2]/2,
+		 (p[i + 1] - p[i + 1]/2) + p[i + 3]/2);
+	}
+      }
+      printf("PR%d,%d", p[np - 2] - p[np - 2]/2, p[np - 1] - p[np - 1]/2);
+      hpgl_end();
+      break;
+    }
+  case 'c':
+  case 'C':
+    // troff adds an extra argument to C
+    if (np != 1 && !(code == 'C' && np == 2)) {
+      error("1 argument required for circle");
+      break;
+    }
+    hpgl_init();
+    if (!moveto(env->hpos + p[0]/2, env->vpos))
+      return;
+    hpgl_start();
+    if (code == 'c') {
+      set_line_thickness(env->size);
+      printf("CI%d", p[0]/2);
+    }
+    else
+      printf("WG%d,0,360", p[0]/2);
+    hpgl_end();
+    break;
+  case 'e':
+  case 'E':
+    if (np != 2) {
+      error("2 arguments required for ellipse");
+      break;
+    }
+    hpgl_init();
+    if (!moveto(env->hpos + p[0]/2, env->vpos))
+      return;
+    hpgl_start();
+    printf("SC0,%.4f,0,-%.4f,2", hpgl_scale * double(p[0])/p[1], hpgl_scale);
+    if (code == 'e') {
+      set_line_thickness(env->size);
+      printf("CI%d", p[1]/2);
+    }
+    else
+      printf("WG%d,0,360", p[1]/2);
+    printf("SC0,%.4f,0,-%.4f,2", hpgl_scale, hpgl_scale);
+    hpgl_end();
+    break;
+  case 'a':
+    {
+      if (np != 4) {
+	error("4 arguments required for arc");
+	break;
+      }
+      hpgl_init();
+      if (!moveto(env->hpos, env->vpos))
+	return;
+      hpgl_start();
+      set_line_thickness(env->size);
+      double c[2];
+      if (adjust_arc_center(p, c)) {
+	double sweep = ((atan2(p[1] + p[3] - c[1], p[0] + p[2] - c[0])
+			 - atan2(-c[1], -c[0]))
+			* 180.0/PI);
+	if (sweep > 0.0)
+	  sweep -= 360.0;
+	printf("PDAR%d,%d,%f", int(c[0]), int(c[1]), sweep);
+      }
+      else
+	printf("PD%d,%d", p[0] + p[2], p[1] + p[3]);
+      hpgl_end();
+    }
+    break;
+  case 'f':
+    if (np != 1 && np != 2) {
+      error("1 argument required for fill");
+      break;
+    }
+    hpgl_init();
+    hpgl_start();
+    if (p[0] >= 0 && p[0] <= 1000)
+      printf("FT10,%d", p[0]/10);
+    hpgl_end();
+    break;
+  case 'F':
+    // not implemented yet
+    break;
+  case 't':
+    {
+      if (np == 0) {
+	line_thickness = -1;
+      }
+      else {
+	// troff gratuitously adds an extra 0
+	if (np != 1 && np != 2) {
+	  error("0 or 1 argument required for thickness");
+	  break;
+	}
+	line_thickness = p[0];
+      }
+      break;
+    }
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+}
+
+void lj4_printer::hpgl_init()
+{
+  if (hpgl_inited)
+    return;
+  hpgl_inited = 1;
+  hpgl_scale = double(DEFAULT_HPGL_UNITS)/font::res;
+  printf("\033&f0S"		// push position
+	 "\033*p0x0Y"		// move to 0,0
+	 "\033*c%dx%dy0T"	// establish picture frame
+	 "\033%%1B"		// switch to HPGL
+	 "SP1SC0,%.4f,0,-%.4f,2IR0,100,0,100" // set up scaling
+	 "LA1,4,2,4"		// round line ends and joins
+	 "PR"			// relative plotting
+	 "TR0"			// opaque
+	 ";\033%%1A"		// back to PCL
+	 "\033&f1S",		// pop position
+	 MAX_PAPER_WIDTH, MAX_PAPER_HEIGHT,
+	 hpgl_scale, hpgl_scale);
+}
+
+void lj4_printer::set_line_thickness(int size, int dot)
+{
+  double pw;
+  if (line_thickness < 0)
+    pw = (size * (line_width_factor * 25.4))/(font::sizescale * 72000.0);
+  else
+    pw = line_thickness*25.4/font::res;
+  if (dot && pw < MIN_DOT_PEN_WIDTH)
+    pw = MIN_DOT_PEN_WIDTH;
+  if (pw != pen_width) {
+    printf("PW%f", pw);
+    pen_width = pw;
+  }
+}
+
+font *lj4_printer::make_font(const char *nm)
+{
+  return lj4_font::load_lj4_font(nm);
+}
+
+printer *make_printer()
+{
+  return new lj4_printer(user_paper_size);
+}
+
+static
+int lookup_paper_size(const char *s)
+{
+  for (unsigned int i = 0;
+       i < sizeof(paper_table)/sizeof(paper_table[0]); i++) {
+    // FIXME Perhaps allow unique prefix.
+    if (strcasecmp(s, paper_table[i].name) == 0)
+      return i;
+  }
+  return -1;
+}
+
+static void usage(FILE *stream);
+
+extern "C" int optopt, optind;
+
+int main(int argc, char **argv)
+{
+  setlocale(LC_NUMERIC, "C");
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, ":F:p:d:lvw:c:", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'l':
+      landscape_flag = 1;
+      break;
+    case ':':
+      if (optopt == 'd') {
+	fprintf(stderr, "duplex assumed to be long-side\n");
+	duplex_flag = 1;
+      } else
+	fprintf(stderr, "option -%c requires an operand\n", optopt);
+      fflush(stderr);
+      break;
+    case 'd':
+      if (!isdigit(*optarg))	// this ugly hack prevents -d without
+	optind--;		//  args from messing up the arg list
+      duplex_flag = atoi(optarg);
+      if (duplex_flag != 1 && duplex_flag != 2) {
+	fprintf(stderr, "odd value for duplex; assumed to be long-side\n");
+	duplex_flag = 1;
+      }
+      break;
+    case 'p':
+      {
+	int n = lookup_paper_size(optarg);
+	if (n < 0)
+	  error("unknown paper size `%1'", optarg);
+	else
+	  user_paper_size = n;
+	break;
+      }
+    case 'v':
+      {
+	printf("GNU grolj4 (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'c':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if (n == 0 && ptr == optarg)
+	  error("argument for -c must be a positive integer");
+	else if (n <= 0 || n > 32767)
+	  error("out of range argument for -c");
+	else
+	  ncopies = unsigned(n);
+	break;
+      }
+    case 'w':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if (n == 0 && ptr == optarg)
+	  error("argument for -w must be a non-negative integer");
+	else if (n < 0 || n > INT_MAX)
+	  error("out of range argument for -w");
+	else
+	  line_width_factor = int(n);
+	break;
+      }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  SET_BINARY(fileno(stdout));
+  if (optind >= argc)
+    do_file("-");
+  else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream,
+	  "usage: %s [-lv] [-d [n]] [-c n] [-p paper_size]\n"
+	  "       [-w n] [-F dir] [files ...]\n",
+	  program_name);
+}
diff --git a/contrib/groff/src/devices/grops/Makefile.sub b/contrib/groff/src/devices/grops/Makefile.sub
index ee2e6d1..e1595cb 100644
--- a/contrib/groff/src/devices/grops/Makefile.sub
+++ b/contrib/groff/src/devices/grops/Makefile.sub
@@ -6,7 +6,7 @@ OBJS=\
   ps.$(OBJEXT) \
   psrm.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/ps.cc \
-  $(srcdir)/psrm.cc
+  $(srcdir)/ps.cpp \
+  $(srcdir)/psrm.cpp
 HDRS=\
   $(srcdir)/ps.h
diff --git a/contrib/groff/src/devices/grops/TODO b/contrib/groff/src/devices/grops/TODO
index 7ab3b69..eab8f83 100644
--- a/contrib/groff/src/devices/grops/TODO
+++ b/contrib/groff/src/devices/grops/TODO
@@ -1,7 +1,5 @@
 Read PFB files directly.
 
-Generate %%DocumentMedia comment.
-
 Generate %%For comment.
 
 Generate %%Title comment.
diff --git a/contrib/groff/src/devices/grops/grops.man b/contrib/groff/src/devices/grops/grops.man
index e7d2305..e9f8f02 100644
--- a/contrib/groff/src/devices/grops/grops.man
+++ b/contrib/groff/src/devices/grops/grops.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -23,8 +23,18 @@ the original English.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
+..
+.
+.de TQ
+.  br
+.  ns
+.  TP \$1
+..
+.
+.de FT
+.  if '\\*(.T'ps' .ft \\$1
 ..
 .
 .
@@ -106,52 +116,56 @@ option.
 .SH OPTIONS
 .TP
 .BI \-b n
-Workaround broken spoolers and previewers.
+Provide workarounds for older printers, broken spoolers, and previewers.
 .
 Normally
 .B grops
-produces output that conforms
-the Document Structuring Conventions version 3.0.
+produces output at PostScript LanguageLevel\~2 that conforms to the
+Document Structuring Conventions version 3.0.
 .
-Unfortunately some spoolers and previewers can't handle such output.
+Some older printers, spoolers, and previewers can't handle such output.
 .
 The value of\~\c
 .I n
 controls what
 .B grops
-does to its output acceptable to such programs.
+does to make its output acceptable to such programs.
 .
 A value of\~0 will cause grops not to employ any workarounds.
 .
+.IP
 Add\~1 if no
-.B %%BeginDocumentSetup
+.B %%Begin\%Document\%Setup
 and
-.B %%EndDocumentSetup
+.B %%End\%Document\%Setup
 comments should be generated;
 this is needed for early versions of TranScript that get confused by
 anything between the
-.B %%EndProlog
+.B %%End\%Prolog
 comment and the first
 .B %%Page
 comment.
 .
+.IP
 Add\~2 if lines in included files beginning with
 .B %!
 should be stripped out; this is needed for Sun's pageview previewer.
 .
+.IP
 Add\~4 if
 .BR %%Page ,
 .BR %%Trailer
 and
-.B %%EndProlog
+.B %%End\%Prolog
 comments should be
 stripped out of included files; this is needed for spoolers that
 don't understand the
-.B %%BeginDocument
+.B %%Begin\%Document
 and
-.B %%EndDocument
+.B %%End\%Document
 comments.
 .
+.IP
 Add\~8 if the first line of the PostScript output should be
 .B %!PS-Adobe-2.0
 rather than
@@ -159,6 +173,18 @@ rather than
 this is needed when using Sun's Newsprint with a printer that requires
 page reversal.
 .
+.IP
+Add\~16 if no media size information should be included in the document
+(this is, neither use
+.B %%Document\%Media
+nor the
+.B setpagedevice
+PostScript command).
+.
+This was the behaviour of groff version 1.18.1 and earlier; it is needed
+for older printers which don't understand PostScript LanguageLevel\~2.
+.
+.IP
 The default value can be specified by a
 .
 .RS
@@ -211,15 +237,20 @@ Turn manual feed on for the document.
 Set physical dimension of output medium.
 .
 This overrides the
-.B papersize
+.BR papersize ,
+.BR paperlength ,
 and
-.B paperlength
+.B paperwidth
 commands in the
 .B DESC
 file; it accepts the same arguments as the
 .B papersize
 command.
 .
+See
+.B groff_font (@MAN5EXT@)
+for details.
+.
 .TP
 .BI \-P prologue-file
 Use the file
@@ -258,15 +289,11 @@ The fonts are grouped into families
 .BR H ,
 .BR HN ,
 .BR N ,
-.B P
+.BR P ,
 and\~\c
 .B T
 having members in each of these styles:
 .
-.de FT
-.if '\\*(.T'ps' .ft \\$1
-..
-.
 .RS
 .TP
 .B AR
@@ -274,187 +301,187 @@ having members in each of these styles:
 AvantGarde-Book
 .FT
 .
-.TP
+.TQ
 .B AI
 .FT AI
 AvantGarde-BookOblique
 .FT
 .
-.TP
+.TQ
 .B AB
 .FT AB
 AvantGarde-Demi
 .FT
 .
-.TP
+.TQ
 .B ABI
 .FT ABI
 AvantGarde-DemiOblique
 .FT
 .
-.TP
+.TQ
 .B BMR
 .FT BMR
 Bookman-Light
 .FT
 .
-.TP
+.TQ
 .B BMI
 .FT BMI
 Bookman-LightItalic
 .FT
 .
-.TP
+.TQ
 .B BMB
 .FT BMB
 Bookman-Demi
 .FT
 .
-.TP
+.TQ
 .B BMBI
 .FT BMBI
 Bookman-DemiItalic
 .FT
 .
-.TP
+.TQ
 .B CR
 .FT CR
 Courier
 .FT
 .
-.TP
+.TQ
 .B CI
 .FT CI
 Courier-Oblique
 .FT
 .
-.TP
+.TQ
 .B CB
 .FT CB
 Courier-Bold
 .FT
 .
-.TP
+.TQ
 .B CBI
 .FT CBI
 Courier-BoldOblique
 .FT
 .
-.TP
+.TQ
 .B HR
 .FT HR
 Helvetica
 .FT
 .
-.TP
+.TQ
 .B HI
 .FT HI
 Helvetica-Oblique
 .FT
 .
-.TP
+.TQ
 .B HB
 .FT HB
 Helvetica-Bold
 .FT
 .
-.TP
+.TQ
 .B HBI
 .FT HBI
 Helvetica-BoldOblique
 .FT
 .
-.TP
+.TQ
 .B HNR
 .FT HNR
 Helvetica-Narrow
 .FT
 .
-.TP
+.TQ
 .B HNI
 .FT HNI
 Helvetica-Narrow-Oblique
 .FT
 .
-.TP
+.TQ
 .B HNB
 .FT HNB
 Helvetica-Narrow-Bold
 .FT
 .
-.TP
+.TQ
 .B HNBI
 .FT HNBI
 Helvetica-Narrow-BoldOblique
 .FT
 .
-.TP
+.TQ
 .B NR
 .FT NR
 NewCenturySchlbk-Roman
 .FT
 .
-.TP
+.TQ
 .B NI
 .FT NI
 NewCenturySchlbk-Italic
 .FT
 .
-.TP
+.TQ
 .B NB
 .FT NB
 NewCenturySchlbk-Bold
 .FT
 .
-.TP
+.TQ
 .B NBI
 .FT NBI
 NewCenturySchlbk-BoldItalic
 .FT
 .
-.TP
+.TQ
 .B PR
 .FT PR
 Palatino-Roman
 .FT
 .
-.TP
+.TQ
 .B PI
 .FT PI
 Palatino-Italic
 .FT
 .
-.TP
+.TQ
 .B PB
 .FT PB
 Palatino-Bold
 .FT
 .
-.TP
+.TQ
 .B PBI
 .FT PBI
 Palatino-BoldItalic
 .FT
 .
-.TP
+.TQ
 .B TR
 .FT TR
 Times-Roman
 .FT
 .
-.TP
+.TQ
 .B TI
 .FT TI
 Times-Italic
 .FT
 .
-.TP
+.TQ
 .B TB
 .FT TB
 Times-Bold
 .FT
 .
-.TP
+.TQ
 .B TBI
 .FT TBI
 Times-BoldItalic
@@ -474,9 +501,10 @@ ZapfChancery-MediumItalic
 .
 .LP
 There are also some special fonts called
-.B SS
-and\~\c
-.BR S .
+.B S
+for the PS Symbol font, and
+.BR SS ,
+containing slanted lowercase Greek letters taken from PS Symbol.
 .
 Zapf Dingbats is available as
 .BR ZD
@@ -497,6 +525,10 @@ is used, for `cmy' and `cmyk'
 .BR setcmykcolor ,
 and for `gray'
 .BR setgray .
+Note that
+.B setcmykcolor
+is a PostScript LanguageLevel\~2 command and thus not available on some
+older printers.
 .
 .LP
 .B grops
@@ -686,70 +718,23 @@ arguments are not allowed to have attached scaling indicators.
 .
 If the PostScript file complies with the Adobe Document Structuring
 Conventions and contains a
-.B %%BoundingBox
+.B %%Bounding\%Box
 comment, then the bounding box can be automatically
 extracted from within groff by using the
 .B psbb
 request.
 .
-.RS
-.LP
-The
-.B \-mps
-macros (which are automatically loaded when
-.B grops
-is run by the groff command) include a
-.B PSPIC
-macro which allows a picture to be easily imported.
-.
-This has the format
 .IP
-\&\fB.PSPIC\fP [\fB\-L\fP|\fB-R\fP|\fB\-I\fP \fIn\fP]\ \fI\|file\fP [\fIwidth\fP [\fIheight\fP]]
-.
-.LP
-.I file
-is the name of the file containing the illustration;
-.I width
-and
-.I height
-give the desired width and height of the graphic.
-.
-The
-.I width
-and
-.I height
-arguments may have scaling indicators attached;
-the default scaling indicator is\~\c
-.BR i .
-.
-This macro will scale the graphic uniformly
-in the x and y\~directions so that it is no more than
-.I width
-wide
-and
-.I height
-high.
-.
-By default, the graphic will be horizontally centered.
-.
-The
-.BI \-L
-and
-.BI \-R
-cause the graphic to be left-aligned and right-aligned
-respectively.
-.
-The
-.B \-I
-option causes the graphic to be indented by\~\c
-.IR n .
-.RE
+See
+.BR groff_tmac (@MAN5EXT@)
+for a description of the
+.B PSPIC
+macro which provides a convenient high-level interface for inclusion of
+PostScript graphics.
 .
 .TP
 .B \[rs]X'ps:\ invis'
-.br
-.ns
-.TP
+.TQ
 .B \[rs]X'ps:\ endinvis'
 No output will be generated for text and drawing commands
 that are bracketed with these
@@ -796,7 +781,12 @@ whereas
 will print the
 .B \[rs](em
 character
-and ignore the line.
+and ignore the line (this code is already in file
+.B Xps.tmac
+which will be loaded if a documented intended for
+.B grops
+is previewed with
+.BR gxditview ).
 .RE
 .
 .LP
@@ -808,7 +798,8 @@ must be in the format output by
 This is described in
 .BR groff_out (@MAN5EXT@).
 .
-In addition the device and font description files for the device used
+.LP
+In addition, the device and font description files for the device used
 must meet certain requirements.
 .
 The device and font description files supplied for
@@ -825,25 +816,12 @@ The
 .B ps
 device uses a resolution of 72000 and a sizescale of 1000.
 .
-The device description file should contain a command
-.IP
-.BI paperlength\  n
 .LP
-which says that output should be generated which is suitable for
-printing on a page whose length is
-.IR n \~\c
-machine units.
-.
-Common values are 792000 for letter paper and 841890 for paper in A4 format.
-.
-Alternatively, it can contain
-.IP
-.BI papersize\  string
-.LP
-to specify a paper size; see
+The device description file must contain a valid paper size; see
 .BR groff_font (@MAN5EXT@)
 for more information.
 .
+.LP
 Each font description file must contain a command
 .IP
 .BI internalname\  psname
@@ -868,7 +846,8 @@ where
 is the PostScript name of the character,
 and
 .I code
-is its position in the encoding expressed as a decimal integer.
+is its position in the encoding expressed as a decimal integer; valid
+values are in the range 0 to\~255.
 .
 Lines starting with
 .B #
@@ -897,10 +876,24 @@ it can make use of such a character to generate more efficient and
 compact PostScript output.
 .
 .LP
+Note that
+.B grops
+is able to display all glyphs in a PostScript font, not only 256.
+.I enc_file
+(or the default encoding if no encoding file specified) just defines the
+order of glyphs for the first 256 characters; all other glyphs are
+accessed with additional encoding vectors which
+.B grops
+produces on the fly.
+.
+.LP
 .B grops
 can automatically include the downloadable fonts necessary
 to print the document.
-.
+Such fonts must be in PFA format.
+Use
+.BR pfbtops (@MAN1EXT@)
+to convert a Type\~1 font in PFB format.
 Any downloadable fonts which should, when required, be included by
 .B grops
 must be listed in the file
@@ -951,7 +944,7 @@ and also a downloadable font called Garamond-Outline
 which depends on Garamond
 (typically it would be defined to copy Garamond's font dictionary,
 and change the PaintType),
-then it is necessary for Garamond to be appear before Garamond-Outline
+then it is necessary for Garamond to appear before Garamond-Outline
 in the PostScript document.
 .
 .B grops
@@ -981,30 +974,30 @@ in the
 file.
 .
 A downloadable font should not include its own name in a
-.B %%DocumentSuppliedResources
+.B %%Document\%Supplied\%Resources
 comment.
 .
 .LP
 .B grops
 will not interpret 
-.B %%DocumentFonts
+.B %%Document\%Fonts
 comments.
 .
 The
-.BR %%DocumentNeededResources ,
-.BR %%DocumentSuppliedResources ,
-.BR %%IncludeResource ,
-.BR %%BeginResource
+.BR %%Document\%Needed\%Resources ,
+.BR %%Document\%Supplied\%Resources ,
+.BR %%Include\%Resource ,
+.BR %%Begin\%Resource ,
 and
-.BR %%EndResource
+.BR %%End\%Resource
 comments
 (or possibly the old
-.BR %%DocumentNeededFonts ,
-.BR %%DocumentSuppliedFonts ,
-.BR %%IncludeFont ,
-.BR %%BeginFont
+.BR %%Document\%Needed\%Fonts ,
+.BR %%Document\%Supplied\%Fonts ,
+.BR %%Include\%Font ,
+.BR %%Begin\%Font ,
 and
-.BR %%EndFont
+.BR %%End\%Font
 comments)
 should be used.
 .
@@ -1104,10 +1097,11 @@ Temporary file.
 .BR afmtodit (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
-.BR psbb (@MAN1EXT@),
+.BR pfbtops (@MAN1EXT@),
 .BR groff_out (@MAN5EXT@),
 .BR groff_font (@MAN5EXT@),
-.BR groff_char (@MAN7EXT@)
+.BR groff_char (@MAN7EXT@),
+.BR groff_tmac (@MAN5EXT@)
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/contrib/groff/src/devices/grops/ps.cpp b/contrib/groff/src/devices/grops/ps.cpp
new file mode 100644
index 0000000..f1c094b
--- /dev/null
+++ b/contrib/groff/src/devices/grops/ps.cpp
@@ -0,0 +1,1869 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/*
+ * PostScript documentation:
+ *   http://www.adobe.com/products/postscript/pdfs/PLRM.pdf
+ *   http://partners.adobe.com/asn/developer/pdfs/tn/5001.DSC_Spec.pdf
+ */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "nonposix.h"
+#include "paper.h"
+
+#include "ps.h"
+#include <time.h>
+
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
+extern "C" const char *Version_string;
+
+static int landscape_flag = 0;
+static int manual_feed_flag = 0;
+static int ncopies = 1;
+static int linewidth = -1;
+// Non-zero means generate PostScript code that guesses the paper
+// length using the imageable area.
+static int guess_flag = 0;
+static double user_paper_length = 0;
+static double user_paper_width = 0;
+
+// Non-zero if -b was specified on the command line.
+static int bflag = 0;
+unsigned broken_flags = 0;
+
+// Non-zero means we need the CMYK extension for PostScript Level 1
+static int cmyk_flag = 0;
+
+#define DEFAULT_LINEWIDTH 40	/* in ems/1000 */
+#define MAX_LINE_LENGTH 72
+#define FILL_MAX 1000
+
+const char *const dict_name = "grops";
+const char *const defs_dict_name = "DEFS";
+const int DEFS_DICT_SPARE = 50;
+
+double degrees(double r)
+{
+  return r*180.0/PI;
+}
+
+double radians(double d)
+{
+  return d*PI/180.0;
+}
+
+// This is used for testing whether a character should be output in the
+// PostScript file using \nnn, so we really want the character to be
+// less than 0200.
+
+inline int is_ascii(char c)
+{
+  return (unsigned char)c < 0200;
+}
+
+ps_output::ps_output(FILE *f, int n)
+: fp(f), col(0), max_line_length(n), need_space(0), fixed_point(0)
+{
+}
+
+ps_output &ps_output::set_file(FILE *f)
+{
+  fp = f;
+  col = 0;
+  return *this;
+}
+
+ps_output &ps_output::copy_file(FILE *infp)
+{
+  int c;
+  while ((c = getc(infp)) != EOF)
+    putc(c, fp);
+  return *this;
+}
+
+ps_output &ps_output::end_line()
+{
+  if (col != 0) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  return *this;
+}
+
+ps_output &ps_output::special(const char *s)
+{
+  if (s == 0 || *s == '\0')
+    return *this;
+  if (col != 0) {
+    putc('\n', fp);
+    col = 0;
+  }
+  fputs(s, fp);
+  if (strchr(s, '\0')[-1] != '\n')
+    putc('\n', fp);
+  need_space = 0;
+  return *this;
+}
+
+ps_output &ps_output::simple_comment(const char *s)
+{
+  if (col != 0)
+    putc('\n', fp);
+  putc('%', fp);
+  putc('%', fp);
+  fputs(s, fp);
+  putc('\n', fp);
+  col = 0;
+  need_space = 0;
+  return *this;
+}
+
+ps_output &ps_output::begin_comment(const char *s)
+{
+  if (col != 0)
+    putc('\n', fp);
+  putc('%', fp);
+  putc('%', fp);
+  fputs(s, fp);
+  col = 2 + strlen(s);
+  return *this;
+}
+
+ps_output &ps_output::end_comment()
+{
+  if (col != 0) {
+    putc('\n', fp);
+    col = 0;
+  }
+  need_space = 0;
+  return *this;
+}
+
+ps_output &ps_output::comment_arg(const char *s)
+{
+  int len = strlen(s);
+  if (col + len + 1 > max_line_length) {
+    putc('\n', fp);
+    fputs("%%+", fp);
+    col = 3;
+  }
+  putc(' ',  fp);
+  fputs(s, fp);
+  col += len + 1;
+  return *this;
+}
+
+ps_output &ps_output::set_fixed_point(int n)
+{
+  assert(n >= 0 && n <= 10);
+  fixed_point = n;
+  return *this;
+}
+
+ps_output &ps_output::put_delimiter(char c)
+{
+  if (col + 1 > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+  }
+  putc(c, fp);
+  col++;
+  need_space = 0;
+  return *this;
+}
+
+ps_output &ps_output::put_string(const char *s, int n)
+{
+  int len = 0;
+  int i;
+  for (i = 0; i < n; i++) {
+    char c = s[i];
+    if (is_ascii(c) && csprint(c)) {
+      if (c == '(' || c == ')' || c == '\\')
+	len += 2;
+      else
+	len += 1;
+    }
+    else
+      len += 4;
+  }
+  if (len > n*2) {
+    if (col + n*2 + 2 > max_line_length && n*2 + 2 <= max_line_length) {
+      putc('\n', fp);
+      col = 0;
+    }
+    if (col + 1 > max_line_length) {
+      putc('\n', fp);
+      col = 0;
+    }
+    putc('<', fp);
+    col++;
+    for (i = 0; i < n; i++) {
+      if (col + 2 > max_line_length) {
+	putc('\n', fp);
+	col = 0;
+      }
+      fprintf(fp, "%02x", s[i] & 0377);
+      col += 2;
+    }
+    putc('>', fp);
+    col++;
+  }
+  else {
+    if (col + len + 2 > max_line_length && len + 2 <= max_line_length) {
+      putc('\n', fp);
+      col = 0;
+    }
+    if (col + 2 > max_line_length) {
+      putc('\n', fp);
+      col = 0;
+    }
+    putc('(', fp);
+    col++;
+    for (i = 0; i < n; i++) {
+      char c = s[i];
+      if (is_ascii(c) && csprint(c)) {
+	if (c == '(' || c == ')' || c == '\\')
+	  len = 2;
+	else
+	  len = 1;
+      }
+      else
+	len = 4;
+      if (col + len + 1 > max_line_length) {
+	putc('\\', fp);
+	putc('\n', fp);
+	col = 0;
+      }
+      switch (len) {
+      case 1:
+	putc(c, fp);
+	break;
+      case 2:
+	putc('\\', fp);
+	putc(c, fp);
+	break;
+      case 4:
+	fprintf(fp, "\\%03o", c & 0377);
+	break;
+      default:
+	assert(0);
+      }
+      col += len;
+    }
+    putc(')', fp);
+    col++;
+  }
+  need_space = 0;
+  return *this;
+}
+
+ps_output &ps_output::put_number(int n)
+{
+  char buf[1 + INT_DIGITS + 1];
+  sprintf(buf, "%d", n);
+  int len = strlen(buf);
+  if (col > 0 && col + len + need_space > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  if (need_space) {
+    putc(' ', fp);
+    col++;
+  }
+  fputs(buf, fp);
+  col += len;
+  need_space = 1;
+  return *this;
+}
+
+ps_output &ps_output::put_fix_number(int i)
+{
+  const char *p = if_to_a(i, fixed_point);
+  int len = strlen(p);
+  if (col > 0 && col + len + need_space > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  if (need_space) {
+    putc(' ', fp);
+    col++;
+  }
+  fputs(p, fp);
+  col += len;
+  need_space = 1;
+  return *this;
+}
+
+ps_output &ps_output::put_float(double d)
+{
+  char buf[128];
+  sprintf(buf, "%.3g", d);
+  int len = strlen(buf);
+  if (col > 0 && col + len + need_space > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  if (need_space) {
+    putc(' ', fp);
+    col++;
+  }
+  fputs(buf, fp);
+  col += len;
+  need_space = 1;
+  return *this;
+}
+
+ps_output &ps_output::put_symbol(const char *s)
+{
+  int len = strlen(s);
+  if (col > 0 && col + len + need_space > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  if (need_space) {
+    putc(' ', fp);
+    col++;
+  }
+  fputs(s, fp);
+  col += len;
+  need_space = 1;
+  return *this;
+}
+
+ps_output &ps_output::put_color(unsigned int c)
+{
+  char buf[128];
+  sprintf(buf, "%.3g", double(c) / color::MAX_COLOR_VAL);
+  int len = strlen(buf);
+  if (col > 0 && col + len + need_space > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+    need_space = 0;
+  }
+  if (need_space) {
+    putc(' ', fp);
+    col++;
+  }
+  fputs(buf, fp);
+  col += len;
+  need_space = 1;
+  return *this;
+}
+
+ps_output &ps_output::put_literal_symbol(const char *s)
+{
+  int len = strlen(s);
+  if (col > 0 && col + len + 1 > max_line_length) {
+    putc('\n', fp);
+    col = 0;
+  }
+  putc('/', fp);
+  fputs(s, fp);
+  col += len + 1;
+  need_space = 1;
+  return *this;
+}
+
+class ps_font : public font {
+  ps_font(const char *);
+public:
+  int encoding_index;
+  char *encoding;
+  char *reencoded_name;
+  ~ps_font();
+  void handle_unknown_font_command(const char *command, const char *arg,
+				   const char *filename, int lineno);
+  static ps_font *load_ps_font(const char *);
+};
+
+ps_font *ps_font::load_ps_font(const char *s)
+{
+  ps_font *f = new ps_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+ps_font::ps_font(const char *nm)
+: font(nm), encoding_index(-1), encoding(0), reencoded_name(0)
+{
+}
+
+ps_font::~ps_font()
+{
+  a_delete encoding;
+  a_delete reencoded_name;
+}
+
+void ps_font::handle_unknown_font_command(const char *command, const char *arg,
+					  const char *filename, int lineno)
+{
+  if (strcmp(command, "encoding") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`encoding' command requires an argument");
+    else
+      encoding = strsave(arg);
+  }
+}
+
+static void handle_unknown_desc_command(const char *command, const char *arg,
+					const char *filename, int lineno)
+{
+  if (strcmp(command, "broken") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`broken' command requires an argument");
+    else if (!bflag)
+      broken_flags = atoi(arg);
+  }
+}
+
+struct subencoding {
+  font *p;
+  unsigned int num;
+  int idx;
+  char *subfont;
+  const char *glyphs[256];
+  subencoding *next;
+
+  subencoding(font *, unsigned int, int, subencoding *);
+  ~subencoding();
+};
+
+subencoding::subencoding(font *f, unsigned int n, int ix, subencoding *s)
+: p(f), num(n), idx(ix), subfont(0), next(s)
+{
+  for (int i = 0; i < 256; i++)
+    glyphs[i] = 0;
+}
+
+subencoding::~subencoding()
+{
+  a_delete subfont;
+}
+
+struct style {
+  font *f;
+  subencoding *sub;
+  int point_size;
+  int height;
+  int slant;
+  style();
+  style(font *, subencoding *, int, int, int);
+  int operator==(const style &) const;
+  int operator!=(const style &) const;
+};
+
+style::style() : f(0)
+{
+}
+
+style::style(font *p, subencoding *s, int sz, int h, int sl)
+: f(p), sub(s), point_size(sz), height(h), slant(sl)
+{
+}
+
+int style::operator==(const style &s) const
+{
+  return (f == s.f
+	  && sub == s.sub
+	  && point_size == s.point_size
+	  && height == s.height
+	  && slant == s.slant);
+}
+
+int style::operator!=(const style &s) const
+{
+  return !(*this == s);
+}
+
+class ps_printer : public printer {
+  FILE *tempfp;
+  ps_output out;
+  int res;
+  int space_char_index;
+  int pages_output;
+  int paper_length;
+  int equalise_spaces;
+  enum { SBUF_SIZE = 256 };
+  char sbuf[SBUF_SIZE];
+  int sbuf_len;
+  int sbuf_start_hpos;
+  int sbuf_vpos;
+  int sbuf_end_hpos;
+  int sbuf_space_width;
+  int sbuf_space_count;
+  int sbuf_space_diff_count;
+  int sbuf_space_code;
+  int sbuf_kern;
+  style sbuf_style;
+  color sbuf_color;		// the current PS color
+  style output_style;
+  subencoding *subencodings;
+  int output_hpos;
+  int output_vpos;
+  int output_draw_point_size;
+  int line_thickness;
+  int output_line_thickness;
+  unsigned char output_space_code;
+  enum { MAX_DEFINED_STYLES = 50 };
+  style defined_styles[MAX_DEFINED_STYLES];
+  int ndefined_styles;
+  int next_encoding_index;
+  int next_subencoding_index;
+  string defs;
+  int ndefs;
+  resource_manager rm;
+  int invis_count;
+
+  void flush_sbuf();
+  void set_style(const style &);
+  void set_space_code(unsigned char c);
+  int set_encoding_index(ps_font *);
+  subencoding *set_subencoding(font *, int, unsigned char *);
+  char *get_subfont(subencoding *, const char *);
+  void do_exec(char *, const environment *);
+  void do_import(char *, const environment *);
+  void do_def(char *, const environment *);
+  void do_mdef(char *, const environment *);
+  void do_file(char *, const environment *);
+  void do_invis(char *, const environment *);
+  void do_endinvis(char *, const environment *);
+  void set_line_thickness_and_color(const environment *);
+  void fill_path(const environment *);
+  void encode_fonts();
+  void encode_subfont(subencoding *);
+  void define_encoding(const char *, int);
+  void reencode_font(ps_font *);
+  void set_color(color *c, int fill = 0);
+
+  const char *media_name();
+  int media_width();
+  int media_height();
+  void media_set();
+
+public:
+  ps_printer(double);
+  ~ps_printer();
+  void set_char(int i, font *f, const environment *env, int w,
+		const char *name);
+  void draw(int code, int *p, int np, const environment *env);
+  void begin_page(int);
+  void end_page(int);
+  void special(char *arg, const environment *env, char type);
+  font *make_font(const char *);
+  void end_of_line();
+};
+
+// `pl' is in inches
+ps_printer::ps_printer(double pl)
+: out(0, MAX_LINE_LENGTH),
+  pages_output(0),
+  sbuf_len(0),
+  subencodings(0),
+  output_hpos(-1),
+  output_vpos(-1),
+  line_thickness(-1),
+  ndefined_styles(0),
+  next_encoding_index(0),
+  next_subencoding_index(0),
+  ndefs(0),
+  invis_count(0)
+{
+  tempfp = xtmpfile();
+  out.set_file(tempfp);
+  if (linewidth < 0)
+    linewidth = DEFAULT_LINEWIDTH;
+  if (font::hor != 1)
+    fatal("horizontal resolution must be 1");
+  if (font::vert != 1)
+    fatal("vertical resolution must be 1");
+  if (font::res % (font::sizescale*72) != 0)
+    fatal("res must be a multiple of 72*sizescale");
+  int r = font::res;
+  int point = 0;
+  while (r % 10 == 0) {
+    r /= 10;
+    point++;
+  }
+  res = r;
+  out.set_fixed_point(point);
+  space_char_index = font::name_to_index("space");
+  if (pl == 0)
+    paper_length = font::paperlength;
+  else
+    paper_length = int(pl * font::res + 0.5);
+  if (paper_length == 0)
+    paper_length = 11 * font::res;
+  equalise_spaces = font::res >= 72000;
+}
+
+int ps_printer::set_encoding_index(ps_font *f)
+{
+  if (f->encoding_index >= 0)
+    return f->encoding_index;
+  for (font_pointer_list *p = font_list; p; p = p->next)
+    if (p->p != f) {
+      char *encoding = ((ps_font *)p->p)->encoding;
+      int encoding_index = ((ps_font *)p->p)->encoding_index;
+      if (encoding != 0 && encoding_index >= 0 
+	  && strcmp(f->encoding, encoding) == 0) {
+	return f->encoding_index = encoding_index;
+      }
+    }
+  return f->encoding_index = next_encoding_index++;
+}
+
+subencoding *ps_printer::set_subencoding(font *f, int i, unsigned char *codep)
+{
+  unsigned int idx = f->get_code(i);
+  *codep = idx % 256;
+  unsigned int num = idx >> 8;
+  if (num == 0)
+    return 0;
+  subencoding *p = 0;
+  for (p = subencodings; p; p = p->next)
+    if (p->p == f && p->num == num)
+      break;
+  if (p == 0)
+    p = subencodings = new subencoding(f, num, next_subencoding_index++,
+				       subencodings);
+  p->glyphs[*codep] = f->get_special_device_encoding(i);
+  return p;
+}
+
+char *ps_printer::get_subfont(subencoding *sub, const char *stem)
+{
+  assert(sub != 0);
+  if (!sub->subfont) {
+    char *tem = new char[strlen(stem) + 2 + INT_DIGITS + 1];
+    sprintf(tem, "%s@@%d", stem, next_subencoding_index);
+    sub->subfont = tem;
+  }
+  return sub->subfont;
+}
+
+void ps_printer::set_char(int i, font *f, const environment *env, int w,
+			  const char *)
+{
+  if (i == space_char_index || invis_count > 0)
+    return;
+  unsigned char code;
+  subencoding *sub = set_subencoding(f, i, &code);
+  style sty(f, sub, env->size, env->height, env->slant);
+  if (sty.slant != 0) {
+    if (sty.slant > 80 || sty.slant < -80) {
+      error("silly slant `%1' degrees", sty.slant);
+      sty.slant = 0;
+    }
+  }
+  if (sbuf_len > 0) {
+    if (sbuf_len < SBUF_SIZE
+	&& sty == sbuf_style
+	&& sbuf_vpos == env->vpos
+	&& sbuf_color == *env->col) {
+      if (sbuf_end_hpos == env->hpos) {
+	sbuf[sbuf_len++] = code;
+	sbuf_end_hpos += w + sbuf_kern;
+	return;
+      }
+      if (sbuf_len == 1 && sbuf_kern == 0) {
+	sbuf_kern = env->hpos - sbuf_end_hpos;
+	sbuf_end_hpos = env->hpos + sbuf_kern + w;
+	sbuf[sbuf_len++] = code;
+	return;
+      }
+      /* If sbuf_end_hpos - sbuf_kern == env->hpos, we are better off
+	 starting a new string. */
+      if (sbuf_len < SBUF_SIZE - 1 && env->hpos >= sbuf_end_hpos
+	  && (sbuf_kern == 0 || sbuf_end_hpos - sbuf_kern != env->hpos)) {
+	if (sbuf_space_code < 0) {
+	  if (f->contains(space_char_index)) {
+	    sbuf_space_code = f->get_code(space_char_index);
+	    sbuf_space_width = env->hpos - sbuf_end_hpos;
+	    sbuf_end_hpos = env->hpos + w + sbuf_kern;
+	    sbuf[sbuf_len++] = sbuf_space_code;
+	    sbuf[sbuf_len++] = code;
+	    sbuf_space_count++;
+	    return;
+	  }
+	}
+	else {
+	  int diff = env->hpos - sbuf_end_hpos - sbuf_space_width;
+	  if (diff == 0 || (equalise_spaces && (diff == 1 || diff == -1))) {
+	    sbuf_end_hpos = env->hpos + w + sbuf_kern;
+	    sbuf[sbuf_len++] = sbuf_space_code;
+	    sbuf[sbuf_len++] = code;
+	    sbuf_space_count++;
+	    if (diff == 1)
+	      sbuf_space_diff_count++;
+	    else if (diff == -1)
+	      sbuf_space_diff_count--;
+	    return;
+	  }
+	}
+      }
+    }
+    flush_sbuf();
+  }
+  sbuf_len = 1;
+  sbuf[0] = code;
+  sbuf_end_hpos = env->hpos + w;
+  sbuf_start_hpos = env->hpos;
+  sbuf_vpos = env->vpos;
+  sbuf_style = sty;
+  sbuf_space_code = -1;
+  sbuf_space_width = 0;
+  sbuf_space_count = sbuf_space_diff_count = 0;
+  sbuf_kern = 0;
+  if (sbuf_color != *env->col)
+    set_color(env->col);
+}
+
+static char *make_encoding_name(int encoding_index)
+{
+  static char buf[3 + INT_DIGITS + 1];
+  sprintf(buf, "ENC%d", encoding_index);
+  return buf;
+}
+
+static char *make_subencoding_name(int subencoding_index)
+{
+  static char buf[6 + INT_DIGITS + 1];
+  sprintf(buf, "SUBENC%d", subencoding_index);
+  return buf;
+}
+
+const char *const WS = " \t\n\r";
+
+void ps_printer::define_encoding(const char *encoding, int encoding_index)
+{
+  char *vec[256];
+  int i;
+  for (i = 0; i < 256; i++)
+    vec[i] = 0;
+  char *path;
+  FILE *fp = font::open_file(encoding, &path);
+  if (fp == 0)
+    fatal("can't open encoding file `%1'", encoding);
+  int lineno = 1;
+  const int BUFFER_SIZE = 512;
+  char buf[BUFFER_SIZE];
+  while (fgets(buf, BUFFER_SIZE, fp) != 0) {
+    char *p = buf;
+    while (csspace(*p))
+      p++;
+    if (*p != '#' && *p != '\0' && (p = strtok(buf, WS)) != 0) {
+      char *q = strtok(0, WS);
+      int n;
+      if (q == 0 || sscanf(q, "%d", &n) != 1 || n < 0 || n >= 256)
+	fatal_with_file_and_line(path, lineno, "bad second field");
+      vec[n] = new char[strlen(p) + 1];
+      strcpy(vec[n], p);
+    }
+    lineno++;
+  }
+  a_delete path;
+  out.put_literal_symbol(make_encoding_name(encoding_index))
+     .put_delimiter('[');
+  for (i = 0; i < 256; i++) {
+    if (vec[i] == 0)
+      out.put_literal_symbol(".notdef");
+    else {
+      out.put_literal_symbol(vec[i]);
+      a_delete vec[i];
+    }
+  }
+  out.put_delimiter(']')
+     .put_symbol("def");
+  fclose(fp);
+}
+
+void ps_printer::reencode_font(ps_font *f)
+{
+  out.put_literal_symbol(f->reencoded_name)
+     .put_symbol(make_encoding_name(f->encoding_index))
+     .put_literal_symbol(f->get_internal_name())
+     .put_symbol("RE");
+}
+
+void ps_printer::encode_fonts()
+{
+  if (next_encoding_index == 0)
+    return;
+  char *done_encoding = new char[next_encoding_index];
+  for (int i = 0; i < next_encoding_index; i++)
+    done_encoding[i] = 0;
+  for (font_pointer_list *f = font_list; f; f = f->next) {
+    int encoding_index = ((ps_font *)f->p)->encoding_index;
+    if (encoding_index >= 0) {
+      assert(encoding_index < next_encoding_index);
+      if (!done_encoding[encoding_index]) {
+	done_encoding[encoding_index] = 1;
+	define_encoding(((ps_font *)f->p)->encoding, encoding_index);
+      }
+      reencode_font((ps_font *)f->p);
+    }
+  }
+  a_delete done_encoding;
+}
+
+void ps_printer::encode_subfont(subencoding *sub)
+{
+  assert(sub->glyphs != 0);
+  out.put_literal_symbol(make_subencoding_name(sub->idx))
+     .put_delimiter('[');
+  for (int i = 0; i < 256; i++)
+  {
+    if (sub->glyphs[i])
+      out.put_literal_symbol(sub->glyphs[i]);
+    else
+      out.put_literal_symbol(".notdef");
+  }
+  out.put_delimiter(']')
+     .put_symbol("def");
+}
+
+void ps_printer::set_style(const style &sty)
+{
+  char buf[1 + INT_DIGITS + 1];
+  for (int i = 0; i < ndefined_styles; i++)
+    if (sty == defined_styles[i]) {
+      sprintf(buf, "F%d", i);
+      out.put_symbol(buf);
+      return;
+    }
+  if (ndefined_styles >= MAX_DEFINED_STYLES)
+    ndefined_styles = 0;
+  sprintf(buf, "F%d", ndefined_styles);
+  out.put_literal_symbol(buf);
+  const char *psname = sty.f->get_internal_name();
+  if (psname == 0)
+    fatal("no internalname specified for font `%1'", sty.f->get_name());
+  char *encoding = ((ps_font *)sty.f)->encoding;
+  if (sty.sub == 0) {
+    if (encoding != 0) {
+      char *s = ((ps_font *)sty.f)->reencoded_name;
+      if (s == 0) {
+	int ei = set_encoding_index((ps_font *)sty.f);
+	char *tem = new char[strlen(psname) + 1 + INT_DIGITS + 1];
+	sprintf(tem, "%s@%d", psname, ei);
+	psname = tem;
+	((ps_font *)sty.f)->reencoded_name = tem;
+      }
+      else
+        psname = s;
+    }
+  }
+  else
+    psname = get_subfont(sty.sub, psname);
+  out.put_fix_number((font::res/(72*font::sizescale))*sty.point_size);
+  if (sty.height != 0 || sty.slant != 0) {
+    int h = sty.height == 0 ? sty.point_size : sty.height;
+    h *= font::res/(72*font::sizescale);
+    int c = int(h*tan(radians(sty.slant)) + .5);
+    out.put_fix_number(c)
+       .put_fix_number(h)
+       .put_literal_symbol(psname)
+       .put_symbol("MF");
+  }
+  else {
+    out.put_literal_symbol(psname)
+       .put_symbol("SF");
+  }
+  defined_styles[ndefined_styles++] = sty;
+}
+
+void ps_printer::set_color(color *col, int fill)
+{
+  sbuf_color = *col;
+  unsigned int components[4];
+  char s[3];
+  color_scheme cs = col->get_components(components);
+  s[0] = fill ? 'F' : 'C';
+  s[2] = 0;
+  switch (cs) {
+  case DEFAULT:			// black
+    out.put_symbol("0");
+    s[1] = 'g';
+    break;
+  case RGB:
+    out.put_color(Red)
+       .put_color(Green)
+       .put_color(Blue);
+    s[1] = 'r';
+    break;
+  case CMY:
+    col->get_cmyk(&Cyan, &Magenta, &Yellow, &Black);
+    // fall through
+  case CMYK:
+    out.put_color(Cyan)
+       .put_color(Magenta)
+       .put_color(Yellow)
+       .put_color(Black);
+    s[1] = 'k';
+    cmyk_flag = 1;
+    break;
+  case GRAY:
+    out.put_color(Gray);
+    s[1] = 'g';
+    break;
+  }
+  out.put_symbol(s);
+}
+
+void ps_printer::set_space_code(unsigned char c)
+{
+  out.put_literal_symbol("SC")
+     .put_number(c)
+     .put_symbol("def");
+}
+
+void ps_printer::end_of_line()
+{
+  flush_sbuf();
+  // this ensures that we do an absolute motion to the beginning of a line
+  output_vpos = output_hpos = -1;
+}
+
+void ps_printer::flush_sbuf()
+{
+  enum {
+    NONE,
+    RELATIVE_H,
+    RELATIVE_V,
+    RELATIVE_HV,
+    ABSOLUTE
+    } motion = NONE;
+  int space_flag = 0;
+  if (sbuf_len == 0)
+    return;
+  if (output_style != sbuf_style) {
+    set_style(sbuf_style);
+    output_style = sbuf_style;
+  }
+  int extra_space = 0;
+  if (output_hpos < 0 || output_vpos < 0)
+    motion = ABSOLUTE;
+  else {
+    if (output_hpos != sbuf_start_hpos)
+      motion = RELATIVE_H;
+    if (output_vpos != sbuf_vpos) {
+      if  (motion != NONE)
+	motion = RELATIVE_HV;
+      else
+	motion = RELATIVE_V;
+    }
+  }
+  if (sbuf_space_code >= 0) {
+    int w = sbuf_style.f->get_width(space_char_index, sbuf_style.point_size);
+    if (w + sbuf_kern != sbuf_space_width) {
+      if (sbuf_space_code != output_space_code) {
+	set_space_code(sbuf_space_code);
+	output_space_code = sbuf_space_code;
+      }
+      space_flag = 1;
+      extra_space = sbuf_space_width - w - sbuf_kern;
+      if (sbuf_space_diff_count > sbuf_space_count/2)
+	extra_space++;
+      else if (sbuf_space_diff_count < -(sbuf_space_count/2))
+	extra_space--;
+    }
+  }
+  if (space_flag)
+    out.put_fix_number(extra_space);
+  if (sbuf_kern != 0)
+    out.put_fix_number(sbuf_kern);
+  out.put_string(sbuf, sbuf_len);
+  char command_array[] = {'A', 'B', 'C', 'D',
+			  'E', 'F', 'G', 'H',
+			  'I', 'J', 'K', 'L',
+			  'M', 'N', 'O', 'P',
+			  'Q', 'R', 'S', 'T'};
+  char sym[2];
+  sym[0] = command_array[motion*4 + space_flag + 2*(sbuf_kern != 0)];
+  sym[1] = '\0';
+  switch (motion) {
+  case NONE:
+    break;
+  case ABSOLUTE:
+    out.put_fix_number(sbuf_start_hpos)
+       .put_fix_number(sbuf_vpos);
+    break;
+  case RELATIVE_H:
+    out.put_fix_number(sbuf_start_hpos - output_hpos);
+    break;
+  case RELATIVE_V:
+    out.put_fix_number(sbuf_vpos - output_vpos);
+    break;
+  case RELATIVE_HV:
+    out.put_fix_number(sbuf_start_hpos - output_hpos)
+       .put_fix_number(sbuf_vpos - output_vpos);
+    break;
+  default:
+    assert(0);
+  }
+  out.put_symbol(sym);
+  output_hpos = sbuf_end_hpos;
+  output_vpos = sbuf_vpos;
+  sbuf_len = 0;
+}
+
+void ps_printer::set_line_thickness_and_color(const environment *env)
+{
+  if (line_thickness < 0) {
+    if (output_draw_point_size != env->size) {
+      // we ought to check for overflow here
+      int lw = ((font::res/(72*font::sizescale))*linewidth*env->size)/1000;
+      out.put_fix_number(lw)
+	 .put_symbol("LW");
+      output_draw_point_size = env->size;
+      output_line_thickness = -1;
+    }
+  }
+  else {
+    if (output_line_thickness != line_thickness) {
+      out.put_fix_number(line_thickness)
+	 .put_symbol("LW");
+      output_line_thickness = line_thickness;
+      output_draw_point_size = -1;
+    }
+  }
+  if (sbuf_color != *env->col)
+    set_color(env->col);
+}
+
+void ps_printer::fill_path(const environment *env)
+{
+  if (sbuf_color == *env->fill)
+    out.put_symbol("FL");
+  else
+    set_color(env->fill, 1);
+}
+
+void ps_printer::draw(int code, int *p, int np, const environment *env)
+{
+  if (invis_count > 0)
+    return;
+  flush_sbuf();
+  int fill_flag = 0;
+  switch (code) {
+  case 'C':
+    fill_flag = 1;
+    // fall through
+  case 'c':
+    // troff adds an extra argument to C
+    if (np != 1 && !(code == 'C' && np == 2)) {
+      error("1 argument required for circle");
+      break;
+    }
+    out.put_fix_number(env->hpos + p[0]/2)
+       .put_fix_number(env->vpos)
+       .put_fix_number(p[0]/2)
+       .put_symbol("DC");
+    if (fill_flag)
+      fill_path(env);
+    else {
+      set_line_thickness_and_color(env);
+      out.put_symbol("ST");
+    }
+    break;
+  case 'l':
+    if (np != 2) {
+      error("2 arguments required for line");
+      break;
+    }
+    set_line_thickness_and_color(env);
+    out.put_fix_number(p[0] + env->hpos)
+       .put_fix_number(p[1] + env->vpos)
+       .put_fix_number(env->hpos)
+       .put_fix_number(env->vpos)
+       .put_symbol("DL");
+    break;
+  case 'E':
+    fill_flag = 1;
+    // fall through
+  case 'e':
+    if (np != 2) {
+      error("2 arguments required for ellipse");
+      break;
+    }
+    out.put_fix_number(p[0])
+       .put_fix_number(p[1])
+       .put_fix_number(env->hpos + p[0]/2)
+       .put_fix_number(env->vpos)
+       .put_symbol("DE");
+    if (fill_flag)
+      fill_path(env);
+    else {
+      set_line_thickness_and_color(env);
+      out.put_symbol("ST");
+    }
+    break;
+  case 'P':
+    fill_flag = 1;
+    // fall through
+  case 'p':
+    {
+      if (np & 1) {
+	error("even number of arguments required for polygon");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for polygon");
+	break;
+      }
+      out.put_fix_number(env->hpos)
+	 .put_fix_number(env->vpos)
+	 .put_symbol("MT");
+      for (int i = 0; i < np; i += 2)
+	out.put_fix_number(p[i])
+	   .put_fix_number(p[i+1])
+	   .put_symbol("RL");
+      out.put_symbol("CL");
+      if (fill_flag)
+	fill_path(env);
+      else {
+	set_line_thickness_and_color(env);
+	out.put_symbol("ST");
+      }
+      break;
+    }
+  case '~':
+    {
+      if (np & 1) {
+	error("even number of arguments required for spline");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for spline");
+	break;
+      }
+      out.put_fix_number(env->hpos)
+	 .put_fix_number(env->vpos)
+	 .put_symbol("MT");
+      out.put_fix_number(p[0]/2)
+	 .put_fix_number(p[1]/2)
+	 .put_symbol("RL");
+      /* tnum/tden should be between 0 and 1; the closer it is to 1
+	 the tighter the curve will be to the guiding lines; 2/3
+	 is the standard value */
+      const int tnum = 2;
+      const int tden = 3;
+      for (int i = 0; i < np - 2; i += 2) {
+	out.put_fix_number((p[i]*tnum)/(2*tden))
+	   .put_fix_number((p[i + 1]*tnum)/(2*tden))
+	   .put_fix_number(p[i]/2 + (p[i + 2]*(tden - tnum))/(2*tden))
+	   .put_fix_number(p[i + 1]/2 + (p[i + 3]*(tden - tnum))/(2*tden))
+	   .put_fix_number((p[i] - p[i]/2) + p[i + 2]/2)
+	   .put_fix_number((p[i + 1] - p[i + 1]/2) + p[i + 3]/2)
+	   .put_symbol("RC");
+      }
+      out.put_fix_number(p[np - 2] - p[np - 2]/2)
+	 .put_fix_number(p[np - 1] - p[np - 1]/2)
+	 .put_symbol("RL");
+      set_line_thickness_and_color(env);
+      out.put_symbol("ST");
+    }
+    break;
+  case 'a':
+    {
+      if (np != 4) {
+	error("4 arguments required for arc");
+	break;
+      }
+      set_line_thickness_and_color(env);
+      double c[2];
+      if (adjust_arc_center(p, c))
+	out.put_fix_number(env->hpos + int(c[0]))
+	   .put_fix_number(env->vpos + int(c[1]))
+	   .put_fix_number(int(sqrt(c[0]*c[0] + c[1]*c[1])))
+	   .put_float(degrees(atan2(-c[1], -c[0])))
+	   .put_float(degrees(atan2(p[1] + p[3] - c[1], p[0] + p[2] - c[0])))
+	   .put_symbol("DA");
+      else
+	out.put_fix_number(p[0] + p[2] + env->hpos)
+	   .put_fix_number(p[1] + p[3] + env->vpos)
+	   .put_fix_number(env->hpos)
+	   .put_fix_number(env->vpos)
+	   .put_symbol("DL");
+    }
+    break;
+  case 't':
+    if (np == 0)
+      line_thickness = -1;
+    else {
+      // troff gratuitously adds an extra 0
+      if (np != 1 && np != 2) {
+	error("0 or 1 argument required for thickness");
+	break;
+      }
+      line_thickness = p[0];
+    }
+    break;
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+  output_hpos = output_vpos = -1;
+}
+
+const char *ps_printer::media_name()
+{
+  return "Default";
+}
+
+int ps_printer::media_width()
+{
+  /*
+   *  NOTE:
+   *  Although paper size is defined as real numbers, it seems to be
+   *  a common convention to round to the nearest postscript unit.
+   *  For example, a4 is really 595.276 by 841.89 but we use 595 by 842.
+   *
+   *  This is probably a good compromise, especially since the
+   *  Postscript definition specifies that media
+   *  matching should be done within a tolerance of 5 units.
+   */
+  return int(user_paper_width ? user_paper_width*72.0 + 0.5
+			      : font::paperwidth*72.0/font::res + 0.5);
+}
+
+int ps_printer::media_height()
+{
+  return int(user_paper_length ? user_paper_length*72.0 + 0.5
+			       : paper_length*72.0/font::res + 0.5);
+}
+
+void ps_printer::media_set()
+{
+  /*
+   *  The setpagedevice implies an erasepage and initgraphics, and
+   *  must thus precede any descriptions for a particular page.
+   *
+   *  NOTE:
+   *  This does not work with ps2pdf when there are included eps
+   *  segments that contain PageSize/setpagedevice.
+   *  This might be a bug in ghostscript -- must be investigated.
+   *  Using setpagedevice in an .eps is really the wrong concept, anyway.
+   *
+   *  NOTE:
+   *  For the future, this is really the place to insert other
+   *  media selection features, like:
+   *    MediaColor
+   *    MediaPosition
+   *    MediaType
+   *    MediaWeight
+   *    MediaClass
+   *    TraySwitch
+   *    ManualFeed
+   *    InsertSheet
+   *    Duplex
+   *    Collate
+   *    ProcessColorModel
+   *  etc.
+   */
+  if (!(broken_flags & (USE_PS_ADOBE_2_0|NO_PAPERSIZE))) { 
+    out.begin_comment("BeginFeature:")
+       .comment_arg("*PageSize")
+       .comment_arg(media_name())
+       .end_comment();
+    int w = media_width();
+    int h = media_height();
+    if (w > 0 && h > 0)
+      // warning to user is done elsewhere
+      fprintf(out.get_file(),
+	      "<< /PageSize [ %d %d ] /ImagingBBox null >> setpagedevice\n",
+	      w, h);
+    out.simple_comment("EndFeature");
+  }
+}
+
+void ps_printer::begin_page(int n)
+{
+  out.begin_comment("Page:")
+     .comment_arg(i_to_a(n));
+  out.comment_arg(i_to_a(++pages_output))
+     .end_comment();
+  output_style.f = 0;
+  output_space_code = 32;
+  output_draw_point_size = -1;
+  output_line_thickness = -1;
+  output_hpos = output_vpos = -1;
+  ndefined_styles = 0;
+  out.simple_comment("BeginPageSetup");
+
+#if 0
+  /*
+   *  NOTE:
+   *  may decide to do this once per page
+   */
+  media_set();
+#endif
+
+  out.put_symbol("BP")
+     .simple_comment("EndPageSetup");
+  if (sbuf_color != default_color)
+    set_color(&sbuf_color);
+}
+
+void ps_printer::end_page(int)
+{
+  flush_sbuf();
+  set_color(&default_color);
+  out.put_symbol("EP");
+  if (invis_count != 0) {
+    error("missing `endinvis' command");
+    invis_count = 0;
+  }
+}
+
+font *ps_printer::make_font(const char *nm)
+{
+  return ps_font::load_ps_font(nm);
+}
+
+ps_printer::~ps_printer()
+{
+  out.simple_comment("Trailer")
+     .put_symbol("end")
+     .simple_comment("EOF");
+  if (fseek(tempfp, 0L, 0) < 0)
+    fatal("fseek on temporary file failed");
+  fputs("%!PS-Adobe-", stdout);
+  fputs((broken_flags & USE_PS_ADOBE_2_0) ? "2.0" : "3.0", stdout);
+  putchar('\n');
+  out.set_file(stdout);
+  if (cmyk_flag)
+    out.begin_comment("Extensions:")
+       .comment_arg("CMYK")
+       .end_comment();
+  out.begin_comment("Creator:")
+     .comment_arg("groff")
+     .comment_arg("version")
+     .comment_arg(Version_string)
+     .end_comment();
+  {
+    fputs("%%CreationDate: ", out.get_file());
+#ifdef LONG_FOR_TIME_T
+    long
+#else
+    time_t
+#endif
+    t = time(0);
+    fputs(ctime(&t), out.get_file());
+  }
+  for (font_pointer_list *f = font_list; f; f = f->next) {
+    ps_font *psf = (ps_font *)(f->p);
+    rm.need_font(psf->get_internal_name());
+  }
+  rm.print_header_comments(out);
+  out.begin_comment("Pages:")
+     .comment_arg(i_to_a(pages_output))
+     .end_comment();
+  out.begin_comment("PageOrder:")
+     .comment_arg("Ascend")
+     .end_comment();
+  if (!(broken_flags & NO_PAPERSIZE)) {
+    int w = media_width();
+    int h = media_height();
+    if (w > 0 && h > 0)
+      fprintf(out.get_file(),
+	      "%%%%DocumentMedia: %s %d %d %d %s %s\n",
+	      media_name(),			// tag name of media
+	      w,				// media width
+	      h,				// media height
+	      0,				// weight in g/m2
+	      "()",				// paper color, e.g. white
+	      "()"				// preprinted form type
+	     );
+    else {
+      if (h <= 0)
+	// see ps_printer::ps_printer
+	warning("bad paper height, defaulting to 11i");
+      if (w <= 0)
+	warning("bad paper width");
+    }
+  }
+  out.begin_comment("Orientation:")
+     .comment_arg(landscape_flag ? "Landscape" : "Portrait")
+     .end_comment(); 
+  if (ncopies != 1) {
+    out.end_line();
+    fprintf(out.get_file(), "%%%%Requirements: numcopies(%d)\n", ncopies);
+  }
+  out.simple_comment("EndComments");
+  if (!(broken_flags & NO_PAPERSIZE)) {
+    /* gv works fine without this one, but it really should be there. */
+    out.simple_comment("BeginDefaults");
+    fprintf(out.get_file(), "%%%%PageMedia: %s\n", media_name());
+    out.simple_comment("EndDefaults");
+  }
+  out.simple_comment("BeginProlog");
+  rm.output_prolog(out);
+  if (!(broken_flags & NO_SETUP_SECTION)) {
+    out.simple_comment("EndProlog");
+    out.simple_comment("BeginSetup");
+  }
+#if 1
+  /*
+   * Define paper (i.e., media) size for entire document here.
+   * This allows ps2pdf to correctly determine page size, for instance.
+   */
+  media_set();
+#endif
+  rm.document_setup(out);
+  out.put_symbol(dict_name)
+     .put_symbol("begin");
+  if (ndefs > 0)
+    ndefs += DEFS_DICT_SPARE;
+  out.put_literal_symbol(defs_dict_name)
+     .put_number(ndefs + 1)
+     .put_symbol("dict")
+     .put_symbol("def");
+  out.put_symbol(defs_dict_name)
+     .put_symbol("begin");
+  out.put_literal_symbol("u")
+     .put_delimiter('{')
+     .put_fix_number(1)
+     .put_symbol("mul")
+     .put_delimiter('}')
+     .put_symbol("bind")
+     .put_symbol("def");
+  defs += '\0';
+  out.special(defs.contents());
+  out.put_symbol("end");
+  if (ncopies != 1)
+    out.put_literal_symbol("#copies")
+       .put_number(ncopies)
+       .put_symbol("def");
+  out.put_literal_symbol("RES")
+     .put_number(res)
+     .put_symbol("def");
+  out.put_literal_symbol("PL");
+  if (guess_flag)
+    out.put_symbol("PLG");
+  else
+    out.put_fix_number(paper_length);
+  out.put_symbol("def");
+  out.put_literal_symbol("LS")
+     .put_symbol(landscape_flag ? "true" : "false")
+     .put_symbol("def");
+  if (manual_feed_flag) {
+    out.begin_comment("BeginFeature:")
+       .comment_arg("*ManualFeed")
+       .comment_arg("True")
+       .end_comment()
+       .put_symbol("MANUAL")
+       .simple_comment("EndFeature");
+  }
+  encode_fonts();
+  while (subencodings) {
+    subencoding *tem = subencodings;
+    subencodings = subencodings->next;
+    encode_subfont(tem);
+    out.put_literal_symbol(tem->subfont)
+       .put_symbol(make_subencoding_name(tem->idx))
+       .put_literal_symbol(tem->p->get_internal_name())
+       .put_symbol("RE");
+    delete tem;
+  }
+  out.simple_comment((broken_flags & NO_SETUP_SECTION)
+		     ? "EndProlog"
+		     : "EndSetup");
+  out.end_line();
+  out.copy_file(tempfp);
+  fclose(tempfp);
+}
+
+void ps_printer::special(char *arg, const environment *env, char type)
+{
+  if (type != 'p')
+    return;
+  typedef void (ps_printer::*SPECIAL_PROCP)(char *, const environment *);
+  static struct {
+    const char *name;
+    SPECIAL_PROCP proc;
+  } proc_table[] = {
+    { "exec", &ps_printer::do_exec },
+    { "def", &ps_printer::do_def },
+    { "mdef", &ps_printer::do_mdef },
+    { "import", &ps_printer::do_import },
+    { "file", &ps_printer::do_file },
+    { "invis", &ps_printer::do_invis },
+    { "endinvis", &ps_printer::do_endinvis },
+  };
+  char *p;
+  for (p = arg; *p == ' ' || *p == '\n'; p++)
+    ;
+  char *tag = p;
+  for (; *p != '\0' && *p != ':' && *p != ' ' && *p != '\n'; p++)
+    ;
+  if (*p == '\0' || strncmp(tag, "ps", p - tag) != 0) {
+    error("X command without `ps:' tag ignored");
+    return;
+  }
+  p++;
+  for (; *p == ' ' || *p == '\n'; p++)
+    ;
+  char *command = p;
+  for (; *p != '\0' && *p != ' ' && *p != '\n'; p++)
+    ;
+  if (*command == '\0') {
+    error("empty X command ignored");
+    return;
+  }
+  for (unsigned int i = 0; i < sizeof(proc_table)/sizeof(proc_table[0]); i++)
+    if (strncmp(command, proc_table[i].name, p - command) == 0) {
+      (this->*(proc_table[i].proc))(p, env);
+      return;
+    }
+  error("X command `%1' not recognised", command);
+}
+
+// A conforming PostScript document must not have lines longer
+// than 255 characters (excluding line termination characters).
+
+static int check_line_lengths(const char *p)
+{
+  for (;;) {
+    const char *end = strchr(p, '\n');
+    if (end == 0)
+      end = strchr(p, '\0');
+    if (end - p > 255)
+      return 0;
+    if (*end == '\0')
+      break;
+    p = end + 1;
+  }
+  return 1;
+}
+
+void ps_printer::do_exec(char *arg, const environment *env)
+{
+  flush_sbuf();
+  while (csspace(*arg))
+    arg++;
+  if (*arg == '\0') {
+    error("missing argument to X exec command");
+    return;
+  }
+  if (!check_line_lengths(arg)) {
+    error("lines in X exec command must not be more than 255 characters long");
+    return;
+  }
+  out.put_fix_number(env->hpos)
+     .put_fix_number(env->vpos)
+     .put_symbol("EBEGIN")
+     .special(arg)
+     .put_symbol("EEND");
+  output_hpos = output_vpos = -1;
+  output_style.f = 0;
+  output_draw_point_size = -1;
+  output_line_thickness = -1;
+  ndefined_styles = 0;
+  if (!ndefs)
+    ndefs = 1;
+}
+
+void ps_printer::do_file(char *arg, const environment *env)
+{
+  flush_sbuf();
+  while (csspace(*arg))
+    arg++;
+  if (*arg == '\0') {
+    error("missing argument to X file command");
+    return;
+  }
+  const char *filename = arg;
+  do {
+    ++arg;
+  } while (*arg != '\0' && *arg != ' ' && *arg != '\n');
+  out.put_fix_number(env->hpos)
+     .put_fix_number(env->vpos)
+     .put_symbol("EBEGIN");
+  rm.import_file(filename, out);
+  out.put_symbol("EEND");
+  output_hpos = output_vpos = -1;
+  output_style.f = 0;
+  output_draw_point_size = -1;
+  output_line_thickness = -1;
+  ndefined_styles = 0;
+  if (!ndefs)
+    ndefs = 1;
+}
+
+void ps_printer::do_def(char *arg, const environment *)
+{
+  flush_sbuf();
+  while (csspace(*arg))
+    arg++;
+  if (!check_line_lengths(arg)) {
+    error("lines in X def command must not be more than 255 characters long");
+    return;
+  }
+  defs += arg;
+  if (*arg != '\0' && strchr(arg, '\0')[-1] != '\n')
+    defs += '\n';
+  ndefs++;
+}
+
+// Like def, but the first argument says how many definitions it contains.
+
+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) {
+    error("first argument to X mdef must be an integer");
+    return;
+  }
+  if (n < 0) {
+    error("out of range argument `%1' to X mdef command", int(n));
+    return;
+  }
+  arg = p;
+  while (csspace(*arg))
+    arg++;
+  if (!check_line_lengths(arg)) {
+    error("lines in X mdef command must not be more than 255 characters long");
+    return;
+  }
+  defs += arg;
+  if (*arg != '\0' && strchr(arg, '\0')[-1] != '\n')
+    defs += '\n';
+  ndefs += n;
+}
+
+void ps_printer::do_import(char *arg, const environment *env)
+{
+  flush_sbuf();
+  while (*arg == ' ' || *arg == '\n')
+    arg++;
+  char *p;
+  for (p = arg; *p != '\0' && *p != ' ' && *p != '\n'; p++)
+    ;
+  if (*p != '\0')
+    *p++ = '\0';
+  int parms[6];
+  int nparms = 0;
+  while (nparms < 6) {
+    char *end;
+    long n = strtol(p, &end, 10);
+    if (n == 0 && end == p)
+      break;
+    parms[nparms++] = int(n);
+    p = end;
+  }
+  if (csalpha(*p) && (p[1] == '\0' || p[1] == ' ' || p[1] == '\n')) {
+    error("scaling indicators not allowed in arguments for X import command");
+    return;
+  }
+  while (*p == ' ' || *p == '\n')
+    p++;
+  if (nparms < 5) {
+    if (*p == '\0')
+      error("too few arguments for X import command");
+    else
+      error("invalid argument `%1' for X import command", p);
+    return;
+  }
+  if (*p != '\0') {
+    error("superfluous argument `%1' for X import command", p);
+    return;
+  }
+  int llx = parms[0];
+  int lly = parms[1];
+  int urx = parms[2];
+  int ury = parms[3];
+  int desired_width = parms[4];
+  int desired_height = parms[5];
+  if (desired_width <= 0) {
+    error("bad width argument `%1' for X import command: must be > 0",
+	  desired_width);
+    return;
+  }
+  if (nparms == 6 && desired_height <= 0) {
+    error("bad height argument `%1' for X import command: must be > 0",
+	  desired_height);
+    return;
+  }
+  if (llx == urx) {
+    error("llx and urx arguments for X import command must not be equal");
+    return;
+  }
+  if (lly == ury) {
+    error("lly and ury arguments for X import command must not be equal");
+    return;
+  }
+  if (nparms == 5) {
+    int old_wid = urx - llx;
+    int old_ht = ury - lly;
+    if (old_wid < 0)
+      old_wid = -old_wid;
+    if (old_ht < 0)
+      old_ht = -old_ht;
+    desired_height = int(desired_width*(double(old_ht)/double(old_wid)) + .5);
+  }
+  if (env->vpos - desired_height < 0)
+    warning("top of imported graphic is above the top of the page");
+  out.put_number(llx)
+     .put_number(lly)
+     .put_fix_number(desired_width)
+     .put_number(urx - llx)
+     .put_fix_number(-desired_height)
+     .put_number(ury - lly)
+     .put_fix_number(env->hpos)
+     .put_fix_number(env->vpos)
+     .put_symbol("PBEGIN");
+  rm.import_file(arg, out);
+  // do this here just in case application defines PEND
+  out.put_symbol("end")
+     .put_symbol("PEND");
+}
+
+void ps_printer::do_invis(char *, const environment *)
+{
+  invis_count++;
+}
+
+void ps_printer::do_endinvis(char *, const environment *)
+{
+  if (invis_count == 0)
+    error("unbalanced `endinvis' command");
+  else
+    --invis_count;
+}
+
+printer *make_printer()
+{
+  return new ps_printer(user_paper_length);
+}
+
+static void usage(FILE *stream);
+
+int main(int argc, char **argv)
+{
+  setlocale(LC_NUMERIC, "C");
+  program_name = argv[0];
+  string env;
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "b:c:F:glmp:P:vw:", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'b':
+      // XXX check this
+      broken_flags = atoi(optarg);
+      bflag = 1;
+      break;
+    case 'c':
+      if (sscanf(optarg, "%d", &ncopies) != 1 || ncopies <= 0) {
+	error("bad number of copies `%s'", optarg);
+	ncopies = 1;
+      }
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'g':
+      guess_flag = 1;
+      break;
+    case 'l':
+      landscape_flag = 1;
+      break;
+    case 'm':
+      manual_feed_flag = 1;
+      break;
+    case 'p':
+      if (!font::scan_papersize(optarg, 0,
+				&user_paper_length, &user_paper_width))
+	error("invalid custom paper size `%1' ignored", optarg);
+      break;
+    case 'P':
+      env = "GROPS_PROLOGUE";
+      env += '=';
+      env += optarg;
+      env += '\0';
+      if (putenv(strsave(env.contents())))
+	fatal("putenv failed");
+      break;
+    case 'v':
+      printf("GNU grops (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case 'w':
+      if (sscanf(optarg, "%d", &linewidth) != 1 || linewidth < 0) {
+	error("bad linewidth `%1'", optarg);
+	linewidth = -1;
+      }
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  font::set_unknown_desc_command_handler(handle_unknown_desc_command);
+  SET_BINARY(fileno(stdout));
+  if (optind >= argc)
+    do_file("-");
+  else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream,
+    "usage: %s [-glmv] [-b n] [-c n] [-w n] [-P prologue] [-F dir] [files ...]\n",
+    program_name);
+}
diff --git a/contrib/groff/src/devices/grops/ps.h b/contrib/groff/src/devices/grops/ps.h
index 0e149fc..a4b4169 100644
--- a/contrib/groff/src/devices/grops/ps.h
+++ b/contrib/groff/src/devices/grops/ps.h
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2003
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -119,5 +120,6 @@ enum {
   NO_SETUP_SECTION = 01,
   STRIP_PERCENT_BANG = 02,
   STRIP_STRUCTURE_COMMENTS = 04,
-  USE_PS_ADOBE_2_0 = 010
+  USE_PS_ADOBE_2_0 = 010,
+  NO_PAPERSIZE = 020
 };
diff --git a/contrib/groff/src/devices/grops/psrm.cpp b/contrib/groff/src/devices/grops/psrm.cpp
new file mode 100644
index 0000000..ab94ffe
--- /dev/null
+++ b/contrib/groff/src/devices/grops/psrm.cpp
@@ -0,0 +1,1178 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+
+#include "ps.h"
+
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
+#define GROPS_PROLOGUE "prologue"
+
+static void print_ps_string(const string &s, FILE *outfp);
+
+cset white_space("\n\r \t\f");
+string an_empty_string;
+
+char valid_input_table[256]= {
+#ifndef IS_EBCDIC_HOST
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#else
+  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 1, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 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,
+#endif
+};
+
+const char *extension_table[] = {
+  "DPS",
+  "CMYK",
+  "Composite",
+  "FileSystem",
+};
+
+const int NEXTENSIONS = sizeof(extension_table)/sizeof(extension_table[0]);
+
+const char *resource_table[] = {
+  "font",
+  "procset",
+  "file",
+  "encoding",
+  "form",
+  "pattern",
+};
+
+const int NRESOURCES = sizeof(resource_table)/sizeof(resource_table[0]);
+
+static int read_uint_arg(const char **pp, unsigned *res)
+{
+  while (white_space(**pp))
+    *pp += 1;
+  if (**pp == '\0') {
+    error("missing argument");
+    return 0;
+  }
+  const char *start = *pp;
+  // XXX use strtoul
+  long n = strtol(start, (char **)pp, 10);
+  if (n == 0 && *pp == start) {
+    error("not an integer");
+    return 0;
+  }
+  if (n < 0) {
+    error("argument must not be negative");
+    return 0;
+  }
+  *res = unsigned(n);
+  return 1;
+}
+
+struct resource {
+  resource *next;
+  resource_type type;
+  string name;
+  enum { NEEDED = 01, SUPPLIED = 02, FONT_NEEDED = 04, BUSY = 010 };
+  unsigned flags;
+  string version;
+  unsigned revision;
+  char *filename;
+  int rank;
+  resource(resource_type, string &, string & = an_empty_string, unsigned = 0);
+  ~resource();
+  void print_type_and_name(FILE *outfp);
+};
+
+resource::resource(resource_type t, string &n, string &v, unsigned r)
+: next(0), type(t), flags(0), revision(r), filename(0), rank(-1)
+{
+  name.move(n);
+  version.move(v);
+  if (type == RESOURCE_FILE) {
+    if (name.search('\0') >= 0)
+      error("filename contains a character with code 0");
+    filename = name.extract();
+  }
+}
+
+resource::~resource()
+{
+  a_delete filename;
+}
+
+void resource::print_type_and_name(FILE *outfp)
+{
+  fputs(resource_table[type], outfp);
+  putc(' ', outfp);
+  print_ps_string(name, outfp);
+  if (type == RESOURCE_PROCSET) {
+    putc(' ', outfp);
+    print_ps_string(version, outfp);
+    fprintf(outfp, " %u", revision);
+  }
+}
+
+resource_manager::resource_manager()
+: extensions(0), language_level(0), resource_list(0)
+{
+  read_download_file();
+  string procset_name("grops");
+  extern const char *version_string;
+  extern const char *revision_string;
+  unsigned revision_uint;
+  if (!read_uint_arg(&revision_string, &revision_uint))
+    revision_uint = 0;
+  string procset_version(version_string);
+  procset_resource = lookup_resource(RESOURCE_PROCSET, procset_name,
+				     procset_version, revision_uint);
+  procset_resource->flags |= resource::SUPPLIED;
+}
+
+resource_manager::~resource_manager()
+{
+  while (resource_list) {
+    resource *tem = resource_list;
+    resource_list = resource_list->next;
+    delete tem;
+  }
+}
+
+resource *resource_manager::lookup_resource(resource_type type,
+					    string &name,
+					    string &version,
+					    unsigned revision)
+{
+  resource *r;
+  for (r = resource_list; r; r = r->next)
+    if (r->type == type
+	&& r->name == name
+	&& r->version == version
+	&& r->revision == revision)
+      return r;
+  r = new resource(type, name, version, revision);
+  r->next = resource_list;
+  resource_list = r;
+  return r;
+}
+
+// Just a specialized version of lookup_resource().
+
+resource *resource_manager::lookup_font(const char *name)
+{
+  resource *r;
+  for (r = resource_list; r; r = r->next)
+    if (r->type == RESOURCE_FONT
+	&& strlen(name) == (size_t)r->name.length()
+	&& memcmp(name, r->name.contents(), r->name.length()) == 0)
+      return r;
+  string s(name);
+  r = new resource(RESOURCE_FONT, s);
+  r->next = resource_list;
+  resource_list = r;
+  return r;
+}
+
+void resource_manager::need_font(const char *name)
+{
+  lookup_font(name)->flags |= resource::FONT_NEEDED;
+}
+
+typedef resource *Presource;	// Work around g++ bug.
+
+void resource_manager::document_setup(ps_output &out)
+{
+  int nranks = 0;
+  resource *r;
+  for (r = resource_list; r; r = r->next)
+    if (r->rank >= nranks)
+      nranks = r->rank + 1;
+  if (nranks > 0) {
+    // Sort resource_list in reverse order of rank.
+    Presource *head = new Presource[nranks + 1];
+    Presource **tail = new Presource *[nranks + 1];
+    int i;
+    for (i = 0; i < nranks + 1; i++) {
+      head[i] = 0;
+      tail[i] = &head[i];
+    }
+    for (r = resource_list; r; r = r->next) {
+      i = r->rank < 0 ? 0 : r->rank + 1;
+      *tail[i] = r;
+      tail[i] = &(*tail[i])->next;
+    }
+    resource_list = 0;
+    for (i = 0; i < nranks + 1; i++)
+      if (head[i]) {
+	*tail[i] = resource_list;
+	resource_list = head[i];
+      }
+    a_delete head;
+    a_delete tail;
+    // check it
+    for (r = resource_list; r; r = r->next)
+      if (r->next)
+	assert(r->rank >= r->next->rank);
+    for (r = resource_list; r; r = r->next)
+      if (r->type == RESOURCE_FONT && r->rank >= 0)
+	supply_resource(r, -1, out.get_file());
+  }
+}
+
+void resource_manager::print_resources_comment(unsigned flag, FILE *outfp)
+{
+  int continued = 0;
+  for (resource *r = resource_list; r; r = r->next)
+    if (r->flags & flag) {
+      if (continued)
+	fputs("%%+ ", outfp);
+      else {
+	fputs(flag == resource::NEEDED
+	      ? "%%DocumentNeededResources: "
+	      : "%%DocumentSuppliedResources: ",
+	      outfp);
+	continued = 1;
+      }
+      r->print_type_and_name(outfp);
+      putc('\n', outfp);
+    }
+}
+
+void resource_manager::print_header_comments(ps_output &out)
+{
+  for (resource *r = resource_list; r; r = r->next)
+    if (r->type == RESOURCE_FONT && (r->flags & resource::FONT_NEEDED))
+      supply_resource(r, 0, 0);
+  print_resources_comment(resource::NEEDED, out.get_file());
+  print_resources_comment(resource::SUPPLIED, out.get_file());
+  print_language_level_comment(out.get_file());
+  print_extensions_comment(out.get_file());
+}
+
+void resource_manager::output_prolog(ps_output &out)
+{
+  FILE *outfp = out.get_file();
+  out.end_line();
+  char *path;
+  if (!getenv("GROPS_PROLOGUE")) {
+    string e = "GROPS_PROLOGUE";
+    e += '=';
+    e += GROPS_PROLOGUE;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+  }
+  char *prologue = getenv("GROPS_PROLOGUE");
+  FILE *fp = font::open_file(prologue, &path);
+  if (!fp)
+    fatal("can't find `%1'", prologue);
+  fputs("%%BeginResource: ", outfp);
+  procset_resource->print_type_and_name(outfp);
+  putc('\n', outfp);
+  process_file(-1, fp, path, outfp);
+  fclose(fp);
+  a_delete path;
+  fputs("%%EndResource\n", outfp);
+}
+
+void resource_manager::import_file(const char *filename, ps_output &out)
+{
+  out.end_line();
+  string name(filename);
+  resource *r = lookup_resource(RESOURCE_FILE, name);
+  supply_resource(r, -1, out.get_file(), 1);
+}
+
+void resource_manager::supply_resource(resource *r, int rank, FILE *outfp,
+				       int is_document)
+{
+  if (r->flags & resource::BUSY) {
+    r->name += '\0';
+    fatal("loop detected in dependency graph for %1 `%2'",
+	  resource_table[r->type],
+	  r->name.contents());
+  }
+  r->flags |= resource::BUSY;
+  if (rank > r->rank)
+    r->rank = rank;
+  char *path;
+  FILE *fp = 0;
+  if (r->filename != 0) {
+    if (r->type == RESOURCE_FONT) {
+      fp = font::open_file(r->filename, &path);
+      if (!fp) {
+	error("can't find `%1'", r->filename);
+	a_delete r->filename;
+	r->filename = 0;
+      }
+    }
+    else {
+      errno = 0;
+      fp = fopen(r->filename, "r");
+      if (!fp) {
+	error("can't open `%1': %2", r->filename, strerror(errno));
+	a_delete r->filename;
+	r->filename = 0;
+      }
+      else
+	path = r->filename;
+    }
+  }
+  if (fp) {
+    if (outfp) {
+      if (r->type == RESOURCE_FILE && is_document) {
+	fputs("%%BeginDocument: ", outfp);
+	print_ps_string(r->name, outfp);
+	putc('\n', outfp);
+      }
+      else {
+	fputs("%%BeginResource: ", outfp);
+	r->print_type_and_name(outfp);
+	putc('\n', outfp);
+      }
+    }
+    process_file(rank, fp, path, outfp);
+    fclose(fp);
+    if (r->type == RESOURCE_FONT)
+      a_delete path;
+    if (outfp) {
+      if (r->type == RESOURCE_FILE && is_document)
+	fputs("%%EndDocument\n", outfp);
+      else
+	fputs("%%EndResource\n", outfp);
+    }
+    r->flags |= resource::SUPPLIED;
+  }
+  else {
+    if (outfp) {
+      if (r->type == RESOURCE_FILE && is_document) {
+	fputs("%%IncludeDocument: ", outfp);
+	print_ps_string(r->name, outfp);
+	putc('\n', outfp);
+      }
+      else {
+	fputs("%%IncludeResource: ", outfp);
+	r->print_type_and_name(outfp);
+	putc('\n', outfp);
+      }
+    }
+    r->flags |= resource::NEEDED;
+  }
+  r->flags &= ~resource::BUSY;
+}
+
+#define PS_MAGIC "%!PS-Adobe-"
+
+static int ps_get_line(string &buf, FILE *fp)
+{
+  buf.clear();
+  int c = getc(fp);
+  if (c == EOF)
+    return 0;
+  current_lineno++;
+  while (c != '\r' && c != '\n' && c != EOF) {
+    if (!valid_input_table[c])
+      error("invalid input character code %1", int(c));
+    buf += c;
+    c = getc(fp);
+  }
+  buf += '\n';
+  buf += '\0';
+  if (c == '\r') {
+    c = getc(fp);
+    if (c != EOF && c != '\n')
+      ungetc(c, fp);
+  }
+  return 1;
+}
+
+static int read_text_arg(const char **pp, string &res)
+{
+  res.clear();
+  while (white_space(**pp))
+    *pp += 1;
+  if (**pp == '\0') {
+    error("missing argument");
+    return 0;
+  }
+  if (**pp != '(') {
+    for (; **pp != '\0' && !white_space(**pp); *pp += 1)
+      res += **pp;
+    return 1;
+  }
+  *pp += 1;
+  res.clear();
+  int level = 0;
+  for (;;) {
+    if (**pp == '\0' || **pp == '\r' || **pp == '\n') {
+      error("missing ')'");
+      return 0;
+    }
+    if (**pp == ')') {
+      if (level == 0) {
+	*pp += 1;
+	break;
+      }
+      res += **pp;
+      level--;
+    }
+    else if (**pp == '(') {
+      level++;
+      res += **pp;
+    }
+    else if (**pp == '\\') {
+      *pp += 1;
+      switch (**pp) {
+      case 'n':
+	res += '\n';
+	break;
+      case 'r':
+	res += '\n';
+	break;
+      case 't':
+	res += '\t';
+	break;
+      case 'b':
+	res += '\b';
+	break;
+      case 'f':
+	res += '\f';
+	break;
+      case '0':
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+	{
+	  int val = **pp - '0';
+	  if ((*pp)[1] >= '0' && (*pp)[1] <= '7') {
+	    *pp += 1;
+	    val = val*8 + (**pp - '0');
+	    if ((*pp)[1] >= '0' && (*pp)[1] <= '7') {
+	      *pp += 1;
+	      val = val*8 + (**pp - '0');
+	    }
+	  }
+	}
+	break;
+      default:
+	res += **pp;
+	break;
+      }
+    }
+    else
+      res += **pp;
+    *pp += 1;
+  }
+  return 1;
+}
+
+resource *resource_manager::read_file_arg(const char **ptr)
+{
+  string arg;
+  if (!read_text_arg(ptr, arg))
+    return 0;
+  return lookup_resource(RESOURCE_FILE, arg);
+}
+
+resource *resource_manager::read_font_arg(const char **ptr)
+{
+  string arg;
+  if (!read_text_arg(ptr, arg))
+    return 0;
+  return lookup_resource(RESOURCE_FONT, arg);
+}
+
+resource *resource_manager::read_procset_arg(const char **ptr)
+{
+  string arg;
+  if (!read_text_arg(ptr, arg))
+    return 0;
+  string version;
+  if (!read_text_arg(ptr, version))
+      return 0;
+  unsigned revision;
+  if (!read_uint_arg(ptr, &revision))
+      return 0;
+  return lookup_resource(RESOURCE_PROCSET, arg, version, revision);
+}
+
+resource *resource_manager::read_resource_arg(const char **ptr)
+{
+  while (white_space(**ptr))
+    *ptr += 1;
+  const char *name = *ptr;
+  while (**ptr != '\0' && !white_space(**ptr))
+    *ptr += 1;
+  if (name == *ptr) {
+    error("missing resource type");
+    return 0;
+  }
+  int ri;
+  for (ri = 0; ri < NRESOURCES; ri++)
+    if (strlen(resource_table[ri]) == size_t(*ptr - name)
+	&& memcmp(resource_table[ri], name, *ptr - name) == 0)
+      break;
+  if (ri >= NRESOURCES) {
+    error("unknown resource type");
+    return 0;
+  }
+  if (ri == RESOURCE_PROCSET)
+    return read_procset_arg(ptr);
+  string arg;
+  if (!read_text_arg(ptr, arg))
+    return 0;
+  return lookup_resource(resource_type(ri), arg);
+}
+
+static const char *matches_comment(string &buf, const char *comment)
+{
+  if ((size_t)buf.length() < strlen(comment) + 3)
+    return 0;
+  if (buf[0] != '%' || buf[1] != '%')
+    return 0;
+  const char *bufp = buf.contents() + 2;
+  for (; *comment; comment++, bufp++)
+    if (*bufp != *comment)
+      return 0;
+  if (comment[-1] == ':')
+    return bufp;
+  if (*bufp == '\0' || white_space(*bufp))
+    return bufp;
+  return 0;
+}
+
+// Return 1 if the line should be copied out.
+
+int resource_manager::do_begin_resource(const char *ptr, int, FILE *,
+					FILE *)
+{
+  resource *r = read_resource_arg(&ptr);
+  if (r)
+    r->flags |= resource::SUPPLIED;
+  return 1;
+}
+
+int resource_manager::do_include_resource(const char *ptr, int rank, FILE *,
+					  FILE *outfp)
+{
+  resource *r = read_resource_arg(&ptr);
+  if (r) {
+    if (r->type == RESOURCE_FONT) {
+      if (rank >= 0)
+	supply_resource(r, rank + 1, outfp);
+      else
+	r->flags |= resource::FONT_NEEDED;
+    }
+    else
+      supply_resource(r, rank, outfp);
+  }
+  return 0;
+}
+
+int resource_manager::do_begin_document(const char *ptr, int, FILE *,
+					FILE *)
+{
+  resource *r = read_file_arg(&ptr);
+  if (r)
+    r->flags |= resource::SUPPLIED;
+  return 1;
+}
+
+int resource_manager::do_include_document(const char *ptr, int rank, FILE *,
+					  FILE *outfp)
+{
+  resource *r = read_file_arg(&ptr);
+  if (r)
+    supply_resource(r, rank, outfp, 1);
+  return 0;
+}
+
+int resource_manager::do_begin_procset(const char *ptr, int, FILE *,
+				       FILE *outfp)
+{
+  resource *r = read_procset_arg(&ptr);
+  if (r) {
+    r->flags |= resource::SUPPLIED;
+    if (outfp) {
+      fputs("%%BeginResource: ", outfp);
+      r->print_type_and_name(outfp);
+      putc('\n', outfp);
+    }
+  }
+  return 0;
+}
+
+int resource_manager::do_include_procset(const char *ptr, int rank, FILE *,
+					  FILE *outfp)
+{
+  resource *r = read_procset_arg(&ptr);
+  if (r)
+    supply_resource(r, rank, outfp);
+  return 0;
+}
+
+int resource_manager::do_begin_file(const char *ptr, int, FILE *,
+				    FILE *outfp)
+{
+  resource *r = read_file_arg(&ptr);
+  if (r) {
+    r->flags |= resource::SUPPLIED;
+    if (outfp) {
+      fputs("%%BeginResource: ", outfp);
+      r->print_type_and_name(outfp);
+      putc('\n', outfp);
+    }
+  }
+  return 0;
+}
+
+int resource_manager::do_include_file(const char *ptr, int rank, FILE *,
+				      FILE *outfp)
+{
+  resource *r = read_file_arg(&ptr);
+  if (r)
+    supply_resource(r, rank, outfp);
+  return 0;
+}
+
+int resource_manager::do_begin_font(const char *ptr, int, FILE *,
+				    FILE *outfp)
+{
+  resource *r = read_font_arg(&ptr);
+  if (r) {
+    r->flags |= resource::SUPPLIED;
+    if (outfp) {
+      fputs("%%BeginResource: ", outfp);
+      r->print_type_and_name(outfp);
+      putc('\n', outfp);
+    }
+  }
+  return 0;
+}
+
+int resource_manager::do_include_font(const char *ptr, int rank, FILE *,
+				      FILE *outfp)
+{
+  resource *r = read_font_arg(&ptr);
+  if (r) {
+    if (rank >= 0)
+      supply_resource(r, rank + 1, outfp);
+    else
+      r->flags |= resource::FONT_NEEDED;
+  }
+  return 0;
+}
+
+int resource_manager::change_to_end_resource(const char *, int, FILE *,
+					     FILE *outfp)
+{
+  if (outfp)
+    fputs("%%EndResource\n", outfp);
+  return 0;
+}
+
+int resource_manager::do_begin_preview(const char *, int, FILE *fp, FILE *)
+{
+  string buf;
+  do {
+    if (!ps_get_line(buf, fp)) {
+      error("end of file in preview section");
+      break;
+    }
+  } while (!matches_comment(buf, "EndPreview"));
+  return 0;
+}
+
+int read_one_of(const char **ptr, const char **s, int n)
+{
+  while (white_space(**ptr))
+    *ptr += 1;
+  if (**ptr == '\0')
+    return -1;
+  const char *start = *ptr;
+  do {
+    ++(*ptr);
+  } while (**ptr != '\0' && !white_space(**ptr));
+  for (int i = 0; i < n; i++)
+    if (strlen(s[i]) == size_t(*ptr - start)
+	&& memcmp(s[i], start, *ptr - start) == 0)
+      return i;
+  return -1;
+}
+
+void skip_possible_newline(FILE *fp, FILE *outfp)
+{
+  int c = getc(fp);
+  if (c == '\r') {
+    current_lineno++;
+    if (outfp)
+      putc(c, outfp);
+    int cc = getc(fp);
+    if (cc != '\n') {
+      if (cc != EOF)
+	ungetc(cc, fp);
+    }
+    else {
+      if (outfp)
+	putc(cc, outfp);
+    }
+  }
+  else if (c == '\n') {
+    current_lineno++;
+    if (outfp)
+      putc(c, outfp);
+  }
+  else if (c != EOF)
+    ungetc(c, fp);
+}
+
+int resource_manager::do_begin_data(const char *ptr, int, FILE *fp,
+				    FILE *outfp)
+{
+  while (white_space(*ptr))
+    ptr++;
+  const char *start = ptr;
+  unsigned numberof;
+  if (!read_uint_arg(&ptr, &numberof))
+    return 0;
+  static const char *types[] = { "Binary", "Hex", "ASCII" };
+  const int Binary = 0;
+  int type = 0;
+  static const char *units[] = { "Bytes", "Lines" };
+  const int Bytes = 0;
+  int unit = Bytes;
+  while (white_space(*ptr))
+    ptr++;
+  if (*ptr != '\0') {
+    type = read_one_of(&ptr, types, 3);
+    if (type < 0) {
+      error("bad data type");
+      return 0;
+    }
+    while (white_space(*ptr))
+      ptr++;
+    if (*ptr != '\0') {
+      unit = read_one_of(&ptr, units, 2);
+      if (unit < 0) {
+	error("expected `Bytes' or `Lines'");
+	return 0;
+      }
+    }
+  }
+  if (type != Binary)
+    return 1;
+  if (outfp) {
+    fputs("%%BeginData: ", outfp);
+    fputs(start, outfp);
+  }
+  if (numberof > 0) {
+    unsigned bytecount = 0;
+    unsigned linecount = 0;
+    do {
+      int c = getc(fp);
+      if (c == EOF) {
+	error("end of file within data section");
+	return 0;
+      }
+      if (outfp)
+	putc(c, outfp);
+      bytecount++;
+      if (c == '\r') {
+	int cc = getc(fp);
+	if (cc != '\n') {
+	  linecount++;
+	  current_lineno++;
+	}
+	if (cc != EOF)
+	  ungetc(c, fp);
+      }
+      else if (c == '\n') {
+	linecount++;
+	current_lineno++;
+      }
+    } while ((unit == Bytes ? bytecount : linecount) < numberof);
+  }
+  skip_possible_newline(fp, outfp);
+  string buf;
+  if (!ps_get_line(buf, fp)) {
+    error("missing %%%%EndData line");
+    return 0;
+  }
+  if (!matches_comment(buf, "EndData"))
+    error("bad %%%%EndData line");
+  if (outfp)
+    fputs(buf.contents(), outfp);
+  return 0;
+}
+
+int resource_manager::do_begin_binary(const char *ptr, int, FILE *fp,
+				      FILE *outfp)
+{
+  if (!outfp)
+    return 0;
+  unsigned count;
+  if (!read_uint_arg(&ptr, &count))
+    return 0;
+  if (outfp)
+    fprintf(outfp, "%%%%BeginData: %u Binary Bytes\n", count);
+  while (count != 0) {
+    int c = getc(fp);
+    if (c == EOF) {
+      error("end of file within binary section");
+      return 0;
+    }
+    if (outfp)
+      putc(c, outfp);
+    --count;
+    if (c == '\r') {
+      int cc = getc(fp);
+      if (cc != '\n')
+	current_lineno++;
+      if (cc != EOF)
+	ungetc(cc, fp);
+    }
+    else if (c == '\n')
+      current_lineno++;
+  }
+  skip_possible_newline(fp, outfp);
+  string buf;
+  if (!ps_get_line(buf, fp)) {
+    error("missing %%%%EndBinary line");
+    return 0;
+  }
+  if (!matches_comment(buf, "EndBinary")) {
+    error("bad %%%%EndBinary line");
+    if (outfp)
+      fputs(buf.contents(), outfp);
+  }
+  else if (outfp)
+    fputs("%%EndData\n", outfp);
+  return 0;
+}
+
+static unsigned parse_extensions(const char *ptr)
+{
+  unsigned flags = 0;
+  for (;;) {
+    while (white_space(*ptr))
+      ptr++;
+    if (*ptr == '\0')
+      break;
+    const char *name = ptr;
+    do {
+      ++ptr;
+    } while (*ptr != '\0' && !white_space(*ptr));
+    int i;
+    for (i = 0; i < NEXTENSIONS; i++)
+      if (strlen(extension_table[i]) == size_t(ptr - name)
+	  && memcmp(extension_table[i], name, ptr - name) == 0) {
+	flags |= (1 << i);
+	break;
+      }
+    if (i >= NEXTENSIONS) {
+      string s(name, ptr - name);
+      s += '\0';
+      error("unknown extension `%1'", s.contents());
+    }
+  }
+  return flags;
+}
+
+// XXX if it has not been surrounded with {Begin,End}Document need to strip
+// out Page: Trailer {Begin,End}Prolog {Begin,End}Setup sections.
+
+// XXX Perhaps the decision whether to use BeginDocument or
+// BeginResource: file should be postponed till we have seen
+// the first line of the file.
+
+void resource_manager::process_file(int rank, FILE *fp, const char *filename,
+				    FILE *outfp)
+{
+  // If none of these comments appear in the header section, and we are
+  // just analyzing the file (ie outfp is 0), then we can return immediately.
+  static const char *header_comment_table[] = {
+    "DocumentNeededResources:",
+    "DocumentSuppliedResources:",
+    "DocumentNeededFonts:",
+    "DocumentSuppliedFonts:",
+    "DocumentNeededProcSets:",
+    "DocumentSuppliedProcSets:",
+    "DocumentNeededFiles:",
+    "DocumentSuppliedFiles:",
+  };
+  
+  const int NHEADER_COMMENTS = sizeof(header_comment_table)
+			       / sizeof(header_comment_table[0]);
+  struct comment_info {
+    const char *name;
+    int (resource_manager::*proc)(const char *, int, FILE *, FILE *);
+  };
+
+  static comment_info comment_table[] = {
+    { "BeginResource:", &resource_manager::do_begin_resource },
+    { "IncludeResource:", &resource_manager::do_include_resource },
+    { "BeginDocument:", &resource_manager::do_begin_document },
+    { "IncludeDocument:", &resource_manager::do_include_document },
+    { "BeginProcSet:", &resource_manager::do_begin_procset },
+    { "IncludeProcSet:", &resource_manager::do_include_procset },
+    { "BeginFont:", &resource_manager::do_begin_font },
+    { "IncludeFont:", &resource_manager::do_include_font },
+    { "BeginFile:", &resource_manager::do_begin_file },
+    { "IncludeFile:", &resource_manager::do_include_file },
+    { "EndProcSet", &resource_manager::change_to_end_resource },
+    { "EndFont", &resource_manager::change_to_end_resource },
+    { "EndFile", &resource_manager::change_to_end_resource },
+    { "BeginPreview:", &resource_manager::do_begin_preview },
+    { "BeginData:", &resource_manager::do_begin_data },
+    { "BeginBinary:", &resource_manager::do_begin_binary },
+  };
+  
+  const int NCOMMENTS = sizeof(comment_table)/sizeof(comment_table[0]);
+  string buf;
+  int saved_lineno = current_lineno;
+  const char *saved_filename = current_filename;
+  current_filename = filename;
+  current_lineno = 0;
+  if (!ps_get_line(buf, fp)) {
+    current_filename = saved_filename;
+    current_lineno = saved_lineno;
+    return;
+  }
+  if ((size_t)buf.length() < sizeof(PS_MAGIC)
+      || memcmp(buf.contents(), PS_MAGIC, sizeof(PS_MAGIC) - 1) != 0) {
+    if (outfp) {
+      do {
+	if (!(broken_flags & STRIP_PERCENT_BANG)
+	    || buf[0] != '%' || buf[1] != '!')
+	  fputs(buf.contents(), outfp);
+      } while (ps_get_line(buf, fp));
+    }
+  }
+  else {
+    if (!(broken_flags & STRIP_PERCENT_BANG) && outfp)
+      fputs(buf.contents(), outfp);
+    int in_header = 1;
+    int interesting = 0;
+    int had_extensions_comment = 0;
+    int had_language_level_comment = 0;
+    for (;;) {
+      if (!ps_get_line(buf, fp))
+	break;
+      int copy_this_line = 1;
+      if (buf[0] == '%') {
+	if (buf[1] == '%') {
+	  const char *ptr;
+	  int i;
+	  for (i = 0; i < NCOMMENTS; i++)
+	    if ((ptr = matches_comment(buf, comment_table[i].name))) {
+	      copy_this_line
+		= (this->*(comment_table[i].proc))(ptr, rank, fp, outfp);
+	      break;
+	    }
+	  if (i >= NCOMMENTS && in_header) {
+	    if ((ptr = matches_comment(buf, "EndComments")))
+	      in_header = 0;
+	    else if (!had_extensions_comment
+		     && (ptr = matches_comment(buf, "Extensions:"))) {
+	      extensions |= parse_extensions(ptr);
+	      // XXX handle possibility that next line is %%+
+	      had_extensions_comment = 1;
+	    }
+	    else if (!had_language_level_comment
+		     && (ptr = matches_comment(buf, "LanguageLevel:"))) {
+	      unsigned ll;
+	      if (read_uint_arg(&ptr, &ll) && ll > language_level)
+		language_level = ll;
+	      had_language_level_comment = 1;
+	    }
+	    else {
+	      for (i = 0; i < NHEADER_COMMENTS; i++)
+		if (matches_comment(buf, header_comment_table[i])) {
+		  interesting = 1;
+		  break;
+		}
+	    }
+	  }
+	  if ((broken_flags & STRIP_STRUCTURE_COMMENTS)
+	      && (matches_comment(buf, "EndProlog")
+		  || matches_comment(buf, "Page:")
+		  || matches_comment(buf, "Trailer")))
+	    copy_this_line = 0;
+	}
+	else if (buf[1] == '!') {
+	  if (broken_flags & STRIP_PERCENT_BANG)
+	    copy_this_line = 0;
+	}
+      }
+      else
+	in_header = 0;
+      if (!outfp && !in_header && !interesting)
+	break;
+      if (copy_this_line && outfp)
+	fputs(buf.contents(), outfp);
+    }
+  }
+  current_filename = saved_filename;
+  current_lineno = saved_lineno;
+}
+
+void resource_manager::read_download_file()
+{
+  char *path = 0;
+  FILE *fp = font::open_file("download", &path);
+  if (!fp)
+    fatal("can't find `download'");
+  char buf[512];
+  int lineno = 0;
+  while (fgets(buf, sizeof(buf), fp)) {
+    lineno++;
+    char *p = strtok(buf, " \t\r\n");
+    if (p == 0 || *p == '#')
+      continue;
+    char *q = strtok(0, " \t\r\n");
+    if (!q)
+      fatal_with_file_and_line(path, lineno, "missing filename");
+    lookup_font(p)->filename = strsave(q);
+  }
+  a_delete path;
+  fclose(fp);
+}
+
+// XXX Can we share some code with ps_output::put_string()?
+
+static void print_ps_string(const string &s, FILE *outfp)
+{
+  int len = s.length();
+  const char *str = s.contents();
+  int funny = 0;
+  if (str[0] == '(')
+    funny = 1;
+  else {
+    for (int i = 0; i < len; i++)
+      if (str[i] <= 040 || str[i] > 0176) {
+	funny = 1;
+	break;
+      }
+  }
+  if (!funny) {
+    put_string(s, outfp);
+    return;
+  }
+  int level = 0;
+  int i;
+  for (i = 0; i < len; i++)
+    if (str[i] == '(')
+      level++;
+    else if (str[i] == ')' && --level < 0)
+      break;
+  putc('(', outfp);
+  for (i = 0; i < len; i++)
+    switch (str[i]) {
+    case '(':
+    case ')':
+      if (level != 0)
+	putc('\\', outfp);
+      putc(str[i], outfp);
+      break;
+    case '\\':
+      fputs("\\\\", outfp);
+      break;
+    case '\n':
+      fputs("\\n", outfp);
+      break;
+    case '\r':
+      fputs("\\r", outfp);
+      break;
+    case '\t':
+      fputs("\\t", outfp);
+      break;
+    case '\b':
+      fputs("\\b", outfp);
+      break;
+    case '\f':
+      fputs("\\f", outfp);
+      break;
+    default:
+      if (str[i] < 040 || str[i] > 0176)
+	fprintf(outfp, "\\%03o", str[i] & 0377);
+      else
+	putc(str[i], outfp);
+      break;
+    }
+  putc(')', outfp);
+}
+
+void resource_manager::print_extensions_comment(FILE *outfp)
+{
+  if (extensions) {
+    fputs("%%Extensions:", outfp);
+    for (int i = 0; i < NEXTENSIONS; i++)
+      if (extensions & (1 << i)) {
+	putc(' ', outfp);
+	fputs(extension_table[i], outfp);
+      }
+    putc('\n', outfp);
+  }
+}
+
+void resource_manager::print_language_level_comment(FILE *outfp)
+{
+  if (language_level)
+    fprintf(outfp, "%%%%LanguageLevel: %u\n", language_level);
+}
diff --git a/contrib/groff/src/devices/grotty/Makefile.sub b/contrib/groff/src/devices/grotty/Makefile.sub
index 8802674..2ec77a5 100644
--- a/contrib/groff/src/devices/grotty/Makefile.sub
+++ b/contrib/groff/src/devices/grotty/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grotty.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=tty.$(OBJEXT)
-CCSRCS=$(srcdir)/tty.cc
+CCSRCS=$(srcdir)/tty.cpp
diff --git a/contrib/groff/src/devices/grotty/tty.cpp b/contrib/groff/src/devices/grotty/tty.cpp
new file mode 100644
index 0000000..812ebf8
--- /dev/null
+++ b/contrib/groff/src/devices/grotty/tty.cpp
@@ -0,0 +1,815 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "device.h"
+#include "ptable.h"
+
+declare_ptable(char)
+implement_ptable(char)
+
+extern "C" const char *Version_string;
+
+#define putstring(s) fputs(s, stdout)
+
+#ifndef SHRT_MIN
+#define SHRT_MIN (-32768)
+#endif
+
+#ifndef SHRT_MAX
+#define SHRT_MAX 32767
+#endif
+
+#define TAB_WIDTH 8
+
+static int horizontal_tab_flag = 0;
+static int form_feed_flag = 0;
+static int bold_flag = 1;
+static int underline_flag = 1;
+static int overstrike_flag = 1;
+static int draw_flag = 1;
+static int italic_flag = 0;
+static int reverse_flag = 0;
+static int old_drawing_scheme = 0;
+
+enum {
+  UNDERLINE_MODE = 0x01,
+  BOLD_MODE = 0x02,
+  VDRAW_MODE = 0x04,
+  HDRAW_MODE = 0x08,
+  CU_MODE = 0x10,
+  COLOR_CHANGE = 0x20
+};
+
+// Mode to use for bold-underlining.
+static unsigned char bold_underline_mode = BOLD_MODE|UNDERLINE_MODE;
+
+#ifndef IS_EBCDIC_HOST
+#define CSI "\033["
+#else
+#define CSI "\047["
+#endif
+
+// SGR handling (ISO 6429)
+#define SGR_BOLD CSI "1m"
+#define SGR_NO_BOLD CSI "22m"
+#define SGR_ITALIC CSI "3m"
+#define SGR_NO_ITALIC CSI "23m"
+#define SGR_UNDERLINE CSI "4m"
+#define SGR_NO_UNDERLINE CSI "24m"
+#define SGR_REVERSE CSI "7m"
+#define SGR_NO_REVERSE CSI "27m"
+// many terminals can't handle `CSI 39 m' and `CSI 49 m' to reset
+// the foreground and bachground color, respectively; thus we use
+// `CSI 0 m' exclusively
+#define SGR_DEFAULT CSI "0m"
+
+#define DEFAULT_COLOR_IDX -1
+
+class tty_font : public font {
+  tty_font(const char *);
+  unsigned char mode;
+public:
+  ~tty_font();
+  unsigned char get_mode() { return mode; }
+#if 0
+  void handle_x_command(int argc, const char **argv);
+#endif
+  static tty_font *load_tty_font(const char *);
+};
+
+tty_font *tty_font::load_tty_font(const char *s)
+{
+  tty_font *f = new tty_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  const char *num = f->get_internal_name();
+  long n;
+  if (num != 0 && (n = strtol(num, 0, 0)) != 0)
+    f->mode = int(n & (BOLD_MODE|UNDERLINE_MODE));
+  if (!underline_flag)
+    f->mode &= ~UNDERLINE_MODE;
+  if (!bold_flag)
+    f->mode &= ~BOLD_MODE;
+  if ((f->mode & (BOLD_MODE|UNDERLINE_MODE)) == (BOLD_MODE|UNDERLINE_MODE))
+    f->mode = (f->mode & ~(BOLD_MODE|UNDERLINE_MODE)) | bold_underline_mode;
+  return f;
+}
+
+tty_font::tty_font(const char *nm)
+: font(nm), mode(0)
+{
+}
+
+tty_font::~tty_font()
+{
+}
+
+#if 0
+void tty_font::handle_x_command(int argc, const char **argv)
+{
+  if (argc >= 1 && strcmp(argv[0], "bold") == 0)
+    mode |= BOLD_MODE;
+  else if (argc >= 1 && strcmp(argv[0], "underline") == 0)
+    mode |= UNDERLINE_MODE;
+}
+#endif
+
+class glyph {
+  static glyph *free_list;
+public:
+  glyph *next;
+  short hpos;
+  unsigned int code;
+  unsigned char mode;
+  char back_color_idx;
+  char fore_color_idx;
+  void *operator new(size_t);
+  void operator delete(void *);
+  inline int draw_mode() { return mode & (VDRAW_MODE|HDRAW_MODE); }
+  inline int order() {
+    return mode & (VDRAW_MODE|HDRAW_MODE|CU_MODE|COLOR_CHANGE); }
+};
+
+glyph *glyph::free_list = 0;
+
+void *glyph::operator new(size_t)
+{
+  if (!free_list) {
+    const int BLOCK = 1024;
+    free_list = (glyph *)new char[sizeof(glyph) * BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK - 1].next = 0;
+  }
+  glyph *p = free_list;
+  free_list = free_list->next;
+  p->next = 0;
+  return p;
+}
+
+void glyph::operator delete(void *p)
+{
+  if (p) {
+    ((glyph *)p)->next = free_list;
+    free_list = (glyph *)p;
+  }
+}
+
+class tty_printer : public printer {
+  int is_utf8;
+  glyph **lines;
+  int nlines;
+  int cached_v;
+  int cached_vpos;
+  char curr_fore_idx;
+  char curr_back_idx;
+  int is_underline;
+  int is_bold;
+  int cu_flag;
+  PTABLE(char) tty_colors;
+  void make_underline();
+  void make_bold(unsigned int);
+  char color_to_idx(color *col);
+  void add_char(unsigned int, int, int, color *, color *, unsigned char);
+  char *make_rgb_string(unsigned int, unsigned int, unsigned int);
+  int tty_color(unsigned int, unsigned int, unsigned int, char *,
+		char = DEFAULT_COLOR_IDX);
+public:
+  tty_printer(const char *device);
+  ~tty_printer();
+  void set_char(int, font *, const environment *, int, const char *name);
+  void draw(int code, int *p, int np, const environment *env);
+  void special(char *arg, const environment *env, char type);
+  void change_color(const environment * const env);
+  void change_fill_color(const environment * const env);
+  void put_char(unsigned int);
+  void put_color(char, int);
+  void begin_page(int) { }
+  void end_page(int page_length);
+  font *make_font(const char *);
+};
+
+char *tty_printer::make_rgb_string(unsigned int r,
+				   unsigned int g,
+				   unsigned int b)
+{
+  char *s = new char[8];
+  s[0] = char(r >> 8);
+  s[1] = char(r & 0xff);
+  s[2] = char(g >> 8);
+  s[3] = char(g & 0xff);
+  s[4] = char(b >> 8);
+  s[5] = char(b & 0xff);
+  s[6] = char(0x80);
+  s[7] = 0;
+  // avoid null-bytes in string
+  for (int i = 0; i < 6; i++)
+    if (!s[i]) {
+      s[i] = 1;
+      s[6] |= 1 << i;
+    }
+  return s;
+}
+
+int tty_printer::tty_color(unsigned int r,
+			   unsigned int g,
+			   unsigned int b, char *idx, char value)
+{
+  int unknown_color = 0;
+  char *s = make_rgb_string(r, g, b);
+  char *i = tty_colors.lookup(s);
+  if (!i) {
+    unknown_color = 1;
+    i = new char[1];
+    *i = value;
+    tty_colors.define(s, i);
+  }
+  *idx = *i;
+  a_delete s;
+  return unknown_color;
+}
+
+tty_printer::tty_printer(const char *device) : cached_v(0)
+{
+  is_utf8 = !strcmp(device, "utf8");
+  char dummy;
+  // black, white
+  (void)tty_color(0, 0, 0, &dummy, 0);
+  (void)tty_color(color::MAX_COLOR_VAL,
+		  color::MAX_COLOR_VAL,
+		  color::MAX_COLOR_VAL, &dummy, 7);
+  // red, green, blue
+  (void)tty_color(color::MAX_COLOR_VAL, 0, 0, &dummy, 1);
+  (void)tty_color(0, color::MAX_COLOR_VAL, 0, &dummy, 2);
+  (void)tty_color(0, 0, color::MAX_COLOR_VAL, &dummy, 4);
+  // yellow, magenta, cyan
+  (void)tty_color(color::MAX_COLOR_VAL, color::MAX_COLOR_VAL, 0, &dummy, 3);
+  (void)tty_color(color::MAX_COLOR_VAL, 0, color::MAX_COLOR_VAL, &dummy, 5);
+  (void)tty_color(0, color::MAX_COLOR_VAL, color::MAX_COLOR_VAL, &dummy, 6);
+  nlines = 66;
+  lines = new glyph *[nlines];
+  for (int i = 0; i < nlines; i++)
+    lines[i] = 0;
+  cu_flag = 0;
+}
+
+tty_printer::~tty_printer()
+{
+  a_delete lines;
+}
+
+void tty_printer::make_underline()
+{
+  if (old_drawing_scheme) {
+    putchar('_');
+    putchar('\b');
+  }
+  else {
+    if (!is_underline) {
+      if (italic_flag)
+	putstring(SGR_ITALIC);
+      else if (reverse_flag)
+	putstring(SGR_REVERSE);
+      else
+	putstring(SGR_UNDERLINE);
+    }
+    is_underline = 1;
+  }
+}
+
+void tty_printer::make_bold(unsigned int c)
+{
+  if (old_drawing_scheme) {
+    put_char(c);
+    putchar('\b');
+  }
+  else {
+    if (!is_bold)
+      putstring(SGR_BOLD);
+    is_bold = 1;
+  }
+}
+
+char tty_printer::color_to_idx(color *col)
+{
+  if (col->is_default())
+    return DEFAULT_COLOR_IDX;
+  unsigned int r, g, b;
+  col->get_rgb(&r, &g, &b);
+  char idx;
+  if (tty_color(r, g, b, &idx)) {
+    char *s = col->print_color();
+    error("Unknown color (%1) mapped to default", s);
+    a_delete s;
+  }
+  return idx;
+}
+
+void tty_printer::set_char(int i, font *f, const environment *env,
+			   int w, const char *)
+{
+  if (w != font::hor)
+    fatal("width of character not equal to horizontal resolution");
+  add_char(f->get_code(i),
+	   env->hpos, env->vpos,
+	   env->col, env->fill,
+	   ((tty_font *)f)->get_mode());
+}
+
+void tty_printer::add_char(unsigned int c,
+			   int h, int v,
+			   color *fore, color *back,
+			   unsigned char mode)
+{
+#if 0
+  // This is too expensive.
+  if (h % font::hor != 0)
+    fatal("horizontal position not a multiple of horizontal resolution");
+#endif
+  int hpos = h / font::hor;
+  if (hpos < SHRT_MIN || hpos > SHRT_MAX) {
+    error("character with ridiculous horizontal position discarded");
+    return;
+  }
+  int vpos;
+  if (v == cached_v && cached_v != 0)
+    vpos = cached_vpos;
+  else {
+    if (v % font::vert != 0)
+      fatal("vertical position not a multiple of vertical resolution");
+    vpos = v / font::vert;
+    if (vpos > nlines) {
+      glyph **old_lines = lines;
+      lines = new glyph *[vpos + 1];
+      memcpy(lines, old_lines, nlines * sizeof(glyph *));
+      for (int i = nlines; i <= vpos; i++)
+	lines[i] = 0;
+      a_delete old_lines;
+      nlines = vpos + 1;
+    }
+    // Note that the first output line corresponds to groff
+    // position font::vert.
+    if (vpos <= 0) {
+      error("character above first line discarded");
+      return;
+    }
+    cached_v = v;
+    cached_vpos = vpos;
+  }
+  glyph *g = new glyph;
+  g->hpos = hpos;
+  g->code = c;
+  g->fore_color_idx = color_to_idx(fore);
+  g->back_color_idx = color_to_idx(back);
+  g->mode = mode;
+
+  // The list will be reversed later.  After reversal, it must be in
+  // increasing order of hpos, with COLOR_CHANGE and CU specials before
+  // HDRAW characters before VDRAW characters before normal characters
+  // at each hpos, and otherwise in order of occurrence.
+
+  glyph **pp;
+  for (pp = lines + (vpos - 1); *pp; pp = &(*pp)->next)
+    if ((*pp)->hpos < hpos
+	|| ((*pp)->hpos == hpos && (*pp)->order() >= g->order()))
+      break;
+  g->next = *pp;
+  *pp = g;
+}
+
+void tty_printer::special(char *arg, const environment *env, char type)
+{
+  if (type == 'u') {
+    add_char(*arg - '0', env->hpos, env->vpos, env->col, env->fill, CU_MODE);
+    return;
+  }
+  if (type != 'p')
+    return;
+  char *p;
+  for (p = arg; *p == ' ' || *p == '\n'; p++)
+    ;
+  char *tag = p;
+  for (; *p != '\0' && *p != ':' && *p != ' ' && *p != '\n'; p++)
+    ;
+  if (*p == '\0' || strncmp(tag, "tty", p - tag) != 0) {
+    error("X command without `tty:' tag ignored");
+    return;
+  }
+  p++;
+  for (; *p == ' ' || *p == '\n'; p++)
+    ;
+  char *command = p;
+  for (; *p != '\0' && *p != ' ' && *p != '\n'; p++)
+    ;
+  if (*command == '\0') {
+    error("empty X command ignored");
+    return;
+  }
+  if (strncmp(command, "sgr", p - command) == 0) {
+    for (; *p == ' ' || *p == '\n'; p++)
+      ;
+    int n;
+    if (*p != '\0' && sscanf(p, "%d", &n) == 1 && n == 0)
+      old_drawing_scheme = 1;
+    else
+      old_drawing_scheme = 0;
+  }
+}
+
+void tty_printer::change_color(const environment * const env)
+{
+  add_char(0, env->hpos, env->vpos, env->col, env->fill, COLOR_CHANGE);
+}
+
+void tty_printer::change_fill_color(const environment * const env)
+{
+  add_char(0, env->hpos, env->vpos, env->col, env->fill, COLOR_CHANGE);
+}
+
+void tty_printer::draw(int code, int *p, int np, const environment *env)
+{
+  if (code != 'l' || !draw_flag)
+    return;
+  if (np != 2) {
+    error("2 arguments required for line");
+    return;
+  }
+  if (p[0] == 0) {
+    // vertical line
+    int v = env->vpos;
+    int len = p[1];
+    if (len < 0) {
+      v += len;
+      len = -len;
+    }
+    while (len >= 0) {
+      add_char('|', env->hpos, v, env->col, env->fill, VDRAW_MODE);
+      len -= font::vert;
+      v += font::vert;
+    }
+  }
+  if (p[1] == 0) {
+    // horizontal line
+    int h = env->hpos;
+    int len = p[0];
+    if (len < 0) {
+      h += len;
+      len = -len;
+    }
+    while (len >= 0) {
+      add_char('-', h, env->vpos, env->col, env->fill, HDRAW_MODE);
+      len -= font::hor;
+      h += font::hor;
+    }
+  }
+}
+
+void tty_printer::put_char(unsigned int wc)
+{
+  if (is_utf8 && wc >= 0x80) {
+    char buf[6 + 1];
+    int count;
+    char *p = buf;
+    if (wc < 0x800)
+      count = 1, *p = (unsigned char)((wc >> 6) | 0xc0);
+    else if (wc < 0x10000)
+      count = 2, *p = (unsigned char)((wc >> 12) | 0xe0);
+    else if (wc < 0x200000)
+      count = 3, *p = (unsigned char)((wc >> 18) | 0xf0);
+    else if (wc < 0x4000000)
+      count = 4, *p = (unsigned char)((wc >> 24) | 0xf8);
+    else if (wc <= 0x7fffffff)
+      count = 5, *p = (unsigned char)((wc >> 30) | 0xfC);
+    else
+      return;
+    do *++p = (unsigned char)(((wc >> (6 * --count)) & 0x3f) | 0x80);
+      while (count > 0);
+    *++p = '\0';
+    putstring(buf);
+  }
+  else
+    putchar(wc);
+}
+
+void tty_printer::put_color(char color_index, int back)
+{
+  if (color_index == DEFAULT_COLOR_IDX) {
+    putstring(SGR_DEFAULT);
+    // set bold and underline again
+    if (is_bold)
+      putstring(SGR_BOLD);
+    if (is_underline) {
+      if (italic_flag)
+	putstring(SGR_ITALIC);
+      else if (reverse_flag)
+	putstring(SGR_REVERSE);
+      else
+	putstring(SGR_UNDERLINE);
+    }
+    // set other color again
+    back = !back;
+    color_index = back ? curr_back_idx : curr_fore_idx;
+  }
+  if (color_index != DEFAULT_COLOR_IDX) {
+    putstring(CSI);
+    if (back)
+      putchar('4');
+    else
+      putchar('3');
+    putchar(color_index + '0');
+    putchar('m');
+  }
+}
+
+void tty_printer::end_page(int page_length)
+{
+  if (page_length % font::vert != 0)
+    error("vertical position at end of page not multiple of vertical resolution");
+  int lines_per_page = page_length / font::vert;
+  int last_line;
+  for (last_line = nlines; last_line > 0; last_line--)
+    if (lines[last_line - 1])
+      break;
+#if 0
+  if (last_line > lines_per_page) {
+    error("characters past last line discarded");
+    do {
+      --last_line;
+      while (lines[last_line]) {
+	glyph *tem = lines[last_line];
+	lines[last_line] = tem->next;
+	delete tem;
+      }
+    } while (last_line > lines_per_page);
+  }
+#endif
+  for (int i = 0; i < last_line; i++) {
+    glyph *p = lines[i];
+    lines[i] = 0;
+    glyph *g = 0;
+    while (p) {
+      glyph *tem = p->next;
+      p->next = g;
+      g = p;
+      p = tem;
+    }
+    int hpos = 0;
+    glyph *nextp;
+    curr_fore_idx = DEFAULT_COLOR_IDX;
+    curr_back_idx = DEFAULT_COLOR_IDX;
+    is_underline = 0;
+    is_bold = 0;
+    for (p = g; p; delete p, p = nextp) {
+      nextp = p->next;
+      if (p->mode & CU_MODE) {
+	cu_flag = p->code;
+	continue;
+      }
+      if (nextp && p->hpos == nextp->hpos) {
+	if (p->draw_mode() == HDRAW_MODE &&
+	    nextp->draw_mode() == VDRAW_MODE) {
+	  nextp->code = '+';
+	  continue;
+	}
+	if (p->draw_mode() != 0 && p->draw_mode() == nextp->draw_mode()) {
+	  nextp->code = p->code;
+	  continue;
+	}
+	if (!overstrike_flag)
+	  continue;
+      }
+      if (hpos > p->hpos) {
+	do {
+	  putchar('\b');
+	  hpos--;
+	} while (hpos > p->hpos);
+      }
+      else {
+	if (horizontal_tab_flag) {
+	  for (;;) {
+	    int next_tab_pos = ((hpos + TAB_WIDTH) / TAB_WIDTH) * TAB_WIDTH;
+	    if (next_tab_pos > p->hpos)
+	      break;
+	    if (cu_flag)
+	      make_underline();
+	    else if (!old_drawing_scheme && is_underline) {
+	      if (italic_flag)
+		putstring(SGR_NO_ITALIC);
+	      else if (reverse_flag)
+		putstring(SGR_NO_REVERSE);
+	      else
+		putstring(SGR_NO_UNDERLINE);
+	      is_underline = 0;
+	    }
+	    putchar('\t');
+	    hpos = next_tab_pos;
+	  }
+	}
+	for (; hpos < p->hpos; hpos++) {
+	  if (cu_flag)
+	    make_underline();
+	  else if (!old_drawing_scheme && is_underline) {
+	    if (italic_flag)
+	      putstring(SGR_NO_ITALIC);
+	    else if (reverse_flag)
+	      putstring(SGR_NO_REVERSE);
+	    else
+	      putstring(SGR_NO_UNDERLINE);
+	    is_underline = 0;
+	  }
+	  putchar(' ');
+	}
+      }
+      assert(hpos == p->hpos);
+      if (p->mode & COLOR_CHANGE) {
+	if (!old_drawing_scheme) {
+	  if (p->fore_color_idx != curr_fore_idx) {
+	    put_color(p->fore_color_idx, 0);
+	    curr_fore_idx = p->fore_color_idx;
+	  }
+	  if (p->back_color_idx != curr_back_idx) {
+	    put_color(p->back_color_idx, 1);
+	    curr_back_idx = p->back_color_idx;
+	  }
+	}
+	continue;
+      }
+      if (p->mode & UNDERLINE_MODE)
+	make_underline();
+      else if (!old_drawing_scheme && is_underline) {
+	if (italic_flag)
+	  putstring(SGR_NO_ITALIC);
+	else if (reverse_flag)
+	  putstring(SGR_NO_REVERSE);
+	else
+	  putstring(SGR_NO_UNDERLINE);
+	is_underline = 0;
+      }
+      if (p->mode & BOLD_MODE)
+	make_bold(p->code);
+      else if (!old_drawing_scheme && is_bold) {
+	putstring(SGR_NO_BOLD);
+	is_bold = 0;
+      }
+      if (!old_drawing_scheme) {
+	if (p->fore_color_idx != curr_fore_idx) {
+	  put_color(p->fore_color_idx, 0);
+	  curr_fore_idx = p->fore_color_idx;
+	}
+	if (p->back_color_idx != curr_back_idx) {
+	  put_color(p->back_color_idx, 1);
+	  curr_back_idx = p->back_color_idx;
+	}
+      }
+      put_char(p->code);
+      hpos++;
+    }
+    if (!old_drawing_scheme
+	&& (is_bold || is_underline
+	    || curr_fore_idx != DEFAULT_COLOR_IDX
+	    || curr_back_idx != DEFAULT_COLOR_IDX))
+      putstring(SGR_DEFAULT);
+    putchar('\n');
+  }
+  if (form_feed_flag) {
+    if (last_line < lines_per_page)
+      putchar('\f');
+  }
+  else {
+    for (; last_line < lines_per_page; last_line++)
+      putchar('\n');
+  }
+}
+
+font *tty_printer::make_font(const char *nm)
+{
+  return tty_font::load_tty_font(nm);
+}
+
+printer *make_printer()
+{
+  return new tty_printer(device);
+}
+
+static void usage(FILE *stream);
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  if (getenv("GROFF_NO_SGR"))
+    old_drawing_scheme = 1;
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "bBcdfF:hioruUv", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'v':
+      printf("GNU grotty (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case 'i':
+      // Use italic font instead of underlining.
+      italic_flag = 1;
+      break;
+    case 'b':
+      // Do not embolden by overstriking.
+      bold_flag = 0;
+      break;
+    case 'c':
+      // Use old scheme for emboldening and underline.
+      old_drawing_scheme = 1;
+      break;
+    case 'u':
+      // Do not underline.
+      underline_flag = 0;
+      break;
+    case 'o':
+      // Do not overstrike (other than emboldening and underlining).
+      overstrike_flag = 0;
+      break;
+    case 'r':
+      // Use reverse mode instead of underlining.
+      reverse_flag = 1;
+      break;
+    case 'B':
+      // Do bold-underlining as bold.
+      bold_underline_mode = BOLD_MODE;
+      break;
+    case 'U':
+      // Do bold-underlining as underlining.
+      bold_underline_mode = UNDERLINE_MODE;
+      break;
+    case 'h':
+      // Use horizontal tabs.
+      horizontal_tab_flag = 1;
+      break;
+    case 'f':
+      form_feed_flag = 1;
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'd':
+      // Ignore \D commands.
+      draw_flag = 0;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  if (old_drawing_scheme) {
+    italic_flag = 0;
+    reverse_flag = 0;
+  }
+  else {
+    bold_underline_mode = BOLD_MODE|UNDERLINE_MODE;
+    bold_flag = 1;
+    underline_flag = 1;
+  }
+  if (optind >= argc)
+    do_file("-");
+  else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-bBcdfhioruUv] [-F dir] [files ...]\n",
+	  program_name);
+}
diff --git a/contrib/groff/src/include/color.h b/contrib/groff/src/include/color.h
index 6888da1..205f70e 100644
--- a/contrib/groff/src/include/color.h
+++ b/contrib/groff/src/include/color.h
@@ -2,9 +2,9 @@
 
 /* <groff_src_dir>/src/include/color.h
 
-Last update: 10 Apr 2002
+Last update: 14 Feb 2003
 
-Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
     Written by Gaius Mulley <gaius@glam.ac.uk>
 
 This file is part of groff.
@@ -31,6 +31,8 @@ class color {
 private:
   color_scheme scheme;
   unsigned int components[4];
+  color *next;
+  static color *free_list;
 
   int read_encoding(const color_scheme, const char * const,
 		    const size_t);
@@ -39,6 +41,9 @@ public:
   enum {MAX_COLOR_VAL = 0xffff};
   color() : scheme(DEFAULT){}
   color(const color * const);
+  ~color();
+  void *operator new(size_t);
+  void operator delete(void *);
 
   int operator==(const color & c) const;
   int operator!=(const color & c) const;
@@ -71,6 +76,8 @@ public:
   void get_cmyk(unsigned int *c, unsigned int *m,
 		unsigned int *y, unsigned int *k) const;
   void get_gray(unsigned int *g) const;
+
+  char *print_color();
 };
 
 #define Cyan components[0]
diff --git a/contrib/groff/src/include/config.hin b/contrib/groff/src/include/config.hin
index 850e317..13a3630 100644
--- a/contrib/groff/src/include/config.hin
+++ b/contrib/groff/src/include/config.hin
@@ -1,4 +1,4 @@
-/* src/include/config.hin.  Generated automatically from configure.ac by autoheader.  */
+/* src/include/config.hin.  Generated from configure.ac by autoheader.  */
 
 /* Define if your C++ doesn't understand `delete []'. */
 #undef ARRAY_DELETE_NEEDS_SIZE
@@ -9,76 +9,88 @@
 /* Define if you have a C++ <osfcn.h>. */
 #undef HAVE_CC_OSFCN_H
 
-/* Define if you have the <dirent.h> header file. */
+/* Define if you have a C++ <stdint.h>. */
+#undef HAVE_CC_STDINT_H
+
+/* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
-/* Define if you have the `fmod' function. */
+/* Define to 1 if you have the `fmod' function. */
 #undef HAVE_FMOD
 
-/* Define if you have the `getcwd' function. */
+/* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define if you have the `getpagesize' function. */
+/* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the `gettimeofday' function. */
+/* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define if you have the <limits.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isatty' function. */
+#undef HAVE_ISATTY
+
+/* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define if you have the <math.h> header file. */
+/* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
 /* Define if you have mkstemp(). */
 #undef HAVE_MKSTEMP
 
-/* Define if you have a working `mmap' system call. */
+/* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define if you have the `putenv' function. */
+/* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
-/* Define if you have the `rename' function. */
+/* Define to 1 if you have the `rename' function. */
 #undef HAVE_RENAME
 
-/* Define if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
 
-/* Define if you have the `isatty' function. */
-#undef HAVE_ISATTY
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
 
-/* Define if you have the <stdint.h> header file. */
+/* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define if you have the `strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the `strerror' function. */
+/* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
-/* Define if you have the <strings.h> header file. */
+/* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define if you have the `strncasecmp' function. */
+/* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
-/* Define if you have the `strsep' function. */
+/* Define to 1 if you have the `strsep' function. */
 #undef HAVE_STRSEP
 
-/* Define if you have the `strtol' function. */
+/* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
 /* Define if <math.h> defines struct exception. */
 #undef HAVE_STRUCT_EXCEPTION
 
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the <sys/dir.h> header file. */
 #undef HAVE_SYS_DIR_H
 
 /* Define if you have sys_errlist in <errno.h> or in <stdio.h>. */
@@ -87,10 +99,16 @@
 /* Define if you have sysnerr in <errno.h> or <stdio.h>. */
 #undef HAVE_SYS_NERR
 
-/* Define if you have the <sys/time.h> header file. */
+/* 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/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
-/* Define if you have the <unistd.h> header file. */
+/* 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 if the host's encoding is EBCDIC. */
@@ -114,12 +132,36 @@
 /* Define if your C++ doesn't declare putenv(). */
 #undef NEED_DECLARATION_PUTENV
 
+/* Define if your C++ doesn't declare rand(). */
+#undef NEED_DECLARATION_RAND
+
+/* Define if your C++ doesn't declare snprintf(). */
+#undef NEED_DECLARATION_SNPRINTF
+
+/* Define if your C++ doesn't declare srand(). */
+#undef NEED_DECLARATION_SRAND
+
 /* Define if your C++ doesn't declare strcasecmp(). */
 #undef NEED_DECLARATION_STRCASECMP
 
 /* Define if your C++ doesn't declare strncasecmp(). */
 #undef NEED_DECLARATION_STRNCASECMP
 
+/* 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 version of this package. */
+#undef PACKAGE_VERSION
+
 /* Define if the printer's page size is A4. */
 #undef PAGEA4
 
@@ -129,7 +171,10 @@
 /* Define if srand() returns void not int. */
 #undef RET_TYPE_SRAND_IS_VOID
 
-/* Define if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
 #undef SYS_SIGLIST_DECLARED
 
 /* Define if your C++ compiler uses a traditional (Reiser) preprocessor. */
diff --git a/contrib/groff/src/include/driver.h b/contrib/groff/src/include/driver.h
index d957928..b15d6c9 100644
--- a/contrib/groff/src/include/driver.h
+++ b/contrib/groff/src/include/driver.h
@@ -34,4 +34,3 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include "geometry.h"
 
 void do_file(const char *);
-extern printer *pr;
diff --git a/contrib/groff/src/include/error.h b/contrib/groff/src/include/error.h
index d26e2c7..e227682 100644
--- a/contrib/groff/src/include/error.h
+++ b/contrib/groff/src/include/error.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -55,4 +55,4 @@ extern void warning(const char *,
 extern const char *program_name;
 extern int current_lineno;
 extern const char *current_filename;
-
+extern const char *current_source_filename;
diff --git a/contrib/groff/src/include/html-strings.h b/contrib/groff/src/include/html-strings.h
index 23a36d1..fd757c3f 100644
--- a/contrib/groff/src/include/html-strings.h
+++ b/contrib/groff/src/include/html-strings.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk).
 
 This file is part of groff.
@@ -20,7 +20,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /*
  *  defines the image tags issued by the pre-processors (tbl, pic, eqn)
- *  and later detected by pre-html.cc
+ *  and later detected by pre-html.cpp
  */
 
 #define HTML_IMAGE_INLINE_BEGIN	"\\O[HTML-IMAGE-INLINE-BEGIN]"
diff --git a/contrib/groff/src/include/lib.h b/contrib/groff/src/include/lib.h
index c6468e0..bebad98 100644
--- a/contrib/groff/src/include/lib.h
+++ b/contrib/groff/src/include/lib.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -44,6 +44,12 @@ extern "C" {
 #include <getopt.h>
 #endif
 
+#ifdef HAVE_SETLOCALE
+#include <locale.h>
+#else
+#define setlocale(category, locale) do {} while(0)
+#endif
+
 char *strsave(const char *s);
 int is_prime(unsigned);
 
@@ -53,7 +59,8 @@ int is_prime(unsigned);
 #include <strings.h>
 #endif
 
-#ifndef HAVE_SNPRINTF
+/* HP-UX 10.20 doesn't declare snprintf() */
+#if !defined(HAVE_SNPRINTF) || defined(NEED_DECLARATION_SNPRINTF)
 #include <stdarg.h>
 extern "C" {
   int snprintf(char *, size_t, const char *, /*args*/ ...);
@@ -63,7 +70,7 @@ extern "C" {
 
 #ifndef HAVE_MKSTEMP
 /* since mkstemp() is defined as a real C++ function if taken from
-   groff's mkstemp.cc we need a declaration */
+   groff's mkstemp.cpp we need a declaration */
 int mkstemp(char *tmpl);
 #endif /* HAVE_MKSTEMP */
 
@@ -100,6 +107,10 @@ extern "C" {
   int strcasecmp(const char *, const char *);
 }
 #endif /* NEED_DECLARATION_STRCASECMP */
+#else /* not HAVE_STRCASECMP */
+extern "C" {
+  int strcasecmp(const char *, const char *);
+}
 #endif /* HAVE_STRCASECMP */
 
 #if !defined(_AIX) && !defined(sinix) && !defined(__sinix__)
@@ -110,17 +121,13 @@ extern "C" {
   int strncasecmp(const char *, const char *, int);
 }
 #endif /* NEED_DECLARATION_STRNCASECMP */
+#else /* not HAVE_STRNCASECMP */
+extern "C" {
+  int strncasecmp(const char *, const char *, size_t);
+}
 #endif /* HAVE_STRNCASECMP */
 #endif /* !_AIX && !sinix && !__sinix__ */
 
-#ifndef HAVE_STRCASECMP
-#define strcasecmp(a,b) strcmp((a),(b))
-#endif
-
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp(a,b,c) strncmp((a),(b),(c))
-#endif
-
 #ifdef HAVE_CC_LIMITS_H
 #include <limits.h>
 #else /* not HAVE_CC_LIMITS_H */
diff --git a/contrib/groff/src/include/nonposix.h b/contrib/groff/src/include/nonposix.h
index 86aa2e0..73422d9 100644
--- a/contrib/groff/src/include/nonposix.h
+++ b/contrib/groff/src/include/nonposix.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
      Written by Eli Zaretskii (eliz@is.elta.co.il)
 
 This file is part of groff.
@@ -26,7 +26,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 # endif
 #endif
 
-#if defined(__MSDOS__) \
+#if defined(__MSDOS__) || defined(__EMX__) \
     || (defined(_WIN32) && !defined(_UWIN) && !defined(__CYGWIN__))
 
 /* Binary I/O nuisances.  Note: "setmode" is right for DJGPP and
@@ -60,9 +60,13 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 /* The system shell.  Groff assumes a Unixy shell, but non-Posix
    systems don't have standard places where it lives, and might not
    have it installed to begin with.  We want to give them some leeway.  */
-# define BSHELL        (system_shell_name())
-# define BSHELL_DASH_C (system_shell_dash_c())
-# define IS_BSHELL(s)  (is_system_shell(s))
+# ifdef __EMX__
+#  define getcwd(b,s)  _getcwd2(b,s)
+# else
+#  define BSHELL        (system_shell_name())
+#  define BSHELL_DASH_C (system_shell_dash_c())
+#  define IS_BSHELL(s)  (is_system_shell(s))
+# endif
 
 /* The separator for directories in PATH and other environment
    variables.  */
@@ -96,6 +100,9 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /* Defaults, for Posix systems.  */
 
+#ifndef SET_BINARY
+# define SET_BINARY(f) do {} while(0)
+#endif
 #ifndef FOPEN_RB
 # define FOPEN_RB      "r"
 #endif
diff --git a/contrib/groff/src/include/printer.h b/contrib/groff/src/include/printer.h
index 4d5cbf5..3976215 100644
--- a/contrib/groff/src/include/printer.h
+++ b/contrib/groff/src/include/printer.h
@@ -2,7 +2,7 @@
 
 // <groff_src_dir>/src/include/printer.h
 
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
    Written by James Clark (jjc@jclark.com)
@@ -30,10 +30,10 @@
 /* Description
 
    The class `printer' performs the postprocessing.  Each
-   postprocessor only need to implement a derived class of `printer' and
+   postprocessor only needs to implement a derived class of `printer' and
    a suitable function `make_printer' for the device-dependent tasks.
    Then the methods of class `printer' are called automatically by
-   `do_file()' in `input.cc'.
+   `do_file()' in `input.cpp'.
 */
 
 #include "color.h"
@@ -67,8 +67,8 @@ public:
 		      int *widthp = 0);
   void set_special_char(const char *nm, const environment *env,
 			int *widthp = 0);
-  void set_numbered_char(int n, const environment *env,
-			 int *widthp = 0);
+  virtual void set_numbered_char(int n, const environment *env,
+				 int *widthp = 0);
   int set_char_and_width(const char *nm, const environment *env,
 			 int *widthp, font **f);
   font *get_font_from_index(int fontno);
@@ -85,6 +85,8 @@ public:
 		       char type = 'p');
 protected:
   font_pointer_list *font_list;
+  font **font_table;
+  int nfonts;
 
   // information about named characters
   int is_char_named;
@@ -94,8 +96,6 @@ protected:
   int named_char_n;
 
 private:
-  font **font_table;
-  int nfonts;
   font *find_font(const char *);
   virtual void set_char(int index, font *f, const environment *env,
 			int w, const char *name) = 0;
diff --git a/contrib/groff/src/include/ptable.h b/contrib/groff/src/include/ptable.h
index dc56add..ffbe8e6 100644
--- a/contrib/groff/src/include/ptable.h
+++ b/contrib/groff/src/include/ptable.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -67,6 +67,10 @@ public:									      \
 };
 
 
+// Keys (which are strings) are allocated and freed by PTABLE.
+// Values must be allocated by the caller (always using new[], not new)
+// and are freed by PTABLE.
+
 #define implement_ptable(T)						      \
 									      \
 PASSOC(T)::PASSOC(T)()							      \
@@ -84,7 +88,7 @@ PTABLE(T)::~PTABLE(T)()							      \
 {									      \
   for (unsigned i = 0; i < size; i++) {					      \
     a_delete v[i].key;							      \
-    delete v[i].val;							      \
+    a_delete v[i].val;							      \
   }									      \
   a_delete v;								      \
 }									      \
@@ -98,7 +102,7 @@ void PTABLE(T)::define(const char *key, T *val)				      \
        v[n].key != 0;							      \
        n = (n == 0 ? size - 1 : n - 1))					      \
     if (strcmp(v[n].key, key) == 0) {					      \
-      delete v[n].val;							      \
+      a_delete v[n].val;						      \
       v[n].val = val;							      \
       return;								      \
     }									      \
@@ -165,4 +169,3 @@ int PTABLE_ITERATOR(T)::next(const char **keyp, T **valp)		      \
     }									      \
   return 0;								      \
 }
-
diff --git a/contrib/groff/src/libs/libbib/Makefile.sub b/contrib/groff/src/libs/libbib/Makefile.sub
index 6e59d64..19dd439 100644
--- a/contrib/groff/src/libs/libbib/Makefile.sub
+++ b/contrib/groff/src/libs/libbib/Makefile.sub
@@ -6,9 +6,9 @@ OBJS=\
   search.$(OBJEXT) \
   map.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/common.cc \
-  $(srcdir)/index.cc \
-  $(srcdir)/linear.cc \
-  $(srcdir)/search.cc
+  $(srcdir)/common.cpp \
+  $(srcdir)/index.cpp \
+  $(srcdir)/linear.cpp \
+  $(srcdir)/search.cpp
 CSRCS=\
   $(srcdir)/map.c
diff --git a/contrib/groff/src/libs/libbib/common.cpp b/contrib/groff/src/libs/libbib/common.cpp
new file mode 100644
index 0000000..4b2bcca
--- /dev/null
+++ b/contrib/groff/src/libs/libbib/common.cpp
@@ -0,0 +1,38 @@
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+unsigned hash(const char *s, int len)
+{
+#if 0
+  unsigned h = 0, g;
+  while (*s != '\0') {
+    h <<= 4;
+    h += *s++;
+    if ((g = h & 0xf0000000) != 0) {
+      h ^= g >> 24;
+      h ^= g;
+    }
+  }
+#endif
+  unsigned h = 0;
+  while (--len >= 0)
+    h = *s++ + 65587*h;
+  return h;
+}
+
diff --git a/contrib/groff/src/libs/libbib/index.cpp b/contrib/groff/src/libs/libbib/index.cpp
new file mode 100644
index 0000000..3633df1
--- /dev/null
+++ b/contrib/groff/src/libs/libbib/index.cpp
@@ -0,0 +1,640 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <errno.h>
+
+#include "posix.h"
+#include "cset.h"
+#include "cmap.h"
+#include "errarg.h"
+#include "error.h"
+
+#include "refid.h"
+#include "search.h"
+#include "index.h"
+#include "defs.h"
+
+#include "nonposix.h"
+
+// Interface to mmap.
+extern "C" {
+  void *mapread(int fd, int len);
+  int unmap(void *, int len);
+}
+
+#if 0
+const 
+#endif
+int minus_one = -1;
+
+int verify_flag = 0;
+
+struct word_list;
+
+class index_search_item : public search_item {
+  search_item *out_of_date_files;
+  index_header header;
+  char *buffer;
+  void *map_addr;
+  int map_len;
+  tag *tags;
+  int *table;
+  int *lists;
+  char *pool;
+  char *key_buffer;
+  char *filename_buffer;
+  int filename_buflen;
+  char **common_words_table;
+  int common_words_table_size;
+  const char *ignore_fields;
+  time_t mtime;
+
+  const char *do_verify();
+  const int *search1(const char **pp, const char *end);
+  const int *search(const char *ptr, int length, int **temp_listp);
+  const char *munge_filename(const char *);
+  void read_common_words_file();
+  void add_out_of_date_file(int fd, const char *filename, int fid);
+public:
+  index_search_item(const char *, int);
+  ~index_search_item();
+  int load(int fd);
+  search_item_iterator *make_search_item_iterator(const char *);
+  int verify();
+  void check_files();
+  int next_filename_id() const;
+  friend class index_search_item_iterator;
+};
+
+class index_search_item_iterator : public search_item_iterator {
+  index_search_item *indx;
+  search_item_iterator *out_of_date_files_iter;
+  search_item *next_out_of_date_file;
+  const int *found_list;
+  int *temp_list;
+  char *buf;
+  int buflen;
+  linear_searcher searcher;
+  char *query;
+  int get_tag(int tagno, const linear_searcher &, const char **, int *,
+	      reference_id *);
+public:
+  index_search_item_iterator(index_search_item *, const char *);
+  ~index_search_item_iterator();
+  int next(const linear_searcher &, const char **, int *, reference_id *);
+};
+
+
+index_search_item::index_search_item(const char *filename, int fid)
+: search_item(filename, fid), out_of_date_files(0), buffer(0), map_addr(0),
+  map_len(0), key_buffer(0), filename_buffer(0), filename_buflen(0),
+  common_words_table(0)
+{
+}
+
+index_search_item::~index_search_item()
+{
+  if (buffer)
+    free(buffer);
+  if (map_addr) {
+    if (unmap(map_addr, map_len) < 0)
+      error("unmap: %1", strerror(errno));
+  }
+  while (out_of_date_files) {
+    search_item *tem = out_of_date_files;
+    out_of_date_files = out_of_date_files->next;
+    delete tem;
+  }
+  a_delete filename_buffer;
+  a_delete key_buffer;
+  if (common_words_table) {
+    for (int i = 0; i < common_words_table_size; i++)
+      a_delete common_words_table[i];
+    a_delete common_words_table;
+  }
+}
+
+class file_closer {
+  int *fdp;
+public:
+  file_closer(int &fd) : fdp(&fd) { }
+  ~file_closer() { close(*fdp); }
+};
+ 
+// Tell the compiler that a variable is intentionally unused.
+inline void unused(void *) { }
+
+int index_search_item::load(int fd)
+{
+  file_closer fd_closer(fd);	// close fd on return
+  unused(&fd_closer);
+  struct stat sb;
+  if (fstat(fd, &sb) < 0) {
+    error("can't fstat `%1': %2", name, strerror(errno));
+    return 0;
+  }
+  if (!S_ISREG(sb.st_mode)) {
+    error("`%1' is not a regular file", name);
+    return 0;
+  }
+  mtime = sb.st_mtime;
+  int size = int(sb.st_size);
+  char *addr;
+  map_addr = mapread(fd, size);
+  if (map_addr) {
+    addr = (char *)map_addr;
+    map_len = size;
+  }
+  else {
+    addr = buffer = (char *)malloc(size);
+    if (buffer == 0) {
+      error("can't allocate buffer for `%1'", name);
+      return 0;
+    }
+    char *ptr = buffer;
+    int bytes_to_read = size;
+    while (bytes_to_read > 0) {
+      int nread = read(fd, ptr, bytes_to_read);
+      if (nread == 0) {
+	error("unexpected EOF on `%1'", name);
+	return 0;
+      }
+      if (nread < 0) {
+	error("read error on `%1': %2", name, strerror(errno));
+	return 0;
+      }
+      bytes_to_read -= nread;
+      ptr += nread;
+    }
+  }
+  header = *(index_header *)addr;
+  if (header.magic != INDEX_MAGIC) {
+    error("`%1' is not an index file: wrong magic number", name);
+    return 0;
+  }
+  if (header.version != INDEX_VERSION) {
+    error("version number in `%1' is wrong: was %2, should be %3",
+	  name, header.version, INDEX_VERSION);
+    return 0;
+  }
+  int sz = (header.tags_size * sizeof(tag)
+	    + header.lists_size * sizeof(int)
+	    + header.table_size * sizeof(int)
+	    + header.strings_size
+	    + sizeof(header));
+  if (sz != size) {
+    error("size of `%1' is wrong: was %2, should be %3",
+	  name, size, sz);
+    return 0;
+  }
+  tags = (tag *)(addr + sizeof(header));
+  lists = (int *)(tags + header.tags_size);
+  table = (int *)(lists + header.lists_size);
+  pool = (char *)(table + header.table_size);
+  ignore_fields = strchr(strchr(pool, '\0') + 1, '\0') + 1;
+  key_buffer = new char[header.truncate];
+  read_common_words_file();
+  return 1;
+}
+
+const char *index_search_item::do_verify()
+{
+  if (tags == 0)
+    return "not loaded";
+  if (lists[header.lists_size - 1] >= 0)
+    return "last list element not negative";
+  int i;
+  for (i = 0; i < header.table_size; i++) {
+    int li = table[i];
+    if (li >= header.lists_size)
+      return "bad list index";
+    if (li >= 0) {
+      for (int *ptr = lists + li; *ptr >= 0; ptr++) {
+	if (*ptr >= header.tags_size)
+	  return "bad tag index";
+	if (*ptr >= ptr[1] && ptr[1] >= 0)
+	  return "list not ordered";
+      }
+    }
+  }
+  for (i = 0; i < header.tags_size; i++) {
+    if (tags[i].filename_index >= header.strings_size)
+      return "bad index in tags";
+    if (tags[i].length < 0)
+      return "bad length in tags";
+    if (tags[i].start < 0)
+      return "bad start in tags";
+  }
+  if (pool[header.strings_size - 1] != '\0')
+    return "last character in pool not nul";
+  return 0;
+}
+
+int index_search_item::verify()
+{
+  const char *reason = do_verify();
+  if (!reason)
+    return 1;
+  error("`%1' is bad: %2", name, reason);
+  return 0;
+}
+
+int index_search_item::next_filename_id() const
+{
+  return filename_id + header.strings_size + 1;
+}
+
+search_item_iterator *index_search_item::make_search_item_iterator(
+  const char *query)
+{
+  return new index_search_item_iterator(this, query);
+}
+
+search_item *make_index_search_item(const char *filename, int fid)
+{
+  char *index_filename = new char[strlen(filename) + sizeof(INDEX_SUFFIX)];
+  strcpy(index_filename, filename);
+  strcat(index_filename, INDEX_SUFFIX);
+  int fd = open(index_filename, O_RDONLY | O_BINARY);
+  if (fd < 0)
+    return 0;
+  index_search_item *item = new index_search_item(index_filename, fid);
+  a_delete index_filename;
+  if (!item->load(fd)) {
+    close(fd);
+    delete item;
+    return 0;
+  }
+  else if (verify_flag && !item->verify()) {
+    delete item;
+    return 0;
+  }
+  else {
+    item->check_files();
+    return item;
+  }
+}
+
+
+index_search_item_iterator::index_search_item_iterator(index_search_item *ind,
+						       const char *q)
+: indx(ind), out_of_date_files_iter(0), next_out_of_date_file(0), temp_list(0),
+  buf(0), buflen(0),
+  searcher(q, strlen(q), ind->ignore_fields, ind->header.truncate),
+  query(strsave(q))
+{
+  found_list = indx->search(q, strlen(q), &temp_list);
+  if (!found_list) {
+    found_list = &minus_one;
+    warning("all keys would have been discarded in constructing index `%1'",
+	    indx->name);
+  }
+}
+
+index_search_item_iterator::~index_search_item_iterator()
+{
+  a_delete temp_list;
+  a_delete buf;
+  a_delete query;
+  delete out_of_date_files_iter;
+}
+
+int index_search_item_iterator::next(const linear_searcher &,
+				     const char **pp, int *lenp,
+				     reference_id *ridp)
+{
+  if (found_list) {
+    for (;;) {
+      int tagno = *found_list;
+      if (tagno == -1)
+	break;
+      found_list++;
+      if (get_tag(tagno, searcher, pp, lenp, ridp))
+	return 1;
+    }
+    found_list = 0;
+    next_out_of_date_file = indx->out_of_date_files;
+  }
+  while (next_out_of_date_file) {
+    if (out_of_date_files_iter == 0)
+      out_of_date_files_iter
+	= next_out_of_date_file->make_search_item_iterator(query);
+    if (out_of_date_files_iter->next(searcher, pp, lenp, ridp))
+      return 1;
+    delete out_of_date_files_iter;
+    out_of_date_files_iter = 0;
+    next_out_of_date_file = next_out_of_date_file->next;
+  }
+  return 0;
+}
+
+int index_search_item_iterator::get_tag(int tagno,
+					const linear_searcher &searcher,
+					const char **pp, int *lenp,
+					reference_id *ridp)
+{
+  if (tagno < 0 || tagno >= indx->header.tags_size) {
+    error("bad tag number");
+    return 0;
+  }
+  tag *tp = indx->tags + tagno;
+  const char *filename = indx->munge_filename(indx->pool + tp->filename_index);
+  int fd = open(filename, O_RDONLY | O_BINARY);
+  if (fd < 0) {
+    error("can't open `%1': %2", filename, strerror(errno));
+    return 0;
+  }
+  struct stat sb;
+  if (fstat(fd, &sb) < 0) {
+    error("can't fstat: %1", strerror(errno));
+    close(fd);
+    return 0;
+  }
+  time_t mtime = sb.st_mtime;
+  if (mtime > indx->mtime) {
+    indx->add_out_of_date_file(fd, filename,
+			       indx->filename_id + tp->filename_index);
+    return 0;
+  }
+  int res = 0;
+  FILE *fp = fdopen(fd, FOPEN_RB);
+  if (!fp) {
+    error("fdopen failed");
+    close(fd);
+    return 0;
+  }
+  if (tp->start != 0 && fseek(fp, long(tp->start), 0) < 0)
+    error("can't seek on `%1': %2", filename, strerror(errno));
+  else {
+    int length = tp->length;
+    int err = 0;
+    if (length == 0) {
+      struct stat sb;
+      if (fstat(fileno(fp), &sb) < 0) {
+	error("can't stat `%1': %2", filename, strerror(errno));
+	err = 1;
+      }
+      else if (!S_ISREG(sb.st_mode)) {
+	error("`%1' is not a regular file", filename);
+	err = 1;
+      }
+      else
+	length = int(sb.st_size);
+    }
+    if (!err) {
+      if (length + 2 > buflen) {
+	a_delete buf;
+	buflen = length + 2;
+	buf = new char[buflen];
+      }
+      if (fread(buf + 1, 1, length, fp) != (size_t)length)
+	error("fread on `%1' failed: %2", filename, strerror(errno));
+      else {
+	buf[0] = '\n';
+	// Remove the CR characters from CRLF pairs.
+	int sidx = 1, didx = 1;
+	for ( ; sidx < length + 1; sidx++, didx++)
+	  {
+	    if (buf[sidx] == '\r')
+	      {
+		if (buf[++sidx] != '\n')
+		  buf[didx++] = '\r';
+		else
+		  length--;
+	      }
+	    if (sidx != didx)
+	      buf[didx] = buf[sidx];
+	  }
+	buf[length + 1] = '\n';
+	res = searcher.search(buf + 1, buf + 2 + length, pp, lenp);
+	if (res && ridp)
+	  *ridp = reference_id(indx->filename_id + tp->filename_index,
+			       tp->start);
+      }
+    }
+  }
+  fclose(fp);
+  return res;
+}
+
+const char *index_search_item::munge_filename(const char *filename)
+{
+  if (IS_ABSOLUTE(filename))
+    return filename;
+  const char *cwd = pool;
+  int need_slash = (cwd[0] != 0
+		    && strchr(DIR_SEPS, strchr(cwd, '\0')[-1]) == 0);
+  int len = strlen(cwd) + strlen(filename) + need_slash + 1;
+  if (len > filename_buflen) {
+    a_delete filename_buffer;
+    filename_buflen = len;
+    filename_buffer = new char[len];
+  }
+  strcpy(filename_buffer, cwd);
+  if (need_slash)
+    strcat(filename_buffer, "/");
+  strcat(filename_buffer, filename);
+  return filename_buffer;
+}
+
+const int *index_search_item::search1(const char **pp, const char *end)
+{
+  while (*pp < end && !csalnum(**pp))
+    *pp += 1;
+  if (*pp >= end)
+    return 0;
+  const char *start = *pp;
+  while (*pp < end && csalnum(**pp))
+    *pp += 1;
+  int len = *pp - start;
+  if (len < header.shortest)
+    return 0;
+  if (len > header.truncate)
+    len = header.truncate;
+  int is_number = 1;
+  for (int i = 0; i < len; i++)
+    if (csdigit(start[i]))
+      key_buffer[i] = start[i];
+    else {
+      key_buffer[i] = cmlower(start[i]);
+      is_number = 0;
+    }
+  if (is_number && !(len == 4 && start[0] == '1' && start[1] == '9'))
+    return 0;
+  unsigned hc = hash(key_buffer, len);
+  if (common_words_table) {
+    for (int h = hc % common_words_table_size;
+	 common_words_table[h];
+	 --h) {
+      if (strlen(common_words_table[h]) == (size_t)len
+	  && memcmp(common_words_table[h], key_buffer, len) == 0)
+	return 0;
+      if (h == 0)
+	h = common_words_table_size;
+    }
+  }
+  int li = table[int(hc % header.table_size)];
+  return li < 0 ? &minus_one : lists + li;
+}
+
+static void merge(int *result, const int *s1, const int *s2)
+{
+  for (; *s1 >= 0; s1++) {
+    while (*s2 >= 0 && *s2 < *s1)
+      s2++;
+    if (*s2 == *s1)
+      *result++ = *s2;
+  }
+  *result++ = -1;
+}
+
+const int *index_search_item::search(const char *ptr, int length,
+				     int **temp_listp)
+{
+  const char *end = ptr + length;
+  if (*temp_listp) {
+    a_delete *temp_listp;
+    *temp_listp = 0;
+  }
+  const int *first_list = 0;
+  while (ptr < end && (first_list = search1(&ptr, end)) == 0)
+    ;
+  if (!first_list)
+    return 0;
+  if (*first_list < 0)
+    return first_list;
+  const int *second_list = 0;
+  while (ptr < end && (second_list = search1(&ptr, end)) == 0)
+    ;
+  if (!second_list)
+    return first_list;
+  if (*second_list < 0)
+    return second_list;
+  const int *p;
+  for (p = first_list; *p >= 0; p++)
+    ;
+  int len = p - first_list;
+  for (p = second_list; *p >= 0; p++)
+    ;
+  if (p - second_list < len)
+    len = p - second_list;
+  int *matches = new int[len + 1];
+  merge(matches, first_list, second_list);
+  while (ptr < end) {
+    const int *list = search1(&ptr, end);
+    if (list != 0) {
+      if (*list < 0) {
+	a_delete matches;
+	return list;
+      }
+      merge(matches, matches, list);
+      if (*matches < 0) {
+	a_delete matches;
+	return &minus_one;
+      }
+    }
+  }
+  *temp_listp = matches;
+  return matches;
+}
+
+void index_search_item::read_common_words_file()
+{
+  if (header.common <= 0)
+    return;
+  const char *common_words_file = munge_filename(strchr(pool, '\0') + 1);
+  errno = 0;
+  FILE *fp = fopen(common_words_file, "r");
+  if (!fp) {
+    error("can't open `%1': %2", common_words_file, strerror(errno));
+    return;
+  }
+  common_words_table_size = 2*header.common + 1;
+  while (!is_prime(common_words_table_size))
+    common_words_table_size++;
+  common_words_table = new char *[common_words_table_size];
+  for (int i = 0; i < common_words_table_size; i++)
+    common_words_table[i] = 0;
+  int count = 0;
+  int key_len = 0;
+  for (;;) {
+    int c = getc(fp);
+    while (c != EOF && !csalnum(c))
+      c = getc(fp);
+    if (c == EOF)
+      break;
+    do {
+      if (key_len < header.truncate)
+	key_buffer[key_len++] = cmlower(c);
+      c = getc(fp);
+    } while (c != EOF && csalnum(c));
+    if (key_len >= header.shortest) {
+      int h = hash(key_buffer, key_len) % common_words_table_size;
+      while (common_words_table[h]) {
+	if (h == 0)
+	  h = common_words_table_size;
+	--h;
+      }
+      common_words_table[h] = new char[key_len + 1];
+      memcpy(common_words_table[h], key_buffer, key_len);
+      common_words_table[h][key_len] = '\0';
+    }
+    if (++count >= header.common)
+      break;
+    key_len = 0;
+    if (c == EOF)
+      break;
+  }
+  fclose(fp);
+}
+
+void index_search_item::add_out_of_date_file(int fd, const char *filename,
+					     int fid)
+{
+  search_item **pp;
+  for (pp = &out_of_date_files; *pp; pp = &(*pp)->next)
+    if ((*pp)->is_named(filename))
+      return;
+  *pp = make_linear_search_item(fd, filename, fid);
+  warning("`%1' modified since `%2' created", filename, name);
+}
+
+void index_search_item::check_files()
+{
+  const char *pool_end = pool + header.strings_size;
+  for (const char *ptr = strchr(ignore_fields, '\0') + 1;
+       ptr < pool_end;
+       ptr = strchr(ptr, '\0') + 1) {
+    const char *path = munge_filename(ptr);
+    struct stat sb;
+    if (stat(path, &sb) < 0)
+      error("can't stat `%1': %2", path, strerror(errno));
+    else if (sb.st_mtime > mtime) {
+      int fd = open(path, O_RDONLY | O_BINARY);
+      if (fd < 0)
+	error("can't open `%1': %2", path, strerror(errno));
+      else
+	add_out_of_date_file(fd, path, filename_id + (ptr - pool));
+    }
+  }
+}
diff --git a/contrib/groff/src/libs/libbib/linear.cpp b/contrib/groff/src/libs/libbib/linear.cpp
new file mode 100644
index 0000000..1dd902b
--- /dev/null
+++ b/contrib/groff/src/libs/libbib/linear.cpp
@@ -0,0 +1,503 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "posix.h"
+#include "errarg.h"
+#include "error.h"
+#include "cset.h"
+#include "cmap.h"
+#include "nonposix.h"
+
+#include "refid.h"
+#include "search.h"
+
+class file_buffer {
+  char *buffer;
+  char *bufend;
+public:
+  file_buffer();
+  ~file_buffer();
+  int load(int fd, const char *filename);
+  const char *get_start() const;
+  const char *get_end() const;
+};
+
+typedef unsigned char uchar;
+
+static uchar map[256];
+static uchar inv_map[256][3];
+
+struct map_init {
+  map_init();
+};
+
+static map_init the_map_init;
+
+map_init::map_init()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    map[i] = csalnum(i) ? cmlower(i) : '\0';
+  for (i = 0; i < 256; i++) {
+    if (cslower(i)) {
+      inv_map[i][0] = i;
+      inv_map[i][1] = cmupper(i);
+      inv_map[i][2] = '\0';
+    }
+    else if (csdigit(i)) {
+      inv_map[i][0] = i;
+      inv_map[i][1] = 0;
+    }
+    else
+      inv_map[i][0] = '\0';
+  }
+}
+
+
+class bmpattern {
+  char *pat;
+  int len;
+  int delta[256];
+public:
+  bmpattern(const char *pattern, int pattern_length);
+  ~bmpattern();
+  const char *search(const char *p, const char *end) const;
+  int length() const;
+};
+
+bmpattern::bmpattern(const char *pattern, int pattern_length)
+: len(pattern_length)
+{
+  pat = new char[len];
+  int i;
+  for (i = 0; i < len; i++)
+    pat[i] = map[uchar(pattern[i])];
+  for (i = 0; i < 256; i++)
+    delta[i] = len;
+  for (i = 0; i < len; i++)
+    for (const unsigned char *inv = inv_map[uchar(pat[i])]; *inv; inv++)
+      delta[*inv] = len - i - 1;
+}
+
+const char *bmpattern::search(const char *buf, const char *end) const
+{
+  int buflen = end - buf;
+  if (len > buflen)
+    return 0;
+  const char *strend;
+  if (buflen > len*4)
+    strend = end - len*4;
+  else
+    strend = buf;
+  const char *k = buf + len - 1;
+  const int *del = delta;
+  const char *pattern = pat;
+  for (;;) {
+    while (k < strend) {
+      int t = del[uchar(*k)];
+      if (!t)
+	break;
+      k += t;
+      k += del[uchar(*k)];
+      k += del[uchar(*k)];
+    }
+    while (k < end && del[uchar(*k)] != 0)
+      k++;
+    if (k == end)
+      break;
+    int j = len - 1;
+    const char *s = k;
+    for (;;) {
+      if (j == 0)
+	return s;
+      if (map[uchar(*--s)] != uchar(pattern[--j]))
+	break;
+    }
+    k++;
+  }
+  return 0;
+}
+
+bmpattern::~bmpattern()
+{
+  a_delete pat;
+}
+
+inline int bmpattern::length() const
+{
+  return len;
+}
+
+
+static const char *find_end(const char *bufend, const char *p);
+
+const char *linear_searcher::search_and_check(const bmpattern *key,
+  const char *buf, const char *bufend, const char **start) const
+{
+  assert(buf[-1] == '\n');
+  assert(bufend[-1] == '\n');
+  const char *ptr = buf;
+  for (;;) {
+    const char *found = key->search(ptr, bufend);
+    if (!found)
+      break;
+    if (check_match(buf, bufend, found, key->length(), &ptr, start))
+      return found;
+  }
+  return 0;
+}
+
+static const char *skip_field(const char *end, const char *p)
+{
+  for (;;)
+    if (*p++ == '\n') {
+      if (p == end || *p == '%')
+	break;
+      const char *q;
+      for (q = p; *q == ' ' || *q == '\t'; q++)
+	;
+      if (*q == '\n')
+	break;
+      p = q + 1;
+    }
+  return p;
+}
+
+static const char *find_end(const char *bufend, const char *p)
+{
+  for (;;)
+    if (*p++ == '\n') {
+      if (p == bufend)
+	break;
+      const char *q;
+      for (q = p; *q == ' ' || *q == '\t'; q++)
+	;
+      if (*q == '\n')
+	break;
+      p = q + 1;
+    }
+  return p;
+}
+
+
+int linear_searcher::check_match(const char *buf, const char *bufend,
+				 const char *match, int matchlen,
+				 const char **cont, const char **start) const
+{
+  *cont = match + 1;
+  // The user is required to supply only the first truncate_len characters
+  // of the key.  If truncate_len <= 0, he must supply all the key.
+  if ((truncate_len <= 0 || matchlen < truncate_len)
+      && map[uchar(match[matchlen])] != '\0')
+    return 0;
+
+  // The character before the match must not be an alphanumeric
+  // character (unless the alphanumeric character follows one or two
+  // percent characters at the beginning of the line), nor must it be
+  // a percent character at the beginning of a line, nor a percent
+  // character following a percent character at the beginning of a
+  // line.
+
+  switch (match - buf) {
+  case 0:
+    break;
+  case 1:
+    if (match[-1] == '%' || map[uchar(match[-1])] != '\0')
+      return 0;
+    break;
+  case 2:
+    if (map[uchar(match[-1])] != '\0' && match[-2] != '%')
+      return 0;
+    if (match[-1] == '%'
+	&& (match[-2] == '\n' || match[-2] == '%'))
+      return 0;
+    break;
+  default:
+    if (map[uchar(match[-1])] != '\0'
+	&& !(match[-2] == '%'
+	     && (match[-3] == '\n'
+		 || (match[-3] == '%' && match[-4] == '\n'))))
+      return 0;
+    if (match[-1] == '%'
+	&& (match[-2] == '\n'
+	    || (match[-2] == '%' && match[-3] == '\n')))
+      return 0;
+  }
+    
+  const char *p = match;
+  int had_percent = 0;
+  for (;;) {
+    if (*p == '\n') {
+      if (!had_percent && p[1] == '%') {
+	if (p[2] != '\0' && strchr(ignore_fields, p[2]) != 0) {
+	  *cont = skip_field(bufend, match + matchlen);
+	  return 0;
+	}
+	if (!start)
+	  break;
+	had_percent = 1;
+      }
+      if (p <= buf) {
+	if (start)
+	  *start = p + 1;
+	return 1;
+      }
+      const char *q;
+      for (q = p - 1; *q == ' ' || *q == '\t'; q--)
+	;
+      if (*q == '\n') {
+	if (start)
+	  *start = p + 1;
+	break;
+      }
+      p = q;
+    }
+    p--;
+  }
+  return 1;
+}
+
+file_buffer::file_buffer()
+: buffer(0), bufend(0)
+{
+}
+
+file_buffer::~file_buffer()
+{
+  a_delete buffer;
+}
+
+const char *file_buffer::get_start() const
+{
+  return buffer ? buffer + 4 : 0;
+}
+
+const char *file_buffer::get_end() const
+{
+  return bufend;
+}
+
+int file_buffer::load(int fd, const char *filename)
+{
+  struct stat sb;
+  if (fstat(fd, &sb) < 0)
+    error("can't fstat `%1': %2", filename, strerror(errno));
+  else if (!S_ISREG(sb.st_mode))
+    error("`%1' is not a regular file", filename);
+  else {
+    // We need one character extra at the beginning for an additional newline
+    // used as a sentinel.  We get 4 instead so that the read buffer will be
+    // word-aligned.  This seems to make the read slightly faster.  We also
+    // need one character at the end also for an additional newline used as a
+    // sentinel.
+    int size = int(sb.st_size);
+    buffer = new char[size + 4 + 1];
+    int nread = read(fd, buffer + 4, size);
+    if (nread < 0)
+      error("error reading `%1': %2", filename, strerror(errno));
+    else if (nread != size)
+      error("size of `%1' decreased", filename);
+    else {
+      char c;
+      nread = read(fd, &c, 1);
+      if (nread != 0)
+	error("size of `%1' increased", filename);
+      else if (memchr(buffer + 4, '\0', size < 1024 ? size : 1024) != 0)
+	error("database `%1' is a binary file", filename);
+      else {
+	close(fd);
+	buffer[3] = '\n';
+	int sidx = 4, didx = 4;
+	for ( ; sidx < size + 4; sidx++, didx++)
+	  {
+	    if (buffer[sidx] == '\r')
+	      {
+		if (buffer[++sidx] != '\n')
+		  buffer[didx++] = '\r';
+		else
+		  size--;
+	      }
+	    if (sidx != didx)
+	      buffer[didx] = buffer[sidx];
+	  }
+	bufend = buffer + 4 + size;
+	if (bufend[-1] != '\n')
+	  *bufend++ = '\n';
+	return 1;
+      }
+    }
+    a_delete buffer;
+    buffer = 0;
+  }
+  close(fd);
+  return 0;
+}
+
+linear_searcher::linear_searcher(const char *query, int query_len,
+				 const char *ign, int trunc)
+: ignore_fields(ign), truncate_len(trunc), keys(0), nkeys(0)
+{
+  const char *query_end = query + query_len;
+  int nk = 0;
+  const char *p;
+  for (p = query; p < query_end; p++)
+    if (map[uchar(*p)] != '\0'
+	&& (p[1] == '\0' || map[uchar(p[1])] == '\0'))
+      nk++;
+  if (nk == 0)
+    return;
+  keys = new bmpattern*[nk];
+  p = query;
+  for (;;) {
+    while (p < query_end && map[uchar(*p)] == '\0')
+      p++;
+    if (p == query_end)
+      break;
+    const char *start = p;
+    while (p < query_end && map[uchar(*p)] != '\0')
+      p++;
+    keys[nkeys++] = new bmpattern(start, p - start);
+  }
+  assert(nkeys <= nk);
+  if (nkeys == 0) {
+    a_delete keys;
+    keys = 0;
+  }
+}
+
+linear_searcher::~linear_searcher()
+{
+  for (int i = 0; i < nkeys; i++)
+    delete keys[i];
+  a_delete keys;
+}
+
+int linear_searcher::search(const char *buffer, const char *bufend,
+			    const char **startp, int *lengthp) const
+{
+  assert(bufend - buffer > 0);
+  assert(buffer[-1] == '\n');
+  assert(bufend[-1] == '\n');
+  if (nkeys == 0)
+    return 0;
+  for (;;) {
+    const char *refstart;
+    const char *found = search_and_check(keys[0], buffer, bufend, &refstart);
+    if (!found)
+      break;
+    const char *refend = find_end(bufend, found + keys[0]->length());
+    int i;
+    for (i = 1; i < nkeys; i++)
+      if (!search_and_check(keys[i], refstart, refend))
+	break;
+    if (i >= nkeys) {
+      *startp = refstart;
+      *lengthp = refend - refstart;
+      return 1;
+    }
+    buffer = refend;
+  }
+  return 0;
+}
+
+class linear_search_item : public search_item {
+  file_buffer fbuf;
+public:
+  linear_search_item(const char *filename, int fid);
+  ~linear_search_item();
+  int load(int fd);
+  search_item_iterator *make_search_item_iterator(const char *);
+  friend class linear_search_item_iterator;
+};
+
+class linear_search_item_iterator : public search_item_iterator {
+  linear_search_item *lsi;
+  int pos;
+public:
+  linear_search_item_iterator(linear_search_item *, const char *query);
+  ~linear_search_item_iterator();
+  int next(const linear_searcher &, const char **ptr, int *lenp,
+	   reference_id *ridp);
+};
+
+search_item *make_linear_search_item(int fd, const char *filename, int fid)
+{
+  linear_search_item *item = new linear_search_item(filename, fid);
+  if (!item->load(fd)) {
+    delete item;
+    return 0;
+  }
+  else
+    return item;
+}
+
+linear_search_item::linear_search_item(const char *filename, int fid)
+: search_item(filename, fid)
+{
+}
+
+linear_search_item::~linear_search_item()
+{
+}
+
+int linear_search_item::load(int fd)
+{
+  return fbuf.load(fd, name);
+}
+
+search_item_iterator *linear_search_item::make_search_item_iterator(
+  const char *query)
+{
+  return new linear_search_item_iterator(this, query);
+}
+
+linear_search_item_iterator::linear_search_item_iterator(
+  linear_search_item *p, const char *)
+: lsi(p), pos(0)
+{
+}
+
+linear_search_item_iterator::~linear_search_item_iterator()
+{
+}
+
+int linear_search_item_iterator::next(const linear_searcher &searcher,
+				      const char **startp, int *lengthp,
+				      reference_id *ridp)
+{
+  const char *bufstart = lsi->fbuf.get_start();
+  const char *bufend = lsi->fbuf.get_end();
+  const char *ptr = bufstart + pos;
+  if (ptr < bufend && searcher.search(ptr, bufend, startp, lengthp)) {
+    pos = *startp + *lengthp - bufstart;
+    if (ridp)
+      *ridp = reference_id(lsi->filename_id, *startp - bufstart);
+    return 1;
+  }
+  else
+    return 0;
+}
diff --git a/contrib/groff/src/libs/libbib/search.cpp b/contrib/groff/src/libs/libbib/search.cpp
new file mode 100644
index 0000000..2223fb6
--- /dev/null
+++ b/contrib/groff/src/libs/libbib/search.cpp
@@ -0,0 +1,133 @@
+// -*- C++ -*- 
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "posix.h"
+#include "errarg.h"
+#include "error.h"
+#include "nonposix.h"
+
+#include "refid.h"
+#include "search.h"
+
+int linear_truncate_len = 6;
+const char *linear_ignore_fields = "XYZ";
+
+search_list::search_list()
+: list(0), niterators(0), next_fid(1)
+{
+}
+
+search_list::~search_list()
+{
+  assert(niterators == 0);
+  while (list) {
+    search_item *tem = list->next;
+    delete list;
+    list = tem;
+  }
+}
+
+void search_list::add_file(const char *filename, int silent)
+{
+  search_item *p = make_index_search_item(filename, next_fid);
+  if (!p) {
+    int fd = open(filename, O_RDONLY | O_BINARY);
+    if (fd < 0) {
+      if (!silent)
+	error("can't open `%1': %2", filename, strerror(errno));
+    }
+    else
+      p = make_linear_search_item(fd, filename, next_fid);
+  }
+  if (p) {
+    search_item **pp;
+    for (pp = &list; *pp; pp = &(*pp)->next)
+      ;
+    *pp = p;
+    next_fid = p->next_filename_id();
+  }
+}
+
+int search_list::nfiles() const
+{
+  int n = 0;
+  for (search_item *ptr = list; ptr; ptr = ptr->next)
+    n++;
+  return n;
+}
+
+search_list_iterator::search_list_iterator(search_list *p, const char *q)
+: list(p), ptr(p->list), iter(0), query(strsave(q)),
+  searcher(q, strlen(q), linear_ignore_fields, linear_truncate_len)
+{
+  list->niterators += 1;
+}
+
+search_list_iterator::~search_list_iterator()
+{
+  list->niterators -= 1;
+  a_delete query;
+  delete iter;
+}
+
+int search_list_iterator::next(const char **pp, int *lenp, reference_id *ridp)
+{
+  while (ptr) {
+    if (iter == 0)
+      iter = ptr->make_search_item_iterator(query);
+    if (iter->next(searcher, pp, lenp, ridp))
+      return 1;
+    delete iter;
+    iter = 0;
+    ptr = ptr->next;
+  }
+  return 0;
+}
+
+search_item::search_item(const char *nm, int fid)
+: name(strsave(nm)), filename_id(fid), next(0)
+{
+}
+
+search_item::~search_item()
+{
+  a_delete name;
+}
+
+int search_item::is_named(const char *nm) const
+{
+  return strcmp(name, nm) == 0;
+}
+
+int search_item::next_filename_id() const
+{
+  return filename_id + 1;
+}
+
+search_item_iterator::~search_item_iterator()
+{
+}
diff --git a/contrib/groff/src/libs/libdriver/Makefile.sub b/contrib/groff/src/libs/libdriver/Makefile.sub
index 547b8c0..5d37e2a 100644
--- a/contrib/groff/src/libs/libdriver/Makefile.sub
+++ b/contrib/groff/src/libs/libdriver/Makefile.sub
@@ -3,5 +3,5 @@ OBJS=\
   input.$(OBJEXT) \
   printer.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/input.cc \
-  $(srcdir)/printer.cc
+  $(srcdir)/input.cpp \
+  $(srcdir)/printer.cpp
diff --git a/contrib/groff/src/libs/libdriver/input.cpp b/contrib/groff/src/libs/libdriver/input.cpp
new file mode 100644
index 0000000..acb6f13
--- /dev/null
+++ b/contrib/groff/src/libs/libdriver/input.cpp
@@ -0,0 +1,1831 @@
+// -*- C++ -*-
+
+// <groff_src_dir>/src/libs/libdriver/input.cpp
+
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+
+   Written by James Clark (jjc@jclark.com)
+   Major rewrite 2001 by Bernd Warken (bwarken@mayn.de)
+
+   Last update: 04 Apr 2003
+
+   This file is part of groff, the GNU roff text processing system.
+
+   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 2, 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 groff; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+*/
+
+/* Description
+
+   This file implements the parser for the intermediate groff output,
+   see groff_out(5), and does the printout for the given device.
+
+   All parsed information is processed within the function do_file().
+   A device postprocessor just needs to fill in the methods for the class
+   `printer' (or rather a derived class) without having to worry about
+   the syntax of the intermediate output format.  Consequently, the
+   programming of groff postprocessors is similar to the development of
+   device drivers.
+
+   The prototyping for this file is done in driver.h (and error.h).
+*/
+
+/* Changes of the 2001 rewrite of this file.
+
+   The interface to the outside and the handling of the global
+   variables was not changed, but internally many necessary changes
+   were performed.
+
+   The main aim for this rewrite is to provide a first step towards
+   making groff fully compatible with classical troff without pain.
+
+   Bugs fixed
+   - Unknown subcommands of `D' and `x' are now ignored like in the
+     classical case, but a warning is issued.  This was also
+     implemented for the other commands.
+   - A warning is emitted if `x stop' is missing.
+   - `DC' and `DE' commands didn't position to the right end after
+     drawing (now they do), see discussion below.
+   - So far, `x stop' was ignored.  Now it terminates the processing
+     of the current intermediate output file like the classical troff.
+   - The command `c' didn't check correctly on white-space.
+   - The environment stack wasn't suitable for the color extensions
+     (replaced by a class).
+   - The old groff parser could only handle a prologue with the first
+     3 lines having a fixed structure, while classical troff specified
+     the sequence of the first 3 commands without further
+     restrictions.  Now the parser is smart about additional
+     white space, comments, and empty lines in the prologue.
+   - The old parser allowed space characters only as syntactical
+     separators, while classical troff had tab characters as well.
+     Now any sequence of tabs and/or spaces is a syntactical
+     separator between commands and/or arguments.
+   - Range checks for numbers implemented.
+
+   New and improved features
+   - The color commands `m' and `DF' are added.
+   - The old color command `Df' is now converted and delegated to `DFg'.
+   - The command `F' is implemented as `use intended file name'.  It
+     checks whether its argument agrees with the file name used so far,
+     otherwise a warning is issued.  Then the new name is remembered
+     and used for the following error messages.
+   - For the positioning after drawing commands, an alternative, easier
+     scheme is provided, but not yet activated; it can be chosen by
+     undefining the preprocessor macro STUPID_DRAWING_POSITIONING.
+     It extends the rule of the classical troff output language in a
+     logical way instead of the rather strange actual positioning.
+     For details, see the discussion below.
+   - For the `D' commands that only set the environment, the calling of
+     pr->send_draw() was removed because this doesn't make sense for
+     the `DF' commands; the (changed) environment is sent with the
+     next command anyway.
+   - Error handling was clearly separated into warnings and fatal.
+   - The error behavior on additional arguments for `D' and `x'
+     commands with a fixed number of arguments was changed from being
+     ignored (former groff) to issue a warning and ignore (now), see
+     skip_line_x().  No fatal was chosen because both string and
+     integer arguments can occur.
+   - The gtroff program issues a trailing dummy integer argument for
+     some drawing commands with an odd number of arguments to make the
+     number of arguments even, e.g. the DC and Dt commands; this is
+     honored now.
+   - All D commands with a variable number of args expect an even
+     number of trailing integer arguments, so fatal on error was
+     implemented.
+   - Disable environment stack and the commands `{' and `}' by making
+     them conditional on macro USE_ENV_STACK; actually, this is
+     undefined by default.  There isn't any known application for these
+     features.
+
+   Cosmetics
+   - Nested `switch' commands are avoided by using more functions.
+     Dangerous 'fall-through's avoided.
+   - Commands and functions are sorted alphabetically (where possible).
+   - Dynamic arrays/buffers are now implemented as container classes.
+   - Some functions had an ugly return structure; this has been
+     streamlined by using classes.
+   - Use standard C math functions for number handling, so getting rid
+     of differences to '0'.
+   - The macro `IntArg' has been created for an easier transition
+     to guaranteed 32 bits integers (`int' is enough for GNU, while
+     ANSI only guarantees `long int' to have a length of 32 bits).
+   - The many usages of type `int' are differentiated by using `Char',
+     `bool', and `IntArg' where appropriate.
+   - To ease the calls of the local utility functions, the parser
+     variables `current_file', `npages', and `current_env'
+     (formerly env) were made global to the file (formerly they were
+     local to the do_file() function)
+   - Various comments were added.
+
+   TODO
+   - Get rid of the stupid drawing positioning.
+   - Can the `Dt' command be completely handled by setting environment
+     within do_file() instead of sending to pr?
+   - Integer arguments must be >= 32 bits, use conditional #define.
+   - Add scaling facility for classical device independence and
+     non-groff devices.  Classical troff output had a quasi device
+     independence by scaling the intermediate output to the resolution
+     of the postprocessor device if different from the one specified
+     with `x T', groff have not.  So implement full quasi device
+     indepedence, including the mapping of the strange classical
+     devices to the postprocessor device (seems to be reasonably
+     easy).
+   - The external, global pointer variables are not optimally handled.
+     - The global variables `current_filename',
+       `current_source_filename', and `current_lineno' are only used for
+       error reporting.  So implement a static class `Error'
+       (`::' calls).
+     - The global `device' is the name used during the formatting
+       process; there should be a new variable for the device name used
+       during the postprocessing.
+  - Implement the B-spline drawing `D~' for all graphical devices.
+  - Make `environment' a class with an overflow check for its members
+    and a delete method to get rid of delete_current_env().
+  - Implement the `EnvStack' to use `new' instead of `malloc'.
+  - The class definitions of this document could go into a new file.
+  - The comments in this section should go to a `Changelog' or some
+    `README' file in this directory.
+*/
+
+/*
+  Discussion of the positioning by drawing commands
+
+  There was some confusion about the positioning of the graphical
+  pointer at the printout after having executed a `D' command.
+  The classical troff manual of Osanna & Kernighan specified,
+
+    `The position after a graphical object has been drawn is
+     at its end; for circles and ellipses, the "end" is at the
+     right side.'
+
+  From this, it follows that
+  - all open figures (args, splines, and lines) should position at their
+    final point.
+  - all circles and ellipses should position at their right-most point
+    (as if 2 halves had been drawn).
+  - all closed figures apart from circles and ellipses shouldn't change
+    the position because they return to their origin.
+  - all setting commands should not change position because they do not
+    draw any graphical object.
+
+  In the case of the open figures, this means that the horizontal
+  displacement is the sum of all odd arguments and the vertical offset
+  the sum of all even arguments, called the alternate arguments sum
+  displacement in the following.
+
+  Unfortunately, groff did not implement this simple rule.  The former
+  documentation in groff_out(5) differed from the source code, and
+  neither of them is compatible with the classical rule.
+
+  The former groff_out(5) specified to use the alternative arguments
+  sum displacement for calculating the drawing positioning of
+  non-classical commands, including the `Dt' command (setting-only)
+  and closed polygons.  Applying this to the new groff color commands
+  will lead to disaster.  For their arguments can take large values (>
+  65000).  On low resolution devices, the displacement of such large
+  values will corrupt the display or kill the printer.  So the
+  nonsense specification has come to a natural end anyway.
+
+  The groff source code, however, had no positioning for the
+  setting-only commands (esp. `Dt'), the right-end positioning for
+  outlined circles and ellipses, and the alternative argument sum
+  displacement for all other commands (including filled circles and
+  ellipses).
+
+  The reason why no one seems to have suffered from this mayhem so
+  far is that the graphical objects are usually generated by
+  preprocessors like pic that do not depend on the automatic
+  positioning.  When using the low level `\D' escape sequences or `D'
+  output commands, the strange positionings can be circumvented by
+  absolute positionings or by tricks like `\Z'.
+
+  So doing an exorcism on the strange, incompatible displacements might
+  not harm any existing documents, but will make the usage of the
+  graphical escape sequences and commands natural.
+
+  That's why the rewrite of this file returned to the reasonable,
+  classical specification with its clear end-of-drawing rule that is
+  suitable for all cases.  But a macro STUPID_DRAWING_POSITIONING is
+  provided for testing the funny former behavior.
+
+  The new rule implies the following behavior.
+  - Setting commands (`Dt', `Df', `DF') and polygons (`Dp' and `DP')
+    do not change position now.
+  - Filled circles and ellipses (`DC' and `DE') position at their
+    most right point (outlined ones `Dc' and `De' did this anyway).
+  - As before, all open graphical objects position to their final
+    drawing point (alternate sum of the command arguments).
+
+*/
+
+#ifndef STUPID_DRAWING_POSITIONING
+// uncomment next line if all non-classical D commands shall position
+// to the strange alternate sum of args displacement
+#define STUPID_DRAWING_POSITIONING
+#endif
+
+// Decide whether the commands `{' and `}' for different environments
+// should be used.
+#undef USE_ENV_STACK
+
+#include "driver.h"
+#include "device.h"
+
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <math.h>
+
+
+/**********************************************************************
+                           local types
+ **********************************************************************/
+
+// integer type used in the fields of struct environment (see printer.h)
+typedef int EnvInt;
+
+// integer arguments of groff_out commands, must be >= 32 bits
+typedef int IntArg;
+
+// color components of groff_out color commands, must be >= 32 bits
+typedef unsigned int ColorArg;
+
+// Array for IntArg values.
+class IntArray {
+  size_t num_allocated;
+  size_t num_stored;
+  IntArg *data;
+public:
+  IntArray(void);
+  IntArray(const size_t);
+  ~IntArray(void);
+  const IntArg operator[](const size_t i) const
+  {
+    if (i >= num_stored)
+      fatal("index out of range");
+    return (IntArg) data[i];
+  }
+  void append(IntArg);
+  const IntArg * const
+    get_data(void) const { return (IntArg *) data; }
+  const size_t len(void) const { return num_stored; }
+};
+
+// Characters read from the input queue.
+class Char {
+  int data;
+public:
+  Char(void) : data('\0') {}
+  Char(const int c) : data(c) {}
+  bool operator==(char c) const { return (data == c) ? true : false; }
+  bool operator==(int c) const { return (data == c) ? true : false; }
+  bool operator==(const Char c) const
+		  { return (data == c.data) ? true : false; }
+  bool operator!=(char c) const { return !(*this == c); }
+  bool operator!=(int c) const { return !(*this == c); }
+  bool operator!=(const Char c) const { return !(*this == c); }
+  operator int() const { return (int) data; }
+  operator unsigned char() const { return (unsigned char) data; }
+  operator char() const { return (char) data; }
+};
+
+// Buffer for string arguments (Char, not char).
+class StringBuf {
+  size_t num_allocated;
+  size_t num_stored;
+  Char *data;			// not terminated by '\0'
+public:
+  StringBuf(void);		// allocate without storing
+  ~StringBuf(void);
+  void append(const Char);	// append character to `data'
+  char *make_string(void);	// return new copy of `data' with '\0'
+  bool is_empty(void) {		// true if none stored
+    return (num_stored > 0) ? false : true;
+  }
+  void reset(void);		// set `num_stored' to 0
+};
+
+#ifdef USE_ENV_STACK
+class EnvStack {
+  environment **data;
+  size_t num_allocated;
+  size_t num_stored;
+public:
+  EnvStack(void);
+  ~EnvStack(void);
+  environment *pop(void);
+  void push(environment *e);
+};
+#endif // USE_ENV_STACK
+
+
+/**********************************************************************
+                          external variables
+ **********************************************************************/
+
+// exported as extern by error.h (called from driver.h)
+// needed for error messages (see ../libgroff/error.cpp)
+const char *current_filename = 0; // printable name of the current file
+				  // printable name of current source file
+const char *current_source_filename = 0;
+int current_lineno = 0;		  // current line number of printout
+
+// exported as extern by device.h;
+const char *device = 0;		  // cancel former init with literal
+
+printer *pr;
+
+// Note:
+//
+//   We rely on an implementation of the `new' operator which aborts
+//   gracefully if it can't allocate memory (e.g. from libgroff/new.cpp).
+
+
+/**********************************************************************
+                        static local variables
+ **********************************************************************/
+
+FILE *current_file = 0;		// current input stream for parser
+
+// npages: number of pages processed so far (including current page),
+//         _not_ the page number in the printout (can be set with `p').
+int npages = 0;
+
+const ColorArg
+COLORARG_MAX = (ColorArg) 65536U; // == 0xFFFF + 1 == 0x10000
+
+const IntArg
+INTARG_MAX = (IntArg) 0x7FFFFFFF; // maximal signed 32 bits number
+
+// parser environment, created and deleted by each run of do_file()
+environment *current_env = 0;
+
+#ifdef USE_ENV_STACK
+const size_t
+envp_size = sizeof(environment *);
+#endif // USE_ENV_STACK
+
+
+/**********************************************************************
+                        function declarations
+ **********************************************************************/
+
+// utility functions
+ColorArg color_from_Df_command(IntArg);
+				// transform old color into new
+void delete_current_env(void);	// delete global var current_env
+void fatal_command(char);	// abort for invalid command
+inline Char get_char(void);	// read next character from input stream
+ColorArg get_color_arg(void);	// read in argument for new color cmds
+IntArray *get_D_fixed_args(const size_t);
+				// read in fixed number of integer
+				// arguments
+IntArray *get_D_fixed_args_odd_dummy(const size_t);
+				// read in a fixed number of integer
+				// arguments plus optional dummy
+IntArray *get_D_variable_args(void);
+                                // variable, even number of int args
+char *get_extended_arg(void);	// argument for `x X' (several lines)
+IntArg get_integer_arg(void);	// read in next integer argument
+IntArray *get_possibly_integer_args();
+				// 0 or more integer arguments
+char *get_string_arg(void);	// read in next string arg, ended by WS
+inline bool is_space_or_tab(const Char);
+				// test on space/tab char
+Char next_arg_begin(void);	// skip white space on current line
+Char next_command(void);	// go to next command, evt. diff. line
+inline bool odd(const int);	// test if integer is odd
+void position_to_end_of_args(const IntArray * const);
+				// positioning after drawing
+void remember_filename(const char *);
+				// set global current_filename
+void remember_source_filename(const char *);
+				// set global current_source_filename
+void send_draw(const Char, const IntArray * const);
+				// call pr->draw
+void skip_line(void);		// unconditionally skip to next line
+bool skip_line_checked(void);	// skip line, false if args are left
+void skip_line_fatal(void);	// skip line, fatal if args are left
+void skip_line_warn(void);	// skip line, warn if args are left
+void skip_line_D(void);		// skip line in D commands
+void skip_line_x(void);		// skip line in x commands
+void skip_to_end_of_line(void);	// skip to the end of the current line
+inline void unget_char(const Char);
+				// restore character onto input
+
+// parser subcommands
+void parse_color_command(color *);
+				// color sub(sub)commands m and DF
+void parse_D_command(void);	// graphical subcommands
+bool parse_x_command(void);	// device controller subcommands
+
+
+/**********************************************************************
+                         class methods
+ **********************************************************************/
+
+#ifdef USE_ENV_STACK
+EnvStack::EnvStack(void)
+{
+  num_allocated = 4;
+  // allocate pointer to array of num_allocated pointers to environment
+  data = (environment **) malloc(envp_size * num_allocated);
+  if (data == 0)
+    fatal("could not allocate environment data");
+  num_stored = 0;
+}
+
+EnvStack::~EnvStack(void)
+{
+  for (size_t i = 0; i < num_stored; i++)
+    delete data[i];
+  free(data);
+}
+
+// return top element from stack and decrease stack pointer
+//
+// the calling function must take care of properly deleting the result
+environment *
+EnvStack::pop(void)
+{
+  num_stored--;
+  environment *result = data[num_stored];
+  data[num_stored] = 0;
+  return result;
+}
+
+// copy argument and push this onto the stack
+void
+EnvStack::push(environment *e)
+{
+  environment *e_copy = new environment;
+  if (num_stored >= num_allocated) {
+    environment **old_data = data;
+    num_allocated *= 2;
+    data = (environment **) malloc(envp_size * num_allocated);
+    if (data == 0)
+      fatal("could not allocate data");
+    for (size_t i = 0; i < num_stored; i++)
+      data[i] = old_data[i];
+    free(old_data);
+  }
+  e_copy->col = new color;
+  e_copy->fill = new color;
+  *e_copy->col = *e->col;
+  *e_copy->fill = *e->fill;
+  e_copy->fontno = e->fontno;
+  e_copy->height = e->height;
+  e_copy->hpos = e->hpos;
+  e_copy->size = e->size;
+  e_copy->slant = e->slant;
+  e_copy->vpos = e->vpos;
+  data[num_stored] = e_copy;
+  num_stored++;
+}
+#endif // USE_ENV_STACK
+
+IntArray::IntArray(void)
+{
+  num_allocated = 4;
+  data = new IntArg[num_allocated];
+  num_stored = 0;
+}
+
+IntArray::IntArray(const size_t n)
+{
+  if (n <= 0)
+    fatal("number of integers to be allocated must be > 0");
+  num_allocated = n;
+  data = new IntArg[num_allocated];
+  num_stored = 0;
+}
+
+IntArray::~IntArray(void)
+{
+  a_delete data;
+}
+
+void
+IntArray::append(IntArg x)
+{
+  if (num_stored >= num_allocated) {
+    IntArg *old_data = data;
+    num_allocated *= 2;
+    data = new IntArg[num_allocated];
+    for (size_t i = 0; i < num_stored; i++)
+      data[i] = old_data[i];
+    a_delete old_data;
+  }
+  data[num_stored] = x;
+  num_stored++;
+}
+
+StringBuf::StringBuf(void)
+{
+  num_stored = 0;
+  num_allocated = 128;
+  data = new Char[num_allocated];
+}
+
+StringBuf::~StringBuf(void)
+{
+  a_delete data;
+}
+
+void
+StringBuf::append(const Char c)
+{
+  if (num_stored >= num_allocated) {
+    Char *old_data = data;
+    num_allocated *= 2;
+    data = new Char[num_allocated];
+    for (size_t i = 0; i < num_stored; i++)
+      data[i] = old_data[i];
+    a_delete old_data;
+  }
+  data[num_stored] = c;
+  num_stored++;
+}
+
+char *
+StringBuf::make_string(void)
+{
+  char *result = new char[num_stored + 1];
+  for (size_t i = 0; i < num_stored; i++)
+    result[i] = (char) data[i];
+  result[num_stored] = '\0';
+  return result;
+}
+
+void
+StringBuf::reset(void)
+{
+  num_stored = 0;
+}
+
+/**********************************************************************
+                        utility functions
+ **********************************************************************/
+
+//////////////////////////////////////////////////////////////////////
+/* color_from_Df_command:
+   Process the gray shade setting command Df.
+
+   Transform Df style color into DF style color.
+   Df color: 0-1000, 0 is white
+   DF color: 0-65536, 0 is black
+
+   The Df command is obsoleted by command DFg, but kept for
+   compatibility.
+*/
+ColorArg
+color_from_Df_command(IntArg Df_gray)
+{
+  return ColorArg((1000-Df_gray) * COLORARG_MAX / 1000); // scaling
+}
+
+//////////////////////////////////////////////////////////////////////
+/* delete_current_env():
+   Delete global variable current_env and its pointer members.
+
+   This should be a class method of environment.
+*/
+void delete_current_env(void)
+{
+  delete current_env->col;
+  delete current_env->fill;
+  delete current_env;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* fatal_command():
+   Emit error message about invalid command and abort.
+*/
+void
+fatal_command(char command)
+{
+  fatal("`%1' command invalid before first `p' command", command);
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_char():
+   Retrieve the next character from the input queue.
+
+   Return: The retrieved character (incl. EOF), converted to Char.
+*/
+inline Char
+get_char(void)
+{
+  return (Char) getc(current_file);
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_color_arg():
+   Retrieve an argument suitable for the color commands m and DF.
+
+   Return: The retrieved color argument.
+*/
+ColorArg
+get_color_arg(void)
+{
+  IntArg x = get_integer_arg();
+  if (x < 0 || x > (IntArg)COLORARG_MAX) {
+    error("color component argument out of range");
+    x = 0;
+  }
+  return (ColorArg) x;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_D_fixed_args():
+   Get a fixed number of integer arguments for D commands.
+
+   Fatal if wrong number of arguments.
+   Too many arguments on the line raise a warning.
+   A line skip is done.
+
+   number: In-parameter, the number of arguments to be retrieved.
+   ignore: In-parameter, ignore next argument -- GNU troff always emits
+           pairs of parameters for `D' extensions added by groff.
+           Default is `false'.
+
+   Return: New IntArray containing the arguments.
+*/
+IntArray *
+get_D_fixed_args(const size_t number)
+{
+  if (number <= 0)
+    fatal("requested number of arguments must be > 0");
+  IntArray *args = new IntArray(number);
+  for (size_t i = 0; i < number; i++)
+    args->append(get_integer_arg());
+  skip_line_D();
+  return args;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_D_fixed_args_odd_dummy():
+   Get a fixed number of integer arguments for D commands and optionally
+   ignore a dummy integer argument if the requested number is odd.
+
+   The gtroff program adds a dummy argument to some commands to get
+   an even number of arguments.
+   Error if the number of arguments differs from the scheme above.
+   A line skip is done.
+
+   number: In-parameter, the number of arguments to be retrieved.
+
+   Return: New IntArray containing the arguments.
+*/
+IntArray *
+get_D_fixed_args_odd_dummy(const size_t number)
+{
+  if (number <= 0)
+    fatal("requested number of arguments must be > 0");
+  IntArray *args = new IntArray(number);
+  for (size_t i = 0; i < number; i++)
+    args->append(get_integer_arg());
+  if (odd(number)) {
+    IntArray *a = get_possibly_integer_args();
+    if (a->len() > 1)
+      error("too many arguments");
+    delete a;
+  }
+  skip_line_D();
+  return args;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_D_variable_args():
+   Get a variable even number of integer arguments for D commands.
+
+   Get as many integer arguments as possible from the rest of the
+   current line.
+   - The arguments are separated by an arbitrary sequence of space or
+     tab characters.
+   - A comment, a newline, or EOF indicates the end of processing.
+   - Error on non-digit characters different from these.
+   - A final line skip is performed (except for EOF).
+
+   Return: New IntArray of the retrieved arguments.
+*/
+IntArray *
+get_D_variable_args()
+{
+  IntArray *args = get_possibly_integer_args();
+  size_t n = args->len();
+  if (n <= 0)
+    error("no arguments found");
+  if (odd(n))
+    error("even number of arguments expected");
+  skip_line_D();
+  return args;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_extended_arg():
+   Retrieve extended arg for `x X' command.
+
+   - Skip leading spaces and tabs, error on EOL or newline.
+   - Return everything before the next NL or EOF ('#' is not a comment);
+     as long as the following line starts with '+' this is returned
+     as well, with the '+' replaced by a newline.
+   - Final line skip is always performed.
+
+   Return: Allocated (new) string of retrieved text argument.
+*/
+char *
+get_extended_arg(void)
+{
+  StringBuf buf = StringBuf();
+  Char c = next_arg_begin();
+  while ((int) c != EOF) {
+    if ((int) c == '\n') {
+      current_lineno++;
+      c = get_char();
+      if ((int) c == '+')
+	buf.append((Char) '\n');
+      else {
+	unget_char(c);		// first character of next line
+	break;
+      }
+    }
+    else
+      buf.append(c);
+    c = get_char();
+  }
+  return buf.make_string();
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_integer_arg(): Retrieve integer argument.
+
+   Skip leading spaces and tabs, collect an optional '-' and all
+   following decimal digits (at least one) up to the next non-digit,
+   which is restored onto the input queue.
+
+   Fatal error on all other situations.
+
+   Return: Retrieved integer.
+*/
+IntArg
+get_integer_arg(void)
+{
+  StringBuf buf = StringBuf();
+  Char c = next_arg_begin();
+  if ((int) c == '-') {
+    buf.append(c);
+    c = get_char();
+  }
+  if (!isdigit((int) c))
+    error("integer argument expected");
+  while (isdigit((int) c)) {
+    buf.append(c);
+    c = get_char();
+  }
+  // c is not a digit
+  unget_char(c);
+  char *s = buf.make_string();
+  errno = 0;
+  long int number = strtol(s, 0, 10);
+  if (errno != 0
+      || number > INTARG_MAX || number < -INTARG_MAX) {
+    error("integer argument too large");
+    number = 0;
+  }
+  a_delete s;
+  return (IntArg) number;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_possibly_integer_args():
+   Parse the rest of the input line as a list of integer arguments.
+
+   Get as many integer arguments as possible from the rest of the
+   current line, even none.
+   - The arguments are separated by an arbitrary sequence of space or
+     tab characters.
+   - A comment, a newline, or EOF indicates the end of processing.
+   - Error on non-digit characters different from these.
+   - No line skip is performed.
+
+   Return: New IntArray of the retrieved arguments.
+*/
+IntArray *
+get_possibly_integer_args()
+{
+  bool done = false;
+  StringBuf buf = StringBuf();
+  Char c = get_char();
+  IntArray *args = new IntArray();
+  while (!done) {
+    buf.reset();
+    while (is_space_or_tab(c))
+      c = get_char();
+    if (c == '-') {
+      Char c1 = get_char();
+      if (isdigit((int) c1)) {
+	buf.append(c);
+	c = c1;
+      }
+      else
+	unget_char(c1);
+    }
+    while (isdigit((int) c)) {
+      buf.append(c);
+      c = get_char();
+    }
+    if (!buf.is_empty()) {
+      char *s = buf.make_string();
+      errno = 0;
+      long int x = strtol(s, 0, 10);
+      if (errno
+	  || x > INTARG_MAX || x < -INTARG_MAX) {
+	error("invalid integer argument, set to 0");
+	x = 0;
+      }
+      args->append((IntArg) x);
+      a_delete s;
+    }
+    // Here, c is not a digit.
+    // Terminate on comment, end of line, or end of file, while
+    // space or tab indicate continuation; otherwise error.
+    switch((int) c) {
+    case '#':
+      skip_to_end_of_line();
+      done = true;
+      break;
+    case '\n':
+      done = true;
+      unget_char(c);
+      break;
+    case EOF:
+      done = true;
+      break;
+    case ' ':
+    case '\t':
+      break;
+    default:
+      error("integer argument expected");
+      break;
+    }
+  }
+  return args;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* get_string_arg():
+   Retrieve string arg.
+
+   - Skip leading spaces and tabs; error on EOL or newline.
+   - Return all following characters before the next space, tab,
+     newline, or EOF character (in-word '#' is not a comment character).
+   - The terminating space, tab, newline, or EOF character is restored
+     onto the input queue, so no line skip.
+
+   Return: Retrieved string as char *, allocated by 'new'.
+*/
+char *
+get_string_arg(void)
+{
+  StringBuf buf = StringBuf();
+  Char c = next_arg_begin();
+  while (!is_space_or_tab(c)
+	 && c != Char('\n') && c != Char(EOF)) {
+    buf.append(c);
+    c = get_char();
+  }
+  unget_char(c);		// restore white space
+  return buf.make_string();
+}
+
+//////////////////////////////////////////////////////////////////////
+/* is_space_or_tab():
+   Test a character if it is a space or tab.
+
+   c: In-parameter, character to be tested.
+
+   Return: True, if c is a space or tab character, false otherwise.
+*/
+inline bool
+is_space_or_tab(const Char c)
+{
+  return (c == Char(' ') || c == Char('\t')) ? true : false;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* next_arg_begin():
+   Return first character of next argument.
+
+   Skip space and tab characters; error on newline or EOF.
+
+   Return: The first character different from these (including '#').
+*/
+Char
+next_arg_begin(void)
+{
+  Char c;
+  while (1) {
+    c = get_char();
+    switch ((int) c) {
+    case ' ':
+    case '\t':
+      break;
+    case '\n':
+    case EOF:
+      error("missing argument");
+      break;
+    default:			// first essential character
+      return c;
+    }
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* next_command():
+   Find the first character of the next command.
+
+   Skip spaces, tabs, comments (introduced by #), and newlines.
+
+   Return: The first character different from these (including EOF).
+*/
+Char
+next_command(void)
+{
+  Char c;
+  while (1) {
+    c = get_char();
+    switch ((int) c) {
+    case ' ':
+    case '\t':
+      break;
+    case '\n':
+      current_lineno++;
+      break;
+    case '#':			// comment
+      skip_line();
+      break;
+    default:			// EOF or first essential character
+      return c;
+    }
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* odd():
+   Test whether argument is an odd number.
+
+   n: In-parameter, the integer to be tested.
+
+   Return: True if odd, false otherwise.
+*/
+inline bool
+odd(const int n)
+{
+  return (n & 1 == 1) ? true : false;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* position_to_end_of_args():
+   Move graphical pointer to end of drawn figure.
+
+   This is used by the D commands that draw open geometrical figures.
+   The algorithm simply sums up all horizontal displacements (arguments
+   with even number) for the horizontal component.  Similarly, the
+   vertical component is the sum of the odd arguments.
+
+   args: In-parameter, the arguments of a former drawing command.
+*/
+void
+position_to_end_of_args(const IntArray * const args)
+{
+  size_t i;
+  const size_t n = args->len();
+  for (i = 0; i < n; i += 2)
+    current_env->hpos += (*args)[i];
+  for (i = 1; i < n; i += 2)
+    current_env->vpos += (*args)[i];
+}
+
+//////////////////////////////////////////////////////////////////////
+/* remember_filename():
+   Set global variable current_filename.
+
+   The actual filename is stored in current_filename.  This is used by
+   the postprocessors, expecting the name "<standard input>" for stdin.
+
+   filename: In-out-parameter; is changed to the new value also.
+*/
+void
+remember_filename(const char *filename)
+{
+  char *fname;
+  if (strcmp(filename, "-") == 0)
+    fname = "<standard input>";
+  else
+    fname = (char *) filename;
+  size_t len = strlen(fname) + 1;
+  if (current_filename != 0)
+    free((char *)current_filename);
+  current_filename = (const char *) malloc(len);
+  if (current_filename == 0)
+    fatal("can't malloc space for filename");
+  strncpy((char *)current_filename, (char *)fname, len);
+}
+
+//////////////////////////////////////////////////////////////////////
+/* remember_source_filename():
+   Set global variable current_source_filename.
+
+   The actual filename is stored in current_filename.  This is used by
+   the postprocessors, expecting the name "<standard input>" for stdin.
+
+   filename: In-out-parameter; is changed to the new value also.
+*/
+void
+remember_source_filename(const char *filename)
+{
+  char *fname;
+  if (strcmp(filename, "-") == 0)
+    fname = "<standard input>";
+  else
+    fname = (char *) filename;
+  size_t len = strlen(fname) + 1;
+  if (current_source_filename != 0)
+    free((char *)current_source_filename);
+  current_source_filename = (const char *) malloc(len);
+  if (current_source_filename == 0)
+    fatal("can't malloc space for filename");
+  strncpy((char *)current_source_filename, (char *)fname, len);
+}
+
+//////////////////////////////////////////////////////////////////////
+/* send_draw():
+   Call draw method of printer class.
+
+   subcmd: Letter of actual D subcommand.
+   args: Array of integer arguments of actual D subcommand.
+*/
+void
+send_draw(const Char subcmd, const IntArray * const args)
+{
+  EnvInt n = (EnvInt) args->len();
+  pr->draw((int) subcmd, (IntArg *) args->get_data(), n, current_env);
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line():
+   Go to next line within the input queue.
+
+   Skip the rest of the current line, including the newline character.
+   The global variable current_lineno is adjusted.
+   No errors are raised.
+*/
+void
+skip_line(void)
+{
+  Char c = get_char();
+  while (1) {
+    if (c == '\n') {
+      current_lineno++;
+      break;
+    }
+    if (c == EOF)
+      break;
+    c = get_char();
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line_checked ():
+   Check that there aren't any arguments left on the rest of the line,
+   then skip line.
+
+   Spaces, tabs, and a comment are allowed before newline or EOF.
+   All other characters raise an error.
+*/
+bool
+skip_line_checked(void)
+{
+  bool ok = true;
+  Char c = get_char();
+  while (is_space_or_tab(c))
+    c = get_char();
+  switch((int) c) {
+  case '#':			// comment
+    skip_line();
+    break;
+  case '\n':
+    current_lineno++;
+    break;
+  case EOF:
+    break;
+  default:
+    ok = false;
+    skip_line();
+    break;
+  }
+  return ok;
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line_fatal ():
+   Fatal error if arguments left, otherwise skip line.
+
+   Spaces, tabs, and a comment are allowed before newline or EOF.
+   All other characters trigger the error.
+*/
+void
+skip_line_fatal(void)
+{
+  bool ok = skip_line_checked();
+  if (!ok) {
+    current_lineno--;
+    error("too many arguments");
+    current_lineno++;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line_warn ():
+   Skip line, but warn if arguments are left on actual line.
+
+   Spaces, tabs, and a comment are allowed before newline or EOF.
+   All other characters raise a warning
+*/
+void
+skip_line_warn(void)
+{
+  bool ok = skip_line_checked();
+  if (!ok) {
+    current_lineno--;
+    warning("too many arguments on current line");
+    current_lineno++;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line_D ():
+   Skip line in `D' commands.
+
+   Decide whether in case of an additional argument a fatal error is
+   raised (the documented classical behavior), only a warning is
+   issued, or the line is just skipped (former groff behavior).
+   Actually decided for the warning.
+*/
+void
+skip_line_D(void)
+{
+  skip_line_warn();
+  // or: skip_line_fatal();
+  // or: skip_line();
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_line_x ():
+   Skip line in `x' commands.
+
+   Decide whether in case of an additional argument a fatal error is
+   raised (the documented classical behavior), only a warning is
+   issued, or the line is just skipped (former groff behavior).
+   Actually decided for the warning.
+*/
+void
+skip_line_x(void)
+{
+  skip_line_warn();
+  // or: skip_line_fatal();
+  // or: skip_line();
+}
+
+//////////////////////////////////////////////////////////////////////
+/* skip_to_end_of_line():
+   Go to the end of the current line.
+
+   Skip the rest of the current line, excluding the newline character.
+   The global variable current_lineno is not changed.
+   No errors are raised.
+*/
+void
+skip_to_end_of_line(void)
+{
+  Char c = get_char();
+  while (1) {
+    if (c == '\n') {
+      unget_char(c);
+      return;
+    }
+    if (c == EOF)
+      return;
+    c = get_char();
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+/* unget_char(c):
+   Restore character c onto input queue.
+
+   Write a character back onto the input stream.
+   EOF is gracefully handled.
+
+   c: In-parameter; character to be pushed onto the input queue.
+*/
+inline void
+unget_char(const Char c)
+{
+  if (c != EOF) {
+    int ch = (int) c;
+    if (ungetc(ch, current_file) == EOF)
+      fatal("could not unget character");
+  }
+}
+
+
+/**********************************************************************
+                       parser subcommands
+ **********************************************************************/
+
+//////////////////////////////////////////////////////////////////////
+/* parse_color_command:
+   Process the commands m and DF, but not Df.
+
+   col: In-out-parameter; the color object to be set, must have
+        been initialized before.
+*/
+void
+parse_color_command(color *col)
+{
+  ColorArg gray = 0;
+  ColorArg red = 0, green = 0, blue = 0;
+  ColorArg cyan = 0, magenta = 0, yellow = 0, black = 0;
+  Char subcmd = next_arg_begin();
+  switch((int) subcmd) {
+  case 'c':			// DFc or mc: CMY
+    cyan = get_color_arg();
+    magenta = get_color_arg();
+    yellow = get_color_arg();
+    col->set_cmy(cyan, magenta, yellow);
+    break;
+  case 'd':			// DFd or md: set default color
+    col->set_default();
+    break;
+  case 'g':			// DFg or mg: gray
+    gray = get_color_arg();
+    col->set_gray(gray);
+    break;
+  case 'k':			// DFk or mk: CMYK
+    cyan = get_color_arg();
+    magenta = get_color_arg();
+    yellow = get_color_arg();
+    black = get_color_arg();
+    col->set_cmyk(cyan, magenta, yellow, black);
+    break;
+  case 'r':			// DFr or mr: RGB
+    red = get_color_arg();
+    green = get_color_arg();
+    blue = get_color_arg();
+    col->set_rgb(red, green, blue);
+    break;
+  default:
+    error("invalid color scheme `%1'", (int) subcmd);
+    break;
+  } // end of color subcommands
+}
+
+//////////////////////////////////////////////////////////////////////
+/* parse_D_command():
+   Parse the subcommands of graphical command D.
+
+   This is the part of the do_file() parser that scans the graphical
+   subcommands.
+   - Error on lacking or wrong arguments.
+   - Warning on too many arguments.
+   - Line is always skipped.
+*/
+void
+parse_D_command()
+{
+  Char subcmd = next_arg_begin();
+  switch((int) subcmd) {
+  case '~':			// D~: draw B-spline
+    // actually, this isn't available for some postprocessors
+    // fall through
+  default:			// unknown options are passed to device
+    {
+      IntArray *args = get_D_variable_args();
+      send_draw(subcmd, args);
+      position_to_end_of_args(args);
+      delete args;
+      break;
+    }
+  case 'a':			// Da: draw arc
+    {
+      IntArray *args = get_D_fixed_args(4);
+      send_draw(subcmd, args);
+      position_to_end_of_args(args);
+      delete args;
+      break;
+    }
+  case 'c':			// Dc: draw circle line
+    {
+      IntArray *args = get_D_fixed_args(1);
+      send_draw(subcmd, args);
+      // move to right end
+      current_env->hpos += (*args)[0];
+      delete args;
+      break;
+    }
+  case 'C':			// DC: draw solid circle
+    {
+      IntArray *args = get_D_fixed_args_odd_dummy(1);
+      send_draw(subcmd, args);
+      // move to right end
+      current_env->hpos += (*args)[0];
+      delete args;
+      break;
+    }
+  case 'e':			// De: draw ellipse line
+  case 'E':			// DE: draw solid ellipse
+    {
+      IntArray *args = get_D_fixed_args(2);
+      send_draw(subcmd, args);
+      // move to right end
+      current_env->hpos += (*args)[0];
+      delete args;
+      break;
+    }
+  case 'f':			// Df: set fill gray; obsoleted by DFg
+    {
+      IntArg arg = get_integer_arg();
+      if ((arg >= 0) && (arg <= 1000)) {
+	// convert arg and treat it like DFg
+	ColorArg gray = color_from_Df_command(arg);
+        current_env->fill->set_gray(gray);
+      }
+      else {
+	// set fill color to the same value as the current outline color
+	delete current_env->fill;
+	current_env->fill = new color(current_env->col);
+      }
+      pr->change_fill_color(current_env);
+      // skip unused `vertical' component (\D'...' always emits pairs)
+      (void) get_integer_arg();
+#   ifdef STUPID_DRAWING_POSITIONING
+      current_env->hpos += arg;
+#   endif
+      skip_line_x();
+      break;
+    }
+  case 'F':			// DF: set fill color, several formats
+    parse_color_command(current_env->fill);
+    pr->change_fill_color(current_env);
+    // no positioning (setting-only command)
+    skip_line_x();
+    break;
+  case 'l':			// Dl: draw line
+    {
+      IntArray *args = get_D_fixed_args(2);
+      send_draw(subcmd, args);
+      position_to_end_of_args(args);
+      delete args;
+      break;
+    }
+  case 'p':			// Dp: draw closed polygon line
+  case 'P':			// DP: draw solid closed polygon
+    {
+      IntArray *args = get_D_variable_args();
+      send_draw(subcmd, args);
+#   ifdef STUPID_DRAWING_POSITIONING
+      // final args positioning
+      position_to_end_of_args(args);
+#   endif
+      delete args;
+      break;
+    }
+  case 't':			// Dt: set line thickness
+    {
+      IntArray *args = get_D_fixed_args_odd_dummy(1);
+      send_draw(subcmd, args);
+#   ifdef STUPID_DRAWING_POSITIONING
+      // final args positioning
+      position_to_end_of_args(args);
+#   endif
+      delete args;
+      break;
+    }
+  } // end of D subcommands
+}
+
+//////////////////////////////////////////////////////////////////////
+/* parse_x_command():
+   Parse subcommands of the device control command x.
+
+   This is the part of the do_file() parser that scans the device
+   controlling commands.
+   - Error on duplicate prologue commands.
+   - Error on wrong or lacking arguments.
+   - Warning on too many arguments.
+   - Line is always skipped.
+
+   Globals:
+   - current_env: is set by many subcommands.
+   - npages: page counting variable
+
+   Return: boolean in the meaning of `stopped'
+           - true if parsing should be stopped (`x stop').
+           - false if parsing should continue.
+*/
+bool
+parse_x_command(void)
+{
+  bool stopped = false;
+  char *subcmd_str = get_string_arg();
+  char subcmd = subcmd_str[0];
+  switch (subcmd) {
+  case 'f':			// x font: mount font
+    {
+      IntArg n = get_integer_arg();
+      char *name = get_string_arg();
+      pr->load_font(n, name);
+      a_delete name;
+      skip_line_x();
+      break;
+    }
+  case 'F':			// x Filename: set filename for errors
+    {
+      char *str_arg = get_string_arg();
+      if (str_arg == 0)
+	warning("empty argument for `x F' command");
+      else {
+	remember_source_filename(str_arg);
+	a_delete str_arg;
+      }
+      break;
+    }
+  case 'H':			// x Height: set character height
+    current_env->height = get_integer_arg();
+    if (current_env->height == current_env->size)
+      current_env->height = 0;
+    skip_line_x();
+    break;
+  case 'i':			// x init: initialize device
+    error("duplicate `x init' command");
+    skip_line_x();
+    break;
+  case 'p':			// x pause: pause device
+    skip_line_x();
+    break;
+  case 'r':			// x res: set resolution
+    error("duplicate `x res' command");
+    skip_line_x();
+    break;
+  case 's':			// x stop: stop device
+    stopped = true;
+    skip_line_x();
+    break;
+  case 'S':			// x Slant: set slant
+    current_env->slant = get_integer_arg();
+    skip_line_x();
+    break;
+  case 't':			// x trailer: generate trailer info
+    skip_line_x();
+    break;
+  case 'T':			// x Typesetter: set typesetter
+    error("duplicate `x T' command");
+    skip_line();
+    break;
+  case 'u':			// x underline: from .cu
+    {
+      char *str_arg = get_string_arg();
+      pr->special(str_arg, current_env, 'u');
+      a_delete str_arg;
+      skip_line_x();
+      break;
+    }
+  case 'X':			// x X: send uninterpretedly to device
+    {
+      char *str_arg = get_extended_arg(); // includes line skip
+      if (npages <= 0)
+	error("`x X' command invalid before first `p' command");
+      else
+	pr->special(str_arg, current_env);
+      a_delete str_arg;
+      break;
+    }
+  default:			// ignore unknown x commands, but warn
+    warning("unknown command `x %1'", subcmd);
+    skip_line();
+  }
+  a_delete subcmd_str;
+  return stopped;
+}
+
+
+/**********************************************************************
+                     exported part (by driver.h)
+ **********************************************************************/
+
+////////////////////////////////////////////////////////////////////////
+/* do_file():
+   Parse and postprocess groff intermediate output.
+
+   filename: "-" for standard input, normal file name otherwise
+*/
+void
+do_file(const char *filename)
+{
+  Char command;
+  bool stopped = false;		// terminating condition
+
+#ifdef USE_ENV_STACK
+  EnvStack env_stack = EnvStack();
+#endif // USE_ENV_STACK
+
+  // setup of global variables
+  npages = 0;
+  current_lineno = 1;
+  // `pr' is initialized after the prologue.
+  // `device' is set by the 1st prologue command.
+
+  if (filename[0] == '-' && filename[1] == '\0')
+    current_file = stdin;
+  else {
+    errno = 0;
+    current_file = fopen(filename, "r");
+    if (errno != 0 || current_file == 0) {
+      error("can't open file `%1'", filename);
+      return;
+    }
+  }
+  remember_filename(filename);
+
+  if (current_env != 0)
+    delete_current_env();
+  current_env = new environment;
+  current_env->col = new color;
+  current_env->fill = new color;
+  current_env->fontno = -1;
+  current_env->height = 0;
+  current_env->hpos = -1;
+  current_env->slant = 0;
+  current_env->size = 0;
+  current_env->vpos = -1;
+
+  // parsing of prologue (first 3 commands)
+  {
+    char *str_arg;
+    IntArg int_arg;
+
+    // 1st command `x T'
+    command = next_command();	
+    if ((int) command == EOF)
+      return;
+    if ((int) command != 'x')
+      fatal("the first command must be `x T'");
+    str_arg = get_string_arg();
+    if (str_arg[0] != 'T')
+      fatal("the first command must be `x T'");
+    a_delete str_arg;
+    char *tmp_dev = get_string_arg();
+    if (pr == 0) {		// note: `pr' initialized after prologue
+      device = tmp_dev;
+      if (!font::load_desc())
+	fatal("couldn't load DESC file, can't continue");
+    }
+    else {
+      if (device == 0 || strcmp(device, tmp_dev) != 0)
+	fatal("all files must use the same device");
+      a_delete tmp_dev;
+    }
+    skip_line_x();		// ignore further arguments
+    current_env->size = 10 * font::sizescale;
+
+    // 2nd command `x res'
+    command = next_command();
+    if ((int) command != 'x')
+      fatal("the second command must be `x res'");
+    str_arg = get_string_arg();
+    if (str_arg[0] != 'r')
+      fatal("the second command must be `x res'");
+    a_delete str_arg;
+    int_arg = get_integer_arg();
+    EnvInt font_res = font::res;
+    if (int_arg != font_res)
+      fatal("resolution does not match");
+    int_arg = get_integer_arg();
+    if (int_arg != font::hor)
+      fatal("minimum horizontal motion does not match");
+    int_arg = get_integer_arg();
+    if (int_arg != font::vert)
+      fatal("minimum vertical motion does not match");
+    skip_line_x();		// ignore further arguments
+
+    // 3rd command `x init'
+    command = next_command();
+    if (command != 'x')
+      fatal("the third command must be `x init'");
+    str_arg = get_string_arg();
+    if (str_arg[0] != 'i')
+      fatal("the third command must be `x init'");
+    a_delete str_arg;
+    skip_line_x();
+  }
+
+  // parsing of body
+  if (pr == 0)
+    pr = make_printer();
+  while (!stopped) {
+    command = next_command();
+    if (command == EOF)
+      break;
+    // spaces, tabs, comments, and newlines are skipped here
+    switch ((int) command) {
+    case '#':			// #: comment, ignore up to end of line
+      skip_line();
+      break;
+#ifdef USE_ENV_STACK
+    case '{':			// {: start a new environment (a copy)
+      env_stack.push(current_env);
+      break;
+    case '}':			// }: pop previous env from stack
+      delete_current_env();
+      current_env = env_stack.pop();
+      break;
+#endif // USE_ENV_STACK
+    case '0':			// ddc: obsolete jump and print command
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      {				// expect 2 digits and a character
+	char s[3];
+	Char c = next_arg_begin();
+	if (npages <= 0)
+	  fatal_command(command);
+	if (!isdigit((int) c)) {
+	  error("digit expected");
+	  c = 0;
+	}
+	s[0] = (char) command;
+	s[1] = (char) c;
+	s[2] = '\0';
+	errno = 0;
+	long int x = strtol(s, 0, 10);
+	if (errno != 0)
+	  error("couldn't convert 2 digits");
+	EnvInt hor_pos = (EnvInt) x;
+	current_env->hpos += hor_pos;
+	c = next_arg_begin();
+	if ((int) c == '\n' || (int) c == EOF)
+	  error("character argument expected");
+	else
+	  pr->set_ascii_char((unsigned char) c, current_env);
+	break;
+      }
+    case 'c':			// c: print ascii char without moving
+      {
+	if (npages <= 0)
+	  fatal_command(command);
+	Char c = next_arg_begin();
+	if (c == '\n' || c == EOF)
+	  error("missing argument to `c' command");
+	else
+	  pr->set_ascii_char((unsigned char) c, current_env);
+	break;
+      }
+    case 'C':			// C: print named special character
+      {
+	if (npages <= 0)
+	  fatal_command(command);
+	char *str_arg = get_string_arg();
+	pr->set_special_char(str_arg, current_env);
+	a_delete str_arg;
+	break;
+      }
+    case 'D':			// drawing commands
+      if (npages <= 0)
+	fatal_command(command);
+      parse_D_command();
+      break;
+    case 'f':			// f: set font to number
+      current_env->fontno = get_integer_arg();
+      break;
+    case 'F':			// F: obsolete, replaced by `x F'
+      {
+	char *str_arg = get_string_arg();
+	remember_source_filename(str_arg);
+	a_delete str_arg;
+	break;
+      }
+    case 'h':			// h: relative horizontal move
+      current_env->hpos += (EnvInt) get_integer_arg();
+      break;
+    case 'H':			// H: absolute horizontal positioning
+      current_env->hpos = (EnvInt) get_integer_arg();
+      break;
+    case 'm':			// m: glyph color
+      parse_color_command(current_env->col);
+      pr->change_color(current_env);
+      break;
+    case 'n':			// n: print end of line
+				// ignore two arguments (historically)
+      if (npages <= 0)
+	fatal_command(command);
+      pr->end_of_line();
+      (void) get_integer_arg();
+      (void) get_integer_arg();
+      break;
+    case 'N':			// N: print char with given int code
+      if (npages <= 0)
+	fatal_command(command);
+      pr->set_numbered_char(get_integer_arg(), current_env);
+      break;
+    case 'p':			// p: start new page with given number
+      if (npages > 0)
+	pr->end_page(current_env->vpos);
+      npages++;			// increment # of processed pages
+      pr->begin_page(get_integer_arg());
+      current_env->vpos = 0;
+      break;
+    case 's':			// s: set point size
+      current_env->size = get_integer_arg();
+      if (current_env->height == current_env->size)
+	current_env->height = 0;
+      break;
+    case 't':			// t: print a text word
+      {
+	char c;
+	if (npages <= 0)
+	  fatal_command(command);
+	char *str_arg = get_string_arg();
+	size_t i = 0;
+	while ((c = str_arg[i++]) != '\0') {
+	  EnvInt w;
+	  pr->set_ascii_char((unsigned char) c, current_env, &w);
+	  current_env->hpos += w;
+	}
+	a_delete str_arg;
+	break;
+      }
+    case 'u':			// u: print spaced word
+      {
+	char c;
+	if (npages <= 0)
+	  fatal_command(command);
+	EnvInt kern = (EnvInt) get_integer_arg();
+	char *str_arg = get_string_arg();
+	size_t i = 0;
+	while ((c = str_arg[i++]) != '\0') {
+	  EnvInt w;
+	  pr->set_ascii_char((unsigned char) c, current_env, &w);
+	  current_env->hpos += w + kern;
+	}
+	a_delete str_arg;
+	break;
+      }
+    case 'v':			// v: relative vertical move
+      current_env->vpos += (EnvInt) get_integer_arg();
+      break;
+    case 'V':			// V: absolute vertical positioning
+      current_env->vpos = (EnvInt) get_integer_arg();
+      break;
+    case 'w':			// w: inform about paddable space
+      break;
+    case 'x':			// device controlling commands
+      stopped = parse_x_command();
+      break;
+    default:
+      warning("unrecognized command `%1'", (unsigned char) command);
+      skip_line();
+      break;
+    } // end of switch
+  } // end of while
+
+  // end of file reached
+  if (npages > 0)
+    pr->end_page(current_env->vpos);
+  delete pr;
+  fclose(current_file);
+  // If `stopped' is not `true' here then there wasn't any `x stop'.
+  if (!stopped)
+    warning("no final `x stop' command");
+  delete_current_env();
+}
diff --git a/contrib/groff/src/libs/libdriver/printer.cpp b/contrib/groff/src/libs/libdriver/printer.cpp
new file mode 100644
index 0000000..179daf1
--- /dev/null
+++ b/contrib/groff/src/libs/libdriver/printer.cpp
@@ -0,0 +1,214 @@
+// -*- C++ -*-
+
+// <groff_src_dir>/src/libs/libdriver/printer.cpp
+
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+   Written by James Clark (jjc@jclark.com)
+
+   Last update: 04 Apr 2003
+
+   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 2, 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 groff; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+*/
+
+#include "driver.h"
+
+font_pointer_list::font_pointer_list(font *f, font_pointer_list *fp)
+: p(f), next(fp)
+{
+}
+
+printer::printer()
+: font_list(0), font_table(0), nfonts(0)
+{
+}
+
+printer::~printer()
+{
+  a_delete font_table;
+  while (font_list) {
+    font_pointer_list *tem = font_list;
+    font_list = font_list->next;
+    delete tem->p;
+    delete tem;
+  }
+  if (ferror(stdout) || fflush(stdout) < 0)
+    fatal("output error");
+}
+
+void printer::load_font(int n, const char *nm)
+{
+  assert(n >= 0);
+  if (n >= nfonts) {
+    if (nfonts == 0) {
+      nfonts = 10;
+      if (nfonts <= n)
+	nfonts = n + 1;
+      font_table = new font *[nfonts];
+      for (int i = 0; i < nfonts; i++)
+	font_table[i] = 0;
+    }
+    else {
+      font **old_font_table = font_table;
+      int old_nfonts = nfonts;
+      nfonts *= 2;
+      if (n >= nfonts)
+	nfonts = n + 1;
+      font_table = new font *[nfonts];
+      int i;
+      for (i = 0; i < old_nfonts; i++)
+	font_table[i] = old_font_table[i];
+      for (i = old_nfonts; i < nfonts; i++)
+	font_table[i] = 0;
+      a_delete old_font_table;
+    }
+  }
+  font *f = find_font(nm);
+  font_table[n] = f;
+}
+
+font *printer::find_font(const char *nm)
+{
+  for (font_pointer_list *p = font_list; p; p = p->next)
+    if (strcmp(p->p->get_name(), nm) == 0)
+      return p->p;
+  font *f = make_font(nm);
+  if (!f)
+    fatal("sorry, I can't continue");
+  font_list = new font_pointer_list(f, font_list);
+  return f;
+}
+
+font *printer::make_font(const char *nm)
+{
+  return font::load_font(nm);
+}
+
+void printer::end_of_line()
+{
+}
+
+void printer::special(char *, const environment *, char)
+{
+}
+
+void printer::draw(int, int *, int, const environment *)
+{
+}
+
+void printer::change_color(const environment * const)
+{
+}
+
+void printer::change_fill_color(const environment * const)
+{
+}
+
+void printer::set_ascii_char(unsigned char c, const environment *env, 
+			     int *widthp)
+{
+  char  buf[2];
+  int   w;
+  font *f;
+
+  buf[0] = c;
+  buf[1] = '\0';
+
+  int i = set_char_and_width(buf, env, &w, &f);
+  set_char(i, f, env, w, 0);
+  if (widthp) {
+    *widthp = w;
+  }
+}
+
+void printer::set_special_char(const char *nm, const environment *env,
+			       int *widthp)
+{
+  font *f;
+  int w;
+  int i = set_char_and_width(nm, env, &w, &f);
+  if (i != -1) {
+    set_char(i, f, env, w, nm);
+    if (widthp)
+      *widthp = w;
+  }
+}
+
+int printer::set_char_and_width(const char *nm, const environment *env,
+				int *widthp, font **f)
+{
+  int i = font::name_to_index(nm);
+  int fn = env->fontno;
+  if (fn < 0 || fn >= nfonts) {
+    error("bad font position `%1'", fn);
+    return(-1);
+  }
+  *f = font_table[fn];
+  if (*f == 0) {
+    error("no font mounted at `%1'", fn);
+    return(-1);
+  }
+  if (!(*f)->contains(i)) {
+    if (nm[0] != '\0' && nm[1] == '\0')
+      error("font `%1' does not contain ascii character `%2'",
+	    (*f)->get_name(),
+	    nm[0]);
+    else
+      error("font `%1' does not contain special character `%2'",
+	    (*f)->get_name(),
+	    nm);
+    return(-1);
+  }
+  int w = (*f)->get_width(i, env->size);
+  if (widthp)
+    *widthp = w;
+  return( i );
+}
+
+void printer::set_numbered_char(int num, const environment *env, int *widthp)
+{
+  int i = font::number_to_index(num);
+  int fn = env->fontno;
+  if (fn < 0 || fn >= nfonts) {
+    error("bad font position `%1'", fn);
+    return;
+  }
+  font *f = font_table[fn];
+  if (f == 0) {
+    error("no font mounted at `%1'", fn);
+    return;
+  }
+  if (!f->contains(i)) {
+    error("font `%1' does not contain numbered character %2",
+	  f->get_name(),
+	  num);
+    return;
+  }
+  int w = f->get_width(i, env->size);
+  if (widthp)
+    *widthp = w;
+  set_char(i, f, env, w, 0);
+}
+
+font *printer::get_font_from_index(int fontno)
+{
+  if ((fontno >= 0) && (fontno < nfonts))
+    return(font_table[fontno]);
+  else
+    return(0);
+}
diff --git a/contrib/groff/src/libs/libgroff/Makefile.sub b/contrib/groff/src/libs/libgroff/Makefile.sub
index ff6bd00..30277ab 100644
--- a/contrib/groff/src/libs/libgroff/Makefile.sub
+++ b/contrib/groff/src/libs/libgroff/Makefile.sub
@@ -39,39 +39,39 @@ OBJS=\
   version.$(OBJEXT) \
   $(LIBOBJS)
 CCSRCS=\
-  $(srcdir)/assert.cc \
-  $(srcdir)/change_lf.cc \
-  $(srcdir)/cmap.cc \
-  $(srcdir)/color.cc \
-  $(srcdir)/cset.cc \
-  $(srcdir)/device.cc \
-  $(srcdir)/errarg.cc \
-  $(srcdir)/error.cc \
-  $(srcdir)/fatal.cc \
-  $(srcdir)/filename.cc \
-  $(srcdir)/font.cc \
-  $(srcdir)/fontfile.cc \
-  $(srcdir)/geometry.cc \
-  $(srcdir)/htmlhint.cc \
-  $(srcdir)/invalid.cc \
-  $(srcdir)/lf.cc \
-  $(srcdir)/lineno.cc \
-  $(srcdir)/macropath.cc \
-  $(srcdir)/maxfilename.cc \
-  $(srcdir)/mksdir.cc \
-  $(srcdir)/mkstemp.cc \
-  $(srcdir)/nametoindex.cc \
-  $(srcdir)/new.cc \
-  $(srcdir)/paper.cc \
-  $(srcdir)/prime.cc \
-  $(srcdir)/progname.cc \
-  $(srcdir)/ptable.cc \
-  $(srcdir)/searchpath.cc \
-  $(srcdir)/string.cc \
-  $(srcdir)/strsave.cc \
-  $(srcdir)/tmpfile.cc \
-  $(srcdir)/tmpname.cc \
-  version.cc
+  $(srcdir)/assert.cpp \
+  $(srcdir)/change_lf.cpp \
+  $(srcdir)/cmap.cpp \
+  $(srcdir)/color.cpp \
+  $(srcdir)/cset.cpp \
+  $(srcdir)/device.cpp \
+  $(srcdir)/errarg.cpp \
+  $(srcdir)/error.cpp \
+  $(srcdir)/fatal.cpp \
+  $(srcdir)/filename.cpp \
+  $(srcdir)/font.cpp \
+  $(srcdir)/fontfile.cpp \
+  $(srcdir)/geometry.cpp \
+  $(srcdir)/htmlhint.cpp \
+  $(srcdir)/invalid.cpp \
+  $(srcdir)/lf.cpp \
+  $(srcdir)/lineno.cpp \
+  $(srcdir)/macropath.cpp \
+  $(srcdir)/maxfilename.cpp \
+  $(srcdir)/mksdir.cpp \
+  $(srcdir)/mkstemp.cpp \
+  $(srcdir)/nametoindex.cpp \
+  $(srcdir)/new.cpp \
+  $(srcdir)/paper.cpp \
+  $(srcdir)/prime.cpp \
+  $(srcdir)/progname.cpp \
+  $(srcdir)/ptable.cpp \
+  $(srcdir)/searchpath.cpp \
+  $(srcdir)/string.cpp \
+  $(srcdir)/strsave.cpp \
+  $(srcdir)/tmpfile.cpp \
+  $(srcdir)/tmpname.cpp \
+  version.cpp
 CSRCS=\
   $(srcdir)/fmod.c \
   $(srcdir)/getcwd.c \
@@ -81,17 +81,19 @@ CSRCS=\
   $(srcdir)/itoa.c \
   $(srcdir)/matherr.c \
   $(srcdir)/putenv.c \
+  $(srcdir)/strcasecmp.c \
   $(srcdir)/strerror.c \
+  $(srcdir)/strncasecmp.c \
   $(srcdir)/strtol.c \
   $(srcdir)/../snprintf/snprintf.c
 GENSRCS=\
-  version.cc
+  version.cpp
 
 src_version=`cat $(top_srcdir)/VERSION`
 src_revision=`cat $(top_srcdir)/REVISION`
 
-version.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
-	@echo Making version.cc
+version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
+	@echo Making version.cpp
 	@echo const char \*version_string = \"$(src_version)\"\; >$@
 	@echo const char \*revision_string = \"$(src_revision)\"\; >>$@
 	@echo extern \"C\" const char \*Version_string = \"$(src_version).$(src_revision)\"\; | \
diff --git a/contrib/groff/src/libs/libgroff/assert.cpp b/contrib/groff/src/libs/libgroff/assert.cpp
new file mode 100644
index 0000000..89742e3
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/assert.cpp
@@ -0,0 +1,34 @@
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "assert.h"
+
+extern const char *program_name;
+
+void assertion_failed(int lineno, const char *filename)
+{
+  if (program_name != 0)
+    fprintf(stderr, "%s: ", program_name);
+  fprintf(stderr, "Failed assertion at line %d, file `%s'.\n",
+	  lineno, filename);
+  fflush(stderr);
+  abort();
+}
diff --git a/contrib/groff/src/libs/libgroff/change_lf.cpp b/contrib/groff/src/libs/libgroff/change_lf.cpp
new file mode 100644
index 0000000..2e44af1
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/change_lf.cpp
@@ -0,0 +1,37 @@
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <string.h>
+
+extern char *strsave(const char *);
+
+extern const char *current_filename;
+extern int current_lineno;
+
+void change_filename(const char *f)
+{
+  if (current_filename != 0 && strcmp(current_filename, f) == 0)
+    return;
+  current_filename = strsave(f);
+}
+
+void change_lineno(int ln)
+{
+  current_lineno = ln;
+}
diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/contrib/groff/src/libs/libgroff/cmap.cpp
new file mode 100644
index 0000000..4b75d06
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/cmap.cpp
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <ctype.h>
+#include "cmap.h"
+
+cmap cmlower(CMAP_BUILTIN);
+cmap cmupper(CMAP_BUILTIN);
+
+#ifdef isascii
+#define ISASCII(c) isascii(c)
+#else
+#define ISASCII(c) (1)
+#endif
+
+cmap::cmap()
+{
+  unsigned char *p = v;
+  for (int i = 0; i <= UCHAR_MAX; i++)
+    p[i] = i;
+}
+
+cmap::cmap(cmap_builtin)
+{
+  // these are initialised by cmap_init::cmap_init()
+}
+
+int cmap_init::initialised = 0;
+
+cmap_init::cmap_init()
+{
+  if (initialised)
+    return;
+  initialised = 1;
+  for (int i = 0; i <= UCHAR_MAX; i++) {
+    cmupper.v[i] = ISASCII(i) && islower(i) ? toupper(i) : i;
+    cmlower.v[i] = ISASCII(i) && isupper(i) ? tolower(i) : i;
+  }
+}
diff --git a/contrib/groff/src/libs/libgroff/color.cpp b/contrib/groff/src/libs/libgroff/color.cpp
new file mode 100644
index 0000000..da138dc
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/color.cpp
@@ -0,0 +1,427 @@
+// -*- C++ -*-
+
+/* <groff_src_dir>/src/libs/libgroff/color.cpp
+
+Last update: 13 Apr 2003
+
+Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+    Written by Gaius Mulley <gaius@glam.ac.uk>
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "color.h"
+#include "cset.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include "errarg.h"
+#include "error.h"
+
+static inline unsigned int
+min(const unsigned int a, const unsigned int b)
+{
+  if (a < b)
+    return a;
+  else
+    return b;
+}
+
+color *color::free_list = 0;
+
+void *color::operator new(size_t n)
+{
+  assert(n == sizeof(color));
+  if (!free_list) {
+    const int BLOCK = 128;
+    free_list = (color *)new char[sizeof(color)*BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK-1].next = 0;
+  }
+  color *p = free_list;
+  free_list = (color *)(free_list->next);
+  p->next = 0;
+  return p;
+}
+
+void color::operator delete(void *p)
+{
+  if (p) {
+    ((color *)p)->next = free_list;
+    free_list = (color *)p;
+  }
+}
+
+color::color(const color * const c)
+{
+  scheme = c->scheme;
+  components[0] = c->components[0];
+  components[1] = c->components[1];
+  components[2] = c->components[2];
+  components[3] = c->components[3];
+}
+
+color::~color()
+{
+}
+
+int color::operator==(const color & c) const
+{
+  if (scheme != c.scheme)
+    return 0;
+  switch (scheme) {
+  case DEFAULT:
+    break;
+  case RGB:
+    if (Red != c.Red || Green != c.Green || Blue != c.Blue)
+      return 0;
+    break;
+  case CMYK:
+    if (Cyan != c.Cyan || Magenta != c.Magenta
+	|| Yellow != c.Yellow || Black != c.Black)
+      return 0;
+    break;
+  case GRAY:
+    if (Gray != c.Gray)
+      return 0;
+    break;
+  case CMY:
+    if (Cyan != c.Cyan || Magenta != c.Magenta || Yellow != c.Yellow)
+      return 0;
+    break;
+  }
+  return 1;
+}
+
+int color::operator!=(const color & c) const
+{
+  return !(*this == c);
+}
+
+color_scheme color::get_components(unsigned int *c) const
+{
+#if 0
+  if (sizeof (c) < sizeof (unsigned int) * 4)
+    fatal("argument is not big enough to store 4 color components");
+#endif
+  c[0] = components[0];
+  c[1] = components[1];
+  c[2] = components[2];
+  c[3] = components[3];
+  return scheme;
+}
+
+void color::set_default()
+{
+  scheme = DEFAULT;
+}
+
+// (0, 0, 0) is black
+
+void color::set_rgb(const unsigned int r, const unsigned int g,
+		    const unsigned int b)
+{
+  scheme = RGB;
+  Red = min(MAX_COLOR_VAL, r);
+  Green = min(MAX_COLOR_VAL, g);
+  Blue = min(MAX_COLOR_VAL, b);
+}
+
+// (0, 0, 0) is white
+
+void color::set_cmy(const unsigned int c, const unsigned int m,
+		    const unsigned int y)
+{
+  scheme = CMY;
+  Cyan = min(MAX_COLOR_VAL, c);
+  Magenta = min(MAX_COLOR_VAL, m);
+  Yellow = min(MAX_COLOR_VAL, y);
+}
+
+// (0, 0, 0, 0) is white
+
+void color::set_cmyk(const unsigned int c, const unsigned int m,
+		     const unsigned int y, const unsigned int k)
+{
+  scheme = CMYK;
+  Cyan = min(MAX_COLOR_VAL, c);
+  Magenta = min(MAX_COLOR_VAL, m);
+  Yellow = min(MAX_COLOR_VAL, y);
+  Black = min(MAX_COLOR_VAL, k);
+}
+
+// (0) is black
+
+void color::set_gray(const unsigned int g)
+{
+  scheme = GRAY;
+  Gray = min(MAX_COLOR_VAL, g);
+}
+
+/*
+ *  atoh - computes the decimal value of a hexadecimal number string.
+ *         `length' characters of `s' are read.  Returns 1 if successful.
+ */
+
+static int atoh(unsigned int *result,
+		const char * const s, const size_t length)
+{
+  size_t i = 0;
+  unsigned int val = 0;
+  while ((i < length) && csxdigit(s[i])) {
+    if (csdigit(s[i]))
+      val = val*0x10 + (s[i]-'0');
+    else if (csupper(s[i]))
+      val = val*0x10 + (s[i]-'A') + 10;
+    else
+      val = val*0x10 + (s[i]-'a') + 10;
+    i++;
+  }
+  if (i != length)
+    return 0;
+  *result = val;
+  return 1;
+}
+
+/*
+ *  read_encoding - set color from a hexadecimal color string.
+ *
+ *  Use color scheme `cs' to parse `n' color components from string `s'.
+ *  Returns 1 if successful.
+ */
+
+int color::read_encoding(const color_scheme cs, const char * const s,
+			 const size_t n)
+{
+  size_t hex_length = 2;
+  scheme = cs;
+  char *p = (char *) s;
+  p++;
+  if (*p == '#') {
+    hex_length = 4;
+    p++;
+  }
+  for (size_t i = 0; i < n; i++) {
+    if (!atoh(&(components[i]), p, hex_length))
+      return 0;
+    if (hex_length == 2)
+      components[i] *= 0x101;	// scale up -- 0xff should become 0xffff
+    p += hex_length;
+  }
+  return 1;
+}
+
+int color::read_rgb(const char * const s)
+{
+  return read_encoding(RGB, s, 3);
+}
+
+int color::read_cmy(const char * const s)
+{
+  return read_encoding(CMY, s, 3);
+}
+
+int color::read_cmyk(const char * const s)
+{
+  return read_encoding(CMYK, s, 4);
+}
+
+int color::read_gray(const char * const s)
+{
+  return read_encoding(GRAY, s, 1);
+}
+
+void
+color::get_rgb(unsigned int *r, unsigned int *g, unsigned int *b) const
+{
+  switch (scheme) {
+  case RGB:
+    *r = Red;
+    *g = Green;
+    *b = Blue;
+    break;
+  case CMY:
+    *r = MAX_COLOR_VAL - Cyan;
+    *g = MAX_COLOR_VAL - Magenta;
+    *b = MAX_COLOR_VAL - Yellow;
+    break;
+  case CMYK:
+    *r = MAX_COLOR_VAL
+	 - min(MAX_COLOR_VAL,
+	       Cyan * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    *g = MAX_COLOR_VAL
+	 - min(MAX_COLOR_VAL,
+	       Magenta * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    *b = MAX_COLOR_VAL
+	 - min(MAX_COLOR_VAL,
+	       Yellow * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    break;
+  case GRAY:
+    *r = *g = *b = Gray;
+    break;
+  default:
+    assert(0);
+    break;
+  }
+}
+
+void
+color::get_cmy(unsigned int *c, unsigned int *m, unsigned int *y) const
+{
+  switch (scheme) {
+  case RGB:
+    *c = MAX_COLOR_VAL - Red;
+    *m = MAX_COLOR_VAL - Green;
+    *y = MAX_COLOR_VAL - Blue;
+    break;
+  case CMY:
+    *c = Cyan;
+    *m = Magenta;
+    *y = Yellow;
+    break;
+  case CMYK:
+    *c = min(MAX_COLOR_VAL,
+	     Cyan * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    *m = min(MAX_COLOR_VAL,
+	     Magenta * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    *y = min(MAX_COLOR_VAL,
+	     Yellow * (MAX_COLOR_VAL - Black) / MAX_COLOR_VAL + Black);
+    break;
+  case GRAY:
+    *c = *m = *y = MAX_COLOR_VAL - Gray;
+    break;
+  default:
+    assert(0);
+    break;
+  }
+}
+
+void color::get_cmyk(unsigned int *c, unsigned int *m,
+		     unsigned int *y, unsigned int *k) const
+{
+  switch (scheme) {
+  case RGB:
+    *k = min(MAX_COLOR_VAL - Red,
+	     min(MAX_COLOR_VAL - Green, MAX_COLOR_VAL - Blue));
+    if (MAX_COLOR_VAL == *k) {
+      *c = MAX_COLOR_VAL;
+      *m = MAX_COLOR_VAL;
+      *y = MAX_COLOR_VAL;
+    }
+    else {
+      *c = (MAX_COLOR_VAL * (MAX_COLOR_VAL - Red - *k))
+	   / (MAX_COLOR_VAL - *k);
+      *m = (MAX_COLOR_VAL * (MAX_COLOR_VAL - Green - *k))
+	   / (MAX_COLOR_VAL - *k);
+      *y = (MAX_COLOR_VAL * (MAX_COLOR_VAL - Blue - *k))
+	   / (MAX_COLOR_VAL - *k);
+    }
+    break;
+  case CMY:
+    *k = min(Cyan, min(Magenta, Yellow));
+    if (MAX_COLOR_VAL == *k) {
+      *c = MAX_COLOR_VAL;
+      *m = MAX_COLOR_VAL;
+      *y = MAX_COLOR_VAL;
+    }
+    else {
+      *c = (MAX_COLOR_VAL * (Cyan - *k)) / (MAX_COLOR_VAL - *k);
+      *m = (MAX_COLOR_VAL * (Magenta - *k)) / (MAX_COLOR_VAL - *k);
+      *y = (MAX_COLOR_VAL * (Yellow - *k)) / (MAX_COLOR_VAL - *k);
+    }
+    break;
+  case CMYK:
+    *c = Cyan;
+    *m = Magenta;
+    *y = Yellow;
+    *k = Black;
+    break;
+  case GRAY:
+    *c = *m = *y = 0;
+    *k = MAX_COLOR_VAL - Gray;
+    break;
+  default:
+    assert(0);
+    break;
+  }
+}
+
+// we use `0.222r + 0.707g + 0.071b' (this is the ITU standard)
+// as an approximation for gray
+
+void color::get_gray(unsigned int *g) const
+{
+  switch (scheme) {
+  case RGB:
+    *g = (222*Red + 707*Green + 71*Blue) / 1000;
+    break;
+  case CMY:
+    *g = MAX_COLOR_VAL - (222*Cyan + 707*Magenta + 71*Yellow) / 1000;
+    break;
+  case CMYK:
+    *g = (MAX_COLOR_VAL - (222*Cyan + 707*Magenta + 71*Yellow) / 1000)
+	 * (MAX_COLOR_VAL - Black);
+    break;
+  case GRAY:
+    *g = Gray;
+    break;
+  default:
+    assert(0);
+    break;
+  }
+}
+
+char *color::print_color()
+{
+  char *s = new char[30];
+  switch (scheme) {
+  case DEFAULT:
+    sprintf(s, "default");
+    break;
+  case RGB:
+    sprintf(s, "rgb %.2ff %.2ff %.2ff",
+	    double(Red) / MAX_COLOR_VAL,
+	    double(Green) / MAX_COLOR_VAL,
+	    double(Blue) / MAX_COLOR_VAL);
+    break;
+  case CMY:
+    sprintf(s, "cmy %.2ff %.2ff %.2ff",
+	    double(Cyan) / MAX_COLOR_VAL,
+	    double(Magenta) / MAX_COLOR_VAL,
+	    double(Yellow) / MAX_COLOR_VAL);
+    break;
+  case CMYK:
+    sprintf(s, "cmyk %.2ff %.2ff %.2ff %.2ff",
+	    double(Cyan) / MAX_COLOR_VAL,
+	    double(Magenta) / MAX_COLOR_VAL,
+	    double(Yellow) / MAX_COLOR_VAL,
+	    double(Black) / MAX_COLOR_VAL);
+    break;
+  case GRAY:
+    sprintf(s, "gray %.2ff",
+	    double(Gray) / MAX_COLOR_VAL);
+    break;
+  }
+  return s;
+}
+
+color default_color;
diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/contrib/groff/src/libs/libgroff/cset.cpp
new file mode 100644
index 0000000..e4845c1
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/cset.cpp
@@ -0,0 +1,102 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <ctype.h>
+#include "cset.h"
+
+cset csalpha(CSET_BUILTIN);
+cset csupper(CSET_BUILTIN);
+cset cslower(CSET_BUILTIN);
+cset csdigit(CSET_BUILTIN);
+cset csxdigit(CSET_BUILTIN);
+cset csspace(CSET_BUILTIN);
+cset cspunct(CSET_BUILTIN);
+cset csalnum(CSET_BUILTIN);
+cset csprint(CSET_BUILTIN);
+cset csgraph(CSET_BUILTIN);
+cset cscntrl(CSET_BUILTIN);
+
+#ifdef isascii
+#define ISASCII(c) isascii(c)
+#else
+#define ISASCII(c) (1)
+#endif
+
+void cset::clear()
+{
+  char *p = v;
+  for (int i = 0; i <= UCHAR_MAX; i++)
+    p[i] = 0;
+}
+
+cset::cset()
+{
+  clear();
+}
+
+cset::cset(const char *s)
+{
+  clear();
+  while (*s)
+    v[(unsigned char)*s++] = 1;
+}
+
+cset::cset(const unsigned char *s)
+{
+  clear();
+  while (*s)
+    v[*s++] = 1;
+}
+
+cset::cset(cset_builtin)
+{
+  // these are initialised by cset_init::cset_init()
+}
+
+cset &cset::operator|=(const cset &cs)
+{
+  for (int i = 0; i <= UCHAR_MAX; i++)
+    if (cs.v[i])
+      v[i] = 1;
+  return *this;
+}
+
+
+int cset_init::initialised = 0;
+
+cset_init::cset_init()
+{
+  if (initialised)
+    return;
+  initialised = 1;
+  for (int i = 0; i <= UCHAR_MAX; i++) {
+    csalpha.v[i] = ISASCII(i) && isalpha(i);
+    csupper.v[i] = ISASCII(i) && isupper(i);
+    cslower.v[i] = ISASCII(i) && islower(i);
+    csdigit.v[i] = ISASCII(i) && isdigit(i);
+    csxdigit.v[i] = ISASCII(i) && isxdigit(i);
+    csspace.v[i] = ISASCII(i) && isspace(i);
+    cspunct.v[i] = ISASCII(i) && ispunct(i);
+    csalnum.v[i] = ISASCII(i) && isalnum(i);
+    csprint.v[i] = ISASCII(i) && isprint(i);
+    csgraph.v[i] = ISASCII(i) && isgraph(i);
+    cscntrl.v[i] = ISASCII(i) && iscntrl(i);
+  }
+}
diff --git a/contrib/groff/src/libs/libgroff/device.cpp b/contrib/groff/src/libs/libgroff/device.cpp
new file mode 100644
index 0000000..7efbfef
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/device.cpp
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdlib.h>
+#include "device.h"
+#include "defs.h"
+
+const char *device = DEVICE;
+
+struct device_init {
+  device_init();
+} _device_init;
+
+device_init::device_init()
+{
+  char *tem = getenv("GROFF_TYPESETTER");
+  if (tem)
+    device = tem;
+}
diff --git a/contrib/groff/src/libs/libgroff/errarg.cpp b/contrib/groff/src/libs/libgroff/errarg.cpp
new file mode 100644
index 0000000..2ddc0cc
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/errarg.cpp
@@ -0,0 +1,128 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdio.h>
+#include "assert.h"
+#include "errarg.h"
+
+errarg::errarg(const char *p) : type(STRING)
+{
+  s = p ? p : "(null)";
+}
+
+errarg::errarg() : type(EMPTY)
+{
+}
+
+errarg::errarg(int nn) : type(INTEGER)
+{
+  n = nn;
+}
+
+errarg::errarg(unsigned int uu) : type(UNSIGNED_INTEGER)
+{
+  u = uu;
+}
+
+errarg::errarg(char cc) : type(CHAR)
+{
+  c = cc;
+}
+
+errarg::errarg(unsigned char cc) : type(CHAR)
+{
+  c = cc;
+}
+
+errarg::errarg(double dd) : type(DOUBLE)
+{
+  d = dd;
+}
+
+int errarg::empty() const
+{
+  return type == EMPTY;
+}
+
+extern "C" {
+  const char *i_to_a(int);
+  const char *ui_to_a(unsigned int);
+}
+	    
+void errarg::print() const
+{
+  switch (type) {
+  case INTEGER:
+    fputs(i_to_a(n), stderr);
+    break;
+  case UNSIGNED_INTEGER:
+    fputs(ui_to_a(u), stderr);
+    break;
+  case CHAR:
+    putc(c, stderr);
+    break;
+  case STRING:
+    fputs(s, stderr);
+    break;
+  case DOUBLE:
+    fprintf(stderr, "%g", d);
+    break;
+  case EMPTY:
+    break;
+  }
+}
+
+errarg empty_errarg;
+
+void errprint(const char *format, 
+	      const errarg &arg1,
+	      const errarg &arg2,
+	      const errarg &arg3)
+{
+  assert(format != 0);
+  char c;
+  while ((c = *format++) != '\0') {
+    if (c == '%') {
+      c = *format++;
+      switch(c) {
+      case '%':
+	fputc('%', stderr);
+	break;
+      case '1':
+	assert(!arg1.empty());
+	arg1.print();
+	break;
+      case '2':
+	assert(!arg2.empty());
+	arg2.print();
+	break;
+      case '3':
+	assert(!arg3.empty());
+	arg3.print();
+	break;
+      default:
+	assert(0);
+      }
+    }
+    else
+      putc(c, stderr);
+  }
+}
diff --git a/contrib/groff/src/libs/libgroff/error.cpp b/contrib/groff/src/libs/libgroff/error.cpp
new file mode 100644
index 0000000..f7d3ec0
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/error.cpp
@@ -0,0 +1,142 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "errarg.h"
+#include "error.h"
+
+extern void fatal_error_exit();
+
+enum error_type { WARNING, ERROR, FATAL };
+
+static void do_error_with_file_and_line(const char *filename,
+					const char *source_filename,
+					int lineno,
+					error_type type, 
+					const char *format, 
+					const errarg &arg1,
+					const errarg &arg2,
+					const errarg &arg3)
+{
+  int need_space = 0;
+  if (program_name) {
+    fprintf(stderr, "%s:", program_name);
+    need_space = 1;
+  }
+  if (lineno >= 0 && filename != 0) {
+    if (strcmp(filename, "-") == 0)
+      filename = "<standard input>";
+    if (source_filename != 0)
+      fprintf(stderr, "%s (%s):%d:", filename, source_filename, lineno);
+    else
+      fprintf(stderr, "%s:%d:", filename, lineno);
+    need_space = 1;
+  }
+  switch (type) {
+  case FATAL:
+    fputs("fatal error:", stderr);
+    need_space = 1;
+    break;
+  case ERROR:
+    break;
+  case WARNING:
+    fputs("warning:", stderr);
+    need_space = 1;
+    break;
+  }
+  if (need_space)
+    fputc(' ', stderr);
+  errprint(format, arg1, arg2, arg3);
+  fputc('\n', stderr);
+  fflush(stderr);
+  if (type == FATAL)
+    fatal_error_exit();
+}
+      
+
+static void do_error(error_type type, 
+		     const char *format, 
+		     const errarg &arg1,
+		     const errarg &arg2,
+		     const errarg &arg3)
+{
+  do_error_with_file_and_line(current_filename, current_source_filename,
+			      current_lineno, type, format, arg1, arg2, arg3);
+}
+
+
+void error(const char *format, 
+	   const errarg &arg1,
+	   const errarg &arg2,
+	   const errarg &arg3)
+{
+  do_error(ERROR, format, arg1, arg2, arg3);
+}
+
+void warning(const char *format, 
+	     const errarg &arg1,
+	     const errarg &arg2,
+	     const errarg &arg3)
+{
+  do_error(WARNING, format, arg1, arg2, arg3);
+}
+
+void fatal(const char *format, 
+	   const errarg &arg1,
+	   const errarg &arg2,
+	   const errarg &arg3)
+{
+  do_error(FATAL, format, arg1, arg2, arg3);
+}
+
+void error_with_file_and_line(const char *filename,
+			      int lineno,
+			      const char *format, 
+			      const errarg &arg1,
+			      const errarg &arg2,
+			      const errarg &arg3)
+{
+  do_error_with_file_and_line(filename, 0, lineno, 
+			      ERROR, format, arg1, arg2, arg3);
+}
+
+void warning_with_file_and_line(const char *filename,
+				int lineno,
+				const char *format, 
+				const errarg &arg1,
+				const errarg &arg2,
+				const errarg &arg3)
+{
+  do_error_with_file_and_line(filename, 0, lineno, 
+			      WARNING, format, arg1, arg2, arg3);
+}
+
+void fatal_with_file_and_line(const char *filename,
+			      int lineno,
+			      const char *format, 
+			      const errarg &arg1,
+			      const errarg &arg2,
+			      const errarg &arg3)
+{
+  do_error_with_file_and_line(filename, 0, lineno, 
+			      FATAL, format, arg1, arg2, arg3);
+}
diff --git a/contrib/groff/src/libs/libgroff/fatal.cpp b/contrib/groff/src/libs/libgroff/fatal.cpp
new file mode 100644
index 0000000..42560dc
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/fatal.cpp
@@ -0,0 +1,27 @@
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdlib.h>
+
+#define FATAL_ERROR_EXIT_CODE 3
+
+void fatal_error_exit()
+{
+  exit(FATAL_ERROR_EXIT_CODE);
+}
diff --git a/contrib/groff/src/libs/libgroff/filename.cpp b/contrib/groff/src/libs/libgroff/filename.cpp
new file mode 100644
index 0000000..6212705
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/filename.cpp
@@ -0,0 +1,2 @@
+const char *current_filename = 0;
+const char *current_source_filename = 0;
diff --git a/contrib/groff/src/libs/libgroff/font.cpp b/contrib/groff/src/libs/libgroff/font.cpp
new file mode 100644
index 0000000..c633cc8
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/font.cpp
@@ -0,0 +1,1034 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <ctype.h>
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include "errarg.h"
+#include "error.h"
+#include "cset.h"
+#include "font.h"
+#include "paper.h"
+
+const char *const WS = " \t\n\r";
+
+struct font_char_metric {
+  char type;
+  int code;
+  int width;
+  int height;
+  int depth;
+  int pre_math_space;
+  int italic_correction;
+  int subscript_correction;
+  char *special_device_coding;
+};
+
+struct font_kern_list {
+  int i1;
+  int i2;
+  int amount;
+  font_kern_list *next;
+
+  font_kern_list(int, int, int, font_kern_list * = 0);
+};
+
+struct font_widths_cache {
+  font_widths_cache *next;
+  int point_size;
+  int *width;
+
+  font_widths_cache(int, int, font_widths_cache * = 0);
+  ~font_widths_cache();
+};
+
+/* text_file */
+
+struct text_file {
+  FILE *fp;
+  char *path;
+  int lineno;
+  int size;
+  int skip_comments;
+  char *buf;
+  text_file(FILE *fp, char *p);
+  ~text_file();
+  int next();
+  void error(const char *format, 
+	     const errarg &arg1 = empty_errarg,
+	     const errarg &arg2 = empty_errarg,
+	     const errarg &arg3 = empty_errarg);
+};
+
+text_file::text_file(FILE *p, char *s) 
+: fp(p), path(s), lineno(0), size(0), skip_comments(1), buf(0)
+{
+}
+
+text_file::~text_file()
+{
+  a_delete buf;
+  a_delete path;
+  if (fp)
+    fclose(fp);
+}
+
+int text_file::next()
+{
+  if (fp == 0)
+    return 0;
+  if (buf == 0) {
+    buf = new char[128];
+    size = 128;
+  }
+  for (;;) {
+    int i = 0;
+    for (;;) {
+      int c = getc(fp);
+      if (c == EOF)
+	break;
+      if (invalid_input_char(c))
+	error("invalid input character code `%1'", int(c));
+      else {
+	if (i + 1 >= size) {
+	  char *old_buf = buf;
+	  buf = new char[size*2];
+	  memcpy(buf, old_buf, size);
+	  a_delete old_buf;
+	  size *= 2;
+	}
+	buf[i++] = c;
+	if (c == '\n')
+	  break;
+      }
+    }
+    if (i == 0)
+      break;
+    buf[i] = '\0';
+    lineno++;
+    char *ptr = buf;
+    while (csspace(*ptr))
+      ptr++;
+    if (*ptr != 0 && (!skip_comments || *ptr != '#'))
+      return 1;
+  }
+  return 0;
+}
+
+void text_file::error(const char *format, 
+		      const errarg &arg1,
+		      const errarg &arg2,
+		      const errarg &arg3)
+{
+  error_with_file_and_line(path, lineno, format, arg1, arg2, arg3);
+}
+
+
+/* font functions */
+
+font::font(const char *s)
+: ligatures(0), kern_hash_table(0), space_width(0), ch_index(0), nindices(0),
+  ch(0), ch_used(0), ch_size(0), special(0), widths_cache(0)
+{
+  name = new char[strlen(s) + 1];
+  strcpy(name, s);
+  internalname = 0;
+  slant = 0.0;
+  // load();			// for testing
+}
+
+font::~font()
+{
+  for (int i = 0; i < ch_used; i++)
+    if (ch[i].special_device_coding)
+      a_delete ch[i].special_device_coding;
+  a_delete ch;
+  a_delete ch_index;
+  if (kern_hash_table) {
+    for (int i = 0; i < KERN_HASH_TABLE_SIZE; i++) {
+      font_kern_list *kerns = kern_hash_table[i];
+      while (kerns) {
+	font_kern_list *tem = kerns;
+	kerns = kerns->next;
+	delete tem;
+      }
+    }
+    a_delete kern_hash_table;
+  }
+  a_delete name;
+  a_delete internalname;
+  while (widths_cache) {
+    font_widths_cache *tem = widths_cache;
+    widths_cache = widths_cache->next;
+    delete tem;
+  }
+}
+
+static int scale_round(int n, int x, int y)
+{
+  assert(x >= 0 && y > 0);
+  int y2 = y/2;
+  if (x == 0)
+    return 0;
+  if (n >= 0) {
+    if (n <= (INT_MAX - y2)/x)
+      return (n*x + y2)/y;
+    return int(n*double(x)/double(y) + .5);
+  }
+  else {
+    if (-(unsigned)n <= (-(unsigned)INT_MIN - y2)/x)
+      return (n*x - y2)/y;
+    return int(n*double(x)/double(y) - .5);
+  }
+}
+
+inline int font::scale(int w, int sz)
+{
+  return sz == unitwidth ? w : scale_round(w, sz, unitwidth);
+}
+
+int font::unit_scale(double *value, char unit)
+{
+  // we scale everything to inch
+  double divisor = 0;
+  switch (unit) {
+  case 'i':
+    divisor = 1;
+    break;
+  case 'p':
+    divisor = 72;
+    break;
+  case 'P':
+    divisor = 6;
+    break;
+  case 'c':
+    divisor = 2.54;
+    break;
+  default:
+    assert(0);
+    break;
+  }
+  if (divisor) {
+    *value /= divisor;
+    return 1;
+  }
+  return 0;
+}
+
+int font::get_skew(int c, int point_size, int sl)
+{
+  int h = get_height(c, point_size);
+  return int(h*tan((slant+sl)*PI/180.0) + .5);
+}
+
+int font::contains(int c)
+{
+  return c >= 0 && c < nindices && ch_index[c] >= 0;
+}
+
+int font::is_special()
+{
+  return special;
+}
+
+font_widths_cache::font_widths_cache(int ps, int ch_size,
+				     font_widths_cache *p)
+: next(p), point_size(ps)
+{
+  width = new int[ch_size];
+  for (int i = 0; i < ch_size; i++)
+    width[i] = -1;
+}
+
+font_widths_cache::~font_widths_cache()
+{
+  a_delete width;
+}
+
+int font::get_width(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices);
+  int i = ch_index[c];
+  assert(i >= 0);
+
+  if (point_size == unitwidth)
+    return ch[i].width;
+
+  if (!widths_cache)
+    widths_cache = new font_widths_cache(point_size, ch_size);
+  else if (widths_cache->point_size != point_size) {
+    font_widths_cache **p;
+    for (p = &widths_cache; *p; p = &(*p)->next)
+      if ((*p)->point_size == point_size)
+	break;
+    if (*p) {
+      font_widths_cache *tem = *p;
+      *p = (*p)->next;
+      tem->next = widths_cache;
+      widths_cache = tem;
+    }
+    else
+      widths_cache = new font_widths_cache(point_size, ch_size, widths_cache);
+  }
+  int &w = widths_cache->width[i];
+  if (w < 0)
+    w = scale(ch[i].width, point_size);
+  return w;
+}
+
+int font::get_height(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return scale(ch[ch_index[c]].height, point_size);
+}
+
+int font::get_depth(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return scale(ch[ch_index[c]].depth, point_size);
+}
+
+int font::get_italic_correction(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return scale(ch[ch_index[c]].italic_correction, point_size);
+}
+
+int font::get_left_italic_correction(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return scale(ch[ch_index[c]].pre_math_space, point_size);
+}
+
+int font::get_subscript_correction(int c, int point_size)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return scale(ch[ch_index[c]].subscript_correction, point_size);
+}
+
+int font::get_space_width(int point_size)
+{
+  return scale(space_width, point_size);
+}
+
+font_kern_list::font_kern_list(int c1, int c2, int n, font_kern_list *p)
+: i1(c1), i2(c2), amount(n), next(p)
+{
+}
+
+inline int font::hash_kern(int i1, int i2)
+{
+  int n = ((i1 << 10) + i2) % KERN_HASH_TABLE_SIZE;
+  return n < 0 ? -n : n;
+}
+
+void font::add_kern(int i1, int i2, int amount)
+{
+  if (!kern_hash_table) {
+    kern_hash_table = new font_kern_list *[int(KERN_HASH_TABLE_SIZE)];
+    for (int i = 0; i < KERN_HASH_TABLE_SIZE; i++)
+      kern_hash_table[i] = 0;
+  }
+  font_kern_list **p = kern_hash_table + hash_kern(i1, i2);
+  *p = new font_kern_list(i1, i2, amount, *p);
+}
+
+int font::get_kern(int i1, int i2, int point_size)
+{
+  if (kern_hash_table) {
+    for (font_kern_list *p = kern_hash_table[hash_kern(i1, i2)]; p; p = p->next)
+      if (i1 == p->i1 && i2 == p->i2)
+	return scale(p->amount, point_size);
+  }
+  return 0;
+}
+
+int font::has_ligature(int mask)
+{
+  return mask & ligatures;
+}
+
+int font::get_character_type(int c)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return ch[ch_index[c]].type;
+}
+
+int font::get_code(int c)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return ch[ch_index[c]].code;
+}
+
+const char *font::get_name()
+{
+  return name;
+}
+
+const char *font::get_internal_name()
+{
+  return internalname;
+}
+
+const char *font::get_special_device_encoding(int c)
+{
+  assert(c >= 0 && c < nindices && ch_index[c] >= 0);
+  return( ch[ch_index[c]].special_device_coding );
+}
+
+void font::alloc_ch_index(int index)
+{
+  if (nindices == 0) {
+    nindices = 128;
+    if (index >= nindices)
+      nindices = index + 10;
+    ch_index = new short[nindices];
+    for (int i = 0; i < nindices; i++)
+      ch_index[i] = -1;
+  }
+  else {
+    int old_nindices = nindices;
+    nindices *= 2;
+    if (index >= nindices)
+      nindices = index + 10;
+    short *old_ch_index = ch_index;
+    ch_index = new short[nindices];
+    memcpy(ch_index, old_ch_index, sizeof(short)*old_nindices);
+    for (int i = old_nindices; i < nindices; i++)
+      ch_index[i] = -1;
+    a_delete old_ch_index;
+  }
+}
+
+void font::extend_ch()
+{
+  if (ch == 0)
+    ch = new font_char_metric[ch_size = 16];
+  else {
+    int old_ch_size = ch_size;
+    ch_size *= 2;
+    font_char_metric *old_ch = ch;
+    ch = new font_char_metric[ch_size];
+    memcpy(ch, old_ch, old_ch_size*sizeof(font_char_metric));
+    a_delete old_ch;
+  }
+}
+
+void font::compact()
+{
+  int i;
+  for (i = nindices - 1; i >= 0; i--)
+    if (ch_index[i] >= 0)
+      break;
+  i++;
+  if (i < nindices) {
+    short *old_ch_index = ch_index;
+    ch_index = new short[i];
+    memcpy(ch_index, old_ch_index, i*sizeof(short));
+    a_delete old_ch_index;
+    nindices = i;
+  }
+  if (ch_used < ch_size) {
+    font_char_metric *old_ch = ch;
+    ch = new font_char_metric[ch_used];
+    memcpy(ch, old_ch, ch_used*sizeof(font_char_metric));
+    a_delete old_ch;
+    ch_size = ch_used;
+  }
+}
+
+void font::add_entry(int index, const font_char_metric &metric)
+{
+  assert(index >= 0);
+  if (index >= nindices)
+    alloc_ch_index(index);
+  assert(index < nindices);
+  if (ch_used + 1 >= ch_size)
+    extend_ch();
+  assert(ch_used + 1 < ch_size);
+  ch_index[index] = ch_used;
+  ch[ch_used++] = metric;
+}
+
+void font::copy_entry(int new_index, int old_index)
+{
+  assert(new_index >= 0 && old_index >= 0 && old_index < nindices);
+  if (new_index >= nindices)
+    alloc_ch_index(new_index);
+  ch_index[new_index] = ch_index[old_index];
+}
+
+font *font::load_font(const char *s, int *not_found)
+{
+  font *f = new font(s);
+  if (!f->load(not_found)) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+static char *trim_arg(char *p)
+{
+  if (!p)
+    return 0;
+  while (csspace(*p))
+    p++;
+  char *q = strchr(p, '\0');
+  while (q > p && csspace(q[-1]))
+    q--;
+  *q = '\0';
+  return p;
+}
+
+int font::scan_papersize(const char *p,
+			 const char **size, double *length, double *width)
+{
+  double l, w;
+  char lu[2], wu[2];
+  const char *pp = p;
+  int test_file = 1;
+  char line[255];
+again:
+  if (csdigit(*pp)) {
+    if (sscanf(pp, "%lf%1[ipPc],%lf%1[ipPc]", &l, lu, &w, wu) == 4
+	&& l > 0 && w > 0
+	&& unit_scale(&l, lu[0]) && unit_scale(&w, wu[0])) {
+      if (length)
+	*length = l;
+      if (width)
+	*width = w;
+      if (size)
+	*size = "custom";
+      return 1;
+    }
+  }
+  else {
+    int i;
+    for (i = 0; i < NUM_PAPERSIZES; i++)
+      if (strcasecmp(papersizes[i].name, pp) == 0) {
+	if (length)
+	  *length = papersizes[i].length;
+	if (width)
+	  *width = papersizes[i].width;
+	if (size)
+	  *size = papersizes[i].name;
+	return 1;
+      }
+    if (test_file) {
+      FILE *f = fopen(p, "r");
+      if (f) {
+	fgets(line, 254, f);
+	fclose(f);
+	test_file = 0;
+	char *linep = strchr(line, '\0');
+	// skip final newline, if any
+	if (*(--linep) == '\n')
+	  *linep = '\0';
+	pp = line;
+	goto again;
+      }
+    }
+  }
+  return 0;
+}
+
+// If the font can't be found, then if not_found is non-NULL, it will be set
+// to 1 otherwise a message will be printed.
+
+int font::load(int *not_found)
+{
+  char *path;
+  FILE *fp;
+  if ((fp = open_file(name, &path)) == NULL) {
+    if (not_found)
+      *not_found = 1;
+    else
+      error("can't find font file `%1'", name);
+    return 0;
+  }
+  text_file t(fp, path);
+  t.skip_comments = 1;
+  char *p;
+  for (;;) {
+    if (!t.next()) {
+      t.error("missing charset command");
+      return 0;
+    }
+    p = strtok(t.buf, WS);
+    if (strcmp(p, "name") == 0) {
+    }
+    else if (strcmp(p, "spacewidth") == 0) {
+      p = strtok(0, WS);
+      int n;
+      if (p == 0 || sscanf(p, "%d", &n) != 1 || n <= 0) {
+	t.error("bad argument for spacewidth command");
+	return 0;
+      }
+      space_width = n;
+    }
+    else if (strcmp(p, "slant") == 0) {
+      p = strtok(0, WS);
+      double n;
+      if (p == 0 || sscanf(p, "%lf", &n) != 1 || n >= 90.0 || n <= -90.0) {
+	t.error("bad argument for slant command", p);
+	return 0;
+      }
+      slant = n;
+    }
+    else if (strcmp(p, "ligatures") == 0) {
+      for (;;) {
+	p = strtok(0, WS);
+	if (p == 0 || strcmp(p, "0") == 0)
+	  break;
+	if (strcmp(p, "ff") == 0)
+	  ligatures |= LIG_ff;
+	else if (strcmp(p, "fi") == 0)
+	  ligatures |= LIG_fi;
+	else if (strcmp(p, "fl") == 0)
+	  ligatures |= LIG_fl;
+	else if (strcmp(p, "ffi") == 0)
+	  ligatures |= LIG_ffi;
+	else if (strcmp(p, "ffl") == 0)
+	  ligatures |= LIG_ffl;
+	else {
+	  t.error("unrecognised ligature `%1'", p);
+	  return 0;
+	}
+      }
+    }
+    else if (strcmp(p, "internalname") == 0) {
+      p = strtok(0, WS);
+      if (!p) {
+	t.error("`internalname command requires argument");
+	return 0;
+      }
+      internalname = new char[strlen(p) + 1];
+      strcpy(internalname, p);
+    }
+    else if (strcmp(p, "special") == 0) {
+      special = 1;
+    }
+    else if (strcmp(p, "kernpairs") != 0 && strcmp(p, "charset") != 0) {
+      char *command = p;
+      p = strtok(0, "\n");
+      handle_unknown_font_command(command, trim_arg(p), t.path, t.lineno);
+    }
+    else
+      break;
+  }
+  char *command = p;
+  int had_charset = 0;
+  t.skip_comments = 0;
+  while (command) {
+    if (strcmp(command, "kernpairs") == 0) {
+      for (;;) {
+	if (!t.next()) {
+	  command = 0;
+	  break;
+	}
+	char *c1 = strtok(t.buf, WS);
+	if (c1 == 0)
+	  continue;
+	char *c2 = strtok(0, WS);
+	if (c2 == 0) {
+	  command = c1;
+	  break;
+	}
+	p = strtok(0, WS);
+	if (p == 0) {
+	  t.error("missing kern amount");
+	  return 0;
+	}
+	int n;
+	if (sscanf(p, "%d", &n) != 1) {
+	  t.error("bad kern amount `%1'", p);
+	  return 0;
+	}
+	int i1 = name_to_index(c1);
+	if (i1 < 0) {
+	  t.error("invalid character `%1'", c1);
+	  return 0;
+	}
+	int i2 = name_to_index(c2);
+	if (i2 < 0) {
+	  t.error("invalid character `%1'", c2);
+	  return 0;
+	}
+	add_kern(i1, i2, n);
+      }
+    }
+    else if (strcmp(command, "charset") == 0) {
+      had_charset = 1;
+      int last_index = -1;
+      for (;;) {
+	if (!t.next()) {
+	  command = 0;
+	  break;
+	}
+	char *nm = strtok(t.buf, WS);
+	if (nm == 0)
+	  continue;			// I dont think this should happen
+	p = strtok(0, WS);
+	if (p == 0) {
+	  command = nm;
+	  break;
+	}
+	if (p[0] == '"') {
+	  if (last_index == -1) {
+	    t.error("first charset entry is duplicate");
+	    return 0;
+	  }
+	  if (strcmp(nm, "---") == 0) {
+	    t.error("unnamed character cannot be duplicate");
+	    return 0;
+	  }
+	  int index = name_to_index(nm);
+	  if (index < 0) {
+	    t.error("invalid character `%1'", nm);
+	    return 0;
+	  }
+	  copy_entry(index, last_index);
+	}
+	else {
+	  font_char_metric metric;
+	  metric.height = 0;
+	  metric.depth = 0;
+	  metric.pre_math_space = 0;
+	  metric.italic_correction = 0;
+	  metric.subscript_correction = 0;
+	  int nparms = sscanf(p, "%d,%d,%d,%d,%d,%d",
+			      &metric.width, &metric.height, &metric.depth,
+			      &metric.italic_correction,
+			      &metric.pre_math_space,
+			      &metric.subscript_correction);
+	  if (nparms < 1) {
+	    t.error("bad width for `%1'", nm);
+	    return 0;
+	  }
+	  p = strtok(0, WS);
+	  if (p == 0) {
+	    t.error("missing character type for `%1'", nm);
+	    return 0;
+	  }
+	  int type;
+	  if (sscanf(p, "%d", &type) != 1) {
+	    t.error("bad character type for `%1'", nm);
+	    return 0;
+	  }
+	  if (type < 0 || type > 255) {
+	    t.error("character type `%1' out of range", type);
+	    return 0;
+	  }
+	  metric.type = type;
+	  p = strtok(0, WS);
+	  if (p == 0) {
+	    t.error("missing code for `%1'", nm);
+	    return 0;
+	  }
+	  char *ptr;
+	  metric.code = (int)strtol(p, &ptr, 0);
+	  if (metric.code == 0 && ptr == p) {
+	    t.error("bad code `%1' for character `%2'", p, nm);
+	    return 0;
+	  }
+	  p = strtok(0, WS);
+	  if ((p == NULL) || (strcmp(p, "--") == 0)) {
+	    metric.special_device_coding = NULL;
+	  }
+	  else {
+	    char *name = new char[strlen(p) + 1];
+	    strcpy(name, p);
+	    metric.special_device_coding = name;
+	  }
+	  if (strcmp(nm, "---") == 0) {
+	    last_index = number_to_index(metric.code);
+	    add_entry(last_index, metric);
+	  }
+	  else {
+	    last_index = name_to_index(nm);
+	    if (last_index < 0) {
+	      t.error("invalid character `%1'", nm);
+	      return 0;
+	    }
+	    add_entry(last_index, metric);
+	    copy_entry(number_to_index(metric.code), last_index);
+	  }
+	}
+      }
+      if (last_index == -1) {
+	t.error("I didn't seem to find any characters");
+	return 0;
+      }
+    }
+    else {
+      t.error("unrecognised command `%1' after `kernpairs' or `charset' command", command);
+      return 0;
+    }
+  }
+  if (!had_charset) {
+    t.error("missing charset command");
+    return 0;
+  }
+  if (space_width == 0)
+    space_width = scale_round(unitwidth, res, 72*3*sizescale);
+  compact();
+  return 1;
+}
+
+static struct {
+  const char *command;
+  int *ptr;
+} table[] = {
+  { "res", &font::res },
+  { "hor", &font::hor },
+  { "vert", &font::vert },
+  { "unitwidth", &font::unitwidth },
+  { "paperwidth", &font::paperwidth },
+  { "paperlength", &font::paperlength },
+  { "spare1", &font::biggestfont },
+  { "biggestfont", &font::biggestfont },
+  { "spare2", &font::spare2 },
+  { "sizescale", &font::sizescale }
+  };
+
+int font::load_desc()
+{
+  int nfonts = 0;
+  FILE *fp;
+  char *path;
+  if ((fp = open_file("DESC", &path)) == 0) {
+    error("can't find `DESC' file");
+    return 0;
+  }
+  text_file t(fp, path);
+  t.skip_comments = 1;
+  res = 0;
+  while (t.next()) {
+    char *p = strtok(t.buf, WS);
+    int found = 0;
+    unsigned int idx;
+    for (idx = 0; !found && idx < sizeof(table)/sizeof(table[0]); idx++)
+      if (strcmp(table[idx].command, p) == 0)
+	found = 1;
+    if (found) {
+      char *q = strtok(0, WS);
+      if (!q) {
+	t.error("missing value for command `%1'", p);
+	return 0;
+      }
+      //int *ptr = &(this->*(table[idx-1].ptr));
+      int *ptr = table[idx-1].ptr;
+      if (sscanf(q, "%d", ptr) != 1) {
+	t.error("bad number `%1'", q);
+	return 0;
+      }
+    }
+    else if (strcmp("family", p) == 0) {
+      p = strtok(0, WS);
+      if (!p) {
+	t.error("family command requires an argument");
+	return 0;
+      }
+      char *tem = new char[strlen(p)+1];
+      strcpy(tem, p);
+      family = tem;
+    }
+    else if (strcmp("fonts", p) == 0) {
+      p = strtok(0, WS);
+      if (!p || sscanf(p, "%d", &nfonts) != 1 || nfonts <= 0) {
+	t.error("bad number of fonts `%1'", p);
+	return 0;
+      }
+      font_name_table = (const char **)new char *[nfonts+1]; 
+      for (int i = 0; i < nfonts; i++) {
+	p = strtok(0, WS);
+	while (p == 0) {
+	  if (!t.next()) {
+	    t.error("end of file while reading list of fonts");
+	    return 0;
+	  }
+	  p = strtok(t.buf, WS);
+	}
+	char *temp = new char[strlen(p)+1];
+	strcpy(temp, p);
+	font_name_table[i] = temp;
+      }
+      p = strtok(0, WS);
+      if (p != 0) {
+	t.error("font count does not match number of fonts");
+	return 0;
+      }
+      font_name_table[nfonts] = 0;
+    }
+    else if (strcmp("papersize", p) == 0) {
+      p = strtok(0, WS);
+      if (!p) {
+	t.error("papersize command requires an argument");
+	return 0;
+      }
+      int found_paper = 0;
+      while (p) {
+	double unscaled_paperwidth, unscaled_paperlength;
+	if (scan_papersize(p, &papersize, &unscaled_paperlength,
+			   &unscaled_paperwidth)) {
+	  paperwidth = int(unscaled_paperwidth * res + 0.5);
+	  paperlength = int(unscaled_paperlength * res + 0.5);
+	  found_paper = 1;
+	  break;
+	}
+	p = strtok(0, WS);
+      }
+      if (!found_paper) {
+	t.error("bad paper size");
+	return 0;
+      }
+    }
+    else if (strcmp("pass_filenames", p) == 0)
+      pass_filenames = 1;
+    else if (strcmp("sizes", p) == 0) {
+      int n = 16;
+      sizes = new int[n];
+      int i = 0;
+      for (;;) {
+	p = strtok(0, WS);
+	while (p == 0) {
+	  if (!t.next()) {
+	    t.error("list of sizes must be terminated by `0'");
+	    return 0;
+	  }
+	  p = strtok(t.buf, WS);
+	}
+	int lower, upper;
+	switch (sscanf(p, "%d-%d", &lower, &upper)) {
+	case 1:
+	  upper = lower;
+	  // fall through
+	case 2:
+	  if (lower <= upper && lower >= 0)
+	    break;
+	  // fall through
+	default:
+	  t.error("bad size range `%1'", p);
+	  return 0;
+	}
+	if (i + 2 > n) {
+	  int *old_sizes = sizes;
+	  sizes = new int[n*2];
+	  memcpy(sizes, old_sizes, n*sizeof(int));
+	  n *= 2;
+	  a_delete old_sizes;
+	}
+	sizes[i++] = lower;
+	if (lower == 0)
+	  break;
+	sizes[i++] = upper;
+      }
+      if (i == 1) {
+	t.error("must have some sizes");
+	return 0;
+      }
+    }
+    else if (strcmp("styles", p) == 0) {
+      int style_table_size = 5;
+      style_table = (const char **)new char *[style_table_size];
+      int j;
+      for (j = 0; j < style_table_size; j++)
+	style_table[j] = 0;
+      int i = 0;
+      for (;;) {
+	p = strtok(0, WS);
+	if (p == 0)
+	  break;
+	// leave room for terminating 0
+	if (i + 1 >= style_table_size) {
+	  const char **old_style_table = style_table;
+	  style_table_size *= 2;
+	  style_table = (const char **)new char*[style_table_size];
+	  for (j = 0; j < i; j++)
+	    style_table[j] = old_style_table[j];
+	  for (; j < style_table_size; j++)
+	    style_table[j] = 0;
+	  a_delete old_style_table;
+	}
+	char *tem = new char[strlen(p) + 1];
+	strcpy(tem, p);
+	style_table[i++] = tem;
+      }
+    }
+    else if (strcmp("tcommand", p) == 0)
+      tcommand = 1;
+    else if (strcmp("use_charnames_in_special", p) == 0)
+      use_charnames_in_special = 1;
+    else if (strcmp("charset", p) == 0)
+      break;
+    else if (unknown_desc_command_handler) {
+      char *command = p;
+      p = strtok(0, "\n");
+      (*unknown_desc_command_handler)(command, trim_arg(p), t.path, t.lineno);
+    }
+  }
+  if (res == 0) {
+    t.error("missing `res' command");
+    return 0;
+  }
+  if (unitwidth == 0) {
+    t.error("missing `unitwidth' command");
+    return 0;
+  }
+  if (font_name_table == 0) {
+    t.error("missing `fonts' command");
+    return 0;
+  }
+  if (sizes == 0) {
+    t.error("missing `sizes' command");
+    return 0;
+  }
+  if (sizescale < 1) {
+    t.error("bad `sizescale' value");
+    return 0;
+  }
+  if (hor < 1) {
+    t.error("bad `hor' value");
+    return 0;
+  }
+  if (vert < 1) {
+    t.error("bad `vert' value");
+    return 0;
+  }
+  return 1;
+}      
+
+void font::handle_unknown_font_command(const char *, const char *,
+				       const char *, int)
+{
+}
+
+FONT_COMMAND_HANDLER
+font::set_unknown_desc_command_handler(FONT_COMMAND_HANDLER func)
+{
+  FONT_COMMAND_HANDLER prev = unknown_desc_command_handler;
+  unknown_desc_command_handler = func;
+  return prev;
+}
diff --git a/contrib/groff/src/libs/libgroff/fontfile.cpp b/contrib/groff/src/libs/libgroff/fontfile.cpp
new file mode 100644
index 0000000..8502d12
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/fontfile.cpp
@@ -0,0 +1,67 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "font.h"
+#include "searchpath.h"
+#include "device.h"
+#include "defs.h"
+
+const char *const FONT_ENV_VAR = "GROFF_FONT_PATH";
+
+static search_path font_path(FONT_ENV_VAR, FONTPATH, 0, 0);
+
+int font::res = 0;
+int font::hor = 1;
+int font::vert = 1;
+int font::unitwidth = 0;
+int font::paperwidth = 0;
+int font::paperlength = 0;
+const char *font::papersize = 0;
+int font::biggestfont = 0;
+int font::spare2 = 0;
+int font::sizescale = 1;
+int font::tcommand = 0;
+int font::pass_filenames = 0;
+int font::use_charnames_in_special = 0;
+const char **font::font_name_table = 0;
+int *font::sizes = 0;
+const char *font::family = 0;
+const char **font::style_table = 0;
+FONT_COMMAND_HANDLER font::unknown_desc_command_handler = 0;
+
+void font::command_line_font_dir(const char *dir)
+{
+  font_path.command_line_dir(dir);
+}
+
+FILE *font::open_file(const char *name, char **pathp)
+{
+  char *filename = new char[strlen(name) + strlen(device) + 5];
+  sprintf(filename, "dev%s/%s", device, name);
+  FILE *fp = font_path.open_file(filename, pathp);
+  a_delete filename;
+  return fp;
+}
diff --git a/contrib/groff/src/libs/libgroff/geometry.cpp b/contrib/groff/src/libs/libgroff/geometry.cpp
new file mode 100644
index 0000000..256d266
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/geometry.cpp
@@ -0,0 +1,286 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by Gaius Mulley <gaius@glam.ac.uk>
+     using adjust_arc_center() from printer.cpp, written by James Clark.
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+#include <stdio.h>
+#include <math.h>
+
+#undef	MAX
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+
+#undef	MIN
+#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+
+
+// This utility function adjusts the specified center of the
+// arc so that it is equidistant between the specified start
+// and end points.  (p[0], p[1]) is a vector from the current
+// point to the center; (p[2], p[3]) is a vector from the 
+// center to the end point.  If the center can be adjusted,
+// a vector from the current point to the adjusted center is
+// stored in c[0], c[1] and 1 is returned.  Otherwise 0 is
+// returned.
+
+#if 1
+int adjust_arc_center(const int *p, double *c)
+{
+  // We move the center along a line parallel to the line between
+  // the specified start point and end point so that the center
+  // is equidistant between the start and end point.
+  // It can be proved (using Lagrange multipliers) that this will
+  // give the point nearest to the specified center that is equidistant
+  // between the start and end point.
+
+  double x = p[0] + p[2];	// (x, y) is the end point
+  double y = p[1] + p[3];
+  double n = x*x + y*y;
+  if (n != 0) {
+    c[0]= double(p[0]);
+    c[1] = double(p[1]);
+    double k = .5 - (c[0]*x + c[1]*y)/n;
+    c[0] += k*x;
+    c[1] += k*y;
+    return 1;
+  }
+  else
+    return 0;
+}
+#else
+int printer::adjust_arc_center(const int *p, double *c)
+{
+  int x = p[0] + p[2];	// (x, y) is the end point
+  int y = p[1] + p[3];
+  // Start at the current point; go in the direction of the specified
+  // center point until we reach a point that is equidistant between
+  // the specified starting point and the specified end point.  Place
+  // the center of the arc there.
+  double n = p[0]*double(x) + p[1]*double(y);
+  if (n > 0) {
+    double k = (double(x)*x + double(y)*y)/(2.0*n);
+    // (cx, cy) is our chosen center
+    c[0] = k*p[0];
+    c[1] = k*p[1];
+    return 1;
+  }
+  else {
+    // We would never reach such a point.  So instead start at the
+    // specified end point of the arc.  Go towards the specified
+    // center point until we reach a point that is equidistant between
+    // the specified start point and specified end point.  Place
+    // the center of the arc there.
+    n = p[2]*double(x) + p[3]*double(y);
+    if (n > 0) {
+      double k = 1 - (double(x)*x + double(y)*y)/(2.0*n);
+      // (c[0], c[1]) is our chosen center
+      c[0] = p[0] + k*p[2];
+      c[1] = p[1] + k*p[3];
+      return 1;
+    }
+    else
+      return 0;
+  }
+}  
+#endif
+
+
+/*
+ *  check_output_arc_limits - works out the smallest box that will encompass
+ *                            an arc defined by an origin (x, y) and two
+ *                            vectors (p0, p1) and (p2, p3).
+ *                            (x1, y1) -> start of arc
+ *                            (x1, y1) + (xv1, yv1) -> center of circle
+ *                            (x1, y1) + (xv1, yv1) + (xv2, yv2) -> end of arc
+ *
+ *                            Works out in which quadrant the arc starts and
+ *                            stops, and from this it determines the x, y
+ *                            max/min limits.  The arc is drawn clockwise.
+ *
+ *                            [I'm sure there is a better way to do this, but
+ *                             I don't know how.  Please can someone let me
+ *                             know or "improve" this function.]
+ */
+
+void check_output_arc_limits(int x1, int y1,
+			     int xv1, int yv1,
+			     int xv2, int yv2,
+			     double c0, double c1,
+			     int *minx, int *maxx,
+			     int *miny, int *maxy)
+{
+  int radius = (int)sqrt(c0*c0 + c1*c1);
+  int x2 = x1 + xv1 + xv2;			// end of arc is (x2, y2)
+  int y2 = y1 + yv1 + yv2;
+
+  // firstly lets use the `circle' limitation
+  *minx = x1 + xv1 - radius;
+  *maxx = x1 + xv1 + radius;
+  *miny = y1 + yv1 - radius;
+  *maxy = y1 + yv1 + radius;
+
+  /*  now to see which min/max can be reduced and increased for the limits of
+   *  the arc
+   *
+   *       Q2   |   Q1
+   *       -----+-----
+   *       Q3   |   Q4
+   *
+   *
+   *  NB. (x1+xv1, y1+yv1) is at the origin
+   *
+   *  below we ask a nested question
+   *  (i)  from which quadrant does the first vector start?
+   *  (ii) into which quadrant does the second vector go?
+   *  from the 16 possible answers we determine the limits of the arc
+   */
+  if (xv1 > 0 && yv1 > 0) {
+    // first vector in Q3
+    if (xv2 >= 0 && yv2 >= 0 ) {
+      // second in Q1
+      *maxx = x2;
+      *miny = y1;
+    }
+    else if (xv2 < 0 && yv2 >= 0) {
+      // second in Q2
+      *maxx = x2;
+      *miny = y1;
+    }
+    else if (xv2 >= 0 && yv2 < 0) {
+      // second in Q4
+      *miny = MIN(y1, y2);
+    }
+    else if (xv2 < 0 && yv2 < 0) {
+      // second in Q3
+      if (x1 >= x2) {
+	*minx = x2;
+	*maxx = x1;
+	*miny = MIN(y1, y2);
+	*maxy = MAX(y1, y2);
+      }
+      else {
+	// xv2, yv2 could all be zero?
+      }
+    }
+  }
+  else if (xv1 > 0 && yv1 < 0) {
+    // first vector in Q2
+    if (xv2 >= 0 && yv2 >= 0) {
+      // second in Q1
+      *maxx = MAX(x1, x2);
+      *minx = MIN(x1, x2);
+      *miny = y1;
+    }
+    else if (xv2 < 0 && yv2 >= 0) {
+      // second in Q2
+      if (x1 < x2) {
+	*maxx = x2;
+	*minx = x1;
+	*miny = MIN(y1, y2);
+	*maxy = MAX(y1, y2);
+      }
+      else {
+	// otherwise almost full circle anyway
+      }
+    }
+    else if (xv2 >= 0 && yv2 < 0) {
+      // second in Q4
+      *miny = y2;
+      *minx = x1;
+    }
+    else if (xv2 < 0 && yv2 < 0) {
+      // second in Q3
+      *minx = MIN(x1, x2);
+    }
+  }
+  else if (xv1 <= 0 && yv1 <= 0) {
+    // first vector in Q1
+    if (xv2 >= 0 && yv2 >= 0) {
+      // second in Q1
+      if (x1 < x2) {
+	*minx = x1;
+	*maxx = x2;
+	*miny = MIN(y1, y2);
+	*maxy = MAX(y1, y2);
+      }
+      else {
+	// nearly full circle
+      }
+    }
+    else if (xv2 < 0 && yv2 >= 0) {
+      // second in Q2
+      *maxy = MAX(y1, y2);
+    }
+    else if (xv2 >= 0 && yv2 < 0) {
+      // second in Q4
+      *miny = MIN(y1, y2);
+      *maxy = MAX(y1, y2);
+      *minx = MIN(x1, x2);
+    }
+    else if (xv2 < 0 && yv2 < 0) {
+      // second in Q3
+      *minx = x2;
+      *maxy = y1;
+    }
+  }
+  else if (xv1 <= 0 && yv1 > 0) {
+    // first vector in Q4
+    if (xv2 >= 0 && yv2 >= 0) {
+      // second in Q1
+      *maxx = MAX(x1, x2);
+    }
+    else if (xv2 < 0 && yv2 >= 0) {
+      // second in Q2
+      *maxy = MAX(y1, y2);
+      *maxx = MAX(x1, x2);
+    }
+    else if (xv2 >= 0 && yv2 < 0) {
+      // second in Q4
+      if (x1 >= x2) {
+	*miny = MIN(y1, y2);
+	*maxy = MAX(y1, y2);
+	*minx = MIN(x1, x2);
+	*maxx = MAX(x2, x2);
+      }
+      else {
+	// nearly full circle
+      }
+    }
+    else if (xv2 < 0 && yv2 < 0) {
+      // second in Q3
+      *maxy = MAX(y1, y2);
+      *minx = MIN(x1, x2);
+      *maxx = MAX(x1, x2);
+    }
+  }
+
+  // this should *never* happen but if it does it means a case above is wrong
+  // this code is only present for safety sake
+  if (*maxx < *minx) {
+    fprintf(stderr, "assert failed *minx > *maxx\n");
+    fflush(stderr);
+    *maxx = *minx;
+  }
+  if (*maxy < *miny) {
+    fprintf(stderr, "assert failed *miny > *maxy\n");
+    fflush(stderr);
+    *maxy = *miny;
+  }
+}
diff --git a/contrib/groff/src/libs/libgroff/htmlhint.cpp b/contrib/groff/src/libs/libgroff/htmlhint.cpp
new file mode 100644
index 0000000..3015767
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/htmlhint.cpp
@@ -0,0 +1,59 @@
+/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "nonposix.h"
+#include "stringclass.h"
+#include "html-strings.h"
+
+/*
+ *  This file contains a very simple set of routines which might
+ *  be shared by preprocessors.  It allows a preprocessor to indicate
+ *  when an inline image should be created.
+ *  This string is intercepted by pre-grohtml and substituted for
+ *  the image name and suppression escapes.
+ *
+ *  pre-html runs troff twice, once with -Thtml and once with -Tps.
+ *  troff -Thtml device driver emits a <src='image'.png> tag
+ *  and the postscript device driver works out the min/max limits
+ *  of the graphic region.  These region limits are read by pre-html
+ *  and an image is generated via troff -Tps -> gs -> png
+ */
+
+/*
+ *  html_begin_suppress - emit a start of image tag which will be seen
+ *                        by pre-html.
+ */
+void html_begin_suppress()
+{
+  put_string(HTML_IMAGE_INLINE_BEGIN, stdout);
+}
+
+/*
+ *  html_end_suppress - emit an end of image tag which will be seen
+ *                      by pre-html.
+ */
+void html_end_suppress()
+{
+  put_string(HTML_IMAGE_INLINE_END, stdout);
+}
diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/contrib/groff/src/libs/libgroff/invalid.cpp
new file mode 100644
index 0000000..f36894a
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/invalid.cpp
@@ -0,0 +1,60 @@
+/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+// Table of invalid input characters.
+
+char invalid_char_table[256]= {
+#ifndef IS_EBCDIC_HOST
+  1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#else
+  1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1,
+  1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+};
diff --git a/contrib/groff/src/libs/libgroff/lf.cpp b/contrib/groff/src/libs/libgroff/lf.cpp
new file mode 100644
index 0000000..34272c7
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/lf.cpp
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <string.h>
+#include <ctype.h>
+#include "cset.h"
+#include "stringclass.h"
+
+extern void change_filename(const char *);
+extern void change_lineno(int);
+
+int interpret_lf_args(const char *p)
+{
+  while (*p == ' ')
+    p++;
+  if (!csdigit(*p))
+    return 0;
+  int ln = 0;
+  do {
+    ln *= 10;
+    ln += *p++ - '0';
+  } while (csdigit(*p));
+  if (*p != ' ' && *p != '\n' && *p != '\0')
+    return 0;
+  while (*p == ' ')
+    p++;
+  if (*p == '\0' || *p == '\n')  {
+    change_lineno(ln);
+    return 1;
+  }
+  const char *q;
+  for (q = p;
+       *q != '\0' && *q != ' ' && *q != '\n' && *q != '\\';
+       q++)
+    ;
+  string tem(p, q - p);
+  while (*q == ' ')
+    q++;
+  if (*q != '\n' && *q != '\0')
+    return 0;
+  tem += '\0';
+  change_filename(tem.contents());
+  change_lineno(ln);
+  return 1;
+}
diff --git a/contrib/groff/src/libs/libgroff/lineno.cpp b/contrib/groff/src/libs/libgroff/lineno.cpp
new file mode 100644
index 0000000..f7138db
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/lineno.cpp
@@ -0,0 +1 @@
+int current_lineno = 0;
diff --git a/contrib/groff/src/libs/libgroff/macropath.cpp b/contrib/groff/src/libs/libgroff/macropath.cpp
new file mode 100644
index 0000000..03c04cb
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/macropath.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+#include "searchpath.h"
+#include "macropath.h"
+#include "defs.h"
+
+#define MACROPATH_ENVVAR "GROFF_TMAC_PATH"
+
+search_path macro_path(MACROPATH_ENVVAR, MACROPATH, 1, 1);
+search_path safer_macro_path(MACROPATH_ENVVAR, MACROPATH, 1, 0);
+search_path config_macro_path(MACROPATH_ENVVAR, MACROPATH, 0, 0);
diff --git a/contrib/groff/src/libs/libgroff/maxfilename.cpp b/contrib/groff/src/libs/libgroff/maxfilename.cpp
new file mode 100644
index 0000000..25f5549
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/maxfilename.cpp
@@ -0,0 +1,69 @@
+// -*- C++ -*-
+/* Copyright (C) 1992, 2001, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* file_name_max(dir) does the same as pathconf(dir, _PC_NAME_MAX) */
+
+#include "lib.h"
+
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#ifdef _POSIX_VERSION
+
+size_t file_name_max(const char *fname)
+{
+  return pathconf(fname, _PC_NAME_MAX);
+}
+
+#else /* not _POSIX_VERSION */
+
+#ifdef HAVE_CC_LIMITS_H
+#include <limits.h>
+#endif /* HAVE_CC_LIMITS_H */
+
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#else /* not HAVE_DIRENT_H */
+#ifdef HAVE_SYS_DIR_H
+#include <sys/dir.h>
+#endif /* HAVE_SYS_DIR_H */
+#endif /* not HAVE_DIRENT_H */
+
+#ifndef NAME_MAX
+#ifdef MAXNAMLEN
+#define NAME_MAX MAXNAMLEN
+#else /* !MAXNAMLEN */
+#ifdef MAXNAMELEN
+#define NAME_MAX MAXNAMELEN
+#else /* !MAXNAMELEN */
+#define NAME_MAX 14
+#endif /* !MAXNAMELEN */
+#endif /* !MAXNAMLEN */
+#endif /* !NAME_MAX */
+
+size_t file_name_max(const char *)
+{
+  return NAME_MAX;
+}
+
+#endif /* not _POSIX_VERSION */
diff --git a/contrib/groff/src/libs/libgroff/mksdir.cpp b/contrib/groff/src/libs/libgroff/mksdir.cpp
new file mode 100644
index 0000000..bf4d300
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/mksdir.cpp
@@ -0,0 +1,34 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Written by Werner Lemberg (wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+/* This file is heavily based on the file mkstemp.c which is part of the
+   fileutils package. */
+
+
+extern int gen_tempname(char *, int = 0);
+
+/* Generate a unique temporary directory name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the directory and return a fd. */
+int mksdir(char *tmpl)
+{
+  return gen_tempname(tmpl, 1);
+}
diff --git a/contrib/groff/src/libs/libgroff/mkstemp.cpp b/contrib/groff/src/libs/libgroff/mkstemp.cpp
new file mode 100644
index 0000000..cd2717c
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/mkstemp.cpp
@@ -0,0 +1,34 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Written by Werner Lemberg (wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+/* This file is heavily based on the file mkstemp.c which is part of the
+   fileutils package. */
+
+
+extern int gen_tempname(char *, int);
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the file and return a fd. */
+int mkstemp(char *tmpl)
+{
+  return gen_tempname(tmpl, 0);
+}
diff --git a/contrib/groff/src/libs/libgroff/nametoindex.cpp b/contrib/groff/src/libs/libgroff/nametoindex.cpp
new file mode 100644
index 0000000..def26b3
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/nametoindex.cpp
@@ -0,0 +1,117 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "errarg.h"
+#include "error.h"
+#include "font.h"
+#include "ptable.h"
+
+declare_ptable(int)
+implement_ptable(int)
+
+class character_indexer {
+public:
+  character_indexer();
+  ~character_indexer();
+  int ascii_char_index(unsigned char);
+  int named_char_index(const char *);
+  int numbered_char_index(int);
+private:
+  enum { NSMALL = 256 };
+  int next_index;
+  int ascii_index[256];
+  int small_number_index[NSMALL];
+  PTABLE(int) table;
+};
+
+character_indexer::character_indexer()
+: next_index(0)
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    ascii_index[i] = -1;
+  for (i = 0; i < NSMALL; i++)
+    small_number_index[i] = -1;
+}
+
+character_indexer::~character_indexer()
+{
+}
+
+int character_indexer::ascii_char_index(unsigned char c)
+{
+  if (ascii_index[c] < 0)
+    ascii_index[c] = next_index++;
+  return ascii_index[c];
+}
+
+int character_indexer::numbered_char_index(int n)
+{
+  if (n >= 0 && n < NSMALL) {
+    if (small_number_index[n] < 0)
+      small_number_index[n] = next_index++;
+    return small_number_index[n];
+  }
+  // Not the most efficient possible implementation.
+  char buf[INT_DIGITS + 3];
+  buf[0] = ' ';
+  strcpy(buf + 1, i_to_a(n));
+  return named_char_index(buf);
+}
+
+int character_indexer::named_char_index(const char *s)
+{
+  int *np = table.lookup(s);
+  if (!np) {
+    np = new int[1];
+    *np = next_index++;
+    table.define(s, np);
+  }
+  return *np;
+}
+
+static character_indexer indexer;
+
+int font::number_to_index(int n)
+{
+  return indexer.numbered_char_index(n);
+}
+
+int font::name_to_index(const char *s)
+{
+  assert(s != 0 && s[0] != '\0' && s[0] != ' ');
+  if (s[1] == '\0')
+    return indexer.ascii_char_index(s[0]);
+  /* char128 and \200 are synonyms */
+  if (s[0] == 'c' && s[1] == 'h' && s[2] == 'a' && s[3] == 'r') {
+    char *res;
+    long n = strtol(s + 4, &res, 10);
+    if (res != s + 4 && *res == '\0' && n >= 0 && n < 256)
+      return indexer.ascii_char_index((unsigned char)n);
+  }
+  return indexer.named_char_index(s);
+}
+
diff --git a/contrib/groff/src/libs/libgroff/new.cpp b/contrib/groff/src/libs/libgroff/new.cpp
new file mode 100644
index 0000000..739cffa
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/new.cpp
@@ -0,0 +1,71 @@
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "posix.h"
+#include "nonposix.h"
+
+extern const char *program_name;
+
+static void ewrite(const char *s)
+{
+  write(2, s, strlen(s));
+}
+
+void *operator new(size_t size)
+{
+  // Avoid relying on the behaviour of malloc(0).
+  if (size == 0)
+    size++;
+#ifdef COOKIE_BUG
+  char *p = (char *)malloc(unsigned(size + 8));
+#else /* not COOKIE_BUG */
+  char *p = (char *)malloc(unsigned(size));
+#endif /* not COOKIE_BUG */
+  if (p == 0) {
+    if (program_name) {
+      ewrite(program_name);
+      ewrite(": ");
+    }
+    ewrite("out of memory\n");
+    _exit(-1);
+  }
+#ifdef COOKIE_BUG
+  ((unsigned *)p)[1] = 0;
+  return p + 8;
+#else /* not COOKIE_BUG */
+  return p;
+#endif /* not COOKIE_BUG */
+}
+
+void operator delete(void *p)
+{
+#ifdef COOKIE_BUG
+  if (p)
+    free((void *)((char *)p - 8));
+#else
+  if (p)
+    free(p);
+#endif /* COOKIE_BUG */
+}
diff --git a/contrib/groff/src/libs/libgroff/paper.cpp b/contrib/groff/src/libs/libgroff/paper.cpp
new file mode 100644
index 0000000..db8f5bc
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/paper.cpp
@@ -0,0 +1,84 @@
+// -*- C++ -*-
+/* Copyright (C) 2002, 2003
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg (wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+#include "paper.h"
+
+paper papersizes[NUM_PAPERSIZES];
+
+// length and width in mm
+static void add_iso_paper(char series, int offset,
+			  int start_length, int start_width)
+{
+  int length = start_length;
+  int width = start_width;
+  for (int i = 0; i < 8; i++)
+  {
+    char *p = new char[3];
+    p[0] = series;
+    p[1] = '0' + i;
+    p[2] = '\0';
+    papersizes[offset + i].name = p;
+    // convert mm to inch
+    papersizes[offset + i].length = (double)length / 25.4;
+    papersizes[offset + i].width = (double)width / 25.4;
+    // after division by two, values must be rounded down to the next
+    // integer (as specified by ISO)
+    int tmp = length;
+    length = width;
+    width = tmp / 2;
+  }
+}
+
+// length and width in inch
+static void add_american_paper(const char *name, int index,
+			       double length, double width )
+{
+  char *p = new char[strlen(name) + 1];
+  strcpy(p, name);
+  papersizes[index].name = p;
+  papersizes[index].length = length;
+  papersizes[index].width = width;
+}
+
+int papersize_init::initialised = 0;
+
+papersize_init::papersize_init()
+{
+  if (initialised)
+    return;
+  initialised = 1;
+  add_iso_paper('a', 0, 1189, 841);
+  add_iso_paper('b', 8, 1414, 1000);
+  add_iso_paper('c', 16, 1297, 917);
+  add_iso_paper('d', 24, 1090, 771);
+  add_american_paper("letter", 32, 11, 8.5);
+  add_american_paper("legal", 33, 14, 8.5);
+  add_american_paper("tabloid", 34, 17, 11);
+  add_american_paper("ledger", 35, 11, 17);
+  add_american_paper("statement", 36, 8.5, 5.5);
+  add_american_paper("executive", 37, 10, 7.5);
+  // the next three entries are for grolj4
+  add_american_paper("com10", 38, 9.5, 4.125);
+  add_american_paper("monarch", 39, 7.5, 3.875);
+  // this is an ISO format, but it easier to use add_american_paper
+  add_american_paper("dl", 40, 220/25.4, 110/25.4);
+}
diff --git a/contrib/groff/src/libs/libgroff/prime.cpp b/contrib/groff/src/libs/libgroff/prime.cpp
new file mode 100644
index 0000000..f0b1ead
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/prime.cpp
@@ -0,0 +1,26 @@
+#include <math.h>
+
+int is_prime(unsigned n)
+{
+  if (n <= 3)
+    return 1;
+  if (!(n & 1))
+    return 0;
+  if (n % 3 == 0)
+    return 0;
+  unsigned lim = unsigned(sqrt((double)n));
+  unsigned d = 5;
+  for (;;) {
+    if (d > lim)
+      break;
+    if (n % d == 0)
+      return 0;
+    d += 2;
+    if (d > lim)
+      break;
+    if (n % d == 0)
+      return 0;
+    d += 4;
+  }
+  return 1;
+}
diff --git a/contrib/groff/src/libs/libgroff/progname.cpp b/contrib/groff/src/libs/libgroff/progname.cpp
new file mode 100644
index 0000000..a70e341
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/progname.cpp
@@ -0,0 +1 @@
+const char *program_name = 0;
diff --git a/contrib/groff/src/libs/libgroff/ptable.cpp b/contrib/groff/src/libs/libgroff/ptable.cpp
new file mode 100644
index 0000000..76735c2
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/ptable.cpp
@@ -0,0 +1,52 @@
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "ptable.h"
+#include "errarg.h"
+#include "error.h"
+
+unsigned long hash_string(const char *s)
+{
+  assert(s != 0);
+  unsigned long h = 0, g;
+  while (*s != 0) {
+    h <<= 4;
+    h += *s++;
+    if ((g = h & 0xf0000000) != 0) {
+      h ^= g >> 24;
+      h ^= g;
+    }
+  }
+  return h;
+}
+
+static const unsigned table_sizes[] = { 
+101, 503, 1009, 2003, 3001, 4001, 5003, 10007, 20011, 40009,
+80021, 160001, 500009, 1000003, 2000003, 4000037, 8000009,
+16000057, 32000011, 64000031, 128000003, 0 
+};
+
+unsigned next_ptable_size(unsigned n)
+{
+  const unsigned *p;  
+  for (p = table_sizes; *p <= n; p++)
+    if (*p == 0)
+      fatal("cannot expand table");
+  return *p;
+}
diff --git a/contrib/groff/src/libs/libgroff/searchpath.cpp b/contrib/groff/src/libs/libgroff/searchpath.cpp
new file mode 100644
index 0000000..1f8b233
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/searchpath.cpp
@@ -0,0 +1,132 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "searchpath.h"
+#include "nonposix.h"
+
+search_path::search_path(const char *envvar, const char *standard,
+			 int add_home, int add_current)
+{
+  char *home = 0;
+  if (add_home)
+    home = getenv("HOME");
+  char *e = 0;
+  if (envvar)
+    e = getenv(envvar);
+  dirs = new char[((e && *e) ? strlen(e) + 1 : 0)
+		  + (add_current ? 1 + 1 : 0)
+		  + ((home && *home) ? strlen(home) + 1 : 0)
+		  + ((standard && *standard) ? strlen(standard) : 0)
+		  + 1];
+  *dirs = '\0';
+  if (e && *e) {
+    strcat(dirs, e);
+    strcat(dirs, PATH_SEP);
+  }
+  if (add_current) {
+    strcat(dirs, ".");
+    strcat(dirs, PATH_SEP);
+  }
+  if (home && *home) {
+    strcat(dirs, home);
+    strcat(dirs, PATH_SEP);
+  }
+  if (standard && *standard)
+    strcat(dirs, standard);
+  init_len = strlen(dirs);
+}
+
+search_path::~search_path()
+{
+  // dirs is always allocated
+  a_delete dirs;
+}
+
+void search_path::command_line_dir(const char *s)
+{
+  char *old = dirs;
+  unsigned old_len = strlen(old);
+  unsigned slen = strlen(s);
+  dirs = new char[old_len + 1 + slen + 1];
+  memcpy(dirs, old, old_len - init_len);
+  char *p = dirs;
+  p += old_len - init_len;
+  if (init_len == 0)
+    *p++ = PATH_SEP[0];
+  memcpy(p, s, slen);
+  p += slen;
+  if (init_len > 0) {
+    *p++ = PATH_SEP[0];
+    memcpy(p, old + old_len - init_len, init_len);
+    p += init_len;
+  }
+  *p++ = '\0';
+  a_delete old;
+}
+
+FILE *search_path::open_file(const char *name, char **pathp)
+{
+  assert(name != 0);
+  if (IS_ABSOLUTE(name) || *dirs == '\0') {
+    FILE *fp = fopen(name, "r");
+    if (fp) {
+      if (pathp)
+	*pathp = strsave(name);
+      return fp;
+    }
+    else
+      return 0;
+  }
+  unsigned namelen = strlen(name);
+  char *p = dirs;
+  for (;;) {
+    char *end = strchr(p, PATH_SEP[0]);
+    if (!end)
+      end = strchr(p, '\0');
+    int need_slash = end > p && strchr(DIR_SEPS, end[-1]) == 0;
+    char *path = new char[(end - p) + need_slash + namelen + 1];
+    memcpy(path, p, end - p);
+    if (need_slash)
+      path[end - p] = '/';
+    strcpy(path + (end - p) + need_slash, name);
+#if 0
+    fprintf(stderr, "trying `%s'\n", path);
+#endif
+    FILE *fp = fopen(path, "r");
+    if (fp) {
+      if (pathp)
+	*pathp = path;
+      else
+	a_delete path;
+      return fp;
+    }
+    a_delete path;
+    if (*end == '\0')
+      break;
+    p = end + 1;
+  }
+  return 0;
+}
diff --git a/contrib/groff/src/libs/libgroff/strcasecmp.c b/contrib/groff/src/libs/libgroff/strcasecmp.c
new file mode 100644
index 0000000..ae7601d
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/strcasecmp.c
@@ -0,0 +1,66 @@
+/* strcasecmp.c -- case insensitive string comparator
+   Copyright (C) 1998, 1999 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, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef LENGTH_LIMIT
+# define STRXCASECMP_FUNCTION strncasecmp
+# define STRXCASECMP_DECLARE_N , size_t n
+# define LENGTH_LIMIT_EXPR(Expr) Expr
+#else
+# define STRXCASECMP_FUNCTION strcasecmp
+# define STRXCASECMP_DECLARE_N /* empty */
+# define LENGTH_LIMIT_EXPR(Expr) 0
+#endif
+
+#include <sys/types.h>
+#include <ctype.h>
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare {{no more than N characters of }}strings S1 and S2,
+   ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less
+   than, equal to or greater than S2.  */
+
+int
+STRXCASECMP_FUNCTION (const char *s1, const char *s2 STRXCASECMP_DECLARE_N)
+{
+  register const unsigned char *p1 = (const unsigned char *) s1;
+  register const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+
+  if (p1 == p2 || LENGTH_LIMIT_EXPR (n == 0))
+    return 0;
+
+  do
+    {
+      c1 = TOLOWER (*p1);
+      c2 = TOLOWER (*p2);
+
+      if (LENGTH_LIMIT_EXPR (--n == 0) || c1 == '\0')
+	break;
+
+      ++p1;
+      ++p2;
+    }
+  while (c1 == c2);
+
+  return c1 - c2;
+}
diff --git a/contrib/groff/src/libs/libgroff/string.cpp b/contrib/groff/src/libs/libgroff/string.cpp
new file mode 100644
index 0000000..2ef547e
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/string.cpp
@@ -0,0 +1,341 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include "stringclass.h"
+
+static char *salloc(int len, int *sizep);
+static void sfree(char *ptr, int size);
+static char *sfree_alloc(char *ptr, int size, int len, int *sizep);
+static char *srealloc(char *ptr, int size, int oldlen, int newlen, int *sizep);
+
+static char *salloc(int len, int *sizep)
+{
+  if (len == 0) {
+    *sizep = 0;
+    return 0;
+  }
+  else
+    return new char[*sizep = len*2];
+}
+
+static void sfree(char *ptr, int)
+{
+  a_delete ptr;
+}
+
+static char *sfree_alloc(char *ptr, int oldsz, int len, int *sizep)
+{
+  if (oldsz >= len) {
+    *sizep = oldsz;
+    return ptr;
+  }
+  a_delete ptr;
+  if (len == 0) {
+    *sizep = 0;
+    return 0;
+  }
+  else
+    return new char[*sizep = len*2];
+}
+
+static char *srealloc(char *ptr, int oldsz, int oldlen, int newlen, int *sizep)
+{
+  if (oldsz >= newlen) {
+    *sizep = oldsz;
+    return ptr;
+  }
+  if (newlen == 0) {
+    a_delete ptr;
+    *sizep = 0;
+    return 0;
+  }
+  else {
+    char *p = new char[*sizep = newlen*2];
+    if (oldlen < newlen && oldlen != 0)
+      memcpy(p, ptr, oldlen);
+    a_delete ptr;
+    return p;
+  }
+}
+
+string::string() : ptr(0), len(0), sz(0)
+{
+}
+
+string::string(const char *p, int n) : len(n)
+{
+  assert(n >= 0);
+  ptr = salloc(n, &sz);
+  if (n != 0)
+    memcpy(ptr, p, n);
+}
+
+string::string(const char *p)
+{
+  if (p == 0) {
+    len = 0;
+    ptr = 0;
+    sz = 0;
+  }
+  else {
+    len = strlen(p);
+    ptr = salloc(len, &sz);
+    memcpy(ptr, p, len);
+  }
+}
+
+string::string(char c) : len(1)
+{
+  ptr = salloc(1, &sz);
+  *ptr = c;
+}
+
+string::string(const string &s) : len(s.len)
+{
+  ptr = salloc(len, &sz);
+  if (len != 0)
+    memcpy(ptr, s.ptr, len);
+}
+  
+string::~string()
+{
+  sfree(ptr, sz);
+}
+
+string &string::operator=(const string &s)
+{
+  ptr = sfree_alloc(ptr, sz, s.len, &sz);
+  len = s.len;
+  if (len != 0)
+    memcpy(ptr, s.ptr, len);
+  return *this;
+}
+
+string &string::operator=(const char *p)
+{
+  if (p == 0) {
+    sfree(ptr, len);
+    len = 0;
+    ptr = 0;
+    sz = 0;
+  }
+  else {
+    int slen = strlen(p);
+    ptr = sfree_alloc(ptr, sz, slen, &sz);
+    len = slen;
+    memcpy(ptr, p, len);
+  }
+  return *this;
+}
+
+string &string::operator=(char c)
+{
+  ptr = sfree_alloc(ptr, sz, 1, &sz);
+  len = 1;
+  *ptr = c;
+  return *this;
+}
+
+void string::move(string &s)
+{
+  sfree(ptr, sz);
+  ptr = s.ptr;
+  len = s.len;
+  sz = s.sz;
+  s.ptr = 0;
+  s.len = 0;
+  s.sz = 0;
+}
+
+void string::grow1()
+{
+  ptr = srealloc(ptr, sz, len, len + 1, &sz);
+}
+
+string &string::operator+=(const char *p)
+{
+  if (p != 0) {
+    int n = strlen(p);
+    int newlen = len + n;
+    if (newlen > sz)
+      ptr = srealloc(ptr, sz, len, newlen, &sz);
+    memcpy(ptr + len, p, n);
+    len = newlen;
+  }
+  return *this;
+}
+
+string &string::operator+=(const string &s)
+{
+  if (s.len != 0) {
+    int newlen = len + s.len;
+    if (newlen > sz)
+      ptr = srealloc(ptr, sz, len, newlen, &sz);
+    memcpy(ptr + len, s.ptr, s.len);
+    len = newlen;
+  }
+  return *this;
+}
+
+void string::append(const char *p, int n)
+{
+  if (n > 0) {
+    int newlen = len + n;
+    if (newlen > sz)
+      ptr = srealloc(ptr, sz, len, newlen, &sz);
+    memcpy(ptr + len, p, n);
+    len = newlen;
+  }
+}
+
+string::string(const char *s1, int n1, const char *s2, int n2)
+{
+  assert(n1 >= 0 && n2 >= 0);
+  len = n1 + n2;
+  if (len == 0) {
+    sz = 0;
+    ptr = 0;
+  }
+  else {
+    ptr = salloc(len, &sz);
+    if (n1 == 0)
+      memcpy(ptr, s2, n2);
+    else {
+      memcpy(ptr, s1, n1);
+      if (n2 != 0)
+	memcpy(ptr + n1, s2, n2);
+    }
+  }
+}
+
+int operator<=(const string &s1, const string &s2)
+{
+  return (s1.len <= s2.len
+	  ? s1.len == 0 || memcmp(s1.ptr, s2.ptr, s1.len) <= 0
+	  : s2.len != 0 && memcmp(s1.ptr, s2.ptr, s2.len) < 0);
+}
+
+int operator<(const string &s1, const string &s2)
+{
+  return (s1.len < s2.len
+	  ? s1.len == 0 || memcmp(s1.ptr, s2.ptr, s1.len) <= 0
+	  : s2.len != 0 && memcmp(s1.ptr, s2.ptr, s2.len) < 0);
+}
+
+int operator>=(const string &s1, const string &s2)
+{
+  return (s1.len >= s2.len
+	  ? s2.len == 0 || memcmp(s1.ptr, s2.ptr, s2.len) >= 0
+	  : s1.len != 0 && memcmp(s1.ptr, s2.ptr, s1.len) > 0);
+}
+
+int operator>(const string &s1, const string &s2)
+{
+  return (s1.len > s2.len
+	  ? s2.len == 0 || memcmp(s1.ptr, s2.ptr, s2.len) >= 0
+	  : s1.len != 0 && memcmp(s1.ptr, s2.ptr, s1.len) > 0);
+}
+
+void string::set_length(int i)
+{
+  assert(i >= 0);
+  if (i > sz)
+    ptr = srealloc(ptr, sz, len, i, &sz);
+  len = i;
+}
+
+void string::clear()
+{
+  len = 0;
+}
+
+int string::search(char c) const
+{
+  char *p = ptr ? (char *)memchr(ptr, c, len) : NULL;
+  return p ? p - ptr : -1;
+}
+
+// we silently strip nuls
+
+char *string::extract() const
+{
+  char *p = ptr;
+  int n = len;
+  int nnuls = 0;
+  int i;
+  for (i = 0; i < n; i++)
+    if (p[i] == '\0')
+      nnuls++;
+  char *q = new char[n + 1 - nnuls];
+  char *r = q;
+  for (i = 0; i < n; i++)
+    if (p[i] != '\0')
+      *r++ = p[i];
+  *r = '\0';
+  return q;
+}
+
+void string::remove_spaces()
+{
+  int l = len - 1;
+  while (l >= 0 && ptr[l] == ' ')
+    l--;
+  char *p = ptr;
+  if (l > 0)
+    while (*p == ' ') {
+      p++;
+      l--;
+    }
+  if (len - 1 != l) {
+    if (l >= 0) {
+      len = l + 1;
+      char *tmp = new char[len];
+      memcpy(tmp, p, len);
+      a_delete ptr;
+      ptr = tmp;
+    }
+    else {
+      len = 0;
+      if (ptr) {
+	a_delete ptr;
+	ptr = 0;
+      }
+    }
+  }
+}
+
+void put_string(const string &s, FILE *fp)
+{
+  int len = s.length();
+  const char *ptr = s.contents();
+  for (int i = 0; i < len; i++)
+    putc(ptr[i], fp);
+}
+
+string as_string(int i)
+{
+  static char buf[INT_DIGITS + 2];
+  sprintf(buf, "%d", i);
+  return string(buf);
+}
+
diff --git a/contrib/groff/src/libs/libgroff/strncasecmp.c b/contrib/groff/src/libs/libgroff/strncasecmp.c
new file mode 100644
index 0000000..68d95aa
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/strncasecmp.c
@@ -0,0 +1,2 @@
+#define LENGTH_LIMIT
+#include "strcasecmp.c"
diff --git a/contrib/groff/src/libs/libgroff/strsave.cpp b/contrib/groff/src/libs/libgroff/strsave.cpp
new file mode 100644
index 0000000..dfd2b6f
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/strsave.cpp
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <string.h>
+
+char *strsave(const char *s)
+{
+  if (s == 0)
+    return 0;
+  char *p = new char[strlen(s) + 1];
+  strcpy(p, s);
+  return p;
+}
+
diff --git a/contrib/groff/src/libs/libgroff/tmpfile.cpp b/contrib/groff/src/libs/libgroff/tmpfile.cpp
new file mode 100644
index 0000000..41b7f06
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/tmpfile.cpp
@@ -0,0 +1,172 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include "posix.h"
+#include "errarg.h"
+#include "error.h"
+#include "nonposix.h"
+
+// If this is set, create temporary files there
+#define GROFF_TMPDIR_ENVVAR "GROFF_TMPDIR"
+// otherwise if this is set, create temporary files there
+#define TMPDIR_ENVVAR "TMPDIR"
+// otherwise if P_tmpdir is defined, create temporary files there
+#ifdef P_tmpdir
+# define DEFAULT_TMPDIR P_tmpdir
+#else
+// otherwise create temporary files here.
+# define DEFAULT_TMPDIR "/tmp"
+#endif
+// Use this as the prefix for temporary filenames.
+#define TMPFILE_PREFIX_SHORT ""
+#define TMPFILE_PREFIX_LONG "groff"
+
+char *tmpfile_prefix;
+size_t tmpfile_prefix_len;
+int use_short_postfix = 0;
+
+struct temp_init {
+  temp_init();
+  ~temp_init();
+} _temp_init;
+
+temp_init::temp_init()
+{
+  const char *tem = getenv(GROFF_TMPDIR_ENVVAR);
+  if (!tem) {
+    tem = getenv(TMPDIR_ENVVAR);
+    if (!tem)
+      tem = DEFAULT_TMPDIR;
+  }
+  size_t tem_len = strlen(tem);
+  const char *tem_end = tem + tem_len - 1;
+  int need_slash = strchr(DIR_SEPS, *tem_end) == NULL ? 1 : 0;
+  char *tem2 = new char[tem_len + need_slash + 1];
+  strcpy(tem2, tem);
+  if (need_slash)
+    strcat(tem2, "/");
+  const char *tem3 = TMPFILE_PREFIX_LONG;
+  if (file_name_max(tem2) <= 14) {
+    tem3 = TMPFILE_PREFIX_SHORT;
+    use_short_postfix = 1;
+  }
+  tmpfile_prefix_len = tem_len + need_slash + strlen(tem3);
+  tmpfile_prefix = new char[tmpfile_prefix_len + 1];
+  strcpy(tmpfile_prefix, tem2);
+  strcat(tmpfile_prefix, tem3);
+  a_delete tem2;
+}
+
+temp_init::~temp_init()
+{
+  a_delete tmpfile_prefix;
+}
+
+/*
+ *  Generate a temporary name template with a postfix
+ *  immediately after the TMPFILE_PREFIX.
+ *  It uses the groff preferences for a temporary directory.
+ *  Note that no file name is either created or opened,
+ *  only the *template* is returned.
+ */
+
+char *xtmptemplate(const char *postfix_long, const char *postfix_short)
+{
+  const char *postfix = use_short_postfix ? postfix_short : postfix_long;
+  int postlen = 0;
+  if (postfix)
+    postlen = strlen(postfix);
+  char *templ = new char[tmpfile_prefix_len + postlen + 6 + 1];
+  strcpy(templ, tmpfile_prefix);
+  if (postlen > 0)
+    strcat(templ, postfix);
+  strcat(templ, "XXXXXX");
+  return templ;
+}
+
+// The trick with unlinking the temporary file while it is still in
+// use is not portable, it will fail on MS-DOS and most MS-Windows
+// filesystems.  So it cannot be used on non-Posix systems.
+// Instead, we maintain a list of files to be deleted on exit.
+// This should be portable to all platforms.
+
+struct xtmpfile_list {
+  char *fname;
+  xtmpfile_list *next;
+  xtmpfile_list(char *fn) : fname(fn), next(0) {}
+};
+
+xtmpfile_list *xtmpfiles_to_delete = 0;
+
+struct xtmpfile_list_init {
+  ~xtmpfile_list_init();
+} _xtmpfile_list_init;
+
+xtmpfile_list_init::~xtmpfile_list_init()
+{
+  xtmpfile_list *x = xtmpfiles_to_delete;
+  while (x != 0) {
+    if (unlink(x->fname) < 0)
+      error("cannot unlink `%1': %2", x->fname, strerror(errno));
+    xtmpfile_list *tmp = x;
+    x = x->next;
+    a_delete tmp->fname;
+    delete tmp;
+  }
+}
+
+static void add_tmp_file(const char *name)
+{
+  char *s = new char[strlen(name)+1];
+  strcpy(s, name);
+  xtmpfile_list *x = new xtmpfile_list(s);
+  x->next = xtmpfiles_to_delete;
+  xtmpfiles_to_delete = x;
+}
+
+// Open a temporary file and with fatal error on failure.
+
+FILE *xtmpfile(char **namep,
+	       const char *postfix_long, const char *postfix_short,
+	       int do_unlink)
+{
+  char *templ = xtmptemplate(postfix_long, postfix_short);
+  errno = 0;
+  int fd = mkstemp(templ);
+  if (fd < 0)
+    fatal("cannot create temporary file: %1", strerror(errno));
+  errno = 0;
+  FILE *fp = fdopen(fd, FOPEN_RWB); // many callers of xtmpfile use binary I/O
+  if (!fp)
+    fatal("fdopen: %1", strerror(errno));
+  if (do_unlink)
+    add_tmp_file(templ);
+  if (namep)
+    *namep = templ;
+  else
+    a_delete templ;
+  return fp;
+}
diff --git a/contrib/groff/src/libs/libgroff/tmpname.cpp b/contrib/groff/src/libs/libgroff/tmpname.cpp
new file mode 100644
index 0000000..f867fe0
--- /dev/null
+++ b/contrib/groff/src/libs/libgroff/tmpname.cpp
@@ -0,0 +1,116 @@
+/* Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+     Written by Werner Lemberg (wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+/* This file is heavily based on the function __gen_tempname() in the
+   file tempname.c which is part of the fileutils package. */
+
+
+#include "lib.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <time.h>
+
+#include "posix.h"
+#include "nonposix.h"
+
+#ifndef TMP_MAX
+# define TMP_MAX 238328
+#endif
+
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#ifdef HAVE_GETTIMEOFDAY
+#ifdef NEED_DECLARATION_GETTIMEOFDAY
+extern "C" {
+  int gettimeofday(struct timeval *, void *);
+}
+#endif
+#endif
+
+#if HAVE_CC_STDINT_H
+# include <stdint.h>
+#endif
+
+/* Use the widest available unsigned type if uint64_t is not
+   available.  The algorithm below extracts a number less than 62**6
+   (approximately 2**35.725) from uint64_t, so ancient hosts where
+   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
+   which is better than not having mkstemp at all.  */
+#if !defined UINT64_MAX && !defined uint64_t
+# define uint64_t uintmax_t
+#endif
+
+/* These are the characters used in temporary filenames.  */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+int gen_tempname(char *tmpl, int dir)
+{
+  static uint64_t value;
+
+  size_t len = strlen(tmpl);
+  if (len < 6 || strcmp(&tmpl[len - 6], "XXXXXX"))
+    return -1; /* EINVAL */
+
+  /* This is where the Xs start.  */
+  char *XXXXXX = &tmpl[len - 6];
+
+  /* Get some more or less random data.  */
+#if HAVE_GETTIMEOFDAY
+  timeval tv;
+  gettimeofday(&tv, NULL);
+  uint64_t random_time_bits = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec;
+#else
+  uint64_t random_time_bits = time(NULL);
+#endif
+  value += random_time_bits ^ getpid();
+
+  for (int count = 0; count < TMP_MAX; value += 7777, ++count) {
+    uint64_t v = value;
+
+    /* Fill in the random bits.  */
+    XXXXXX[0] = letters[v % 62];
+    v /= 62;
+    XXXXXX[1] = letters[v % 62];
+    v /= 62;
+    XXXXXX[2] = letters[v % 62];
+    v /= 62;
+    XXXXXX[3] = letters[v % 62];
+    v /= 62;
+    XXXXXX[4] = letters[v % 62];
+    v /= 62;
+    XXXXXX[5] = letters[v % 62];
+
+    int fd = dir ? mkdir(tmpl, S_IRUSR | S_IWUSR | S_IXUSR)
+		 : open(tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+
+    if (fd >= 0)
+      return fd;
+    else if (errno != EEXIST)
+      return -1;
+  }
+
+  /* We got out of the loop because we ran out of combinations to try.  */
+  return -1; /* EEXIST */
+}
diff --git a/contrib/groff/src/preproc/eqn/Makefile.sub b/contrib/groff/src/preproc/eqn/Makefile.sub
index 6997290..7554645 100644
--- a/contrib/groff/src/preproc/eqn/Makefile.sub
+++ b/contrib/groff/src/preproc/eqn/Makefile.sub
@@ -18,26 +18,26 @@ OBJS=\
   pile.$(OBJEXT) \
   special.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/main.cc \
-  $(srcdir)/lex.cc \
-  $(srcdir)/box.cc \
-  $(srcdir)/limit.cc \
-  $(srcdir)/list.cc \
-  $(srcdir)/over.cc \
-  $(srcdir)/text.cc \
-  $(srcdir)/script.cc \
-  $(srcdir)/mark.cc \
-  $(srcdir)/other.cc \
-  $(srcdir)/delim.cc \
-  $(srcdir)/sqrt.cc \
-  $(srcdir)/pile.cc \
-  $(srcdir)/special.cc
+  $(srcdir)/main.cpp \
+  $(srcdir)/lex.cpp \
+  $(srcdir)/box.cpp \
+  $(srcdir)/limit.cpp \
+  $(srcdir)/list.cpp \
+  $(srcdir)/over.cpp \
+  $(srcdir)/text.cpp \
+  $(srcdir)/script.cpp \
+  $(srcdir)/mark.cpp \
+  $(srcdir)/other.cpp \
+  $(srcdir)/delim.cpp \
+  $(srcdir)/sqrt.cpp \
+  $(srcdir)/pile.cpp \
+  $(srcdir)/special.cpp
 HDRS=\
   $(srcdir)/box.h \
   $(srcdir)/eqn.h \
   $(srcdir)/pbox.h
 GRAM=$(srcdir)/eqn.y
-YTABC=eqn.cc
+YTABC=eqn.cpp
 YTABH=eqn_tab.h
 NAMEPREFIX=$(g)
 CLEANADD=neqn
@@ -48,6 +48,7 @@ neqn: neqn.sh
 	-rm -f $@
 	sed -e 's/@g@/$(g)/g' \
 	-e 's|@BINDIR@|$(bindir)|g' \
+	-e 's|@SEP@|$(SEP)|g' \
 	-e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
 	chmod +x $@
 
diff --git a/contrib/groff/src/preproc/eqn/box.cpp b/contrib/groff/src/preproc/eqn/box.cpp
new file mode 100644
index 0000000..41d8dff
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/box.cpp
@@ -0,0 +1,611 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+const char *current_roman_font;
+
+char *gfont = 0;
+char *grfont = 0;
+char *gbfont = 0;
+int gsize = 0;
+
+int script_size_reduction = -1;	// negative means reduce by a percentage 
+
+int positive_space = -1;
+int negative_space = -1;
+
+int minimum_size = 5;
+
+int fat_offset = 4;
+int body_height = 85;
+int body_depth = 35;
+
+int over_hang = 0;
+int accent_width = 31;
+int delimiter_factor = 900;
+int delimiter_shortfall = 50;
+
+int null_delimiter_space = 12;
+int script_space = 5;
+int thin_space = 17;
+int medium_space = 22;
+int thick_space = 28;
+
+int num1 = 70;
+int num2 = 40;
+// we don't use num3, because we don't have \atop
+int denom1 = 70;
+int denom2 = 36;
+int axis_height = 26;		// in 100ths of an em
+int sup1 = 42;
+int sup2 = 37;
+int sup3 = 28;
+int default_rule_thickness = 4;
+int sub1 = 20;
+int sub2 = 23;
+int sup_drop = 38;
+int sub_drop = 5;
+int x_height = 45;
+int big_op_spacing1 = 11;
+int big_op_spacing2 = 17;
+int big_op_spacing3 = 20;
+int big_op_spacing4 = 60;
+int big_op_spacing5 = 10;
+
+// These are for piles and matrices.
+
+int baseline_sep = 140;		// = num1 + denom1
+int shift_down = 26;		// = axis_height
+int column_sep = 100;		// = em space
+int matrix_side_sep = 17;	// = thin space
+
+int nroff = 0;			// should we grok ndefine or tdefine?
+
+struct {
+  const char *name;
+  int *ptr;
+} param_table[] = {
+  { "fat_offset", &fat_offset },
+  { "over_hang", &over_hang },
+  { "accent_width", &accent_width },
+  { "delimiter_factor", &delimiter_factor },
+  { "delimiter_shortfall", &delimiter_shortfall },
+  { "null_delimiter_space", &null_delimiter_space },
+  { "script_space", &script_space },
+  { "thin_space", &thin_space },
+  { "medium_space", &medium_space },
+  { "thick_space", &thick_space },
+  { "num1", &num1 },
+  { "num2", &num2 },
+  { "denom1", &denom1 },
+  { "denom2", &denom2 },
+  { "axis_height", &axis_height },
+  { "sup1", &sup1 },
+  { "sup2", &sup2 },
+  { "sup3", &sup3 },
+  { "default_rule_thickness", &default_rule_thickness },
+  { "sub1", &sub1 },
+  { "sub2", &sub2 },
+  { "sup_drop", &sup_drop },
+  { "sub_drop", &sub_drop },
+  { "x_height", &x_height },
+  { "big_op_spacing1", &big_op_spacing1 },
+  { "big_op_spacing2", &big_op_spacing2 },
+  { "big_op_spacing3", &big_op_spacing3 },
+  { "big_op_spacing4", &big_op_spacing4 },
+  { "big_op_spacing5", &big_op_spacing5 },
+  { "minimum_size", &minimum_size },
+  { "baseline_sep", &baseline_sep },
+  { "shift_down", &shift_down },
+  { "column_sep", &column_sep },
+  { "matrix_side_sep", &matrix_side_sep },
+  { "draw_lines", &draw_flag },
+  { "body_height", &body_height },
+  { "body_depth", &body_depth },
+  { "nroff", &nroff },
+  { 0, 0 }
+};
+
+void set_param(const char *name, int value)
+{
+  for (int i = 0; param_table[i].name != 0; i++)
+    if (strcmp(param_table[i].name, name) == 0) {
+      *param_table[i].ptr = value;
+      return;
+    }
+  error("unrecognised parameter `%1'", name);
+}
+
+int script_style(int style)
+{
+  return style > SCRIPT_STYLE ? style - 2 : style;
+}
+
+int cramped_style(int style)
+{
+  return (style & 1) ? style - 1 : style;
+}
+
+void set_space(int n)
+{
+  if (n < 0)
+    negative_space = -n;
+  else
+    positive_space = n;
+}
+
+// Return 0 if the specified size is bad.
+// The caller is responsible for giving the error message.
+
+int set_gsize(const char *s)
+{
+  const char *p = (*s == '+' || *s == '-') ? s + 1 : s;
+  char *end;
+  long n = strtol(p, &end, 10);
+  if (n <= 0 || *end != '\0' || n > INT_MAX)
+    return 0;
+  if (p > s) {
+    if (!gsize)
+      gsize = 10;
+    if (*s == '+') {
+      if (gsize > INT_MAX - n)
+	return 0;
+      gsize += int(n);
+    }
+    else {
+      if (gsize - n <= 0)
+	return 0;
+      gsize -= int(n);
+    }
+  }
+  else
+    gsize = int(n);
+  return 1;
+}
+
+void set_script_reduction(int n)
+{
+  script_size_reduction = n;
+}
+
+const char *get_gfont()
+{
+  return gfont ? gfont : "I";
+}
+
+const char *get_grfont()
+{
+  return grfont ? grfont : "R";
+}
+
+const char *get_gbfont()
+{
+  return gbfont ? gbfont : "B";
+}
+
+void set_gfont(const char *s)
+{
+  a_delete gfont;
+  gfont = strsave(s);
+}
+
+void set_grfont(const char *s)
+{
+  a_delete grfont;
+  grfont = strsave(s);
+}
+
+void set_gbfont(const char *s)
+{
+  a_delete gbfont;
+  gbfont = strsave(s);
+}
+
+// this must be precisely 2 characters in length
+#define COMPATIBLE_REG "0C"
+
+void start_string()
+{
+  printf(".nr " COMPATIBLE_REG " \\n(.C\n");
+  printf(".cp 0\n");
+  printf(".ds " LINE_STRING "\n");
+}
+
+void output_string()
+{
+  printf("\\*(" LINE_STRING "\n");
+}
+
+void restore_compatibility()
+{
+  printf(".cp \\n(" COMPATIBLE_REG "\n");
+}
+
+void do_text(const char *s)
+{
+  printf(".eo\n");
+  printf(".as " LINE_STRING " \"%s\n", s);
+  printf(".ec\n");
+}
+
+void set_minimum_size(int n)
+{
+  minimum_size = n;
+}
+
+void set_script_size()
+{
+  if (minimum_size < 0)
+    minimum_size = 0;
+  if (script_size_reduction >= 0)
+    printf(".ps \\n[.s]-%d>?%d\n", script_size_reduction, minimum_size);
+  else
+    printf(".ps (u;\\n[.ps]*7+5/10>?%d)\n", minimum_size);
+}
+
+int box::next_uid = 0;
+
+box::box() : spacing_type(ORDINARY_TYPE), uid(next_uid++)
+{
+}
+
+box::~box()
+{
+}
+
+void box::top_level()
+{
+  // debug_print();
+  // putc('\n', stderr);
+  box *b = this;
+  printf(".nr " SAVED_FONT_REG " \\n[.f]\n");
+  printf(".ft\n");
+  printf(".nr " SAVED_PREV_FONT_REG " \\n[.f]\n");
+  printf(".ft %s\n", get_gfont());
+  printf(".nr " SAVED_SIZE_REG " \\n[.ps]\n");
+  if (gsize > 0) {
+    char buf[INT_DIGITS + 1];
+    sprintf(buf, "%d", gsize);
+    b = new size_box(strsave(buf), b);
+  }
+  current_roman_font = get_grfont();
+  // This catches tabs used within \Z (which aren't allowed).
+  b->check_tabs(0);
+  int r = b->compute_metrics(DISPLAY_STYLE);
+  printf(".ft \\n[" SAVED_PREV_FONT_REG "]\n");
+  printf(".ft \\n[" SAVED_FONT_REG "]\n");
+  printf(".nr " MARK_OR_LINEUP_FLAG_REG " %d\n", r);
+  if (r == FOUND_MARK) {
+    printf(".nr " SAVED_MARK_REG " \\n[" MARK_REG "]\n");
+    printf(".nr " MARK_WIDTH_REG " 0\\n[" WIDTH_FORMAT "]\n", b->uid);
+  }
+  else if (r == FOUND_LINEUP)
+    printf(".if r" SAVED_MARK_REG " .as1 " LINE_STRING " \\h'\\n["
+	   SAVED_MARK_REG "]u-\\n[" MARK_REG "]u'\n");
+  else
+    assert(r == FOUND_NOTHING);
+  // The problem here is that the argument to \f is read in copy mode,
+  // so we cannot use \E there; so we hide it in a string instead.
+  // Another problem is that if we use \R directly, then the space will
+  // prevent it working in a macro argument.
+  printf(".ds " SAVE_FONT_STRING " "
+	 "\\R'" SAVED_INLINE_FONT_REG " \\\\n[.f]'"
+	 "\\fP"
+	 "\\R'" SAVED_INLINE_PREV_FONT_REG " \\\\n[.f]'"
+	 "\\R'" SAVED_INLINE_SIZE_REG " \\\\n[.ps]'"
+	 "\\s0"
+	 "\\R'" SAVED_INLINE_PREV_SIZE_REG " \\\\n[.ps]'"
+	 "\n"
+	 ".ds " RESTORE_FONT_STRING " "
+	 "\\f[\\\\n[" SAVED_INLINE_PREV_FONT_REG "]]"
+	 "\\f[\\\\n[" SAVED_INLINE_FONT_REG "]]"
+	 "\\s'\\\\n[" SAVED_INLINE_PREV_SIZE_REG "]u'"
+	 "\\s'\\\\n[" SAVED_INLINE_SIZE_REG "]u'"
+	 "\n");
+  printf(".as1 " LINE_STRING " \\&\\E*[" SAVE_FONT_STRING "]");
+  printf("\\f[%s]", get_gfont());
+  printf("\\s'\\En[" SAVED_SIZE_REG "]u'");
+  current_roman_font = get_grfont();
+  b->output();
+  printf("\\E*[" RESTORE_FONT_STRING "]\n");
+  if (r == FOUND_LINEUP)
+    printf(".if r" SAVED_MARK_REG " .as1 " LINE_STRING " \\h'\\n["
+	   MARK_WIDTH_REG "]u-\\n[" SAVED_MARK_REG "]u-(\\n["
+	   WIDTH_FORMAT "]u-\\n[" MARK_REG "]u)'\n",
+	   b->uid);
+  b->extra_space();
+  if (!inline_flag)
+    printf(".ne \\n[" HEIGHT_FORMAT "]u-%dM>?0+(\\n["
+	   DEPTH_FORMAT "]u-%dM>?0)\n",
+	   b->uid, body_height, b->uid, body_depth);
+  delete b;
+  next_uid = 0;
+}
+
+// gpic defines this register so as to make geqn not produce `\x's
+#define EQN_NO_EXTRA_SPACE_REG "0x"
+
+void box::extra_space()
+{
+  printf(".if !r" EQN_NO_EXTRA_SPACE_REG " "
+	 ".nr " EQN_NO_EXTRA_SPACE_REG " 0\n");
+  if (positive_space >= 0 || negative_space >= 0) {
+    if (positive_space > 0)
+      printf(".if !\\n[" EQN_NO_EXTRA_SPACE_REG "] "
+	     ".as1 " LINE_STRING " \\x'-%dM'\n", positive_space);
+    if (negative_space > 0)
+      printf(".if !\\n[" EQN_NO_EXTRA_SPACE_REG "] "
+	     ".as1 " LINE_STRING " \\x'%dM'\n", negative_space);
+    positive_space = negative_space = -1;
+  }
+  else {
+    printf(".if !\\n[" EQN_NO_EXTRA_SPACE_REG "] "
+	   ".if \\n[" HEIGHT_FORMAT "]>%dM .as1 " LINE_STRING
+	   " \\x'-(\\n[" HEIGHT_FORMAT
+	   "]u-%dM)'\n",
+	   uid, body_height, uid, body_height);
+    printf(".if !\\n[" EQN_NO_EXTRA_SPACE_REG "] "
+	   ".if \\n[" DEPTH_FORMAT "]>%dM .as1 " LINE_STRING
+	   " \\x'\\n[" DEPTH_FORMAT
+	   "]u-%dM'\n",
+	   uid, body_depth, uid, body_depth);
+  }
+}
+
+int box::compute_metrics(int)
+{
+  printf(".nr " WIDTH_FORMAT " 0\n", uid);
+  printf(".nr " HEIGHT_FORMAT " 0\n", uid);
+  printf(".nr " DEPTH_FORMAT " 0\n", uid);
+  return FOUND_NOTHING;
+}
+
+void box::compute_subscript_kern()
+{
+  printf(".nr " SUB_KERN_FORMAT " 0\n", uid);
+}
+
+void box::compute_skew()
+{
+  printf(".nr " SKEW_FORMAT " 0\n", uid);
+}
+
+void box::output()
+{
+}
+
+void box::check_tabs(int)
+{
+}
+
+int box::is_char()
+{
+  return 0;
+}
+
+int box::left_is_italic()
+{
+  return 0;
+}
+
+int box::right_is_italic()
+{
+  return 0;
+}
+
+void box::hint(unsigned)
+{
+}
+  
+void box::handle_char_type(int, int)
+{
+}
+
+
+box_list::box_list(box *pp)
+{
+  p = new box*[10];
+  for (int i = 0; i < 10; i++)
+    p[i] = 0;
+  maxlen = 10;
+  len = 1;
+  p[0] = pp;
+}
+
+void box_list::append(box *pp)
+{
+  if (len + 1 > maxlen) {
+    box **oldp = p;
+    maxlen *= 2;
+    p = new box*[maxlen];
+    memcpy(p, oldp, sizeof(box*)*len);
+    a_delete oldp;
+  }
+  p[len++] = pp;
+}
+
+box_list::~box_list()
+{
+  for (int i = 0; i < len; i++)
+    delete p[i];
+  a_delete p;
+}
+
+void box_list::list_check_tabs(int level)
+{
+  for (int i = 0; i < len; i++)
+    p[i]->check_tabs(level);
+}
+
+
+pointer_box::pointer_box(box *pp) : p(pp)
+{
+  spacing_type = p->spacing_type;
+}
+
+pointer_box::~pointer_box()
+{
+  delete p;
+}
+
+int pointer_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void pointer_box::compute_subscript_kern()
+{
+  p->compute_subscript_kern();
+  printf(".nr " SUB_KERN_FORMAT " \\n[" SUB_KERN_FORMAT "]\n", uid, p->uid);
+}
+
+void pointer_box::compute_skew()
+{
+  p->compute_skew();
+  printf(".nr " SKEW_FORMAT " 0\\n[" SKEW_FORMAT "]\n",
+	 uid, p->uid);
+}
+
+void pointer_box::check_tabs(int level)
+{
+  p->check_tabs(level);
+}
+
+int simple_box::compute_metrics(int)
+{
+  printf(".nr " WIDTH_FORMAT " 0\\w" DELIMITER_CHAR, uid);
+  output();
+  printf(DELIMITER_CHAR "\n");
+  printf(".nr " HEIGHT_FORMAT " 0>?\\n[rst]\n", uid);
+  printf(".nr " DEPTH_FORMAT " 0-\\n[rsb]>?0\n", uid);
+  printf(".nr " SUB_KERN_FORMAT " 0-\\n[ssc]>?0\n", uid);
+  printf(".nr " SKEW_FORMAT " 0\\n[skw]\n", uid);
+  return FOUND_NOTHING;
+}
+
+void simple_box::compute_subscript_kern()
+{
+  // do nothing, we already computed it in do_metrics
+}
+
+void simple_box::compute_skew()
+{
+  // do nothing, we already computed it in do_metrics
+}
+
+int box::is_simple()
+{
+  return 0;
+}
+
+int simple_box::is_simple()
+{
+  return 1;
+}
+
+quoted_text_box::quoted_text_box(char *s) : text(s)
+{
+}
+
+quoted_text_box::~quoted_text_box()
+{
+  a_delete text;
+}
+
+void quoted_text_box::output()
+{
+  if (text)
+    fputs(text, stdout);
+}
+
+tab_box::tab_box() : disabled(0)
+{
+}
+
+// We treat a tab_box as having width 0 for width computations.
+
+void tab_box::output()
+{
+  if (!disabled)
+    printf("\\t");
+}
+
+void tab_box::check_tabs(int level)
+{
+  if (level > 0) {
+    error("tabs allowed only at outermost level");
+    disabled = 1;
+  }
+}
+
+space_box::space_box()
+{
+  spacing_type = SUPPRESS_TYPE;
+}
+
+void space_box::output()
+{
+  printf("\\h'%dM'", thick_space);
+}
+
+half_space_box::half_space_box()
+{
+  spacing_type = SUPPRESS_TYPE;
+}
+
+void half_space_box::output()
+{
+  printf("\\h'%dM'", thin_space);
+}
+
+void box_list::list_debug_print(const char *sep)
+{
+  p[0]->debug_print();
+  for (int i = 1; i < len; i++) {
+    fprintf(stderr, "%s", sep);
+    p[i]->debug_print();
+  }
+}
+
+void quoted_text_box::debug_print()
+{
+  fprintf(stderr, "\"%s\"", (text ? text : ""));
+}
+
+void half_space_box::debug_print()
+{
+  fprintf(stderr, "^");
+}
+
+void space_box::debug_print()
+{
+  fprintf(stderr, "~");
+}
+
+void tab_box::debug_print()
+{
+  fprintf(stderr, "<tab>");
+}
diff --git a/contrib/groff/src/preproc/eqn/delim.cpp b/contrib/groff/src/preproc/eqn/delim.cpp
new file mode 100644
index 0000000..b724180
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/delim.cpp
@@ -0,0 +1,401 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+enum left_or_right_t { LEFT_DELIM = 01, RIGHT_DELIM = 02 };
+
+// Small must be none-zero and must exist in each device.
+// Small will be put in the roman font, others are assumed to be
+// on the special font (so no font change will be necessary.)
+
+struct delimiter {
+  const char *name;
+  int flags;
+  const char *small;
+  const char *chain_format;
+  const char *ext;
+  const char *top;
+  const char *mid;
+  const char *bot;
+} delim_table[] = {
+  {
+    "(", LEFT_DELIM|RIGHT_DELIM, "(", "\\[parenleft%s]",
+    "\\[parenleftex]",
+    "\\[parenlefttp]",
+    0,
+    "\\[parenleftbt]",
+  },
+  {
+    ")", LEFT_DELIM|RIGHT_DELIM, ")", "\\[parenright%s]",
+    "\\[parenrightex]",
+    "\\[parenrighttp]",
+    0,
+    "\\[parenrightbt]",
+  },
+  {
+    "[", LEFT_DELIM|RIGHT_DELIM, "[", "\\[bracketleft%s]",
+    "\\[bracketleftex]",
+    "\\[bracketlefttp]",
+    0,
+    "\\[bracketleftbt]",
+  },
+  {
+    "]", LEFT_DELIM|RIGHT_DELIM, "]", "\\[bracketright%s]",
+    "\\[bracketrightex]",
+    "\\[bracketrighttp]",
+    0,
+    "\\[bracketrightbt]",
+  },
+  {
+    "{", LEFT_DELIM|RIGHT_DELIM, "{", "\\[braceleft%s]",
+    "\\[braceleftex]",
+    "\\[bracelefttp]",
+    "\\[braceleftmid]",
+    "\\[braceleftbt]",
+  },
+  {
+    "}", LEFT_DELIM|RIGHT_DELIM, "}", "\\[braceright%s]",
+    "\\[bracerightex]",
+    "\\[bracerighttp]",
+    "\\[bracerightmid]",
+    "\\[bracerightbt]",
+  },
+  {
+    "|", LEFT_DELIM|RIGHT_DELIM, "|", "\\[bar%s]",
+    "\\[barex]",
+    0,
+    0,
+    0,
+  },
+  {
+    "floor", LEFT_DELIM, "\\(lf", "\\[floorleft%s]",
+    "\\[bracketleftex]",
+    0,
+    0,
+    "\\[bracketleftbt]",
+  },
+  {
+    "floor", RIGHT_DELIM, "\\(rf", "\\[floorright%s]",
+    "\\[bracketrightex]",
+    0,
+    0,
+    "\\[bracketrightbt]",
+  },
+  {
+    "ceiling", LEFT_DELIM, "\\(lc", "\\[ceilingleft%s]",
+    "\\[bracketleftex]",
+    "\\[bracketlefttp]",
+    0,
+    0,
+  },
+  {
+    "ceiling", RIGHT_DELIM, "\\(rc", "\\[ceilingright%s]",
+    "\\[bracketrightex]",
+    "\\[bracketrighttp]",
+    0,
+    0,
+  },
+  {
+    "||", LEFT_DELIM|RIGHT_DELIM, "|", "\\[bar%s]",
+    "\\[bardblex]",
+    0,
+    0,
+    0,
+  },
+  {
+    "<", LEFT_DELIM|RIGHT_DELIM, "\\(la", "\\[angleleft%s]",
+    0,
+    0,
+    0,
+    0,
+  },
+  {
+    ">", LEFT_DELIM|RIGHT_DELIM, "\\(ra", "\\[angleright%s]",
+    0,
+    0,
+    0,
+    0,
+  },
+  {
+    "uparrow", LEFT_DELIM|RIGHT_DELIM, "\\(ua", "\\[arrowup%s]",
+    "\\[arrowvertex]",
+    "\\[arrowverttp]",
+    0,
+    0,
+  },
+  {
+    "downarrow", LEFT_DELIM|RIGHT_DELIM, "\\(da", "\\[arrowdown%s]",
+    "\\[arrowvertex]",
+    0,
+    0,
+    "\\[arrowvertbt]",
+  },
+  {
+    "updownarrow", LEFT_DELIM|RIGHT_DELIM, "\\(va", "\\[arrowupdown%s]",
+    "\\[arrowvertex]",
+    "\\[arrowverttp]",
+    0,
+    "\\[arrowvertbt]",
+  },
+};
+
+const int DELIM_TABLE_SIZE = int(sizeof(delim_table)/sizeof(delim_table[0]));
+
+class delim_box : public box {
+private:
+  char *left;
+  char *right;
+  box *p;
+public:
+  delim_box(char *, box *, char *);
+  ~delim_box();
+  int compute_metrics(int);
+  void output();
+  void check_tabs(int);
+  void debug_print();
+};
+
+box *make_delim_box(char *l, box *pp, char *r)
+{
+  if (l != 0 && *l == '\0') {
+    a_delete l;
+    l = 0;
+  }
+  if (r != 0 && *r == '\0') {
+    a_delete r;
+    r = 0;
+  }
+  return new delim_box(l, pp, r);
+}
+
+delim_box::delim_box(char *l, box *pp, char *r)
+: left(l), right(r), p(pp)
+{
+}
+
+delim_box::~delim_box()
+{
+  a_delete left;
+  a_delete right;
+  delete p;
+}
+
+static void build_extensible(const char *ext, const char *top, const char *mid,
+			     const char *bot)
+{
+  assert(ext != 0);
+  printf(".nr " DELIM_WIDTH_REG " 0\\w" DELIMITER_CHAR "%s" DELIMITER_CHAR "\n",
+	 ext);
+  printf(".nr " EXT_HEIGHT_REG " 0\\n[rst]\n");
+  printf(".nr " EXT_DEPTH_REG " 0-\\n[rsb]\n");
+  if (top) {
+    printf(".nr " DELIM_WIDTH_REG " 0\\n[" DELIM_WIDTH_REG "]"
+	   ">?\\w" DELIMITER_CHAR "%s" DELIMITER_CHAR "\n",
+	   top);
+    printf(".nr " TOP_HEIGHT_REG " 0\\n[rst]\n");
+    printf(".nr " TOP_DEPTH_REG " 0-\\n[rsb]\n");
+  }
+  if (mid) {
+    printf(".nr " DELIM_WIDTH_REG " 0\\n[" DELIM_WIDTH_REG "]"
+	   ">?\\w" DELIMITER_CHAR "%s" DELIMITER_CHAR "\n",
+	   mid);
+    printf(".nr " MID_HEIGHT_REG " 0\\n[rst]\n");
+    printf(".nr " MID_DEPTH_REG " 0-\\n[rsb]\n");
+  }
+  if (bot) {
+    printf(".nr " DELIM_WIDTH_REG " 0\\n[" DELIM_WIDTH_REG "]"
+	   ">?\\w" DELIMITER_CHAR "%s" DELIMITER_CHAR "\n",
+	   bot);
+    printf(".nr " BOT_HEIGHT_REG " 0\\n[rst]\n");
+    printf(".nr " BOT_DEPTH_REG " 0-\\n[rsb]\n");
+  }
+  printf(".nr " TOTAL_HEIGHT_REG " 0");
+  if (top)
+    printf("+\\n[" TOP_HEIGHT_REG "]+\\n[" TOP_DEPTH_REG "]");
+  if (bot)
+    printf("+\\n[" BOT_HEIGHT_REG "]+\\n[" BOT_DEPTH_REG "]");
+  if (mid)
+    printf("+\\n[" MID_HEIGHT_REG "]+\\n[" MID_DEPTH_REG "]");
+  printf("\n");
+  // determine how many extensible characters we need
+  printf(".nr " TEMP_REG " \\n[" DELTA_REG "]-\\n[" TOTAL_HEIGHT_REG "]");
+  if (mid)
+    printf("/2");
+  printf(">?0+\\n[" EXT_HEIGHT_REG "]+\\n[" EXT_DEPTH_REG "]-1/(\\n["
+	 EXT_HEIGHT_REG "]+\\n[" EXT_DEPTH_REG "])\n");
+  
+  printf(".nr " TOTAL_HEIGHT_REG " +(\\n[" EXT_HEIGHT_REG "]+\\n["
+	 EXT_DEPTH_REG "]*\\n[" TEMP_REG "]");
+  if (mid)
+    printf("*2");
+  printf(")\n");
+  printf(".ds " DELIM_STRING " \\Z" DELIMITER_CHAR
+	 "\\v'-%dM-(\\n[" TOTAL_HEIGHT_REG "]u/2u)'\n",
+	 axis_height);
+  if (top)
+    printf(".as " DELIM_STRING " \\v'\\n[" TOP_HEIGHT_REG "]u'"
+	   "\\Z" DELIMITER_CHAR "%s" DELIMITER_CHAR
+	   "\\v'\\n[" TOP_DEPTH_REG "]u'\n",
+	   top);
+
+  // this macro appends $2 copies of $3 to string $1
+  printf(".de " REPEAT_APPEND_STRING_MACRO "\n"
+	 ".if \\\\$2 \\{.as \\\\$1 \"\\\\$3\n"
+	 "." REPEAT_APPEND_STRING_MACRO " \\\\$1 \\\\$2-1 \"\\\\$3\"\n"
+	 ".\\}\n"
+	 "..\n");
+
+  printf("." REPEAT_APPEND_STRING_MACRO " " DELIM_STRING " \\n[" TEMP_REG "] "
+	 "\\v'\\n[" EXT_HEIGHT_REG "]u'"
+	 "\\Z" DELIMITER_CHAR "%s" DELIMITER_CHAR 
+	 "\\v'\\n[" EXT_DEPTH_REG "]u'\n",
+	 ext);
+
+  if (mid) {
+    printf(".as " DELIM_STRING " \\v'\\n[" MID_HEIGHT_REG "]u'"
+	   "\\Z" DELIMITER_CHAR "%s" DELIMITER_CHAR
+	   "\\v'\\n[" MID_DEPTH_REG "]u'\n",
+	   mid);
+    printf("." REPEAT_APPEND_STRING_MACRO " " DELIM_STRING 
+	   " \\n[" TEMP_REG "] "
+	   "\\v'\\n[" EXT_HEIGHT_REG "]u'"
+	   "\\Z" DELIMITER_CHAR "%s" DELIMITER_CHAR
+	   "\\v'\\n[" EXT_DEPTH_REG "]u'\n",
+	   ext);
+  }
+  if (bot)
+    printf(".as " DELIM_STRING " \\v'\\n[" BOT_HEIGHT_REG "]u'"
+	   "\\Z" DELIMITER_CHAR "%s" DELIMITER_CHAR
+	   "\\v'\\n[" BOT_DEPTH_REG "]u'\n",
+	   bot);
+  printf(".as " DELIM_STRING " " DELIMITER_CHAR "\n");
+}
+
+static void define_extensible_string(char *delim, int uid,
+				     left_or_right_t left_or_right)
+{
+  printf(".ds " DELIM_STRING "\n");
+  delimiter *d = delim_table;
+  int delim_len = strlen(delim);
+  int i;
+  for (i = 0; i < DELIM_TABLE_SIZE; i++, d++)
+    if (strncmp(delim, d->name, delim_len) == 0 
+	&& (left_or_right & d->flags) != 0)
+      break;
+  if (i >= DELIM_TABLE_SIZE) {
+    error("there is no `%1' delimiter", delim);
+    printf(".nr " DELIM_WIDTH_REG " 0\n");
+    return;
+  }
+
+  printf(".nr " DELIM_WIDTH_REG " 0\\w" DELIMITER_CHAR "\\f[%s]%s\\fP" DELIMITER_CHAR "\n"
+	 ".ds " DELIM_STRING " \\Z" DELIMITER_CHAR
+	   "\\v'\\n[rsb]u+\\n[rst]u/2u-%dM'\\f[%s]%s\\fP" DELIMITER_CHAR "\n"
+	 ".nr " TOTAL_HEIGHT_REG " \\n[rst]-\\n[rsb]\n"
+	 ".if \\n[" TOTAL_HEIGHT_REG "]<\\n[" DELTA_REG "] "
+	 "\\{",
+	 current_roman_font, d->small, axis_height,
+	 current_roman_font, d->small);
+	 
+  char buf[256];
+  sprintf(buf, d->chain_format, "\\\\n[" INDEX_REG "]");
+  printf(".nr " INDEX_REG " 0\n"
+	 ".de " TEMP_MACRO "\n"
+	 ".ie c%s \\{\\\n"
+	 ".nr " DELIM_WIDTH_REG " 0\\w" DELIMITER_CHAR "%s" DELIMITER_CHAR "\n"
+	 ".ds " DELIM_STRING " \\Z" DELIMITER_CHAR
+	   "\\v'\\\\n[rsb]u+\\\\n[rst]u/2u-%dM'%s" DELIMITER_CHAR "\n"
+	 ".nr " TOTAL_HEIGHT_REG " \\\\n[rst]-\\\\n[rsb]\n"
+	 ".if \\\\n[" TOTAL_HEIGHT_REG "]<\\n[" DELTA_REG "] "
+	 "\\{.nr " INDEX_REG " +1\n"
+	 "." TEMP_MACRO "\n"
+	 ".\\}\\}\n"
+	 ".el .nr " INDEX_REG " 0-1\n"
+	 "..\n"
+	 "." TEMP_MACRO "\n",
+	 buf, buf, axis_height, buf);
+  if (d->ext) {
+    printf(".if \\n[" INDEX_REG "]<0 \\{.if c%s \\{\\\n", d->ext);
+    build_extensible(d->ext, d->top, d->mid, d->bot);
+    printf(".\\}\\}\n");
+  }
+  printf(".\\}\n");
+  printf(".as " DELIM_STRING " \\h'\\n[" DELIM_WIDTH_REG "]u'\n");
+  printf(".nr " WIDTH_FORMAT " +\\n[" DELIM_WIDTH_REG "]\n", uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]"
+	 ">?(\\n[" TOTAL_HEIGHT_REG "]/2+%dM)\n",
+	 uid, uid, axis_height);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]"
+	 ">?(\\n[" TOTAL_HEIGHT_REG "]/2-%dM)\n",
+	 uid, uid, axis_height);
+}
+
+int delim_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DELTA_REG " \\n[" HEIGHT_FORMAT "]-%dM"
+	 ">?(\\n[" DEPTH_FORMAT "]+%dM)\n",
+	 p->uid, axis_height, p->uid, axis_height);
+  printf(".nr " DELTA_REG " 0\\n[" DELTA_REG "]*%d/500"
+	 ">?(\\n[" DELTA_REG "]*2-%dM)\n",
+	 delimiter_factor, delimiter_shortfall);
+  if (left) {
+    define_extensible_string(left, uid, LEFT_DELIM);
+    printf(".rn " DELIM_STRING " " LEFT_DELIM_STRING_FORMAT "\n",
+	   uid);
+    if (r)
+      printf(".nr " MARK_REG " +\\n[" DELIM_WIDTH_REG "]\n");
+  }
+  if (right) {
+    define_extensible_string(right, uid, RIGHT_DELIM);
+    printf(".rn " DELIM_STRING " " RIGHT_DELIM_STRING_FORMAT "\n",
+	   uid);
+  }
+  return r;
+}
+
+void delim_box::output()
+{
+  if (left)
+    printf("\\*[" LEFT_DELIM_STRING_FORMAT "]", uid);
+  p->output();
+  if (right)
+    printf("\\*[" RIGHT_DELIM_STRING_FORMAT "]", uid);
+}
+
+void delim_box::check_tabs(int level)
+{
+  p->check_tabs(level);
+}
+
+void delim_box::debug_print()
+{
+  fprintf(stderr, "left \"%s\" { ", left ? left : "");
+  p->debug_print();
+  fprintf(stderr, " }");
+  if (right)
+    fprintf(stderr, " right \"%s\"", right);
+}
+
diff --git a/contrib/groff/src/preproc/eqn/eqn.cpp b/contrib/groff/src/preproc/eqn/eqn.cpp
new file mode 100644
index 0000000..2c01ba6
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/eqn.cpp
@@ -0,0 +1,1170 @@
+#ifndef lint
+static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93 (groff)";
+#endif
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+#define yyclearin (yychar=(-1))
+#define yyerrok (yyerrflag=0)
+#define YYRECOVERING (yyerrflag!=0)
+#define YYPREFIX "yy"
+#line 20 "eqn.y"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "lib.h"
+#include "box.h"
+extern int non_empty_flag;
+char *strsave(const char *);
+int yylex();
+void yyerror(const char *);
+#line 32 "eqn.y"
+typedef union {
+	char *str;
+	box *b;
+	pile_box *pb;
+	matrix_box *mb;
+	int n;
+	column *col;
+} YYSTYPE;
+#line 32 "y.tab.c"
+#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
+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,
+};
+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,
+};
+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,
+};
+short yydgoto[] = {                                      31,
+   32,   33,   34,   35,   36,   84,   38,   43,   44,   52,
+   85,   45,   98,   99,  118,  131,
+};
+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,
+};
+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,
+};
+short yygindex[] = {                                      0,
+   -7,  -69,    3,  -66,  458,    9,  -26,   52,   27,  -63,
+  -32,   54,    0,  -35,    2,  -59,
+};
+#define YYTABLESIZE 1865
+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,
+};
+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,
+};
+#define YYFINAL 31
+#ifndef YYDEBUG
+#define YYDEBUG 0
+#endif
+#define YYMAXTOKEN 314
+#if YYDEBUG
+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",
+};
+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 : '}'",
+};
+#endif
+#ifdef YYSTACKSIZE
+#undef YYMAXDEPTH
+#define YYMAXDEPTH YYSTACKSIZE
+#else
+#ifdef YYMAXDEPTH
+#define YYSTACKSIZE YYMAXDEPTH
+#else
+#define YYSTACKSIZE 500
+#define YYMAXDEPTH 500
+#endif
+#endif
+int yydebug;
+int yynerrs;
+int yyerrflag;
+int yychar;
+short *yyssp;
+YYSTYPE *yyvsp;
+YYSTYPE yyval;
+YYSTYPE yylval;
+short yyss[YYSTACKSIZE];
+YYSTYPE yyvs[YYSTACKSIZE];
+#define yystacksize YYSTACKSIZE
+#define YYABORT goto yyabort
+#define YYREJECT goto yyabort
+#define YYACCEPT goto yyaccept
+#define YYERROR goto yyerrlab
+int
+#if defined(__STDC__)
+yyparse(void)
+#else
+yyparse()
+#endif
+{
+    register int yym, yyn, yystate;
+#if YYDEBUG
+    register char *yys;
+    extern char *getenv();
+
+    if (yys = getenv("YYDEBUG"))
+    {
+        yyn = *yys;
+        if (yyn >= '0' && yyn <= '9')
+            yydebug = yyn - '0';
+    }
+#endif
+
+    yynerrs = 0;
+    yyerrflag = 0;
+    yychar = (-1);
+
+    yyssp = yyss;
+    yyvsp = yyvs;
+    *yyssp = yystate = 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 >= yyss + yystacksize - 1)
+        {
+            goto yyoverflow;
+        }
+        *++yyssp = yystate = yytable[yyn];
+        *++yyvsp = yylval;
+        yychar = (-1);
+        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;
+#ifdef lint
+    goto yynewerror;
+#endif
+yynewerror:
+    yyerror("syntax error");
+#ifdef lint
+    goto yyerrlab;
+#endif
+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 >= yyss + yystacksize - 1)
+                {
+                    goto yyoverflow;
+                }
+                *++yyssp = yystate = 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 = (-1);
+        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];
+    yyval = yyvsp[1-yym];
+    switch (yyn)
+    {
+case 2:
+#line 126 "eqn.y"
+{ yyvsp[0].b->top_level(); non_empty_flag = 1; }
+break;
+case 3:
+#line 131 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 4:
+#line 133 "eqn.y"
+{
+		  list_box *lb = yyvsp[-1].b->to_list_box();
+		  if (!lb)
+		    lb = new list_box(yyvsp[-1].b);
+		  lb->append(yyvsp[0].b);
+		  yyval.b = lb;
+		}
+break;
+case 5:
+#line 144 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 6:
+#line 146 "eqn.y"
+{ yyval.b = make_mark_box(yyvsp[0].b); }
+break;
+case 7:
+#line 148 "eqn.y"
+{ yyval.b = make_lineup_box(yyvsp[0].b); }
+break;
+case 8:
+#line 153 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 9:
+#line 155 "eqn.y"
+{ yyval.b = make_limit_box(yyvsp[-2].b, 0, yyvsp[0].b); }
+break;
+case 10:
+#line 157 "eqn.y"
+{ yyval.b = make_limit_box(yyvsp[-2].b, yyvsp[0].b, 0); }
+break;
+case 11:
+#line 159 "eqn.y"
+{ yyval.b = make_limit_box(yyvsp[-4].b, yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 12:
+#line 161 "eqn.y"
+{ yyval.b = make_limit_box(yyvsp[-4].b, make_limit_box(yyvsp[-2].b, yyvsp[0].b, 0), 0); }
+break;
+case 13:
+#line 166 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 14:
+#line 168 "eqn.y"
+{ yyval.b = make_sqrt_box(yyvsp[0].b); }
+break;
+case 15:
+#line 170 "eqn.y"
+{ yyval.b = make_over_box(yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 16:
+#line 172 "eqn.y"
+{ yyval.b = make_small_over_box(yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 17:
+#line 177 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 18:
+#line 179 "eqn.y"
+{ yyval.b = make_script_box(yyvsp[-2].b, 0, yyvsp[0].b); }
+break;
+case 19:
+#line 184 "eqn.y"
+{ yyval.b = yyvsp[0].b; }
+break;
+case 20:
+#line 186 "eqn.y"
+{ yyval.b = make_script_box(yyvsp[-2].b, yyvsp[0].b, 0); }
+break;
+case 21:
+#line 188 "eqn.y"
+{ yyval.b = make_script_box(yyvsp[-4].b, yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 22:
+#line 193 "eqn.y"
+{ yyval.b = split_text(yyvsp[0].str); }
+break;
+case 23:
+#line 195 "eqn.y"
+{ yyval.b = new quoted_text_box(yyvsp[0].str); }
+break;
+case 24:
+#line 197 "eqn.y"
+{ yyval.b = split_text(yyvsp[0].str); }
+break;
+case 25:
+#line 199 "eqn.y"
+{ yyval.b = new quoted_text_box(yyvsp[0].str); }
+break;
+case 26:
+#line 201 "eqn.y"
+{ yyval.b = new half_space_box; }
+break;
+case 27:
+#line 203 "eqn.y"
+{ yyval.b = new space_box; }
+break;
+case 28:
+#line 205 "eqn.y"
+{ yyval.b = new tab_box; }
+break;
+case 29:
+#line 207 "eqn.y"
+{ yyval.b = yyvsp[-1].b; }
+break;
+case 30:
+#line 209 "eqn.y"
+{ yyvsp[0].pb->set_alignment(CENTER_ALIGN); yyval.b = yyvsp[0].pb; }
+break;
+case 31:
+#line 211 "eqn.y"
+{ yyvsp[0].pb->set_alignment(LEFT_ALIGN); yyval.b = yyvsp[0].pb; }
+break;
+case 32:
+#line 213 "eqn.y"
+{ yyvsp[0].pb->set_alignment(RIGHT_ALIGN); yyval.b = yyvsp[0].pb; }
+break;
+case 33:
+#line 215 "eqn.y"
+{ yyvsp[0].pb->set_alignment(CENTER_ALIGN); yyval.b = yyvsp[0].pb; }
+break;
+case 34:
+#line 217 "eqn.y"
+{ yyval.b = yyvsp[-1].mb; }
+break;
+case 35:
+#line 219 "eqn.y"
+{ yyval.b = make_delim_box(yyvsp[-3].str, yyvsp[-2].b, yyvsp[0].str); }
+break;
+case 36:
+#line 221 "eqn.y"
+{ yyval.b = make_delim_box(yyvsp[-1].str, yyvsp[0].b, 0); }
+break;
+case 37:
+#line 223 "eqn.y"
+{ yyval.b = make_overline_box(yyvsp[-1].b); }
+break;
+case 38:
+#line 225 "eqn.y"
+{ yyval.b = make_underline_box(yyvsp[-1].b); }
+break;
+case 39:
+#line 227 "eqn.y"
+{ yyval.b = make_prime_box(yyvsp[-1].b); }
+break;
+case 40:
+#line 229 "eqn.y"
+{ yyval.b = make_accent_box(yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 41:
+#line 231 "eqn.y"
+{ yyval.b = make_uaccent_box(yyvsp[-2].b, yyvsp[0].b); }
+break;
+case 42:
+#line 233 "eqn.y"
+{ yyval.b = new font_box(strsave(get_grfont()), yyvsp[0].b); }
+break;
+case 43:
+#line 235 "eqn.y"
+{ yyval.b = new font_box(strsave(get_gbfont()), yyvsp[0].b); }
+break;
+case 44:
+#line 237 "eqn.y"
+{ yyval.b = new font_box(strsave(get_gfont()), yyvsp[0].b); }
+break;
+case 45:
+#line 239 "eqn.y"
+{ yyval.b = new fat_box(yyvsp[0].b); }
+break;
+case 46:
+#line 241 "eqn.y"
+{ yyval.b = new font_box(yyvsp[-1].str, yyvsp[0].b); }
+break;
+case 47:
+#line 243 "eqn.y"
+{ yyval.b = new size_box(yyvsp[-1].str, yyvsp[0].b); }
+break;
+case 48:
+#line 245 "eqn.y"
+{ yyval.b = new hmotion_box(yyvsp[-1].n, yyvsp[0].b); }
+break;
+case 49:
+#line 247 "eqn.y"
+{ yyval.b = new hmotion_box(-yyvsp[-1].n, yyvsp[0].b); }
+break;
+case 50:
+#line 249 "eqn.y"
+{ yyval.b = new vmotion_box(yyvsp[-1].n, yyvsp[0].b); }
+break;
+case 51:
+#line 251 "eqn.y"
+{ yyval.b = new vmotion_box(-yyvsp[-1].n, yyvsp[0].b); }
+break;
+case 52:
+#line 253 "eqn.y"
+{ yyvsp[0].b->set_spacing_type(yyvsp[-1].str); yyval.b = yyvsp[0].b; }
+break;
+case 53:
+#line 255 "eqn.y"
+{ yyval.b = new vcenter_box(yyvsp[0].b); }
+break;
+case 54:
+#line 257 "eqn.y"
+{ yyval.b = make_special_box(yyvsp[-1].str, yyvsp[0].b); }
+break;
+case 55:
+#line 262 "eqn.y"
+{
+		  int n;
+		  if (sscanf(yyvsp[0].str, "%d", &n) == 1)
+		    yyval.n = n;
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 56:
+#line 272 "eqn.y"
+{ yyval.pb = new pile_box(yyvsp[0].b); }
+break;
+case 57:
+#line 274 "eqn.y"
+{ yyvsp[-2].pb->append(yyvsp[0].b); yyval.pb = yyvsp[-2].pb; }
+break;
+case 58:
+#line 279 "eqn.y"
+{ yyval.pb = yyvsp[-1].pb; }
+break;
+case 59:
+#line 281 "eqn.y"
+{ yyvsp[-1].pb->set_space(yyvsp[-3].n); yyval.pb = yyvsp[-1].pb; }
+break;
+case 60:
+#line 286 "eqn.y"
+{ yyval.mb = new matrix_box(yyvsp[0].col); }
+break;
+case 61:
+#line 288 "eqn.y"
+{ yyvsp[-1].mb->append(yyvsp[0].col); yyval.mb = yyvsp[-1].mb; }
+break;
+case 62:
+#line 293 "eqn.y"
+{ yyval.col = new column(yyvsp[0].b); }
+break;
+case 63:
+#line 295 "eqn.y"
+{ yyvsp[-2].col->append(yyvsp[0].b); yyval.col = yyvsp[-2].col; }
+break;
+case 64:
+#line 300 "eqn.y"
+{ yyval.col = yyvsp[-1].col; }
+break;
+case 65:
+#line 302 "eqn.y"
+{ yyvsp[-1].col->set_space(yyvsp[-3].n); yyval.col = yyvsp[-1].col; }
+break;
+case 66:
+#line 307 "eqn.y"
+{ yyvsp[0].col->set_alignment(CENTER_ALIGN); yyval.col = yyvsp[0].col; }
+break;
+case 67:
+#line 309 "eqn.y"
+{ yyvsp[0].col->set_alignment(LEFT_ALIGN); yyval.col = yyvsp[0].col; }
+break;
+case 68:
+#line 311 "eqn.y"
+{ yyvsp[0].col->set_alignment(RIGHT_ALIGN); yyval.col = yyvsp[0].col; }
+break;
+case 69:
+#line 313 "eqn.y"
+{ yyvsp[0].col->set_alignment(CENTER_ALIGN); yyval.col = yyvsp[0].col; }
+break;
+case 70:
+#line 317 "eqn.y"
+{ yyval.str = yyvsp[0].str; }
+break;
+case 71:
+#line 319 "eqn.y"
+{ yyval.str = yyvsp[0].str; }
+break;
+case 72:
+#line 324 "eqn.y"
+{ yyval.str = yyvsp[0].str; }
+break;
+case 73:
+#line 326 "eqn.y"
+{ yyval.str = strsave("{"); }
+break;
+case 74:
+#line 328 "eqn.y"
+{ yyval.str = strsave("}"); }
+break;
+#line 1115 "y.tab.c"
+    }
+    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 >= yyss + yystacksize - 1)
+    {
+        goto yyoverflow;
+    }
+    *++yyssp = yystate;
+    *++yyvsp = yyval;
+    goto yyloop;
+yyoverflow:
+    yyerror("yacc stack overflow");
+yyabort:
+    return (1);
+yyaccept:
+    return (0);
+}
diff --git a/contrib/groff/src/preproc/eqn/lex.cpp b/contrib/groff/src/preproc/eqn/lex.cpp
new file mode 100644
index 0000000..abc07c9
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/lex.cpp
@@ -0,0 +1,1166 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "eqn_tab.h"
+#include "stringclass.h"
+#include "ptable.h"
+
+struct definition {
+  char is_macro;
+  char is_simple;
+  union {
+    int tok;
+    char *contents;
+  };
+  definition();
+  ~definition();
+};
+
+definition::definition() : is_macro(1), is_simple(0)
+{
+  contents = 0;
+}
+
+definition::~definition()
+{
+  if (is_macro)
+    a_delete contents;
+}
+
+declare_ptable(definition)
+implement_ptable(definition)
+
+PTABLE(definition) macro_table;
+
+static struct {
+  const char *name;
+  int token;
+} token_table[] = {
+  { "over", OVER },
+  { "smallover", SMALLOVER },
+  { "sqrt", SQRT },
+  { "sub", SUB },
+  { "sup", SUP },
+  { "lpile", LPILE },
+  { "rpile", RPILE },
+  { "cpile", CPILE },
+  { "pile", PILE },
+  { "left", LEFT },
+  { "right", RIGHT },
+  { "to", TO },
+  { "from", FROM },
+  { "size", SIZE },
+  { "font", FONT },
+  { "roman", ROMAN },
+  { "bold", BOLD },
+  { "italic", ITALIC },
+  { "fat", FAT },
+  { "bar", BAR },
+  { "under", UNDER },
+  { "accent", ACCENT },
+  { "uaccent", UACCENT },
+  { "above", ABOVE },
+  { "fwd", FWD },
+  { "back", BACK },
+  { "down", DOWN },
+  { "up", UP },
+  { "matrix", MATRIX },
+  { "col", COL },
+  { "lcol", LCOL },
+  { "rcol", RCOL },
+  { "ccol", CCOL },
+  { "mark", MARK },
+  { "lineup", LINEUP },
+  { "space", SPACE },
+  { "gfont", GFONT },
+  { "gsize", GSIZE },
+  { "define", DEFINE },
+  { "sdefine", SDEFINE },
+  { "ndefine", NDEFINE },
+  { "tdefine", TDEFINE },
+  { "undef", UNDEF },
+  { "ifdef", IFDEF },
+  { "include", INCLUDE },
+  { "copy", INCLUDE },
+  { "delim", DELIM },
+  { "chartype", CHARTYPE },
+  { "type", TYPE },
+  { "vcenter", VCENTER },
+  { "set", SET },
+  { "opprime", PRIME },
+  { "grfont", GRFONT },
+  { "gbfont", GBFONT },
+  { "split", SPLIT },
+  { "nosplit", NOSPLIT },
+  { "special", SPECIAL },
+};
+
+static struct {
+  const char *name;
+  const char *def;
+} def_table[] = {
+  { "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" },
+  { "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" },
+  { "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" },
+  { "max", "{type \"operator\" roman \"max\"}" },
+  { "min", "{type \"operator\" roman \"min\"}" },
+  { "lim", "{type \"operator\" roman \"lim\"}" },
+  { "sin", "{type \"operator\" roman \"sin\"}" },
+  { "cos", "{type \"operator\" roman \"cos\"}" },
+  { "tan", "{type \"operator\" roman \"tan\"}" },
+  { "sinh", "{type \"operator\" roman \"sinh\"}" },
+  { "cosh", "{type \"operator\" roman \"cosh\"}" },
+  { "tanh", "{type \"operator\" roman \"tanh\"}" },
+  { "arc", "{type \"operator\" roman \"arc\"}" },
+  { "log", "{type \"operator\" roman \"log\"}" },
+  { "ln", "{type \"operator\" roman \"ln\"}" },
+  { "exp", "{type \"operator\" roman \"exp\"}" },
+  { "Re", "{type \"operator\" roman \"Re\"}" },
+  { "Im", "{type \"operator\" roman \"Im\"}" },
+  { "det", "{type \"operator\" roman \"det\"}" },
+  { "and", "{roman \"and\"}" },
+  { "if", "{roman \"if\"}" },
+  { "for", "{roman \"for\"}" },
+  { "sum", "{type \"operator\" vcenter size +5 \\(*S}" },
+  { "prod", "{type \"operator\" vcenter size +5 \\(*P}" },
+  { "int", "{type \"operator\" vcenter size +8 \\(is}" },
+  { "union", "{type \"operator\" vcenter size +5 \\(cu}" },
+  { "inter", "{type \"operator\" vcenter size +5 \\(ca}" },
+  { "times", "type \"binary\" \\(mu" },
+  { "ldots", "type \"inner\" { . . . }" },
+  { "inf", "\\(if" },
+  { "partial", "\\(pd" },
+  { "nothing", "\"\"" },
+  { "half", "{1 smallover 2}" },
+  { "hat_def", "roman \"^\"" },
+  { "hat", "accent { hat_def }" },
+  { "dot_def", "back 15 \"\\v'-52M'.\\v'52M'\"" },
+  { "dot", "accent { dot_def }" },
+  { "dotdot_def", "back 25 \"\\v'-52M'..\\v'52M'\"" },
+  { "dotdot", "accent { dotdot_def }" },
+  { "tilde_def", "\"~\"" },
+  { "tilde", "accent { tilde_def }" },
+  { "utilde_def", "\"\\v'75M'~\\v'-75M'\"" },
+  { "utilde", "uaccent { utilde_def }" },
+  { "vec_def", "up 52 size -5 \\(->" },
+  { "vec", "accent { vec_def }" },
+  { "dyad_def", "up 52 size -5 {\\(<- back 60 \\(->}" },
+  { "dyad", "accent { dyad_def }" },
+  { "==", "type \"relation\" \\(==" },
+  { "!=", "type \"relation\" \\(!=" },
+  { "+-", "type \"binary\" \\(+-" },
+  { "->", "type \"relation\" \\(->" },
+  { "<-", "type \"relation\" \\(<-" },
+  { "<<", "{ < back 20 < }" },
+  { ">>", "{ > back 20 > }" },
+  { "...", "type \"inner\" vcenter { . . . }" },
+  { "prime", "'" },
+  { "approx", "type \"relation\" \"\\(~=\"" },
+  { "grad", "\\(gr" },
+  { "del", "\\(gr" },
+  { "cdot", "type \"binary\" vcenter ." },
+  { "dollar", "$" },
+};  
+
+void init_table(const char *device)
+{
+  unsigned int i;
+  for (i = 0; i < sizeof(token_table)/sizeof(token_table[0]); i++) {
+    definition *def = new definition[1];
+    def->is_macro = 0;
+    def->tok = token_table[i].token;
+    macro_table.define(token_table[i].name, def);
+  }
+  for (i = 0; i < sizeof(def_table)/sizeof(def_table[0]); i++) {
+    definition *def = new definition[1];
+    def->is_macro = 1;
+    def->contents = strsave(def_table[i].def);
+    def->is_simple = 1;
+    macro_table.define(def_table[i].name, def);
+  }
+  definition *def = new definition[1];
+  def->is_macro = 1;
+  def->contents = strsave("1");
+  macro_table.define(device, def);
+}
+
+class input {
+  input *next;
+public:
+  input(input *p);
+  virtual ~input();
+  virtual int get() = 0;
+  virtual int peek() = 0;
+  virtual int get_location(char **, int *);
+
+  friend int get_char();
+  friend int peek_char();
+  friend int get_location(char **, int *);
+  friend void init_lex(const char *str, const char *filename, int lineno);
+};
+
+class file_input : public input {
+  FILE *fp;
+  char *filename;
+  int lineno;
+  string line;
+  const char *ptr;
+  int read_line();
+public:
+  file_input(FILE *, const char *, input *);
+  ~file_input();
+  int get();
+  int peek();
+  int get_location(char **, int *);
+};
+
+
+class macro_input : public input {
+  char *s;
+  char *p;
+public:
+  macro_input(const char *, input *);
+  ~macro_input();
+  int get();
+  int peek();
+};
+
+class top_input : public macro_input {
+  char *filename;
+  int lineno;
+ public:
+  top_input(const char *, const char *, int, input *);
+  ~top_input();
+  int get();
+  int get_location(char **, int *);
+};
+
+class argument_macro_input: public input {
+  char *s;
+  char *p;
+  char *ap;
+  int argc;
+  char *argv[9];
+public:
+  argument_macro_input(const char *, int, char **, input *);
+  ~argument_macro_input();
+  int get();
+  int peek();
+};
+
+input::input(input *x) : next(x)
+{
+}
+
+input::~input()
+{
+}
+
+int input::get_location(char **, int *)
+{
+  return 0;
+}
+
+file_input::file_input(FILE *f, const char *fn, input *p)
+: input(p), lineno(0), ptr("")
+{
+  fp = f;
+  filename = strsave(fn);
+}
+
+file_input::~file_input()
+{
+  a_delete filename;
+  fclose(fp);
+}
+
+int file_input::read_line()
+{
+  for (;;) {
+    line.clear();
+    lineno++;
+    for (;;) {
+      int c = getc(fp);
+      if (c == EOF)
+	break;
+      else if (invalid_input_char(c))
+	lex_error("invalid input character code %1", c);
+      else {
+	line += char(c);
+	if (c == '\n') 
+	  break;
+      }
+    }
+    if (line.length() == 0)
+      return 0;
+    if (!(line.length() >= 3 && line[0] == '.' && line[1] == 'E'
+	  && (line[2] == 'Q' || line[2] == 'N')
+	  && (line.length() == 3 || line[3] == ' ' || line[3] == '\n'
+	      || compatible_flag))) {
+      line += '\0';
+      ptr = line.contents();
+      return 1;
+    }
+  }
+}
+
+int file_input::get()
+{
+  if (*ptr != '\0' || read_line())
+    return *ptr++ & 0377;
+  else
+    return EOF;
+}
+
+int file_input::peek()
+{
+  if (*ptr != '\0' || read_line())
+    return *ptr;
+  else
+    return EOF;
+}
+
+int file_input::get_location(char **fnp, int *lnp)
+{
+  *fnp = filename;
+  *lnp = lineno;
+  return 1;
+}
+
+macro_input::macro_input(const char *str, input *x) : input(x)
+{
+  p = s = strsave(str);
+}
+
+macro_input::~macro_input()
+{
+  a_delete s;
+}
+
+int macro_input::get()
+{
+  if (p == 0 || *p == '\0')
+    return EOF;
+  else
+    return *p++ & 0377;
+}
+
+int macro_input::peek()
+{
+  if (p == 0 || *p == '\0')
+    return EOF;
+  else
+    return *p & 0377;
+}
+
+top_input::top_input(const char *str, const char *fn, int ln, input *x)
+: macro_input(str, x), lineno(ln)
+{
+  filename = strsave(fn);
+}
+
+top_input::~top_input()
+{
+  a_delete filename;
+}
+
+int top_input::get()
+{
+  int c = macro_input::get();
+  if (c == '\n')
+    lineno++;
+  return c;
+}
+
+int top_input::get_location(char **fnp, int *lnp)
+{
+  *fnp = filename;
+  *lnp = lineno;
+  return 1;
+}
+
+// Character representing $1.  Must be invalid input character.
+#define ARG1 14
+
+argument_macro_input::argument_macro_input(const char *body, int ac, 
+					   char **av, input *x)
+: input(x), ap(0), argc(ac)
+{
+  int i;
+  for (i = 0; i < argc; i++)
+    argv[i] = av[i];
+  p = s = strsave(body);
+  int j = 0;
+  for (i = 0; s[i] != '\0'; i++)
+    if (s[i] == '$' && s[i+1] >= '0' && s[i+1] <= '9') {
+      if (s[i+1] != '0')
+	s[j++] = ARG1 + s[++i] - '1';
+    }
+    else
+      s[j++] = s[i];
+  s[j] = '\0';
+}
+
+
+argument_macro_input::~argument_macro_input()
+{
+  for (int i = 0; i < argc; i++)
+    a_delete argv[i];
+  a_delete s;
+}
+
+int argument_macro_input::get()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return *ap++ & 0377;
+    ap = 0;
+  }
+  if (p == 0)
+    return EOF;
+  while (*p >= ARG1 && *p <= ARG1 + 8) {
+    int i = *p++ - ARG1;
+    if (i < argc && argv[i] != 0 && argv[i][0] != '\0') {
+      ap = argv[i];
+      return *ap++ & 0377;
+    }
+  }
+  if (*p == '\0')
+    return EOF;
+  return *p++ & 0377;
+}
+
+int argument_macro_input::peek()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return *ap & 0377;
+    ap = 0;
+  }
+  if (p == 0)
+    return EOF;
+  while (*p >= ARG1 && *p <= ARG1 + 8) {
+    int i = *p++ - ARG1;
+    if (i < argc && argv[i] != 0 && argv[i][0] != '\0') {
+      ap = argv[i];
+      return *ap & 0377;
+    }
+  }
+  if (*p == '\0')
+    return EOF;
+  return *p & 0377;
+}
+
+static input *current_input = 0;
+
+/* we insert a newline between input from different levels */
+
+int get_char()
+{
+  if (current_input == 0)
+    return EOF;
+  else {
+    int c = current_input->get();
+    if (c != EOF)
+      return c;
+    else {
+      input *tem = current_input;
+      current_input = current_input->next;
+      delete tem;
+      return '\n';
+    }
+  }
+}
+
+int peek_char()
+{
+  if (current_input == 0)
+    return EOF;
+  else {
+    int c = current_input->peek();
+    if (c != EOF)
+      return c;
+    else
+      return '\n';
+  }
+}
+
+int get_location(char **fnp, int *lnp)
+{
+  for (input *p = current_input; p; p = p->next)
+    if (p->get_location(fnp, lnp))
+      return 1;
+  return 0;
+}
+
+string token_buffer;
+const int NCONTEXT = 4;
+string context_ring[NCONTEXT];
+int context_index = 0;
+
+void flush_context()
+{
+  for (int i = 0; i < NCONTEXT; i++)
+    context_ring[i] = "";
+  context_index = 0;
+}
+
+void show_context()
+{
+  int i = context_index;
+  fputs(" context is\n\t", stderr);
+  for (;;) {
+    int j = (i + 1) % NCONTEXT;
+    if (j == context_index) {
+      fputs(">>> ", stderr);
+      put_string(context_ring[i], stderr);
+      fputs(" <<<", stderr);
+      break;
+    }
+    else if (context_ring[i].length() > 0) {
+      put_string(context_ring[i], stderr);
+      putc(' ', stderr);
+    }
+    i = j;
+  }
+  putc('\n', stderr);
+}
+
+void add_context(const string &s)
+{
+  context_ring[context_index] = s;
+  context_index = (context_index + 1) % NCONTEXT;
+}
+
+void add_context(char c)
+{
+  context_ring[context_index] = c;
+  context_index = (context_index + 1) % NCONTEXT;
+}
+
+void add_quoted_context(const string &s)
+{
+  string &r = context_ring[context_index];
+  r = '"';
+  for (int i = 0; i < s.length(); i++)
+    if (s[i] == '"')
+      r += "\\\"";
+    else
+      r += s[i];
+  r += '"';
+  context_index = (context_index + 1) % NCONTEXT;
+}
+
+void init_lex(const char *str, const char *filename, int lineno)
+{
+ while (current_input != 0) {
+    input *tem = current_input;
+    current_input = current_input->next;
+    delete tem;
+  }
+  current_input = new top_input(str, filename, lineno, 0);
+  flush_context();
+}
+
+
+void get_delimited_text()
+{
+  char *filename;
+  int lineno;
+  int got_location = get_location(&filename, &lineno);
+  int start = get_char();
+  while (start == ' ' || start == '\t' || start == '\n')
+    start = get_char();
+  token_buffer.clear();
+  if (start == EOF) {
+    if (got_location)
+      error_with_file_and_line(filename, lineno,
+			       "end of input while defining macro");
+    else
+      error("end of input while defining macro");
+    return;
+  }
+  for (;;) {
+    int c = get_char();
+    if (c == EOF) {
+      if (got_location)
+	error_with_file_and_line(filename, lineno,
+				 "end of input while defining macro");
+      else
+	error("end of input while defining macro");
+      add_context(start + token_buffer);
+      return;
+    }
+    if (c == start)
+      break;
+    token_buffer += char(c);
+  }
+  add_context(start + token_buffer + start);
+}
+
+void interpolate_macro_with_args(const char *body)
+{
+  char *argv[9];
+  int argc = 0;
+  int i;
+  for (i = 0; i < 9; i++)
+    argv[i] = 0;
+  int level = 0;
+  int c;
+  do {
+    token_buffer.clear();
+    for (;;) {
+      c = get_char();
+      if (c == EOF) {
+	lex_error("end of input while scanning macro arguments");
+	break;
+      }
+      if (level == 0 && (c == ',' || c == ')')) {
+	if (token_buffer.length() > 0) {
+	  token_buffer +=  '\0';
+	  argv[argc] = strsave(token_buffer.contents());
+	}
+	// for `foo()', argc = 0
+	if (argc > 0 || c != ')' || i > 0)
+	  argc++;
+	break;
+      }
+      token_buffer += char(c);
+      if (c == '(')
+	level++;
+      else if (c == ')')
+	level--;
+    }
+  } while (c != ')' && c != EOF);
+  current_input = new argument_macro_input(body, argc, argv, current_input);
+}
+
+/* If lookup flag is non-zero the token will be looked up to see
+if it is macro. If it's 1, it will looked up to see if it's a token.
+*/
+
+int get_token(int lookup_flag = 0)
+{
+  for (;;) {
+    int c = get_char();
+    while (c == ' ' || c == '\n')
+      c = get_char();
+    switch (c) {
+    case EOF:
+      {
+	add_context("end of input");
+      }
+      return 0;
+    case '"':
+      {
+	int quoted = 0;
+	token_buffer.clear();
+	for (;;) {
+	  c = get_char();
+	  if (c == EOF) {
+	    lex_error("missing \"");
+	    break;
+	  }
+	  else if (c == '\n') {
+	    lex_error("newline before end of quoted text");
+	    break;
+	  }
+	  else if (c == '"') {
+	    if (!quoted)
+	      break;
+	    token_buffer[token_buffer.length() - 1] = '"';
+	    quoted = 0;
+	  }
+	  else {
+	    token_buffer += c;
+	    quoted = quoted ? 0 : c == '\\';
+	  }
+	}
+      }
+      add_quoted_context(token_buffer);
+      return QUOTED_TEXT;
+    case '{':
+    case '}':
+    case '^':
+    case '~':
+    case '\t':
+      add_context(c);
+      return c;
+    default:
+      {
+	int break_flag = 0;
+	int quoted = 0;
+	token_buffer.clear();
+	if (c == '\\')
+	  quoted = 1;
+	else
+	  token_buffer += c;
+	int done = 0;
+	while (!done) {
+	  c = peek_char();
+	  if (!quoted && lookup_flag != 0 && c == '(') {
+	    token_buffer += '\0';
+	    definition *def = macro_table.lookup(token_buffer.contents());
+	    if (def && def->is_macro && !def->is_simple) {
+	      (void)get_char();	// skip initial '('
+	      interpolate_macro_with_args(def->contents);
+	      break_flag = 1;
+	      break;
+	    }
+	    token_buffer.set_length(token_buffer.length() - 1);
+	  }
+	  if (quoted) {
+	    quoted = 0;
+	    switch (c) {
+	    case EOF:
+	      lex_error("`\\' ignored at end of equation");
+	      done = 1;
+	      break;
+	    case '\n':
+	      lex_error("`\\' ignored because followed by newline");
+	      done = 1;
+	      break;
+	    case '\t':
+	      lex_error("`\\' ignored because followed by tab");
+	      done = 1;
+	      break;
+	    case '"':
+	      (void)get_char();
+	      token_buffer += '"';
+	      break;
+	    default:
+	      (void)get_char();
+	      token_buffer += '\\';
+	      token_buffer += c;
+	      break;
+	    }
+	  }
+	  else {
+	    switch (c) {
+	    case EOF:
+	    case '{':
+	    case '}':
+	    case '^':
+	    case '~':
+	    case '"':
+	    case ' ':
+	    case '\t':
+	    case '\n':
+	      done = 1;
+	      break;
+	    case '\\':
+	      (void)get_char();
+	      quoted = 1;
+	      break;
+	    default:
+	      (void)get_char();
+	      token_buffer += char(c);
+	      break;
+	    }
+	  }
+	}
+	if (break_flag || token_buffer.length() == 0)
+	  break;
+	if (lookup_flag != 0) {
+	  token_buffer += '\0';
+	  definition *def = macro_table.lookup(token_buffer.contents());
+	  token_buffer.set_length(token_buffer.length() - 1);
+	  if (def) {
+	    if (def->is_macro) {
+	      current_input = new macro_input(def->contents, current_input);
+	      break;
+	    }
+	    else if (lookup_flag == 1) {
+	      add_context(token_buffer);
+	      return def->tok;
+	    }
+	  }
+	}
+	add_context(token_buffer);
+	return TEXT;
+      }
+    }
+  }
+}
+
+void do_include()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad filename for include");
+    return;
+  }
+  token_buffer += '\0';
+  const char *filename = token_buffer.contents();
+  errno = 0;
+  FILE *fp = fopen(filename, "r");
+  if (fp == 0) {
+    lex_error("can't open included file `%1'", filename);
+    return;
+  }
+  current_input = new file_input(fp, filename, current_input);
+}
+
+void ignore_definition()
+{
+  int t = get_token();
+  if (t != TEXT) {
+    lex_error("bad definition");
+    return;
+  }
+  get_delimited_text();
+}
+
+void do_definition(int is_simple)
+{
+  int t = get_token();
+  if (t != TEXT) {
+    lex_error("bad definition");
+    return;
+  }
+  token_buffer += '\0';
+  const char *name = token_buffer.contents();
+  definition *def = macro_table.lookup(name);
+  if (def == 0) {
+    def = new definition[1];
+    macro_table.define(name, def);
+  }
+  else if (def->is_macro) {
+    a_delete def->contents;
+  }
+  get_delimited_text();
+  token_buffer += '\0';
+  def->is_macro = 1;
+  def->contents = strsave(token_buffer.contents());
+  def->is_simple = is_simple;
+}
+
+void do_undef()
+{
+  int t = get_token();
+  if (t != TEXT) {
+    lex_error("bad undef command");
+    return;
+  }
+  token_buffer += '\0';
+  macro_table.define(token_buffer.contents(), 0);
+}
+
+void do_gsize()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad argument to gsize command");
+    return;
+  }
+  token_buffer += '\0';
+  if (!set_gsize(token_buffer.contents()))
+    lex_error("invalid size `%1'", token_buffer.contents());
+}
+
+void do_gfont()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad argument to gfont command");
+    return;
+  }
+  token_buffer += '\0';
+  set_gfont(token_buffer.contents());
+}
+
+void do_grfont()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad argument to grfont command");
+    return;
+  }
+  token_buffer += '\0';
+  set_grfont(token_buffer.contents());
+}
+
+void do_gbfont()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad argument to gbfont command");
+    return;
+  }
+  token_buffer += '\0';
+  set_gbfont(token_buffer.contents());
+}
+
+void do_space()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad argument to space command");
+    return;
+  }
+  token_buffer += '\0';
+  char *ptr;
+  long n = strtol(token_buffer.contents(), &ptr, 10);
+  if (n == 0 && ptr == token_buffer.contents())
+    lex_error("bad argument `%1' to space command", token_buffer.contents());
+  else
+    set_space(int(n));
+}
+
+void do_ifdef()
+{
+  int t = get_token();
+  if (t != TEXT) {
+    lex_error("bad ifdef");
+    return;
+  }
+  token_buffer += '\0';
+  definition *def = macro_table.lookup(token_buffer.contents());
+  int result = def && def->is_macro && !def->is_simple;
+  get_delimited_text();
+  if (result) {
+    token_buffer += '\0';
+    current_input = new macro_input(token_buffer.contents(), current_input);
+  }
+}
+
+void do_delim()
+{
+  int c = get_char();
+  while (c == ' ' || c == '\n')
+    c = get_char();
+  int d;
+  if (c == EOF || (d = get_char()) == EOF)
+    lex_error("end of file while reading argument to `delim'");
+  else {
+    if (c == 'o' && d == 'f' && peek_char() == 'f') {
+      (void)get_char();
+      start_delim = end_delim = '\0';
+    }
+    else {
+      start_delim = c;
+      end_delim = d;
+    }
+  }
+}
+
+void do_chartype()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad chartype");
+    return;
+  }
+  token_buffer += '\0';
+  string type = token_buffer;
+  t = get_token();
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad chartype");
+    return;
+  }
+  token_buffer += '\0';
+  set_char_type(type.contents(), strsave(token_buffer.contents()));
+}
+
+void do_set()
+{
+  int t = get_token(2);
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad set");
+    return;
+  }
+  token_buffer += '\0';
+  string param = token_buffer;
+  t = get_token();
+  if (t != TEXT && t != QUOTED_TEXT) {
+    lex_error("bad set");
+    return;
+  }
+  token_buffer += '\0';
+  int n;
+  if (sscanf(&token_buffer[0], "%d", &n) != 1) {
+    lex_error("bad number `%1'", token_buffer.contents());
+    return;
+  }
+  set_param(param.contents(), n);
+}
+
+int yylex()
+{
+  for (;;) {
+    int tk = get_token(1);
+    switch(tk) {
+    case UNDEF:
+      do_undef();
+      break;
+    case SDEFINE:
+      do_definition(1);
+      break;
+    case DEFINE:
+      do_definition(0);
+      break;
+    case TDEFINE:
+      if (!nroff)
+	do_definition(0);
+      else
+	ignore_definition();
+      break;
+    case NDEFINE:
+      if (nroff)
+	do_definition(0);
+      else
+	ignore_definition();
+      break;
+    case GSIZE:
+      do_gsize();
+      break;
+    case GFONT:
+      do_gfont();
+      break;
+    case GRFONT:
+      do_grfont();
+      break;
+    case GBFONT:
+      do_gbfont();
+      break;
+    case SPACE:
+      do_space();
+      break;
+    case INCLUDE:
+      do_include();
+      break;
+    case IFDEF:
+      do_ifdef();
+      break;
+    case DELIM:
+      do_delim();
+      break;
+    case CHARTYPE:
+      do_chartype();
+      break;
+    case SET:
+      do_set();
+      break;
+    case QUOTED_TEXT:
+    case TEXT:
+      token_buffer += '\0';
+      yylval.str = strsave(token_buffer.contents());
+      // fall through
+    default:
+      return tk;
+    }
+  }
+}
+
+void lex_error(const char *message,
+	       const errarg &arg1,
+	       const errarg &arg2,
+	       const errarg &arg3)
+{
+  char *filename;
+  int lineno;
+  if (!get_location(&filename, &lineno))
+    error(message, arg1, arg2, arg3);
+  else
+    error_with_file_and_line(filename, lineno, message, arg1, arg2, arg3);
+}
+
+void yyerror(const char *s)
+{
+  char *filename;
+  int lineno;
+  if (!get_location(&filename, &lineno))
+    error(s);
+  else
+    error_with_file_and_line(filename, lineno, s);
+  show_context();
+}
+
diff --git a/contrib/groff/src/preproc/eqn/limit.cpp b/contrib/groff/src/preproc/eqn/limit.cpp
new file mode 100644
index 0000000..c8b5587
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/limit.cpp
@@ -0,0 +1,195 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+class limit_box : public box {
+private:
+  box *p;
+  box *from;
+  box *to;
+public:
+  limit_box(box *, box *, box *);
+  ~limit_box();
+  int compute_metrics(int);
+  void output();
+  void debug_print();
+  void check_tabs(int);
+};
+
+box *make_limit_box(box *pp, box *qq, box *rr)
+{
+  return new limit_box(pp, qq, rr);
+}
+
+limit_box::limit_box(box *pp, box *qq, box *rr)
+: p(pp), from(qq), to(rr)
+{
+  spacing_type = p->spacing_type;
+}
+
+limit_box::~limit_box()
+{
+  delete p;
+  delete from;
+  delete to;
+}
+
+int limit_box::compute_metrics(int style)
+{
+  printf(".nr " SIZE_FORMAT " \\n[.ps]\n", uid);
+  if (!(style <= SCRIPT_STYLE && one_size_reduction_flag))
+    set_script_size();
+  printf(".nr " SMALL_SIZE_FORMAT " \\n[.ps]\n", uid);
+  int res = 0;
+  int mark_uid = -1;
+  if (from != 0) {
+    res = from->compute_metrics(cramped_style(script_style(style)));
+    if (res)
+      mark_uid = from->uid;
+  }
+  if (to != 0) {
+    int r = to->compute_metrics(script_style(style));
+    if (res && r)
+      error("multiple marks and lineups");
+    else  {
+      mark_uid = to->uid;
+      res = r;
+    }
+  }
+  printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  int r = p->compute_metrics(style);
+  p->compute_subscript_kern();
+  if (res && r)
+    error("multiple marks and lineups");
+  else {
+    mark_uid = p->uid;
+    res = r;
+  }
+  printf(".nr " LEFT_WIDTH_FORMAT " "
+	 "0\\n[" WIDTH_FORMAT "]",
+	 uid, p->uid);
+  if (from != 0)
+    printf(">?(\\n[" SUB_KERN_FORMAT "]+\\n[" WIDTH_FORMAT "])",
+	   p->uid, from->uid);
+  if (to != 0)
+    printf(">?(-\\n[" SUB_KERN_FORMAT "]+\\n[" WIDTH_FORMAT "])",
+	   p->uid, to->uid);
+  printf("/2\n");
+  printf(".nr " WIDTH_FORMAT " "
+	 "0\\n[" WIDTH_FORMAT "]",
+	 uid, p->uid);
+  if (from != 0)
+    printf(">?(-\\n[" SUB_KERN_FORMAT "]+\\n[" WIDTH_FORMAT "])",
+	   p->uid, from->uid);
+  if (to != 0)
+    printf(">?(\\n[" SUB_KERN_FORMAT "]+\\n[" WIDTH_FORMAT "])",
+	   p->uid, to->uid);
+  printf("/2+\\n[" LEFT_WIDTH_FORMAT "]\n", uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]", uid, p->uid);
+  if (to != 0)
+    printf(">?\\n[" WIDTH_FORMAT "]", to->uid);
+  if (from != 0)
+    printf(">?\\n[" WIDTH_FORMAT "]", from->uid);
+  printf("\n");
+  if (res)
+    printf(".nr " MARK_REG " +(\\n[" LEFT_WIDTH_FORMAT "]"
+	   "-(\\n[" WIDTH_FORMAT "]/2))\n",
+	   uid, mark_uid);
+  if (to != 0) {
+    printf(".nr " SUP_RAISE_FORMAT " %dM+\\n[" DEPTH_FORMAT
+	   "]>?%dM+\\n[" HEIGHT_FORMAT "]\n",
+	   uid, big_op_spacing1, to->uid, big_op_spacing3, p->uid);
+    printf(".nr " HEIGHT_FORMAT " \\n[" SUP_RAISE_FORMAT "]+\\n["
+	   HEIGHT_FORMAT "]+%dM\n",
+	   uid, uid, to->uid, big_op_spacing5);
+  }
+  else
+    printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  if (from != 0) {
+    printf(".nr " SUB_LOWER_FORMAT " %dM+\\n[" HEIGHT_FORMAT
+	   "]>?%dM+\\n[" DEPTH_FORMAT "]\n",
+	   uid, big_op_spacing2, from->uid, big_op_spacing4, p->uid);
+    printf(".nr " DEPTH_FORMAT " \\n[" SUB_LOWER_FORMAT "]+\\n["
+	   DEPTH_FORMAT "]+%dM\n",
+	   uid, uid, from->uid, big_op_spacing5);
+  }
+  else
+    printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return res;
+}
+
+void limit_box::output()
+{
+  printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+  if (to != 0) {
+    printf("\\Z" DELIMITER_CHAR);
+    printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+    printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u"
+	   "+(-\\n[" WIDTH_FORMAT "]u+\\n[" SUB_KERN_FORMAT "]u/2u)'",
+	   uid, to->uid, p->uid);
+    to->output();
+    printf(DELIMITER_CHAR);
+  }
+  if (from != 0) {
+    printf("\\Z" DELIMITER_CHAR);
+    printf("\\v'\\n[" SUB_LOWER_FORMAT "]u'", uid);
+    printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u"
+	   "+(-\\n[" SUB_KERN_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u)'",
+	   uid, p->uid, from->uid);
+    from->output();
+    printf(DELIMITER_CHAR);
+  }
+  printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u"
+	 "-(\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, p->uid);
+  p->output();
+  printf(DELIMITER_CHAR);
+  printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
+}
+
+void limit_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " }");
+  if (from) {
+    fprintf(stderr, " from { ");
+    from->debug_print();
+    fprintf(stderr, " }");
+  }
+  if (to) {
+    fprintf(stderr, " to { ");
+    to->debug_print();
+    fprintf(stderr, " }");
+  }
+}
+
+void limit_box::check_tabs(int level)
+{
+  if (to)
+    to->check_tabs(level + 1);
+  if (from)
+    from->check_tabs(level + 1);
+  p->check_tabs(level + 1);
+}
diff --git a/contrib/groff/src/preproc/eqn/list.cpp b/contrib/groff/src/preproc/eqn/list.cpp
new file mode 100644
index 0000000..1118fa1
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/list.cpp
@@ -0,0 +1,237 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+list_box *box::to_list_box()
+{
+  return 0;
+}
+
+list_box *list_box::to_list_box()
+{
+  return this;
+}
+
+void list_box::append(box *pp)
+{
+  list_box *q = pp->to_list_box();
+  if (q == 0)
+    list.append(pp);
+  else {
+    for (int i = 0; i < q->list.len; i++) {
+      list.append(q->list.p[i]);
+      q->list.p[i] = 0;
+    }
+    q->list.len = 0;
+    delete q;
+  }
+}
+
+list_box::list_box(box *pp) : list(pp), sty(-1)
+{
+  list_box *q = pp->to_list_box();
+  if (q != 0) {
+    // flatten it
+    list.p[0] = q->list.p[0];
+    for (int i = 1; i < q->list.len; i++) {
+      list.append(q->list.p[i]);
+      q->list.p[i] = 0;
+    }
+    q->list.len = 0;
+    delete q;
+  }
+}
+
+static int compute_spacing(int is_script, int left, int right)
+{
+  if (left == SUPPRESS_TYPE || right == SUPPRESS_TYPE)
+    return 0;
+  if (left == PUNCTUATION_TYPE)
+    return is_script ? 0 : thin_space;
+  if (left == OPENING_TYPE || right == CLOSING_TYPE)
+    return 0;
+  if (right == BINARY_TYPE || left == BINARY_TYPE)
+    return is_script ? 0 : medium_space;
+  if (right == RELATION_TYPE) {
+    if (left == RELATION_TYPE)
+      return 0;
+    else
+      return is_script ? 0 : thick_space;
+  }
+  if (left == RELATION_TYPE)
+    return is_script ? 0 : thick_space;
+  if (right == OPERATOR_TYPE)
+    return thin_space;
+  if (left == INNER_TYPE || right == INNER_TYPE)
+    return is_script ? 0 : thin_space;
+  if (left == OPERATOR_TYPE && right == ORDINARY_TYPE)
+    return thin_space;
+  return 0;
+}
+
+int list_box::compute_metrics(int style)
+{
+  sty = style;
+  int i;
+  for (i = 0; i < list.len; i++) {
+    int t = list.p[i]->spacing_type; 
+    // 5
+    if (t == BINARY_TYPE) {
+      int prevt;
+      if (i == 0
+	  || (prevt = list.p[i-1]->spacing_type) == BINARY_TYPE
+	  || prevt == OPERATOR_TYPE
+	  || prevt == RELATION_TYPE
+	  || prevt == OPENING_TYPE
+	  || prevt == PUNCTUATION_TYPE)
+	list.p[i]->spacing_type = ORDINARY_TYPE;
+    }
+    // 7
+    else if ((t == RELATION_TYPE || t == CLOSING_TYPE 
+	      || t == PUNCTUATION_TYPE)
+	     && i > 0 && list.p[i-1]->spacing_type == BINARY_TYPE)
+      list.p[i-1]->spacing_type = ORDINARY_TYPE;
+  }
+  for (i = 0; i < list.len; i++) {
+    unsigned flags = 0;
+    if (i - 1 >= 0 && list.p[i - 1]->right_is_italic())
+      flags |= HINT_PREV_IS_ITALIC;
+    if (i + 1 < list.len && list.p[i + 1]->left_is_italic())
+      flags |= HINT_NEXT_IS_ITALIC;
+    if (flags)
+      list.p[i]->hint(flags);
+  }
+  is_script = (style <= SCRIPT_STYLE);
+  int total_spacing = 0;
+  for (i = 1; i < list.len; i++)
+    total_spacing += compute_spacing(is_script, list.p[i-1]->spacing_type,
+				     list.p[i]->spacing_type);
+  int res = 0;
+  for (i = 0; i < list.len; i++)
+    if (!list.p[i]->is_simple()) {
+      int r = list.p[i]->compute_metrics(style);
+      if (r) {
+	if (res)
+	  error("multiple marks and lineups");
+	else {
+	  compute_sublist_width(i);
+	  printf(".nr " MARK_REG " +\\n[" TEMP_REG"]\n");
+	  res = r;
+	}
+      }
+    }
+  printf(".nr " WIDTH_FORMAT " %dM", uid, total_spacing);
+  for (i = 0; i < list.len; i++)
+    if (!list.p[i]->is_simple())
+      printf("+\\n[" WIDTH_FORMAT "]", list.p[i]->uid);
+  printf("\n");
+  printf(".nr " HEIGHT_FORMAT " 0", uid);
+  for (i = 0; i < list.len; i++)
+    if (!list.p[i]->is_simple())
+      printf(">?\\n[" HEIGHT_FORMAT "]", list.p[i]->uid);
+  printf("\n");
+  printf(".nr " DEPTH_FORMAT " 0", uid);
+  for (i = 0; i < list.len; i++)
+    if (!list.p[i]->is_simple())
+      printf(">?\\n[" DEPTH_FORMAT "]", list.p[i]->uid);
+  printf("\n");
+  int have_simple = 0;
+  for (i = 0; i < list.len && !have_simple; i++)
+    have_simple = list.p[i]->is_simple();
+  if (have_simple) {
+    printf(".nr " WIDTH_FORMAT " +\\w" DELIMITER_CHAR, uid);
+    for (i = 0; i < list.len; i++)
+      if (list.p[i]->is_simple())
+	list.p[i]->output();
+    printf(DELIMITER_CHAR "\n");
+    printf(".nr " HEIGHT_FORMAT " \\n[rst]>?\\n[" HEIGHT_FORMAT "]\n",
+	   uid, uid);
+    printf(".nr " DEPTH_FORMAT " 0-\\n[rsb]>?\\n[" DEPTH_FORMAT "]\n",
+	   uid, uid);
+  }
+  return res;
+}
+
+void list_box::compute_sublist_width(int n)
+{
+  int total_spacing = 0;
+  int i;
+  for (i = 1; i < n + 1 && i < list.len; i++)
+    total_spacing += compute_spacing(is_script, list.p[i-1]->spacing_type,
+				     list.p[i]->spacing_type);
+  printf(".nr " TEMP_REG " %dM", total_spacing);
+  for (i = 0; i < n; i++)
+    if (!list.p[i]->is_simple())
+      printf("+\\n[" WIDTH_FORMAT "]", list.p[i]->uid);
+  int have_simple = 0;
+  for (i = 0; i < n && !have_simple; i++)
+    have_simple = list.p[i]->is_simple();
+  if (have_simple) {
+    printf("+\\w" DELIMITER_CHAR);
+    for (i = 0; i < n; i++)
+      if (list.p[i]->is_simple())
+	list.p[i]->output();
+    printf(DELIMITER_CHAR);
+  }
+  printf("\n");
+}
+
+void list_box::compute_subscript_kern()
+{
+  // We can only call compute_subscript_kern if we have called
+  // compute_metrics first.
+  if (list.p[list.len-1]->is_simple())
+    list.p[list.len-1]->compute_metrics(sty);
+  list.p[list.len-1]->compute_subscript_kern();
+  printf(".nr " SUB_KERN_FORMAT " \\n[" SUB_KERN_FORMAT "]\n",
+	 uid, list.p[list.len-1]->uid);
+}
+
+void list_box::output()
+{
+  for (int i = 0; i < list.len; i++) {
+    if (i > 0) {
+      int n = compute_spacing(is_script,
+			      list.p[i-1]->spacing_type,
+			      list.p[i]->spacing_type);
+      if (n > 0)
+	printf("\\h'%dM'", n);
+    }
+    list.p[i]->output();
+  }
+}
+
+void list_box::handle_char_type(int st, int ft)
+{
+  for (int i = 0; i < list.len; i++)
+    list.p[i]->handle_char_type(st, ft);
+}
+
+void list_box::debug_print()
+{
+  list.list_debug_print(" ");
+}
+
+void list_box::check_tabs(int level)
+{
+  list.list_check_tabs(level);
+}
diff --git a/contrib/groff/src/preproc/eqn/main.cpp b/contrib/groff/src/preproc/eqn/main.cpp
new file mode 100644
index 0000000..dabac5f
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/main.cpp
@@ -0,0 +1,395 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "stringclass.h"
+#include "device.h"
+#include "searchpath.h"
+#include "macropath.h"
+#include "htmlhint.h"
+#include "pbox.h"
+#include "ctype.h"
+
+#define STARTUP_FILE "eqnrc"
+
+extern int yyparse();
+extern "C" const char *Version_string;
+
+static char *delim_search    (char *, int);
+static int   inline_equation (FILE *, string &, string &);
+
+char start_delim = '\0';
+char end_delim = '\0';
+int non_empty_flag;
+int inline_flag;
+int draw_flag = 0;
+int one_size_reduction_flag = 0;
+int compatible_flag = 0;
+int no_newline_in_delim_flag = 0;
+int html = 0;
+                      
+
+int read_line(FILE *fp, string *p)
+{
+  p->clear();
+  int c = -1;
+  while ((c = getc(fp)) != EOF) {
+    if (!invalid_input_char(c))
+      *p += char(c);
+    else
+      error("invalid input character code `%1'", c);
+    if (c == '\n')
+      break;
+  }
+  current_lineno++;
+  return p->length() > 0;
+}
+
+void do_file(FILE *fp, const char *filename)
+{
+  string linebuf;
+  string str;
+  printf(".lf 1 %s\n", filename);
+  current_filename = filename;
+  current_lineno = 0;
+  while (read_line(fp, &linebuf)) {
+    if (linebuf.length() >= 4
+	&& linebuf[0] == '.' && linebuf[1] == 'l' && linebuf[2] == 'f'
+	&& (linebuf[3] == ' ' || linebuf[3] == '\n' || compatible_flag)) {
+      put_string(linebuf, stdout);
+      linebuf += '\0';
+      if (interpret_lf_args(linebuf.contents() + 3))
+	current_lineno--;
+    }
+    else if (linebuf.length() >= 4
+	     && linebuf[0] == '.'
+	     && linebuf[1] == 'E'
+	     && linebuf[2] == 'Q'
+	     && (linebuf[3] == ' ' || linebuf[3] == '\n'
+		 || compatible_flag)) {
+      put_string(linebuf, stdout);
+      int start_lineno = current_lineno + 1;
+      str.clear();
+      for (;;) {
+	if (!read_line(fp, &linebuf))
+	  fatal("end of file before .EN");
+	if (linebuf.length() >= 3 && linebuf[0] == '.' && linebuf[1] == 'E') {
+	  if (linebuf[2] == 'N'
+	      && (linebuf.length() == 3 || linebuf[3] == ' '
+		  || linebuf[3] == '\n' || compatible_flag))
+	    break;
+	  else if (linebuf[2] == 'Q' && linebuf.length() > 3
+		   && (linebuf[3] == ' ' || linebuf[3] == '\n'
+		       || compatible_flag))
+	    fatal("nested .EQ");
+	}
+	str += linebuf;
+      }
+      str += '\0';
+      start_string();
+      init_lex(str.contents(), current_filename, start_lineno);
+      non_empty_flag = 0;
+      inline_flag = 0;
+      yyparse();
+      restore_compatibility();
+      if (non_empty_flag) {
+	printf(".lf %d\n", current_lineno - 1);
+	output_string();
+      }
+      printf(".lf %d\n", current_lineno);
+      put_string(linebuf, stdout);
+    }
+    else if (start_delim != '\0' && linebuf.search(start_delim) >= 0
+	     && inline_equation(fp, linebuf, str))
+      ;
+    else
+      put_string(linebuf, stdout);
+  }
+  current_filename = 0;
+  current_lineno = 0;
+}
+
+// Handle an inline equation.  Return 1 if it was an inline equation,
+// otherwise.
+static int inline_equation(FILE *fp, string &linebuf, string &str)
+{
+  linebuf += '\0';
+  char *ptr = &linebuf[0];
+  char *start = delim_search(ptr, start_delim);
+  if (!start) {
+    // It wasn't a delimiter after all.
+    linebuf.set_length(linebuf.length() - 1); // strip the '\0'
+    return 0;
+  }
+  start_string();
+  inline_flag = 1;
+  for (;;) {
+    if (no_newline_in_delim_flag && strchr(start + 1, end_delim) == 0) {
+      error("missing `%1'", end_delim);
+      char *nl = strchr(start + 1, '\n');
+      if (nl != 0)
+	*nl = '\0';
+      do_text(ptr);
+      break;
+    }
+    int start_lineno = current_lineno;
+    *start = '\0';
+    do_text(ptr);
+    ptr = start + 1;
+    str.clear();
+    for (;;) {
+      char *end = strchr(ptr, end_delim);
+      if (end != 0) {
+	*end = '\0';
+	str += ptr;
+	ptr = end + 1;
+	break;
+      }
+      str += ptr;
+      if (!read_line(fp, &linebuf))
+	fatal("unterminated `%1' at line %2, looking for `%3'",
+	      start_delim, start_lineno, end_delim);
+      linebuf += '\0';
+      ptr = &linebuf[0];
+    }
+    str += '\0';
+    if (html) {
+      printf(".as1 %s ", LINE_STRING);
+      html_begin_suppress();
+      printf("\n");
+    }
+    init_lex(str.contents(), current_filename, start_lineno);
+    yyparse();
+    if (html) {
+      printf(".as1 %s ", LINE_STRING);
+      html_end_suppress();
+      printf("\n");
+    }
+    start = delim_search(ptr, start_delim);
+    if (start == 0) {
+      char *nl = strchr(ptr, '\n');
+      if (nl != 0)
+	*nl = '\0';
+      do_text(ptr);
+      break;
+    }
+  }
+  restore_compatibility();
+  printf(".lf %d\n", current_lineno);
+  output_string();
+  printf(".lf %d\n", current_lineno + 1);
+  return 1;
+}
+
+/* Search for delim.  Skip over number register and string names etc. */
+
+static char *delim_search(char *ptr, int delim)
+{
+  while (*ptr) {
+    if (*ptr == delim)
+      return ptr;
+    if (*ptr++ == '\\') {
+      switch (*ptr) {
+      case 'n':
+      case '*':
+      case 'f':
+      case 'g':
+      case 'k':
+	switch (*++ptr) {
+	case '\0':
+	case '\\':
+	  break;
+	case '(':
+	  if (*++ptr != '\\' && *ptr != '\0'
+	      && *++ptr != '\\' && *ptr != '\0')
+	      ptr++;
+	  break;
+	case '[':
+	  while (*++ptr != '\0')
+	    if (*ptr == ']') {
+	      ptr++;
+	      break;
+	    }
+	  break;
+	default:
+	  ptr++;
+	  break;
+	}
+	break;
+      case '\\':
+      case '\0':
+	break;
+      default:
+	ptr++;
+	break;
+      }
+    }
+  }
+  return 0;
+}
+
+void usage(FILE *stream)
+{
+  fprintf(stream,
+    "usage: %s [ -rvDCNR ] -dxx -fn -sn -pn -mn -Mdir -Ts [ files ... ]\n",
+    program_name);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int opt;
+  int load_startup_file = 1;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "DCRvd:f:p:s:m:T:M:rN", long_options,
+			    NULL))
+	 != EOF)
+    switch (opt) {
+    case 'C':
+      compatible_flag = 1;
+      break;
+    case 'R':			// don't load eqnrc
+      load_startup_file = 0;
+      break;
+    case 'M':
+      config_macro_path.command_line_dir(optarg);
+      break;
+    case 'v':
+      {
+	printf("GNU eqn (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'd':
+      if (optarg[0] == '\0' || optarg[1] == '\0')
+	error("-d requires two character argument");
+      else if (invalid_input_char(optarg[0]))
+	error("bad delimiter `%1'", optarg[0]);
+      else if (invalid_input_char(optarg[1]))
+	error("bad delimiter `%1'", optarg[1]);
+      else {
+	start_delim = optarg[0];
+	end_delim = optarg[1];
+      }
+      break;
+    case 'f':
+      set_gfont(optarg);
+      break;
+    case 'T':
+      device = optarg;
+      if (strcmp(device, "ps:html") == 0) {
+	device = "ps";
+	html = 1;
+      }
+      break;
+    case 's':
+      if (!set_gsize(optarg))
+	error("invalid size `%1'", optarg);
+      break;
+    case 'p':
+      {
+	int n;
+	if (sscanf(optarg, "%d", &n) == 1)
+	  set_script_reduction(n);
+	else
+	  error("bad size `%1'", optarg);
+      }
+      break;
+    case 'm':
+      {
+	int n;
+	if (sscanf(optarg, "%d", &n) == 1)
+	  set_minimum_size(n);
+	else
+	  error("bad size `%1'", optarg);
+      }
+      break;
+    case 'r':
+      one_size_reduction_flag = 1;
+      break;
+    case 'D':
+      warning("-D option is obsolete: use `set draw_lines 1' instead");
+      draw_flag = 1;
+      break;
+    case 'N':
+      no_newline_in_delim_flag = 1;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  init_table(device);
+  init_char_table();
+  printf(".if !'\\*(.T'%s' "
+	 ".if !'\\*(.T'html' "	// the html device uses `-Tps' to render
+				// equations as images
+	 ".tm warning: %s should have been given a `-T\\*(.T' option\n",
+	 device, program_name);
+  printf(".if '\\*(.T'html' "
+	 ".if !'%s'ps' "
+	 ".tm warning: %s should have been given a `-Tps' option\n",
+	 device, program_name);
+  printf(".if '\\*(.T'html' "
+	 ".if !'%s'ps' "
+	 ".tm warning: (it is advisable to invoke groff via: groff -Thtml -e)\n",
+	 device);
+  if (load_startup_file) {
+    char *path;
+    FILE *fp = config_macro_path.open_file(STARTUP_FILE, &path);
+    if (fp) {
+      do_file(fp, path);
+      fclose(fp);
+      a_delete path;
+    }
+  }
+  if (optind >= argc)
+    do_file(stdin, "-");
+  else
+    for (int i = optind; i < argc; i++)
+      if (strcmp(argv[i], "-") == 0)
+	do_file(stdin, "-");
+      else {
+	errno = 0;
+	FILE *fp = fopen(argv[i], "r");
+	if (!fp)
+	  fatal("can't open `%1': %2", argv[i], strerror(errno));
+	else {
+	  do_file(fp, argv[i]);
+	  fclose(fp);
+	}
+      }
+  if (ferror(stdout) || fflush(stdout) < 0)
+    fatal("output error");
+  return 0;
+}
diff --git a/contrib/groff/src/preproc/eqn/mark.cpp b/contrib/groff/src/preproc/eqn/mark.cpp
new file mode 100644
index 0000000..99d1b75
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/mark.cpp
@@ -0,0 +1,121 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+class mark_box : public pointer_box {
+public:
+  mark_box(box *);
+  int compute_metrics(int);
+  void output();
+  void debug_print();
+};
+
+// we push down marks so that they don't interfere with spacing
+
+box *make_mark_box(box *p)
+{
+  list_box *b = p->to_list_box();
+  if (b != 0) {
+    b->list.p[0] = make_mark_box(b->list.p[0]);
+    return b;
+  }
+  else
+    return new mark_box(p);
+}
+
+mark_box::mark_box(box *pp) : pointer_box(pp)
+{
+}
+
+void mark_box::output()
+{
+  p->output();
+}
+
+int mark_box::compute_metrics(int style)
+{
+  int res = p->compute_metrics(style);
+  if (res)
+    error("multiple marks and lineups");
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " MARK_REG " 0\n");
+  return FOUND_MARK;
+}
+
+void mark_box::debug_print()
+{
+  fprintf(stderr, "mark { ");
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+
+class lineup_box : public pointer_box {
+public:
+  lineup_box(box *);
+  void output();
+  int compute_metrics(int style);
+  void debug_print();
+};
+
+// we push down lineups so that they don't interfere with spacing
+
+box *make_lineup_box(box *p)
+{
+  list_box *b = p->to_list_box();
+  if (b != 0) {
+    b->list.p[0] = make_lineup_box(b->list.p[0]);
+    return b;
+  }
+  else
+    return new lineup_box(p);
+}
+
+lineup_box::lineup_box(box *pp) : pointer_box(pp)
+{
+}
+
+void lineup_box::output()
+{
+  p->output();
+}
+
+int lineup_box::compute_metrics(int style)
+{
+  int res = p->compute_metrics(style);
+  if (res)
+    error("multiple marks and lineups");
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " MARK_REG " 0\n");
+  return FOUND_LINEUP;
+}
+
+void lineup_box::debug_print()
+{
+  fprintf(stderr, "lineup { ");
+  p->debug_print();
+  fprintf(stderr, " }");
+}
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh
index 08346b0..43fe1e8 100644
--- a/contrib/groff/src/preproc/eqn/neqn.sh
+++ b/contrib/groff/src/preproc/eqn/neqn.sh
@@ -3,7 +3,7 @@
 # GNU eqn with groff -Tascii|-Tlatin1|-Tutf8|-Tcp1047 is supported.
 
 : ${GROFF_BIN_PATH=@BINDIR@}
-PATH=$GROFF_BIN_PATH:$PATH
+PATH=$GROFF_BIN_PATH@SEP@$PATH
 export PATH
 exec @g@eqn -Tascii ${1+"$@"}
 
diff --git a/contrib/groff/src/preproc/eqn/other.cpp b/contrib/groff/src/preproc/eqn/other.cpp
new file mode 100644
index 0000000..c052f52
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/other.cpp
@@ -0,0 +1,601 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+class accent_box : public pointer_box {
+private:
+  box *ab;
+public:
+  accent_box(box *, box *);
+  ~accent_box();
+  int compute_metrics(int);
+  void output();
+  void debug_print();
+  void check_tabs(int);
+};
+
+box *make_accent_box(box *p, box *q)
+{
+  return new accent_box(p, q);
+}
+
+accent_box::accent_box(box *pp, box *qq) : pointer_box(pp), ab(qq)
+{
+}
+
+accent_box::~accent_box()
+{
+  delete ab;
+}
+
+#if 0
+int accent_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  p->compute_skew();
+  ab->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " SUP_RAISE_FORMAT " \\n[" HEIGHT_FORMAT "]-%dM>?0\n",
+	 uid, p->uid, x_height);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]+\\n["
+	 SUP_RAISE_FORMAT "]\n",
+	 uid, ab->uid, uid);
+  return r;
+}
+
+void accent_box::output()
+{
+  printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u+\\n["
+	 SKEW_FORMAT "]u'",
+	 p->uid, ab->uid, p->uid);
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid); 
+  ab->output();
+  printf("\\h'-\\n[" WIDTH_FORMAT "]u'", ab->uid);
+  printf("\\v'\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  printf("\\h'-(\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u+\\n["
+	 SKEW_FORMAT "]u)'",
+	 p->uid, ab->uid, p->uid);
+  p->output();
+}
+#endif
+
+/* This version copes with the possibility of an accent's being wider
+than its accentee.  LEFT_WIDTH_FORMAT gives the distance from the
+left edge of the resulting box to the middle of the accentee's box.*/
+
+int accent_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  p->compute_skew();
+  ab->compute_metrics(style);
+  printf(".nr " LEFT_WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]/2"
+	 ">?(\\n[" WIDTH_FORMAT "]/2-\\n[" SKEW_FORMAT "])\n",
+	 uid, p->uid, ab->uid, p->uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]/2"
+	 ">?(\\n[" WIDTH_FORMAT "]/2+\\n[" SKEW_FORMAT "])"
+	 "+\\n[" LEFT_WIDTH_FORMAT "]\n",
+	 uid, p->uid, ab->uid, p->uid, uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " SUP_RAISE_FORMAT " \\n[" HEIGHT_FORMAT "]-%dM>?0\n",
+	 uid, p->uid, x_height);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]+\\n["
+	 SUP_RAISE_FORMAT "]\n",
+	 uid, ab->uid, uid);
+  if (r)
+    printf(".nr " MARK_REG " +\\n[" LEFT_WIDTH_FORMAT "]"
+	   "-(\\n[" WIDTH_FORMAT "]/2)'\n",
+	   uid, p->uid);
+  return r;
+}
+
+void accent_box::output()
+{
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u+\\n[" SKEW_FORMAT "]u"
+	 "-(\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, p->uid, ab->uid);
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid); 
+  ab->output();
+  printf(DELIMITER_CHAR);
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u-(\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, p->uid);
+  p->output();
+  printf(DELIMITER_CHAR);
+  printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
+}
+
+void accent_box::check_tabs(int level)
+{
+  ab->check_tabs(level + 1);
+  p->check_tabs(level + 1);
+}
+
+void accent_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " } accent { ");
+  ab->debug_print();
+  fprintf(stderr, " }");
+}
+
+class overline_char_box : public simple_box {
+public:
+  overline_char_box();
+  void output();
+  void debug_print();
+};
+
+overline_char_box::overline_char_box()
+{
+}
+
+void overline_char_box::output()
+{
+  printf("\\v'-%dM/2u-%dM'", 7*default_rule_thickness, x_height);
+  printf((draw_flag ? "\\D'l%dM 0'" : "\\l'%dM\\&\\(ru'"),
+	 accent_width);
+  printf("\\v'%dM/2u+%dM'", 7*default_rule_thickness, x_height);
+}
+
+void overline_char_box::debug_print()
+{
+  fprintf(stderr, "<overline char>");
+}
+
+class overline_box : public pointer_box {
+public:
+  overline_box(box *);
+  int compute_metrics(int);
+  void output();
+  void debug_print();
+};
+
+box *make_overline_box(box *p)
+{
+  if (p->is_char())
+    return new accent_box(p, new overline_char_box);
+  else
+    return new overline_box(p);
+}
+
+overline_box::overline_box(box *pp) : pointer_box(pp)
+{
+}
+
+int overline_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(cramped_style(style));
+  // 9
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]+%dM\n",
+	 uid, p->uid, default_rule_thickness*5);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void overline_box::output()
+{
+  // 9
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\v'-\\n[" HEIGHT_FORMAT "]u-(%dM/2u)'",
+	 p->uid, 7*default_rule_thickness);
+  if (draw_flag)
+    printf("\\D'l\\n[" WIDTH_FORMAT "]u 0'", p->uid);
+  else
+    printf("\\l'\\n[" WIDTH_FORMAT "]u\\&\\(ru'", p->uid);
+  printf(DELIMITER_CHAR);
+  p->output();
+}
+
+void overline_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " } bar");
+}
+
+class uaccent_box : public pointer_box {
+  box *ab;
+public:
+  uaccent_box(box *, box *);
+  ~uaccent_box();
+  int compute_metrics(int);
+  void output();
+  void compute_subscript_kern();
+  void check_tabs(int);
+  void debug_print();
+};
+
+box *make_uaccent_box(box *p, box *q)
+{
+  return new uaccent_box(p, q);
+}
+
+uaccent_box::uaccent_box(box *pp, box *qq)
+: pointer_box(pp), ab(qq)
+{
+}
+
+uaccent_box::~uaccent_box()
+{
+  delete ab;
+}
+
+int uaccent_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  ab->compute_metrics(style);
+  printf(".nr " LEFT_WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]/2"
+	 ">?(\\n[" WIDTH_FORMAT "]/2)\n",
+	 uid, p->uid, ab->uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]/2"
+	 ">?(\\n[" WIDTH_FORMAT "]/2)"
+	 "+\\n[" LEFT_WIDTH_FORMAT "]\n",
+	 uid, p->uid, ab->uid, uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]"
+	 "+\\n[" DEPTH_FORMAT "]\n",
+	 uid, p->uid, ab->uid);
+  if (r)
+    printf(".nr " MARK_REG " +\\n[" LEFT_WIDTH_FORMAT "]"
+	   "-(\\n[" WIDTH_FORMAT "]/2)'\n",
+	   uid, p->uid);
+  return r;
+}
+
+void uaccent_box::output()
+{
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u-(\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, ab->uid);
+  printf("\\v'\\n[" DEPTH_FORMAT "]u'", p->uid); 
+  ab->output();
+  printf(DELIMITER_CHAR);
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" LEFT_WIDTH_FORMAT "]u-(\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, p->uid);
+  p->output();
+  printf(DELIMITER_CHAR);
+  printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
+}
+
+void uaccent_box::check_tabs(int level)
+{
+  ab->check_tabs(level + 1);
+  p->check_tabs(level + 1);
+}
+
+void uaccent_box::compute_subscript_kern()
+{
+  box::compute_subscript_kern(); // want 0 subscript kern
+}
+
+void uaccent_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " } uaccent { ");
+  ab->debug_print();
+  fprintf(stderr, " }");
+}
+
+class underline_char_box : public simple_box {
+public:
+  underline_char_box();
+  void output();
+  void debug_print();
+};
+
+underline_char_box::underline_char_box()
+{
+}
+
+void underline_char_box::output()
+{
+  printf("\\v'%dM/2u'", 7*default_rule_thickness);
+  printf((draw_flag ? "\\D'l%dM 0'" : "\\l'%dM\\&\\(ru'"),
+	 accent_width);
+  printf("\\v'-%dM/2u'", 7*default_rule_thickness);
+}
+
+void underline_char_box::debug_print()
+{
+  fprintf(stderr, "<underline char>");
+}
+
+
+class underline_box : public pointer_box {
+public:
+  underline_box(box *);
+  int compute_metrics(int);
+  void output();
+  void compute_subscript_kern();
+  void debug_print();
+};
+
+box *make_underline_box(box *p)
+{
+  if (p->is_char())
+    return new uaccent_box(p, new underline_char_box);
+  else
+    return new underline_box(p);
+}
+
+underline_box::underline_box(box *pp) : pointer_box(pp)
+{
+}
+
+int underline_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  // 10
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]+%dM\n",
+	 uid, p->uid, default_rule_thickness*5);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void underline_box::output()
+{
+  // 10
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\v'\\n[" DEPTH_FORMAT "]u+(%dM/2u)'",
+	 p->uid, 7*default_rule_thickness);
+  if (draw_flag)
+    printf("\\D'l\\n[" WIDTH_FORMAT "]u 0'", p->uid);
+  else
+    printf("\\l'\\n[" WIDTH_FORMAT "]u\\&\\(ru'", p->uid);
+  printf(DELIMITER_CHAR);
+  p->output();
+}
+
+// we want an underline box to have 0 subscript kern
+
+void underline_box::compute_subscript_kern()
+{
+  box::compute_subscript_kern();
+}
+
+void underline_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " } under");
+}
+
+size_box::size_box(char *s, box *pp) : pointer_box(pp), size(s)
+{
+}
+
+int size_box::compute_metrics(int style)
+{
+  printf(".nr " SIZE_FORMAT " \\n[.ps]\n", uid);
+  printf(".ps %s\n", size);
+  printf(".nr " SMALL_SIZE_FORMAT " \\n[.ps]\n", uid);
+  int r = p->compute_metrics(style);
+  printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void size_box::output()
+{
+  printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+  p->output();
+  printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+}
+
+size_box::~size_box()
+{
+  a_delete size;
+}
+
+void size_box::debug_print()
+{
+  fprintf(stderr, "size %s { ", size);
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+
+font_box::font_box(char *s, box *pp) : pointer_box(pp), f(s)
+{
+}
+
+font_box::~font_box()
+{
+  a_delete f;
+}
+
+int font_box::compute_metrics(int style)
+{
+  const char *old_roman_font = current_roman_font;
+  current_roman_font = f;
+  printf(".nr " FONT_FORMAT " \\n[.f]\n", uid);
+  printf(".ft %s\n", f);
+  int r = p->compute_metrics(style);
+  current_roman_font = old_roman_font;
+  printf(".ft \\n[" FONT_FORMAT "]\n", uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void font_box::output()
+{
+  printf("\\f[%s]", f);
+  const char *old_roman_font = current_roman_font;
+  current_roman_font = f;
+  p->output();
+  current_roman_font = old_roman_font;
+  printf("\\f[\\n[" FONT_FORMAT "]]", uid);
+}
+
+void font_box::debug_print()
+{
+  fprintf(stderr, "font %s { ", f);
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+fat_box::fat_box(box *pp) : pointer_box(pp)
+{
+}
+
+int fat_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]+%dM\n",
+	 uid, p->uid, fat_offset);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  return r;
+}
+
+void fat_box::output()
+{
+  p->output();
+  printf("\\h'-\\n[" WIDTH_FORMAT "]u'", p->uid);
+  printf("\\h'%dM'", fat_offset);
+  p->output();
+}
+
+
+void fat_box::debug_print()
+{
+  fprintf(stderr, "fat { ");
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+
+vmotion_box::vmotion_box(int i, box *pp) : pointer_box(pp), n(i)
+{
+}
+
+int vmotion_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  if (n > 0) {
+    printf(".nr " HEIGHT_FORMAT " %dM+\\n[" HEIGHT_FORMAT "]\n",
+	   uid, n, p->uid);
+    printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  }
+  else {
+    printf(".nr " DEPTH_FORMAT " %dM+\\n[" DEPTH_FORMAT "]>?0\n",
+	   uid, -n, p->uid);
+    printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n",
+	   uid, p->uid);
+  }
+  return r;
+}
+
+void vmotion_box::output()
+{
+  printf("\\v'%dM'", -n);
+  p->output();
+  printf("\\v'%dM'", n);
+}
+
+void vmotion_box::debug_print()
+{
+  if (n >= 0)
+    fprintf(stderr, "up %d { ", n);
+  else
+    fprintf(stderr, "down %d { ", -n);
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+hmotion_box::hmotion_box(int i, box *pp) : pointer_box(pp), n(i)
+{
+}
+
+int hmotion_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]+%dM\n",
+	 uid, p->uid, n);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]\n", uid, p->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  if (r)
+    printf(".nr " MARK_REG " +%dM\n", n);
+  return r;
+}
+
+void hmotion_box::output()
+{
+  printf("\\h'%dM'", n);
+  p->output();
+}
+
+void hmotion_box::debug_print()
+{
+  if (n >= 0)
+    fprintf(stderr, "fwd %d { ", n);
+  else
+    fprintf(stderr, "back %d { ", -n);
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+vcenter_box::vcenter_box(box *pp) : pointer_box(pp)
+{
+}
+
+int vcenter_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " SUP_RAISE_FORMAT " \\n[" DEPTH_FORMAT "]-\\n["
+	 HEIGHT_FORMAT "]/2+%dM\n",
+	 uid, p->uid, p->uid, axis_height);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]+\\n["
+	 SUP_RAISE_FORMAT "]>?0\n", uid, p->uid, uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]-\\n["
+	 SUP_RAISE_FORMAT "]>?0\n", uid, p->uid, uid);
+
+  return r;
+}
+
+void vcenter_box::output()
+{
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  p->output();
+  printf("\\v'\\n[" SUP_RAISE_FORMAT "]u'", uid);
+}
+
+void vcenter_box::debug_print()
+{
+  fprintf(stderr, "vcenter { ");
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
diff --git a/contrib/groff/src/preproc/eqn/over.cpp b/contrib/groff/src/preproc/eqn/over.cpp
new file mode 100644
index 0000000..279efc8
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/over.cpp
@@ -0,0 +1,197 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+class over_box : public box {
+private:
+  int reduce_size;
+  box *num;
+  box *den;
+public:
+  over_box(int small, box *, box *);
+  ~over_box();
+  void debug_print();
+  int compute_metrics(int);
+  void output();
+  void check_tabs(int);
+};
+
+box *make_over_box(box *pp, box *qq)
+{
+  return new over_box(0, pp, qq);
+}
+
+box *make_small_over_box(box *pp, box *qq)
+{
+  return new over_box(1, pp, qq);
+}
+
+over_box::over_box(int is_small, box *pp, box *qq)
+: reduce_size(is_small), num(pp), den(qq)
+{
+  spacing_type = INNER_TYPE;
+}
+
+over_box::~over_box()
+{
+  delete num;
+  delete den;
+}
+
+int over_box::compute_metrics(int style)
+{
+  if (reduce_size) {
+    style = script_style(style);
+    printf(".nr " SIZE_FORMAT " \\n[.ps]\n", uid);
+    set_script_size();
+    printf(".nr " SMALL_SIZE_FORMAT " \\n[.ps]\n", uid);
+  }
+  int mark_uid = 0;
+  int res = num->compute_metrics(style);
+  if (res)
+    mark_uid = num->uid;
+  int r = den->compute_metrics(cramped_style(style));
+  if (r && res)
+    error("multiple marks and lineups");
+  else {
+    mark_uid = den->uid;
+    res = r;
+  }
+  if (reduce_size)
+    printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  printf(".nr " WIDTH_FORMAT " (\\n[" WIDTH_FORMAT "]>?\\n[" WIDTH_FORMAT "]", 
+	 uid, num->uid, den->uid);
+  // allow for \(ru being wider than both the numerator and denominator
+  if (!draw_flag)
+    fputs(">?\\w" DELIMITER_CHAR "\\(ru" DELIMITER_CHAR, stdout);
+  printf(")+%dM\n", null_delimiter_space*2 + over_hang*2);
+  // 15b
+  printf(".nr " SUP_RAISE_FORMAT " %dM\n",
+	 uid, (reduce_size ? num2 : num1));
+  printf(".nr " SUB_LOWER_FORMAT " %dM\n",
+	 uid, (reduce_size ? denom2 : denom1));
+
+  // 15d
+  printf(".nr " SUP_RAISE_FORMAT " +(\\n[" DEPTH_FORMAT
+	 "]-\\n[" SUP_RAISE_FORMAT "]+%dM+(%dM/2)+%dM)>?0\n",
+	 uid, num->uid, uid, axis_height, default_rule_thickness,
+	 default_rule_thickness*(reduce_size ? 1 : 3));
+  printf(".nr " SUB_LOWER_FORMAT " +(\\n[" HEIGHT_FORMAT
+	 "]-\\n[" SUB_LOWER_FORMAT "]-%dM+(%dM/2)+%dM)>?0\n",
+	 uid, den->uid, uid, axis_height, default_rule_thickness,
+	 default_rule_thickness*(reduce_size ? 1 : 3));
+
+
+  printf(".nr " HEIGHT_FORMAT " \\n[" SUP_RAISE_FORMAT "]+\\n["
+	 HEIGHT_FORMAT "]\n",
+	 uid, uid, num->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" SUB_LOWER_FORMAT "]+\\n["
+	 DEPTH_FORMAT "]\n",
+	 uid, uid, den->uid);
+  if (res)
+    printf(".nr " MARK_REG " +(\\n[" WIDTH_FORMAT "]-\\n["
+	   WIDTH_FORMAT "]/2)\n", uid, mark_uid);
+  return res;
+}
+
+#define USE_Z
+
+void over_box::output()
+{
+  if (reduce_size)
+    printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+#ifdef USE_Z
+  printf("\\Z" DELIMITER_CHAR);
+#endif
+  // move up to the numerator baseline
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  // move across so that it's centered
+  printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
+	 uid, num->uid);
+
+  // print the numerator
+  num->output();
+
+#ifdef USE_Z
+  printf(DELIMITER_CHAR);
+#else
+  // back again
+  printf("\\h'-\\n[" WIDTH_FORMAT "]u'", num->uid);
+  printf("\\h'-(\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, num->uid);
+  // down again
+  printf("\\v'\\n[" SUP_RAISE_FORMAT "]u'", uid);
+#endif
+#ifdef USE_Z
+  printf("\\Z" DELIMITER_CHAR);
+#endif
+  // move down to the denominator baseline
+  printf("\\v'\\n[" SUB_LOWER_FORMAT "]u'", uid);
+
+  // move across so that it's centered
+  printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
+	 uid, den->uid);
+
+  // print the the denominator
+  den->output();
+
+#ifdef USE_Z
+  printf(DELIMITER_CHAR);
+#else
+  // back again
+  printf("\\h'-\\n[" WIDTH_FORMAT "]u'", den->uid);
+  printf("\\h'-(\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u)'",
+	 uid, den->uid);
+  // up again
+  printf("\\v'-\\n[" SUB_LOWER_FORMAT "]u'", uid);
+#endif
+  if (reduce_size)
+    printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+  // draw the line
+  printf("\\h'%dM'", null_delimiter_space);
+  printf("\\v'-%dM'", axis_height);
+  fputs(draw_flag ? "\\D'l" : "\\l'", stdout);
+  printf("\\n[" WIDTH_FORMAT "]u-%dM",
+	 uid, 2*null_delimiter_space);
+  fputs(draw_flag ? " 0'" : "\\&\\(ru'", stdout);
+  printf("\\v'%dM'", axis_height);
+  printf("\\h'%dM'", null_delimiter_space);
+}
+
+void over_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  num->debug_print();
+  if (reduce_size)
+    fprintf(stderr, " } smallover { ");
+  else
+    fprintf(stderr, " } over { ");
+  den->debug_print();
+  fprintf(stderr, " }");
+}
+
+void over_box::check_tabs(int level)
+{
+  num->check_tabs(level + 1);
+  den->check_tabs(level + 1);
+}
diff --git a/contrib/groff/src/preproc/eqn/pile.cpp b/contrib/groff/src/preproc/eqn/pile.cpp
new file mode 100644
index 0000000..0df5241
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/pile.cpp
@@ -0,0 +1,293 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+// piles and matrices
+
+#include "eqn.h"
+#include "pbox.h"
+
+// SUP_RAISE_FORMAT gives the first baseline
+// BASELINE_SEP_FORMAT gives the separation between baselines
+
+int pile_box::compute_metrics(int style)
+{
+  int i;
+  for (i = 0; i < col.len; i++)
+    col.p[i]->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0", uid);
+  for (i = 0; i < col.len; i++)
+    printf(">?\\n[" WIDTH_FORMAT "]", col.p[i]->uid);
+  printf("\n");
+  printf(".nr " BASELINE_SEP_FORMAT " %dM",
+	 uid, baseline_sep+col.space);
+  for (i = 1; i < col.len; i++)
+    printf(">?(\\n[" DEPTH_FORMAT "]+\\n[" HEIGHT_FORMAT "]+%dM)",
+	   col.p[i-1]->uid, col.p[i]->uid, default_rule_thickness*5);
+  // round it so that it's a multiple of the vertical resolution
+  printf("/\\n(.V+(\\n(.V/2)*\\n(.V\n");
+
+  printf(".nr " SUP_RAISE_FORMAT " \\n[" BASELINE_SEP_FORMAT "]*%d/2"
+	 "+%dM\n",
+	 uid, uid, col.len-1, axis_height - shift_down);
+  printf(".nr " HEIGHT_FORMAT " \\n[" SUP_RAISE_FORMAT "]+\\n["
+	 HEIGHT_FORMAT "]\n",
+	 uid, uid, col.p[0]->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" BASELINE_SEP_FORMAT "]*%d+\\n["
+	 DEPTH_FORMAT "]-\\n[" SUP_RAISE_FORMAT "]\n",
+	 uid, uid, col.len-1, col.p[col.len-1]->uid, uid);
+  return FOUND_NOTHING;
+}
+
+void pile_box::output()
+{
+  int i;
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  for (i = 0; i < col.len; i++) {
+    switch (col.align) {
+    case LEFT_ALIGN:
+      break;
+    case CENTER_ALIGN:
+      printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
+	     uid, col.p[i]->uid);
+      break;
+    case RIGHT_ALIGN:
+      printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u'",
+	     uid, col.p[i]->uid);
+      break;
+    default:
+      assert(0);
+    }
+    col.p[i]->output();
+    printf("\\h'-\\n[" WIDTH_FORMAT "]u'", col.p[i]->uid);
+    switch (col.align) {
+    case LEFT_ALIGN:
+      break;
+    case CENTER_ALIGN:
+      printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
+	     col.p[i]->uid, uid);
+      break;
+    case RIGHT_ALIGN:
+      printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u'",
+	     col.p[i]->uid, uid);
+      break;
+    default:
+      assert(0);
+    }
+    if (i != col.len - 1)
+      printf("\\v'\\n[" BASELINE_SEP_FORMAT "]u'", uid);
+  }
+  printf("\\v'\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  printf("\\v'-(%du*\\n[" BASELINE_SEP_FORMAT "]u)'", col.len - 1, uid);
+  printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
+}
+
+pile_box::pile_box(box *pp) : col(pp)
+{
+}
+
+void pile_box::check_tabs(int level)
+{
+  col.list_check_tabs(level);
+}
+
+void pile_box::debug_print()
+{
+  col.debug_print("pile");
+}
+
+int matrix_box::compute_metrics(int style)
+{
+  int i, j;
+  int maxlen = 0;
+  int space = 0;
+  for (i = 0; i < len; i++) {
+    for (j = 0; j < p[i]->len; j++)
+      p[i]->p[j]->compute_metrics(style);
+    if (p[i]->len > maxlen)
+      maxlen = p[i]->len;
+    if (p[i]->space > space)
+      space = p[i]->space;
+  }
+  for (i = 0; i < len; i++) {
+    printf(".nr " COLUMN_WIDTH_FORMAT " 0", uid, i);
+    for (j = 0; j < p[i]->len; j++)
+      printf(">?\\n[" WIDTH_FORMAT "]", p[i]->p[j]->uid);
+    printf("\n");
+  }
+  printf(".nr " WIDTH_FORMAT " %dM",
+	 uid, column_sep*(len-1)+2*matrix_side_sep);
+  for (i = 0; i < len; i++)
+    printf("+\\n[" COLUMN_WIDTH_FORMAT "]", uid, i);
+  printf("\n");
+  printf(".nr " BASELINE_SEP_FORMAT " %dM",
+	 uid, baseline_sep+space);
+  for (i = 0; i < len; i++)
+    for (j = 1; j < p[i]->len; j++)
+      printf(">?(\\n[" DEPTH_FORMAT "]+\\n[" HEIGHT_FORMAT "]+%dM)",
+	   p[i]->p[j-1]->uid, p[i]->p[j]->uid, default_rule_thickness*5);
+  // round it so that it's a multiple of the vertical resolution
+  printf("/\\n(.V+(\\n(.V/2)*\\n(.V\n");
+  printf(".nr " SUP_RAISE_FORMAT " \\n[" BASELINE_SEP_FORMAT "]*%d/2"
+	 "+%dM\n",
+	 uid, uid, maxlen-1, axis_height - shift_down);
+  printf(".nr " HEIGHT_FORMAT " 0\\n[" SUP_RAISE_FORMAT "]+(0",
+	 uid, uid);
+  for (i = 0; i < len; i++)
+    printf(">?\\n[" HEIGHT_FORMAT "]", p[i]->p[0]->uid);
+  printf(")>?0\n");
+  printf(".nr " DEPTH_FORMAT " \\n[" BASELINE_SEP_FORMAT "]*%d-\\n["
+	 SUP_RAISE_FORMAT "]+(0",
+	 uid, uid, maxlen-1, uid);
+  for (i = 0; i < len; i++)
+    if (p[i]->len == maxlen)
+      printf(">?\\n[" DEPTH_FORMAT "]", p[i]->p[maxlen-1]->uid);
+  printf(")>?0\n");
+  return FOUND_NOTHING;
+}
+
+void matrix_box::output()
+{
+  printf("\\h'%dM'", matrix_side_sep);
+  for (int i = 0; i < len; i++) {
+    int j;
+    printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+    for (j = 0; j < p[i]->len; j++) {
+      switch (p[i]->align) {
+      case LEFT_ALIGN:
+	break;
+      case CENTER_ALIGN:
+	printf("\\h'\\n[" COLUMN_WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
+	       uid, i, p[i]->p[j]->uid);
+	break;
+      case RIGHT_ALIGN:
+	printf("\\h'\\n[" COLUMN_WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u'",
+	       uid, i, p[i]->p[j]->uid);
+	break;
+      default:
+	assert(0);
+      }
+      p[i]->p[j]->output();
+      printf("\\h'-\\n[" WIDTH_FORMAT "]u'", p[i]->p[j]->uid);
+      switch (p[i]->align) {
+      case LEFT_ALIGN:
+	break;
+      case CENTER_ALIGN:
+	printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" COLUMN_WIDTH_FORMAT "]u/2u'",
+	       p[i]->p[j]->uid, uid, i);
+	break;
+      case RIGHT_ALIGN:
+	printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" COLUMN_WIDTH_FORMAT "]u'",
+	       p[i]->p[j]->uid, uid, i);
+	break;
+      default:
+	assert(0);
+      }
+      if (j != p[i]->len - 1)
+	printf("\\v'\\n[" BASELINE_SEP_FORMAT "]u'", uid);
+    }
+    printf("\\v'\\n[" SUP_RAISE_FORMAT "]u'", uid);
+    printf("\\v'-(%du*\\n[" BASELINE_SEP_FORMAT "]u)'", p[i]->len - 1, uid);
+    printf("\\h'\\n[" COLUMN_WIDTH_FORMAT "]u'", uid, i);
+    if (i != len - 1)
+      printf("\\h'%dM'", column_sep);
+  }
+  printf("\\h'%dM'", matrix_side_sep);
+}
+
+matrix_box::matrix_box(column *pp)
+{
+  p = new column*[10];
+  for (int i = 0; i < 10; i++)
+    p[i] = 0;
+  maxlen = 10;
+  len = 1;
+  p[0] = pp;
+}
+
+matrix_box::~matrix_box()
+{
+  for (int i = 0; i < len; i++)
+    delete p[i];
+  a_delete p;
+}
+
+void matrix_box::append(column *pp)
+{
+  if (len + 1 > maxlen) {
+    column **oldp = p;
+    maxlen *= 2;
+    p = new column*[maxlen];
+    memcpy(p, oldp, sizeof(column*)*len);
+    a_delete oldp;
+  }
+  p[len++] = pp;
+}
+
+void matrix_box::check_tabs(int level)
+{
+  for (int i = 0; i < len; i++)
+    p[i]->list_check_tabs(level);
+}
+
+void matrix_box::debug_print()
+{
+  fprintf(stderr, "matrix { ");
+  p[0]->debug_print("col");
+  for (int i = 1; i < len; i++) {
+    fprintf(stderr, " ");
+    p[i]->debug_print("col");
+  }
+  fprintf(stderr, " }");
+}
+
+column::column(box *pp) : box_list(pp), align(CENTER_ALIGN), space(0)
+{
+}
+
+void column::set_alignment(alignment a)
+{
+  align = a;
+}
+
+void column::set_space(int n)
+{
+  space = n;
+}
+
+void column::debug_print(const char *s)
+{
+  char c = '\0';		// shut up -Wall
+  switch (align) {
+  case LEFT_ALIGN:
+    c = 'l';
+    break;
+  case RIGHT_ALIGN:
+    c = 'r';
+    break;
+  case CENTER_ALIGN:
+    c = 'c';
+    break;
+  default:
+    assert(0);
+  }
+  fprintf(stderr, "%c%s %d { ", c, s, space);
+  list_debug_print(" above ");
+  fprintf(stderr, " }");
+}
+
diff --git a/contrib/groff/src/preproc/eqn/script.cpp b/contrib/groff/src/preproc/eqn/script.cpp
new file mode 100644
index 0000000..62a05b4
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/script.cpp
@@ -0,0 +1,221 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+class script_box : public pointer_box {
+private:
+  box *sub;
+  box *sup;
+public:
+  script_box(box *, box *, box *);
+  ~script_box();
+  int compute_metrics(int);
+  void output();
+  void debug_print();
+  int left_is_italic();
+  void hint(unsigned);
+  void check_tabs(int);
+};
+
+/* The idea is that the script should attach to the rightmost box
+of a list. For example, given `2x sup 3', the superscript should
+attach to `x' rather than `2x'. */
+
+box *make_script_box(box *nuc, box *sub, box *sup)
+{
+  list_box *b = nuc->to_list_box();
+  if (b != 0) {
+    b->list.p[b->list.len-1] = make_script_box(b->list.p[b->list.len - 1],
+					       sub,
+					       sup);
+    return b;
+  }
+  else
+    return new script_box(nuc, sub, sup);
+}
+
+script_box::script_box(box *pp, box *qq, box *rr)
+: pointer_box(pp), sub(qq), sup(rr)
+{
+}
+
+script_box::~script_box()
+{
+  delete sub;
+  delete sup;
+}
+
+int script_box::left_is_italic()
+{
+  return p->left_is_italic();
+}
+
+int script_box::compute_metrics(int style)
+{
+  int res = p->compute_metrics(style);
+  p->compute_subscript_kern();
+  printf(".nr " SIZE_FORMAT " \\n[.ps]\n", uid);
+  if (!(style <= SCRIPT_STYLE && one_size_reduction_flag))
+    set_script_size();
+  printf(".nr " SMALL_SIZE_FORMAT " \\n[.ps]\n", uid);
+  if (sub != 0)
+    sub->compute_metrics(cramped_style(script_style(style)));
+  if (sup != 0)
+    sup->compute_metrics(script_style(style));
+  // 18a
+  if (p->is_char()) {
+    printf(".nr " SUP_RAISE_FORMAT " 0\n", uid);
+    printf(".nr " SUB_LOWER_FORMAT " 0\n", uid);
+  }
+  else {
+    printf(".nr " SUP_RAISE_FORMAT " \\n[" HEIGHT_FORMAT "]-%dM>?0\n",
+	   uid, p->uid, sup_drop);
+    printf(".nr " SUB_LOWER_FORMAT " \\n[" DEPTH_FORMAT "]+%dM\n",
+	   uid, p->uid, sub_drop);
+  }
+  printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  if (sup == 0) {
+    assert(sub != 0);
+    // 18b
+    printf(".nr " SUB_LOWER_FORMAT " \\n[" SUB_LOWER_FORMAT "]>?%dM>?(\\n["
+	   HEIGHT_FORMAT "]-(%dM*4/5))\n",
+	   uid, uid, sub1, sub->uid, x_height);
+  }
+  else {
+    // sup != 0
+    // 18c
+    int p;
+    if (style == DISPLAY_STYLE)
+      p = sup1;
+    else if (style & 1)		// not cramped
+      p = sup2;
+    else
+      p = sup3;
+    printf(".nr " SUP_RAISE_FORMAT " \\n[" SUP_RAISE_FORMAT
+	   "]>?%dM>?(\\n[" DEPTH_FORMAT "]+(%dM/4))\n",
+	   uid, uid, p, sup->uid, x_height);
+    // 18d
+    if (sub != 0) {
+      printf(".nr " SUB_LOWER_FORMAT " \\n[" SUB_LOWER_FORMAT "]>?%dM\n",
+	   uid, uid, sub2);
+      // 18e
+      printf(".nr " TEMP_REG " \\n[" DEPTH_FORMAT "]-\\n["
+	     SUP_RAISE_FORMAT "]+\\n[" HEIGHT_FORMAT "]-\\n["
+	     SUB_LOWER_FORMAT "]+(4*%dM)\n",
+	     sup->uid, uid, sub->uid, uid, default_rule_thickness);
+      printf(".if \\n[" TEMP_REG "] \\{");
+      printf(".nr " SUB_LOWER_FORMAT " +\\n[" TEMP_REG "]\n", uid);
+      printf(".nr " TEMP_REG " (%dM*4/5)-\\n[" SUP_RAISE_FORMAT
+	     "]+\\n[" DEPTH_FORMAT "]>?0\n",
+	     x_height, uid, sup->uid);
+      printf(".nr " SUP_RAISE_FORMAT " +\\n[" TEMP_REG "]\n", uid);
+      printf(".nr " SUB_LOWER_FORMAT " -\\n[" TEMP_REG "]\n", uid);
+      printf(".\\}\n");
+    }
+  }
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]", uid, p->uid);
+  if (sub != 0 && sup != 0)
+    printf("+((\\n[" WIDTH_FORMAT "]-\\n[" SUB_KERN_FORMAT "]>?\\n["
+	   WIDTH_FORMAT "])+%dM)>?0\n",
+	   sub->uid, p->uid, sup->uid, script_space);
+  else if (sub != 0)
+    printf("+(\\n[" WIDTH_FORMAT "]-\\n[" SUB_KERN_FORMAT "]+%dM)>?0\n",
+	   sub->uid, p->uid, script_space);
+  else if (sup != 0)
+    printf("+(\\n[" WIDTH_FORMAT "]+%dM)>?0\n", sup->uid, script_space);
+  else
+    printf("\n");
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]",
+	 uid, p->uid);
+  if (sup != 0)
+    printf(">?(\\n[" SUP_RAISE_FORMAT "]+\\n[" HEIGHT_FORMAT "])",
+	   uid, sup->uid);
+  if (sub != 0)
+    printf(">?(-\\n[" SUB_LOWER_FORMAT "]+\\n[" HEIGHT_FORMAT "])",
+	   uid, sub->uid);
+  printf("\n");
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]",
+	 uid, p->uid);
+  if (sub != 0)
+    printf(">?(\\n[" SUB_LOWER_FORMAT "]+\\n[" DEPTH_FORMAT "])",
+	   uid, sub->uid);
+  if (sup != 0)
+    printf(">?(-\\n[" SUP_RAISE_FORMAT "]+\\n[" DEPTH_FORMAT "])",
+	   uid, sup->uid);
+  printf("\n");
+  return res;
+}
+
+void script_box::output()
+{
+  p->output();
+  if (sup != 0) {
+    printf("\\Z" DELIMITER_CHAR);
+    printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+    printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+    sup->output();
+    printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+    printf(DELIMITER_CHAR);
+  }
+  if (sub != 0) {
+    printf("\\Z" DELIMITER_CHAR);
+    printf("\\v'\\n[" SUB_LOWER_FORMAT "]u'", uid);
+    printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+    printf("\\h'-\\n[" SUB_KERN_FORMAT "]u'", p->uid);
+    sub->output();
+    printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+    printf(DELIMITER_CHAR);
+  }
+  printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u'",
+	 uid, p->uid);
+}
+
+void script_box::hint(unsigned flags)
+{
+  p->hint(flags & ~HINT_NEXT_IS_ITALIC);
+}
+
+void script_box::debug_print()
+{
+  fprintf(stderr, "{ ");
+  p->debug_print();
+  fprintf(stderr, " }");
+  if (sub) {
+    fprintf(stderr, " sub { ");
+    sub->debug_print();
+    fprintf(stderr, " }");
+  }
+  if (sup) {
+    fprintf(stderr, " sup { ");
+    sup->debug_print();
+    fprintf(stderr, " }");
+  }
+}
+
+void script_box::check_tabs(int level)
+{
+  if (sup)
+    sup->check_tabs(level + 1);
+  if (sub)
+    sub->check_tabs(level + 1);
+  p->check_tabs(level);
+}
diff --git a/contrib/groff/src/preproc/eqn/special.cpp b/contrib/groff/src/preproc/eqn/special.cpp
new file mode 100644
index 0000000..310261a
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/special.cpp
@@ -0,0 +1,115 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+#define STRING_FORMAT PREFIX "str%d"
+
+#define SPECIAL_STRING "0s"
+#define SPECIAL_WIDTH_REG "0w"
+#define SPECIAL_HEIGHT_REG "0h"
+#define SPECIAL_DEPTH_REG "0d"
+#define SPECIAL_SUB_KERN_REG "0skern"
+#define SPECIAL_SKEW_REG "0skew"
+
+/*
+For example:
+
+.de Cl
+.ds 0s \Z'\\*[0s]'\v'\\n(0du'\D'l \\n(0wu -\\n(0hu-\\n(0du'\v'\\n(0hu'
+..
+.EQ
+define cancel 'special Cl'
+.EN
+*/
+
+
+class special_box : public pointer_box {
+  char *macro_name;
+public:
+  special_box(char *, box *);
+  ~special_box();
+  int compute_metrics(int);
+  void compute_subscript_kern();
+  void compute_skew();
+  void output();
+  void debug_print();
+};
+
+box *make_special_box(char *s, box *p)
+{
+  return new special_box(s, p);
+}
+
+special_box::special_box(char *s, box *pp) : pointer_box(pp), macro_name(s)
+{
+}
+
+special_box::~special_box()
+{
+  a_delete macro_name;
+}
+
+int special_box::compute_metrics(int style)
+{
+  int r = p->compute_metrics(style);
+  p->compute_subscript_kern();
+  p->compute_skew();
+  printf(".ds " SPECIAL_STRING " \"");
+  p->output();
+  printf("\n");
+  printf(".nr " SPECIAL_WIDTH_REG " 0\\n[" WIDTH_FORMAT "]\n", p->uid);
+  printf(".nr " SPECIAL_HEIGHT_REG " \\n[" HEIGHT_FORMAT "]\n", p->uid);
+  printf(".nr " SPECIAL_DEPTH_REG " \\n[" DEPTH_FORMAT "]\n", p->uid);
+  printf(".nr " SPECIAL_SUB_KERN_REG " \\n[" SUB_KERN_FORMAT "]\n", p->uid);
+  printf(".nr " SPECIAL_SKEW_REG " 0\\n[" SKEW_FORMAT "]\n", p->uid);
+  printf(".%s\n", macro_name);
+  printf(".rn " SPECIAL_STRING " " STRING_FORMAT "\n", uid);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" SPECIAL_WIDTH_REG "]\n", uid);
+  printf(".nr " HEIGHT_FORMAT " 0>?\\n[" SPECIAL_HEIGHT_REG "]\n", uid);
+  printf(".nr " DEPTH_FORMAT " 0>?\\n[" SPECIAL_DEPTH_REG "]\n", uid);
+  printf(".nr " SUB_KERN_FORMAT " 0>?\\n[" SPECIAL_SUB_KERN_REG "]\n", uid);
+  printf(".nr " SKEW_FORMAT " 0\\n[" SPECIAL_SKEW_REG "]\n", uid);
+  // User will have to change MARK_REG if appropriate.
+  return r;
+}
+
+void special_box::compute_subscript_kern()
+{
+  // Already computed in compute_metrics(), so do nothing.
+}
+
+void special_box::compute_skew()
+{
+  // Already computed in compute_metrics(), so do nothing.
+}
+
+void special_box::output()
+{
+  printf("\\*[" STRING_FORMAT "]", uid);
+}
+
+void special_box::debug_print()
+{
+  fprintf(stderr, "special %s { ", macro_name);
+  p->debug_print();
+  fprintf(stderr, " }");
+}
diff --git a/contrib/groff/src/preproc/eqn/sqrt.cpp b/contrib/groff/src/preproc/eqn/sqrt.cpp
new file mode 100644
index 0000000..f998ff3
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/sqrt.cpp
@@ -0,0 +1,180 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+
+
+class sqrt_box : public pointer_box {
+public:
+  sqrt_box(box *);
+  int compute_metrics(int style);
+  void output();
+  void debug_print();
+  void check_tabs(int);
+};
+
+box *make_sqrt_box(box *pp)
+{
+  return new sqrt_box(pp);
+}
+
+sqrt_box::sqrt_box(box *pp) : pointer_box(pp)
+{
+}
+
+#define SQRT_CHAR "\\[sqrt]"
+#define RADICAL_EXTENSION_CHAR "\\[sqrtex]"
+
+#define SQRT_CHAIN "\\[sqrt\\\\n[" INDEX_REG "]]"
+#define BAR_CHAIN "\\[sqrtex\\\\n[" INDEX_REG "]]"
+
+int sqrt_box::compute_metrics(int style)
+{
+  // 11
+  int r = p->compute_metrics(cramped_style(style));
+  printf(".nr " TEMP_REG " \\n[" HEIGHT_FORMAT "]+\\n[" DEPTH_FORMAT
+	 "]+%dM+(%dM/4)\n",
+	 p->uid, p->uid, default_rule_thickness,
+	 (style > SCRIPT_STYLE ? x_height : default_rule_thickness));
+  printf(".nr " SIZE_FORMAT " \\n[.ps]\n", uid);
+  printf(".ds " SQRT_STRING_FORMAT " " SQRT_CHAR "\n", uid);
+  printf(".ds " BAR_STRING " " RADICAL_EXTENSION_CHAR "\n");
+  printf(".nr " SQRT_WIDTH_FORMAT
+	 " 0\\w" DELIMITER_CHAR SQRT_CHAR DELIMITER_CHAR "\n",
+	 uid);
+  printf(".if \\n[rst]-\\n[rsb]-%dM<\\n[" TEMP_REG "] \\{",
+	 default_rule_thickness);
+
+  printf(".nr " INDEX_REG " 0\n"
+	 ".de " TEMP_MACRO "\n"
+	 ".ie c" SQRT_CHAIN " \\{"
+	 ".ds " SQRT_STRING_FORMAT " " SQRT_CHAIN "\n"
+	 ".ie c" BAR_CHAIN " .ds " BAR_STRING " " BAR_CHAIN "\n"
+	 ".el .ds " BAR_STRING " " RADICAL_EXTENSION_CHAR "\n"
+	 ".nr " SQRT_WIDTH_FORMAT
+	 " 0\\w" DELIMITER_CHAR SQRT_CHAIN DELIMITER_CHAR "\n"
+	 ".if \\\\n[rst]-\\\\n[rsb]-%dM<\\n[" TEMP_REG "] \\{"
+	 ".nr " INDEX_REG " +1\n"
+	 "." TEMP_MACRO "\n"
+	 ".\\}\\}\n"
+	 ".el .nr " INDEX_REG " 0-1\n"
+	 "..\n"
+	 "." TEMP_MACRO "\n",
+	 uid, uid, default_rule_thickness);
+
+  printf(".if \\n[" INDEX_REG "]<0 \\{");
+
+  // Determine the maximum point size
+  printf(".ps 1000\n");
+  printf(".nr " MAX_SIZE_REG " \\n[.ps]\n");
+  printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  // We define a macro that will increase the current point size
+  // until we get a radical sign that's tall enough or we reach
+  // the maximum point size.
+  printf(".de " TEMP_MACRO "\n"
+	 ".nr " SQRT_WIDTH_FORMAT
+	 " 0\\w" DELIMITER_CHAR "\\*[" SQRT_STRING_FORMAT "]" DELIMITER_CHAR "\n"
+	 ".if \\\\n[rst]-\\\\n[rsb]-%dM<\\n[" TEMP_REG "]"
+	 "&(\\\\n[.ps]<\\n[" MAX_SIZE_REG "]) \\{"
+	 ".ps +1\n"
+	 "." TEMP_MACRO "\n"
+	 ".\\}\n"
+	 "..\n"
+	 "." TEMP_MACRO "\n",
+	 uid, uid, default_rule_thickness);
+  
+  printf(".\\}\\}\n");
+
+  printf(".nr " SMALL_SIZE_FORMAT " \\n[.ps]\n", uid);
+  // set TEMP_REG to the amount by which the radical sign is too big
+  printf(".nr " TEMP_REG " \\n[rst]-\\n[rsb]-%dM-\\n[" TEMP_REG "]\n",
+	 default_rule_thickness);
+  // If TEMP_REG is negative, the bottom of the radical sign should
+  // be -TEMP_REG above the bottom of p. If it's positive, the bottom
+  // of the radical sign should be TEMP_REG/2 below the bottom of p.
+  // This calculates the amount by which the baseline of the radical
+  // should be raised.
+  printf(".nr " SUP_RAISE_FORMAT " (-\\n[" TEMP_REG "]>?(-\\n[" TEMP_REG "]/2))"
+	 "-\\n[rsb]-\\n[" DEPTH_FORMAT "]\n", uid, p->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]"
+	 ">?(\\n[" SUP_RAISE_FORMAT "]+\\n[rst])\n",
+	 uid, p->uid, uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]"
+	 ">?(-\\n[" SUP_RAISE_FORMAT "]-\\n[rsb])\n",
+	 uid, p->uid, uid);
+  // Do this last, so we don't lose height and depth information on
+  // the radical sign.
+  // Remember that the width of the bar might be greater than the width of p.
+
+  printf(".nr " TEMP_REG " "
+	 "\\n[" WIDTH_FORMAT "]"
+	 ">?\\w" DELIMITER_CHAR "\\*[" BAR_STRING "]" DELIMITER_CHAR "\n",
+	 p->uid);
+  printf(".as " SQRT_STRING_FORMAT " "
+	 "\\l'\\n[" TEMP_REG "]u\\&\\*[" BAR_STRING "]'\n",
+	 uid);
+  printf(".nr " WIDTH_FORMAT " \\n[" TEMP_REG "]"
+	 "+\\n[" SQRT_WIDTH_FORMAT "]\n",
+	 uid, uid);
+
+  if (r)
+    printf(".nr " MARK_REG " +\\n[" SQRT_WIDTH_FORMAT "]\n", uid);
+  // the top of the bar might be higher than the top of the radical sign
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]"
+	 ">?(\\n[" SUP_RAISE_FORMAT "]+\\n[rst])\n",
+	 uid, p->uid, uid);
+  // put a bit of extra space above the bar
+  printf(".nr " HEIGHT_FORMAT " +%dM\n", uid, default_rule_thickness);
+  printf(".ps \\n[" SIZE_FORMAT "]u\n", uid);
+  return r;
+}
+
+void sqrt_box::output()
+{
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\s[\\n[" SMALL_SIZE_FORMAT "]u]", uid);
+  printf("\\v'-\\n[" SUP_RAISE_FORMAT "]u'", uid);
+  printf("\\*[" SQRT_STRING_FORMAT "]", uid);
+  printf("\\s[\\n[" SIZE_FORMAT "]u]", uid);
+  printf(DELIMITER_CHAR);
+
+  printf("\\Z" DELIMITER_CHAR);
+  printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u"
+	 "+\\n[" SQRT_WIDTH_FORMAT "]u/2u'",
+	 uid, p->uid, uid);
+  p->output();
+  printf(DELIMITER_CHAR);
+
+  printf("\\h'\\n[" WIDTH_FORMAT "]u'", uid);
+}
+
+void sqrt_box::debug_print()
+{
+  fprintf(stderr, "sqrt { ");
+  p->debug_print();
+  fprintf(stderr, " }");
+}
+
+void sqrt_box::check_tabs(int level)
+{
+  p->check_tabs(level + 1);
+}
diff --git a/contrib/groff/src/preproc/eqn/text.cpp b/contrib/groff/src/preproc/eqn/text.cpp
new file mode 100644
index 0000000..83e4a76
--- /dev/null
+++ b/contrib/groff/src/preproc/eqn/text.cpp
@@ -0,0 +1,528 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "eqn.h"
+#include "pbox.h"
+#include "ptable.h"
+
+class char_box : public simple_box {
+  unsigned char c;
+  char next_is_italic;
+  char prev_is_italic;
+public:
+  char_box(unsigned char);
+  void debug_print();
+  void output();
+  int is_char();
+  int left_is_italic();
+  int right_is_italic();
+  void hint(unsigned);
+  void handle_char_type(int, int);
+};
+
+class special_char_box : public simple_box {
+  char *s;
+public:
+  special_char_box(const char *);
+  ~special_char_box();
+  void output();
+  void debug_print();
+  int is_char();
+  void handle_char_type(int, int);
+};
+
+const char *spacing_type_table[] = {
+  "ordinary",
+  "operator",
+  "binary",
+  "relation",
+  "opening",
+  "closing",
+  "punctuation",
+  "inner",
+  "suppress",
+  0,
+};
+
+const int DIGIT_TYPE = 0;
+const int LETTER_TYPE = 1;
+
+const char *font_type_table[] = {
+  "digit",
+  "letter",
+  0,
+};
+
+struct char_info {
+  int spacing_type;
+  int font_type;
+  char_info();
+};
+
+char_info::char_info()
+: spacing_type(ORDINARY_TYPE), font_type(DIGIT_TYPE)
+{
+}
+
+static char_info char_table[256];
+
+declare_ptable(char_info)
+implement_ptable(char_info)
+
+PTABLE(char_info) special_char_table;
+
+static int get_special_char_spacing_type(const char *ch)
+{
+  char_info *p = special_char_table.lookup(ch);
+  return p ? p->spacing_type : ORDINARY_TYPE;
+}
+
+static int get_special_char_font_type(const char *ch)
+{
+  char_info *p = special_char_table.lookup(ch);
+  return p ? p->font_type : DIGIT_TYPE;
+}
+
+static void set_special_char_type(const char *ch, int st, int ft)
+{
+  char_info *p = special_char_table.lookup(ch);
+  if (!p) {
+    p = new char_info[1];
+    special_char_table.define(ch, p);
+  }
+  if (st >= 0)
+    p->spacing_type = st;
+  if (ft >= 0)
+    p->font_type = ft;
+}
+
+void init_char_table()
+{
+  set_special_char_type("pl", 2, -1); // binary
+  set_special_char_type("mi", 2, -1);
+  set_special_char_type("eq", 3, -1); // relation
+  set_special_char_type("<=", 3, -1);
+  set_special_char_type(">=", 3, -1);
+  char_table['}'].spacing_type = 5; // closing
+  char_table[')'].spacing_type = 5;
+  char_table[']'].spacing_type = 5;
+  char_table['{'].spacing_type = 4; // opening
+  char_table['('].spacing_type = 4;
+  char_table['['].spacing_type = 4;
+  char_table[','].spacing_type = 6; // punctuation
+  char_table[';'].spacing_type = 6;
+  char_table[':'].spacing_type = 6;
+  char_table['.'].spacing_type = 6;
+  char_table['>'].spacing_type = 3;
+  char_table['<'].spacing_type = 3;
+  char_table['*'].spacing_type = 2; // binary
+  for (int i = 0; i < 256; i++)
+    if (csalpha(i))
+      char_table[i].font_type = LETTER_TYPE;
+}
+
+static int lookup_spacing_type(const char *type)
+{
+  for (int i = 0; spacing_type_table[i] != 0; i++)
+    if (strcmp(spacing_type_table[i], type) == 0)
+      return i;
+  return -1;
+}
+
+static int lookup_font_type(const char *type)
+{
+  for (int i = 0; font_type_table[i] != 0; i++)
+    if (strcmp(font_type_table[i], type) == 0)
+      return i;
+  return -1;
+}
+
+void box::set_spacing_type(char *type)
+{
+  int t = lookup_spacing_type(type);
+  if (t < 0)
+    error("unrecognised type `%1'", type);
+  else
+    spacing_type = t;
+  a_delete type;
+}
+
+char_box::char_box(unsigned char cc)
+: c(cc), next_is_italic(0), prev_is_italic(0)
+{
+  spacing_type = char_table[c].spacing_type;
+}
+
+void char_box::hint(unsigned flags)
+{
+  if (flags & HINT_PREV_IS_ITALIC)
+    prev_is_italic = 1;
+  if (flags & HINT_NEXT_IS_ITALIC)
+    next_is_italic = 1;
+}
+
+void char_box::output()
+{
+  int font_type = char_table[c].font_type;
+  if (font_type != LETTER_TYPE)
+    printf("\\f[%s]", current_roman_font);
+  if (!prev_is_italic)
+    fputs("\\,", stdout);
+  if (c == '\\')
+    fputs("\\e", stdout);
+  else
+    putchar(c);
+  if (!next_is_italic)
+    fputs("\\/", stdout);
+  else
+    fputs("\\&", stdout);		// suppress ligaturing and kerning
+  if (font_type != LETTER_TYPE)
+    fputs("\\fP", stdout);
+}
+
+int char_box::left_is_italic()
+{
+  int font_type = char_table[c].font_type;
+  return font_type == LETTER_TYPE;
+}
+
+int char_box::right_is_italic()
+{
+  int font_type = char_table[c].font_type;
+  return font_type == LETTER_TYPE;
+}
+
+int char_box::is_char()
+{
+  return 1;
+}
+
+void char_box::debug_print()
+{
+  if (c == '\\') {
+    putc('\\', stderr);
+    putc('\\', stderr);
+  }
+  else
+    putc(c, stderr);
+}
+
+special_char_box::special_char_box(const char *t)
+{
+  s = strsave(t);
+  spacing_type = get_special_char_spacing_type(s);
+}
+
+special_char_box::~special_char_box()
+{
+  a_delete s;
+}
+
+void special_char_box::output()
+{
+  int font_type = get_special_char_font_type(s);
+  if (font_type != LETTER_TYPE)
+    printf("\\f[%s]", current_roman_font);
+  printf("\\,\\[%s]\\/", s);
+  if (font_type != LETTER_TYPE)
+    printf("\\fP");
+}
+
+int special_char_box::is_char()
+{
+  return 1;
+}
+
+void special_char_box::debug_print()
+{
+  fprintf(stderr, "\\[%s]", s);
+}
+
+
+void char_box::handle_char_type(int st, int ft)
+{
+  if (st >= 0)
+    char_table[c].spacing_type = st;
+  if (ft >= 0)
+    char_table[c].font_type = ft;
+}
+
+void special_char_box::handle_char_type(int st, int ft)
+{
+  set_special_char_type(s, st, ft);
+}
+
+void set_char_type(const char *type, char *ch)
+{
+  assert(ch != 0);
+  int st = lookup_spacing_type(type);
+  int ft = lookup_font_type(type);
+  if (st < 0 && ft < 0) {
+    error("bad character type `%1'", type);
+    a_delete ch;
+    return;
+  }
+  box *b = split_text(ch);
+  b->handle_char_type(st, ft);
+  delete b;
+}
+
+/* We give primes special treatment so that in ``x' sub 2'', the ``2''
+will be tucked under the prime */
+
+class prime_box : public pointer_box {
+  box *pb;
+public:
+  prime_box(box *);
+  ~prime_box();
+  int compute_metrics(int style);
+  void output();
+  void compute_subscript_kern();
+  void debug_print();
+  void handle_char_type(int, int);
+};
+
+box *make_prime_box(box *pp)
+{
+  return new prime_box(pp);
+}
+
+prime_box::prime_box(box *pp) : pointer_box(pp)
+{
+  pb = new special_char_box("fm");
+}
+
+prime_box::~prime_box()
+{
+  delete pb;
+}
+
+int prime_box::compute_metrics(int style)
+{
+  int res = p->compute_metrics(style);
+  pb->compute_metrics(style);
+  printf(".nr " WIDTH_FORMAT " 0\\n[" WIDTH_FORMAT "]"
+	 "+\\n[" WIDTH_FORMAT "]\n",
+	 uid, p->uid, pb->uid);
+  printf(".nr " HEIGHT_FORMAT " \\n[" HEIGHT_FORMAT "]"
+	 ">?\\n[" HEIGHT_FORMAT "]\n",
+	 uid, p->uid, pb->uid);
+  printf(".nr " DEPTH_FORMAT " \\n[" DEPTH_FORMAT "]"
+	 ">?\\n[" DEPTH_FORMAT "]\n",
+	 uid, p->uid, pb->uid);
+  return res;
+}
+
+void prime_box::compute_subscript_kern()
+{
+  p->compute_subscript_kern();
+  printf(".nr " SUB_KERN_FORMAT " 0\\n[" WIDTH_FORMAT "]"
+	 "+\\n[" SUB_KERN_FORMAT "]>?0\n",
+	 uid, pb->uid, p->uid);
+}
+
+void prime_box::output()
+{
+  p->output();
+  pb->output();
+}
+
+void prime_box::handle_char_type(int st, int ft)
+{
+  p->handle_char_type(st, ft);
+  pb->handle_char_type(st, ft);
+}
+
+void prime_box::debug_print()
+{
+  p->debug_print();
+  putc('\'', stderr);
+}
+
+box *split_text(char *text)
+{
+  list_box *lb = 0;
+  box *fb = 0;
+  char *s = text;
+  while (*s != '\0') {
+    char c = *s++;
+    box *b = 0;
+    switch (c) {
+    case '+':
+      b = new special_char_box("pl");
+      break;
+    case '-':
+      b = new special_char_box("mi");
+      break;
+    case '=':
+      b = new special_char_box("eq");
+      break;
+    case '\'':
+      b = new special_char_box("fm");
+      break;
+    case '<':
+      if (*s == '=') {
+	b = new special_char_box("<=");
+	s++;
+	break;
+      }
+      goto normal_char;
+    case '>':
+      if (*s == '=') {
+	b = new special_char_box(">=");
+	s++;
+	break;
+      }
+      goto normal_char;
+    case '\\':
+      if (*s == '\0') {
+	lex_error("bad escape");
+	break;
+      }
+      c = *s++;
+      switch (c) {
+      case '(':
+	{
+	  char buf[3];
+	  if (*s != '\0') {
+	    buf[0] = *s++;
+	    if (*s != '\0') {
+	      buf[1] = *s++;
+	      buf[2] = '\0';
+	      b = new special_char_box(buf);
+	    }
+	    else {
+	      lex_error("bad escape");
+	    }
+	  }
+	  else {
+	    lex_error("bad escape");
+	  }
+	}
+	break;
+      case '[':
+	{
+	  char *ch = s;
+	  while (*s != ']' && *s != '\0')
+	    s++;
+	  if (*s == '\0')
+	    lex_error("bad escape");
+	  else {
+	    *s++ = '\0';
+	    b = new special_char_box(ch);
+	  }
+	}
+	break;
+      case 'f':
+      case 'g':
+      case 'k':
+      case 'n':
+      case '*':
+	{
+	  char *escape_start = s - 2;
+	  switch (*s) {
+	  case '(':
+	    if (*++s != '\0')
+	      ++s;
+	    break;
+	  case '[':
+	    for (++s; *s != '\0' && *s != ']'; s++)
+	      ;
+	    break;
+	  }
+	  if (*s == '\0')
+	    lex_error("bad escape");
+	  else {
+	    ++s;
+	    char *buf = new char[s - escape_start + 1];
+	    memcpy(buf, escape_start, s - escape_start);
+	    buf[s - escape_start] = '\0';
+	    b = new quoted_text_box(buf);
+	  }
+	}
+	break;
+      case '-':
+      case '_':
+	{
+	  char buf[2];
+	  buf[0] = c;
+	  buf[1] = '\0';
+	  b = new special_char_box(buf);
+	}
+	break;
+      case '`':
+	b = new special_char_box("ga");
+	break;
+      case '\'':
+	b = new special_char_box("aa");
+	break;
+      case 'e':
+      case '\\':
+	b = new char_box('\\');
+	break;
+      case '^':
+      case '|':
+      case '0':
+	{
+	  char buf[3];
+	  buf[0] = '\\';
+	  buf[1] = c;
+	  buf[2] = '\0';
+	  b = new quoted_text_box(strsave(buf));
+	  break;
+	}
+      default:
+	lex_error("unquoted escape");
+	b = new quoted_text_box(strsave(s - 2));
+	s = strchr(s, '\0');
+	break;
+      }
+      break;
+    default:
+    normal_char:
+      b = new char_box(c);
+      break;
+    }
+    while (*s == '\'') {
+      if (b == 0)
+	b = new quoted_text_box(0);
+      b = new prime_box(b);
+      s++;
+    }
+    if (b != 0) {
+      if (lb != 0)
+	lb->append(b);
+      else if (fb != 0) {
+	lb = new list_box(fb);
+	lb->append(b);
+      }
+      else
+	fb = b;
+    }
+  }
+  a_delete text;
+  if (lb != 0)
+    return lb;
+  else if (fb != 0)
+    return fb;
+  else
+    return new quoted_text_box(0);
+}
+
diff --git a/contrib/groff/src/preproc/grn/Makefile.sub b/contrib/groff/src/preproc/grn/Makefile.sub
index d180803..c28db47 100644
--- a/contrib/groff/src/preproc/grn/Makefile.sub
+++ b/contrib/groff/src/preproc/grn/Makefile.sub
@@ -8,10 +8,10 @@ OBJS=\
   hgraph.$(OBJEXT) \
   main.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/hdb.cc \
-  $(srcdir)/hpoint.cc \
-  $(srcdir)/hgraph.cc \
-  $(srcdir)/main.cc
+  $(srcdir)/hdb.cpp \
+  $(srcdir)/hpoint.cpp \
+  $(srcdir)/hgraph.cpp \
+  $(srcdir)/main.cpp
 HDRS=\
   $(srcdir)/gprint.h
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/preproc/grn/README b/contrib/groff/src/preproc/grn/README
index 7ac685e..124103b 100644
--- a/contrib/groff/src/preproc/grn/README
+++ b/contrib/groff/src/preproc/grn/README
@@ -40,10 +40,10 @@ better into the groff package.
 
   . Used error() and fatal() from libgroff for all source files.
 
-  . Renamed *.c to *.cc; updates as needed for C++ (prototypes, proper
+  . Renamed *.c to *.cpp; updates as needed for C++ (prototypes, proper
     casts, standard header files etc).  Heavy formatting.
 
-  . main.cc:
+  . main.cpp:
 
       Using groff's default values instead of DEVDIR, DEFAULTDEV, PRINTER,
       TYPESETTER, and GREMLIB.
diff --git a/contrib/groff/src/preproc/grn/hdb.cpp b/contrib/groff/src/preproc/grn/hdb.cpp
new file mode 100644
index 0000000..c9fbb7d
--- /dev/null
+++ b/contrib/groff/src/preproc/grn/hdb.cpp
@@ -0,0 +1,339 @@
+/* Last non-groff version: hdb.c  1.8 (Berkeley) 84/10/20
+ *
+ * Copyright -C- 1982 Barry S. Roitblat
+ *
+ * This file contains database routines for the hard copy programs of the
+ * gremlin picture editor.
+ */
+
+#include "gprint.h"
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "errarg.h"
+#include "error.h"
+
+#define MAXSTRING 128
+#define MAXSTRING_S "127"
+
+/* imports from main.cpp */
+
+extern int linenum;		/* current line number in input file */
+extern char gremlinfile[];	/* name of file currently reading */
+extern int SUNFILE;		/* TRUE if SUN gremlin file */
+extern void savebounds(float x, float y);
+
+/* imports from hpoint.cpp */
+
+extern POINT *PTInit();
+extern POINT *PTMakePoint(float x, float y, POINT ** pplist);
+
+
+int DBGetType(register char *s);
+
+
+/*
+ * This routine returns a pointer to an initialized database element which
+ * would be the only element in an empty list.
+ */
+ELT *
+DBInit()
+{
+  return ((ELT *) NULL);
+}				/* end DBInit */
+
+
+/*
+ * This routine creates a new element with the specified attributes and
+ * links it into database.
+ */
+ELT *
+DBCreateElt(int type,
+	    POINT * pointlist,
+	    int brush,
+	    int size,
+	    char *text,
+	    ELT **db)
+{
+  register ELT *temp;
+
+  temp = (ELT *) malloc(sizeof(ELT));
+  temp->nextelt = *db;
+  temp->type = type;
+  temp->ptlist = pointlist;
+  temp->brushf = brush;
+  temp->size = size;
+  temp->textpt = text;
+  *db = temp;
+  return (temp);
+}				/* end CreateElt */
+
+
+/*
+ * This routine reads the specified file into a database and returns a
+ * pointer to that database.
+ */
+ELT *
+DBRead(register FILE *file)
+{
+  register int i;
+  register int done;		/* flag for input exhausted */
+  register float nx;		/* x holder so x is not set before orienting */
+  int type;			/* element type */
+  ELT *elist;			/* pointer to the file's elements */
+  POINT *plist;			/* pointer for reading in points */
+  char string[MAXSTRING], *txt;
+  float x, y;			/* x and y are read in point coords */
+  int len, brush, size;
+  int lastpoint;
+
+  SUNFILE = FALSE;
+  elist = DBInit();
+  (void) fscanf(file, "%" MAXSTRING_S "s%*[^\n]\n", string);
+  if (strcmp(string, "gremlinfile")) {
+    if (strcmp(string, "sungremlinfile")) {
+      error("`%1' is not a gremlin file", gremlinfile);
+      return (elist);
+    }
+    SUNFILE = TRUE;
+  }
+
+  (void) fscanf(file, "%d%f%f\n", &size, &x, &y);
+  /* ignore orientation and file positioning point */
+
+  done = FALSE;
+  while (!done) {
+    /* if (fscanf(file,"%" MAXSTRING_S "s\n", string) == EOF) */
+    /* I changed the scanf format because the element */
+    /* can have two words (e.g. CURVE SPLINE)         */
+    if (fscanf(file, "\n%" MAXSTRING_S "[^\n]%*[^\n]\n", string) == EOF) {
+      error("`%1', error in file format", gremlinfile);
+      return (elist);
+    }
+
+    type = DBGetType(string);	/* interpret element type */
+    if (type < 0) {		/* no more data */
+      done = TRUE;
+      (void) fclose(file);
+    } else {
+#ifdef UW_FASTSCAN
+      (void) xscanf(file, &x, &y);		/* always one point */
+#else
+      (void) fscanf(file, "%f%f\n", &x, &y);	/* always one point */
+#endif	/* UW_FASTSCAN */
+      plist = PTInit();		/* NULL point list */
+
+      /*
+       * Files created on the SUN have point lists terminated by a line
+       * containing only an asterik ('*').  Files created on the AED have
+       * point lists terminated by the coordinate pair (-1.00 -1.00).
+       */
+      if (TEXT(type)) {		/* read only first point for TEXT elements */
+	nx = xorn(x, y);
+	y = yorn(x, y);
+	(void) PTMakePoint(nx, y, &plist);
+	savebounds(nx, y);
+
+#ifdef UW_FASTSCAN
+	while (xscanf(file, &x, &y));
+#else
+	lastpoint = FALSE;
+	do {
+	  fgets(string, MAXSTRING, file);
+	  if (string[0] == '*') {	/* SUN gremlin file */
+	    lastpoint = TRUE;
+	  } else {
+	    (void) sscanf(string, "%f%f", &x, &y);
+	    if ((x == -1.00 && y == -1.00) && (!SUNFILE))
+	      lastpoint = TRUE;
+	  }
+	} while (!lastpoint);
+#endif	/* UW_FASTSCAN */
+      } else {			/* not TEXT element */
+#ifdef UW_FASTSCAN
+	do {
+	  nx = xorn(x, y);
+	  y = yorn(x, y);
+	  (void) PTMakePoint(nx, y, &plist);
+	  savebounds(nx, y);
+	} while (xscanf(file, &x, &y));
+#else
+	lastpoint = FALSE;
+	while (!lastpoint) {
+	  nx = xorn(x, y);
+	  y = yorn(x, y);
+	  (void) PTMakePoint(nx, y, &plist);
+	  savebounds(nx, y);
+
+	  fgets(string, MAXSTRING, file);
+	  if (string[0] == '*') {	/* SUN gremlin file */
+	    lastpoint = TRUE;
+	  } else {
+	    (void) sscanf(string, "%f%f", &x, &y);
+	    if ((x == -1.00 && y == -1.00) && (!SUNFILE))
+	      lastpoint = TRUE;
+	  }
+	}
+#endif	/* UW_FASTSCAN */
+      }
+      (void) fscanf(file, "%d%d\n", &brush, &size);
+      (void) fscanf(file, "%d", &len);	/* text length */
+      (void) getc(file);		/* eat blank */
+      txt = (char *) malloc((unsigned) len + 1);
+      for (i = 0; i < len; ++i) {	/* read text */
+	txt[i] = getc(file);
+      }
+      txt[len] = '\0';
+      (void) DBCreateElt(type, plist, brush, size, txt, &elist);
+    }				/* end else */
+  } /* end while not done */ ;
+  return (elist);
+}				/* end DBRead */
+
+
+/*
+ * Interpret element type in string s.
+ * Old file format consisted of integer element types.
+ * New file format has literal names for element types.
+ */
+int
+DBGetType(register char *s)
+{
+  if (isdigit(s[0]) || (s[0] == '-'))	/* old element format or EOF */
+    return (atoi(s));
+
+  switch (s[0]) {
+  case 'P':
+    return (POLYGON);
+  case 'V':
+    return (VECTOR);
+  case 'A':
+    return (ARC);
+  case 'C':
+    if (s[1] == 'U') {
+      if (s[5] == '\n')
+	return (CURVE);
+      switch (s[7]) {
+      case 'S': 
+	return(BSPLINE);
+      case 'E':
+	fprintf(stderr,
+		"Warning: Bezier Curves will be printed as B-Splines\n");
+	return(BSPLINE);
+      default:
+	return(CURVE);
+      }
+    }
+    switch (s[4]) {
+    case 'L':
+      return (CENTLEFT);
+    case 'C':
+      return (CENTCENT);
+    case 'R':
+      return (CENTRIGHT);
+    default:
+      fatal("unknown element type");
+    }
+  case 'B':
+    switch (s[3]) {
+    case 'L':
+      return (BOTLEFT);
+    case 'C':
+      return (BOTCENT);
+    case 'R':
+      return (BOTRIGHT);
+    default:
+      fatal("unknown element type");
+    }
+  case 'T':
+    switch (s[3]) {
+    case 'L':
+      return (TOPLEFT);
+    case 'C':
+      return (TOPCENT);
+    case 'R':
+      return (TOPRIGHT);
+    default:
+      fatal("unknown element type");
+    }
+  default:
+    fatal("unknown element type");
+  }
+
+  return 0;				/* never reached */
+}
+
+#ifdef UW_FASTSCAN
+/*
+ * Optimization hack added by solomon@crys.wisc.edu, 12/2/86.
+ * A huge fraction of the time was spent reading floating point numbers from
+ * the input file, but the numbers always have the format 'ddd.dd'.  Thus
+ * the following special-purpose version of fscanf.
+ *
+ * xscanf(f,xp,yp) does roughly what fscanf(f,"%f%f",xp,yp) does except:
+ *   -the next piece of input must be of the form
+ *      <space>* <digit>*'.'<digit>* <space>* <digit>*'.'<digit>*
+ *   -xscanf eats the character following the second number
+ *   -xscanf returns 0 for "end-of-data" indication, 1 otherwise, where
+ *    end-of-data is signalled by a '*' [in which case the rest of the
+ *    line is gobbled], or by '-1.00 -1.00' [but only if !SUNFILE].
+ */
+int
+xscanf(FILE *f,
+       float *xp,
+       float *yp)
+{
+  register int c, i, j, m, frac;
+  int iscale = 1, jscale = 1;	/* x = i/scale, y=j/jscale */
+
+  while ((c = getc(f)) == ' ');
+  if (c == '*') {
+    while ((c = getc(f)) != '\n');
+    return 0;
+  }
+  i = m = frac = 0;
+  while (isdigit(c) || c == '.' || c == '-') {
+    if (c == '-') {
+      m++;
+      c = getc(f);
+      continue;
+    }
+    if (c == '.')
+      frac = 1;
+    else {
+      if (frac)
+	iscale *= 10;
+      i = 10 * i + c - '0';
+    }
+    c = getc(f);
+  }
+  if (m)
+    i = -i;
+  *xp = (double) i / (double) iscale;
+
+  while ((c = getc(f)) == ' ');
+  j = m = frac = 0;
+  while (isdigit(c) || c == '.' || c == '-') {
+    if (c == '-') {
+      m++;
+      c = getc(f);
+      continue;
+    }
+    if (c == '.')
+      frac = 1;
+    else {
+      if (frac)
+	jscale *= 10;
+      j = 10 * j + c - '0';
+    }
+    c = getc(f);
+  }
+  if (m)
+    j = -j;
+  *yp = (double) j / (double) jscale;
+  return (SUNFILE || i != -iscale || j != -jscale);
+}
+#endif	/* UW_FASTSCAN */
+
+/* EOF */
diff --git a/contrib/groff/src/preproc/grn/hgraph.cpp b/contrib/groff/src/preproc/grn/hgraph.cpp
new file mode 100644
index 0000000..d124c6c
--- /dev/null
+++ b/contrib/groff/src/preproc/grn/hgraph.cpp
@@ -0,0 +1,1054 @@
+/* Last non-groff version: hgraph.c  1.14 (Berkeley) 84/11/27
+ *
+ * This file contains the graphics routines for converting gremlin pictures
+ * to troff input.
+ */
+
+#include "lib.h"
+
+#include "gprint.h"
+
+#ifdef NEED_DECLARATION_HYPOT
+extern "C" {
+  double hypot(double, double);
+}
+#endif /* NEED_DECLARATION_HYPOT */
+
+#define MAXVECT	40
+#define MAXPOINTS	200
+#define LINELENGTH	1
+#define PointsPerInterval 64
+#define pi		3.14159265358979324
+#define twopi		(2.0 * pi)
+#define len(a, b)	hypot((double)(b.x-a.x), (double)(b.y-a.y))
+
+
+extern int dotshifter;		/* for the length of dotted curves */
+
+extern int style[];		/* line and character styles */
+extern double thick[];
+extern char *tfont[];
+extern int tsize[];
+extern int stipple_index[];	/* stipple font index for stipples 0 - 16 */
+extern char *stipple;		/* stipple type (cf or ug) */
+
+
+extern double troffscale;	/* imports from main.c */
+extern double linethickness;
+extern int linmod;
+extern int lastx;
+extern int lasty;
+extern int lastyline;
+extern int ytop;
+extern int ybottom;
+extern int xleft;
+extern int xright;
+extern enum {
+  OUTLINE, FILL, BOTH
+} polyfill;
+
+extern double adj1;
+extern double adj2;
+extern double adj3;
+extern double adj4;
+extern int res;
+
+void HGSetFont(int font, int size);
+void HGPutText(int justify, POINT pnt, register char *string);
+void HGSetBrush(int mode);
+void tmove2(int px, int py);
+void doarc(POINT cp, POINT sp, int angle);
+void tmove(POINT * ptr);
+void cr();
+void drawwig(POINT * ptr, int type);
+void HGtline(int x1, int y1);
+void dx(double x);
+void dy(double y);
+void HGArc(register int cx, register int cy, int px, int py, int angle);
+void picurve(register int *x, register int *y, int npts);
+void HGCurve(int *x, int *y, int numpoints);
+void Paramaterize(int x[], int y[], float h[], int n);
+void PeriodicSpline(float h[], int z[],
+		    float dz[], float d2z[], float d3z[],
+		    int npoints);
+void NaturalEndSpline(float h[], int z[],
+		      float dz[], float d2z[], float d3z[],
+		      int npoints);
+
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	HGPrintElt (element_pointer, baseline)
+ |
+ | Results:	Examines a picture element and calls the appropriate
+ |		routine(s) to print them according to their type.  After the
+ |		picture is drawn, current position is (lastx, lasty).
+ *----------------------------------------------------------------------------*/
+
+void
+HGPrintElt(ELT *element,
+	   int /* baseline */)
+{
+  register POINT *p1;
+  register POINT *p2;
+  register int length;
+  register int graylevel;
+
+  if (!DBNullelt(element) && !Nullpoint((p1 = element->ptlist))) {
+    /* p1 always has first point */
+    if (TEXT(element->type)) {
+      HGSetFont(element->brushf, element->size);
+      switch (element->size) {
+      case 1:
+	p1->y += adj1;
+	break;
+      case 2:
+	p1->y += adj2;
+	break;
+      case 3:
+	p1->y += adj3;
+	break;
+      case 4:
+	p1->y += adj4;
+	break;
+      default:
+	break;
+      }
+      HGPutText(element->type, *p1, element->textpt);
+    } else {
+      if (element->brushf)		/* if there is a brush, the */
+	HGSetBrush(element->brushf);	/* graphics need it set     */
+
+      switch (element->type) {
+
+      case ARC:
+	p2 = PTNextPoint(p1);
+	tmove(p2);
+	doarc(*p1, *p2, element->size);
+	cr();
+	break;
+
+      case CURVE:
+	length = 0;	/* keep track of line length */
+	drawwig(p1, CURVE);
+	cr();
+	break;
+
+      case BSPLINE:
+	length = 0;	/* keep track of line length */
+	drawwig(p1, BSPLINE);
+	cr();
+	break;
+
+      case VECTOR:
+	length = 0;		/* keep track of line length so */
+	tmove(p1);		/* single lines don't get long  */
+	while (!Nullpoint((p1 = PTNextPoint(p1)))) {
+	  HGtline((int) (p1->x * troffscale),
+		  (int) (p1->y * troffscale));
+	  if (length++ > LINELENGTH) {
+	    length = 0;
+	    printf("\\\n");
+	  }
+	}			/* end while */
+	cr();
+	break;
+
+      case POLYGON:
+	{
+	  /* brushf = style of outline; size = color of fill:
+	   * on first pass (polyfill=FILL), do the interior using 'P'
+	   *    unless size=0
+	   * on second pass (polyfill=OUTLINE), do the outline using a series
+	   *    of vectors. It might make more sense to use \D'p ...',
+	   *    but there is no uniform way to specify a 'fill character'
+	   *    that prints as 'no fill' on all output devices (and
+	   *    stipple fonts).
+	   * If polyfill=BOTH, just use the \D'p ...' command.
+	   */
+	  float firstx = p1->x;
+	  float firsty = p1->y;
+
+	  length = 0;		/* keep track of line length so */
+				/* single lines don't get long  */
+
+	  if (polyfill == FILL || polyfill == BOTH) {
+	    /* do the interior */
+	    char command = (polyfill == BOTH && element->brushf) ? 'p' : 'P';
+
+	    /* include outline, if there is one and */
+	    /* the -p flag was set                  */
+
+	    /* switch based on what gremlin gives */
+	    switch (element->size) {
+	    case 1:
+	      graylevel = 1;
+	      break;
+	    case 3:
+	      graylevel = 2;
+	      break;
+	    case 12:
+	      graylevel = 3;
+	      break;
+	    case 14:
+	      graylevel = 4;
+	      break;
+	    case 16:
+	      graylevel = 5;
+	      break;
+	    case 19:
+	      graylevel = 6;
+	      break;
+	    case 21:
+	      graylevel = 7;
+	      break;
+	    case 23:
+	      graylevel = 8;
+	      break;
+	    default:		/* who's giving something else? */
+	      graylevel = NSTIPPLES;
+	      break;
+	    }
+	    /* int graylevel = element->size; */
+
+	    if (graylevel < 0)
+	      break;
+	    if (graylevel > NSTIPPLES)
+	      graylevel = NSTIPPLES;
+	    printf("\\D'Fg %.3f'",
+		   double(1000 - stipple_index[graylevel]) / 1000.0);
+	    cr();
+	    tmove(p1);
+	    printf("\\D'%c", command);
+
+	    while (!Nullpoint((PTNextPoint(p1)))) {
+	      p1 = PTNextPoint(p1);
+	      dx((double) p1->x);
+	      dy((double) p1->y);
+	      if (length++ > LINELENGTH) {
+		length = 0;
+		printf("\\\n");
+	      }
+	    } /* end while */
+
+	    /* close polygon if not done so by user */
+	    if ((firstx != p1->x) || (firsty != p1->y)) {
+	      dx((double) firstx);
+	      dy((double) firsty);
+	    }
+	    putchar('\'');
+	    cr();
+	    break;
+	  }
+	  /* else polyfill == OUTLINE; only draw the outline */
+	  if (!(element->brushf))
+	    break;
+	  length = 0;		/* keep track of line length */
+	  tmove(p1);
+
+	  while (!Nullpoint((PTNextPoint(p1)))) {
+	    p1 = PTNextPoint(p1);
+	    HGtline((int) (p1->x * troffscale),
+		    (int) (p1->y * troffscale));
+	    if (length++ > LINELENGTH) {
+	      length = 0;
+	      printf("\\\n");
+	    }
+	  }			/* end while */
+
+	  /* close polygon if not done so by user */
+	  if ((firstx != p1->x) || (firsty != p1->y)) {
+	    HGtline((int) (firstx * troffscale),
+		    (int) (firsty * troffscale));
+	  }
+	  cr();
+	  break;
+	}			/* end case POLYGON */
+      }				/* end switch */
+    }				/* end else Text */
+  }				/* end if */
+}				/* end PrintElt */
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	HGPutText (justification, position_point, string)
+ |
+ | Results:	Given the justification, a point to position with, and a
+ |		string to put, HGPutText first sends the string into a
+ |		diversion, moves to the positioning point, then outputs
+ |		local vertical and horizontal motions as needed to justify
+ |		the text.  After all motions are done, the diversion is
+ |		printed out.
+ *----------------------------------------------------------------------------*/
+
+void
+HGPutText(int justify,
+	  POINT pnt,
+	  register char *string)
+{
+  int savelasty = lasty;	/* vertical motion for text is to be */
+				/* ignored.  Save current y here     */
+
+  printf(".nr g8 \\n(.d\n");	/* save current vertical position. */
+  printf(".ds g9 \"");		/* define string containing the text. */
+  while (*string) {		/* put out the string */
+    if (*string == '\\' &&
+	*(string + 1) == '\\') {	/* one character at a */
+      printf("\\\\\\");			/* time replacing //  */
+      string++;				/* by //// to prevent */
+    }					/* interpretation at  */
+    printf("%c", *(string++));		/* printout time      */
+  }
+  printf("\n");
+
+  tmove(&pnt);			/* move to positioning point */
+
+  switch (justify) {
+    /* local vertical motions                                            */
+    /* (the numbers here are used to be somewhat compatible with gprint) */
+  case CENTLEFT:
+  case CENTCENT:
+  case CENTRIGHT:
+    printf("\\v'0.85n'");	/* down half */
+    break;
+
+  case TOPLEFT:
+  case TOPCENT:
+  case TOPRIGHT:
+    printf("\\v'1.7n'");	/* down whole */
+  }
+
+  switch (justify) {
+    /* local horizontal motions */
+  case BOTCENT:
+  case CENTCENT:
+  case TOPCENT:
+    printf("\\h'-\\w'\\*(g9'u/2u'");	/* back half */
+    break;
+
+  case BOTRIGHT:
+  case CENTRIGHT:
+  case TOPRIGHT:
+    printf("\\h'-\\w'\\*(g9'u'");	/* back whole */
+  }
+
+  printf("\\&\\*(g9\n");	/* now print the text. */
+  printf(".sp |\\n(g8u\n");	/* restore vertical position */
+  lasty = savelasty;		/* vertical position restored to where it */
+  lastx = xleft;		/* was before text, also horizontal is at */
+				/* left                                   */
+}				/* end HGPutText */
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	doarc (center_point, start_point, angle)
+ |
+ | Results:	Produces either drawarc command or a drawcircle command
+ |		depending on the angle needed to draw through.
+ *----------------------------------------------------------------------------*/
+
+void
+doarc(POINT cp,
+      POINT sp,
+      int angle)
+{
+  if (angle)			/* arc with angle */
+    HGArc((int) (cp.x * troffscale), (int) (cp.y * troffscale),
+	  (int) (sp.x * troffscale), (int) (sp.y * troffscale), angle);
+  else				/* a full circle (angle == 0) */
+    HGArc((int) (cp.x * troffscale), (int) (cp.y * troffscale),
+	  (int) (sp.x * troffscale), (int) (sp.y * troffscale), 0);
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	HGSetFont (font_number, Point_size)
+ |
+ | Results:	ALWAYS outputs a .ft and .ps directive to troff.  This is
+ |		done because someone may change stuff inside a text string. 
+ |		Changes thickness back to default thickness.  Default
+ |		thickness depends on font and pointsize.
+ *----------------------------------------------------------------------------*/
+
+void
+HGSetFont(int font,
+	  int size)
+{
+  printf(".ft %s\n"
+	 ".ps %d\n", tfont[font - 1], tsize[size - 1]);
+  linethickness = DEFTHICK;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	HGSetBrush (line_mode)
+ |
+ | Results:	Generates the troff commands to set up the line width and
+ |		style of subsequent lines.  Does nothing if no change is
+ |              needed.
+ |
+ | Side Efct:	Sets `linmode' and `linethicknes'.
+ *----------------------------------------------------------------------------*/
+
+void
+HGSetBrush(int mode)
+{
+  register int printed = 0;
+
+  if (linmod != style[--mode]) {
+    /* Groff doesn't understand \Ds, so we take it out */
+    /* printf ("\\D's %du'", linmod = style[mode]); */
+    linmod = style[mode];
+    printed = 1;
+  }
+  if (linethickness != thick[mode]) {
+    linethickness = thick[mode];
+    printf("\\h'-%.2fp'\\D't %.2fp'", linethickness, linethickness);
+    printed = 1;
+  }
+  if (printed)
+    cr();
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	dx (x_destination)
+ |
+ | Results:	Scales and outputs a number for delta x (with a leading
+ |		space) given `lastx' and x_destination.
+ |
+ | Side Efct:	Resets `lastx' to x_destination.
+ *----------------------------------------------------------------------------*/
+
+void
+dx(double x)
+{
+  register int ix = (int) (x * troffscale);
+
+  printf(" %du", ix - lastx);
+  lastx = ix;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	dy (y_destination)
+ |
+ | Results:	Scales and outputs a number for delta y (with a leading
+ |		space) given `lastyline' and y_destination.
+ |
+ | Side Efct:	Resets `lastyline' to y_destination.  Since `line' vertical
+ |		motions don't affect `page' ones, `lasty' isn't updated.
+ *----------------------------------------------------------------------------*/
+
+void
+dy(double y)
+{
+  register int iy = (int) (y * troffscale);
+
+  printf(" %du", iy - lastyline);
+  lastyline = iy;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	tmove2 (px, py)
+ |
+ | Results:	Produces horizontal and vertical moves for troff given the
+ |		pair of points to move to and knowing the current position. 
+ |		Also puts out a horizontal move to start the line.  This is
+ |		a variation without the .sp command.
+ *----------------------------------------------------------------------------*/
+
+void
+tmove2(int px,
+       int py)
+{
+  register int dx;
+  register int dy;
+
+  if ((dy = py - lasty)) {
+    printf("\\v'%du'", dy);
+  }
+  lastyline = lasty = py;	/* lasty is always set to current */
+  if ((dx = px - lastx)) {
+    printf("\\h'%du'", dx);
+    lastx = px;
+  }
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	tmove (point_pointer)
+ |
+ | Results:	Produces horizontal and vertical moves for troff given the
+ |		pointer of a point to move to and knowing the current
+ |		position.  Also puts out a horizontal move to start the
+ |		line.
+ *----------------------------------------------------------------------------*/
+
+void
+tmove(POINT * ptr)
+{
+  register int ix = (int) (ptr->x * troffscale);
+  register int iy = (int) (ptr->y * troffscale);
+  register int dx;
+  register int dy;
+
+  if ((dy = iy - lasty)) {
+    printf(".sp %du\n", dy);
+  }
+  lastyline = lasty = iy;	/* lasty is always set to current */
+  if ((dx = ix - lastx)) {
+    printf("\\h'%du'", dx);
+    lastx = ix;
+  }
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	cr ( )
+ |
+ | Results:	Ends off an input line.  `.sp -1' is also added to counteract
+ |		the vertical move done at the end of text lines.
+ |
+ | Side Efct:	Sets `lastx' to `xleft' for troff's return to left margin.
+ *----------------------------------------------------------------------------*/
+
+void
+cr()
+{
+  printf("\n.sp -1\n");
+  lastx = xleft;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	line ( )
+ |
+ | Results:	Draws a single solid line to (x,y).
+ *----------------------------------------------------------------------------*/
+
+void
+line(int px,
+     int py)
+{
+  printf("\\D'l");
+  printf(" %du", px - lastx);
+  printf(" %du'", py - lastyline);
+  lastx = px;
+  lastyline = lasty = py;
+}
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	drawwig (ptr, type)
+ |
+ | Results:	The point sequence found in the structure pointed by ptr is
+ |		placed in integer arrays for further manipulation by the
+ |		existing routing.  With the corresponding type parameter,
+ |		either picurve or HGCurve are called.
+ *----------------------------------------------------------------------------*/
+
+void
+drawwig(POINT * ptr,
+	int type)
+{
+  register int npts;			/* point list index */
+  int x[MAXPOINTS], y[MAXPOINTS];	/* point list */
+
+  for (npts = 1; !Nullpoint(ptr); ptr = PTNextPoint(ptr), npts++) {
+    x[npts] = (int) (ptr->x * troffscale);
+    y[npts] = (int) (ptr->y * troffscale);
+  }
+  if (--npts) {
+    if (type == CURVE) /* Use the 2 different types of curves */
+      HGCurve(&x[0], &y[0], npts);
+    else
+      picurve(&x[0], &y[0], npts);
+  }
+}
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	HGArc (xcenter, ycenter, xstart, ystart, angle)
+ |
+ | Results:	This routine plots an arc centered about (cx, cy) counter
+ |		clockwise starting from the point (px, py) through `angle'
+ |		degrees.  If angle is 0, a full circle is drawn.  It does so
+ |		by creating a draw-path around the arc whose density of
+ |		points depends on the size of the arc.
+ *----------------------------------------------------------------------------*/
+
+void
+HGArc(register int cx,
+      register int cy,
+      int px,
+      int py,
+      int angle)
+{
+  double xs, ys, resolution, fullcircle;
+  int m;
+  register int mask;
+  register int extent;
+  register int nx;
+  register int ny;
+  register int length;
+  register double epsilon;
+
+  xs = px - cx;
+  ys = py - cy;
+
+  length = 0;
+
+  resolution = (1.0 + hypot(xs, ys) / res) * PointsPerInterval;
+  /* mask = (1 << (int) log10(resolution + 1.0)) - 1; */
+  (void) frexp(resolution, &m);		/* A bit more elegant than log10 */
+  for (mask = 1; mask < m; mask = mask << 1);
+  mask -= 1;
+
+  epsilon = 1.0 / resolution;
+  fullcircle = (2.0 * pi) * resolution;
+  if (angle == 0)
+    extent = (int) fullcircle;
+  else
+    extent = (int) (angle * fullcircle / 360.0);
+
+  HGtline(px, py);
+  while (--extent >= 0) {
+    xs += epsilon * ys;
+    nx = cx + (int) (xs + 0.5);
+    ys -= epsilon * xs;
+    ny = cy + (int) (ys + 0.5);
+    if (!(extent & mask)) {
+      HGtline(nx, ny);		/* put out a point on circle */
+      if (length++ > LINELENGTH) {
+	length = 0;
+	printf("\\\n");
+      }
+    }
+  }				/* end for */
+}				/* end HGArc */
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	picurve (xpoints, ypoints, num_of_points)
+ |
+ | Results:	Draws a curve delimited by (not through) the line segments
+ |		traced by (xpoints, ypoints) point list.  This is the `Pic'
+ |		style curve.
+ *----------------------------------------------------------------------------*/
+
+void
+picurve(register int *x,
+	register int *y,
+	int npts)
+{
+  register int nseg;		/* effective resolution for each curve */
+  register int xp;		/* current point (and temporary) */
+  register int yp;
+  int pxp, pyp;			/* previous point (to make lines from) */
+  int i;			/* inner curve segment traverser */
+  int length = 0;
+  double w;			/* position factor */
+  double t1, t2, t3;		/* calculation temps */
+
+  if (x[1] == x[npts] && y[1] == y[npts]) {
+    x[0] = x[npts - 1];		/* if the lines' ends meet, make */
+    y[0] = y[npts - 1];		/* sure the curve meets          */
+    x[npts + 1] = x[2];
+    y[npts + 1] = y[2];
+  } else {			/* otherwise, make the ends of the  */
+    x[0] = x[1];		/* curve touch the ending points of */
+    y[0] = y[1];		/* the line segments                */
+    x[npts + 1] = x[npts];
+    y[npts + 1] = y[npts];
+  }
+
+  pxp = (x[0] + x[1]) / 2;	/* make the last point pointers       */
+  pyp = (y[0] + y[1]) / 2;	/* point to the start of the 1st line */
+  tmove2(pxp, pyp);
+
+  for (; npts--; x++, y++) {	/* traverse the line segments */
+    xp = x[0] - x[1];
+    yp = y[0] - y[1];
+    nseg = (int) hypot((double) xp, (double) yp);
+    xp = x[1] - x[2];
+    yp = y[1] - y[2];
+				/* `nseg' is the number of line    */
+				/* segments that will be drawn for */
+				/* each curve segment.             */
+    nseg = (int) ((double) (nseg + (int) hypot((double) xp, (double) yp)) /
+		  res * PointsPerInterval);
+
+    for (i = 1; i < nseg; i++) {
+      w = (double) i / (double) nseg;
+      t1 = w * w;
+      t3 = t1 + 1.0 - (w + w);
+      t2 = 2.0 - (t3 + t1);
+      xp = (((int) (t1 * x[2] + t2 * x[1] + t3 * x[0])) + 1) / 2;
+      yp = (((int) (t1 * y[2] + t2 * y[1] + t3 * y[0])) + 1) / 2;
+
+      HGtline(xp, yp);
+      if (length++ > LINELENGTH) {
+	length = 0;
+	printf("\\\n");
+      }
+    }
+  }
+}
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	HGCurve(xpoints, ypoints, num_points)
+ |
+ | Results:	This routine generates a smooth curve through a set of
+ |		points.  The method used is the parametric spline curve on
+ |		unit knot mesh described in `Spline Curve Techniques' by
+ |		Patrick Baudelaire, Robert Flegal, and Robert Sproull --
+ |		Xerox Parc.
+ *----------------------------------------------------------------------------*/
+
+void
+HGCurve(int *x,
+	int *y,
+	int numpoints)
+{
+  float h[MAXPOINTS], dx[MAXPOINTS], dy[MAXPOINTS];
+  float d2x[MAXPOINTS], d2y[MAXPOINTS], d3x[MAXPOINTS], d3y[MAXPOINTS];
+  float t, t2, t3;
+  register int j;
+  register int k;
+  register int nx;
+  register int ny;
+  int lx, ly;
+  int length = 0;
+
+  lx = x[1];
+  ly = y[1];
+  tmove2(lx, ly);
+
+  /*
+   * Solve for derivatives of the curve at each point separately for x and y
+   * (parametric).
+   */
+  Paramaterize(x, y, h, numpoints);
+
+  /* closed curve */
+  if ((x[1] == x[numpoints]) && (y[1] == y[numpoints])) {
+    PeriodicSpline(h, x, dx, d2x, d3x, numpoints);
+    PeriodicSpline(h, y, dy, d2y, d3y, numpoints);
+  } else {
+    NaturalEndSpline(h, x, dx, d2x, d3x, numpoints);
+    NaturalEndSpline(h, y, dy, d2y, d3y, numpoints);
+  }
+
+  /*
+   * generate the curve using the above information and PointsPerInterval
+   * vectors between each specified knot.
+   */
+
+  for (j = 1; j < numpoints; ++j) {
+    if ((x[j] == x[j + 1]) && (y[j] == y[j + 1]))
+      continue;
+    for (k = 0; k <= PointsPerInterval; ++k) {
+      t = (float) k *h[j] / (float) PointsPerInterval;
+      t2 = t * t;
+      t3 = t * t * t;
+      nx = x[j] + (int) (t * dx[j] + t2 * d2x[j] / 2 + t3 * d3x[j] / 6);
+      ny = y[j] + (int) (t * dy[j] + t2 * d2y[j] / 2 + t3 * d3y[j] / 6);
+      HGtline(nx, ny);
+      if (length++ > LINELENGTH) {
+	length = 0;
+	printf("\\\n");
+      }
+    }				/* end for k */
+  }				/* end for j */
+}				/* end HGCurve */
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	Paramaterize (xpoints, ypoints, hparams, num_points)
+ |
+ | Results:	This routine calculates parameteric values for use in
+ |		calculating curves.  The parametric values are returned
+ |		in the array h.  The values are an approximation of
+ |		cumulative arc lengths of the curve (uses cord length).
+ |		For additional information, see paper cited below.
+ *----------------------------------------------------------------------------*/
+
+void
+Paramaterize(int x[],
+	     int y[],
+	     float h[],
+	     int n)
+{
+  register int dx;
+  register int dy;
+  register int i;
+  register int j;
+  float u[MAXPOINTS];
+
+  for (i = 1; i <= n; ++i) {
+    u[i] = 0;
+    for (j = 1; j < i; j++) {
+      dx = x[j + 1] - x[j];
+      dy = y[j + 1] - y[j];
+      /* Here was overflowing, so I changed it.       */
+      /* u[i] += sqrt ((double) (dx * dx + dy * dy)); */
+      u[i] += hypot((double) dx, (double) dy);
+    }
+  }
+  for (i = 1; i < n; ++i)
+    h[i] = u[i + 1] - u[i];
+}				/* end Paramaterize */
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	PeriodicSpline (h, z, dz, d2z, d3z, npoints)
+ |
+ | Results:	This routine solves for the cubic polynomial to fit a spline
+ |		curve to the the points specified by the list of values. 
+ |		The Curve generated is periodic.  The algorithms for this
+ |		curve are from the `Spline Curve Techniques' paper cited
+ |		above.
+ *----------------------------------------------------------------------------*/
+
+void
+PeriodicSpline(float h[],	/* paramaterization  */
+	       int z[],		/* point list */
+	       float dz[],	/* to return the 1st derivative */
+	       float d2z[],	/* 2nd derivative */
+	       float d3z[],	/* 3rd derivative */
+	       int npoints)	/* number of valid points */
+{
+  float d[MAXPOINTS];
+  float deltaz[MAXPOINTS], a[MAXPOINTS], b[MAXPOINTS];
+  float c[MAXPOINTS], r[MAXPOINTS], s[MAXPOINTS];
+  int i;
+
+  /* step 1 */
+  for (i = 1; i < npoints; ++i) {
+    deltaz[i] = h[i] ? ((double) (z[i + 1] - z[i])) / h[i] : 0;
+  }
+  h[0] = h[npoints - 1];
+  deltaz[0] = deltaz[npoints - 1];
+
+  /* step 2 */
+  for (i = 1; i < npoints - 1; ++i) {
+    d[i] = deltaz[i + 1] - deltaz[i];
+  }
+  d[0] = deltaz[1] - deltaz[0];
+
+  /* step 3a */
+  a[1] = 2 * (h[0] + h[1]);
+  b[1] = d[0];
+  c[1] = h[0];
+  for (i = 2; i < npoints - 1; ++i) {
+    a[i] = 2 * (h[i - 1] + h[i]) -
+	   pow((double) h[i - 1], (double) 2.0) / a[i - 1];
+    b[i] = d[i - 1] - h[i - 1] * b[i - 1] / a[i - 1];
+    c[i] = -h[i - 1] * c[i - 1] / a[i - 1];
+  }
+
+  /* step 3b */
+  r[npoints - 1] = 1;
+  s[npoints - 1] = 0;
+  for (i = npoints - 2; i > 0; --i) {
+    r[i] = -(h[i] * r[i + 1] + c[i]) / a[i];
+    s[i] = (6 * b[i] - h[i] * s[i + 1]) / a[i];
+  }
+
+  /* step 4 */
+  d2z[npoints - 1] = (6 * d[npoints - 2] - h[0] * s[1]
+		      - h[npoints - 1] * s[npoints - 2])
+		     / (h[0] * r[1] + h[npoints - 1] * r[npoints - 2]
+		      + 2 * (h[npoints - 2] + h[0]));
+  for (i = 1; i < npoints - 1; ++i) {
+    d2z[i] = r[i] * d2z[npoints - 1] + s[i];
+  }
+  d2z[npoints] = d2z[1];
+
+  /* step 5 */
+  for (i = 1; i < npoints; ++i) {
+    dz[i] = deltaz[i] - h[i] * (2 * d2z[i] + d2z[i + 1]) / 6;
+    d3z[i] = h[i] ? (d2z[i + 1] - d2z[i]) / h[i] : 0;
+  }
+}				/* end PeriodicSpline */
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	NaturalEndSpline (h, z, dz, d2z, d3z, npoints)
+ |
+ | Results:	This routine solves for the cubic polynomial to fit a spline
+ |		curve the the points specified by the list of values.  The
+ |		alogrithms for this curve are from the `Spline Curve
+ |		Techniques' paper cited above.
+ *----------------------------------------------------------------------------*/
+
+void
+NaturalEndSpline(float h[],	/* parameterization */
+		 int z[],	/* Point list */
+		 float dz[],	/* to return the 1st derivative */
+		 float d2z[],	/* 2nd derivative */
+		 float d3z[],	/* 3rd derivative */
+		 int npoints)	/* number of valid points */
+{
+  float d[MAXPOINTS];
+  float deltaz[MAXPOINTS], a[MAXPOINTS], b[MAXPOINTS];
+  int i;
+
+  /* step 1 */
+  for (i = 1; i < npoints; ++i) {
+    deltaz[i] = h[i] ? ((double) (z[i + 1] - z[i])) / h[i] : 0;
+  }
+  deltaz[0] = deltaz[npoints - 1];
+
+  /* step 2 */
+  for (i = 1; i < npoints - 1; ++i) {
+    d[i] = deltaz[i + 1] - deltaz[i];
+  }
+  d[0] = deltaz[1] - deltaz[0];
+
+  /* step 3 */
+  a[0] = 2 * (h[2] + h[1]);
+  b[0] = d[1];
+  for (i = 1; i < npoints - 2; ++i) {
+    a[i] = 2 * (h[i + 1] + h[i + 2]) -
+	    pow((double) h[i + 1], (double) 2.0) / a[i - 1];
+    b[i] = d[i + 1] - h[i + 1] * b[i - 1] / a[i - 1];
+  }
+
+  /* step 4 */
+  d2z[npoints] = d2z[1] = 0;
+  for (i = npoints - 1; i > 1; --i) {
+    d2z[i] = (6 * b[i - 2] - h[i] * d2z[i + 1]) / a[i - 2];
+  }
+
+  /* step 5 */
+  for (i = 1; i < npoints; ++i) {
+    dz[i] = deltaz[i] - h[i] * (2 * d2z[i] + d2z[i + 1]) / 6;
+    d3z[i] = h[i] ? (d2z[i + 1] - d2z[i]) / h[i] : 0;
+  }
+}				/* end NaturalEndSpline */
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	change (x_position, y_position, visible_flag)
+ |
+ | Results:	As HGtline passes from the invisible to visible (or vice
+ |		versa) portion of a line, change is called to either draw
+ |		the line, or initialize the beginning of the next one.
+ |		Change calls line to draw segments if visible_flag is set
+ |		(which means we're leaving a visible area).
+ *----------------------------------------------------------------------------*/
+
+void
+change(register int x,
+       register int y,
+       register int vis)
+{
+  static int length = 0;
+
+  if (vis) {			/* leaving a visible area, draw it. */
+    line(x, y);
+    if (length++ > LINELENGTH) {
+      length = 0;
+      printf("\\\n");
+    }
+  } else {			/* otherwise, we're entering one, remember */
+				/* beginning                               */
+    tmove2(x, y);
+  }
+}
+
+
+/*----------------------------------------------------------------------------
+ | Routine:	HGtline (xstart, ystart, xend, yend)
+ |
+ | Results:	Draws a line from current position to (x1,y1) using line(x1,
+ |		y1) to place individual segments of dotted or dashed lines.
+ *----------------------------------------------------------------------------*/
+
+void
+HGtline(int x1,
+	int y1)
+{
+  register int x0 = lastx;
+  register int y0 = lasty;
+  register int dx;
+  register int dy;
+  register int oldcoord;
+  register int res1;
+  register int visible;
+  register int res2;
+  register int xinc;
+  register int yinc;
+  register int dotcounter;
+
+  if (linmod == SOLID) {
+    line(x1, y1);
+    return;
+  }
+
+  /* for handling different resolutions */
+  dotcounter = linmod << dotshifter;
+
+  xinc = 1;
+  yinc = 1;
+  if ((dx = x1 - x0) < 0) {
+    xinc = -xinc;
+    dx = -dx;
+  }
+  if ((dy = y1 - y0) < 0) {
+    yinc = -yinc;
+    dy = -dy;
+  }
+  res1 = 0;
+  res2 = 0;
+  visible = 0;
+  if (dx >= dy) {
+    oldcoord = y0;
+    while (x0 != x1) {
+      if ((x0 & dotcounter) && !visible) {
+	change(x0, y0, 0);
+	visible = 1;
+      } else if (visible && !(x0 & dotcounter)) {
+	change(x0 - xinc, oldcoord, 1);
+	visible = 0;
+      }
+      if (res1 > res2) {
+	oldcoord = y0;
+	res2 += dx - res1;
+	res1 = 0;
+	y0 += yinc;
+      }
+      res1 += dy;
+      x0 += xinc;
+    }
+  } else {
+    oldcoord = x0;
+    while (y0 != y1) {
+      if ((y0 & dotcounter) && !visible) {
+	change(x0, y0, 0);
+	visible = 1;
+      } else if (visible && !(y0 & dotcounter)) {
+	change(oldcoord, y0 - yinc, 1);
+	visible = 0;
+      }
+      if (res1 > res2) {
+	oldcoord = x0;
+	res2 += dy - res1;
+	res1 = 0;
+	x0 += xinc;
+      }
+      res1 += dx;
+      y0 += yinc;
+    }
+  }
+  if (visible)
+    change(x1, y1, 1);
+  else
+    change(x1, y1, 0);
+}
+
+/* EOF */
diff --git a/contrib/groff/src/preproc/grn/hpoint.cpp b/contrib/groff/src/preproc/grn/hpoint.cpp
new file mode 100644
index 0000000..f4e1ca8
--- /dev/null
+++ b/contrib/groff/src/preproc/grn/hpoint.cpp
@@ -0,0 +1,49 @@
+/* Last non-groff version: hpoint.c  1.1  84/10/08 */
+
+/*
+ * This file contains routines for manipulating the point data structures
+ * for the gremlin picture editor.
+ */
+
+#include <stdlib.h>
+#include "gprint.h"
+
+
+/*
+ * Return pointer to empty point list.
+ */
+POINT *
+PTInit()
+{
+  return ((POINT *) NULL);
+}
+
+
+/*
+ * This routine creates a new point with coordinates x and y and links it
+ * into the pointlist.
+ */
+POINT *
+PTMakePoint(float x,
+	    float y,
+	    POINT **pplist)
+{
+  register POINT *point;
+
+  if (Nullpoint(point = *pplist)) {	/* empty list */
+    *pplist = (POINT *) malloc(sizeof(POINT));
+    point = *pplist;
+  } else {
+    while (!Nullpoint(point->nextpt))
+      point = point->nextpt;
+    point->nextpt = (POINT *) malloc(sizeof(POINT));
+    point = point->nextpt;
+  }
+
+  point->x = x;
+  point->y = y;
+  point->nextpt = PTInit();
+  return (point);
+}				/* end PTMakePoint */
+
+/* EOF */
diff --git a/contrib/groff/src/preproc/grn/main.cpp b/contrib/groff/src/preproc/grn/main.cpp
new file mode 100644
index 0000000..150b78f
--- /dev/null
+++ b/contrib/groff/src/preproc/grn/main.cpp
@@ -0,0 +1,907 @@
+/* Last non-groff version: main.c 1.23  (Berkeley)  85/08/05
+ *
+ * Adapted to GNU troff by Daniel Senderowicz 99/12/29.
+ *
+ * Further refinements by Werner Lemberg 00/02/20.
+ *
+ *
+ * This file contains the main and file system dependent routines for
+ * processing gremlin files into troff input.  The program watches input go
+ * by to standard output, only interpreting things between .GS and .GE
+ * lines.  Default values (font, size, scale, thickness) may be overridden
+ * with a `default' command and are further overridden by commands in the
+ * input.
+ *
+ * Inside the GS and GE, commands are accepted to reconfigure the picture. 
+ * At most one command may reside on each line, and each command is followed
+ * by a parameter separated by white space.  The commands are as follows,
+ * and may be abbreviated down to one character (with exception of `scale'
+ * and `stipple' down to "sc" and "st") and may be upper or lower case.
+ *
+ *                        default  -  Make all settings in the current
+ *                                    .GS/.GE the global defaults.  Height,
+ *                                    width and file are NOT saved.
+ *                     1, 2, 3, 4  -  Set size 1, 2, 3, or 4 (followed by an
+ *                                    integer point size).
+ *  roman, italics, bold, special  -  Set gremlin's fonts to any other troff
+ *                                    font (one or two characters).
+ *                     stipple, l  -  Use a stipple font for polygons.  Arg
+ *                                    is troff font name.  No Default.  Can
+ *                                    use only one stipple font per picture. 
+ *                                    (See below for stipple font index.)
+ *                       scale, x  -  Scale is IN ADDITION to the global
+ *                                    scale factor from the default.
+ *                     pointscale  -  Turn on scaling point sizes to match
+ *                                    `scale' commands.  (Optional operand
+ *                                    `off' to turn it off.)
+ *          narrow, medium, thick  -  Set widths of lines.
+ *                           file  -  Set the file name to read the gremlin
+ *                                    picture from.  If the file isn't in
+ *                                    the current directory, the gremlin
+ *                                    library is tried.
+ *                  width, height  -  These two commands override any
+ *                                    scaling factor that is in effect, and
+ *                                    forces the picture to fit into either
+ *                                    the height or width specified,
+ *                                    whichever makes the picture smaller. 
+ *                                    The operand for these two commands is
+ *                                    a floating-point number in units of
+ *                                    inches.
+ *            l<nn> (integer <nn>) -  Set association between stipple <nn>
+ *                                    and a stipple `character'.  <nn> must
+ *                                    be in the range 0 to NSTIPPLES (16)
+ *                                    inclusive.  The integer operand is an
+ *                                    index in the stipple font selected. 
+ *                                    Valid cf (cifplot) indices are 1-32
+ *                                    (although 24 is not defined), valid ug
+ *                                    (unigrafix) indices are 1-14, and
+ *                                    valid gs (gray scale) indices are
+ *                                    0-16.  Nonetheless, any number between
+ *                                    0 and 255 is accepted since new
+ *                                    stipple fonts may be added.  An
+ *                                    integer operand is required.
+ *
+ * Troff number registers used:  g1 through g9.  g1 is the width of the
+ * picture, and g2 is the height.  g3, and g4, save information, g8 and g9
+ * are used for text processing and g5-g7 are reserved.
+ */
+
+
+#include "lib.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include "gprint.h"
+
+#include "device.h"
+#include "font.h"
+#include "searchpath.h"
+#include "macropath.h"
+
+#include "errarg.h"
+#include "error.h"
+#include "defs.h"
+
+extern "C" const char *Version_string;
+
+/* database imports */
+
+extern void HGPrintElt(ELT *element, int baseline);
+extern ELT *DBInit();
+extern ELT *DBRead(register FILE *file);
+extern POINT *PTInit();
+extern POINT *PTMakePoint(float x, float y, POINT **pplist);
+
+
+#define SUN_SCALEFACTOR 0.70
+
+/* #define DEFSTIPPLE    "gs" */
+#define DEFSTIPPLE	"cf"
+
+#define MAXINLINE	100	/* input line length */
+
+#define SCREENtoINCH	0.02	/* scaling factor, screen to inches */
+
+#define BIG	999999999999.0	/* unweildly large floating number */
+
+
+static char sccsid[] = "@(#) (Berkeley) 8/5/85, 12/28/99";
+
+int res;			/* the printer's resolution goes here */
+
+int dotshifter;			/* for the length of dotted curves */
+
+double linethickness;		/* brush styles */
+int linmod;
+int lastx;			/* point registers for printing elements */
+int lasty;
+int lastyline;			/* A line's vertical position is NOT the  */
+				/* same after that line is over, so for a */
+				/* line of drawing commands, vertical     */
+				/* spacing is kept in lastyline           */
+
+/* These are the default fonts, sizes, line styles, */
+/* and thicknesses.  They can be modified from a    */
+/* `default' command and are reset each time the    */
+/* start of a picture (.GS) is found.               */
+
+char *deffont[] =
+{"R", "I", "B", "S"};
+int defsize[] =
+{10, 16, 24, 36};
+/* #define BASE_THICKNESS 1.0 */
+#define BASE_THICKNESS 0.15
+double defthick[STYLES] =
+{1 * BASE_THICKNESS,
+ 1 * BASE_THICKNESS,
+ 5 * BASE_THICKNESS,
+ 1 * BASE_THICKNESS,
+ 1 * BASE_THICKNESS,
+ 3 * BASE_THICKNESS};
+
+/* int cf_stipple_index[NSTIPPLES + 1] =                                  */
+/* {0, 1, 3, 12, 14, 16, 19, 21, 23};                                     */
+/* a logarithmic scale looks better than a linear one for the gray shades */
+/*                                                                        */
+/* int other_stipple_index[NSTIPPLES + 1] =                               */
+/* {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};            */
+
+int cf_stipple_index[NSTIPPLES + 1] =
+{0, 18, 32, 56, 100, 178, 316, 562, 1000};	/* only 1-8 used */
+int other_stipple_index[NSTIPPLES + 1] =
+{0, 62, 125, 187, 250, 312, 375, 437, 500,
+ 562, 625, 687, 750, 812, 875, 937, 1000};
+
+/* int *defstipple_index = other_stipple_index; */
+int *defstipple_index = cf_stipple_index;
+
+int style[STYLES] =
+{DOTTED, DOTDASHED, SOLID, DASHED, SOLID, SOLID};
+double scale = 1.0;		/* no scaling, default */
+int defpoint = 0;		/* flag for pointsize scaling */
+char *defstipple = (char *) 0;
+enum {
+  OUTLINE, FILL, BOTH
+} polyfill;
+
+/* flag to controll filling of polygons */
+
+double adj1 = 0.0;
+double adj2 = 0.0;
+double adj3 = 0.0;
+double adj4 = 0.0;
+
+double thick[STYLES];		/* thicknesses set by defaults, then by */
+				/* commands                             */
+char *tfont[FONTS];		/* fonts originally set to deffont values, */
+				/* then                                    */
+int tsize[SIZES];		/* optionally changed by commands inside */
+				/* grn                                   */
+int stipple_index[NSTIPPLES + 1];	/* stipple font file indices */
+char *stipple;
+
+double xscale;			/* scaling factor from individual pictures */
+double troffscale;		/* scaling factor at output time */
+
+double width;			/* user-request maximum width for picture */
+				/* (in inches)                            */
+double height;			/* user-request height */
+int pointscale;			/* flag for pointsize scaling */
+int setdefault;			/* flag for a .GS/.GE to remember all */
+				/* settings                           */
+int sflag;			/* -s flag: sort order (do polyfill first) */
+
+double toppoint;		/* remember the picture */
+double bottompoint;		/* bounds in these variables */
+double leftpoint;
+double rightpoint;
+
+int ytop;			/* these are integer versions of the above */
+int ybottom;			/* so not to convert each time they're used */
+int xleft;
+int xright;
+
+int linenum = 0;		/* line number of input file */
+char inputline[MAXINLINE];	/* spot to filter through the file */
+char *c1 = inputline;		/* c1, c2, and c3 will be used to */
+char *c2 = inputline + 1;	/* hunt for lines that begin with */
+char *c3 = inputline + 2;	/* ".GS" by looking individually */
+char *c4 = inputline + 3;	/* needed for compatibility mode */
+char GScommand[MAXINLINE];	/* put user's ".GS" command line here */
+char gremlinfile[MAXINLINE];	/* filename to use for a picture */
+int SUNFILE = FALSE;		/* TRUE if SUN gremlin file */
+int compatibility_flag = FALSE;	/* TRUE if in compatibility mode */
+
+
+void getres();
+char *doinput(FILE *fp);
+void conv(register FILE *fp, int baseline);
+void savestate();
+int has_polygon(register ELT *elist);
+void interpret(char *line);
+
+
+void
+usage(FILE *stream)
+{
+  fprintf(stream,
+	  "usage: %s [ -vCs ] [ -M dir ] [ -F dir ] [ -T dev ] [ file ]\n",
+	  program_name);
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	main (argument_count, argument_pointer)
+ |
+ | Results:	Parses the command line, accumulating input file names, then
+ |		reads the inputs, passing it directly to output until a `.GS'
+ |		line is read.  Main then passes control to `conv' to do the
+ |		gremlin file conversions.
+ *----------------------------------------------------------------------------*/
+
+int
+main(int argc,
+     char **argv)
+{
+  setlocale(LC_NUMERIC, "C");
+  program_name = argv[0];
+  register FILE *fp;
+  register int k;
+  register char c;
+  register int gfil = 0;
+  char *file[50];
+  char *operand(int *argcp, char ***argvp);
+
+  while (--argc) {
+    if (**++argv != '-')
+      file[gfil++] = *argv;
+    else
+      switch (c = (*argv)[1]) {
+
+      case 0:
+	file[gfil++] = NULL;
+	break;
+
+      case 'C':		/* compatibility mode */
+	compatibility_flag = TRUE;
+	break;
+
+      case 'F':		/* font path to find DESC */
+	font::command_line_font_dir(operand(&argc, &argv));
+	break;
+
+      case 'T':		/* final output typesetter name */
+	device = operand(&argc, &argv);
+	break;
+
+      case 'M':		/* set library directory */
+	macro_path.command_line_dir(operand(&argc, &argv));
+	break;
+
+      case 's':		/* preserve order of elements */
+	sflag = 1;
+	break;
+
+      case '-':
+	if (strcmp(*argv,"--version")==0) {
+      case 'v':
+	  printf("GNU grn (groff) version %s\n", Version_string);
+	  exit(0);
+	  break;
+	}
+	if (strcmp(*argv,"--help")==0) {
+      case '?':
+	  usage(stdout);
+	  exit(0);
+	  break;
+	}
+	// fallthrough
+      default:
+	error("unknown switch: %1", c);
+	usage(stderr);
+	exit(1);
+      }
+  }
+
+  getres();			/* set the resolution for an output device */
+
+  if (gfil == 0) {		/* no filename, use standard input */
+    file[0] = NULL;
+    gfil++;
+  }
+
+  for (k = 0; k < gfil; k++) {
+    if (file[k] != NULL) {
+      if ((fp = fopen(file[k], "r")) == NULL)
+	fatal("can't open %1", file[k]);
+    } else
+      fp = stdin;
+
+    while (doinput(fp) != NULL) {
+      if (*c1 == '.' && *c2 == 'G' && *c3 == 'S') {
+	if (compatibility_flag ||
+	    *c4 == '\n' || *c4 == ' ' || *c4 == '\0')
+	  conv(fp, linenum);
+	else
+	  fputs(inputline, stdout);
+      } else
+	fputs(inputline, stdout);
+    }
+  }
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	char  * operand (& argc, & argv)
+ |
+ | Results:	Returns address of the operand given with a command-line
+ |		option.  It uses either `-Xoperand' or `-X operand', whichever
+ |		is present.  The program is terminated if no option is
+ |		present.
+ |
+ | Side Efct:	argc and argv are updated as necessary.
+ *----------------------------------------------------------------------------*/
+
+char *
+operand(int *argcp,
+	char ***argvp)
+{
+  if ((**argvp)[2])
+    return (**argvp + 2);	/* operand immediately follows */
+  if ((--*argcp) <= 0) {	/* no operand */
+    error("command-line option operand missing.");
+    exit(8);
+  }
+  return (*(++(*argvp)));	/* operand is next word */
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	getres ()
+ |
+ | Results:	Sets `res' to the resolution of the output device.
+ *----------------------------------------------------------------------------*/
+
+void
+getres()
+{
+  int linepiece;
+
+  if (!font::load_desc())
+    fatal("sorry, I can't continue");
+
+  res = font::res;
+
+  /* Correct the brush thicknesses based on res */
+  /* if (res >= 256) {
+      defthick[0] = res >> 8;
+      defthick[1] = res >> 8;
+      defthick[2] = res >> 4;
+      defthick[3] = res >> 8;
+      defthick[4] = res >> 8;
+      defthick[5] = res >> 6;
+      } */
+
+  linepiece = res >> 9;
+  for (dotshifter = 0; linepiece; dotshifter++)
+    linepiece = linepiece >> 1;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	char  * doinput (file_pointer)
+ |
+ | Results:	A line of input is read into `inputline'.
+ |
+ | Side Efct:	"linenum" is incremented.
+ |
+ | Bugs:	Lines longer than MAXINLINE are NOT checked, except for 
+ |		updating `linenum'.
+ *----------------------------------------------------------------------------*/
+
+char *
+doinput(FILE *fp)
+{
+  char *k;
+
+  if ((k = fgets(inputline, MAXINLINE, fp)) == NULL)
+    return k;
+  if (strchr(inputline, '\n'))	/* ++ only if it's a complete line */
+    linenum++;
+  return (char *) !NULL;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	initpic ( )
+ |
+ | Results:	Sets all parameters to the normal defaults, possibly
+ |		overridden by a setdefault command.  Initialize the picture
+ |		variables, and output the startup commands to troff to begin
+ |		the picture.
+ *----------------------------------------------------------------------------*/
+
+void
+initpic()
+{
+  register int i;
+
+  for (i = 0; i < STYLES; i++) {	/* line thickness defaults */
+    thick[i] = defthick[i];
+  }
+  for (i = 0; i < FONTS; i++) {		/* font name defaults */
+    tfont[i] = deffont[i];
+  }
+  for (i = 0; i < SIZES; i++) {		/* font size defaults */
+    tsize[i] = defsize[i];
+  }
+  for (i = 0; i <= NSTIPPLES; i++) {	/* stipple font file default indices */
+    stipple_index[i] = defstipple_index[i];
+  }
+  stipple = defstipple;
+
+  gremlinfile[0] = 0;		/* filename is `null' */
+  setdefault = 0;		/* this is not the default settings (yet) */
+
+  toppoint = BIG;		/* set the picture bounds out */
+  bottompoint = -BIG;		/* of range so they'll be set */
+  leftpoint = BIG;		/* by `savebounds' on input */
+  rightpoint = -BIG;
+
+  pointscale = defpoint;	/* flag for scaling point sizes default */
+  xscale = scale;		/* default scale of individual pictures */
+  width = 0.0;			/* size specifications input by user */
+  height = 0.0;
+
+  linethickness = DEFTHICK;	/* brush styles */
+  linmod = DEFSTYLE;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	conv (file_pointer, starting_line)
+ |
+ | Results:	At this point, we just passed a `.GS' line in the input
+ |		file.  conv reads the input and calls `interpret' to process
+ |		commands, gathering up information until a `.GE' line is
+ |		found.  It then calls `HGPrint' to do the translation of the
+ |		gremlin file to troff commands.
+ *----------------------------------------------------------------------------*/
+
+void
+conv(register FILE *fp,
+     int baseline)
+{
+  register FILE *gfp = NULL;	/* input file pointer */
+  register int done = 0;	/* flag to remember if finished */
+  register ELT *e;		/* current element pointer */
+  ELT *PICTURE;			/* whole picture data base pointer */
+  double temp;			/* temporary calculating area */
+  /* POINT ptr; */		/* coordinates of a point to pass to `mov' */
+				/* routine                                 */
+  int flyback;			/* flag `want to end up at the top of the */
+				/* picture?'                              */
+  int compat;			/* test character after .GE or .GF */
+
+
+  initpic();			/* set defaults, ranges, etc. */
+  strcpy(GScommand, inputline);	/* save `.GS' line for later */
+
+  do {
+    done = (doinput(fp) == NULL);	/* test for EOF */
+    flyback = (*c3 == 'F');		/* and .GE or .GF */
+    compat = (compatibility_flag ||
+	      *c4 == '\n' || *c4 == ' ' || *c4 == '\0');
+    done |= (*c1 == '.' && *c2 == 'G' && (*c3 == 'E' || flyback) &&
+	     compat);
+
+    if (done) {
+      if (setdefault)
+	savestate();
+
+      if (!gremlinfile[0]) {
+	if (!setdefault)
+	  error("at line %1: no picture filename.\n", baseline);
+	return;
+      }
+      char *path;
+      gfp = macro_path.open_file(gremlinfile, &path);
+      if (!gfp)
+	return;
+      PICTURE = DBRead(gfp);	/* read picture file */
+      fclose(gfp);
+      a_delete path;
+      if (DBNullelt(PICTURE))
+	return;			/* If a request is made to make the  */
+				/* picture fit into a specific area, */
+				/* set the scale to do that.         */
+
+      if (stipple == (char *) NULL)	/* if user forgot stipple    */
+	if (has_polygon(PICTURE))	/* and picture has a polygon */
+	  stipple = DEFSTIPPLE;		/* then set the default      */
+
+      if ((temp = bottompoint - toppoint) < 0.1)
+	temp = 0.1;
+      temp = (height != 0.0) ? height / (temp * SCREENtoINCH) : BIG;
+      if ((troffscale = rightpoint - leftpoint) < 0.1)
+	troffscale = 0.1;
+      troffscale = (width != 0.0) ?
+	  width / (troffscale * SCREENtoINCH) : BIG;
+      if (temp == BIG && troffscale == BIG)
+	troffscale = xscale;
+      else {
+	if (temp < troffscale)
+	  troffscale = temp;
+      }				/* here, troffscale is the */
+				/* picture's scaling factor */
+      if (pointscale) {
+	register int i;		/* do pointscaling here, when */
+				/* scale is known, before output */
+	for (i = 0; i < SIZES; i++)
+	  tsize[i] = (int) (troffscale * (double) tsize[i] + 0.5);
+      }
+
+						/* change to device units */
+      troffscale *= SCREENtoINCH * res;		/* from screen units */
+
+      ytop = (int) (toppoint * troffscale);		/* calculate integer */
+      ybottom = (int) (bottompoint * troffscale);	/* versions of the   */
+      xleft = (int) (leftpoint * troffscale);		/* picture limits    */
+      xright = (int) (rightpoint * troffscale);
+
+      /* save stuff in number registers,    */
+      /*   register g1 = picture width and  */
+      /*   register g2 = picture height,    */
+      /*   set vertical spacing, no fill,   */
+      /*   and break (to make sure picture  */
+      /*   starts on left), and put out the */
+      /*   user's `.GS' line.               */
+      printf(".br\n"
+	     ".nr g1 %du\n"
+	     ".nr g2 %du\n"
+	     "%s"
+	     ".nr g3 \\n(.f\n"
+	     ".nr g4 \\n(.s\n"
+	     "\\0\n"
+	     ".sp -1\n",
+	     xright - xleft, ybottom - ytop, GScommand);
+
+      if (stipple)		/* stipple requested for this picture */
+	printf(".st %s\n", stipple);
+      lastx = xleft;		/* note where we are (upper left */
+      lastyline = lasty = ytop;	/* corner of the picture)        */
+
+      /* Just dump everything in the order it appears.
+       *
+       * If -s command-line option, traverse picture twice: First time,
+       * print only the interiors of filled polygons (as borderless
+       * polygons).  Second time, print the outline as series of line
+       * segments.  This way, postprocessors that overwrite rather than
+       * merge picture elements (such as Postscript) can still have text and
+       * graphics on a shaded background.
+       */
+      /* if (sflag) */
+      if (!sflag) {		/* changing the default for filled polygons */
+	e = PICTURE;
+	polyfill = FILL;
+	while (!DBNullelt(e)) {
+	  printf(".mk\n");
+	  if (e->type == POLYGON)
+	    HGPrintElt(e, baseline);
+	  printf(".rt\n");
+	  lastx = xleft;
+	  lastyline = lasty = ytop;
+	  e = DBNextElt(e);
+	}
+      }
+      e = PICTURE;
+
+      /* polyfill = !sflag ? BOTH : OUTLINE; */
+      polyfill = sflag ? BOTH : OUTLINE;	/* changing the default */
+      while (!DBNullelt(e)) {
+	printf(".mk\n");
+	HGPrintElt(e, baseline);
+	printf(".rt\n");
+	lastx = xleft;
+	lastyline = lasty = ytop;
+	e = DBNextElt(e);
+      }
+
+      /* decide where to end picture */
+
+      /* I changed everything here.  I always use the combination .mk and */
+      /* .rt so once finished I just space down the heigth of the picture */
+      /* that is \n(g2u                                                   */
+      if (flyback) {		/* end picture at upper left */
+	/* ptr.x = leftpoint;
+	   ptr.y = toppoint; */
+      } else {			/* end picture at lower left */
+	/* ptr.x = leftpoint;
+	   ptr.y = bottompoint; */
+	printf(".sp \\n(g2u\n");
+      }
+
+      /* tmove(&ptr); */	/* restore default line parameters */
+
+      /* restore everything to the way it was before the .GS, then put */
+      /* out the `.GE' line from user                                  */
+
+      /* printf("\\D't %du'\\D's %du'\n", DEFTHICK, DEFSTYLE); */
+      /* groff doesn't understand the \Ds command */
+
+      printf("\\D't %du'\n", DEFTHICK);
+      if (flyback)		/* make sure we end up at top of */
+	printf(".sp -1\n");	/* picture if `flying back'      */
+      if (stipple)		/* restore stipple to previous */
+	printf(".st\n");
+      printf(".br\n"
+	     ".ft \\n(g3\n"
+	     ".ps \\n(g4\n"
+	     "%s", inputline);
+    } else
+      interpret(inputline);	/* take commands from the input file */
+  } while (!done);
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	savestate  ( )
+ |
+ | Results:	all the current  scaling / font size / font name / thickness
+ |		/ pointscale settings are saved to be the defaults.  Scaled
+ |		point sizes are NOT saved.  The scaling is done each time a
+ |		new picture is started.
+ |
+ | Side Efct:	scale, and def* are modified.
+ *----------------------------------------------------------------------------*/
+
+void
+savestate()
+{
+  register int i;
+
+  for (i = 0; i < STYLES; i++)	/* line thickness defaults */
+    defthick[i] = thick[i];
+  for (i = 0; i < FONTS; i++)	/* font name defaults */
+    deffont[i] = tfont[i];
+  for (i = 0; i < SIZES; i++)	/* font size defaults */
+    defsize[i] = tsize[i];
+  for (i = 0; i <= NSTIPPLES; i++)	/* stipple font file default indices */
+    defstipple_index[i] = stipple_index[i];
+
+  defstipple = stipple;		/* if stipple has been set, it's remembered */
+  scale *= xscale;		/* default scale of individual pictures */
+  defpoint = pointscale;	/* flag for scaling pointsizes from x factors */
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	savebounds (x_coordinate, y_coordinate)
+ |
+ | Results:	Keeps track of the maximum and minimum extent of a picture
+ |		in the global variables: left-, right-, top- and
+ |		bottompoint.  `savebounds' assumes that the points have been
+ |		oriented to the correct direction.  No scaling has taken
+ |		place, though.
+ *----------------------------------------------------------------------------*/
+
+void
+savebounds(float x,
+	   float y)
+{
+  if (x < leftpoint)
+    leftpoint = x;
+  if (x > rightpoint)
+    rightpoint = x;
+  if (y < toppoint)
+    toppoint = y;
+  if (y > bottompoint)
+    bottompoint = y;
+}
+
+
+/*----------------------------------------------------------------------------*
+ | Routine:	interpret (character_string)
+ |
+ | Results:	Commands are taken from the input string and performed.
+ |		Commands are separated by the endofline, and are of the
+ |		format:
+ |			string1 string2
+ |
+ |		where string1 is the command and string2 is the argument.
+ |
+ | Side Efct:	Font and size strings, plus the gremlin file name and the
+ |		width and height variables are set by this routine.
+ *----------------------------------------------------------------------------*/
+
+void
+interpret(char *line)
+{
+  char str1[MAXINLINE];
+  char str2[MAXINLINE];
+  register char *chr;
+  register int i;
+  double par;
+
+  str2[0] = '\0';
+  sscanf(line, "%80s%80s", &str1[0], &str2[0]);
+  for (chr = &str1[0]; *chr; chr++)	/* convert command to */
+    if (isupper(*chr))
+      *chr = tolower(*chr);	/* lower case */
+
+  switch (str1[0]) {
+
+  case '1':
+  case '2':			/* font sizes */
+  case '3':
+  case '4':
+    i = atoi(str2);
+    if (i > 0 && i < 1000)
+      tsize[str1[0] - '1'] = i;
+    else
+      error("bad font size value at line %1", linenum);
+    break;
+
+  case 'r':			/* roman */
+    if (str2[0] < '0')
+      goto nofont;
+    tfont[0] = (char *) malloc(strlen(str2) + 1);
+    strcpy(tfont[0], str2);
+    break;
+
+  case 'i':			/* italics */
+    if (str2[0] < '0')
+      goto nofont;
+    tfont[1] = (char *) malloc(strlen(str2) + 1);
+    strcpy(tfont[1], str2);
+    break;
+
+  case 'b':			/* bold */
+    if (str2[0] < '0')
+      goto nofont;
+    tfont[2] = (char *) malloc(strlen(str2) + 1);
+    strcpy(tfont[2], str2);
+    break;
+
+  case 's':			/* special */
+    if (str1[1] == 'c')
+      goto scalecommand;	/* or scale */
+
+    if (str2[0] < '0') {
+  nofont:
+      error("no fontname specified in line %1", linenum);
+      break;
+    }
+    if (str1[1] == 't')
+      goto stipplecommand;	/* or stipple */
+
+    tfont[3] = (char *) malloc(strlen(str2) + 1);
+    strcpy(tfont[3], str2);
+    break;
+
+  case 'l':			/* l */
+    if (isdigit(str1[1])) {	/* set stipple index */
+      int index = atoi(str1 + 1), val;
+
+      if (index < 0 || index > NSTIPPLES) {
+	error("bad stipple number %1 at line %2", index, linenum);
+	break;
+      }
+      if (!defstipple_index)
+	defstipple_index = other_stipple_index;
+      val = atoi(str2);
+      if (val >= 0 && val < 256)
+	stipple_index[index] = val;
+      else
+	error("bad stipple index value at line %1", linenum);
+      break;
+    }
+
+  stipplecommand:		/* set stipple name */
+    stipple = (char *) malloc(strlen(str2) + 1);
+    strcpy(stipple, str2);
+    /* if its a `known' font (currently only `cf'), set indicies    */
+    if (strcmp(stipple, "cf") == 0)
+      defstipple_index = cf_stipple_index;
+    else
+      defstipple_index = other_stipple_index;
+    for (i = 0; i <= NSTIPPLES; i++)
+      stipple_index[i] = defstipple_index[i];
+    break;
+
+  case 'a':			/* text adjust */
+    par = atof(str2);
+    switch (str1[1]) {
+    case '1':
+      adj1 = par;
+      break;
+    case '2':
+      adj2 = par;
+      break;
+    case '3':
+      adj3 = par;
+      break;
+    case '4':
+      adj4 = par;
+      break;
+    default:
+      error("bad adjust command at line %1", linenum);
+      break;
+    }
+    break;
+
+  case 't':			/* thick */
+    thick[2] = defthick[0] * atof(str2);
+    break;
+
+  case 'm':			/* medium */
+    thick[5] = defthick[0] * atof(str2);
+    break;
+
+  case 'n':			/* narrow */
+    thick[0] = thick[1] = thick[3] = thick[4] =
+	defthick[0] * atof(str2);
+    break;
+
+  case 'x':			/* x */
+  scalecommand:			/* scale */
+    par = atof(str2);
+    if (par > 0.0)
+      xscale *= par;
+    else
+      error("invalid scale value on line %1", linenum);
+    break;
+
+  case 'f':			/* file */
+    strcpy(gremlinfile, str2);
+    break;
+
+  case 'w':			/* width */
+    width = atof(str2);
+    if (width < 0.0)
+      width = -width;
+    break;
+
+  case 'h':			/* height */
+    height = atof(str2);
+    if (height < 0.0)
+      height = -height;
+    break;
+
+  case 'd':			/* defaults */
+    setdefault = 1;
+    break;
+
+  case 'p':			/* pointscale */
+    if (strcmp("off", str2))
+      pointscale = 1;
+    else
+      pointscale = 0;
+    break;
+
+  default:
+    error("unknown command `%1' on line %2", str1, linenum);
+    exit(8);
+    break;
+  };
+}
+
+
+/*
+ * return TRUE if picture contains a polygon
+ * otherwise FALSE
+ */
+
+int
+has_polygon(register ELT *elist)
+{
+  while (!DBNullelt(elist)) {
+    if (elist->type == POLYGON)
+      return (1);
+    elist = DBNextElt(elist);
+  }
+
+  return (0);
+}
+
+/* EOF */
diff --git a/contrib/groff/src/preproc/html/Makefile.sub b/contrib/groff/src/preproc/html/Makefile.sub
index 5da6d43..6a9a757 100644
--- a/contrib/groff/src/preproc/html/Makefile.sub
+++ b/contrib/groff/src/preproc/html/Makefile.sub
@@ -3,4 +3,4 @@ PROG=pre-grohtml$(EXEEXT)
 MAN1=
 XLIBS=$(LIBGROFF)
 OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT)
-CCSRCS=$(srcdir)/pre-html.cc $(srcdir)/pushback.cc
+CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp
diff --git a/contrib/groff/src/preproc/html/pre-html.cpp b/contrib/groff/src/preproc/html/pre-html.cpp
new file mode 100644
index 0000000..8869136
--- /dev/null
+++ b/contrib/groff/src/preproc/html/pre-html.cpp
@@ -0,0 +1,1530 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk).
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#define PREHTMLC
+
+#include "lib.h"
+
+#include <signal.h>
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "posix.h"
+#include "defs.h"
+#include "searchpath.h"
+#include "paper.h"
+#include "font.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef _POSIX_VERSION
+#include <sys/wait.h>
+#define PID_T pid_t
+#else /* not _POSIX_VERSION */
+#define PID_T int
+#endif /* not _POSIX_VERSION */
+
+#include <stdarg.h>
+
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+#include "pre-html.h"
+#include "pushback.h"
+#include "html-strings.h"
+
+#define DEFAULT_LINE_LENGTH        7   // inches wide
+#define DEFAULT_IMAGE_RES        100   // number of pixels per inch resolution
+#define IMAGE_BOARDER_PIXELS       0
+#define INLINE_LEADER_CHAR      '\\'
+
+#define TRANSPARENT  "-background white -transparent white"
+#define MIN_ALPHA_BITS             0
+#define MAX_ALPHA_BITS             4
+
+#define PAGE_TEMPLATE_SHORT "pg"
+#define PAGE_TEMPLATE_LONG "-page-"
+#define PS_TEMPLATE_SHORT "ps"
+#define PS_TEMPLATE_LONG "-ps-"
+#define REGION_TEMPLATE_SHORT "rg"
+#define REGION_TEMPLATE_LONG "-regions-"
+
+#if 0
+#   define  DEBUGGING
+#endif
+
+#if !defined(TRUE)
+#   define TRUE (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+typedef enum {CENTERED, LEFT, RIGHT, INLINE} IMAGE_ALIGNMENT;
+
+static int   postscriptRes    =-1;              // postscript resolution, dots per inch
+static int   stdoutfd         = 1;              // output file descriptor - normally 1 but might move
+                                                // -1 means closed
+static int   copyofstdoutfd   =-1;              // a copy of stdout, so we can restore stdout when
+                                                // writing to post-html
+static char *psFileName       = NULL;           // name of postscript file
+static char *psPageName       = NULL;           // name of file containing postscript current page
+static char *regionFileName   = NULL;           // name of file containing all image regions
+static char *imagePageName    = NULL;           // name of bitmap image containing current page
+static const char *image_device = "pnmraw";
+static int   image_res        = DEFAULT_IMAGE_RES;
+static int   vertical_offset  = 0;
+static char *image_template   = NULL;           // image template filename
+static char *macroset_template= NULL;           // image template passed to troff by -D
+static int   troff_arg        = 0;              // troff arg index
+static char *image_dir        = NULL;           // user specified image directory
+static int   textAlphaBits    = MAX_ALPHA_BITS;
+static int   graphicAlphaBits = MAX_ALPHA_BITS;
+static char *antiAlias        = NULL;           // antialias arguments we pass to gs.
+static int   show_progress    = FALSE;          // should we display page numbers as they are processed?
+static int   currentPageNo    = -1;             // current image page number
+#if defined(DEBUGGING)
+static int   debug          = FALSE;
+static char *troffFileName  = NULL;             // output of pre-html output which is sent to troff -Tps
+static char *htmlFileName   = NULL;             // output of pre-html output which is sent to troff -Thtml
+#endif
+
+static char *linebuf = NULL;                    // for scanning devps/DESC
+static int linebufsize = 0;
+
+const char *const FONT_ENV_VAR = "GROFF_FONT_PATH";
+static search_path font_path(FONT_ENV_VAR, FONTPATH, 0, 0);
+
+
+/*
+ *  Images are generated via postscript, gs and the pnm utilities.
+ */
+
+#define IMAGE_DEVICE    "-Tps"
+
+/*
+ *  prototypes
+ */
+static int do_file(const char *filename);
+
+/*
+ *  sys_fatal - writes a fatal error message.
+ *  Taken from src/roff/groff/pipeline.c.
+ */
+
+void sys_fatal (const char *s)
+{
+  fatal("%1: %2", s, strerror(errno));
+}
+
+/*
+ *  get_line - copies a line (w/o newline) from a file to the global line buffer
+ */
+
+int get_line (FILE *f)
+{
+  if (f == 0)
+    return 0;
+  if (linebuf == 0) {
+    linebuf = new char[128];
+    linebufsize = 128;
+  }
+  int i = 0;
+  // skip leading whitespace
+  for (;;) {
+    int c = getc(f);
+    if (c == EOF)
+      return 0;
+    if (c != ' ' && c != '\t') {
+      ungetc(c, f);
+      break;
+    }
+  }
+  for (;;) {
+    int c = getc(f);
+    if (c == EOF)
+      break;
+    if (i + 1 >= linebufsize) {
+      char *old_linebuf = linebuf;
+      linebuf = new char[linebufsize * 2];
+      memcpy(linebuf, old_linebuf, linebufsize);
+      a_delete old_linebuf;
+      linebufsize *= 2;
+    }
+    linebuf[i++] = c;
+    if (c == '\n') {
+      i--;
+      break;
+    }
+  }
+  linebuf[i] = '\0';
+  return 1;
+}
+
+/*
+ *  get_resolution - returns the postscript resolution from devps/DESC
+ */
+
+static unsigned int get_resolution (void)
+{
+  char *pathp;
+  FILE *f;
+  unsigned int res;
+  f = font_path.open_file("devps/DESC", &pathp);
+  a_delete pathp;
+  if (f == 0)
+    fatal("can't open devps/DESC");
+  while (get_line(f)) {
+    int n = sscanf(linebuf, "res %u", &res);
+    if (n >= 1) {
+      fclose(f);
+      return res;
+    }
+  }
+  fatal("can't find `res' keyword in devps/DESC");
+  return 0;
+}
+
+/*
+ *  html_system - a wrapper for system()
+ */
+
+void html_system(const char *s, int redirect_stdout)
+{
+  // Redirect standard error to the null device.  This is more
+  // portable than using "2> /dev/null", since it doesn't require a
+  // Unixy shell.
+  int save_stderr = dup(2);
+  int save_stdout = dup(1);
+  int fdnull = open(NULL_DEV, O_WRONLY|O_BINARY, 0666);
+  if (save_stderr > 2 && fdnull > 2)
+    dup2(fdnull, 2);
+  if (redirect_stdout && save_stdout > 1 && fdnull > 1)
+    dup2(fdnull, 1);
+  if (fdnull >= 0)
+    close(fdnull);
+  int status = system(s);
+  dup2(save_stderr, 2);
+  if (redirect_stdout)
+    dup2(save_stdout, 1);
+  if (status == -1)
+    fprintf(stderr, "Calling `%s' failed\n", s);
+  else if (status)
+    fprintf(stderr, "Calling `%s' returned status %d\n", s, status);
+  close(save_stderr);
+  close(save_stdout);
+}
+
+/*
+ *  make_message - taken from man printf(3), creates a string via malloc
+ *                 and places the result of the va args into string.
+ *                 Finally the new string is returned.
+ */
+
+char *
+make_message (const char *fmt, ...)
+{
+  /* Guess we need no more than 100 bytes. */
+  int n, size = 100;
+  char *p;
+  char *np;
+  va_list ap;
+  if ((p = (char *)malloc (size)) == NULL)
+    return NULL;
+  while (1) {
+    /* Try to print in the allocated space. */
+    va_start(ap, fmt);
+    n = vsnprintf (p, size, fmt, ap);
+    va_end(ap);
+    /* If that worked, return the string. */
+    if (n > -1 && n < size) {
+      if (size > n+1) {
+	np = strsave(p);
+	free(p);
+	return np;
+      }
+      return p;
+    }
+    /* Else try again with more space. */
+    if (n > -1)    /* glibc 2.1 */
+      size = n+1; /* precisely what is needed */
+    else           /* glibc 2.0 */
+      size *= 2;  /* twice the old size */
+    if ((np = (char *)realloc (p, size)) == NULL) {
+      free(p);  /* realloc failed, free old, p. */
+      return NULL;
+    }
+    p = np;  /* use realloc'ed, p */
+  }
+}
+
+/*
+ *  the class and methods for retaining ascii text
+ */
+
+struct char_block {
+  enum { SIZE = 256 };
+  char          buffer[SIZE];
+  int           used;
+  char_block   *next;
+
+  char_block();
+};
+
+/*
+ *  char_block - constructor, sets the, used, and, next, fields to zero.
+ */
+
+char_block::char_block()
+: used(0), next(0)
+{
+  for (int i = 0; i < SIZE; i++)
+    buffer[i] = 0;
+}
+
+class char_buffer {
+public:
+  char_buffer();
+  ~char_buffer();
+  int  read_file(FILE *fp);
+  int  do_html(int argc, char *argv[]);
+  int  do_image(int argc, char *argv[]);
+  void write_file_html(void);
+  void write_file_troff(void);
+  void write_upto_newline (char_block **t, int *i, int is_html);
+  int  can_see(char_block **t, int *i, const char *string);
+  int  skip_spaces(char_block **t, int *i);
+  void skip_until_newline(char_block **t, int *i);
+private:
+  char_block *head;
+  char_block *tail;
+};
+
+/*
+ *  char_buffer - constructor
+ */
+
+char_buffer::char_buffer()
+: head(0), tail(0)
+{
+}
+
+/*
+ *  char_buffer - deconstructor, throws aways the whole buffer list.
+ */
+
+char_buffer::~char_buffer()
+{
+  while (head != NULL) {
+    char_block *temp = head;
+    head = head->next;
+    delete temp;
+  }
+}
+
+/*
+ *  read_file - read in a complete file, fp, placing the contents inside char_blocks.
+ */
+
+int char_buffer::read_file (FILE *fp)
+{
+  int n;
+
+  while (! feof(fp)) {
+    if (tail == NULL) {
+      tail = new char_block;
+      head = tail;
+    } else {
+      if (tail->used == char_block::SIZE) {
+	tail->next = new char_block;
+	tail       = tail->next;
+      }
+    }
+    // at this point we have a tail which is ready for the next SIZE bytes of the file
+
+    n = fread(tail->buffer, sizeof(char), char_block::SIZE-tail->used, fp);
+    if (n <= 0) {
+      // error
+      return( 0 );
+    } else {
+      tail->used += n*sizeof(char);
+    }
+  }
+  return( 1 );
+}
+
+/*
+ *  writeNbytes - writes n bytes to stdout.
+ */
+
+static void writeNbytes (const char *s, int l)
+{
+  int n=0;
+  int r;
+
+  while (n<l) {
+    r = write(stdoutfd, s, l-n);
+    if (r<0) {
+      sys_fatal("write");
+    }
+    n += r;
+    s += r;
+  }
+}
+
+/*
+ *  writeString - writes a string to stdout.
+ */
+
+static void writeString (const char *s)
+{
+  writeNbytes(s, strlen(s));
+}
+
+/*
+ *  makeFileName - creates the image filename template
+ *                 and the macroset image template.
+ */
+
+static void makeFileName (void)
+{
+  if ((image_dir != NULL) && (strchr(image_dir, '%') != NULL)) {
+    error("cannot use a `%%' within the image directory name");
+    exit(1);
+  }
+
+  if ((image_template != NULL) && (strchr(image_template, '%') != NULL)) {
+    error("cannot use a `%%' within the image template");
+    exit(1);
+  }
+
+  if (image_dir == NULL) {
+    image_dir = "";
+  } else if ((strlen(image_dir)>0) && (image_dir[strlen(image_dir)-1] != '/')) {
+    image_dir = make_message("%s/", image_dir);
+    if (image_dir == NULL)
+      sys_fatal("make_message");
+  }
+  
+  if (image_template == NULL)
+    macroset_template = make_message("%sgrohtml-%d", image_dir, (int)getpid());
+  else
+    macroset_template = make_message("%s%s", image_dir, image_template);
+
+  if (macroset_template == NULL)
+    sys_fatal("make_message");
+
+  image_template = (char *)malloc(strlen("-%d")+strlen(macroset_template)+1);
+  if (image_template == NULL)
+    sys_fatal("malloc");
+  strcpy(image_template, macroset_template);
+  strcat(image_template, "-%d");
+}
+
+/*
+ *  setupAntiAlias - sets up the antialias string, used when we call gs.
+ */
+
+static void setupAntiAlias (void)
+{
+  if (textAlphaBits == 0 && graphicAlphaBits == 0)
+    antiAlias = make_message(" ");
+  else if (textAlphaBits == 0)
+    antiAlias = make_message("-dGraphicsAlphaBits=%d ", graphicAlphaBits);
+  else if (graphicAlphaBits == 0)
+    antiAlias = make_message("-dTextAlphaBits=%d ", textAlphaBits);
+  else
+    antiAlias = make_message("-dTextAlphaBits=%d -dGraphicsAlphaBits=%d ",
+			     textAlphaBits, graphicAlphaBits);
+}
+
+/*
+ *  checkImageDir - checks to see whether the image directory is available.
+ */
+
+static void checkImageDir (void)
+{
+  if ((image_dir != NULL) && (strcmp(image_dir, "") != 0))
+    if (! ((mkdir(image_dir, 0777) == 0) || (errno == EEXIST))) {
+      error("cannot create directory `%1'", image_dir);
+      exit(1);
+    }
+}
+
+/*
+ *  write_end_image - ends the image. It writes out the image extents if we are using -Tps.
+ */
+
+static void write_end_image (int is_html)
+{
+  /*
+   *  if we are producing html then these
+   *    emit image name and enable output
+   *  else
+   *    we are producing images
+   *    in which case these generate image
+   *    boundaries
+   */
+  writeString("\\O[4]\\O[2]");
+  if (is_html)
+    writeString("\\O[1]");
+  else
+    writeString("\\O[0]");
+}
+
+/*
+ *  write_start_image - writes the troff which will:
+ *
+ *                      (i)  disable html output for the following image
+ *                      (ii) reset the max/min x/y registers during postscript
+ *                           rendering.
+ */
+
+static void write_start_image (IMAGE_ALIGNMENT pos, int is_html)
+{
+  writeString("\\O[5");
+  switch (pos) {
+
+  case INLINE:
+    writeString("i");
+    break;
+  case LEFT:
+    writeString("l");
+    break;
+  case RIGHT:
+    writeString("r");
+    break;
+  case CENTERED:
+  default:
+    writeString("c");
+    break;
+  }
+  writeString(image_template); writeString(".png]");
+  if (is_html)
+    writeString("\\O[0]\\O[3]");
+  else
+    // reset min/max registers
+    writeString("\\O[1]\\O[3]");
+}
+
+/*
+ *  write_upto_newline - writes the contents of the buffer until a newline is seen.
+ *                       It checks for HTML_IMAGE_INLINE_BEGIN and HTML_IMAGE_INLINE_END
+ *                       and if they are present it processes them.
+ */
+
+void char_buffer::write_upto_newline (char_block **t, int *i, int is_html)
+{
+  int j=*i;
+
+  if (*t) {
+    while ((j < (*t)->used) && ((*t)->buffer[j] != '\n') &&
+	   ((*t)->buffer[j] != INLINE_LEADER_CHAR)) {
+      j++;
+    }
+    if ((j < (*t)->used) && ((*t)->buffer[j] == '\n')) {
+      j++;
+    }
+    writeNbytes((*t)->buffer+(*i), j-(*i));
+    if ((*t)->buffer[j] == INLINE_LEADER_CHAR) {
+      if (can_see(t, &j, HTML_IMAGE_INLINE_BEGIN))
+	write_start_image(INLINE, is_html);
+      else if (can_see(t, &j, HTML_IMAGE_INLINE_END))
+	write_end_image(is_html);
+      else {
+	if (j < (*t)->used) {
+	  *i = j;
+	  j++;
+	  writeNbytes((*t)->buffer+(*i), j-(*i));
+	}
+      }
+    }
+    if (j == (*t)->used) {
+      *i = 0;
+      if ((*t)->buffer[j-1] == '\n') {
+	*t = (*t)->next;
+      } else {
+	*t = (*t)->next;
+	write_upto_newline(t, i, is_html);
+      }
+    } else {
+      // newline was seen
+      *i = j;
+    }
+  }
+}
+
+/*
+ *  can_see - returns TRUE if we can see string in t->buffer[i] onwards
+ */
+
+int char_buffer::can_see (char_block **t, int *i, const char *string)
+{
+  int j         = 0;
+  int l         = strlen(string);
+  int k         = *i;
+  char_block *s = *t;
+
+  while (s) {
+    while ((k<s->used) && (j<l) && (s->buffer[k] == string[j])) {
+      j++;
+      k++;
+    }
+    if (j == l) {
+      *i = k;
+      *t = s;
+      return( TRUE );
+    } else if ((k<s->used) && (s->buffer[k] != string[j])) {
+      return( FALSE );
+    }
+    s = s->next;
+    k = 0;
+  }
+  return( FALSE );
+}
+
+/*
+ *  skip_spaces - returns TRUE if we have not run out of data.
+ *                It also consumes spaces.
+ */
+
+int char_buffer::skip_spaces(char_block **t, int *i)
+{
+  char_block *s = *t;
+  int k         = *i;
+
+  while (s) {
+    while ((k<s->used) && (isspace(s->buffer[k]))) {
+      k++;
+    }
+    if (k == s->used) {
+      k = 0;
+      s = s->next;
+    } else {
+      *i = k;
+      return( TRUE );
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  skip_until_newline - skips all characters until a newline is seen.
+ *                       The newline is not consumed.
+ */
+
+void char_buffer::skip_until_newline (char_block **t, int *i)
+{
+  int j=*i;
+
+  if (*t) {
+    while ((j < (*t)->used) && ((*t)->buffer[j] != '\n')) {
+      j++;
+    }
+    if (j == (*t)->used) {
+      *i = 0;
+      *t = (*t)->next;
+      skip_until_newline(t, i);
+    } else {
+      // newline was seen
+      *i = j;
+    }
+  }
+}
+
+/*
+ *  write_file_troff - writes the buffer to stdout (troff).
+ */
+
+void char_buffer::write_file_troff (void)
+{
+  char_block *t=head;
+  int         i=0;
+
+  if (t != NULL) {
+    do {
+      write_upto_newline(&t, &i, FALSE);
+    } while (t != NULL);
+  }
+  if (close(stdoutfd) < 0)
+    sys_fatal("close");
+
+  // now we grab fd=1 so that the next pipe cannot use fd=1
+  if (stdoutfd == 1) {
+    if (dup(2) != stdoutfd) {
+      sys_fatal("dup failed to use fd=1");
+    }
+  }
+}
+
+/*
+ *  the image class remembers the position of all images in the postscript file
+ *  and assigns names for each image.
+ */
+
+struct imageItem {
+  imageItem  *next;
+  int         X1;
+  int         Y1;
+  int         X2;
+  int         Y2;
+  char       *imageName;
+  int         resolution;
+  int         maxx;
+  int         pageNo;
+
+  imageItem (int x1, int y1, int x2, int y2, int page, int res, int max_width, char *name);
+  ~imageItem ();
+};
+
+/*
+ *  imageItem - constructor
+ */
+
+imageItem::imageItem (int x1, int y1, int x2, int y2, int page, int res, int max_width, char *name)
+{
+  X1         = x1;
+  Y1         = y1;
+  X2         = x2;
+  Y2         = y2;
+  pageNo     = page;
+  resolution = res;
+  maxx       = max_width;
+  imageName  = name;
+  next       = NULL;
+}
+
+/*
+ *  imageItem - deconstructor
+ */
+
+imageItem::~imageItem ()
+{
+  if (imageName)
+    free(imageName);
+}
+
+/*
+ *  imageList - class containing a list of imageItems.
+ */
+
+class imageList {
+private:
+  imageItem *head;
+  imageItem *tail;
+  int        count;
+public:
+  imageList();
+  ~imageList();
+  void  add(int x1, int y1, int x2, int y2, int page, int res, int maxx, char *name);
+  void  createImages (void);
+  int   createPage (int pageno);
+  void  createImage (imageItem *i);
+  int   getMaxX (int pageno);
+};
+
+/*
+ *  imageList - constructor.
+ */
+
+imageList::imageList ()
+  : head(0), tail(0), count(0)
+{
+}
+
+/*
+ *  imageList - deconstructor.
+ */
+
+imageList::~imageList ()
+{
+  while (head != NULL) {
+    imageItem *i = head;
+    head = head->next;
+    delete i;
+  }
+}
+
+/*
+ *  createPage - creates one image of, page pageno, from the postscript file.
+ */
+
+int imageList::createPage (int pageno)
+{
+  char *s;
+
+  if (currentPageNo == pageno)
+    return 0;
+
+  if (currentPageNo >= 1) {
+    /*
+     *  we need to unlink the files which change each time a new page is processed.
+     *  The final unlink is done by xtmpfile when pre-grohtml exits.
+     */
+    unlink(imagePageName);
+    unlink(psPageName);
+  }
+
+  if (show_progress) {
+    fprintf(stderr, "[%d] ", pageno);
+    fflush(stderr);
+  }
+
+#if defined(DEBUGGING)
+  if (debug)
+    fprintf(stderr, "creating page %d\n", pageno);
+#endif
+
+  s = make_message("psselect -q -p%d %s %s\n",
+		   pageno, psFileName, psPageName);
+
+  if (s == NULL)
+    sys_fatal("make_message");
+#if defined(DEBUGGING)
+  if (debug) {
+    fwrite(s, sizeof(char), strlen(s), stderr);
+    fflush(stderr);
+  }
+#endif
+  html_system(s, 1);
+  
+  s = make_message("echo showpage | "
+		   "gs%s -q -dBATCH -dSAFER "
+		   "-dDEVICEHEIGHTPOINTS=792 "
+		   "-dDEVICEWIDTHPOINTS=%d -dFIXEDMEDIA=true "
+		   "-sDEVICE=%s -r%d %s "
+		   "-sOutputFile=%s %s -\n",
+		   EXE_EXT,
+		   (getMaxX(pageno) * image_res) / postscriptRes,
+		   image_device,
+		   image_res,
+		   antiAlias,
+		   imagePageName,
+		   psPageName);
+  if (s == NULL)
+    sys_fatal("make_message");
+#if defined(DEBUGGING)
+  if (debug) {
+    fwrite(s, sizeof(char), strlen(s), stderr);
+    fflush(stderr);
+  }
+#endif
+  html_system(s, 1);
+  free(s);
+  currentPageNo = pageno;
+  return 0;
+}
+
+/*
+ *  min - returns the minimum of two numbers.
+ */
+
+int min (int x, int y)
+{
+  if (x < y) {
+    return( x );
+  } else {
+    return( y );
+  }
+}
+
+/*
+ *  max - returns the maximum of two numbers.
+ */
+
+int max (int x, int y)
+{
+  if (x > y) {
+    return( x );
+  } else {
+    return( y );
+  }
+}
+
+/*
+ *  getMaxX - returns the largest right hand position for any image on, pageno
+ */
+
+int imageList::getMaxX (int pageno)
+{
+  imageItem *h = head;
+  int x        = postscriptRes * DEFAULT_LINE_LENGTH;
+
+  while (h != NULL) {
+    if (h->pageNo == pageno)
+      x = max(h->X2, x);
+    h = h->next;
+  }
+  return x;
+}
+
+/*
+ *  createImage - generates a minimal png file from the set of page images.
+ */
+
+void imageList::createImage (imageItem *i)
+{
+  if (i->X1 != -1) {
+    char *s;
+    int  x1 = max(min(i->X1, i->X2)*image_res/postscriptRes-1*IMAGE_BOARDER_PIXELS, 0);
+    int  y1 = max((image_res*vertical_offset/72)+min(i->Y1, i->Y2)*image_res/postscriptRes-IMAGE_BOARDER_PIXELS, 0);
+    int  x2 = max(i->X1, i->X2)*image_res/postscriptRes+1*IMAGE_BOARDER_PIXELS;
+    int  y2 = (image_res*vertical_offset/72)+(max(i->Y1, i->Y2)*image_res/postscriptRes)+1+IMAGE_BOARDER_PIXELS;
+    if (createPage(i->pageNo) == 0) {
+      s = make_message("pnmcut%s %d %d %d %d < %s | pnmcrop -quiet | pnmtopng%s %s > %s \n",
+		       EXE_EXT,
+		       x1, y1, x2-x1+1, y2-y1+1,
+		       imagePageName,
+		       EXE_EXT,
+		       TRANSPARENT,
+		       i->imageName);
+      if (s == NULL)
+	sys_fatal("make_message");
+
+#if defined(DEBUGGING)
+      if (debug) {
+	fprintf(stderr, s);
+	fflush(stderr);
+      }
+#endif
+      html_system(s, 0);
+      free(s);
+    } else {
+      fprintf(stderr, "failed to generate image of page %d\n", i->pageNo);
+      fflush(stderr);
+    }
+#if defined(DEBUGGING)
+  } else {
+    if (debug) {
+      fprintf(stderr, "ignoring image as x1 coord is -1\n");
+      fflush(stderr);
+    }
+#endif
+  }
+}
+
+/*
+ *  add - an image description to the imageList.
+ */
+
+void imageList::add (int x1, int y1, int x2, int y2, int page, int res, int maxx, char *name)
+{
+  imageItem *i = new imageItem(x1, y1, x2, y2, page, res, maxx, name);
+
+  if (head == NULL) {
+    head = i;
+    tail = i;
+  } else {
+    tail->next = i;
+    tail = i;
+  }
+}
+
+/*
+ *  createImages - foreach image descriptor on the imageList, create the actual image.
+ */
+
+void imageList::createImages (void)
+{
+  imageItem *h = head;
+
+  while (h != NULL) {
+    createImage(h);
+    h = h->next;
+  }
+}
+
+static imageList listOfImages;  // list of images defined by the region file.
+
+/*
+ *  write_file_html - writes the buffer to stdout (troff).
+ *                    It writes out the file replacing template image names with
+ *                    actual image names.
+ */
+
+void char_buffer::write_file_html (void)
+{
+  char_block *t=head;
+  int         i=0;
+
+  if (t != NULL) {
+    do {
+      write_upto_newline(&t, &i, TRUE);
+    } while (t != NULL);
+  }
+  if (close(stdoutfd) < 0)
+    sys_fatal("close");
+
+  // now we grab fd=1 so that the next pipe cannot use fd=1
+  if (stdoutfd == 1) {
+    if (dup(2) != stdoutfd) {
+      sys_fatal("dup failed to use fd=1");
+    }
+  }
+}
+
+/*
+ *  generateImages - parses the region file and generates images
+ *                   from the postscript file. The region file
+ *                   contains the x1,y1  x2,y2 extents of each
+ *                   image.
+ */
+
+static void generateImages (char *regionFileName)
+{
+  pushBackBuffer *f=new pushBackBuffer(regionFileName);
+
+  while (f->putPB(f->getPB()) != eof) {
+    if (f->isString("grohtml-info:page")) {
+      int page   = f->readInt();
+      int x1     = f->readInt();
+      int y1     = f->readInt();
+      int x2     = f->readInt();
+      int y2     = f->readInt();
+      int maxx   = f->readInt();
+      char *name = f->readString();
+      int res    = postscriptRes;
+      listOfImages.add(x1, y1, x2, y2, page, res, maxx, name);
+      while ((f->putPB(f->getPB()) != '\n') &&
+	     (f->putPB(f->getPB()) != eof)) {
+	(void)f->getPB();
+      }
+      if (f->putPB(f->getPB()) == '\n') {
+	(void)f->getPB();
+      }
+    } else {
+      /*
+       *  write any error messages out to the user
+       */
+      fputc(f->getPB(), stderr);
+    }
+  }
+  
+  listOfImages.createImages();
+  if (show_progress) {
+    fprintf(stderr, "done\n");
+    fflush(stderr);
+  }
+  delete f;
+}
+
+/*
+ *  replaceFd - replace a file descriptor, was, with, willbe.
+ */
+
+static void replaceFd (int was, int willbe)
+{
+  int dupres;
+
+  if (was != willbe) {
+    if (close(was)<0) {
+      sys_fatal("close");
+    }
+    dupres = dup(willbe);
+    if (dupres != was) {
+      sys_fatal("dup");
+      fprintf(stderr, "trying to replace fd=%d with %d dup used %d\n", was, willbe, dupres);
+      if (willbe == 1) {
+	fprintf(stderr, "likely that stdout should be opened before %d\n", was);
+      }
+      exit(1);
+    }
+    if (close(willbe) < 0) {
+      sys_fatal("close");
+    }
+  }
+}
+
+/*
+ *  waitForChild - waits for child, pid, to exit.
+ */
+
+static void waitForChild (PID_T pid)
+{
+  PID_T waitpd;
+  int   status;
+
+  waitpd = WAIT(&status, pid, _WAIT_CHILD);
+  if (waitpd != pid)
+    sys_fatal("wait");
+}
+
+/*
+ *  alterDeviceTo - if toImage is set then the arg list is altered to include
+ *                     IMAGE_DEVICE and we invoke groff rather than troff.
+ *                  else 
+ *                     set -Thtml and groff
+ */
+
+static void alterDeviceTo (int argc, char *argv[], int toImage)
+{
+  int i=0;
+
+  if (toImage) {
+    while (i < argc) {
+      if (strcmp(argv[i], "-Thtml") == 0) {
+	argv[i] = IMAGE_DEVICE;
+      }
+      i++;
+    }
+    argv[troff_arg] = "groff";  /* rather than troff */
+  } else {
+    while (i < argc) {
+      if (strcmp(argv[i], IMAGE_DEVICE) == 0) {
+	argv[i] = "-Thtml";
+      }
+      i++;
+    }
+    argv[troff_arg] = "groff";   /* use groff -Z */
+  }
+}
+
+/*
+ *  addZ - appends -Z onto the command list for groff.
+ */
+
+char **addZ (int argc, char *argv[])
+{
+  char **new_argv = (char **)malloc((argc+2)*sizeof(char *));
+  int    i=0;
+
+  if (new_argv == NULL)
+    sys_fatal("malloc");
+
+  if (argc > 0) {
+    new_argv[i] = argv[i];
+    i++;
+  }
+  new_argv[i] = "-Z";
+  while (i<argc) {
+    new_argv[i+1] = argv[i];
+    i++;
+  }
+  argc++;
+  new_argv[argc] = NULL;
+  return new_argv;
+}
+
+/*
+ *  addRegDef - appends a defined register or string onto the command list for troff.
+ */
+
+char **addRegDef (int argc, char *argv[], const char *numReg)
+{
+  char **new_argv = (char **)malloc((argc+2)*sizeof(char *));
+  int    i=0;
+
+  if (new_argv == NULL)
+    sys_fatal("malloc");
+
+  while (i<argc) {
+    new_argv[i] = argv[i];
+    i++;
+  }
+  new_argv[argc] = strsave(numReg);
+  argc++;
+  new_argv[argc] = NULL;
+  return new_argv;
+}
+
+/*
+ *  dump_args - display the argument list.
+ */
+
+void dump_args (int argc, char *argv[])
+{
+  fprintf(stderr, "  %d arguments:", argc);
+  for (int i=0; i<argc; i++)
+    fprintf(stderr, " %s", argv[i]);
+  fprintf(stderr, "\n");
+}
+
+/*
+ *  do_html - sets the troff number htmlflip and
+ *            writes out the buffer to troff -Thtml
+ */
+
+int char_buffer::do_html(int argc, char *argv[])
+{
+  int pdes[2];
+  PID_T pid;
+  string s;
+
+  alterDeviceTo(argc, argv, 0);
+  argv += troff_arg;   // skip all arguments up to groff
+  argc -= troff_arg;
+  argv = addZ(argc, argv);
+  argc++;
+
+  s = "-dwww-image-template=";
+  s += macroset_template;   // do not combine these statements otherwise they will not work
+  s += '\0';                // the trailing '\0' is ignored
+  argv = addRegDef(argc, argv, s.contents());
+  argc++;
+
+  if (pipe(pdes) < 0)
+    sys_fatal("pipe");
+
+  pid = fork();
+  if (pid < 0)
+    sys_fatal("fork");
+
+  if (pid == 0) {
+    // child
+    replaceFd(0, pdes[0]);
+    // close end we are not using
+    if (close(pdes[1])<0)
+      sys_fatal("close");
+    replaceFd(1, copyofstdoutfd); // and restore stdout
+
+    execvp(argv[0], argv);
+    error("couldn't exec %1: %2", argv[0], strerror(errno), (char *)0);
+    fflush(stderr);		/* just in case error() doesn't */
+    exit(1);
+  } else {
+    // parent
+
+#if defined(DEBUGGING)
+    /*
+     *  slight security risk so only enabled if compiled with defined(DEBUGGING)
+     */
+    if (debug) {
+      replaceFd(1, creat(htmlFileName, S_IWUSR|S_IRUSR));
+      write_file_html();
+    }
+#endif
+    replaceFd(1, pdes[1]);
+    // close end we are not using
+    if (close(pdes[0])<0)
+      sys_fatal("close");
+
+    write_file_html();
+    waitForChild(pid);
+  }
+  return 0;
+}
+
+/*
+ *  do_image - writes out the buffer to troff -Tps
+ */
+
+int char_buffer::do_image(int argc, char *argv[])
+{
+  PID_T pid;
+  int pdes[2];
+  string s;
+
+  alterDeviceTo(argc, argv, 1);
+  argv += troff_arg;   // skip all arguments up to troff/groff
+  argc -= troff_arg;
+  argv = addRegDef(argc, argv, "-rps4html=1");
+  argc++;
+
+  s = "-dwww-image-template=";
+  s += macroset_template;
+  s += '\0';
+  argv = addRegDef(argc, argv, s.contents());
+  argc++;
+
+  // override local settings and produce a page size letter postscript file
+  argv = addRegDef(argc, argv, "-P-pletter");
+  argc++;
+
+  if (pipe(pdes) < 0)
+    sys_fatal("pipe");
+
+  pid = fork();
+  if (pid == 0) {
+    // child
+
+    int psFd     = creat(psFileName,     S_IWUSR|S_IRUSR);
+    int regionFd = creat(regionFileName, S_IWUSR|S_IRUSR);
+
+    replaceFd(1, psFd);
+    replaceFd(0, pdes[0]);
+    replaceFd(2, regionFd);
+
+    // close end we are not using
+    if (close(pdes[1])<0)
+      sys_fatal("close");
+
+    execvp(argv[0], argv);
+    error("couldn't exec %1: %2", argv[0], strerror(errno), (char *)0);
+    fflush(stderr);		/* just in case error() doesn't */
+    exit(1);
+  } else {
+    // parent
+
+#if defined(DEBUGGING)
+    /*
+     *  slight security risk so only enabled if compiled with defined(DEBUGGING)
+     */
+    if (debug) {
+      replaceFd(1, creat(troffFileName, S_IWUSR|S_IRUSR));
+      write_file_troff();
+    }
+#endif
+    replaceFd(1, pdes[1]);
+    write_file_troff();
+    waitForChild(pid);
+  }
+  return 0;
+}
+
+static char_buffer inputFile;
+
+
+/*
+ *  usage - emit usage arguments.
+ */
+
+void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s troffname [-Iimage_name] [-Dimage_directory] [-P-o vertical_image_offset] [-P-i image_resolution] [troff flags] [files]\n", program_name);
+  fprintf(stream, "    vertical_image_offset (default %d/72 of an inch)\n", vertical_offset);
+  fprintf(stream, "    image_resolution (default %d) pixels per inch\n", image_res);
+  fprintf(stream, "    image_name is the name of the stem for all images (default is grohtml-<pid>)\n");
+  fprintf(stream, "    place all png files into image_directory\n");
+}
+
+/*
+ *  scanArguments - scans for all arguments including -P-i, -P-o, -P-D and -P-I. It returns
+ *                  the argument index of the first non option.
+ */
+
+int scanArguments (int argc, char **argv)
+{
+  const char *command_prefix = getenv("GROFF_COMMAND_PREFIX");
+  if (!command_prefix)
+    command_prefix = PROG_PREFIX;
+  char *troff_name = new char[strlen(command_prefix) + strlen("troff") + 1];
+  strcpy(troff_name, command_prefix);
+  strcat(troff_name, "troff");
+  int c, i;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "+a:g:o:i:I:D:F:vbdhlrnp", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'v':
+      printf("GNU pre-grohtml (groff) version %s\n", Version_string);
+      exit(0);
+    case 'a':
+      textAlphaBits = min(max(MIN_ALPHA_BITS, atoi(optarg)), MAX_ALPHA_BITS);
+      if (textAlphaBits == 3) {
+	error("cannot use 3 bits of antialiasing information");
+	exit(1);
+      }
+      break;
+    case 'g':
+      graphicAlphaBits = min(max(MIN_ALPHA_BITS, atoi(optarg)), MAX_ALPHA_BITS);
+      if (graphicAlphaBits == 3) {
+	error("cannot use 3 bits of antialiasing information");
+	exit(1);
+      }
+      break;
+    case 'b':
+      // handled by post-grohtml (set background color to white)
+      break;
+    case 'D':
+      image_dir = optarg;
+      break;
+    case 'I':
+      image_template = optarg;
+      break;
+    case 'i':
+      image_res = atoi(optarg);
+      break;
+    case 'F':
+      font_path.command_line_dir(optarg);
+      break;
+    case 'o':
+      vertical_offset = atoi(optarg);
+      break;
+    case 'p':
+      show_progress = TRUE;
+      break;
+    case 'd':
+#if defined(DEBUGGING)
+      debug = TRUE;
+#endif
+      break;
+    case 'h':
+      // handled by post-grohtml
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      break;
+    }
+
+  i = optind;
+  while (i < argc) {
+    if (strcmp(argv[i], troff_name) == 0)
+      troff_arg = i;
+    else if (argv[i][0] != '-')
+      return i;
+    i++;
+  }
+  a_delete troff_name;
+
+  return argc;
+}
+
+/*
+ *  makeTempFiles - name the temporary files
+ */
+
+static int makeTempFiles (void)
+{
+#if defined(DEBUGGING)
+  psFileName     = "/tmp/prehtml-ps";
+  regionFileName = "/tmp/prehtml-region";
+  imagePageName  = "/tmp/prehtml-page";
+  psPageName     = "/tmp/prehtml-psn";
+  troffFileName  = "/tmp/prehtml-troff";
+  htmlFileName   = "/tmp/prehtml-html";
+#else
+  FILE *f;
+
+  /* psPageName contains a single page of postscript */
+  f = xtmpfile(&psPageName,
+	       PS_TEMPLATE_LONG, PS_TEMPLATE_SHORT,
+	       TRUE);
+  if (f == NULL) {
+    sys_fatal("xtmpfile");
+    return -1;
+  }
+  fclose(f);
+
+  /* imagePageName contains a bitmap image of the single postscript page */
+  f = xtmpfile(&imagePageName,
+	       PAGE_TEMPLATE_LONG, PAGE_TEMPLATE_SHORT,
+	       TRUE);
+  if (f == NULL) {
+    sys_fatal("xtmpfile");
+    return -1;
+  }
+  fclose(f);
+
+  /* psFileName contains a postscript file of the complete document */
+  f = xtmpfile(&psFileName,
+	       PS_TEMPLATE_LONG, PS_TEMPLATE_SHORT,
+	       TRUE);
+  if (f == NULL) {
+    sys_fatal("xtmpfile");
+    return -1;
+  }
+  fclose(f);
+
+  /* regionFileName contains a list of the images and their boxed coordinates */
+  f = xtmpfile(&regionFileName,
+	       REGION_TEMPLATE_LONG, REGION_TEMPLATE_SHORT,
+	       TRUE);
+  if (f == NULL) {
+    sys_fatal("xtmpfile");
+    return -1;
+  }
+  fclose(f);
+
+#endif
+  return 0;
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  int i;
+  int found=0;
+  int ok=1;
+
+  postscriptRes = get_resolution();
+  i = scanArguments(argc, argv);
+  setupAntiAlias();
+  checkImageDir();
+  makeFileName();
+  while (i < argc) {
+    if (argv[i][0] != '-') {
+      /* found source file */
+      ok = do_file(argv[i]);
+      if (! ok) {
+	return( 0 );
+      }
+      found = 1;
+    }
+    i++;
+  }
+
+  copyofstdoutfd=dup(stdoutfd);
+
+  if (! found) {
+    do_file("-");
+  }
+  if (makeTempFiles())
+    return 1;
+  ok = inputFile.do_image(argc, argv);
+  if (ok == 0) {
+    generateImages(regionFileName);
+    ok = inputFile.do_html(argc, argv);
+  }
+  return ok;
+}
+
+static int do_file(const char *filename)
+{
+  FILE *fp;
+
+  current_filename = filename;
+  if (strcmp(filename, "-") == 0) {
+    fp = stdin;
+  } else {
+    fp = fopen(filename, "r");
+    if (fp == 0) {
+      error("can't open `%1': %2", filename, strerror(errno));
+      return 0;
+    }
+  }
+
+  if (inputFile.read_file(fp)) {
+  }
+
+  if (fp != stdin)
+    fclose(fp);
+  current_filename = NULL;
+  return 1;
+}
diff --git a/contrib/groff/src/preproc/html/pushback.cpp b/contrib/groff/src/preproc/html/pushback.cpp
new file mode 100644
index 0000000..07a15e3
--- /dev/null
+++ b/contrib/groff/src/preproc/html/pushback.cpp
@@ -0,0 +1,333 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk).
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <signal.h>
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "posix.h"
+#include "nonposix.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "pushback.h"
+#include "pre-html.h"
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+#   define ERROR(X)   (void)(fprintf(stderr, "%s:%d error %s\n", __FILE__, __LINE__, X) && \
+                            (fflush(stderr)) && localexit(1))
+
+
+#define MAXPUSHBACKSTACK 4096                  /* maximum number of character that can be pushed back */
+
+
+/*
+ *  constructor for pushBackBuffer
+ */
+
+pushBackBuffer::pushBackBuffer (char *filename)
+{
+  charStack = (char *)malloc(MAXPUSHBACKSTACK);
+  if (charStack == 0) {
+    sys_fatal("malloc");
+  }
+  stackPtr = 0;   /* index to push back stack        */
+  debug    = 0;
+  verbose  = 0;
+  eofFound = FALSE;
+  lineNo   = 1;
+  if (strcmp(filename, "") != 0) {
+    stdIn = dup(0);
+    close(0);
+    if (open(filename, O_RDONLY) != 0) {
+      sys_fatal("when trying to open file");
+    } else {
+      fileName = filename;
+    }
+  }
+}
+
+pushBackBuffer::~pushBackBuffer ()
+{
+  int old;
+
+  if (charStack != 0) {
+    free(charStack);
+  }
+  close(0);
+  /* restore stdin in file descriptor 0 */
+  old = dup(stdIn);
+  close(stdIn);
+}
+
+/*
+ *  localexit - wraps exit with a return code to aid the ERROR macro.
+ */
+
+int localexit (int i)
+{
+  exit(i);
+  return( 1 );
+}
+
+/*
+ *  getPB - returns a character, possibly a pushed back character.
+ */
+
+char pushBackBuffer::getPB (void)
+{
+  if (stackPtr>0) {
+    stackPtr--;
+    return( charStack[stackPtr] );
+  } else {
+    char ch;
+
+    if (read(0, &ch, 1) == 1) {
+      if (verbose) {
+	printf("%c", ch);
+      }
+      if (ch == '\n') {
+	lineNo++;
+      }
+      return( ch );
+    } else {
+      eofFound = TRUE;
+      return( eof );
+    }
+  }
+}
+
+/*
+ *  putPB - pushes a character onto the push back stack.
+ *          The same character is returned.
+ */
+
+char pushBackBuffer::putPB (char ch)
+{
+  if (stackPtr<MAXPUSHBACKSTACK) {
+    charStack[stackPtr] = ch ;
+    stackPtr++;
+  } else {
+    ERROR("max push back stack exceeded, increase MAXPUSHBACKSTACK constant");
+  }
+  return( ch );
+}
+
+/*
+ *  isWhite - returns TRUE if a white character is found. This character is NOT consumed.
+ */
+
+static int isWhite (char ch)
+{
+  return( (ch==' ') || (ch == '\t') || (ch == '\n') );
+}
+
+/*
+ *  skipToNewline - skips characters until a newline is seen.
+ */
+
+void pushBackBuffer::skipToNewline (void)
+{
+  char ch;
+
+  while ((putPB(getPB()) != '\n') && (! eofFound)) {
+    ch = getPB();
+  }
+}
+
+/*
+ *  skipUntilToken - skips until a token is seen
+ */
+
+void pushBackBuffer::skipUntilToken (void)
+{
+  char ch;
+
+  while ((isWhite(putPB(getPB())) || (putPB(getPB()) == '#')) && (! eofFound)) {
+    ch = getPB();
+    if (ch == '#') {
+      skipToNewline();
+    }
+  }
+}
+
+/*
+ *  isString - returns TRUE if the string, s, matches the pushed back string.
+ *             if TRUE is returned then this string is consumed, otherwise it is
+ *             left alone.
+ */
+
+int pushBackBuffer::isString (const char *s)
+{
+  int length=strlen(s);
+  int i=0;
+
+  while ((i<length) && (putPB(getPB())==s[i])) {
+    if (getPB() != s[i]) {
+      ERROR("assert failed");
+    }
+    i++;
+  }
+  if (i==length) {
+    return( TRUE );
+  } else {
+    i--;
+    while (i>=0) {
+      if (putPB(s[i]) != s[i]) {
+	ERROR("assert failed");
+      }
+      i--;
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  isDigit - returns TRUE if the character, ch, is a digit.
+ */
+
+static int isDigit (char ch)
+{
+  return( ((ch>='0') && (ch<='9')) );
+}
+
+/*
+ *  isHexDigit - returns TRUE if the character, ch, is a hex digit.
+ */
+
+#if 0
+static int isHexDigit (char ch)
+{
+  return( (isDigit(ch)) || ((ch>='a') && (ch<='f')) );
+}
+#endif
+
+/*
+ *  readInt - returns an integer from the input stream.
+ */
+
+int pushBackBuffer::readInt (void)
+{
+  int  c =0;
+  int  i =0;
+  int  s =1;
+  char ch=getPB();
+
+  while (isWhite(ch)) {
+    ch=getPB();
+  }
+  // now read integer
+
+  if (ch == '-') {
+    s = -1;
+    ch = getPB();
+  }
+  while (isDigit(ch)) {
+    i *= 10;
+    if ((ch>='0') && (ch<='9')) {
+      i += (int)(ch-'0');
+    }
+    ch = getPB();
+    c++;
+  }
+  if (ch != putPB(ch)) {
+    ERROR("assert failed");
+  }
+  return( i*s );
+}
+
+/*
+ *  convertToFloat - converts integers, a and b into a.b
+ */
+
+static float convertToFloat (int a, int b)
+{
+  int c=10;
+  float f;
+
+  while (b>c) {
+    c *= 10;
+  }
+  f = ((float)a) + (((float)b)/((float)c));
+  return( f );
+}
+
+/*
+ *  readNumber - returns a float representing the word just read.
+ */
+
+float pushBackBuffer::readNumber (void)
+{
+  int i;
+  char ch;
+
+  i = readInt();
+  if ((ch = getPB()) == '.') {
+    return convertToFloat(i, readInt());
+  }
+  putPB(ch);
+  return (float)i;
+}
+
+/*
+ *  readString - reads a string terminated by white space
+ *               and returns a malloced area of memory containing
+ *               a copy of the characters.
+ */
+
+char *pushBackBuffer::readString (void)
+{
+  char  buffer[MAXPUSHBACKSTACK];
+  char *string = 0;
+  int   i=0;
+  char ch=getPB();
+
+  while (isWhite(ch)) {
+    ch=getPB();
+  }
+  while ((i < MAXPUSHBACKSTACK) && (! isWhite(ch)) && (! eofFound)) {
+    buffer[i] = ch;
+    i++;
+    ch = getPB();
+  }
+  if (i < MAXPUSHBACKSTACK) {
+    buffer[i] = (char)0;
+    string = (char *)malloc(strlen(buffer)+1);
+    strcpy(string, buffer);
+  }
+  return( string );
+}
diff --git a/contrib/groff/src/preproc/html/pushback.h b/contrib/groff/src/preproc/html/pushback.h
index 93cb3f1..608bac5 100644
--- a/contrib/groff/src/preproc/html/pushback.h
+++ b/contrib/groff/src/preproc/html/pushback.h
@@ -1,5 +1,5 @@
 // -*- C -*-
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk).
 
 This file is part of groff.
@@ -23,7 +23,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 
 /*
- *  defines the class and methods implemented within pushbackbuffer.cc
+ *  defines the class and methods implemented within pushback.cpp
  */
 
 class pushBackBuffer
@@ -48,7 +48,7 @@ class pushBackBuffer
   float readNumber     (void);
   int   readInt        (void);
   char *readString     (void);
-  int   isString       (char *string);
+  int   isString       (const char *string);
 };
 
 
diff --git a/contrib/groff/src/preproc/pic/Makefile.sub b/contrib/groff/src/preproc/pic/Makefile.sub
index 05c47a1..94b41fe 100644
--- a/contrib/groff/src/preproc/pic/Makefile.sub
+++ b/contrib/groff/src/preproc/pic/Makefile.sub
@@ -12,12 +12,12 @@ OBJS=\
   tex.$(OBJEXT)
   # fig.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/lex.cc \
-  $(srcdir)/main.cc \
-  $(srcdir)/object.cc \
-  $(srcdir)/common.cc \
-  $(srcdir)/troff.cc \
-  $(srcdir)/tex.cc
+  $(srcdir)/lex.cpp \
+  $(srcdir)/main.cpp \
+  $(srcdir)/object.cpp \
+  $(srcdir)/common.cpp \
+  $(srcdir)/troff.cpp \
+  $(srcdir)/tex.cpp
 HDRS=\
   $(srcdir)/common.h \
   $(srcdir)/object.h \
@@ -26,6 +26,6 @@ HDRS=\
   $(srcdir)/position.h \
   $(srcdir)/text.h
 GRAM=$(srcdir)/pic.y
-YTABC=pic.cc
+YTABC=pic.cpp
 YTABH=pic_tab.h
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/preproc/pic/common.cpp b/contrib/groff/src/preproc/pic/common.cpp
new file mode 100644
index 0000000..5075e93
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/common.cpp
@@ -0,0 +1,496 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+#include "common.h"
+
+// output a dashed circle as a series of arcs
+
+void common_output::dashed_circle(const position &cent, double rad,
+				  const line_type &lt)
+{
+  assert(lt.type == line_type::dashed);
+  line_type slt = lt;
+  slt.type = line_type::solid;
+  double dash_angle = lt.dash_width/rad;
+  int ndashes;
+  double gap_angle;
+  if (dash_angle >= M_PI/4.0) {
+    if (dash_angle < M_PI/2.0) {
+      gap_angle = M_PI/2.0 - dash_angle;
+      ndashes = 4;
+    }
+    else if (dash_angle < M_PI) {
+      gap_angle = M_PI - dash_angle;
+      ndashes = 2;
+    }
+    else {
+      circle(cent, rad, slt, -1.0);
+      return;
+    }
+  }
+  else {
+    ndashes = 4*int(ceil(M_PI/(4.0*dash_angle)));
+    gap_angle = (M_PI*2.0)/ndashes - dash_angle;
+  }
+  for (int i = 0; i < ndashes; i++) {
+    double start_angle = i*(dash_angle+gap_angle) - dash_angle/2.0;
+    solid_arc(cent, rad, start_angle, start_angle + dash_angle, lt);
+  }
+}
+
+// output a dotted circle as a series of dots
+
+void common_output::dotted_circle(const position &cent, double rad,
+				  const line_type &lt)
+{
+  assert(lt.type == line_type::dotted);
+  double gap_angle = lt.dash_width/rad;
+  int ndots;
+  if (gap_angle >= M_PI/2.0) {
+    // always have at least 2 dots
+    gap_angle = M_PI;
+    ndots = 2;
+  }
+  else {
+    ndots = 4*int(M_PI/(2.0*gap_angle));
+    gap_angle = (M_PI*2.0)/ndots;
+  }
+  double ang = 0.0;
+  for (int i = 0; i < ndots; i++, ang += gap_angle)
+    dot(cent + position(cos(ang), sin(ang))*rad, lt);
+}
+
+// return non-zero iff we can compute a center
+
+int compute_arc_center(const position &start, const position &cent,
+		       const position &end, position *result)
+{
+  // This finds the point along the vector from start to cent that
+  // is equidistant between start and end.
+  distance c = cent - start;
+  distance e = end - start;
+  double n = c*e;
+  if (n == 0.0)
+    return 0;
+  *result = start + c*((e*e)/(2.0*n));
+  return 1;
+}
+
+// output a dashed arc as a series of arcs
+
+void common_output::dashed_arc(const position &start, const position &cent,
+			       const position &end, const line_type &lt)
+{
+  assert(lt.type == line_type::dashed);
+  position c;
+  if (!compute_arc_center(start, cent, end, &c)) {
+    line(start, &end, 1, lt);
+    return;
+  }
+  distance start_offset = start - c;
+  distance end_offset = end - c;
+  double start_angle = atan2(start_offset.y, start_offset.x);
+  double end_angle = atan2(end_offset.y, end_offset.x);
+  double rad = hypot(c - start);
+  double dash_angle = lt.dash_width/rad;
+  double total_angle = end_angle - start_angle;
+  while (total_angle < 0)
+    total_angle += M_PI + M_PI;
+  if (total_angle <= dash_angle*2.0) {
+    solid_arc(cent, rad, start_angle, end_angle, lt);
+    return;
+  }
+  int ndashes = int((total_angle - dash_angle)/(dash_angle*2.0) + .5);
+  double dash_and_gap_angle = (total_angle - dash_angle)/ndashes;
+  for (int i = 0; i <= ndashes; i++)
+    solid_arc(cent, rad, start_angle + i*dash_and_gap_angle,
+	      start_angle + i*dash_and_gap_angle + dash_angle, lt);
+}
+
+// output a dotted arc as a series of dots
+
+void common_output::dotted_arc(const position &start, const position &cent,
+			       const position &end, const line_type &lt)
+{
+  assert(lt.type == line_type::dotted);
+  position c;
+  if (!compute_arc_center(start, cent, end, &c)) {
+    line(start, &end, 1, lt);
+    return;
+  }
+  distance start_offset = start - c;
+  distance end_offset = end - c;
+  double start_angle = atan2(start_offset.y, start_offset.x);
+  double total_angle = atan2(end_offset.y, end_offset.x) - start_angle;
+  while (total_angle < 0)
+    total_angle += M_PI + M_PI;
+  double rad = hypot(c - start);
+  int ndots = int(total_angle/(lt.dash_width/rad) + .5);
+  if (ndots == 0)
+    dot(start, lt);
+  else {
+    for (int i = 0; i <= ndots; i++) {
+      double a = start_angle + (total_angle*i)/ndots;
+      dot(cent + position(cos(a), sin(a))*rad, lt);
+    }
+  }
+}
+
+void common_output::solid_arc(const position &cent, double rad,
+			      double start_angle, double end_angle,
+			      const line_type &lt)
+{
+  line_type slt = lt;
+  slt.type = line_type::solid;
+  arc(cent + position(cos(start_angle), sin(start_angle))*rad,
+      cent,
+      cent + position(cos(end_angle), sin(end_angle))*rad,
+      slt);
+}
+
+
+void common_output::rounded_box(const position &cent, const distance &dim,
+				double rad, const line_type &lt, double fill)
+{
+  if (fill >= 0.0)
+    filled_rounded_box(cent, dim, rad, fill);
+  switch (lt.type) {
+  case line_type::invisible:
+    break;
+  case line_type::dashed:
+    dashed_rounded_box(cent, dim, rad, lt);
+    break;
+  case line_type::dotted:
+    dotted_rounded_box(cent, dim, rad, lt);
+    break;
+  case line_type::solid:
+    solid_rounded_box(cent, dim, rad, lt);
+    break;
+  default:
+    assert(0);
+  }
+}
+
+
+void common_output::dashed_rounded_box(const position &cent,
+				       const distance &dim, double rad,
+				       const line_type &lt)
+{
+  line_type slt = lt;
+  slt.type = line_type::solid;
+
+  double hor_length = dim.x + (M_PI/2.0 - 2.0)*rad;
+  int n_hor_dashes = int(hor_length/(lt.dash_width*2.0) + .5);
+  double hor_gap_width = (n_hor_dashes != 0
+			  ? hor_length/n_hor_dashes - lt.dash_width
+			  : 0.0);
+
+  double vert_length = dim.y + (M_PI/2.0 - 2.0)*rad;
+  int n_vert_dashes = int(vert_length/(lt.dash_width*2.0) + .5);
+  double vert_gap_width = (n_vert_dashes != 0
+			   ? vert_length/n_vert_dashes - lt.dash_width
+			   : 0.0);
+  // Note that each corner arc has to be split into two for dashing,
+  // because one part is dashed using vert_gap_width, and the other
+  // using hor_gap_width.
+  double offset = lt.dash_width/2.0;
+  dash_arc(cent + position(dim.x/2.0 - rad, -dim.y/2.0 + rad), rad,
+	   -M_PI/4.0, 0, slt, lt.dash_width, vert_gap_width, &offset);
+  dash_line(cent + position(dim.x/2.0, -dim.y/2.0 + rad),
+	    cent + position(dim.x/2.0, dim.y/2.0 - rad),
+	    slt, lt.dash_width, vert_gap_width, &offset);
+  dash_arc(cent + position(dim.x/2.0 - rad, dim.y/2.0 - rad), rad,
+	   0, M_PI/4.0, slt, lt.dash_width, vert_gap_width, &offset);
+
+  offset = lt.dash_width/2.0;
+  dash_arc(cent + position(dim.x/2.0 - rad, dim.y/2.0 - rad), rad,
+	   M_PI/4.0, M_PI/2, slt, lt.dash_width, hor_gap_width, &offset);
+  dash_line(cent + position(dim.x/2.0 - rad, dim.y/2.0),
+	    cent + position(-dim.x/2.0 + rad, dim.y/2.0),
+	    slt, lt.dash_width, hor_gap_width, &offset);
+  dash_arc(cent + position(-dim.x/2.0 + rad, dim.y/2.0 - rad), rad,
+	   M_PI/2, 3*M_PI/4.0, slt, lt.dash_width, hor_gap_width, &offset);
+
+  offset = lt.dash_width/2.0;
+  dash_arc(cent + position(-dim.x/2.0 + rad, dim.y/2.0 - rad), rad,
+	   3.0*M_PI/4.0, M_PI, slt, lt.dash_width, vert_gap_width, &offset);
+  dash_line(cent + position(-dim.x/2.0, dim.y/2.0 - rad),
+	    cent + position(-dim.x/2.0, -dim.y/2.0 + rad),
+	    slt, lt.dash_width, vert_gap_width, &offset);
+  dash_arc(cent + position(-dim.x/2.0 + rad, -dim.y/2.0 + rad), rad,
+	   M_PI, 5.0*M_PI/4.0, slt, lt.dash_width, vert_gap_width, &offset);
+
+  offset = lt.dash_width/2.0;
+  dash_arc(cent + position(-dim.x/2.0 + rad, -dim.y/2.0 + rad), rad,
+	   5*M_PI/4.0, 3*M_PI/2.0, slt, lt.dash_width, hor_gap_width, &offset);
+  dash_line(cent + position(-dim.x/2.0 + rad, -dim.y/2.0),
+	    cent + position(dim.x/2.0 - rad, -dim.y/2.0),
+	    slt, lt.dash_width, hor_gap_width, &offset);
+  dash_arc(cent + position(dim.x/2.0 - rad, -dim.y/2.0 + rad), rad,
+	   3*M_PI/2, 7*M_PI/4, slt, lt.dash_width, hor_gap_width, &offset);
+}
+
+// Used by dashed_rounded_box.
+
+void common_output::dash_arc(const position &cent, double rad,
+			     double start_angle, double end_angle,
+			     const line_type &lt,
+			     double dash_width, double gap_width,
+			     double *offsetp)
+{
+  double length = (end_angle - start_angle)*rad;
+  double pos = 0.0;
+  for (;;) {
+    if (*offsetp >= dash_width) {
+      double rem = dash_width + gap_width - *offsetp;
+      if (pos + rem > length) {
+	*offsetp += length - pos;
+	break;
+      }
+      else {
+	pos += rem;
+	*offsetp = 0.0;
+      }
+    }
+    else {
+      double rem = dash_width  - *offsetp;
+      if (pos + rem > length) {
+	solid_arc(cent, rad, start_angle + pos/rad, end_angle, lt);
+	*offsetp += length - pos;
+	break;
+      }
+      else {
+	solid_arc(cent, rad, start_angle + pos/rad,
+		  start_angle + (pos + rem)/rad, lt);
+	pos += rem;
+	*offsetp = dash_width;
+      }
+    }
+  }
+}
+
+// Used by dashed_rounded_box.
+
+void common_output::dash_line(const position &start, const position &end,
+			      const line_type &lt,
+			      double dash_width, double gap_width,
+			      double *offsetp)
+{
+  distance dist = end - start;
+  double length = hypot(dist);
+  if (length == 0.0)
+    return;
+  double pos = 0.0;
+  for (;;) {
+    if (*offsetp >= dash_width) {
+      double rem = dash_width + gap_width - *offsetp;
+      if (pos + rem > length) {
+	*offsetp += length - pos;
+	break;
+      }
+      else {
+	pos += rem;
+	*offsetp = 0.0;
+      }
+    }
+    else {
+      double rem = dash_width  - *offsetp;
+      if (pos + rem > length) {
+	line(start + dist*(pos/length), &end, 1, lt);
+	*offsetp += length - pos;
+	break;
+      }
+      else {
+	position p(start + dist*((pos + rem)/length));
+	line(start + dist*(pos/length), &p, 1, lt);
+	pos += rem;
+	*offsetp = dash_width;
+      }
+    }
+  }
+}
+
+void common_output::dotted_rounded_box(const position &cent,
+				       const distance &dim, double rad,
+				       const line_type &lt)
+{
+  line_type slt = lt;
+  slt.type = line_type::solid;
+
+  double hor_length = dim.x + (M_PI/2.0 - 2.0)*rad;
+  int n_hor_dots = int(hor_length/lt.dash_width + .5);
+  double hor_gap_width = (n_hor_dots != 0
+			  ? hor_length/n_hor_dots
+			  : lt.dash_width);
+
+  double vert_length = dim.y + (M_PI/2.0 - 2.0)*rad;
+  int n_vert_dots = int(vert_length/lt.dash_width + .5);
+  double vert_gap_width = (n_vert_dots != 0
+			   ? vert_length/n_vert_dots
+			   : lt.dash_width);
+  double epsilon = lt.dash_width/(rad*100.0);
+
+  double offset = 0.0;
+  dot_arc(cent + position(dim.x/2.0 - rad, -dim.y/2.0 + rad), rad,
+	   -M_PI/4.0, 0, slt, vert_gap_width, &offset);
+  dot_line(cent + position(dim.x/2.0, -dim.y/2.0 + rad),
+	    cent + position(dim.x/2.0, dim.y/2.0 - rad),
+	    slt, vert_gap_width, &offset);
+  dot_arc(cent + position(dim.x/2.0 - rad, dim.y/2.0 - rad), rad,
+	   0, M_PI/4.0 - epsilon, slt, vert_gap_width, &offset);
+
+  offset = 0.0;
+  dot_arc(cent + position(dim.x/2.0 - rad, dim.y/2.0 - rad), rad,
+	   M_PI/4.0, M_PI/2, slt, hor_gap_width, &offset);
+  dot_line(cent + position(dim.x/2.0 - rad, dim.y/2.0),
+	    cent + position(-dim.x/2.0 + rad, dim.y/2.0),
+	    slt, hor_gap_width, &offset);
+  dot_arc(cent + position(-dim.x/2.0 + rad, dim.y/2.0 - rad), rad,
+	   M_PI/2, 3*M_PI/4.0 - epsilon, slt, hor_gap_width, &offset);
+
+  offset = 0.0;
+  dot_arc(cent + position(-dim.x/2.0 + rad, dim.y/2.0 - rad), rad,
+	   3.0*M_PI/4.0, M_PI, slt, vert_gap_width, &offset);
+  dot_line(cent + position(-dim.x/2.0, dim.y/2.0 - rad),
+	    cent + position(-dim.x/2.0, -dim.y/2.0 + rad),
+	    slt, vert_gap_width, &offset);
+  dot_arc(cent + position(-dim.x/2.0 + rad, -dim.y/2.0 + rad), rad,
+	   M_PI, 5.0*M_PI/4.0 - epsilon, slt, vert_gap_width, &offset);
+
+  offset = 0.0;
+  dot_arc(cent + position(-dim.x/2.0 + rad, -dim.y/2.0 + rad), rad,
+	   5*M_PI/4.0, 3*M_PI/2.0, slt, hor_gap_width, &offset);
+  dot_line(cent + position(-dim.x/2.0 + rad, -dim.y/2.0),
+	    cent + position(dim.x/2.0 - rad, -dim.y/2.0),
+	    slt, hor_gap_width, &offset);
+  dot_arc(cent + position(dim.x/2.0 - rad, -dim.y/2.0 + rad), rad,
+	   3*M_PI/2, 7*M_PI/4 - epsilon, slt, hor_gap_width, &offset);
+}
+
+// Used by dotted_rounded_box.
+
+void common_output::dot_arc(const position &cent, double rad,
+			    double start_angle, double end_angle,
+			    const line_type &lt, double gap_width,
+			    double *offsetp)
+{
+  double length = (end_angle - start_angle)*rad;
+  double pos = 0.0;
+  for (;;) {
+    if (*offsetp == 0.0) {
+      double ang = start_angle + pos/rad;
+      dot(cent + position(cos(ang), sin(ang))*rad, lt);
+    }
+    double rem = gap_width - *offsetp;
+    if (pos + rem > length) {
+      *offsetp += length - pos;
+      break;
+    }
+    else {
+      pos += rem;
+      *offsetp = 0.0;
+    }
+  }
+}
+
+// Used by dotted_rounded_box.
+
+void common_output::dot_line(const position &start, const position &end,
+			     const line_type &lt, double gap_width,
+			     double *offsetp)
+{
+  distance dist = end - start;
+  double length = hypot(dist);
+  if (length == 0.0)
+    return;
+  double pos = 0.0;
+  for (;;) {
+    if (*offsetp == 0.0)
+      dot(start + dist*(pos/length), lt);
+    double rem = gap_width - *offsetp;
+    if (pos + rem > length) {
+      *offsetp += length - pos;
+      break;
+    }
+    else {
+      pos += rem;
+      *offsetp = 0.0;
+    }
+  }
+}
+
+void common_output::solid_rounded_box(const position &cent,
+				      const distance &dim, double rad,
+				      const line_type &lt)
+{
+  position tem = cent - dim/2.0;
+  arc(tem + position(0.0, rad),
+      tem + position(rad, rad),
+      tem + position(rad, 0.0),
+      lt);
+  tem = cent + position(-dim.x/2.0, dim.y/2.0);
+  arc(tem + position(rad, 0.0),
+      tem + position(rad, -rad),
+      tem + position(0.0, -rad),
+      lt);
+  tem = cent + dim/2.0;
+  arc(tem + position(0.0, -rad),
+      tem + position(-rad, -rad),
+      tem + position(-rad, 0.0),
+      lt);
+  tem = cent + position(dim.x/2.0, -dim.y/2.0);
+  arc(tem + position(-rad, 0.0),
+      tem + position(-rad, rad),
+      tem + position(0.0, rad),
+      lt);
+  position end;
+  end = cent + position(-dim.x/2.0, dim.y/2.0 - rad);
+  line(cent - dim/2.0 + position(0.0, rad), &end, 1, lt);
+  end = cent + position(dim.x/2.0 - rad, dim.y/2.0);
+  line(cent + position(-dim.x/2.0 + rad, dim.y/2.0), &end, 1, lt);
+  end = cent + position(dim.x/2.0, -dim.y/2.0 + rad);
+  line(cent + position(dim.x/2.0, dim.y/2.0 - rad), &end, 1, lt);
+  end = cent + position(-dim.x/2.0 + rad, -dim.y/2.0);
+  line(cent + position(dim.x/2.0 - rad, -dim.y/2.0), &end, 1, lt);
+}
+
+void common_output::filled_rounded_box(const position &cent,
+				       const distance &dim, double rad,
+				       double fill)
+{
+  line_type ilt;
+  ilt.type = line_type::invisible;
+  circle(cent + position(dim.x/2.0 - rad, dim.y/2.0 - rad), rad, ilt, fill);
+  circle(cent + position(-dim.x/2.0 + rad, dim.y/2.0 - rad), rad, ilt, fill);
+  circle(cent + position(-dim.x/2.0 + rad, -dim.y/2.0 + rad), rad, ilt, fill);
+  circle(cent + position(dim.x/2.0 - rad, -dim.y/2.0 + rad), rad, ilt, fill);
+  position vec[4];
+  vec[0] = cent + position(dim.x/2.0, dim.y/2.0 - rad);
+  vec[1] = cent + position(-dim.x/2.0, dim.y/2.0 - rad);
+  vec[2] = cent + position(-dim.x/2.0, -dim.y/2.0 + rad);
+  vec[3] = cent + position(dim.x/2.0, -dim.y/2.0 + rad);
+  polygon(vec, 4, ilt, fill);
+  vec[0] = cent + position(dim.x/2.0 - rad, dim.y/2.0);
+  vec[1] = cent + position(-dim.x/2.0 + rad, dim.y/2.0);
+  vec[2] = cent + position(-dim.x/2.0 + rad, -dim.y/2.0);
+  vec[3] = cent + position(dim.x/2.0 - rad, -dim.y/2.0);
+  polygon(vec, 4, ilt, fill);
+}
diff --git a/contrib/groff/src/preproc/pic/lex.cpp b/contrib/groff/src/preproc/pic/lex.cpp
new file mode 100644
index 0000000..b8aa9eb
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/lex.cpp
@@ -0,0 +1,1993 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2002, 2003
+     Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+#include "ptable.h"
+#include "object.h"
+#include "pic_tab.h"
+
+declare_ptable(char)
+implement_ptable(char)
+
+PTABLE(char) macro_table;
+
+class macro_input : public input {
+  char *s;
+  char *p;
+public:
+  macro_input(const char *);
+  ~macro_input();
+  int get();
+  int peek();
+};
+
+class argument_macro_input : public input {
+  char *s;
+  char *p;
+  char *ap;
+  int argc;
+  char *argv[9];
+public:
+  argument_macro_input(const char *, int, char **);
+  ~argument_macro_input();
+  int get();
+  int peek();
+};
+
+input::input() : next(0)
+{
+}
+
+input::~input()
+{
+}
+
+int input::get_location(const char **, int *)
+{
+  return 0;
+}
+
+file_input::file_input(FILE *f, const char *fn)
+: fp(f), filename(fn), lineno(0), ptr("")
+{
+}
+
+file_input::~file_input()
+{
+  fclose(fp);
+}
+
+int file_input::read_line()
+{
+  for (;;) {
+    line.clear();
+    lineno++;
+    for (;;) {
+      int c = getc(fp);
+      if (c == EOF)
+	break;
+      else if (invalid_input_char(c))
+	lex_error("invalid input character code %1", c);
+      else {
+	line += char(c);
+	if (c == '\n') 
+	  break;
+      }
+    }
+    if (line.length() == 0)
+      return 0;
+    if (!(line.length() >= 3 && line[0] == '.' && line[1] == 'P'
+	  && (line[2] == 'S' || line[2] == 'E' || line[2] == 'F')
+	  && (line.length() == 3 || line[3] == ' ' || line[3] == '\n'
+	      || compatible_flag))) {
+      line += '\0';
+      ptr = line.contents();
+      return 1;
+    }
+  }
+}
+
+int file_input::get()
+{
+  if (*ptr != '\0' || read_line())
+    return (unsigned char)*ptr++;
+  else
+    return EOF;
+}
+
+int file_input::peek()
+{
+  if (*ptr != '\0' || read_line())
+    return (unsigned char)*ptr;
+  else
+    return EOF;
+}
+
+int file_input::get_location(const char **fnp, int *lnp)
+{
+  *fnp = filename;
+  *lnp = lineno;
+  return 1;
+}
+
+macro_input::macro_input(const char *str)
+{
+  p = s = strsave(str);
+}
+
+macro_input::~macro_input()
+{
+  a_delete s;
+}
+
+int macro_input::get()
+{
+  if (p == 0 || *p == '\0')
+    return EOF;
+  else
+    return (unsigned char)*p++;
+}
+
+int macro_input::peek()
+{
+  if (p == 0 || *p == '\0')
+    return EOF;
+  else
+    return (unsigned char)*p;
+}
+
+// Character representing $1.  Must be invalid input character.
+#define ARG1 14
+
+char *process_body(const char *body)
+{
+  char *s = strsave(body);
+  int j = 0;
+  for (int i = 0; s[i] != '\0'; i++)
+    if (s[i] == '$' && s[i+1] >= '0' && s[i+1] <= '9') {
+      if (s[i+1] != '0')
+	s[j++] = ARG1 + s[++i] - '1';
+    }
+    else
+      s[j++] = s[i];
+  s[j] = '\0';
+  return s;
+}
+
+
+argument_macro_input::argument_macro_input(const char *body, int ac, char **av)
+: ap(0), argc(ac)
+{
+  for (int i = 0; i < argc; i++)
+    argv[i] = av[i];
+  p = s = process_body(body);
+}
+
+
+argument_macro_input::~argument_macro_input()
+{
+  for (int i = 0; i < argc; i++)
+    a_delete argv[i];
+  a_delete s;
+}
+
+int argument_macro_input::get()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return (unsigned char)*ap++;
+    ap = 0;
+  }
+  if (p == 0)
+    return EOF;
+  while (*p >= ARG1 && *p <= ARG1 + 8) {
+    int i = *p++ - ARG1;
+    if (i < argc && argv[i] != 0 && argv[i][0] != '\0') {
+      ap = argv[i];
+      return (unsigned char)*ap++;
+    }
+  }
+  if (*p == '\0')
+    return EOF;
+  return (unsigned char)*p++;
+}
+
+int argument_macro_input::peek()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return (unsigned char)*ap;
+    ap = 0;
+  }
+  if (p == 0)
+    return EOF;
+  while (*p >= ARG1 && *p <= ARG1 + 8) {
+    int i = *p++ - ARG1;
+    if (i < argc && argv[i] != 0 && argv[i][0] != '\0') {
+      ap = argv[i];
+      return (unsigned char)*ap;
+    }
+  }
+  if (*p == '\0')
+    return EOF;
+  return (unsigned char)*p;
+}
+
+class input_stack {
+  static input *current_input;
+  static int bol_flag;
+public:
+  static void push(input *);
+  static void clear();
+  static int get_char();
+  static int peek_char();
+  static int get_location(const char **fnp, int *lnp);
+  static void push_back(unsigned char c, int was_bol = 0);
+  static int bol();
+};
+
+input *input_stack::current_input = 0;
+int input_stack::bol_flag = 0;
+
+inline int input_stack::bol()
+{
+  return bol_flag;
+}
+
+void input_stack::clear()
+{
+  while (current_input != 0) {
+    input *tem = current_input;
+    current_input = current_input->next;
+    delete tem;
+  }
+  bol_flag = 1;
+}
+
+void input_stack::push(input *in)
+{
+  in->next = current_input;
+  current_input = in;
+}
+
+void lex_init(input *top)
+{
+  input_stack::clear();
+  input_stack::push(top);
+}
+
+void lex_cleanup()
+{
+  while (input_stack::get_char() != EOF)
+    ;
+}
+
+int input_stack::get_char()
+{
+  while (current_input != 0) {
+    int c = current_input->get();
+    if (c != EOF) {
+      bol_flag = c == '\n';
+      return c;
+    }
+    // don't pop the top-level input off the stack
+    if (current_input->next == 0)
+      return EOF;
+    input *tem = current_input;
+    current_input = current_input->next;
+    delete tem;
+  }
+  return EOF;
+}
+
+int input_stack::peek_char()
+{
+  while (current_input != 0) {
+    int c = current_input->peek();
+    if (c != EOF)
+      return c;
+    if (current_input->next == 0)
+      return EOF;
+    input *tem = current_input;
+    current_input = current_input->next;
+    delete tem;
+  }
+  return EOF;
+}
+
+class char_input : public input {
+  int c;
+public:
+  char_input(int);
+  int get();
+  int peek();
+};
+
+char_input::char_input(int n) : c((unsigned char)n)
+{
+}
+
+int char_input::get()
+{
+  int n = c;
+  c = EOF;
+  return n;
+}
+
+int char_input::peek()
+{
+  return c;
+}
+
+void input_stack::push_back(unsigned char c, int was_bol)
+{
+  push(new char_input(c));
+  bol_flag = was_bol;
+}
+
+int input_stack::get_location(const char **fnp, int *lnp)
+{
+  for (input *p = current_input; p; p = p->next)
+    if (p->get_location(fnp, lnp))
+      return 1;
+  return 0;
+}
+
+string context_buffer;
+
+string token_buffer;
+double token_double;
+int token_int;
+
+void interpolate_macro_with_args(const char *body)
+{
+  char *argv[9];
+  int argc = 0;
+  int i;
+  for (i = 0; i < 9; i++)
+    argv[i] = 0;
+  int level = 0;
+  int c;
+  enum { NORMAL, IN_STRING, IN_STRING_QUOTED } state = NORMAL;
+  do {
+    token_buffer.clear();
+    for (;;) {
+      c = input_stack::get_char();
+      if (c == EOF) {
+	lex_error("end of input while scanning macro arguments");
+	break;
+      }
+      if (state == NORMAL && level == 0 && (c == ',' || c == ')')) {
+	if (token_buffer.length() > 0) {
+	  token_buffer +=  '\0';
+	  argv[argc] = strsave(token_buffer.contents());
+	}
+	// for `foo()', argc = 0
+	if (argc > 0 || c != ')' || i > 0)
+	  argc++;
+	break;
+      }
+      token_buffer += char(c);
+      switch (state) {
+      case NORMAL:
+	if (c == '"')
+	  state = IN_STRING;
+	else if (c == '(')
+	  level++;
+	else if (c == ')')
+	  level--;
+	break;
+      case IN_STRING:
+	if (c == '"')
+	  state = NORMAL;
+	else if (c == '\\')
+	  state = IN_STRING_QUOTED;
+	break;
+      case IN_STRING_QUOTED:
+	state = IN_STRING;
+	break;
+      }
+    }
+  } while (c != ')' && c != EOF);
+  input_stack::push(new argument_macro_input(body, argc, argv));
+}
+
+static int docmp(const char *s1, int n1, const char *s2, int n2)
+{
+  if (n1 < n2) {
+    int r = memcmp(s1, s2, n1);
+    return r ? r : -1;
+  }
+  else if (n1 > n2) {
+    int r = memcmp(s1, s2, n2);
+    return r ? r : 1;
+  }
+  else
+    return memcmp(s1, s2, n1);
+}
+
+int lookup_keyword(const char *str, int len)
+{
+  static struct keyword {
+    const char *name;
+    int token;
+  } table[] = {
+    { "Here", HERE },
+    { "above", ABOVE },
+    { "aligned", ALIGNED },
+    { "and", AND },
+    { "arc", ARC },
+    { "arrow", ARROW },
+    { "at", AT },
+    { "atan2", ATAN2 },
+    { "below", BELOW },
+    { "between", BETWEEN },
+    { "bottom", BOTTOM },
+    { "box", BOX },
+    { "by", BY },
+    { "ccw", CCW },
+    { "center", CENTER },
+    { "chop", CHOP },
+    { "circle", CIRCLE },
+    { "color", COLORED },
+    { "colored", COLORED },
+    { "colour", COLORED },
+    { "coloured", COLORED },
+    { "command", COMMAND },
+    { "copy", COPY },
+    { "cos", COS },
+    { "cw", CW },
+    { "dashed", DASHED },
+    { "define", DEFINE },
+    { "diam", DIAMETER },
+    { "diameter", DIAMETER },
+    { "do", DO },
+    { "dotted", DOTTED },
+    { "down", DOWN },
+    { "east", EAST },
+    { "ellipse", ELLIPSE },
+    { "else", ELSE },
+    { "end", END },
+    { "exp", EXP },
+    { "figname", FIGNAME },
+    { "fill", FILL },
+    { "filled", FILL },
+    { "for", FOR },
+    { "from", FROM },
+    { "height", HEIGHT },
+    { "ht", HEIGHT },
+    { "if", IF },
+    { "int", INT },
+    { "invis", INVISIBLE },
+    { "invisible", INVISIBLE },
+    { "last", LAST },
+    { "left", LEFT },
+    { "line", LINE },
+    { "ljust", LJUST },
+    { "log", LOG },
+    { "lower", LOWER },
+    { "max", K_MAX },
+    { "min", K_MIN },
+    { "move", MOVE },
+    { "north", NORTH },
+    { "of", OF },
+    { "outline", OUTLINED },
+    { "outlined", OUTLINED },
+    { "plot", PLOT },
+    { "print", PRINT },
+    { "rad", RADIUS },
+    { "radius", RADIUS },
+    { "rand", RAND },
+    { "reset", RESET },
+    { "right", RIGHT },
+    { "rjust", RJUST },
+    { "same", SAME },
+    { "sh", SH },
+    { "shaded", SHADED },
+    { "sin", SIN },
+    { "solid", SOLID },
+    { "south", SOUTH },
+    { "spline", SPLINE },
+    { "sprintf", SPRINTF },
+    { "sqrt", SQRT },
+    { "srand", SRAND },
+    { "start", START },
+    { "the", THE },
+    { "then", THEN },
+    { "thick", THICKNESS },
+    { "thickness", THICKNESS },
+    { "thru", THRU },
+    { "to", TO },
+    { "top", TOP },
+    { "undef", UNDEF },
+    { "until", UNTIL },
+    { "up", UP },
+    { "upper", UPPER },
+    { "way", WAY },
+    { "west", WEST },
+    { "wid", WIDTH },
+    { "width", WIDTH },
+    { "with", WITH },
+  };
+  
+  const keyword *start = table;
+  const keyword *end = table + sizeof(table)/sizeof(table[0]);
+  while (start < end) {
+    // start <= target < end
+    const keyword *mid = start + (end - start)/2;
+    
+    int cmp = docmp(str, len, mid->name, strlen(mid->name));
+    if (cmp == 0)
+      return mid->token;
+    if (cmp < 0)
+      end = mid;
+    else
+      start = mid + 1;
+  }
+  return 0;
+}
+
+int get_token_after_dot(int c)
+{
+  // get_token deals with the case where c is a digit
+  switch (c) {
+  case 'h':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 't') {
+      input_stack::get_char();
+      context_buffer = ".ht";
+      return DOT_HT;
+    }
+    else if (c == 'e') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'i') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'g') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'h') {
+	    input_stack::get_char();
+	    c = input_stack::peek_char();
+	    if (c == 't') {
+	      input_stack::get_char();
+	      context_buffer = ".height";
+	      return DOT_HT;
+	    }
+	    input_stack::push_back('h');
+	  }
+	  input_stack::push_back('g');
+	}
+	input_stack::push_back('i');
+      }
+      input_stack::push_back('e');
+    }
+    input_stack::push_back('h');
+    return '.';
+  case 'x':
+    input_stack::get_char();
+    context_buffer = ".x";
+    return DOT_X;
+  case 'y':
+    input_stack::get_char();
+    context_buffer = ".y";
+    return DOT_Y;
+  case 'c':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'e') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'n') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'e') {
+	    input_stack::get_char();
+	    c = input_stack::peek_char();
+	    if (c == 'r') {
+	      input_stack::get_char();
+	      context_buffer = ".center";
+	      return DOT_C;
+	    }
+	    input_stack::push_back('e');
+	  }
+	  input_stack::push_back('t');
+	}
+	input_stack::push_back('n');
+      }
+      input_stack::push_back('e');
+    }
+    context_buffer = ".c";
+    return DOT_C;
+  case 'n':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'e') {
+      input_stack::get_char();
+      context_buffer = ".ne";
+      return DOT_NE;
+    }
+    else if (c == 'w') {
+      input_stack::get_char();
+      context_buffer = ".nw";
+      return DOT_NW;
+    }
+    else {
+      context_buffer = ".n";
+      return DOT_N;
+    }
+    break;
+  case 'e':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'n') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'd') {
+	input_stack::get_char();
+	context_buffer = ".end";
+	return DOT_END;
+      }
+      input_stack::push_back('n');
+      context_buffer = ".e";
+      return DOT_E;
+    }
+    context_buffer = ".e";
+    return DOT_E;
+  case 'w':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'i') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'd') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'h') {
+	    input_stack::get_char();
+	    context_buffer = ".width";
+	    return DOT_WID;
+	  }
+	  input_stack::push_back('t');
+	}
+	context_buffer = ".wid";
+	return DOT_WID;
+      }
+      input_stack::push_back('i');
+    }
+    context_buffer = ".w";
+    return DOT_W;
+  case 's':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'e') {
+      input_stack::get_char();
+      context_buffer = ".se";
+      return DOT_SE;
+    }
+    else if (c == 'w') {
+      input_stack::get_char();
+      context_buffer = ".sw";
+      return DOT_SW;
+    }
+    else {
+      if (c == 't') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'a') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'r') {
+	    input_stack::get_char();
+	    c = input_stack::peek_char();
+	    if (c == 't') {
+	      input_stack::get_char();
+	      context_buffer = ".start";
+	      return DOT_START;
+	    }
+	    input_stack::push_back('r');
+	  }
+	  input_stack::push_back('a');
+	}
+	input_stack::push_back('t');
+      }
+      context_buffer = ".s";
+      return DOT_S;
+    }
+    break;
+  case 't':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'o') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'p') {
+	input_stack::get_char();
+	context_buffer = ".top";
+	return DOT_N;
+      }
+      input_stack::push_back('o');
+    }
+    context_buffer = ".t";
+    return DOT_N;
+  case 'l':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'e') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'f') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  context_buffer = ".left";
+	  return DOT_W;
+	}
+	input_stack::push_back('f');
+      }
+      input_stack::push_back('e');
+    }
+    context_buffer = ".l";
+    return DOT_W;
+  case 'r':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'a') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'd') {
+	input_stack::get_char();
+	context_buffer = ".rad";
+	return DOT_RAD;
+      }
+      input_stack::push_back('a');
+    }
+    else if (c == 'i') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 'g') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'h') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 't') {
+	    input_stack::get_char();
+	    context_buffer = ".right";
+	    return DOT_E;
+	  }
+	  input_stack::push_back('h');
+	}
+	input_stack::push_back('g');
+      }
+      input_stack::push_back('i');
+    }
+    context_buffer = ".r";
+    return DOT_E;
+  case 'b':
+    input_stack::get_char();
+    c = input_stack::peek_char();
+    if (c == 'o') {
+      input_stack::get_char();
+      c = input_stack::peek_char();
+      if (c == 't') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'o') {
+	    input_stack::get_char();
+	    c = input_stack::peek_char();
+	    if (c == 'm') {
+	      input_stack::get_char();
+	      context_buffer = ".bottom";
+	      return DOT_S;
+	    }
+	    input_stack::push_back('o');
+	  }
+	  input_stack::push_back('t');
+	}
+	context_buffer = ".bot";
+	return DOT_S;
+      }
+      input_stack::push_back('o');
+    }
+    context_buffer = ".b";
+    return DOT_S;
+  default:
+    context_buffer = '.';
+    return '.';
+  }
+}
+
+int get_token(int lookup_flag)
+{
+  context_buffer.clear();
+  for (;;) {
+    int n = 0;
+    int bol = input_stack::bol();
+    int c = input_stack::get_char();
+    if (bol && c == command_char) {
+      token_buffer.clear();
+      token_buffer += c;
+      // the newline is not part of the token
+      for (;;) {
+	c = input_stack::peek_char();
+	if (c == EOF || c == '\n')
+	  break;
+	input_stack::get_char();
+	token_buffer += char(c);
+      }
+      context_buffer = token_buffer;
+      return COMMAND_LINE;
+    }
+    switch (c) {
+    case EOF:
+      return EOF;
+    case ' ':
+    case '\t':
+      break;
+    case '\\':
+      {
+	int d = input_stack::peek_char();
+	if (d != '\n') {
+	  context_buffer = '\\';
+	  return '\\';
+	}
+	input_stack::get_char();
+	break;
+      }
+    case '#':
+      do {
+	c = input_stack::get_char();
+      } while (c != '\n' && c != EOF);
+      if (c == '\n')
+	context_buffer = '\n';
+      return c;
+    case '"':
+      context_buffer = '"';
+      token_buffer.clear();
+      for (;;) {
+	c = input_stack::get_char();
+	if (c == '\\') {
+	  context_buffer += '\\';
+	  c = input_stack::peek_char();
+	  if (c == '"') {
+	    input_stack::get_char();
+	    token_buffer += '"';
+	    context_buffer += '"';
+	  }
+	  else
+	    token_buffer += '\\';
+	}
+	else if (c == '\n') {
+	  error("newline in string");
+	  break;
+	}
+	else if (c == EOF) {
+	  error("missing `\"'");
+	  break;
+	}
+	else if (c == '"') {
+	  context_buffer += '"';
+	  break;
+	}
+	else {
+	  context_buffer += char(c);
+	  token_buffer += char(c);
+	}
+      }
+      return TEXT;
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      {   
+	int overflow = 0;
+	n = 0;
+	for (;;) {
+	  if (n > (INT_MAX - 9)/10) {
+	    overflow = 1;
+	    break;
+	  }
+	  n *= 10;
+	  n += c - '0';
+	  context_buffer += char(c);
+	  c = input_stack::peek_char();
+	  if (c == EOF || !csdigit(c))
+	    break;
+	  c = input_stack::get_char();
+	}
+	token_double = n;
+	if (overflow) {
+	  for (;;) {
+	    token_double *= 10.0;
+	    token_double += c - '0';
+	    context_buffer += char(c);
+	    c = input_stack::peek_char();
+	    if (c == EOF || !csdigit(c))
+	      break;
+	    c = input_stack::get_char();
+	  }
+	  // if somebody asks for 1000000000000th, we will silently
+	  // give them INT_MAXth
+	  double temp = token_double; // work around gas 1.34/sparc bug
+	  if (token_double > INT_MAX)
+	    n = INT_MAX;
+	  else
+	    n = int(temp);
+	}
+      }
+      switch (c) {
+      case 'i':
+      case 'I':
+	context_buffer += char(c);
+	input_stack::get_char();
+	return NUMBER;
+      case '.':
+	{
+	  context_buffer += '.';
+	  input_stack::get_char();
+	got_dot:
+	  double factor = 1.0;
+	  for (;;) {
+	    c = input_stack::peek_char();
+	    if (c == EOF || !csdigit(c))
+	      break;
+	    input_stack::get_char();
+	    context_buffer += char(c);
+	    factor /= 10.0;
+	    if (c != '0')
+	      token_double += factor*(c - '0');
+	  }
+	  if (c != 'e' && c != 'E') {
+	    if (c == 'i' || c == 'I') {
+	      context_buffer += char(c);
+	      input_stack::get_char();
+	    }
+	    return NUMBER;
+	  }
+	}
+	// fall through
+      case 'e':
+      case 'E':
+	{
+	  int echar = c;
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  int sign = '+';
+	  if (c == '+' || c == '-') {
+	    sign = c;
+	    input_stack::get_char();
+	    c = input_stack::peek_char();
+	    if (c == EOF || !csdigit(c)) {
+	      input_stack::push_back(sign);
+	      input_stack::push_back(echar);
+	      return NUMBER;
+	    }
+	    context_buffer += char(echar);
+	    context_buffer += char(sign);
+	  }
+	  else {
+	    if (c == EOF || !csdigit(c)) {
+	      input_stack::push_back(echar);
+	      return NUMBER;
+	    }
+	    context_buffer += char(echar);
+	  }
+	  input_stack::get_char();
+	  context_buffer += char(c);
+	  n = c - '0';
+	  for (;;) {
+	    c = input_stack::peek_char();
+	    if (c == EOF || !csdigit(c))
+	      break;
+	    input_stack::get_char();
+	    context_buffer += char(c);
+	    n = n*10 + (c - '0');
+	  }
+	  if (sign == '-')
+	    n = -n;
+	  if (c == 'i' || c == 'I') {
+	    context_buffer += char(c);
+	    input_stack::get_char();
+	  }
+	  token_double *= pow(10.0, n);
+	  return NUMBER;
+	}
+      case 'n':
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'd') {
+	  input_stack::get_char();
+	  token_int = n;
+	  context_buffer += "nd";
+	  return ORDINAL;
+	}
+	input_stack::push_back('n');
+	return NUMBER;
+      case 'r':
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'd') {
+	  input_stack::get_char();
+	  token_int = n;
+	  context_buffer += "rd";
+	  return ORDINAL;
+	}
+	input_stack::push_back('r');
+	return NUMBER;
+      case 't':
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 'h') {
+	  input_stack::get_char();
+	  token_int = n;
+	  context_buffer += "th";
+	  return ORDINAL;
+	}
+	input_stack::push_back('t');
+	return NUMBER;
+      case 's':
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  token_int = n;
+	  context_buffer += "st";
+	  return ORDINAL;
+	}
+	input_stack::push_back('s');
+	return NUMBER;
+      default:
+	return NUMBER;
+      }
+      break;
+    case '\'':
+      {
+	c = input_stack::peek_char();
+	if (c == 't') {
+	  input_stack::get_char();
+	  c = input_stack::peek_char();
+	  if (c == 'h') {
+	    input_stack::get_char();
+	    context_buffer = "'th";
+	    return TH;
+	  }
+	  else
+	    input_stack::push_back('t');
+	}
+	context_buffer = "'";
+	return '\'';
+      }
+    case '.':
+      {
+	c = input_stack::peek_char();
+	if (c != EOF && csdigit(c)) {
+	  n = 0;
+	  token_double = 0.0;
+	  context_buffer = '.';
+	  goto got_dot;
+	}
+	return get_token_after_dot(c);
+      }
+    case '<':
+      c = input_stack::peek_char();
+      if (c == '-') {
+	input_stack::get_char();
+	c = input_stack::peek_char();
+	if (c == '>') {
+	  input_stack::get_char();
+	  context_buffer = "<->";
+	  return DOUBLE_ARROW_HEAD;
+	}
+	context_buffer = "<-";
+	return LEFT_ARROW_HEAD;
+      }
+      else if (c == '=') {
+	input_stack::get_char();
+	context_buffer = "<=";
+	return LESSEQUAL;
+      }
+      context_buffer = "<";
+      return '<';
+    case '-':
+      c = input_stack::peek_char();
+      if (c == '>') {
+	input_stack::get_char();
+	context_buffer = "->";
+	return RIGHT_ARROW_HEAD;
+      }
+      context_buffer = "-";
+      return '-';
+    case '!':
+      c = input_stack::peek_char();
+      if (c == '=') {
+	input_stack::get_char();
+	context_buffer = "!=";
+	return NOTEQUAL;
+      }
+      context_buffer = "!";
+      return '!';
+    case '>':
+      c = input_stack::peek_char();
+      if (c == '=') {
+	input_stack::get_char();
+	context_buffer = ">=";
+	return GREATEREQUAL;
+      }
+      context_buffer = ">";
+      return '>';
+    case '=':
+      c = input_stack::peek_char();
+      if (c == '=') {
+	input_stack::get_char();
+	context_buffer = "==";
+	return EQUALEQUAL;
+      }
+      context_buffer = "=";
+      return '=';
+    case '&':
+      c = input_stack::peek_char();
+      if (c == '&') {
+	input_stack::get_char();
+	context_buffer = "&&";
+	return ANDAND;
+      }
+      context_buffer = "&";
+      return '&';
+    case '|':
+      c = input_stack::peek_char();
+      if (c == '|') {
+	input_stack::get_char();
+	context_buffer = "||";
+	return OROR;
+      }
+      context_buffer = "|";
+      return '|';
+    default:
+      if (c != EOF && csalpha(c)) {
+	token_buffer.clear();
+	token_buffer = c;
+	for (;;) {
+	  c = input_stack::peek_char();
+	  if (c == EOF || (!csalnum(c) && c != '_'))
+	    break;
+	  input_stack::get_char();
+	  token_buffer += char(c);
+	}
+	int tok = lookup_keyword(token_buffer.contents(),
+				 token_buffer.length());
+	if (tok != 0) {
+	  context_buffer = token_buffer;
+	  return tok;
+	}
+	char *def = 0;
+	if (lookup_flag) {
+	  token_buffer += '\0';
+	  def = macro_table.lookup(token_buffer.contents());
+	  token_buffer.set_length(token_buffer.length() - 1);
+	  if (def) {
+	    if (c == '(') {
+	      input_stack::get_char();
+	      interpolate_macro_with_args(def);
+	    }
+	    else
+	      input_stack::push(new macro_input(def));
+	  }
+	}
+	if (!def) {
+	  context_buffer = token_buffer;
+	  if (csupper(token_buffer[0]))
+	    return LABEL;
+	  else
+	    return VARIABLE;
+	}
+      }
+      else {
+	context_buffer = char(c);
+	return (unsigned char)c;
+      }
+      break;
+    }
+  }
+}
+
+int get_delimited()
+{
+  token_buffer.clear();
+  int c = input_stack::get_char();
+  while (c == ' ' || c == '\t' || c == '\n')
+    c = input_stack::get_char();
+  if (c == EOF) {
+    lex_error("missing delimiter");
+    return 0;
+  }
+  context_buffer = char(c);
+  int had_newline = 0;
+  int start = c;
+  int level = 0;
+  enum { NORMAL, IN_STRING, IN_STRING_QUOTED, DELIM_END } state = NORMAL;
+  for (;;) {
+    c = input_stack::get_char();
+    if (c == EOF) {
+      lex_error("missing closing delimiter");
+      return 0;
+    }
+    if (c == '\n')
+      had_newline = 1;
+    else if (!had_newline)
+      context_buffer += char(c);
+    switch (state) {
+    case NORMAL:
+      if (start == '{') {
+	if (c == '{') {
+	  level++;
+	  break;
+	}
+	if (c == '}') {
+	  if (--level < 0)
+	    state = DELIM_END;
+	  break;
+	}
+      }
+      else {
+	if (c == start) {
+	  state = DELIM_END;
+	  break;
+	}
+      }
+      if (c == '"')
+	state = IN_STRING;
+      break;
+    case IN_STRING_QUOTED:
+      if (c == '\n')
+	state = NORMAL;
+      else
+	state = IN_STRING;
+      break;
+    case IN_STRING:
+      if (c == '"' || c == '\n')
+	state = NORMAL;
+      else if (c == '\\')
+	state = IN_STRING_QUOTED;
+      break;
+    case DELIM_END:
+      // This case it just to shut cfront 2.0 up.
+    default:
+      assert(0);
+    }
+    if (state == DELIM_END)
+      break;
+    token_buffer += c;
+  }
+  return 1;
+}
+
+void do_define()
+{
+  int t = get_token(0);		// do not expand what we are defining
+  if (t != VARIABLE && t != LABEL) {
+    lex_error("can only define variable or placename");
+    return;
+  }
+  token_buffer += '\0';
+  string nm = token_buffer;
+  const char *name = nm.contents();
+  if (!get_delimited())
+    return;
+  token_buffer += '\0';
+  macro_table.define(name, strsave(token_buffer.contents()));
+}
+
+void do_undef()
+{
+  int t = get_token(0);		// do not expand what we are undefining
+  if (t != VARIABLE && t != LABEL) {
+    lex_error("can only define variable or placename");
+    return;
+  }
+  token_buffer += '\0';
+  macro_table.define(token_buffer.contents(), 0);
+}
+
+
+class for_input : public input {
+  char *var;
+  char *body;
+  double to;
+  int by_is_multiplicative;
+  double by;
+  const char *p;
+  int done_newline;
+public:
+  for_input(char *, double, int, double, char *);
+  ~for_input();
+  int get();
+  int peek();
+};
+
+for_input::for_input(char *vr, double t, int bim, double b, char *bd)
+: var(vr), body(bd), to(t), by_is_multiplicative(bim), by(b), p(body),
+  done_newline(0)
+{
+}
+
+for_input::~for_input()
+{
+  a_delete var;
+  a_delete body;
+}
+
+int for_input::get()
+{
+  if (p == 0)
+    return EOF;
+  for (;;) {
+    if (*p != '\0')
+      return (unsigned char)*p++;
+    if (!done_newline) {
+      done_newline = 1;
+      return '\n';
+    }
+    double val;
+    if (!lookup_variable(var, &val)) {
+      lex_error("body of `for' terminated enclosing block");
+      return EOF;
+    }
+    if (by_is_multiplicative)
+      val *= by;
+    else
+      val += by;
+    define_variable(var, val);
+    if (val > to) {
+      p = 0;
+      return EOF;
+    }
+    p = body;
+    done_newline = 0;
+  }
+}
+
+int for_input::peek()
+{
+  if (p == 0)
+    return EOF;
+  if (*p != '\0')
+    return (unsigned char)*p;
+  if (!done_newline)
+    return '\n';
+  double val;
+  if (!lookup_variable(var, &val))
+    return EOF;
+  if (by_is_multiplicative) {
+    if (val * by > to)
+      return EOF;
+  }
+  else {
+    if (val + by > to)
+      return EOF;
+  }
+  if (*body == '\0')
+    return EOF;
+  return (unsigned char)*body;
+}
+
+void do_for(char *var, double from, double to, int by_is_multiplicative,
+	    double by, char *body)
+{
+  define_variable(var, from);
+  if (from <= to)
+    input_stack::push(new for_input(var, to, by_is_multiplicative, by, body));
+}
+
+
+void do_copy(const char *filename)
+{
+  errno = 0;
+  FILE *fp = fopen(filename, "r");
+  if (fp == 0) {
+    lex_error("can't open `%1': %2", filename, strerror(errno));
+    return;
+  }
+  input_stack::push(new file_input(fp, filename));
+}
+
+class copy_thru_input : public input {
+  int done;
+  char *body;
+  char *until;
+  const char *p;
+  const char *ap;
+  int argv[9];
+  int argc;
+  string line;
+  int get_line();
+  virtual int inget() = 0;
+public:
+  copy_thru_input(const char *b, const char *u);
+  ~copy_thru_input();
+  int get();
+  int peek();
+};
+
+class copy_file_thru_input : public copy_thru_input {
+  input *in;
+public:
+  copy_file_thru_input(input *, const char *b, const char *u);
+  ~copy_file_thru_input();
+  int inget();
+};
+
+copy_file_thru_input::copy_file_thru_input(input *i, const char *b,
+					   const char *u)
+: copy_thru_input(b, u), in(i)
+{
+}
+
+copy_file_thru_input::~copy_file_thru_input()
+{
+  delete in;
+}
+
+int copy_file_thru_input::inget()
+{
+  if (!in)
+    return EOF;
+  else
+    return in->get();
+}
+
+class copy_rest_thru_input : public copy_thru_input {
+public:
+  copy_rest_thru_input(const char *, const char *u);
+  int inget();
+};
+
+copy_rest_thru_input::copy_rest_thru_input(const char *b, const char *u)
+: copy_thru_input(b, u)
+{
+}
+
+int copy_rest_thru_input::inget()
+{
+  while (next != 0) {
+    int c = next->get();
+    if (c != EOF)
+      return c;
+    if (next->next == 0)
+      return EOF;
+    input *tem = next;
+    next = next->next;
+    delete tem;
+  }
+  return EOF;
+
+}
+
+copy_thru_input::copy_thru_input(const char *b, const char *u)
+: done(0)
+{
+  ap = 0;
+  body = process_body(b);
+  p = 0;
+  until = strsave(u);
+}
+
+
+copy_thru_input::~copy_thru_input()
+{
+  a_delete body;
+  a_delete until;
+}
+
+int copy_thru_input::get()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return (unsigned char)*ap++;
+    ap = 0;
+  }
+  for (;;) {
+    if (p == 0) {
+      if (!get_line())
+	break;
+      p = body;
+    }
+    if (*p == '\0') {
+      p = 0;
+      return '\n';
+    }
+    while (*p >= ARG1 && *p <= ARG1 + 8) {
+      int i = *p++ - ARG1;
+      if (i < argc && line[argv[i]] != '\0') {
+	ap = line.contents() + argv[i];
+	return (unsigned char)*ap++;
+      }
+    }
+    if (*p != '\0')
+      return (unsigned char)*p++;
+  }
+  return EOF;
+}
+
+int copy_thru_input::peek()
+{
+  if (ap) {
+    if (*ap != '\0')
+      return (unsigned char)*ap;
+    ap = 0;
+  }
+  for (;;) {
+    if (p == 0) {
+      if (!get_line())
+	break;
+      p = body;
+    }
+    if (*p == '\0')
+      return '\n';
+    while (*p >= ARG1 && *p <= ARG1 + 8) {
+      int i = *p++ - ARG1;
+      if (i < argc && line[argv[i]] != '\0') {
+	ap = line.contents() + argv[i];
+	return (unsigned char)*ap;
+      }
+    }
+    if (*p != '\0')
+      return (unsigned char)*p;
+  }
+  return EOF;
+}
+
+int copy_thru_input::get_line()
+{
+  if (done)
+    return 0;
+  line.clear();
+  argc = 0;
+  int c = inget();
+  for (;;) {
+    while (c == ' ')
+      c = inget();
+    if (c == EOF || c == '\n')
+      break;
+    if (argc == 9) {
+      do {
+	c = inget();
+      } while (c != '\n' && c != EOF);
+      break;
+    }
+    argv[argc++] = line.length();
+    do {
+      line += char(c);
+      c = inget();
+    } while (c != ' ' && c != '\n');
+    line += '\0';
+  }
+  if (until != 0 && argc > 0 && strcmp(&line[argv[0]], until) == 0) {
+    done = 1;
+    return 0;
+  }
+  return argc > 0 || c == '\n';
+}
+
+class simple_file_input : public input {
+  const char *filename;
+  int lineno;
+  FILE *fp;
+public:
+  simple_file_input(FILE *, const char *);
+  ~simple_file_input();
+  int get();
+  int peek();
+  int get_location(const char **, int *);
+};
+
+simple_file_input::simple_file_input(FILE *p, const char *s)
+: filename(s), lineno(1), fp(p)
+{
+}
+
+simple_file_input::~simple_file_input()
+{
+  // don't delete the filename
+  fclose(fp);
+}
+
+int simple_file_input::get()
+{
+  int c = getc(fp);
+  while (invalid_input_char(c)) {
+    error("invalid input character code %1", c);
+    c = getc(fp);
+  }
+  if (c == '\n')
+    lineno++;
+  return c;
+}
+
+int simple_file_input::peek()
+{
+  int c = getc(fp);
+  while (invalid_input_char(c)) {
+    error("invalid input character code %1", c);
+    c = getc(fp);
+  }
+  if (c != EOF)
+    ungetc(c, fp);
+  return c;
+}
+
+int simple_file_input::get_location(const char **fnp, int *lnp)
+{
+  *fnp = filename;
+  *lnp = lineno;
+  return 1;
+}
+
+
+void copy_file_thru(const char *filename, const char *body, const char *until)
+{
+  errno = 0;
+  FILE *fp = fopen(filename, "r");
+  if (fp == 0) {
+    lex_error("can't open `%1': %2", filename, strerror(errno));
+    return;
+  }
+  input *in = new copy_file_thru_input(new simple_file_input(fp, filename),
+				       body, until);
+  input_stack::push(in);
+}
+
+void copy_rest_thru(const char *body, const char *until)
+{
+  input_stack::push(new copy_rest_thru_input(body, until));
+}
+
+void push_body(const char *s)
+{
+  input_stack::push(new char_input('\n'));
+  input_stack::push(new macro_input(s));
+}
+
+int delim_flag = 0;
+
+char *get_thru_arg()
+{
+  int c = input_stack::peek_char();
+  while (c == ' ') {
+    input_stack::get_char();
+    c = input_stack::peek_char();
+  }
+  if (c != EOF && csalpha(c)) {
+    // looks like a macro
+    input_stack::get_char();
+    token_buffer = c;
+    for (;;) {
+      c = input_stack::peek_char();
+      if (c == EOF || (!csalnum(c) && c != '_'))
+	break;
+      input_stack::get_char();
+      token_buffer += char(c);
+    }
+    context_buffer = token_buffer;
+    token_buffer += '\0';
+    char *def = macro_table.lookup(token_buffer.contents());
+    if (def)
+      return strsave(def);
+    // I guess it wasn't a macro after all; so push the macro name back.
+    // -2 because we added a '\0'
+    for (int i = token_buffer.length() - 2; i >= 0; i--)
+      input_stack::push_back(token_buffer[i]);
+  }
+  if (get_delimited()) {
+    token_buffer += '\0';
+    return strsave(token_buffer.contents());
+  }
+  else
+    return 0;
+}
+
+int lookahead_token = -1;
+string old_context_buffer;
+
+void do_lookahead()
+{
+  if (lookahead_token == -1) {
+    old_context_buffer = context_buffer;
+    lookahead_token = get_token(1);
+  }
+}
+
+int yylex()
+{
+  if (delim_flag) {
+    assert(lookahead_token == -1);
+    if (delim_flag == 2) {
+      if ((yylval.str = get_thru_arg()) != 0)
+	return DELIMITED;
+      else
+	return 0;
+    }
+    else {
+      if (get_delimited()) {
+	token_buffer += '\0';
+	yylval.str = strsave(token_buffer.contents());
+	return DELIMITED;
+      }
+      else
+	return 0;
+    }
+  }
+  for (;;) {
+    int t;
+    if (lookahead_token >= 0) {
+      t = lookahead_token;
+      lookahead_token = -1;
+    }
+    else
+      t = get_token(1);
+    switch (t) {
+    case '\n':
+      return ';';
+    case EOF:
+      return 0;
+    case DEFINE:
+      do_define();
+      break;
+    case UNDEF:
+      do_undef();
+      break;
+    case ORDINAL:
+      yylval.n = token_int;
+      return t;
+    case NUMBER:
+      yylval.x = token_double;
+      return t;
+    case COMMAND_LINE:
+    case TEXT:
+      token_buffer += '\0';
+      if (!input_stack::get_location(&yylval.lstr.filename,
+				     &yylval.lstr.lineno)) {
+	yylval.lstr.filename = 0;
+	yylval.lstr.lineno = -1;
+      }
+      yylval.lstr.str = strsave(token_buffer.contents());
+      return t;
+    case LABEL:
+    case VARIABLE:
+      token_buffer += '\0';
+      yylval.str = strsave(token_buffer.contents());
+      return t;
+    case LEFT:
+      // change LEFT to LEFT_CORNER when followed by OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token == OF)
+	return LEFT_CORNER;
+      else
+	return t;
+    case RIGHT:
+      // change RIGHT to RIGHT_CORNER when followed by OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token == OF)
+	return RIGHT_CORNER;
+      else
+	return t;
+    case UPPER:
+      // recognise UPPER only before LEFT or RIGHT
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != LEFT && lookahead_token != RIGHT) {
+	yylval.str = strsave("upper");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case LOWER:
+      // recognise LOWER only before LEFT or RIGHT
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != LEFT && lookahead_token != RIGHT) {
+	yylval.str = strsave("lower");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case NORTH:
+      // recognise NORTH only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("north");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case SOUTH:
+      // recognise SOUTH only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("south");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case EAST:
+      // recognise EAST only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("east");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case WEST:
+      // recognise WEST only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("west");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case TOP:
+      // recognise TOP only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("top");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case BOTTOM:
+      // recognise BOTTOM only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("bottom");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case CENTER:
+      // recognise CENTER only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("center");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case START:
+      // recognise START only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("start");
+	return VARIABLE;
+      }
+      else
+	return t;
+    case END:
+      // recognise END only before OF
+      old_context_buffer = context_buffer;
+      lookahead_token = get_token(1);
+      if (lookahead_token != OF) {
+	yylval.str = strsave("end");
+	return VARIABLE;
+      }
+      else
+	return t;
+    default:
+      return t;
+    }
+  }
+}
+
+void lex_error(const char *message,
+	       const errarg &arg1,
+	       const errarg &arg2,
+	       const errarg &arg3)
+{
+  const char *filename;
+  int lineno;
+  if (!input_stack::get_location(&filename, &lineno))
+    error(message, arg1, arg2, arg3);
+  else
+    error_with_file_and_line(filename, lineno, message, arg1, arg2, arg3);
+}
+
+void lex_warning(const char *message,
+		 const errarg &arg1,
+		 const errarg &arg2,
+		 const errarg &arg3)
+{
+  const char *filename;
+  int lineno;
+  if (!input_stack::get_location(&filename, &lineno))
+    warning(message, arg1, arg2, arg3);
+  else
+    warning_with_file_and_line(filename, lineno, message, arg1, arg2, arg3);
+}
+
+void yyerror(const char *s)
+{
+  const char *filename;
+  int lineno;
+  const char *context = 0;
+  if (lookahead_token == -1) {
+    if (context_buffer.length() > 0) {
+      context_buffer += '\0';
+      context = context_buffer.contents();
+    }
+  }
+  else {
+    if (old_context_buffer.length() > 0) {
+      old_context_buffer += '\0';
+      context = old_context_buffer.contents();
+    }
+  }
+  if (!input_stack::get_location(&filename, &lineno)) {
+    if (context) {
+      if (context[0] == '\n' && context[1] == '\0')
+	error("%1 before newline", s);
+      else
+	error("%1 before `%2'", s, context);
+    }
+    else
+      error("%1 at end of picture", s);
+  }
+  else {
+    if (context) {
+      if (context[0] == '\n' && context[1] == '\0')
+	error_with_file_and_line(filename, lineno, "%1 before newline", s);
+      else
+	error_with_file_and_line(filename, lineno, "%1 before `%2'",
+				 s, context);
+    }
+    else
+      error_with_file_and_line(filename, lineno, "%1 at end of picture", s);
+  }
+}
+
diff --git a/contrib/groff/src/preproc/pic/main.cpp b/contrib/groff/src/preproc/pic/main.cpp
new file mode 100644
index 0000000..8788fa6
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/main.cpp
@@ -0,0 +1,642 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+
+extern int yyparse();
+extern "C" const char *Version_string;
+
+output *out;
+char *graphname;		// the picture box name in TeX mode
+
+int flyback_flag;
+int zero_length_line_flag = 0;
+// Non-zero means we're using a groff driver.
+int driver_extension_flag = 1;
+int compatible_flag = 0;
+int safer_flag = 1;
+int command_char = '.';		// the character that introduces lines
+				// that should be passed through tranparently
+static int lf_flag = 1;		// non-zero if we should attempt to understand
+				// lines beginning with `.lf'
+
+// Non-zero means a parse error was encountered.
+static int had_parse_error = 0;
+
+void do_file(const char *filename);
+
+class top_input : public input {
+  FILE *fp;
+  int bol;
+  int eof;
+  int push_back[3];
+  int start_lineno;
+public:
+  top_input(FILE *);
+  int get();
+  int peek();
+  int get_location(const char **, int *);
+};
+
+top_input::top_input(FILE *p) : fp(p), bol(1), eof(0)
+{
+  push_back[0] = push_back[1] = push_back[2] = EOF;
+  start_lineno = current_lineno;
+}
+
+int top_input::get()
+{
+  if (eof)
+    return EOF;
+  if (push_back[2] != EOF) {
+    int c = push_back[2];
+    push_back[2] = EOF;
+    return c;
+  }
+  else if (push_back[1] != EOF) {
+    int c = push_back[1];
+    push_back[1] = EOF;
+    return c;
+  }
+  else if (push_back[0] != EOF) {
+    int c = push_back[0];
+    push_back[0] = EOF;
+    return c;
+  }
+  int c = getc(fp);
+  while (invalid_input_char(c)) {
+    error("invalid input character code %1", int(c));
+    c = getc(fp);
+    bol = 0;
+  }
+  if (bol && c == '.') {
+    c = getc(fp);
+    if (c == 'P') {
+      c = getc(fp);
+      if (c == 'F' || c == 'E') {
+	int d = getc(fp);
+	if (d != EOF)
+	  ungetc(d, fp);
+	if (d == EOF || d == ' ' || d == '\n' || compatible_flag) {
+	  eof = 1;
+	  flyback_flag = c == 'F';
+	  return EOF;
+	}
+	push_back[0] = c;
+	push_back[1] = 'P';
+	return '.';
+      }
+      if (c == 'S') {
+	c = getc(fp);
+	if (c != EOF)
+	  ungetc(c, fp);
+	if (c == EOF || c == ' ' || c == '\n' || compatible_flag) {
+	  error("nested .PS");
+	  eof = 1;
+	  return EOF;
+	}
+	push_back[0] = 'S';
+	push_back[1] = 'P';
+	return '.';
+      }
+      if (c != EOF)
+	ungetc(c, fp);
+      push_back[0] = 'P';
+      return '.';
+    }
+    else {
+      if (c != EOF)
+	ungetc(c, fp);
+      return '.';
+    }
+  }
+  if (c == '\n') {
+    bol = 1;
+    current_lineno++;
+    return '\n';
+  }
+  bol = 0;
+  if (c == EOF) {
+    eof = 1;
+    error("end of file before .PE or .PF");
+    error_with_file_and_line(current_filename, start_lineno - 1,
+			     ".PS was here");
+  }
+  return c;
+}
+
+int top_input::peek()
+{
+  if (eof)
+    return EOF;
+  if (push_back[2] != EOF)
+    return push_back[2];
+  if (push_back[1] != EOF)
+    return push_back[1];
+  if (push_back[0] != EOF)
+    return push_back[0];
+  int c = getc(fp);
+  while (invalid_input_char(c)) {
+    error("invalid input character code %1", int(c));
+    c = getc(fp);
+    bol = 0;
+  }
+  if (bol && c == '.') {
+    c = getc(fp);
+    if (c == 'P') {
+      c = getc(fp);
+      if (c == 'F' || c == 'E') {
+	int d = getc(fp);
+	if (d != EOF)
+	  ungetc(d, fp);
+	if (d == EOF || d == ' ' || d == '\n' || compatible_flag) {
+	  eof = 1;
+	  flyback_flag = c == 'F';
+	  return EOF;
+	}
+	push_back[0] = c;
+	push_back[1] = 'P';
+	push_back[2] = '.';
+	return '.';
+      }
+      if (c == 'S') {
+	c = getc(fp);
+	if (c != EOF)
+	  ungetc(c, fp);
+	if (c == EOF || c == ' ' || c == '\n' || compatible_flag) {
+	  error("nested .PS");
+	  eof = 1;
+	  return EOF;
+	}
+	push_back[0] = 'S';
+	push_back[1] = 'P';
+	push_back[2] = '.';
+	return '.';
+      }
+      if (c != EOF)
+	ungetc(c, fp);
+      push_back[0] = 'P';
+      push_back[1] = '.';
+      return '.';
+    }
+    else {
+      if (c != EOF)
+	ungetc(c, fp);
+      push_back[0] = '.';
+      return '.';
+    }
+  }
+  if (c != EOF)
+    ungetc(c, fp);
+  if (c == '\n')
+    return '\n';
+  return c;
+}
+
+int top_input::get_location(const char **filenamep, int *linenop)
+{
+  *filenamep = current_filename;
+  *linenop = current_lineno;
+  return 1;
+}
+
+void do_picture(FILE *fp)
+{
+  flyback_flag = 0;
+  int c;
+  a_delete graphname;
+  graphname = strsave("graph");		// default picture name in TeX mode
+  while ((c = getc(fp)) == ' ')
+    ;
+  if (c == '<') {
+    string filename;
+    while ((c = getc(fp)) == ' ')
+      ;
+    while (c != EOF && c != ' ' && c != '\n') {
+      filename += char(c);
+      c = getc(fp);
+    }
+    if (c == ' ') {
+      do {
+	c = getc(fp);
+      } while (c != EOF && c != '\n');
+    }
+    if (c == '\n') 
+      current_lineno++;
+    if (filename.length() == 0)
+      error("missing filename after `<'");
+    else {
+      filename += '\0';
+      const char *old_filename = current_filename;
+      int old_lineno = current_lineno;
+      // filenames must be permanent
+      do_file(strsave(filename.contents()));
+      current_filename = old_filename;
+      current_lineno = old_lineno;
+    }
+    out->set_location(current_filename, current_lineno);
+  }
+  else {
+    out->set_location(current_filename, current_lineno);
+    string start_line;
+    while (c != EOF) {
+      if (c == '\n') {
+	current_lineno++;
+	break;
+      }
+      start_line += c;
+      c = getc(fp);
+    }
+    if (c == EOF)
+      return;
+    start_line += '\0';
+    double wid, ht;
+    switch (sscanf(&start_line[0], "%lf %lf", &wid, &ht)) {
+    case 1:
+      ht = 0.0;
+      break;
+    case 2:
+      break;
+    default:
+      ht = wid = 0.0;
+      break;
+    }
+    out->set_desired_width_height(wid, ht);
+    out->set_args(start_line.contents());
+    lex_init(new top_input(fp));
+    if (yyparse()) {
+      had_parse_error = 1;
+      lex_error("giving up on this picture");
+    }
+    parse_cleanup();
+    lex_cleanup();
+
+    // skip the rest of the .PF/.PE line
+    while ((c = getc(fp)) != EOF && c != '\n')
+      ;
+    if (c == '\n')
+      current_lineno++;
+    out->set_location(current_filename, current_lineno);
+  }
+}
+
+void do_file(const char *filename)
+{
+  FILE *fp;
+  if (strcmp(filename, "-") == 0)
+    fp = stdin;
+  else {
+    errno = 0;
+    fp = fopen(filename, "r");
+    if (fp == 0) {
+      delete out;
+      fatal("can't open `%1': %2", filename, strerror(errno));
+    }
+  }
+  out->set_location(filename, 1);
+  current_filename = filename;
+  current_lineno = 1;
+  enum { START, MIDDLE, HAD_DOT, HAD_P, HAD_PS, HAD_l, HAD_lf } state = START;
+  for (;;) {
+    int c = getc(fp);
+    if (c == EOF)
+      break;
+    switch (state) {
+    case START:
+      if (c == '.')
+	state = HAD_DOT;
+      else {
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case MIDDLE:
+      putchar(c);
+      if (c == '\n') {
+	current_lineno++;
+	state = START;
+      }
+      break;
+    case HAD_DOT:
+      if (c == 'P')
+	state = HAD_P;
+      else if (lf_flag && c == 'l')
+	state = HAD_l;
+      else {
+	putchar('.');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_P:
+      if (c == 'S')
+	state = HAD_PS;
+      else  {
+	putchar('.');
+	putchar('P');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_PS:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	ungetc(c, fp);
+	do_picture(fp);
+	state = START;
+      }
+      else {
+	fputs(".PS", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    case HAD_l:
+      if (c == 'f')
+	state = HAD_lf;
+      else {
+	putchar('.');
+	putchar('l');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_lf:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	string line;
+	while (c != EOF) {
+	  line += c;
+	  if (c == '\n') {
+	    current_lineno++;
+	    break;
+	  }
+	  c = getc(fp);
+	}
+	line += '\0';
+	interpret_lf_args(line.contents());
+	printf(".lf%s", line.contents());
+	state = START;
+      }
+      else {
+	fputs(".lf", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    default:
+      assert(0);
+    }
+  }
+  switch (state) {
+  case START:
+    break;
+  case MIDDLE:
+    putchar('\n');
+    break;
+  case HAD_DOT:
+    fputs(".\n", stdout);
+    break;
+  case HAD_P:
+    fputs(".P\n", stdout);
+    break;
+  case HAD_PS:
+    fputs(".PS\n", stdout);
+    break;
+  case HAD_l:
+    fputs(".l\n", stdout);
+    break;
+  case HAD_lf:
+    fputs(".lf\n", stdout);
+    break;
+  }
+  if (fp != stdin)
+    fclose(fp);
+}
+
+#ifdef FIG_SUPPORT
+void do_whole_file(const char *filename)
+{
+  // Do not set current_filename.
+  FILE *fp;
+  if (strcmp(filename, "-") == 0)
+    fp = stdin;
+  else {
+    errno = 0;
+    fp = fopen(filename, "r");
+    if (fp == 0)
+      fatal("can't open `%1': %2", filename, strerror(errno));
+  }
+  lex_init(new file_input(fp, filename));
+  if (yyparse())
+    had_parse_error = 1;
+  parse_cleanup();
+  lex_cleanup();
+}
+#endif
+
+void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [ -nvC ] [ filename ... ]\n", program_name);
+#ifdef TEX_SUPPORT
+  fprintf(stream, "       %s -t [ -cvzC ] [ filename ... ]\n", program_name);
+#endif
+#ifdef FIG_SUPPORT
+  fprintf(stream, "       %s -f [ -v ] [ filename ]\n", program_name);
+#endif
+}
+
+#if defined(__MSDOS__) || defined(__EMX__)
+static char *fix_program_name(char *arg, char *dflt)
+{
+  if (!arg)
+    return dflt;
+  char *prog = strchr(arg, '\0');
+  for (;;) {
+    if (prog == arg)
+      break;
+    --prog;
+    if (strchr("\\/:", *prog)) {
+      prog++;
+      break;
+    }
+  }	
+  char *ext = strchr(prog, '.');
+  if (ext)
+    *ext = '\0';
+  for (char *p = prog; *p; p++)
+    if ('A' <= *p && *p <= 'Z')
+      *p = 'a' + (*p - 'A');
+  return prog;
+}
+#endif /* __MSDOS__ || __EMX__ */
+
+int main(int argc, char **argv)
+{
+  setlocale(LC_NUMERIC, "C");
+#if defined(__MSDOS__) || defined(__EMX__)
+  argv[0] = fix_program_name(argv[0], "pic");
+#endif /* __MSDOS__ || __EMX__ */
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int opt;
+#ifdef TEX_SUPPORT
+  int tex_flag = 0;
+  int tpic_flag = 0;
+#endif
+#ifdef FIG_SUPPORT
+  int whole_file_flag = 0;
+  int fig_flag = 0;
+#endif
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "T:CDSUtcvnxzpf", long_options, NULL))
+	 != EOF)
+    switch (opt) {
+    case 'C':
+      compatible_flag = 1;
+      break;
+    case 'D':
+    case 'T':
+      break;
+    case 'S':
+      safer_flag = 1;
+      break;
+    case 'U':
+      safer_flag = 0;
+      break;
+    case 'f':
+#ifdef FIG_SUPPORT
+      whole_file_flag++;
+      fig_flag++;
+#else
+      fatal("fig support not included");
+#endif
+      break;
+    case 'n':
+      driver_extension_flag = 0;
+      break;
+    case 'p':
+    case 'x':
+      warning("-%1 option is obsolete", char(opt));
+      break;
+    case 't':
+#ifdef TEX_SUPPORT
+      tex_flag++;
+#else
+      fatal("TeX support not included");
+#endif
+      break;
+    case 'c':
+#ifdef TEX_SUPPORT
+      tpic_flag++;
+#else
+      fatal("TeX support not included");
+#endif
+      break;
+    case 'v':
+      {
+	printf("GNU pic (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'z':
+      // zero length lines will be printed as dots
+      zero_length_line_flag++;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  parse_init();
+#ifdef TEX_SUPPORT
+  if (tpic_flag) {
+    out = make_tpic_output();
+    lf_flag = 0;
+  }
+  else if (tex_flag) {
+    out = make_tex_output();
+    command_char = '\\';
+    lf_flag = 0;
+  }
+  else
+#endif
+#ifdef FIG_SUPPORT
+  if (fig_flag)
+    out = make_fig_output();
+  else
+#endif
+    out = make_troff_output();
+#ifdef FIG_SUPPORT
+  if (whole_file_flag) {
+    if (optind >= argc)
+      do_whole_file("-");
+    else if (argc - optind > 1) {
+      usage(stderr);
+      exit(1);
+    } else
+      do_whole_file(argv[optind]);
+  }
+  else {
+#endif
+    if (optind >= argc)
+      do_file("-");
+    else
+      for (int i = optind; i < argc; i++)
+	do_file(argv[i]);
+#ifdef FIG_SUPPORT
+  }
+#endif
+  delete out;
+  if (ferror(stdout) || fflush(stdout) < 0)
+    fatal("output error");
+  return had_parse_error;
+}
+
diff --git a/contrib/groff/src/preproc/pic/object.cpp b/contrib/groff/src/preproc/pic/object.cpp
new file mode 100644
index 0000000..d5c0d6c
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/object.cpp
@@ -0,0 +1,1898 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
+     Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+#include "ptable.h"
+#include "object.h"
+
+void print_object_list(object *);
+
+line_type::line_type()
+: type(solid), thickness(1.0)
+{
+}
+
+output::output() : args(0), desired_height(0.0), desired_width(0.0)
+{
+}
+
+output::~output()
+{
+  a_delete args;
+}
+
+void output::set_desired_width_height(double wid, double ht)
+{
+  desired_width = wid;
+  desired_height = ht;
+}
+
+void output::set_args(const char *s)
+{
+  a_delete args;
+  if (s == 0 || *s == '\0')
+    args = 0;
+  else
+    args = strsave(s);
+}
+
+int output::supports_filled_polygons()
+{
+  return 0;
+}
+
+void output::begin_block(const position &, const position &)
+{
+}
+
+void output::end_block()
+{
+}
+
+double output::compute_scale(double sc, const position &ll, const position &ur)
+{
+  distance dim = ur - ll;
+  if (desired_width != 0.0 || desired_height != 0.0) {
+    sc = 0.0;
+    if (desired_width != 0.0) {
+      if (dim.x == 0.0)
+	error("width specified for picture with zero width");
+      else
+	sc = dim.x/desired_width;
+    }
+    if (desired_height != 0.0) {
+      if (dim.y == 0.0)
+	error("height specified for picture with zero height");
+      else {
+	double tem = dim.y/desired_height;
+	if (tem > sc)
+	  sc = tem;
+      }
+    }
+    return sc == 0.0 ? 1.0 : sc;
+  }
+  else {
+    if (sc <= 0.0)
+      sc = 1.0;
+    distance sdim = dim/sc;
+    double max_width = 0.0;
+    lookup_variable("maxpswid", &max_width);
+    double max_height = 0.0;
+    lookup_variable("maxpsht", &max_height);
+    if ((max_width > 0.0 && sdim.x > max_width)
+	|| (max_height > 0.0 && sdim.y > max_height)) {
+      double xscale = dim.x/max_width;
+      double yscale = dim.y/max_height;
+      return xscale > yscale ? xscale : yscale;
+    }
+    else
+      return sc;
+  }
+}
+
+position::position(const place &pl)
+{
+  if (pl.obj != 0) {
+    // Use two statements to work around bug in SGI C++.
+    object *tem = pl.obj;
+    *this = tem->origin();
+  }
+  else {
+    x = pl.x;
+    y = pl.y;
+  }
+}
+
+position::position() : x(0.0), y(0.0)
+{
+}
+
+position::position(double a, double b) : x(a), y(b)
+{
+}
+
+
+int operator==(const position &a, const position &b)
+{
+  return a.x == b.x && a.y == b.y;
+}
+
+int operator!=(const position &a, const position &b)
+{
+  return a.x != b.x || a.y != b.y;
+}
+
+position &position::operator+=(const position &a)
+{
+  x += a.x;
+  y += a.y;
+  return *this;
+}
+
+position &position::operator-=(const position &a)
+{
+  x -= a.x;
+  y -= a.y;
+  return *this;
+}
+
+position &position::operator*=(double a)
+{
+  x *= a;
+  y *= a;
+  return *this;
+}
+
+position &position::operator/=(double a)
+{
+  x /= a;
+  y /= a;
+  return *this;
+}
+
+position operator-(const position &a)
+{
+  return position(-a.x, -a.y);
+}
+
+position operator+(const position &a, const position &b)
+{
+  return position(a.x + b.x, a.y + b.y);
+}
+
+position operator-(const position &a, const position &b)
+{
+  return position(a.x - b.x, a.y - b.y);
+}
+
+position operator/(const position &a, double n)
+{
+  return position(a.x/n, a.y/n);
+}
+
+position operator*(const position &a, double n)
+{
+  return position(a.x*n, a.y*n);
+}
+
+// dot product
+
+double operator*(const position &a, const position &b)
+{
+  return a.x*b.x + a.y*b.y;
+}
+
+double hypot(const position &a)
+{
+  return hypot(a.x, a.y);
+}
+
+struct arrow_head_type {
+  double height;
+  double width;
+  int solid;
+};
+
+void draw_arrow(const position &pos, const distance &dir,
+		const arrow_head_type &aht, const line_type &lt,
+		char *outline_color_for_fill)
+{
+  double hyp = hypot(dir);
+  if (hyp == 0.0) {
+    error("cannot draw arrow on object with zero length");
+    return;
+  }
+  position base = -dir;
+  base *= aht.height/hyp;
+  position n(dir.y, -dir.x);
+  n *= aht.width/(hyp*2.0);
+  line_type slt = lt;
+  slt.type = line_type::solid;
+  if (aht.solid && out->supports_filled_polygons()) {
+    position v[3];
+    v[0] = pos;
+    v[1] = pos + base + n;
+    v[2] = pos + base - n;
+    // fill with outline color
+    out->set_color(outline_color_for_fill, outline_color_for_fill);
+    out->polygon(v, 3, slt, 1);
+  }
+  else {
+    position v[2];
+    v[0] = pos;
+    v[1] = pos + base + n;
+    out->line(pos + base - n, v, 2, slt);
+  }
+}
+
+object::object() : prev(0), next(0)
+{
+}
+
+object::~object()
+{
+}
+
+void object::move_by(const position &)
+{
+}
+
+void object::print()
+{
+}
+
+void object::print_text()
+{
+}
+
+int object::blank()
+{
+  return 0;
+}
+
+struct bounding_box {
+  int blank;
+  position ll;
+  position ur;
+
+  bounding_box();
+  void encompass(const position &);
+};
+
+bounding_box::bounding_box()
+: blank(1)
+{
+}
+
+void bounding_box::encompass(const position &pos)
+{
+  if (blank) {
+    ll = pos;
+    ur = pos;
+    blank = 0;
+  }
+  else {
+    if (pos.x < ll.x)
+      ll.x = pos.x;
+    if (pos.y < ll.y)
+      ll.y = pos.y;
+    if (pos.x > ur.x)
+      ur.x = pos.x;
+    if (pos.y > ur.y)
+      ur.y = pos.y;
+  }
+}
+
+void object::update_bounding_box(bounding_box *)
+{
+}
+
+position object::origin()
+{
+  return position(0.0,0.0);
+}
+
+position object::north()
+{
+  return origin();
+}
+
+position object::south()
+{
+  return origin();
+}
+
+position object::east()
+{
+  return origin();
+}
+
+position object::west()
+{
+  return origin();
+}
+
+position object::north_east()
+{
+  return origin();
+}
+
+position object::north_west()
+{
+  return origin();
+}
+
+position object::south_east()
+{
+  return origin();
+}
+
+position object::south_west()
+{
+  return origin();
+}
+
+position object::start()
+{
+  return origin();
+}
+
+position object::end()
+{
+  return origin();
+}
+
+position object::center()
+{
+  return origin();
+}
+
+double object::width()
+{
+  return 0.0;
+}
+
+double object::radius()
+{
+  return 0.0;
+}
+
+double object::height()
+{
+  return 0.0;
+}
+
+place *object::find_label(const char *)
+{
+  return 0;
+}
+
+segment::segment(const position &a, int n, segment *p)
+: is_absolute(n), pos(a), next(p)
+{
+}
+
+text_item::text_item(char *t, const char *fn, int ln)
+: next(0), text(t), filename(fn), lineno(ln) 
+{
+  adj.h = CENTER_ADJUST;
+  adj.v = NONE_ADJUST;
+}
+
+text_item::~text_item()
+{
+  a_delete text;
+}
+
+object_spec::object_spec(object_type t) : type(t)
+{
+  flags = 0;
+  tbl = 0;
+  segment_list = 0;
+  segment_width = segment_height = 0.0;
+  segment_is_absolute = 0;
+  text = 0;
+  shaded = 0;
+  outlined = 0;
+  with = 0;
+  dir = RIGHT_DIRECTION;
+}
+
+object_spec::~object_spec()
+{
+  delete tbl;
+  while (segment_list != 0) {
+    segment *tem = segment_list;
+    segment_list = segment_list->next;
+    delete tem;
+  }
+  object *p = oblist.head;
+  while (p != 0) {
+    object *tem = p;
+    p = p->next;
+    delete tem;
+  }
+  while (text != 0) {
+    text_item *tem = text;
+    text = text->next;
+    delete tem;
+  }
+  delete with;
+  a_delete shaded;
+  a_delete outlined;
+}
+
+class command_object : public object {
+  char *s;
+  const char *filename;
+  int lineno;
+public:
+  command_object(char *, const char *, int);
+  ~command_object();
+  object_type type() { return OTHER_OBJECT; }
+  void print();
+};
+
+command_object::command_object(char *p, const char *fn, int ln)
+: s(p), filename(fn), lineno(ln)
+{
+}
+
+command_object::~command_object()
+{
+  a_delete s;
+}
+
+void command_object::print()
+{
+  out->command(s, filename, lineno);
+}
+
+object *make_command_object(char *s, const char *fn, int ln)
+{
+  return new command_object(s, fn, ln);
+}
+
+class mark_object : public object {
+public:
+  mark_object();
+  object_type type();
+};
+
+object *make_mark_object()
+{
+  return new mark_object();
+}
+
+mark_object::mark_object()
+{
+}
+
+object_type mark_object::type()
+{
+  return MARK_OBJECT;
+}
+
+object_list::object_list() : head(0), tail(0)
+{
+}
+
+void object_list::append(object *obj)
+{
+  if (tail == 0) {
+    obj->next = obj->prev = 0;
+    head = tail = obj;
+  }
+  else {
+    obj->prev = tail;
+    obj->next = 0;
+    tail->next = obj;
+    tail = obj;
+  }
+}
+
+void object_list::wrap_up_block(object_list *ol)
+{
+  object *p;
+  for (p = tail; p && p->type() != MARK_OBJECT; p = p->prev)
+    ;
+  assert(p != 0);
+  ol->head = p->next;
+  if (ol->head) {
+    ol->tail = tail;
+    ol->head->prev = 0;
+  }
+  else
+    ol->tail = 0;
+  tail = p->prev;
+  if (tail)
+    tail->next = 0;
+  else
+    head = 0;
+  delete p;
+}
+
+text_piece::text_piece()
+: text(0), filename(0), lineno(-1)
+{
+  adj.h = CENTER_ADJUST;
+  adj.v = NONE_ADJUST;
+}
+
+text_piece::~text_piece()
+{
+  a_delete text;
+}
+
+class graphic_object : public object {
+  int ntext;
+  text_piece *text;
+  int aligned;
+protected:
+  line_type lt;
+  char *outline_color;
+  char *color_fill;
+public:
+  graphic_object();
+  ~graphic_object();
+  object_type type() = 0;
+  void print_text();
+  void add_text(text_item *, int);
+  void set_dotted(double);
+  void set_dashed(double);
+  void set_thickness(double);
+  void set_invisible();
+  void set_outline_color(char *);
+  char *get_outline_color();
+  virtual void set_fill(double);
+  virtual void set_fill_color(char *);
+};
+
+graphic_object::graphic_object()
+: ntext(0), text(0), aligned(0), outline_color(0), color_fill(0)
+{
+}
+
+void graphic_object::set_dotted(double wid)
+{
+  lt.type = line_type::dotted;
+  lt.dash_width = wid;
+}
+
+void graphic_object::set_dashed(double wid)
+{
+  lt.type = line_type::dashed;
+  lt.dash_width = wid;
+}
+
+void graphic_object::set_thickness(double th)
+{
+  lt.thickness = th;
+}
+
+void graphic_object::set_fill(double)
+{
+}
+
+void graphic_object::set_fill_color(char *c)
+{
+  color_fill = strsave(c);
+}
+
+void graphic_object::set_outline_color(char *c)
+{
+  outline_color = strsave(c);
+}
+
+char *graphic_object::get_outline_color()
+{
+  return outline_color;
+}
+
+void graphic_object::set_invisible()
+{
+  lt.type = line_type::invisible;
+}
+
+void graphic_object::add_text(text_item *t, int a)
+{
+  aligned = a;
+  int len = 0;
+  text_item *p;
+  for (p = t; p; p = p->next)
+    len++;
+  if (len == 0)
+    text = 0;
+  else {
+    text = new text_piece[len];
+    for (p = t, len = 0; p; p = p->next, len++) {
+      text[len].text = p->text;
+      p->text = 0;
+      text[len].adj = p->adj;
+      text[len].filename = p->filename;
+      text[len].lineno = p->lineno;
+    }
+  }
+  ntext = len;
+}
+
+void graphic_object::print_text()
+{
+  double angle = 0.0;
+  if (aligned) {
+    position d(end() - start());
+    if (d.x != 0.0 || d.y != 0.0)
+      angle = atan2(d.y, d.x);
+  }
+  if (text != 0) {
+    out->set_color(color_fill, get_outline_color());
+    out->text(center(), text, ntext, angle);
+    out->reset_color();
+  }
+}
+
+graphic_object::~graphic_object()
+{
+  if (text)
+    ad_delete(ntext) text;
+}
+
+class rectangle_object : public graphic_object {
+protected:
+  position cent;
+  position dim;
+public:
+  rectangle_object(const position &);
+  double width() { return dim.x; }
+  double height() { return dim.y; }
+  position origin() { return cent; }
+  position center() { return cent; }
+  position north() { return position(cent.x, cent.y + dim.y/2.0); }
+  position south() { return position(cent.x, cent.y - dim.y/2.0); }
+  position east() { return position(cent.x + dim.x/2.0, cent.y); }
+  position west() { return position(cent.x - dim.x/2.0, cent.y); }
+  position north_east() { return position(cent.x + dim.x/2.0, cent.y + dim.y/2.0); }
+  position north_west() { return position(cent.x - dim.x/2.0, cent.y + dim.y/2.0); }
+  position south_east() { return position(cent.x + dim.x/2.0, cent.y - dim.y/2.0); }
+  position south_west() { return position(cent.x - dim.x/2.0, cent.y - dim.y/2.0); }
+  object_type type() = 0;
+  void update_bounding_box(bounding_box *);
+  void move_by(const position &);
+};
+
+rectangle_object::rectangle_object(const position &d)
+: dim(d)
+{
+}
+
+void rectangle_object::update_bounding_box(bounding_box *p)
+{
+  p->encompass(cent - dim/2.0);
+  p->encompass(cent + dim/2.0);
+}
+
+void rectangle_object::move_by(const position &a)
+{
+  cent += a;
+}
+
+class closed_object : public rectangle_object {
+public:
+  closed_object(const position &);
+  object_type type() = 0;
+  void set_fill(double);
+  void set_fill_color(char *fill);
+protected:
+  double fill;			// < 0 if not filled
+  char *color_fill;		// = 0 if not colored
+};
+
+closed_object::closed_object(const position &pos)
+: rectangle_object(pos), fill(-1.0), color_fill(0)
+{
+}
+
+void closed_object::set_fill(double f)
+{
+  assert(f >= 0.0);
+  fill = f;
+}
+
+void closed_object::set_fill_color(char *fill)
+{
+  color_fill = strsave(fill);
+}
+
+class box_object : public closed_object {
+  double xrad;
+  double yrad;
+public:
+  box_object(const position &, double);
+  object_type type() { return BOX_OBJECT; }
+  void print();
+  position north_east();
+  position north_west();
+  position south_east();
+  position south_west();
+};
+
+box_object::box_object(const position &pos, double r)
+: closed_object(pos), xrad(dim.x > 0 ? r : -r), yrad(dim.y > 0 ? r : -r)
+{
+}
+
+const double CHOP_FACTOR = 1.0 - 1.0/M_SQRT2;
+
+position box_object::north_east()
+{
+  return position(cent.x + dim.x/2.0 - CHOP_FACTOR*xrad,
+		  cent.y + dim.y/2.0 - CHOP_FACTOR*yrad);
+}
+
+position box_object::north_west()
+{
+  return position(cent.x - dim.x/2.0 + CHOP_FACTOR*xrad,
+		  cent.y + dim.y/2.0 - CHOP_FACTOR*yrad);
+}
+
+position box_object::south_east()
+{
+  return position(cent.x + dim.x/2.0 - CHOP_FACTOR*xrad,
+		  cent.y - dim.y/2.0 + CHOP_FACTOR*yrad);
+}
+
+position box_object::south_west()
+{
+  return position(cent.x - dim.x/2.0 + CHOP_FACTOR*xrad,
+		  cent.y - dim.y/2.0 + CHOP_FACTOR*yrad);
+}
+
+void box_object::print()
+{
+  if (lt.type == line_type::invisible && fill < 0.0 && color_fill == 0)
+    return;
+  out->set_color(color_fill, graphic_object::get_outline_color());
+  if (xrad == 0.0) {
+    distance dim2 = dim/2.0;
+    position vec[4];
+    vec[0] = cent + position(dim2.x, -dim2.y);
+    vec[1] = cent + position(dim2.x, dim2.y);
+    vec[2] = cent + position(-dim2.x, dim2.y);
+    vec[3] = cent + position(-dim2.x, -dim2.y);
+    out->polygon(vec, 4, lt, fill);
+  }
+  else {
+    distance abs_dim(fabs(dim.x), fabs(dim.y));
+    out->rounded_box(cent, abs_dim, fabs(xrad), lt, fill);
+  }
+  out->reset_color();
+}
+
+graphic_object *object_spec::make_box(position *curpos, direction *dirp)
+{
+  static double last_box_height;
+  static double last_box_width;
+  static double last_box_radius;
+  static int have_last_box = 0;
+  if (!(flags & HAS_HEIGHT)) {
+    if ((flags & IS_SAME) && have_last_box)
+      height = last_box_height;
+    else
+      lookup_variable("boxht", &height);
+  }
+  if (!(flags & HAS_WIDTH)) {
+    if ((flags & IS_SAME) && have_last_box)
+      width = last_box_width;
+    else
+      lookup_variable("boxwid", &width);
+  }
+  if (!(flags & HAS_RADIUS)) {
+    if ((flags & IS_SAME) && have_last_box)
+      radius = last_box_radius;
+    else
+      lookup_variable("boxrad", &radius);
+  }
+  last_box_width = width;
+  last_box_height = height;
+  last_box_radius = radius;
+  have_last_box = 1;
+  radius = fabs(radius);
+  if (radius*2.0 > fabs(width))
+    radius = fabs(width/2.0);
+  if (radius*2.0 > fabs(height))
+    radius = fabs(height/2.0);
+  box_object *p = new box_object(position(width, height), radius);
+  if (!position_rectangle(p, curpos, dirp)) {
+    delete p;
+    p = 0;
+  }
+  return p;
+}
+
+// return non-zero for success
+
+int object_spec::position_rectangle(rectangle_object *p,
+				    position *curpos, direction *dirp)
+{
+  position pos;
+  dir = *dirp;			// ignore any direction in attribute list
+  position motion;
+  switch (dir) {
+  case UP_DIRECTION:
+    motion.y = p->height()/2.0;
+    break;
+  case DOWN_DIRECTION:
+    motion.y = -p->height()/2.0;
+    break;
+  case LEFT_DIRECTION:
+    motion.x = -p->width()/2.0;
+    break;
+  case RIGHT_DIRECTION:
+    motion.x = p->width()/2.0;
+    break;
+  default:
+    assert(0);
+  }
+  if (flags & HAS_AT) {
+    pos = at;
+    if (flags & HAS_WITH) {
+      place offset;
+      place here;
+      here.obj = p;
+      if (!with->follow(here, &offset))
+	return 0;
+      pos -= offset;
+    }
+  }
+  else {
+    pos = *curpos;
+    pos += motion;
+  }
+  p->move_by(pos);
+  pos += motion;
+  *curpos = pos;
+  return 1;
+}
+
+class block_object : public rectangle_object {
+  object_list oblist;
+  PTABLE(place) *tbl;
+public:
+  block_object(const position &, const object_list &ol, PTABLE(place) *t);
+  ~block_object();
+  place *find_label(const char *);
+  object_type type();
+  void move_by(const position &);
+  void print();
+};
+
+block_object::block_object(const position &d, const object_list &ol,
+			   PTABLE(place) *t)
+: rectangle_object(d), oblist(ol), tbl(t)
+{
+}
+
+block_object::~block_object()
+{
+  delete tbl;
+  object *p = oblist.head;
+  while (p != 0) {
+    object *tem = p;
+    p = p->next;
+    delete tem;
+  }
+}
+
+void block_object::print()
+{
+  out->begin_block(south_west(), north_east());
+  print_object_list(oblist.head);
+  out->end_block();
+}
+
+static void adjust_objectless_places(PTABLE(place) *tbl, const position &a)
+{
+  // Adjust all the labels that aren't attached to objects.
+  PTABLE_ITERATOR(place) iter(tbl);
+  const char *key;
+  place *pl;
+  while (iter.next(&key, &pl))
+    if (key && csupper(key[0]) && pl->obj == 0) {
+      pl->x += a.x;
+      pl->y += a.y;
+    }
+}
+
+void block_object::move_by(const position &a)
+{
+  cent += a;
+  for (object *p = oblist.head; p; p = p->next)
+    p->move_by(a);
+  adjust_objectless_places(tbl, a);
+}
+
+
+place *block_object::find_label(const char *name)
+{
+  return tbl->lookup(name);
+}
+
+object_type block_object::type()
+{
+  return BLOCK_OBJECT;
+}
+
+graphic_object *object_spec::make_block(position *curpos, direction *dirp)
+{
+  bounding_box bb;
+  for (object *p = oblist.head; p; p = p->next)
+    p->update_bounding_box(&bb);
+  position dim;
+  if (!bb.blank) {
+    position m = -(bb.ll + bb.ur)/2.0;
+    for (object *p = oblist.head; p; p = p->next)
+      p->move_by(m);
+    adjust_objectless_places(tbl, m);
+    dim = bb.ur - bb.ll;
+  }
+  if (flags & HAS_WIDTH)
+    dim.x = width;
+  if (flags & HAS_HEIGHT)
+    dim.y = height;
+  block_object *block = new block_object(dim, oblist, tbl);
+  if (!position_rectangle(block, curpos, dirp)) {
+    delete block;
+    block = 0;
+  }
+  tbl = 0;
+  oblist.head = oblist.tail = 0;
+  return block;
+}
+
+class text_object : public rectangle_object {
+public:
+  text_object(const position &);
+  object_type type() { return TEXT_OBJECT; }
+};
+
+text_object::text_object(const position &d)
+: rectangle_object(d)
+{
+}
+
+graphic_object *object_spec::make_text(position *curpos, direction *dirp)
+{
+  if (!(flags & HAS_HEIGHT)) {
+    lookup_variable("textht", &height);
+    int nitems = 0;
+    for (text_item *t = text; t; t = t->next)
+      nitems++;
+    height *= nitems;
+  }
+  if (!(flags & HAS_WIDTH))
+    lookup_variable("textwid", &width);
+  text_object *p = new text_object(position(width, height));
+  if (!position_rectangle(p, curpos, dirp)) {
+    delete p;
+    p = 0;
+  }
+  return p;
+}
+
+
+class ellipse_object : public closed_object {
+public:
+  ellipse_object(const position &);
+  position north_east() { return position(cent.x + dim.x/(M_SQRT2*2.0),
+					  cent.y + dim.y/(M_SQRT2*2.0)); }
+  position north_west() { return position(cent.x - dim.x/(M_SQRT2*2.0),
+					  cent.y + dim.y/(M_SQRT2*2.0)); }
+  position south_east() { return position(cent.x + dim.x/(M_SQRT2*2.0),
+					  cent.y - dim.y/(M_SQRT2*2.0)); }
+  position south_west() { return position(cent.x - dim.x/(M_SQRT2*2.0),
+					  cent.y - dim.y/(M_SQRT2*2.0)); }
+  double radius() { return dim.x/2.0; }
+  object_type type() { return ELLIPSE_OBJECT; }
+  void print();
+};
+
+ellipse_object::ellipse_object(const position &d)
+: closed_object(d)
+{
+}
+
+void ellipse_object::print()
+{
+  if (lt.type == line_type::invisible && fill < 0.0 && color_fill == 0)
+    return;
+  out->set_color(color_fill, graphic_object::get_outline_color());
+  out->ellipse(cent, dim, lt, fill);
+  out->reset_color();
+}
+
+graphic_object *object_spec::make_ellipse(position *curpos, direction *dirp)
+{
+  static double last_ellipse_height;
+  static double last_ellipse_width;
+  static int have_last_ellipse = 0;
+  if (!(flags & HAS_HEIGHT)) {
+    if ((flags & IS_SAME) && have_last_ellipse)
+      height = last_ellipse_height;
+    else
+      lookup_variable("ellipseht", &height);
+  }
+  if (!(flags & HAS_WIDTH)) {
+    if ((flags & IS_SAME) && have_last_ellipse)
+      width = last_ellipse_width;
+    else
+      lookup_variable("ellipsewid", &width);
+  }
+  last_ellipse_width = width;
+  last_ellipse_height = height;
+  have_last_ellipse = 1;
+  ellipse_object *p = new ellipse_object(position(width, height));
+  if (!position_rectangle(p, curpos, dirp)) {
+    delete p;
+    return 0;
+  }
+  return p;
+}
+
+class circle_object : public ellipse_object {
+public:
+  circle_object(double);
+  object_type type() { return CIRCLE_OBJECT; }
+  void print();
+};
+
+circle_object::circle_object(double diam)
+: ellipse_object(position(diam, diam))
+{
+}
+
+void circle_object::print()
+{
+  if (lt.type == line_type::invisible && fill < 0.0 && color_fill == 0)
+    return;
+  out->set_color(color_fill, graphic_object::get_outline_color());
+  out->circle(cent, dim.x/2.0, lt, fill);
+  out->reset_color();
+}
+
+graphic_object *object_spec::make_circle(position *curpos, direction *dirp)
+{
+  static double last_circle_radius;
+  static int have_last_circle = 0;
+  if (!(flags & HAS_RADIUS)) {
+    if ((flags & IS_SAME) && have_last_circle)
+      radius = last_circle_radius;
+    else
+      lookup_variable("circlerad", &radius);
+  }
+  last_circle_radius = radius;
+  have_last_circle = 1;
+  circle_object *p = new circle_object(radius*2.0);
+  if (!position_rectangle(p, curpos, dirp)) {
+    delete p;
+    return 0;
+  }
+  return p;
+}
+
+class move_object : public graphic_object {
+  position strt;
+  position en;
+public:
+  move_object(const position &s, const position &e);
+  position origin() { return en; }
+  object_type type() { return MOVE_OBJECT; }
+  void update_bounding_box(bounding_box *);
+  void move_by(const position &);
+};
+
+move_object::move_object(const position &s, const position &e)
+: strt(s), en(e)
+{
+}
+
+void move_object::update_bounding_box(bounding_box *p)
+{
+  p->encompass(strt);
+  p->encompass(en);
+}
+
+void move_object::move_by(const position &a)
+{
+  strt += a;
+  en += a;
+}
+
+graphic_object *object_spec::make_move(position *curpos, direction *dirp)
+{
+  static position last_move;
+  static int have_last_move = 0;
+  *dirp = dir;
+  // No need to look at at since `at' attribute sets `from' attribute.
+  position startpos = (flags & HAS_FROM) ? from : *curpos;
+  if (!(flags & HAS_SEGMENT)) {
+    if ((flags & IS_SAME) && have_last_move)
+      segment_pos = last_move;
+    else {
+      switch (dir) {
+      case UP_DIRECTION:
+	segment_pos.y = segment_height;
+	break;
+      case DOWN_DIRECTION:
+	segment_pos.y = -segment_height;
+	break;
+      case LEFT_DIRECTION:
+	segment_pos.x = -segment_width;
+	break;
+      case RIGHT_DIRECTION:
+	segment_pos.x = segment_width;
+	break;
+      default:
+	assert(0);
+      }
+    }
+  }
+  segment_list = new segment(segment_pos, segment_is_absolute, segment_list);
+  // Reverse the segment_list so that it's in forward order.
+  segment *old = segment_list;
+  segment_list = 0;
+  while (old != 0) {
+    segment *tem = old->next;
+    old->next = segment_list;
+    segment_list = old;
+    old = tem;
+  }
+  // Compute the end position.
+  position endpos = startpos;
+  for (segment *s = segment_list; s; s = s->next)
+    if (s->is_absolute)
+      endpos = s->pos;
+    else 
+      endpos += s->pos;
+  have_last_move = 1;
+  last_move = endpos - startpos;
+  move_object *p = new move_object(startpos, endpos);
+  *curpos = endpos;
+  return p;
+}
+
+class linear_object : public graphic_object {
+protected:
+  char arrow_at_start;
+  char arrow_at_end;
+  arrow_head_type aht;
+  position strt;
+  position en;
+public:
+  linear_object(const position &s, const position &e);
+  position start() { return strt; }
+  position end() { return en; }
+  void move_by(const position &);
+  void update_bounding_box(bounding_box *) = 0;
+  object_type type() = 0;
+  void add_arrows(int at_start, int at_end, const arrow_head_type &);
+};
+
+class line_object : public linear_object {
+protected:
+  position *v;
+  int n;
+public:
+  line_object(const position &s, const position &e, position *, int);
+  ~line_object();
+  position origin() { return strt; }
+  position center() { return (strt + en)/2.0; }
+  position north() { return (en.y - strt.y) > 0 ? en : strt; }
+  position south() { return (en.y - strt.y) < 0 ? en : strt; }
+  position east() { return (en.x - strt.x) > 0 ? en : strt; }
+  position west() { return (en.x - strt.x) < 0 ? en : strt; }
+  object_type type() { return LINE_OBJECT; }
+  void update_bounding_box(bounding_box *);
+  void print();
+  void move_by(const position &);
+};
+
+class arrow_object : public line_object {
+public:
+  arrow_object(const position &, const position &, position *, int);
+  object_type type() { return ARROW_OBJECT; }
+};
+
+class spline_object : public line_object {
+public:
+  spline_object(const position &, const position &, position *, int);
+  object_type type() { return SPLINE_OBJECT; }
+  void print();
+  void update_bounding_box(bounding_box *);
+};
+
+linear_object::linear_object(const position &s, const position &e)
+: arrow_at_start(0), arrow_at_end(0), strt(s), en(e)
+{
+}
+
+void linear_object::move_by(const position &a)
+{
+  strt += a;
+  en += a;
+}
+
+void linear_object::add_arrows(int at_start, int at_end,
+			       const arrow_head_type &a)
+{
+  arrow_at_start = at_start;
+  arrow_at_end = at_end;
+  aht = a;
+}
+
+line_object::line_object(const position &s, const position &e,
+			 position *p, int i)
+: linear_object(s, e), v(p), n(i)
+{
+}
+
+void line_object::print()
+{
+  if (lt.type == line_type::invisible)
+    return;
+  out->set_color(0, graphic_object::get_outline_color());
+  out->line(strt, v, n, lt);
+  if (arrow_at_start)
+    draw_arrow(strt, strt-v[0], aht, lt, graphic_object::get_outline_color());
+  if (arrow_at_end)
+    draw_arrow(en, v[n-1] - (n > 1 ? v[n - 2] : strt), aht, lt,
+	       graphic_object::get_outline_color());
+  out->reset_color();
+}
+
+void line_object::update_bounding_box(bounding_box *p)
+{
+  p->encompass(strt);
+  for (int i = 0; i < n; i++)
+    p->encompass(v[i]);
+}
+
+void line_object::move_by(const position &pos)
+{
+  linear_object::move_by(pos);
+  for (int i = 0; i < n; i++)
+    v[i] += pos;
+}
+  
+void spline_object::update_bounding_box(bounding_box *p)
+{
+  p->encompass(strt);
+  p->encompass(en);
+  /*
+
+  If
+
+  p1 = q1/2 + q2/2
+  p2 = q1/6 + q2*5/6
+  p3 = q2*5/6 + q3/6
+  p4 = q2/2 + q3/2
+  [ the points for the Bezier cubic ]
+
+  and
+
+  t = .5
+
+  then
+
+  (1-t)^3*p1 + 3*t*(t - 1)^2*p2 + 3*t^2*(1-t)*p3 + t^3*p4
+  [ the equation for the Bezier cubic ]
+
+  = .125*q1 + .75*q2 + .125*q3
+
+  */
+  for (int i = 1; i < n; i++)
+    p->encompass((i == 1 ? strt : v[i-2])*.125 + v[i-1]*.75 + v[i]*.125);
+}
+
+arrow_object::arrow_object(const position &s, const position &e,
+			   position *p, int i)
+: line_object(s, e, p, i)
+{
+}
+
+spline_object::spline_object(const position &s, const position &e,
+			     position *p, int i)
+: line_object(s, e, p, i)
+{
+}
+
+void spline_object::print()
+{
+  if (lt.type == line_type::invisible)
+    return;
+  out->set_color(0, graphic_object::get_outline_color());
+  out->spline(strt, v, n, lt);
+  if (arrow_at_start)
+    draw_arrow(strt, strt-v[0], aht, lt, graphic_object::get_outline_color());
+  if (arrow_at_end)
+    draw_arrow(en, v[n-1] - (n > 1 ? v[n - 2] : strt), aht, lt,
+	       graphic_object::get_outline_color());
+  out->reset_color();
+}
+
+line_object::~line_object()
+{
+  a_delete v;
+}
+
+linear_object *object_spec::make_line(position *curpos, direction *dirp)
+{
+  static position last_line;
+  static int have_last_line = 0;
+  *dirp = dir;
+  // No need to look at at since `at' attribute sets `from' attribute.
+  position startpos = (flags & HAS_FROM) ? from : *curpos;
+  if (!(flags & HAS_SEGMENT)) {
+    if ((flags & IS_SAME) && (type == LINE_OBJECT || type == ARROW_OBJECT)
+	&& have_last_line)
+      segment_pos = last_line;
+    else 
+      switch (dir) {
+      case UP_DIRECTION:
+	segment_pos.y = segment_height;
+	break;
+      case DOWN_DIRECTION:
+	segment_pos.y = -segment_height;
+	break;
+      case LEFT_DIRECTION:
+	segment_pos.x = -segment_width;
+	break;
+      case RIGHT_DIRECTION:
+	segment_pos.x = segment_width;
+	break;
+      default:
+	assert(0);
+      }
+  }
+  segment_list = new segment(segment_pos, segment_is_absolute, segment_list);
+  // reverse the segment_list so that it's in forward order
+  segment *old = segment_list;
+  segment_list = 0;
+  while (old != 0) {
+    segment *tem = old->next;
+    old->next = segment_list;
+    segment_list = old;
+    old = tem;
+  }
+  // Absolutise all movements
+  position endpos = startpos;
+  int nsegments = 0;
+  segment *s;
+  for (s = segment_list; s; s = s->next, nsegments++)
+    if (s->is_absolute)
+      endpos = s->pos;
+    else {
+      endpos += s->pos;
+      s->pos = endpos;
+      s->is_absolute = 1;	// to avoid confusion
+    }
+  // handle chop
+  line_object *p = 0;
+  position *v = new position[nsegments];
+  int i = 0;
+  for (s = segment_list; s; s = s->next, i++)
+    v[i] = s->pos;
+  if (flags & IS_DEFAULT_CHOPPED) {
+    lookup_variable("circlerad", &start_chop);
+    end_chop = start_chop;
+    flags |= IS_CHOPPED;
+  }
+  if (flags & IS_CHOPPED) {
+    position start_chop_vec, end_chop_vec;
+    if (start_chop != 0.0) {
+      start_chop_vec = v[0] - startpos;
+      start_chop_vec *= start_chop / hypot(start_chop_vec);
+    }
+    if (end_chop != 0.0) {
+      end_chop_vec = (v[nsegments - 1]
+		      - (nsegments > 1 ? v[nsegments - 2] : startpos));
+      end_chop_vec *= end_chop / hypot(end_chop_vec);
+    }
+    startpos += start_chop_vec;
+    v[nsegments - 1] -= end_chop_vec;
+    endpos -= end_chop_vec;
+  }
+  switch (type) {
+  case SPLINE_OBJECT:
+    p = new spline_object(startpos, endpos, v, nsegments);
+    break;
+  case ARROW_OBJECT:
+    p = new arrow_object(startpos, endpos, v, nsegments);
+    break;
+  case LINE_OBJECT:
+    p = new line_object(startpos, endpos, v, nsegments);
+    break;
+  default:
+    assert(0);
+  }
+  have_last_line = 1;
+  last_line = endpos - startpos;
+  *curpos = endpos;
+  return p;
+}
+
+class arc_object : public linear_object {
+  int clockwise;
+  position cent;
+  double rad;
+public:
+  arc_object(int, const position &, const position &, const position &);
+  position origin() { return cent; }
+  position center() { return cent; }
+  double radius() { return rad; }
+  position north();
+  position south();
+  position east();
+  position west();
+  position north_east();
+  position north_west();
+  position south_east();
+  position south_west();
+  void update_bounding_box(bounding_box *);
+  object_type type() { return ARC_OBJECT; }
+  void print();
+  void move_by(const position &pos);
+};
+
+arc_object::arc_object(int cw, const position &s, const position &e,
+		       const position &c)
+: linear_object(s, e), clockwise(cw), cent(c)
+{
+  rad = hypot(c - s);
+}
+
+void arc_object::move_by(const position &pos)
+{
+  linear_object::move_by(pos);
+  cent += pos;
+}
+
+// we get arc corners from the corresponding circle
+
+position arc_object::north()
+{
+  position result(cent);
+  result.y += rad;
+  return result;
+}
+
+position arc_object::south()
+{
+  position result(cent);
+  result.y -= rad;
+  return result;
+}
+
+position arc_object::east()
+{
+  position result(cent);
+  result.x += rad;
+  return result;
+}
+
+position arc_object::west()
+{
+  position result(cent);
+  result.x -= rad;
+  return result;
+}
+
+position arc_object::north_east()
+{
+  position result(cent);
+  result.x += rad/M_SQRT2;
+  result.y += rad/M_SQRT2;
+  return result;
+}
+
+position arc_object::north_west()
+{
+  position result(cent);
+  result.x -= rad/M_SQRT2;
+  result.y += rad/M_SQRT2;
+  return result;
+}
+
+position arc_object::south_east()
+{
+  position result(cent);
+  result.x += rad/M_SQRT2;
+  result.y -= rad/M_SQRT2;
+  return result;
+}
+
+position arc_object::south_west()
+{
+  position result(cent);
+  result.x -= rad/M_SQRT2;
+  result.y -= rad/M_SQRT2;
+  return result;
+}
+
+
+void arc_object::print()
+{
+  if (lt.type == line_type::invisible)
+    return;
+  out->set_color(0, graphic_object::get_outline_color());
+  if (clockwise)
+    out->arc(en, cent, strt, lt);
+  else
+    out->arc(strt, cent, en, lt);
+  if (arrow_at_start) {
+    position c = cent - strt;
+    draw_arrow(strt,
+	       (clockwise ? position(c.y, -c.x) : position(-c.y, c.x)),
+	       aht, lt, graphic_object::get_outline_color());
+  }
+  if (arrow_at_end) {
+    position e = en - cent;
+    draw_arrow(en,
+	       (clockwise ? position(e.y, -e.x) : position(-e.y, e.x)),
+	       aht, lt, graphic_object::get_outline_color());
+  }
+  out->reset_color();
+}
+
+inline double max(double a, double b)
+{
+  return a > b ? a : b;
+}
+
+void arc_object::update_bounding_box(bounding_box *p)
+{
+  p->encompass(strt);
+  p->encompass(en);
+  position start_offset = strt - cent;
+  if (start_offset.x == 0.0 && start_offset.y == 0.0)
+    return;
+  position end_offset = en  - cent;
+  if (end_offset.x == 0.0 && end_offset.y == 0.0)
+    return;
+  double start_quad = atan2(start_offset.y, start_offset.x)/(M_PI/2.0);
+  double end_quad = atan2(end_offset.y, end_offset.x)/(M_PI/2.0);
+  if (clockwise) {
+    double temp = start_quad;
+    start_quad = end_quad;
+    end_quad = temp;
+  }
+  if (start_quad < 0.0)
+    start_quad += 4.0;
+  while (end_quad <= start_quad)
+    end_quad += 4.0;
+  double radius = max(hypot(start_offset), hypot(end_offset));
+  for (int q = int(start_quad) + 1; q < end_quad; q++) {
+    position offset;
+    switch (q % 4) {
+    case 0:
+      offset.x = radius;
+      break;
+    case 1:
+      offset.y = radius;
+      break;
+    case 2:
+      offset.x = -radius;
+      break;
+    case 3:
+      offset.y = -radius;
+      break;
+    }
+    p->encompass(cent + offset);
+  }
+}
+
+// We ignore the with attribute. The at attribute always refers to the center.
+
+linear_object *object_spec::make_arc(position *curpos, direction *dirp)
+{
+  *dirp = dir;
+  int cw = (flags & IS_CLOCKWISE) != 0;
+  // compute the start
+  position startpos;
+  if (flags & HAS_FROM)
+    startpos = from;
+  else
+    startpos = *curpos;
+  if (!(flags & HAS_RADIUS))
+    lookup_variable("arcrad", &radius);
+  // compute the end
+  position endpos;
+  if (flags & HAS_TO)
+    endpos = to;
+  else {
+    position m(radius, radius);
+    // Adjust the signs.
+    if (cw) {
+      if (dir == DOWN_DIRECTION || dir == LEFT_DIRECTION)
+	m.x = -m.x;
+      if (dir == DOWN_DIRECTION || dir == RIGHT_DIRECTION)
+	m.y = -m.y;
+      *dirp = direction((dir + 3) % 4);
+    }
+    else {
+      if (dir == UP_DIRECTION || dir == LEFT_DIRECTION)
+	m.x = -m.x;
+      if (dir == DOWN_DIRECTION || dir == LEFT_DIRECTION)
+	m.y = -m.y;
+      *dirp = direction((dir + 1) % 4);
+    }
+    endpos = startpos + m;
+  }
+  // compute the center
+  position centerpos;
+  if (flags & HAS_AT)
+    centerpos = at;
+  else if (startpos == endpos)
+    centerpos = startpos;
+  else {
+    position h = (endpos - startpos)/2.0;
+    double d = hypot(h);
+    if (radius <= 0)
+      radius = .25;
+    // make the radius big enough
+    while (radius < d)
+      radius *= 2.0;
+    double alpha = acos(d/radius);
+    double theta = atan2(h.y, h.x);
+    if (cw)
+      theta -= alpha;
+    else
+      theta += alpha;
+    centerpos = position(cos(theta), sin(theta))*radius + startpos;
+  }
+  arc_object *p = new arc_object(cw, startpos, endpos, centerpos);
+  *curpos = endpos;
+  return p;
+}
+
+graphic_object *object_spec::make_linear(position *curpos, direction *dirp)
+{
+  linear_object *obj;
+  if (type == ARC_OBJECT)
+    obj = make_arc(curpos, dirp);
+  else
+    obj = make_line(curpos, dirp);
+  if (type == ARROW_OBJECT
+      && (flags & (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD)) == 0)
+    flags |= HAS_RIGHT_ARROW_HEAD;
+  if (obj && (flags & (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD))) {
+    arrow_head_type a;
+    int at_start = (flags & HAS_LEFT_ARROW_HEAD) != 0;
+    int at_end = (flags & HAS_RIGHT_ARROW_HEAD) != 0;
+    if (flags & HAS_HEIGHT)
+      a.height = height;
+    else
+      lookup_variable("arrowht", &a.height);
+    if (flags & HAS_WIDTH)
+      a.width = width;
+    else
+      lookup_variable("arrowwid", &a.width);
+    double solid;
+    lookup_variable("arrowhead", &solid);
+    a.solid = solid != 0.0;
+    obj->add_arrows(at_start, at_end, a);
+  }
+  return obj;
+}
+
+object *object_spec::make_object(position *curpos, direction *dirp)
+{
+  graphic_object *obj = 0;
+  switch (type) {
+  case BLOCK_OBJECT:
+    obj = make_block(curpos, dirp);
+    break;
+  case BOX_OBJECT:
+    obj = make_box(curpos, dirp);
+    break;
+  case TEXT_OBJECT:
+    obj = make_text(curpos, dirp);
+    break;
+  case ELLIPSE_OBJECT:
+    obj = make_ellipse(curpos, dirp);
+    break;
+  case CIRCLE_OBJECT:
+    obj = make_circle(curpos, dirp);
+    break;
+  case MOVE_OBJECT:
+    obj = make_move(curpos, dirp);
+    break;
+  case ARC_OBJECT:
+  case LINE_OBJECT:
+  case SPLINE_OBJECT:
+  case ARROW_OBJECT:
+    obj = make_linear(curpos, dirp);
+    break;
+  case MARK_OBJECT:
+  case OTHER_OBJECT:
+  default:
+    assert(0);
+    break;
+  }
+  if (obj) {
+    if (flags & IS_INVISIBLE)
+      obj->set_invisible();
+    if (text != 0)
+      obj->add_text(text, (flags & IS_ALIGNED) != 0);
+    if (flags & IS_DOTTED)
+      obj->set_dotted(dash_width);
+    else if (flags & IS_DASHED)
+      obj->set_dashed(dash_width);
+    double th;
+    if (flags & HAS_THICKNESS)
+      th = thickness;
+    else
+      lookup_variable("linethick", &th);
+    obj->set_thickness(th);
+    if (flags & IS_OUTLINED)
+      obj->set_outline_color(outlined);
+    if (flags & (IS_DEFAULT_FILLED|IS_FILLED)) {
+      if (flags & IS_SHADED)
+	obj->set_fill_color(shaded);
+      else {
+	if (flags & IS_DEFAULT_FILLED)
+	  lookup_variable("fillval", &fill);
+	if (fill < 0.0)
+	  error("bad fill value %1", fill);
+	else
+	  obj->set_fill(fill);
+      }
+    }
+  }
+  return obj;
+}
+
+struct string_list {
+  string_list *next;
+  char *str;
+  string_list(char *);
+  ~string_list();
+};
+
+string_list::string_list(char *s)
+: next(0), str(s)
+{
+}
+
+string_list::~string_list()
+{
+  a_delete str;
+}
+  
+/* A path is used to hold the argument to the `with' attribute.  For
+   example, `.nw' or `.A.s' or `.A'.  The major operation on a path is to
+   take a place and follow the path through the place to place within the
+   place.  Note that `.A.B.C.sw' will work.
+
+   For compatibility with DWB pic, `with' accepts positions also (this
+   is incorrectly documented in CSTR 116). */
+
+path::path(corner c)
+: crn(c), label_list(0), ypath(0), is_position(0)
+{
+}
+
+path::path(position p)
+: crn(0), label_list(0), ypath(0), is_position(1)
+{
+  pos.x = p.x;
+  pos.y = p.y;
+}
+
+path::path(char *l, corner c)
+: crn(c), ypath(0), is_position(0)
+{
+  label_list = new string_list(l);
+}
+
+path::~path()
+{
+  while (label_list) {
+    string_list *tem = label_list;
+    label_list = label_list->next;
+    delete tem;
+  }
+  delete ypath;
+}
+
+void path::append(corner c)
+{
+  assert(crn == 0);
+  crn = c;
+}
+
+void path::append(char *s)
+{
+  string_list **p;
+  for (p = &label_list; *p; p = &(*p)->next)
+    ;
+  *p = new string_list(s);
+}
+
+void path::set_ypath(path *p)
+{
+  ypath = p;
+}
+
+// return non-zero for success
+
+int path::follow(const place &pl, place *result) const
+{
+  if (is_position) {
+    result->x = pos.x;
+    result->y = pos.y;
+    result->obj = 0;
+    return 1;
+  }
+  const place *p = &pl;
+  for (string_list *lb = label_list; lb; lb = lb->next)
+    if (p->obj == 0 || (p = p->obj->find_label(lb->str)) == 0) {
+      lex_error("object does not contain a place `%1'", lb->str);
+      return 0;
+    }
+  if (crn == 0 || p->obj == 0)
+    *result = *p;
+  else {
+    position ps = ((p->obj)->*(crn))();
+    result->x = ps.x;
+    result->y = ps.y;
+    result->obj = 0;
+  }
+  if (ypath) {
+    place tem;
+    if (!ypath->follow(pl, &tem))
+      return 0;
+    result->y = tem.y;
+    if (result->obj != tem.obj)
+      result->obj = 0;
+  }
+  return 1;
+}
+
+void print_object_list(object *p)
+{
+  for (; p; p = p->next) {
+    p->print();
+    p->print_text();
+  }
+}
+
+void print_picture(object *obj)
+{
+  bounding_box bb;
+  for (object *p = obj; p; p = p->next)
+    p->update_bounding_box(&bb);
+  double scale;
+  lookup_variable("scale", &scale);
+  out->start_picture(scale, bb.ll, bb.ur);
+  print_object_list(obj);
+  out->finish_picture();
+}
+
diff --git a/contrib/groff/src/preproc/pic/pic.cpp b/contrib/groff/src/preproc/pic/pic.cpp
new file mode 100644
index 0000000..41ae347
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/pic.cpp
@@ -0,0 +1,5619 @@
+#ifndef lint
+static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93 (groff)";
+#endif
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+#define yyclearin (yychar=(-1))
+#define yyerrok (yyerrflag=0)
+#define YYRECOVERING (yyerrflag!=0)
+#define YYPREFIX "yy"
+#line 21 "pic.y"
+#include "pic.h"
+#include "ptable.h"
+#include "object.h"
+
+extern int delim_flag;
+extern void do_copy(const char *);
+extern void copy_rest_thru(const char *, const char *);
+extern void copy_file_thru(const char *, const char *, const char *);
+extern void push_body(const char *);
+extern void do_for(char *var, double from, double to,
+		   int by_is_multiplicative, double by, char *body);
+extern void do_lookahead();
+
+/* Maximum number of characters produced by printf("%g") */
+#define GDIGITS 14
+
+int yylex();
+void yyerror(const char *);
+
+void reset(const char *nm);
+void reset_all();
+
+place *lookup_label(const char *);
+void define_label(const char *label, const place *pl);
+
+direction current_direction;
+position current_position;
+
+implement_ptable(place)
+
+PTABLE(place) top_table;
+
+PTABLE(place) *current_table = &top_table;
+saved_state *current_saved_state = 0;
+
+object_list olist;
+
+const char *ordinal_postfix(int n);
+const char *object_type_name(object_type type);
+char *format_number(const char *form, double n);
+char *do_sprintf(const char *form, const double *v, int nv);
+
+#line 66 "pic.y"
+typedef union {
+	char *str;
+	int n;
+	double x;
+	struct { double x, y; } pair;
+	struct { double x; char *body; } if_data;
+	struct { char *str; const char *filename; int lineno; } lstr;
+	struct { double *v; int nv; int maxv; } dv;
+	struct { double val; int is_multiplicative; } by;
+	place pl;
+	object *obj;
+	corner crn;
+	path *pth;
+	object_spec *spec;
+	saved_state *pstate;
+	graphics_state state;
+	object_type obtype;
+} YYSTYPE;
+#line 74 "y.tab.c"
+#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 UP 269
+#define DOWN 270
+#define LEFT 271
+#define RIGHT 272
+#define BOX 273
+#define CIRCLE 274
+#define ELLIPSE 275
+#define ARC 276
+#define LINE 277
+#define ARROW 278
+#define MOVE 279
+#define SPLINE 280
+#define HEIGHT 281
+#define RADIUS 282
+#define FIGNAME 283
+#define WIDTH 284
+#define DIAMETER 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 ALIGNED 372
+#define SPRINTF 373
+#define COMMAND 374
+#define DEFINE 375
+#define UNDEF 376
+#define YYERRCODE 256
+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,   26,   26,   25,   25,   19,   19,    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,
+};
+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,    2,    3,    2,    2,
+    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+    3,    2,    1,    5,    0,    3,    1,    1,    1,    3,
+    3,    5,    5,    6,    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,
+};
+short yydefred[] = {                                      0,
+    8,    0,    2,    0,    0,    0,    0,  133,   17,   13,
+   14,   15,   16,   74,   75,   76,   77,   78,   79,   80,
+   81,    0,    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,  154,  215,
+  216,  157,  159,  196,  197,  153,  183,  184,  185,  186,
+  187,  188,  189,  190,  191,  192,  193,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  194,  195,
+    0,    0,  202,  203,  208,  209,  210,  211,  212,  214,
+  213,    0,    0,    0,    0,    0,  139,  137,  155,    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,  121,  122,  123,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  106,  107,    0,    0,    0,  119,  120,  127,  128,
+  129,  130,  124,  125,    0,    0,    0,    0,    0,  132,
+    0,  126,   39,    0,    0,   11,    0,   37,   36,   10,
+   23,    0,   21,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  198,  200,  204,  206,  199,  201,
+  205,  207,    0,    0,    0,    0,    0,    0,    0,    0,
+  145,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  217,
+  218,  219,  220,  221,    0,  150,    0,    0,  171,  163,
+  164,  165,  166,  167,  168,  169,    0,  162,  160,  161,
+   42,    0,    0,   60,    0,    0,    0,   46,    0,    0,
+    0,    0,   84,  135,    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,  177,
+    0,    0,    0,  105,    0,    0,    0,    0,    0,  115,
+  116,  114,   40,    0,    0,    0,    0,    0,    0,   65,
+    0,   12,    0,   27,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  240,    0,    0,  229,  148,    0,  158,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  156,
+  140,  141,  170,    0,    0,   56,    0,    0,    0,    0,
+    0,   54,    0,    0,   53,   52,    0,   86,   69,   33,
+  174,  182,    0,    0,    0,  172,    0,    0,  176,    0,
+    0,   24,    0,  230,  231,    0,  233,  234,  235,    0,
+    0,  238,  239,  241,    0,    0,    0,    0,    0,   47,
+    0,  134,    0,    0,  181,  180,    0,  173,    0,    0,
+   28,    0,    0,    0,  142,  146,    0,    0,    0,    0,
+   73,   70,  179,    0,   25,   49,  232,  236,  237,  144,
+    0,    0,  178,    0,    0,   29,    0,    0,   30,
+};
+short yydgoto[] = {                                       2,
+  112,  194,  114,  422,   97,   98,   34,   99,  100,  278,
+  279,  280,  115,  102,   35,    3,   36,   37,  103,  238,
+  104,  105,  170,  401,  357,  116,  107,  108,  256,    5,
+   39,   48,  303,  399,  172,  373,  428,  258,   40,  350,
+  122,  412,  393,  121,  217,
+};
+short yysindex[] = {                                    -57,
+    0,    0,    0, 5015,  -24,   -4,   -8,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   -2, -245,    0,12240, -182,12363, -175,12960,   45,
+12240,    0,    0, -261,    0,  -57,11821,    0,    0,  -43,
+    0,  -57,12363,   42, -103, -214,    0, -125,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  126,  161,  166,
+  176,  186,  187,  190,  194,  197,  198,  203,    0,    0,
+ -199, -147,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,12480,12363,12960,12960, 1256,    0,    0,    0,  -22,
+ -223,  867,   21,  191,   -1,    0,12240,    0,  183,12363,
+12363,  361,  -44, -187, -223, -179,    0,  798,  -11,12240,
+  -57,  -57,    0,    0,13430,    0,    0,    0,13323,13323,
+13323,13323,12960,12960,12960,12960,13083,13083,13083,12720,
+13200,    0,    0,13323,13323,13323,    0,    0,    0,    0,
+    0,    0,    0,    0,12960,13323, -247, -247, -247,    0,
+ 1697,    0,    0,   -6,11489,    0,12363,    0,    0,    0,
+    0,   -9,    0,12363,12363,12363,12363,12363,12363,12363,
+12363,12363,11938,12363,    0,    0,    0,    0,    0,    0,
+    0,    0, 1597,  214,  221,   36,    1,  172,  172,  -34,
+    0,12960,12960,12960,12960,12960,12960,12960,13083,12960,
+12960,12960,12960,12960,12960,12960,13083,  -18,  232,    0,
+    0,    0,    0,    0,   24,    0,13200,13200,    0,    0,
+    0,    0,    0,    0,    0,    0,  192,    0,    0,    0,
+    0,12960,  172,    0,12363,12363,12960,    0,12363,12363,
+ -247, -247,    0,    0,  195, 5015,  162,   27,    0, 1697,
+ 1697, 1697, 1697, 1697, 1697, 1697, 1697, 1256,   21,   21,
+   21, 1783,  428,  428,   43,12123,  -22,    0,  467,    0,
+   21,12603,  680,    0, 1697, 1697, 1697, 1697, 1697,    0,
+    0,    0,    0,   -4,   -8,    0,    0,    0, -223,    0,
+   21,    0,   44,    0,  252,  264,  278,  267,  290,  291,
+  289,  301,  294,    0,  310,  312,    0,    0,13083,    0,
+   51,   -5,  -26,   99,   99,  714,  714, 1697,  -19,   49,
+  714,  337,  337,  172,  172,  172,  172,  -38,  232,    0,
+    0,    0,    0, 3111,   -5,    0, 1733,   11,  714,   96,
+   -5,    0, 1733,   11,    0,    0,   17,    0,    0,    0,
+    0,    0,  191,  927,  927,    0,  323,  113,    0, 1277,
+  221,    0,   13,    0,    0,12363,    0,    0,    0,12363,
+12363,    0,    0,    0,    6,   66,13083,13083,12960,    0,
+12960,    0, 5015,  927,    0,    0,  927,    0,   13,  115,
+    0,  332,  339,  340,    0,    0,  -14,   21, 2174, 1697,
+    0,    0,    0,  344,    0,    0,    0,    0,    0,    0,
+12843,   46,    0,12960, 1697,    0, 1697,  125,    0,
+};
+short yyrindex[] = {                                     41,
+    0,    0,    0,  389,  167,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   25,    0,    0,
+    0,    0,    0,  117,    0,    8,  135,    0,    0,  236,
+    0,11685,    0,    0,    0,  284,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,10065,    0,    0,    0,    0,
+ 4419, 9457,10400,    0,    0,    0,  633,    0,    0,    0,
+    0, 2068,    0, 2113,    0,    0,    0,11307,    0,  661,
+ 5476, 5476,    0,    0,    9,    0,    0,    0,10642,10706,
+10218,10521,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,10770,10896,10960,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,11024,    0,    0,    0,    0,
+ 5218,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  350,    0,   84,    0,    0,  297,  638,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0, 3045,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,10568,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, 5335,
+ 5676, 5793, 6134, 6251, 6592, 6709, 7050,    0, 7167, 7508,
+ 7625, 9759, -238,  134,    0,    0, 9340,    0, 9853,    0,
+ 7966,    0,    0,    0, 8083, 8424, 8541, 8882, 8999,    0,
+    0,    0,    0,11377, 1711, 2448, 2906,  211,  309,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0, 3961, 4302, 3386, 3503, 2129, 2470, 4877, 9942,    0,
+ 2587, 1671, 2012,  755, 1096, 1213, 1554,    0, 3844,    0,
+    0,    0,    0,    0, 4392,    0, 4850, 3059, 2928,    0,
+ 3931,    0, 5305, 5763,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  350,
+    0,    0,  676,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  694,    0,    0,    0,    0,    0,  676,    0,
+    0,    0,    0,    0,    0,    0,    0, 4760,   54,   19,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   55,    0,   64,    0,    0,
+};
+short yygindex[] = {                                      0,
+  -25,  368,  -97,    0,  -53,  247,    0,    0,   93,    0,
+    0, -133,   31,  -73, -122,   97,    0,    0, 1557,  -60,
+    0,    0,    0,   14,    0,   40,  366,  -87,   10,  380,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,
+};
+#define YYTABLESIZE 13804
+short yytable[] = {                                      96,
+  164,    1,  259,  118,  227,   96,  228,    6,    7,    4,
+  215,  161,    8,  244,   46,  213,  211,  215,  212,  241,
+  214,  157,  213,  211,   35,  212,  219,  214,  227,  157,
+  228,  215,  241,  247,   41,  210,  213,  211,  195,  212,
+    6,  214,  300,   38,  240,  124,  405,  420,  227,   44,
+  228,  165,   43,   42,  247,  101,  210,  392,   45,  136,
+  391,  101,  136,  227,  106,  228,  193,  216,  198,  199,
+  106,  185,  186,   93,  216,  109,  162,   93,  227,  319,
+  228,   96,  117,   35,  119,  243,  123,  284,  216,  237,
+   47,  227,  387,  228,   96,  220,  221,  222,  223,  224,
+    6,    7,  167,  260,  261,  262,  263,  264,  265,  266,
+  267,  268,  268,  268,  268,  283,   31,   35,  285,  286,
+  287,  171,  101,  189,  190,   30,  139,  139,  139,  288,
+  289,    6,    6,    7,   64,  215,  173,  101,  362,  268,
+  213,  211,  367,  212,  339,  214,  106,  346,  348,   35,
+  101,  352,  354,  168,  169,  187,  188,  253,  247,  106,
+  210,  249,  250,    6,   38,  174,    7,  101,  101,  101,
+  101,  251,  252,  341,  342,   31,  322,  323,  324,  325,
+  326,  327,  328,  329,  331,  332,  333,  334,  335,  336,
+  337,  268,  216,   64,  226,  299,  290,  291,  292,    7,
+  175,  283,  283,  219,   38,  176,    7,  191,  192,   31,
+   66,    7,  364,  365,  163,  177,  344,  255,  257,  345,
+  347,  349,  195,  351,  353,  178,  179,   64,  371,  180,
+  395,  396,  277,  181,   49,   34,  182,  183,   49,  101,
+   52,   31,  184,  242,   52,   53,  248,  101,  254,   53,
+  193,  293,  304,  137,  317,  137,  370,    7,  229,   64,
+  413,  318,    7,  414,  320,  216,  239,  388,  321,   66,
+  411,  230,  231,  232,  233,  234,  235,  225,  236,  218,
+  340,  237,  200,   22,  343,  201,  359,  358,  360,    7,
+  355,  356,  374,  268,   34,   38,  228,    6,    6,  366,
+    6,    6,  394,   66,  375,  372,  101,  377,   67,    6,
+    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+    6,  376,  202,    6,  204,  205,  206,  207,   34,  228,
+  378,  379,  380,  228,  382,   66,  228,  228,  228,  228,
+  228,  228,   22,  228,  381,  204,  205,  206,  207,  101,
+  383,  138,  384,  138,  386,  228,  228,  390,  228,  249,
+   34,  268,  268,  409,  361,  410,  397,   67,  277,  398,
+  406,  369,  417,  215,  416,    6,   22,  400,  213,  418,
+  419,    6,    6,  214,  423,    6,  429,    6,    1,  228,
+   50,  426,  228,  159,  113,  425,  120,  215,  427,   61,
+   62,   67,  213,  211,    6,  212,    6,  214,   22,   63,
+  166,  298,  415,    6,    6,  125,    0,  101,  101,    0,
+  247,  228,  210,    7,    7,    7,    7,    7,    0,    7,
+  216,    0,   38,   67,    7,    7,    7,    7,    7,    7,
+    7,    7,    7,    7,    7,    7,    7,    0,    0,    7,
+  229,  206,  207,    0,  216,    0,  361,  361,    0,    0,
+  197,    0,    0,  230,  231,  232,  233,  234,  235,    0,
+  236,    0,    0,    7,    7,    7,    7,    7,    7,    7,
+    7,    7,    7,    7,    7,    0,  361,    0,    0,  361,
+    7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+    7,    7,    0,    7,    7,    7,    7,    7,    7,    0,
+    0,    7,  368,    7,    0,    0,    0,    0,  237,    0,
+    0,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+    7,    0,    7,    0,  302,    0,    0,    0,    0,    7,
+    7,  305,  306,  307,  308,  309,  310,  311,  312,  313,
+  315,  316,    0,  228,  228,  228,  228,    0,    0,  228,
+  228,  228,  228,  228,  228,  228,  228,  228,  228,    0,
+    0,    0,    0,    0,    0,    0,    0,  228,  228,    0,
+  228,  228,  228,  228,  228,  228,  228,  228,  228,  228,
+  228,  228,  228,  228,  228,  228,  228,  228,  228,    0,
+    0,  228,  228,  228,  228,  228,  228,  228,  228,  228,
+  228,  228,  228,  228,  228,    0,    0,    0,    0,    0,
+  228,  228,  228,  228,  228,  228,  228,  228,  228,  228,
+  228,    0,   19,  228,  228,  228,  228,  250,    0,  228,
+  228,    0,  228,    0,    0,  228,  228,  228,  228,  228,
+  228,  228,  228,  228,  228,  228,  228,  228,  228,  228,
+   18,    0,    0,  228,  228,  228,  228,  228,  228,  228,
+  250,    0,    0,    0,  250,   48,    0,  250,  250,  250,
+  250,  250,  250,    0,  250,    0,    0,    0,    0,    0,
+    0,   19,    0,   72,    0,    0,  250,  250,    0,  250,
+  230,  231,  232,  233,  234,  235,    0,  236,    0,  245,
+  246,  204,  205,  206,  207,    0,  215,    0,    0,   18,
+    0,  213,  211,  208,  212,   19,  214,    0,    0,    0,
+  250,    0,    0,  250,   48,    0,    0,   54,   55,  247,
+    0,  210,    0,  402,    0,    0,    0,  403,  404,    0,
+  215,    0,   72,   18,  224,  213,  211,   19,  212,    0,
+  214,    0,  250,    0,    0,    0,    0,    0,   48,    0,
+    0,    0,    0,  216,   57,   58,   59,   60,   61,   62,
+   63,   64,   65,   66,   67,   18,   72,  224,    0,    0,
+    0,  224,    0,    0,  224,  224,  224,  224,  224,  224,
+   48,  224,    0,   79,   80,   81,   82,  216,    0,    0,
+    0,    0,    0,  224,  224,    0,  224,    0,   72,    0,
+    0,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+    0,    0,    0,    0,  215,    0,    0,    0,    0,  213,
+  211,    0,  212,    0,  214,    0,    0,  224,    0,    0,
+  224,    0,    0,    0,    0,    0,    0,  247,    0,  210,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  224,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  216,    0,    0,  250,  250,  250,  250,    0,    0,
+  250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+    0,    0,  225,    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,
+    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,  275,    0,  250,  250,  250,  250,    0,    0,
+  250,  250,    0,  250,    0,    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,  224,  224,  224,  224,    0,    0,  224,  224,  224,
+  224,  224,  224,  224,  224,  224,  224,    0,  202,  203,
+  204,  205,  206,  207,    0,  224,  224,    0,  224,  224,
+  224,  224,  224,  224,  224,  224,  224,  224,  224,  224,
+  224,  224,  224,  224,  224,  224,  224,    8,    0,  224,
+  224,  224,  224,  224,  224,  224,  224,  224,  224,  224,
+  224,  224,  224,    0,    0,    0,    0,    0,  224,  224,
+  224,  224,  224,  224,  224,  224,  224,  224,  224,    0,
+    0,  224,  224,  224,  224,  225,    0,  224,  224,    0,
+  224,    0,    0,  224,  224,  224,  224,  224,  224,  224,
+  224,  224,  224,  224,  224,  224,  224,  224,    0,    0,
+    0,  224,  224,  224,  224,  224,  224,  224,  225,    0,
+    0,    0,  225,    0,    0,  225,  225,  225,  225,  225,
+  225,    0,  225,    0,    0,    0,  202,  203,  204,  205,
+  206,  207,    0,    0,  225,  225,    0,  225,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   30,    0,    0,    0,   57,   58,   59,   60,   61,   62,
+   63,   64,   65,   66,   67,    0,    0,    0,  225,    0,
+    0,  225,    0,    0,    0,    0,    0,   54,   55,    0,
+    0,    0,    0,   79,   80,   81,   82,    0,    0,    0,
+    0,    0,  226,    0,    0,    0,    0,    0,    0,    0,
+  225,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+    0,    0,    0,    0,   57,   58,   59,   60,   61,   62,
+   63,   64,   65,   66,   67,  226,    0,    0,    0,  226,
+    0,    0,  226,  226,  226,  226,  226,  226,    0,  226,
+    0,    0,    0,   79,   80,   81,   82,    0,    0,    0,
+    0,  226,  226,    0,  226,    0,    0,    0,    0,    0,
+    0,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+    0,    0,  215,    0,    0,    0,    0,  213,  211,  208,
+  212,    0,  214,    0,    0,  226,    0,    0,  226,    0,
+    0,    0,    0,  215,    0,  209,    0,  210,  213,  211,
+  208,  212,    0,  214,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  247,  226,  210,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  216,
+    0,    0,  225,  225,  225,  225,    0,    0,  225,  225,
+  225,  225,  225,  225,  225,  225,  225,  225,    0,    0,
+  216,    0,    0,    0,    0,    0,  225,  225,    0,  225,
+  225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
+  225,  225,  225,  225,  225,  225,  225,  225,    0,    0,
+  225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
+  225,  225,  225,  225,    0,    0,    0,    0,    0,  225,
+  225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
+    0,    0,  225,  225,  225,  225,    0,    0,  225,  225,
+    0,  225,    0,    0,  225,  225,  225,  225,  225,  225,
+  225,  225,  225,  225,  225,  225,  225,  225,  225,    0,
+    0,    0,  225,  225,  225,  225,  225,  225,  225,  226,
+  226,  226,  226,    0,    0,  226,  226,  226,  226,  226,
+  226,  226,  226,  226,  226,    0,    0,    0,    0,    0,
+    0,    0,    0,  226,  226,    0,  226,  226,  226,  226,
+  226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
+  226,  226,  226,  226,  226,    0,    0,  226,  226,  226,
+  226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
+  226,    0,    0,    0,    0,    0,  226,  226,  226,  226,
+  226,  226,  226,  226,  226,  226,  226,    0,    0,  226,
+  226,  226,  226,  227,    0,  226,  226,  200,  226,    0,
+  201,  226,  226,  226,  226,  226,  226,  226,  226,  226,
+  226,  226,  226,  226,  226,  226,    0,    0,    0,  226,
+  226,  226,  226,  226,  226,  226,  227,    0,    0,    0,
+  227,    0,    0,  227,  227,  227,  227,  227,  227,    0,
+  227,    0,    0,    0,  202,  203,  204,  205,  206,  207,
+    0,    0,  227,  227,    0,  227,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  245,  246,  204,  205,  206,
+  207,    0,    0,  215,    0,    0,    0,    0,  213,  211,
+  208,  212,    0,  214,    0,    0,  227,    0,  196,  227,
+    0,    0,    0,    0,    0,    0,  209,    0,  210,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  222,    0,    0,    0,    0,    0,    0,    0,  227,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  216,    0,    0,  269,  270,  271,  281,    0,    0,    0,
+    0,    0,    0,  222,    0,    0,    0,    0,    0,    0,
+  222,  222,    0,  222,  222,  222,    0,    0,    0,    0,
+    0,  301,    0,    0,    0,    0,    0,    0,    0,  222,
+  222,    0,  222,  215,    0,    0,    0,    0,  213,  211,
+    0,  212,    0,  214,    0,    0,    0,  215,    0,    0,
+    0,    0,  215,  215,  215,  215,  247,  215,  210,    0,
+    0,    0,    0,  222,    0,  330,  222,    0,    0,  215,
+  215,    0,  215,  338,  213,  211,    0,  212,    0,  214,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  216,    0,  247,    0,  210,  222,    0,    0,    0,    0,
+    0,    0,    0,    0,  215,    0,    0,    0,    0,    0,
+  227,  227,  227,  227,    0,    0,  227,  227,  227,  227,
+  227,  227,  227,  227,  227,  227,  216,    0,    0,    0,
+    0,    0,  196,    0,  227,  227,    0,  227,  227,  227,
+  227,  227,  227,  227,  227,  227,  227,  227,  227,  227,
+  227,  227,  227,  227,  227,  227,    0,    0,  227,  227,
+  227,  227,  227,  227,  227,  227,  227,  227,  227,  227,
+  227,  227,    0,    0,    0,  385,    0,  227,  227,  227,
+  227,  227,  227,  227,  227,  227,  227,  227,    0,    0,
+  227,  227,  227,  227,    0,    0,  227,  227,  200,  227,
+    0,  201,  227,  227,  227,  227,  227,  227,  227,  227,
+  227,  227,  227,  227,  227,  227,  227,    0,    0,    0,
+  227,  227,  227,  227,  227,  227,  227,  222,  222,  222,
+  222,    0,    0,  222,  222,  222,  222,  222,  222,  222,
+  222,  222,  222,  407,  408,  245,  246,  204,  205,  206,
+  207,  222,  222,    0,  222,  222,  222,  222,  222,  222,
+  222,  222,  222,  222,  222,  222,  222,  222,  222,  222,
+  222,  222,  222,    0,    0,  222,  222,  222,  222,  222,
+  222,  222,  222,  222,  222,  222,  222,  222,  222,    0,
+    0,    0,    0,    0,  222,  222,  222,  222,  222,  222,
+  222,  222,  222,  222,  222,    0,    0,  222,  222,  222,
+  222,  223,  215,  222,  222,  215,  222,    0,    0,  222,
+  222,  222,  222,  222,  222,  222,  222,  222,  222,  222,
+  222,  222,  222,  222,    0,    0,    0,  222,  222,  222,
+  222,  222,  222,  222,  223,  202,  203,  204,  205,  206,
+  207,  223,  223,    0,  223,  223,  223,    0,    0,  215,
+  215,  215,  215,  215,  215,    0,    0,   50,    0,    0,
+  223,  223,    0,  223,    0,    0,    0,    0,    0,    0,
+    0,  245,    0,  204,  205,  206,  207,    0,    0,    0,
+   57,   58,   59,   60,   61,   62,   63,   64,   65,   66,
+   67,    0,    0,    0,  223,    0,    0,  223,   50,    0,
+    0,   50,   51,    0,    0,    0,    0,    0,    0,   79,
+   80,   81,   82,    0,    0,    0,   50,    0,  243,    0,
+    0,    0,    0,    0,    0,    0,  223,   83,   84,   85,
+   86,   87,   88,   89,   90,   91,    0,    0,    0,    0,
+    0,    0,    0,   51,    0,    0,   51,    0,    0,    0,
+   50,  243,    0,    0,    0,    0,    0,    0,  243,  243,
+    0,   51,  243,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  243,  243,    0,
+  243,    0,   50,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   51,    0,    0,    0,    0,
+  215,    0,    0,    0,    0,  213,  211,    0,  212,    0,
+  214,  243,    0,    0,  243,    0,    0,    0,    0,    0,
+    0,    0,    0,  247,    0,  210,    0,   51,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  243,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  216,  223,  223,
+  223,  223,    0,    0,  223,  223,  223,  223,  223,  223,
+  223,  223,  223,  223,    0,    0,    0,    0,    0,    0,
+    0,    0,  223,  223,    0,  223,  223,  223,  223,  223,
+  223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+  223,  223,  223,  223,    0,    0,  223,  223,  223,  223,
+  223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+    0,   50,    0,    0,    0,  223,  223,  223,  223,  223,
+  223,  223,  223,  223,  223,  223,    0,    0,  223,  223,
+  223,  223,    0,    0,  223,  223,    0,  223,   50,    0,
+  223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+  223,  223,  223,  223,  223,    0,   51,    0,  223,  223,
+  223,  223,  223,  223,  223,  243,  243,  243,  243,    0,
+    0,  243,  243,  243,  243,  243,  243,  243,  243,  243,
+  243,    0,    0,   51,    0,    0,    0,    0,    0,  243,
+  243,    0,  243,  243,  243,  243,  243,  243,  243,  243,
+  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
+  243,    0,    0,  243,  243,  243,  243,  243,  243,  243,
+  243,  243,  243,  243,  243,  243,  243,   15,    0,    0,
+    0,    0,  243,  243,  243,  243,  243,  243,  243,  243,
+  243,  243,  243,  421,    0,  243,  243,  243,  243,  245,
+    0,  243,  243,    0,  243,    0,    0,  243,  243,  243,
+  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
+  243,  243,    0,    0,    0,  243,  243,  243,  243,  243,
+  243,  243,  245,    0,    0,    0,   15,    0,    0,  245,
+  245,    0,    0,  245,    0,    0,    0,    0,    0,    0,
+    0,    0,  202,  203,  204,  205,  206,  207,  245,  245,
+    0,  245,    0,    0,    0,    0,    0,    0,    0,    0,
+   15,    0,    0,  196,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  245,    0,    0,  245,    0,    0,    0,    0,
+    0,    0,   15,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  244,    0,    0,    0,
+    0,    0,    0,    0,  245,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  244,
+    0,    0,    0,    0,    0,    0,  244,  244,    0,    0,
+  244,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  244,  244,    0,  244,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  244,
+    0,    0,  244,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  196,    0,    0,    0,    0,    0,
+  196,  244,    0,    0,    0,  196,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  245,  245,  245,  245,
+    0,    0,  245,  245,  245,  245,  245,  245,  245,  245,
+  245,  245,    0,    0,    0,    0,    0,    0,    0,  196,
+  245,  245,    0,  245,  245,  245,  245,  245,  245,  245,
+  245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
+  245,  245,    0,    0,  245,  245,  245,  245,  245,  245,
+  245,  245,  245,  245,  245,  245,  245,  245,    0,    0,
+    0,    0,    0,  245,  245,  245,  245,  245,  245,  245,
+  245,  245,  245,  245,    0,    0,  245,  245,  245,  245,
+    0,    0,  245,  245,    0,  245,    0,    0,  245,  245,
+  245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
+  245,  245,  245,    0,    0,    0,  245,  245,  245,  245,
+  245,  245,  245,  244,  244,  244,  244,    0,    0,  244,
+  244,  244,  244,  244,  244,  244,  244,  244,  244,    0,
+    0,    0,    0,    0,    0,    0,    0,  244,  244,    0,
+  244,  244,  244,  244,  244,  244,  244,  244,  244,  244,
+  244,  244,  244,  244,  244,  244,  244,  244,  244,    0,
+    0,  244,  244,  244,  244,  244,  244,  244,  244,  244,
+  244,  244,  244,  244,  244,   16,    0,    0,    0,    0,
+  244,  244,  244,  244,  244,  244,  244,  244,  244,  244,
+  244,    0,    0,  244,  244,  244,  244,  242,    0,  244,
+  244,    0,  244,    0,    0,  244,  244,  244,  244,  244,
+  244,  244,  244,  244,  244,  244,  244,  244,  244,  244,
+    0,    0,    0,  244,  244,  244,  244,  244,  244,  244,
+  242,    0,    0,    0,   16,    0,    0,  242,  242,    0,
+    0,  242,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  242,  242,    0,  242,
+    0,    0,    0,    0,    0,    0,    0,    0,   16,    0,
+    0,  197,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  242,    0,    0,  242,    0,    0,    0,    0,    0,    0,
+   16,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  151,    0,    0,    0,    0,    0,
+    0,    0,  242,    0,    0,    0,    0,    0,   59,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  151,    0,    0,
+    0,    0,    0,    0,  151,  151,    0,  151,  151,  151,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   59,
+    0,    0,   59,  151,    0,    0,  151,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   59,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  151,    0,    0,
+  151,    0,    0,    0,    0,    0,    0,  215,    0,    0,
+    0,   59,  213,  211,    0,  212,    0,  214,    0,    0,
+    0,    0,  197,    0,    0,    0,    0,    0,  197,  151,
+  247,    0,  210,  197,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   59,  242,  242,  242,  242,    0,    0,
+  242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+    0,    0,    0,    0,  216,    0,    0,  197,  242,  242,
+    0,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+  242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+    0,    0,  242,  242,  242,  242,  242,  242,  242,  242,
+  242,  242,  242,  242,  242,  242,    0,    0,    0,    0,
+    0,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+  242,  242,    0,    0,  242,  242,  242,  242,    0,    0,
+  242,  242,    0,  242,    0,    0,  242,  242,  242,  242,
+  242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+  242,    0,    0,    0,  242,  242,  242,  242,  242,  242,
+  242,  151,  151,  151,  151,    0,    0,  151,    0,  151,
+  151,  151,  151,  151,  151,  151,  151,    0,    0,    0,
+    0,    0,   59,    0,    0,  151,  151,    0,  151,  151,
+  151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+  151,  151,  151,  151,  151,  151,    0,    0,    0,   59,
+  151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+  151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+  151,  151,  151,  151,  151,  151,  151,  151,  151,    0,
+    0,  151,  151,  151,  151,  247,    0,  151,  151,    0,
+    0,    0,    0,    0,    0,    0,    0,  389,    0,  151,
+  151,  151,  151,  151,  151,  151,  151,  151,   59,    0,
+    0,  151,  151,  151,  151,  151,  151,  151,  247,    0,
+    0,    0,    0,    0,    0,  247,  247,    0,    0,  247,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  247,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  202,
+  203,  204,  205,  206,  207,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  247,    0,
+    0,  247,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  246,    0,    0,    0,    0,    0,    0,    0,
+  247,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  246,    0,    0,    0,    0,
+    0,    0,  246,  246,    0,    0,  246,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  246,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  246,    0,    0,  246,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  246,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  247,  247,  247,  247,    0,    0,  247,  247,
+  247,  247,  247,  247,  247,  247,  247,  247,    0,    0,
+    0,    0,    0,    0,    0,    0,  247,  247,    0,  247,
+  247,  247,  247,  247,  247,  247,  247,  247,  247,  247,
+  247,  247,  247,  247,  247,  247,  247,  247,    0,    0,
+  247,  247,  247,  247,  247,  247,  247,  247,  247,  247,
+  247,  247,  247,  247,    0,    0,    0,    0,    0,  247,
+  247,  247,  247,  247,  247,  247,  247,  247,  247,  247,
+    0,    0,  247,  247,  247,  247,    0,    0,  247,  247,
+    0,  247,    0,    0,  247,  247,  247,  247,    0,    0,
+  247,  247,  247,  247,  247,  247,  247,  247,  247,    0,
+    0,    0,  247,  247,  247,  247,  247,  247,  247,  246,
+  246,  246,  246,    0,    0,  246,  246,  246,  246,  246,
+  246,  246,  246,  246,  246,    0,    0,    0,    0,    0,
+    0,    0,    0,  246,  246,    0,  246,  246,  246,  246,
+  246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
+  246,  246,  246,  246,  246,    0,    0,  246,  246,  246,
+  246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
+  246,    0,    0,    0,    0,    0,  246,  246,  246,  246,
+  246,  246,  246,  246,  246,  246,  246,    0,    0,  246,
+  246,  246,  246,  152,    0,  246,  246,    0,  246,    0,
+    0,  246,  246,  246,  246,    0,    0,  246,  246,  246,
+  246,  246,  246,  246,  246,  246,    0,    0,    0,  246,
+  246,  246,  246,  246,  246,  246,  152,    0,    0,    0,
+    0,    0,    0,  152,  152,    0,  152,  152,  152,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  152,    0,    0,  152,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   55,    0,    0,    0,    0,    0,  152,    0,    0,  152,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  248,    0,    0,    0,    0,    0,    0,    0,  152,    0,
+    0,   55,    0,    0,   55,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   55,
+    0,    0,    0,  248,    0,    0,    0,    0,    0,    0,
+  248,  248,    0,    0,  248,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  248,
+    0,    0,    0,   55,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  248,    0,   55,  248,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  248,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  152,  152,  152,  152,    0,    0,  152,    0,  152,  152,
+  152,  152,  152,  152,  152,  152,    0,    0,    0,    0,
+    0,    0,    0,    0,  152,  152,    0,  152,  152,  152,
+  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
+  152,  152,  152,  152,  152,    0,    0,    0,    0,  152,
+  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
+  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
+  152,  152,  152,  152,  152,  152,  152,  152,    0,    0,
+  152,  152,  152,  152,    0,    0,  152,  152,    0,    0,
+    0,    0,    0,    0,   55,    0,    0,    0,  152,  152,
+  152,  152,  152,  152,  152,  152,  152,    0,    0,    0,
+  152,  152,  152,  152,  152,  152,  152,  248,  248,  248,
+  248,   55,    0,  248,  248,  248,  248,  248,  248,  248,
+  248,  248,  248,    0,    0,    0,    0,    0,    0,    0,
+    0,  248,  248,    0,  248,  248,  248,  248,  248,  248,
+  248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
+  248,  248,  248,    0,    0,  248,  248,  248,  248,  248,
+  248,  248,  248,  248,  248,  248,  248,  248,  248,   55,
+   55,    0,    0,    0,  248,  248,  248,  248,  248,  248,
+  248,  248,  248,  248,  248,    0,    0,  248,  248,  248,
+  248,  249,    0,  248,  248,    0,  248,    0,    0,  248,
+  248,    0,    0,    0,    0,  248,  248,  248,  248,  248,
+  248,  248,  248,  248,    0,    0,    0,  248,  248,  248,
+  248,  248,  248,  248,  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,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  248,    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,  138,    0,
+    0,    0,    0,    0,    0,    0,  249,    0,    0,    0,
+    0,    0,  248,    0,    0,  248,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  248,  138,    0,    0,    0,    0,    0,    0,  138,  138,
+    0,  138,  138,  138,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  138,    0,    0,
+  138,    0,    0,    0,  248,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  138,    0,    0,  138,    0,  248,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  138,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  249,  249,
+  249,  249,    0,    0,  249,  249,  249,  249,  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,    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,    0,  249,    0,    0,
+    0,  249,    0,    0,    0,  248,  249,  249,  249,  249,
+  249,  249,  249,  249,  249,    0,    0,    0,  249,  249,
+  249,  249,  249,  249,  249,  138,  138,  138,  138,    0,
+    0,  138,  248,  138,  138,  138,  138,  138,  138,  138,
+  138,    0,    0,  248,    0,    0,  248,    0,    0,  138,
+  138,    0,  138,  138,  138,  138,  138,  138,  138,  138,
+  138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+    0,    0,    0,    0,  138,  138,  138,  138,  138,  138,
+  138,  138,  138,  138,  138,  138,  138,    0,    0,    0,
+  248,  248,  138,  138,  138,  138,  138,  138,  138,  138,
+  138,  138,  138,    0,    0,  138,  138,  138,  138,  143,
+    0,  138,  138,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  138,  138,  138,  138,  138,  138,  138,
+  138,  138,    0,    0,    0,  138,  138,  138,  138,  138,
+  138,  138,  143,    0,    0,    0,    0,    0,    0,  143,
+  143,    0,    0,  143,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  143,    0,
+    0,  143,    0,    0,    0,    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,  143,    0,    0,  143,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  147,    0,    0,    0,
+    0,    0,    0,    0,  143,    0,    0,    0,    0,    0,
+  249,    0,    0,  249,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  249,  147,
+    0,    0,    0,    0,    0,    0,  147,  147,    0,    0,
+  147,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  147,    0,    0,    0,    0,
+    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,  147,
+    0,    0,  147,    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,  147,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  143,  143,  143,  143,
+    0,    0,  143,    0,  143,  143,  143,  143,  143,  143,
+  143,  143,    0,    0,    0,    0,    0,    0,    0,    0,
+  143,  143,    0,  143,  143,  143,  143,  143,  143,  143,
+  143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
+  143,    0,    0,    0,    0,  143,  143,  143,  143,  143,
+  143,  143,  143,  143,  143,  143,  143,  143,    0,    0,
+    0,    0,    0,  143,  143,  143,  143,  143,  143,  143,
+  143,  143,  143,  143,    0,    0,  143,  143,  143,  143,
+    0,    0,  143,  143,    0,   32,    0,    0,    0,    0,
+    0,    0,    0,  249,  143,  143,  143,  143,  143,  143,
+  143,  143,  143,    0,    0,    0,  143,  143,  143,  143,
+  143,  143,  143,  147,  147,  147,  147,   33,    0,  147,
+  249,  147,  147,  147,  147,  147,  147,  147,  147,    0,
+    0,  249,    0,    0,  249,    0,    0,  147,  147,    0,
+  147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+  147,  147,  147,  147,  147,  147,  147,  147,    0,    0,
+    0,    0,  147,  147,  147,  147,  147,  147,  147,  147,
+  147,  147,  147,  147,  147,    0,    0,    0,    0,  249,
+  147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+  147,    0,    0,  147,  147,  147,  147,   91,    0,  147,
+  147,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+    0,    0,    0,  147,  147,  147,  147,  147,  147,  147,
+   91,    0,    0,    0,    0,    0,    0,   91,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    6,    7,    0,    8,    9,   91,    0,    0,    0,
+    0,    0,    0,   10,   11,   12,   13,   14,   15,   16,
+   17,   18,   19,   20,   21,    0,    0,   22,    0,    0,
+    0,    0,    0,    0,   58,    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,   93,    0,    0,    0,    0,    0,
+    0,    0,   91,    0,    0,   58,    0,    0,   58,   23,
+    0,    0,    0,    0,    0,   24,   25,    0,    0,   26,
+    0,   27,    0,   58,    0,    0,    0,   93,    0,    0,
+    0,    0,    0,    0,   93,    0,    0,    0,   28,    0,
+   29,    0,    0,    0,    0,    0,    0,   30,   31,    0,
+    0,    0,    0,   93,    0,    0,    0,   58,    0,    0,
+    0,    0,    0,    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,   58,
+   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,   93,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   91,   91,   91,   91,    0,    0,
+   91,    0,   91,   91,   91,   91,   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,    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,    0,    0,    0,    0,    6,    0,   58,    0,
+    0,    0,   91,   91,   91,   91,   91,   91,   91,   91,
+   91,    0,    0,    0,   91,   91,   91,   91,   91,   91,
+   91,   93,   93,   93,   93,   58,    0,   93,    6,   93,
+   93,   93,   93,   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,    0,    0,    0,    0,
+    0,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+   93,   93,   93,    0,   58,    0,    0,    0,   93,   93,
+   93,   93,   93,   93,   93,   93,   93,   93,   93,    0,
+    0,   93,   93,   93,   93,   95,    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,   95,    0,
+    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    6,    6,   95,    6,    6,    0,    0,    0,
+    0,    0,    0,    0,    6,    6,    6,    6,    6,    6,
+    6,    6,    6,    6,    6,    6,    0,    0,    6,    0,
+    0,    0,   57,    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,   99,    0,    0,    0,    0,    0,    0,    0,
+   95,    0,    0,   57,    0,    0,   57,    0,    0,    0,
+    6,    0,    0,    0,    0,    0,    6,    6,    0,    0,
+    6,   57,    6,    0,    0,   99,    0,    0,    0,    0,
+    0,    0,   99,    0,    0,    0,    0,    0,    0,    6,
+    0,    6,    0,    0,    0,    0,    0,    0,    6,    6,
+    0,   99,    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,   99,    0,   57,   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,
+    0,    0,   95,   95,   95,   95,    0,    0,   95,    0,
+   95,   95,   95,   95,   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,    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,
+    0,    0,    0,    0,    0,    0,   57,    0,    0,    0,
+   95,   95,   95,   95,   95,   95,   95,   95,   95,    0,
+    0,    0,   95,   95,   95,   95,   95,   95,   95,   99,
+   99,   99,   99,   57,    0,   99,    0,   99,   99,   99,
+   99,   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,    0,    0,    0,    0,    0,   99,
+   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+   99,    0,   57,    0,    0,    0,   99,   99,   99,   99,
+   99,   99,   99,   99,   99,   99,   99,    0,    0,   99,
+   99,   99,   99,   97,    0,   99,   99,    0,    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,   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,
+   87,    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,   87,    0,    0,    0,    0,    0,    0,
+   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    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,    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,    0,
+    0,    0,    0,    0,    0,   87,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   97,   97,   97,   97,    0,    0,   97,    0,   97,   97,
+   97,   97,   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,    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,   87,   87,   87,
+   87,    0,    0,   87,    0,   87,   87,   87,   87,   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,    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,   88,    0,   87,   87,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   87,   87,   87,   87,   87,
+   87,   87,   87,   87,    0,    0,    0,   87,   87,   87,
+   87,   87,   87,   87,   88,    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,
+   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,   89,    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,   89,    0,    0,    0,    0,    0,    0,   89,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    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,
+    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,    0,    0,    0,
+    0,    0,    0,   89,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   88,   88,
+   88,   88,    0,    0,   88,    0,   88,   88,   88,   88,
+   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,    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,    0,    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,   89,   89,   89,   89,    0,
+    0,   89,    0,   89,   89,   89,   89,   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,
+    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,   90,
+    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,   90,    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,   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,  100,    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,  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,    0,    0,    0,    0,    0,
+    0,  100,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   90,   90,   90,   90,
+    0,    0,   90,    0,   90,   90,   90,   90,   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,    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,    0,    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,  100,  100,  100,  100,    0,    0,  100,
+    0,  100,  100,  100,  100,  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,    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,  101,    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,
+  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,  102,    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,  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,    0,    0,    0,    0,    0,    0,  102,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  101,  101,  101,  101,    0,    0,
+  101,    0,  101,  101,  101,  101,  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,    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,    0,    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,  102,  102,  102,  102,    0,    0,  102,    0,  102,
+  102,  102,  102,  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,    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,  104,    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,  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,  109,    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,  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,    0,    0,    0,    0,    0,    0,  109,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  104,  104,  104,  104,    0,    0,  104,    0,
+  104,  104,  104,  104,  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,    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,
+    0,    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,  109,
+  109,  109,  109,    0,    0,  109,    0,  109,  109,  109,
+  109,  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,    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,  111,    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,  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,
+  118,    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,  118,    0,    0,    0,    0,    0,    0,
+  118,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  118,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  118,    0,    0,  118,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  118,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  111,  111,  111,  111,    0,    0,  111,    0,  111,  111,
+  111,  111,  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,    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,    0,    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,  118,  118,  118,
+  118,    0,    0,  118,    0,  118,  118,  118,  118,  118,
+  118,  118,  118,    0,    0,    0,    0,    0,    0,    0,
+    0,  118,  118,    0,  118,  118,  118,  118,  118,  118,
+  118,  118,  118,  118,  118,  118,  118,  118,  118,  118,
+  118,  118,    0,    0,    0,    0,    0,  118,  118,  118,
+  118,  118,  118,  118,  118,  118,  118,  118,  118,    0,
+    0,    0,    0,    0,  118,  118,  118,  118,  118,  118,
+  118,  118,  118,  118,  118,    0,    0,  118,  118,  118,
+  118,  131,    0,  118,  118,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  118,  118,  118,  118,  118,
+  118,  118,  118,  118,    0,    0,    0,  118,  118,  118,
+  118,  118,  118,  118,  131,    0,    0,    0,    0,    0,
+    0,  131,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  131,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  131,    0,    0,  131,    0,    0,
+    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,  131,    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,    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,    0,    0,    0,
+    0,    0,    0,  113,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  131,  131,
+  131,  131,    0,    0,  131,    0,  131,  131,  131,  131,
+  131,  131,  131,  131,    0,    0,    0,    0,    0,    0,
+    0,    0,  131,  131,    0,  131,  131,  131,  131,  131,
+  131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+  131,  131,  131,    0,    0,    0,    0,    0,  131,  131,
+  131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+    0,    0,    0,    0,    0,  131,  131,  131,  131,  131,
+  131,  131,  131,  131,  131,  131,    0,    0,  131,  131,
+  131,  131,    0,    0,  131,  131,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  131,  131,  131,  131,
+  131,  131,  131,  131,  131,    0,    0,    0,  131,  131,
+  131,  131,  131,  131,  131,  113,  113,  113,  113,    0,
+    0,  113,    0,  113,  113,  113,  113,  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,
+    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,  174,
+    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,  174,    0,    0,    0,    0,    0,    0,  174,
+    0,    0,    0,  174,  174,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  174,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  174,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  149,    0,    0,    0,
+    0,    0,    0,    0,  174,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  149,
+    0,    0,    0,    0,    0,    0,  149,  149,    0,  149,
+  149,  149,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  149,    0,    0,  149,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  149,
+    0,    0,  149,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  149,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  174,  174,  174,
+    0,    0,    0,    0,  174,  174,  174,    0,  174,  174,
+  174,  174,    0,    0,    0,    0,    0,    0,    0,    0,
+  174,  174,    0,  174,  174,  174,  174,  174,  174,  174,
+  174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
+  174,    0,    0,    0,    0,    0,  174,  174,  174,  174,
+  174,  174,  174,  174,  174,  174,  174,  174,    0,    0,
+    0,    0,    0,  174,  174,  174,  174,  174,  174,  174,
+  174,  174,  174,  174,    0,    0,  174,  174,  174,  174,
+    0,    0,  174,  174,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  174,  174,  174,  174,  174,  174,
+  174,  174,  174,    0,    0,    0,  174,  174,  174,  174,
+  174,  174,  174,  149,  149,  149,  149,    0,    0,  149,
+    0,  149,  149,  149,  149,  149,  149,  149,  149,    0,
+    0,    0,    0,    0,    0,    0,    0,  149,  149,    0,
+  149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+  149,  149,  149,  149,  149,  149,  149,  149,  154,    0,
+    0,    0,  149,  149,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  149,  149,  149,  149,  149,
+  149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+  149,  154,    0,    0,    0,    0,    0,    0,  154,  149,
+  149,  154,    0,  154,  154,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  154,    0,    0,
+    0,    0,    0,  149,  149,  149,  149,  149,  149,  149,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  154,  175,    0,  154,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  154,    0,  175,    0,    0,    0,    0,
+    0,    0,  175,  175,    0,    0,  175,  175,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  175,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  242,    0,    0,    0,  175,    0,    0,  175,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  242,    0,    0,  175,    0,    0,
+    0,  242,  242,    0,    0,  242,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  242,  242,    0,  242,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  154,  154,  154,  154,    0,
+    0,  154,    0,  154,  154,  154,  154,  154,  154,  154,
+  154,    0,    0,    0,  242,    0,    0,  242,    0,  154,
+  154,    0,  154,  154,  154,  154,  154,  154,  154,  154,
+  154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
+    0,    0,    0,    0,   43,  154,  242,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  154,  154,  154,
+  154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
+  154,  154,  154,    0,    0,    0,    0,   43,    0,    0,
+    0,  154,  154,    0,   43,    0,    0,    0,    0,  175,
+  175,  175,  175,    0,    0,  175,    0,  175,  175,  175,
+  175,  175,  175,   43,    0,  154,  154,  154,  154,  154,
+  154,  154,    0,  175,  175,    0,  175,  175,  175,  175,
+  175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+  175,  175,  175,  175,    0,    0,    0,   43,    0,  175,
+   43,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  175,  175,  175,  175,
+  175,  175,  175,  175,  175,  175,  175,    0,    0,   43,
+    0,    0,    0,    0,    0,  175,  175,    0,  242,  242,
+  242,  242,    0,    0,  242,    0,    0,    0,    0,  242,
+    0,    0,  242,  242,    0,    0,    0,   98,    0,  175,
+  175,  175,  175,  175,  175,  175,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  242,  242,
+  242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+    0,    0,    0,    0,    0,  242,  242,  242,  242,  242,
+  242,  242,  242,  242,  242,  242,   98,    0,  242,  242,
+  242,  242,    0,    0,    0,    0,    0,    0,    0,    0,
+  242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+  242,  242,  242,  242,  242,    0,    0,    0,    0,    0,
+   98,    0,    0,    0,  242,    0,    0,    0,    0,    0,
+    0,   43,   43,   43,   43,    0,    0,   43,    0,    0,
+    0,    0,   43,    0,    0,   43,   43,    0,    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,    0,    0,    0,    0,    0,    0,    0,
+    0,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+   43,   43,   43,    0,    0,    0,    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,   45,    0,    0,    0,    0,   43,    0,   45,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   45,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   98,    0,    0,
+    0,    0,   98,   98,   98,    0,   98,   98,   98,   98,
+    0,    0,   45,    0,    0,   45,    0,    0,   98,   98,
+    0,   98,   98,   98,   98,   98,   98,   98,   98,   98,
+   98,   98,   98,   98,   98,   98,   98,   98,   98,  196,
+   96,    0,    0,    0,   45,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   98,   98,    0,    0,    0,    0,    0,  250,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   96,
+    0,    0,    0,    0,   98,   98,   98,   98,   98,   98,
+   98,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  250,    0,    0,    0,  250,  250,
+  250,  250,  250,   96,  250,    0,    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,   92,    0,    0,    0,   96,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   45,   45,   45,   45,
+  250,    0,   45,    0,    0,    0,    0,   45,    0,    0,
+   45,   45,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  250,    0,    0,    0,    0,    0,    0,    0,
+   92,    0,    0,    0,    0,   94,   45,   45,   45,   45,
+   45,   45,   45,   45,   45,   45,   45,   45,    0,    0,
+    0,    0,    0,   45,   45,   45,   45,   45,   45,   45,
+   45,   45,   45,   45,   92,    0,   45,   45,   45,   45,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   45,   45,   45,   45,   45,   45,
+   45,   45,   45,    0,   94,    0,   92,    0,    0,  108,
+    0,    0,   45,    0,    0,    0,    0,    0,    0,    0,
+   96,    0,    0,    0,    0,   96,   96,   96,    0,   96,
+   96,   96,   96,    0,    0,    0,    0,    0,   94,    0,
+    0,   96,   96,    0,   96,   96,   96,   96,   96,   96,
+   96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
+   96,   96,  197,    0,    0,    0,    0,    0,  108,    0,
+   94,  250,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  250,    0,
+    0,    0,  108,   96,   96,    0,    0,    0,    0,  250,
+    0,    0,  250,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   96,   96,   96,
+   96,   96,   96,   96,  108,  110,    0,    0,    0,    0,
+    0,   92,    0,    0,    0,    0,   92,   92,   92,    0,
+   92,   92,   92,   92,    0,    0,  250,  250,  250,  250,
+  250,  250,   92,   92,    0,   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,    0,    0,  110,    0,    0,    0,    0,  117,
+    0,    0,    0,    0,    0,   94,    0,    0,    0,    0,
+   94,   94,   94,    0,   94,   94,   94,   94,    0,    0,
+    0,    0,    0,    0,   92,   92,   94,   94,  110,   94,
+   94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
+   94,   94,   94,   94,   94,   94,   94,    0,   92,   92,
+   92,   92,   92,   92,   92,    0,    0,    0,  117,    0,
+  110,    0,    0,  112,    0,    0,    0,    0,    0,  108,
+    0,    0,    0,    0,  108,  108,  108,    0,  108,  108,
+  108,  108,    0,    0,    0,    0,    0,    0,   94,   94,
+  108,  108,  117,  108,  108,  108,  108,  108,  108,  108,
+  108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+  108,    0,   94,   94,   94,   94,   94,   94,   94,    0,
+    0,    0,  112,    0,  117,    0,    0,    0,    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,    0,    0,  112,    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,    0,    0,    0,    0,    0,  112,    0,
+    0,    0,    0,    0,    0,  110,    0,    0,    0,    0,
+  110,  110,  110,    0,  110,  110,  110,  110,    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,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  117,
+    0,    0,    0,    0,  117,  117,  117,    0,  117,  117,
+  117,  117,    0,    0,    0,    0,    0,    0,  110,  110,
+  117,  117,    0,  117,  117,  117,  117,  117,  117,  117,
+  117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
+  117,    0,  110,  110,  110,  110,  110,  110,  110,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  112,    0,    0,    0,    0,  112,  112,
+  112,    0,  112,  112,  112,  112,    0,    0,    0,    0,
+    0,    0,  117,  117,  112,  112,   83,  112,  112,  112,
+  112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
+  112,  112,  112,  112,  112,    0,  117,  117,  117,  117,
+  117,  117,  117,    0,    0,    0,    0,    0,    0,   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,  112,  112,    0,    0,
+    0,    0,    0,    0,    0,    0,  154,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  112,  112,  112,  112,  112,  112,  112,    0,    0,   83,
+    0,    0,   83,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  154,
+    0,  154,  154,    0,    0,    0,    0,    0,    0,    0,
+    0,   83,    0,    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,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    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,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  154,    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,   92,    0,
+    0,    0,    0,   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,   83,   83,   83,    0,    0,    0,   83,
+    0,   83,   83,   83,   83,   83,   83,   83,   83,   32,
+    0,    0,    0,    0,   93,    0,    0,   83,   83,    0,
+   83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+   83,   83,   83,   83,   83,   83,   83,   83,    0,    0,
+    0,   33,    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,  154,  154,   83,
+   83,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+    0,    0,    0,   83,   83,   83,   83,   83,   83,    0,
+    0,    0,    0,    0,  154,  154,  154,  154,  154,  154,
+  154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  154,  154,  154,  154,    6,    0,    0,
+    0,    0,    0,    0,    6,    0,    0,    0,    0,    6,
+    0,  154,  154,  154,  154,  154,  154,  154,  154,  154,
+    0,    0,    0,    0,    0,  294,  295,   51,    8,    9,
+    0,   52,    0,    0,    0,    0,   53,   10,   11,  296,
+  297,   14,   15,   16,   17,   18,   19,   20,   21,    0,
+    0,   22,    0,    0,    0,    6,    0,    0,    0,    0,
+    6,    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,    6,    0,    0,
+    0,    0,   68,   69,   70,   71,   72,   73,   74,   75,
+   76,   77,   78,   23,    0,   79,   80,   81,   82,   24,
+   25,    0,    0,   26,    0,   27,    0,    0,    0,    0,
+    0,    0,    0,   83,   84,   85,   86,   87,   88,   89,
+   90,   91,   28,   95,   29,    0,    0,    0,    0,    0,
+  110,   30,   31,    0,    0,   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,    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,    0,    0,    0,
+    0,    6,    6,    6,    6,    6,    0,    6,    0,    0,
+    0,    0,    6,    6,    6,    6,    6,    6,    6,    6,
+    6,    6,    6,    6,    6,    0,    0,    6,    0,    0,
+  111,    0,    0,    0,    0,    0,    0,  110,  314,    0,
+    0,    0,   94,    0,    0,    0,    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,   93,    0,    0,    0,    0,    0,    6,
+    6,    6,    6,    6,    6,    6,    6,    6,    6,    0,
+    6,    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,    0,   49,   50,   51,
+    8,    0,    0,   52,    0,  126,  127,  128,   53,  129,
+  130,  131,  132,    0,    0,    0,    0,    0,    0,    0,
+    0,  133,  134,    0,  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,  275,    0,
+    0,    0,    0,    0,    0,   83,   84,   85,   86,   87,
+   88,   89,   90,   91,    0,    0,    0,  155,  156,  157,
+  158,  159,  160,   30,   49,   50,   51,    8,    0,    0,
+   52,    0,    0,    0,    0,   53,    0,    0,   54,   55,
+    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,   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,
+   30,    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,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    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,    0,    0,    0,    0,
+   53,    0,    0,   54,   55,  111,    0,    0,    0,    0,
+    0,    0,  110,    0,    0,    0,    0,   94,    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,   93,   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,   30,   49,   50,   51,    8,
+    0,    0,   52,    0,    0,    0,    0,   53,    0,    0,
+   54,   55,  111,    0,    0,    0,    0,    0,    0,   92,
+    0,    0,    0,    0,   94,    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,   93,   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,   30,    0,    0,    0,    0,    0,    0,   49,
+   50,   51,    8,    0,    0,   52,    0,    0,    0,    0,
+   53,    0,    0,   54,   55,  111,    0,    0,    0,    0,
+    0,    0,  282,    0,    0,    0,    0,   94,    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,   93,   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,   30,   49,   50,   51,    8,
+    0,    0,   52,    0,    0,    0,    0,   53,    0,    0,
+   54,   55,   95,    0,    0,    0,    0,    0,    0,  276,
+    0,    0,    0,    0,   94,  275,    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,   93,   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,   30,    0,    0,    0,    0,    0,    0,   49,
+   50,   51,    8,    0,    0,   52,    0,    0,    0,    0,
+   53,    0,    0,   54,   55,   95,    0,    0,    0,    0,
+    0,    0,  110,    0,  424,    0,    0,   94,    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,   93,   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,   30,  272,   50,   51,    0,
+    0,    0,  273,    0,    0,    0,    0,  274,    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,    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,   93,   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,    0,    0,    0,    0,    0,   49,
+   50,   51,    0,    0,    0,   52,    0,    0,    0,    0,
+   53,    0,    0,   54,   55,   95,    0,    0,    0,    0,
+    0,    0,   92,    0,    0,    0,    0,   94,    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,   93,   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,   49,   50,   51,    0,
+    0,    0,   52,    0,    0,    0,    0,   53,    0,    0,
+   54,   55,   95,    0,    0,    0,    0,    0,    0,  282,
+    0,    0,    0,    0,   94,    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,   93,   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,    0,    0,    0,    0,    0,   49,
+   50,   51,    0,    0,    0,   52,    0,    0,    0,    0,
+   53,    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,    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,   93,   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,   49,   50,   51,    0,
+    0,    0,   52,    0,    0,    0,    0,   53,    0,    0,
+   54,   55,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   41,    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,
+   32,    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,   33,    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,   49,
+   50,   51,    0,    0,    0,   52,    0,    0,    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,    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,    6,    7,    0,    8,
+    9,    0,    0,    0,    0,    0,    0,    0,   10,   11,
+   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
+    0,    0,   22,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    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,    0,    0,    0,    0,    0,
+    0,    0,    0,   28,    0,   29,    0,    0,    0,    0,
+    0,    0,   30,   31,
+};
+short yycheck[] = {                                      25,
+   44,   59,  125,   29,   43,   31,   45,    0,    0,    0,
+   37,   37,  260,  111,  260,   42,   43,   37,   45,  107,
+   47,  260,   42,   43,    0,   45,  100,   47,   43,  268,
+   45,   37,  120,   60,   59,   62,   42,   43,   92,   45,
+    0,   47,  165,    4,  105,   36,   41,   62,   43,   58,
+   45,   42,   61,   58,   60,   25,   62,   41,   61,   41,
+   44,   31,   44,   43,   25,   45,   92,   94,   94,   95,
+   31,  271,  272,   96,   94,  258,   37,   96,   43,   44,
+   45,  107,  258,   59,   40,  111,  348,  141,   94,   91,
+  336,   43,   44,   45,  120,  319,  320,  321,  322,  323,
+   93,   93,   61,  129,  130,  131,  132,  133,  134,  135,
+  136,  137,  138,  139,  140,  141,    0,   93,  144,  145,
+  146,  336,   92,  271,  272,  373,   43,   44,   45,  155,
+  156,   91,  125,  125,    0,   37,  262,  107,  272,  165,
+   42,   43,  276,   45,  218,   47,  107,  245,  246,  125,
+  120,  249,  250,  257,  258,  355,  356,  118,   60,  120,
+   62,  349,  350,  123,  125,   40,    0,  137,  138,  139,
+  140,  351,  352,  227,  228,   59,  202,  203,  204,  205,
+  206,  207,  208,  209,  210,  211,  212,  213,  214,  215,
+  216,  217,   94,   59,  102,  165,  157,  158,  159,   33,
+   40,  227,  228,  277,  165,   40,   40,  355,  356,   93,
+    0,   45,  273,  274,  258,   40,  242,  121,  122,  245,
+  246,  247,  276,  249,  250,   40,   40,   93,  282,   40,
+  364,  365,  140,   40,  257,    0,   40,   40,  257,  209,
+  263,  125,   40,   61,  263,  268,  291,  217,  260,  268,
+  276,  258,  262,   43,   41,   45,  282,   91,  260,  125,
+  394,   41,   96,  397,  264,   94,  268,  306,  303,   59,
+  393,  273,  274,  275,  276,  277,  278,   46,  280,  302,
+  257,   91,  302,    0,   93,  305,  125,   93,  262,  123,
+  251,  252,   41,  319,   59,  256,    0,  257,  258,  257,
+  260,  261,  363,   93,   41,  262,  276,   41,    0,  269,
+  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
+  280,   44,  349,  283,  351,  352,  353,  354,   93,   33,
+   41,   41,   44,   37,   41,  125,   40,   41,   42,   43,
+   44,   45,   59,   47,   44,  351,  352,  353,  354,  319,
+   41,   43,   41,   45,  304,   59,   60,  262,   62,  349,
+  125,  387,  388,  389,  272,  391,   44,   59,  276,  257,
+  305,  279,   41,   37,  260,  335,   93,  365,   42,   41,
+   41,  341,  342,   47,   41,  345,  262,  347,    0,   93,
+   41,  346,   96,  260,   27,  421,   31,   37,  424,  346,
+  346,   93,   42,   43,  364,   45,  366,   47,  125,  346,
+   43,  165,  399,  373,  374,   36,   -1,  387,  388,   -1,
+   60,  125,   62,  257,  258,  259,  260,  261,   -1,  263,
+   94,   -1,  393,  125,  268,  269,  270,  271,  272,  273,
+  274,  275,  276,  277,  278,  279,  280,   -1,   -1,  283,
+  260,  353,  354,   -1,   94,   -1,  364,  365,   -1,   -1,
+   93,   -1,   -1,  273,  274,  275,  276,  277,  278,   -1,
+  280,   -1,   -1,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,   -1,  394,   -1,   -1,  397,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+  334,  335,   -1,  337,  338,  339,  340,  341,  342,   -1,
+   -1,  345,   46,  347,   -1,   -1,   -1,   -1,   91,   -1,
+   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+  364,   -1,  366,   -1,  167,   -1,   -1,   -1,   -1,  373,
+  374,  174,  175,  176,  177,  178,  179,  180,  181,  182,
+  183,  184,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+  264,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,
+  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,    0,  337,  338,  339,  340,    0,   -1,  343,
+  344,   -1,  346,   -1,   -1,  349,  350,  351,  352,  353,
+  354,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+    0,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
+   33,   -1,   -1,   -1,   37,    0,   -1,   40,   41,   42,
+   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,
+   -1,   59,   -1,    0,   -1,   -1,   59,   60,   -1,   62,
+  273,  274,  275,  276,  277,  278,   -1,  280,   -1,  349,
+  350,  351,  352,  353,  354,   -1,   37,   -1,   -1,   59,
+   -1,   42,   43,   44,   45,   93,   47,   -1,   -1,   -1,
+   93,   -1,   -1,   96,   59,   -1,   -1,  271,  272,   60,
+   -1,   62,   -1,  376,   -1,   -1,   -1,  380,  381,   -1,
+   37,   -1,   59,   93,    0,   42,   43,  125,   45,   -1,
+   47,   -1,  125,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   -1,   -1,   94,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,  125,   93,   33,   -1,   -1,
+   -1,   37,   -1,   -1,   40,   41,   42,   43,   44,   45,
+  125,   47,   -1,  337,  338,  339,  340,   94,   -1,   -1,
+   -1,   -1,   -1,   59,   60,   -1,   62,   -1,  125,   -1,
+   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,   -1,   37,   -1,   -1,   -1,   -1,   42,
+   43,   -1,   45,   -1,   47,   -1,   -1,   93,   -1,   -1,
+   96,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62,
+   -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,   94,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
+  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+   -1,   -1,   46,   -1,   -1,   -1,   -1,   -1,  281,  282,
+   -1,  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,   46,   -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,  257,  258,  259,  260,   -1,   -1,  263,  264,  265,
+  266,  267,  268,  269,  270,  271,  272,   -1,  349,  350,
+  351,  352,  353,  354,   -1,  281,  282,   -1,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,  300,  301,  302,  260,   -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,    0,   -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,   33,   -1,
+   -1,   -1,   37,   -1,   -1,   40,   41,   42,   43,   44,
+   45,   -1,   47,   -1,   -1,   -1,  349,  350,  351,  352,
+  353,  354,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  373,   -1,   -1,   -1,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,  271,  272,   -1,
+   -1,   -1,   -1,  337,  338,  339,  340,   -1,   -1,   -1,
+   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,   -1,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,   33,   -1,   -1,   -1,   37,
+   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,   47,
+   -1,   -1,   -1,  337,  338,  339,  340,   -1,   -1,   -1,
+   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,
+   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+   -1,   -1,   37,   -1,   -1,   -1,   -1,   42,   43,   44,
+   45,   -1,   47,   -1,   -1,   93,   -1,   -1,   96,   -1,
+   -1,   -1,   -1,   37,   -1,   60,   -1,   62,   42,   43,
+   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   60,  125,   62,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,
+   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,  264,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   94,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  257,
+  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
+  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  281,  282,   -1,  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,    0,   -1,  343,  344,  302,  346,   -1,
+  305,  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,   33,   -1,   -1,   -1,
+   37,   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,
+   47,   -1,   -1,   -1,  349,  350,  351,  352,  353,  354,
+   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  349,  350,  351,  352,  353,
+  354,   -1,   -1,   37,   -1,   -1,   -1,   -1,   42,   43,
+   44,   45,   -1,   47,   -1,   -1,   93,   -1,   92,   96,
+   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   94,   -1,   -1,  137,  138,  139,  140,   -1,   -1,   -1,
+   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
+   40,   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,
+   -1,  165,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
+   60,   -1,   62,   37,   -1,   -1,   -1,   -1,   42,   43,
+   -1,   45,   -1,   47,   -1,   -1,   -1,   37,   -1,   -1,
+   -1,   -1,   42,   43,   44,   45,   60,   47,   62,   -1,
+   -1,   -1,   -1,   93,   -1,  209,   96,   -1,   -1,   37,
+   60,   -1,   62,  217,   42,   43,   -1,   45,   -1,   47,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   94,   -1,   60,   -1,   62,  125,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,  264,  265,  266,
+  267,  268,  269,  270,  271,  272,   94,   -1,   -1,   -1,
+   -1,   -1,  276,   -1,  281,  282,   -1,  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,  319,   -1,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
+  337,  338,  339,  340,   -1,   -1,  343,  344,  302,  346,
+   -1,  305,  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,  257,  258,  259,
+  260,   -1,   -1,  263,  264,  265,  266,  267,  268,  269,
+  270,  271,  272,  387,  388,  349,  350,  351,  352,  353,
+  354,  281,  282,   -1,  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,    0,  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,   33,  349,  350,  351,  352,  353,
+  354,   40,   41,   -1,   43,   44,   45,   -1,   -1,  349,
+  350,  351,  352,  353,  354,   -1,   -1,    0,   -1,   -1,
+   59,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  349,   -1,  351,  352,  353,  354,   -1,   -1,   -1,
+  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+  318,   -1,   -1,   -1,   93,   -1,   -1,   96,   41,   -1,
+   -1,   44,    0,   -1,   -1,   -1,   -1,   -1,   -1,  337,
+  338,  339,  340,   -1,   -1,   -1,   59,   -1,    0,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  125,  355,  356,  357,
+  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,
+   93,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,
+   -1,   59,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,
+   62,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,
+   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,
+   47,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   60,   -1,   62,   -1,  125,   -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,   94,  257,  258,
+  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,   -1,  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,  264,   -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,  291,   -1,
+  349,  350,  351,  352,  353,  354,  355,  356,  357,  358,
+  359,  360,  361,  362,  363,   -1,  264,   -1,  367,  368,
+  369,  370,  371,  372,  373,  257,  258,  259,  260,   -1,
+   -1,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,  291,   -1,   -1,   -1,   -1,   -1,  281,
+  282,   -1,  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,    0,   -1,   -1,
+   -1,   -1,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,  334,  290,   -1,  337,  338,  339,  340,    0,
+   -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,   33,   -1,   -1,   -1,   59,   -1,   -1,   40,
+   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  349,  350,  351,  352,  353,  354,   59,   60,
+   -1,   62,   -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,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
+   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -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,   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,   -1,   -1,   -1,  257,   -1,   -1,   -1,   -1,   -1,
+  263,  125,   -1,   -1,   -1,  268,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,
+   -1,   -1,  263,  264,  265,  266,  267,  268,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  302,
+  281,  282,   -1,  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,  257,  258,  259,  260,   -1,   -1,  263,
+  264,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,
+  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,    0,   -1,   -1,   -1,   -1,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+  334,   -1,   -1,  337,  338,  339,  340,    0,   -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,
+   33,   -1,   -1,   -1,   59,   -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,   93,   -1,
+   -1,   96,   -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,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,    0,   -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,   41,
+   -1,   -1,   44,   59,   -1,   -1,   62,   -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,   93,   -1,   -1,
+   96,   -1,   -1,   -1,   -1,   -1,   -1,   37,   -1,   -1,
+   -1,   93,   42,   43,   -1,   45,   -1,   47,   -1,   -1,
+   -1,   -1,  257,   -1,   -1,   -1,   -1,   -1,  263,  125,
+   60,   -1,   62,  268,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  125,  257,  258,  259,  260,   -1,   -1,
+  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+   -1,   -1,   -1,   -1,   94,   -1,   -1,  302,  281,  282,
+   -1,  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,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
+  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
+   -1,   -1,  264,   -1,   -1,  281,  282,   -1,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,  291,
+  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,    0,   -1,  343,  344,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  287,   -1,  355,
+  356,  357,  358,  359,  360,  361,  362,  363,  350,   -1,
+   -1,  367,  368,  369,  370,  371,  372,  373,   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,  349,
+  350,  351,  352,  353,  354,   -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,    0,   -1,   -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,   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,
+   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,  264,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  257,
+  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
+  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  281,  282,   -1,  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,    0,   -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,   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,
+    0,   -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,
+    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -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,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,
+  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  264,   -1,   -1,   -1,  355,  356,
+  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
+  367,  368,  369,  370,  371,  372,  373,  257,  258,  259,
+  260,  291,   -1,  263,  264,  265,  266,  267,  268,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,   -1,  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,  349,
+  350,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
+  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
+  340,    0,   -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,   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,    0,   -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,    0,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
+   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   59,   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,   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,   93,   -1,   -1,   96,   -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,  125,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,
+  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,   -1,  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,
+   -1,  350,   -1,   -1,   -1,  264,  355,  356,  357,  358,
+  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
+  369,  370,  371,  372,  373,  257,  258,  259,  260,   -1,
+   -1,  263,  291,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,  302,   -1,   -1,  305,   -1,   -1,  281,
+  282,   -1,  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,
+  349,  350,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,  334,   -1,   -1,  337,  338,  339,  340,    0,
+   -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,   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,    0,
+   -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,    0,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   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,   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,   93,
+   -1,   -1,   96,   -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,  125,   -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,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  281,  282,   -1,  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,   91,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  264,  355,  356,  357,  358,  359,  360,
+  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,
+  371,  372,  373,  257,  258,  259,  260,  123,   -1,  263,
+  291,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,  302,   -1,   -1,  305,   -1,   -1,  281,  282,   -1,
+  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,  350,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+  334,   -1,   -1,  337,  338,  339,  340,    0,   -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,
+   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  257,  258,   -1,  260,  261,   59,   -1,   -1,   -1,
+   -1,   -1,   -1,  269,  270,  271,  272,  273,  274,  275,
+  276,  277,  278,  279,  280,   -1,   -1,  283,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -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,    0,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  125,   -1,   -1,   41,   -1,   -1,   44,  335,
+   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,  345,
+   -1,  347,   -1,   59,   -1,   -1,   -1,   33,   -1,   -1,
+   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,  364,   -1,
+  366,   -1,   -1,   -1,   -1,   -1,   -1,  373,  374,   -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,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
+  263,   -1,  265,  266,  267,  268,  269,  270,  271,  272,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
+   -1,  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,  264,   -1,
+   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
+  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
+  373,  257,  258,  259,  260,  291,   -1,  263,  123,  265,
+  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  350,   -1,   -1,   -1,  324,  325,
+  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
+   -1,  337,  338,  339,  340,    0,   -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,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  257,  258,   59,  260,  261,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  269,  270,  271,  272,  273,  274,
+  275,  276,  277,  278,  279,  280,   -1,   -1,  283,   -1,
+   -1,   -1,    0,   -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,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   -1,
+  335,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,
+  345,   59,  347,   -1,   -1,   33,   -1,   -1,   -1,   -1,
+   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,  364,
+   -1,  366,   -1,   -1,   -1,   -1,   -1,   -1,  373,  374,
+   -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,
+   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  264,   -1,   -1,   -1,
+  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
+   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  257,
+  258,  259,  260,  291,   -1,  263,   -1,  265,  266,  267,
+  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  281,  282,   -1,  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,  350,   -1,   -1,   -1,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
+  338,  339,  340,    0,   -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,   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,
+    0,   -1,   -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,   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,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,
+  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  257,  258,  259,
+  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,   -1,  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,    0,   -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,   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,    0,   -1,
+   -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,   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,   -1,   -1,  257,  258,
+  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,   -1,  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,  257,  258,  259,  260,   -1,
+   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,   -1,  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,    0,
+   -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,   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,    0,   -1,   -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,   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,   -1,   -1,  257,  258,  259,  260,
+   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  281,  282,   -1,  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,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,
+  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,    0,   -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,
+   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,    0,   -1,   -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,   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,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
+  263,   -1,  265,  266,  267,  268,  269,  270,  271,  272,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
+   -1,  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,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
+  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,    0,   -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,   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,    0,   -1,   -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,   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,
+   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  257,
+  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
+  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  281,  282,   -1,  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,    0,   -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,   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,
+    0,   -1,   -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,   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,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,
+  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  281,  282,   -1,  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,  257,  258,  259,
+  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,   -1,  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,    0,   -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,   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,    0,   -1,
+   -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,   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,   -1,   -1,  257,  258,
+  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,   -1,  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,  257,  258,  259,  260,   -1,
+   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,   -1,  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,    0,
+   -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,   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,    0,   -1,   -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,   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,   -1,   -1,   -1,  258,  259,  260,
+   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  281,  282,   -1,  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,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,  301,    0,   -1,
+   -1,   -1,  306,  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,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,  343,
+  344,   43,   -1,   45,   46,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
+   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   93,    0,   -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,   33,   -1,   -1,   -1,   -1,
+   -1,   -1,   40,   41,   -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,    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,   -1,   -1,   -1,   33,   -1,   -1,  125,   -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,  257,  258,  259,  260,   -1,
+   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,  281,
+  282,   -1,  284,  285,  286,  287,  288,  289,  290,  291,
+  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
+   -1,   -1,   -1,   -1,    0,  307,  125,   -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,   -1,   33,   -1,   -1,
+   -1,  343,  344,   -1,   40,   -1,   -1,   -1,   -1,  257,
+  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
+  268,  269,  270,   59,   -1,  367,  368,  369,  370,  371,
+  372,  373,   -1,  281,  282,   -1,  284,  285,  286,  287,
+  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
+  298,  299,  300,  301,   -1,   -1,   -1,   93,   -1,  307,
+   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  125,
+   -1,   -1,   -1,   -1,   -1,  343,  344,   -1,  257,  258,
+  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,
+   -1,   -1,  271,  272,   -1,   -1,   -1,    0,   -1,  367,
+  368,  369,  370,  371,  372,  373,   -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,   59,   -1,  337,  338,
+  339,  340,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -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,  373,   -1,   -1,   -1,   -1,   -1,
+   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,   -1,
+   -1,   -1,  268,   -1,   -1,  271,  272,   -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,   -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,    0,
+   -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,   33,   -1,   -1,   -1,   -1,  373,   -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,  260,   -1,   -1,
+   -1,   -1,  265,  266,  267,   -1,  269,  270,  271,  272,
+   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,  281,  282,
+   -1,  284,  285,  286,  287,  288,  289,  290,  291,  292,
+  293,  294,  295,  296,  297,  298,  299,  300,  301,  302,
+    0,   -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,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  343,  344,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
+   -1,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
+  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   37,   -1,   -1,   -1,   41,   42,
+   43,   44,   45,   93,   47,   -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,    0,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,
+   93,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   -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,
+   59,   -1,   -1,   -1,   -1,    0,  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,   93,   -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,   59,   -1,  125,   -1,   -1,    0,
+   -1,   -1,  373,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  260,   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,  281,  282,   -1,  284,  285,  286,  287,  288,  289,
+  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
+  300,  301,  302,   -1,   -1,   -1,   -1,   -1,   59,   -1,
+  125,  264,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  291,   -1,
+   -1,   -1,   93,  343,  344,   -1,   -1,   -1,   -1,  302,
+   -1,   -1,  305,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  367,  368,  369,
+  370,  371,  372,  373,  125,    0,   -1,   -1,   -1,   -1,
+   -1,  260,   -1,   -1,   -1,   -1,  265,  266,  267,   -1,
+  269,  270,  271,  272,   -1,   -1,  349,  350,  351,  352,
+  353,  354,  281,  282,   -1,  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,   59,   -1,   -1,   -1,   -1,    0,
+   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,
+  265,  266,  267,   -1,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,  343,  344,  281,  282,   93,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,  301,   -1,  367,  368,
+  369,  370,  371,  372,  373,   -1,   -1,   -1,   59,   -1,
+  125,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  260,
+   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,  343,  344,
+  281,  282,   93,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  301,   -1,  367,  368,  369,  370,  371,  372,  373,   -1,
+   -1,   -1,   59,   -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,   -1,  343,  344,   -1,   -1,   93,   -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,   -1,   -1,   -1,   -1,   -1,  125,   -1,
+   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,
+  265,  266,  267,   -1,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,  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,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,
+   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,  343,  344,
+  281,  282,   -1,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  301,   -1,  367,  368,  369,  370,  371,  372,  373,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,  265,  266,
+  267,   -1,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,  343,  344,  281,  282,    0,  284,  285,  286,
+  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
+  297,  298,  299,  300,  301,   -1,  367,  368,  369,  370,
+  371,  372,  373,   -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,  343,  344,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  367,  368,  369,  370,  371,  372,  373,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   43,
+   -1,   45,   46,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -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,   -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,  257,  258,  259,   -1,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   91,
+   -1,   -1,   -1,   -1,   96,   -1,   -1,  281,  282,   -1,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,  301,   -1,   -1,
+   -1,  123,   -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,  271,  272,  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,   -1,
+   -1,   -1,   -1,   -1,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,  319,  320,  321,  322,  323,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  337,  338,  339,  340,   33,   -1,   -1,
+   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,
+   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,
+   -1,  263,   -1,   -1,   -1,   -1,  268,  269,  270,  271,
+  272,  273,  274,  275,  276,  277,  278,  279,  280,   -1,
+   -1,  283,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,
+   96,   -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,  123,   -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,   33,  366,   -1,   -1,   -1,   -1,   -1,
+   40,  373,  374,   -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,   -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,   -1,   -1,   -1,
+   -1,  257,  258,  259,  260,  261,   -1,  263,   -1,   -1,
+   -1,   -1,  268,  269,  270,  271,  272,  273,  274,  275,
+  276,  277,  278,  279,  280,   -1,   -1,  283,   -1,   -1,
+   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -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,  335,
+   -1,  337,  338,  339,  340,  341,  342,   -1,   -1,  345,
+   -1,  347,   -1,   96,   -1,   -1,   -1,   -1,   -1,  355,
+  356,  357,  358,  359,  360,  361,  362,  363,  364,   -1,
+  366,   -1,   -1,   -1,   -1,   -1,   -1,  373,  374,   -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,   -1,  265,  266,  267,  268,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,   -1,  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,  257,  258,  259,  260,   -1,   -1,
+  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,  271,  272,
+   -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,   -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,
+  373,   -1,   -1,   -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,   -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,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   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,  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,   96,  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,  373,  257,  258,  259,  260,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   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,  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,   96,  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,  373,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   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,  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,   96,  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,  373,  257,  258,  259,  260,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
+   -1,   -1,   -1,   -1,   45,   46,   -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,   96,  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,  373,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   33,   -1,   -1,   -1,   -1,
+   -1,   -1,   40,   -1,   42,   -1,   -1,   45,   -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,   96,  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,  373,  257,  258,  259,   -1,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   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,  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,   96,  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,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,   -1,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   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,  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,   96,  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,  257,  258,  259,   -1,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   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,  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,   96,  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,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,   -1,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   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,  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,   96,  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,  257,  258,  259,   -1,
+   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
+  271,  272,   -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,  307,  308,  309,  310,
+  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
+   91,   -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,  123,   -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,  257,
+  258,  259,   -1,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -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,  257,  258,   -1,  260,
+  261,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  269,  270,
+  271,  272,  273,  274,  275,  276,  277,  278,  279,  280,
+   -1,   -1,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -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,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  364,   -1,  366,   -1,   -1,   -1,   -1,
+   -1,   -1,  373,  374,
+};
+#define YYFINAL 2
+#ifndef YYDEBUG
+#define YYDEBUG 0
+#endif
+#define YYMAXTOKEN 376
+#if YYDEBUG
+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","UP","DOWN","LEFT","RIGHT","BOX",
+"CIRCLE","ELLIPSE","ARC","LINE","ARROW","MOVE","SPLINE","HEIGHT","RADIUS",
+"FIGNAME","WIDTH","DIAMETER","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","ALIGNED","SPRINTF","COMMAND",
+"DEFINE","UNDEF",
+};
+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 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_not_place : 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 '<' 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",
+};
+#endif
+#ifdef YYSTACKSIZE
+#undef YYMAXDEPTH
+#define YYMAXDEPTH YYSTACKSIZE
+#else
+#ifdef YYMAXDEPTH
+#define YYSTACKSIZE YYMAXDEPTH
+#else
+#define YYSTACKSIZE 500
+#define YYMAXDEPTH 500
+#endif
+#endif
+int yydebug;
+int yynerrs;
+int yyerrflag;
+int yychar;
+short *yyssp;
+YYSTYPE *yyvsp;
+YYSTYPE yyval;
+YYSTYPE yylval;
+short yyss[YYSTACKSIZE];
+YYSTYPE yyvs[YYSTACKSIZE];
+#define yystacksize YYSTACKSIZE
+#line 1610 "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;
+    }
+  lex_error("`%1' is not a predefined variable", nm);
+}
+
+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);
+}
+
+// called after each parse
+
+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());
+}
+#line 3729 "y.tab.c"
+#define YYABORT goto yyabort
+#define YYREJECT goto yyabort
+#define YYACCEPT goto yyaccept
+#define YYERROR goto yyerrlab
+int
+#if defined(__STDC__)
+yyparse(void)
+#else
+yyparse()
+#endif
+{
+    register int yym, yyn, yystate;
+#if YYDEBUG
+    register char *yys;
+    extern char *getenv();
+
+    if (yys = getenv("YYDEBUG"))
+    {
+        yyn = *yys;
+        if (yyn >= '0' && yyn <= '9')
+            yydebug = yyn - '0';
+    }
+#endif
+
+    yynerrs = 0;
+    yyerrflag = 0;
+    yychar = (-1);
+
+    yyssp = yyss;
+    yyvsp = yyvs;
+    *yyssp = yystate = 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 >= yyss + yystacksize - 1)
+        {
+            goto yyoverflow;
+        }
+        *++yyssp = yystate = yytable[yyn];
+        *++yyvsp = yylval;
+        yychar = (-1);
+        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;
+#ifdef lint
+    goto yynewerror;
+#endif
+yynewerror:
+    yyerror("syntax error");
+#ifdef lint
+    goto yyerrlab;
+#endif
+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 >= yyss + yystacksize - 1)
+                {
+                    goto yyoverflow;
+                }
+                *++yyssp = yystate = 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 = (-1);
+        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];
+    yyval = yyvsp[1-yym];
+    switch (yyn)
+    {
+case 2:
+#line 279 "pic.y"
+{
+		  if (olist.head)
+		    print_picture(olist.head);
+		}
+break;
+case 3:
+#line 288 "pic.y"
+{ yyval.pl = yyvsp[-1].pl; }
+break;
+case 4:
+#line 293 "pic.y"
+{ yyval.pl = yyvsp[0].pl; }
+break;
+case 5:
+#line 295 "pic.y"
+{ yyval.pl = yyvsp[-2].pl; }
+break;
+case 10:
+#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 318 "pic.y"
+{
+		  define_variable(yyvsp[-2].str, yyvsp[0].x);
+		  a_delete yyvsp[-2].str;
+		}
+break;
+case 12:
+#line 323 "pic.y"
+{
+		  place *p = lookup_label(yyvsp[-3].str);
+		  if (!p) {
+		    lex_error("variable `%1' not defined", yyvsp[-3].str);
+		    YYABORT;
+		  }
+		  p->obj = 0;
+		  p->x = yyvsp[0].x;
+		  p->y = 0.0;
+		  a_delete yyvsp[-3].str;
+		}
+break;
+case 13:
+#line 335 "pic.y"
+{ current_direction = UP_DIRECTION; }
+break;
+case 14:
+#line 337 "pic.y"
+{ current_direction = DOWN_DIRECTION; }
+break;
+case 15:
+#line 339 "pic.y"
+{ current_direction = LEFT_DIRECTION; }
+break;
+case 16:
+#line 341 "pic.y"
+{ current_direction = RIGHT_DIRECTION; }
+break;
+case 17:
+#line 343 "pic.y"
+{
+		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
+						   yyvsp[0].lstr.lineno));
+		}
+break;
+case 18:
+#line 348 "pic.y"
+{
+		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
+						   yyvsp[0].lstr.lineno));
+		}
+break;
+case 19:
+#line 353 "pic.y"
+{
+		  fprintf(stderr, "%s\n", yyvsp[0].lstr.str);
+		  a_delete yyvsp[0].lstr.str;
+		  fflush(stderr);
+		}
+break;
+case 20:
+#line 359 "pic.y"
+{ delim_flag = 1; }
+break;
+case 21:
+#line 361 "pic.y"
+{
+		  delim_flag = 0;
+		  if (safer_flag)
+		    lex_error("unsafe to run command `%1'", yyvsp[0].str);
+		  else
+		    system(yyvsp[0].str);
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 22:
+#line 370 "pic.y"
+{
+		  if (yychar < 0)
+		    do_lookahead();
+		  do_copy(yyvsp[0].lstr.str);
+		  /* do not delete the filename*/
+		}
+break;
+case 23:
+#line 377 "pic.y"
+{ delim_flag = 2; }
+break;
+case 24:
+#line 379 "pic.y"
+{ delim_flag = 0; }
+break;
+case 25:
+#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 390 "pic.y"
+{ delim_flag = 2; }
+break;
+case 27:
+#line 392 "pic.y"
+{ delim_flag = 0; }
+break;
+case 28:
+#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 402 "pic.y"
+{ delim_flag = 1; }
+break;
+case 30:
+#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); 
+		}
+break;
+case 31:
+#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 419 "pic.y"
+{ delim_flag = 1; }
+break;
+case 33:
+#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);
+		  else
+		    push_body(yyvsp[0].str);
+		  a_delete yyvsp[-3].if_data.body;
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 35:
+#line 434 "pic.y"
+{ define_variable("scale", 1.0); }
+break;
+case 38:
+#line 444 "pic.y"
+{
+		  reset(yyvsp[0].str);
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 39:
+#line 449 "pic.y"
+{
+		  reset(yyvsp[0].str);
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 40:
+#line 454 "pic.y"
+{
+		  reset(yyvsp[0].str);
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 41:
+#line 462 "pic.y"
+{ yyval.lstr = yyvsp[0].lstr; }
+break;
+case 42:
+#line 464 "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;
+		  }
+		  else if (yyvsp[0].lstr.filename) {
+		    yyval.lstr.filename = yyvsp[0].lstr.filename;
+		    yyval.lstr.lineno = yyvsp[0].lstr.lineno;
+		  }
+		}
+break;
+case 43:
+#line 483 "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 490 "pic.y"
+{ yyval.lstr = yyvsp[0].lstr; }
+break;
+case 45:
+#line 492 "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 502 "pic.y"
+{ delim_flag = 1; }
+break;
+case 47:
+#line 504 "pic.y"
+{
+		  delim_flag = 0;
+		  yyval.if_data.x = yyvsp[-3].x;
+		  yyval.if_data.body = yyvsp[0].str;
+		}
+break;
+case 48:
+#line 513 "pic.y"
+{ yyval.str = 0; }
+break;
+case 49:
+#line 515 "pic.y"
+{ yyval.str = yyvsp[0].lstr.str; }
+break;
+case 50:
+#line 520 "pic.y"
+{ yyval.x = yyvsp[0].x; }
+break;
+case 51:
+#line 522 "pic.y"
+{ yyval.x = yyvsp[0].x; }
+break;
+case 52:
+#line 527 "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 533 "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 539 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
+break;
+case 55:
+#line 541 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
+break;
+case 56:
+#line 543 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
+break;
+case 57:
+#line 545 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
+break;
+case 58:
+#line 547 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
+break;
+case 59:
+#line 549 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
+break;
+case 60:
+#line 551 "pic.y"
+{ yyval.x = (yyvsp[0].x == 0.0); }
+break;
+case 61:
+#line 557 "pic.y"
+{
+		  yyval.by.val = 1.0;
+		  yyval.by.is_multiplicative = 0;
+		}
+break;
+case 62:
+#line 562 "pic.y"
+{
+		  yyval.by.val = yyvsp[0].x;
+		  yyval.by.is_multiplicative = 0;
+		}
+break;
+case 63:
+#line 567 "pic.y"
+{
+		  yyval.by.val = yyvsp[0].x;
+		  yyval.by.is_multiplicative = 1;
+		}
+break;
+case 64:
+#line 575 "pic.y"
+{
+		  yyval.pl.obj = yyvsp[0].spec->make_object(&current_position,
+					   &current_direction);
+		  if (yyval.pl.obj == 0)
+		    YYABORT;
+		  delete yyvsp[0].spec;
+		  if (yyval.pl.obj)
+		    olist.append(yyval.pl.obj);
+		  else {
+		    yyval.pl.x = current_position.x;
+		    yyval.pl.y = current_position.y;
+		  }
+		}
+break;
+case 65:
+#line 589 "pic.y"
+{
+		  yyval.pl = yyvsp[0].pl;
+		  define_label(yyvsp[-3].str, & yyval.pl);
+		  a_delete yyvsp[-3].str;
+		}
+break;
+case 66:
+#line 595 "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 603 "pic.y"
+{
+		  yyval.pl = yyvsp[0].pl;
+		  define_label(yyvsp[-3].str, & yyval.pl);
+		  a_delete yyvsp[-3].str;
+		}
+break;
+case 68:
+#line 609 "pic.y"
+{
+		  yyval.state.x = current_position.x;
+		  yyval.state.y = current_position.y;
+		  yyval.state.dir = current_direction;
+		}
+break;
+case 69:
+#line 615 "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 621 "pic.y"
+{
+		  yyval.pl = yyvsp[-3].pl;
+		}
+break;
+case 71:
+#line 625 "pic.y"
+{
+		  yyval.pl.obj = 0;
+		  yyval.pl.x = current_position.x;
+		  yyval.pl.y = current_position.y;
+		}
+break;
+case 72:
+#line 634 "pic.y"
+{}
+break;
+case 73:
+#line 636 "pic.y"
+{}
+break;
+case 74:
+#line 641 "pic.y"
+{ yyval.spec = new object_spec(BOX_OBJECT); }
+break;
+case 75:
+#line 643 "pic.y"
+{ yyval.spec = new object_spec(CIRCLE_OBJECT); }
+break;
+case 76:
+#line 645 "pic.y"
+{ yyval.spec = new object_spec(ELLIPSE_OBJECT); }
+break;
+case 77:
+#line 647 "pic.y"
+{
+		  yyval.spec = new object_spec(ARC_OBJECT);
+		  yyval.spec->dir = current_direction;
+		}
+break;
+case 78:
+#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 79:
+#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 80:
+#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 81:
+#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 82:
+#line 680 "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 83:
+#line 685 "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 84:
+#line 690 "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 697 "pic.y"
+{
+		  saved_state *p = new saved_state;
+		  yyval.pstate = p;
+		  p->x = current_position.x;
+		  p->y = current_position.y;
+		  p->dir = current_direction;
+		  p->tbl = current_table;
+		  p->prev = current_saved_state;
+		  current_position.x = 0.0;
+		  current_position.y = 0.0;
+		  current_table = new PTABLE(place);
+		  current_saved_state = p;
+		  olist.append(make_mark_object());
+		}
+break;
+case 86:
+#line 712 "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 724 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->height = yyvsp[0].x;
+		  yyval.spec->flags |= HAS_HEIGHT;
+		}
+break;
+case 88:
+#line 730 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->radius = yyvsp[0].x;
+		  yyval.spec->flags |= HAS_RADIUS;
+		}
+break;
+case 89:
+#line 736 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->width = yyvsp[0].x;
+		  yyval.spec->flags |= HAS_WIDTH;
+		}
+break;
+case 90:
+#line 742 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->radius = yyvsp[0].x/2.0;
+		  yyval.spec->flags |= HAS_RADIUS;
+		}
+break;
+case 91:
+#line 748 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= HAS_SEGMENT;
+		  switch (yyval.spec->dir) {
+		  case UP_DIRECTION:
+		    yyval.spec->segment_pos.y += yyvsp[0].x;
+		    break;
+		  case DOWN_DIRECTION:
+		    yyval.spec->segment_pos.y -= yyvsp[0].x;
+		    break;
+		  case RIGHT_DIRECTION:
+		    yyval.spec->segment_pos.x += yyvsp[0].x;
+		    break;
+		  case LEFT_DIRECTION:
+		    yyval.spec->segment_pos.x -= yyvsp[0].x;
+		    break;
+		  }
+		}
+break;
+case 92:
+#line 767 "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 774 "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 781 "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 788 "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 795 "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 802 "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 809 "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 816 "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 823 "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 830 "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 845 "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 103:
+#line 857 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->flags |= HAS_WITH;
+		  yyval.spec->with = yyvsp[0].pth;
+		}
+break;
+case 104:
+#line 863 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].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 872 "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 879 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].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 = yyval.spec->segment_pos.y = 0.0;
+		    yyval.spec->segment_is_absolute = 0;
+		  }
+		}
+break;
+case 107:
+#line 891 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;	/* nothing*/
+		}
+break;
+case 108:
+#line 895 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_DOTTED;
+		  lookup_variable("dashwid", & yyval.spec->dash_width);
+		}
+break;
+case 109:
+#line 901 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->flags |= IS_DOTTED;
+		  yyval.spec->dash_width = yyvsp[0].x;
+		}
+break;
+case 110:
+#line 907 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_DASHED;
+		  lookup_variable("dashwid", & yyval.spec->dash_width);
+		}
+break;
+case 111:
+#line 913 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->flags |= IS_DASHED;
+		  yyval.spec->dash_width = yyvsp[0].x;
+		}
+break;
+case 112:
+#line 919 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_DEFAULT_FILLED;
+		}
+break;
+case 113:
+#line 924 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->flags |= IS_FILLED;
+		  yyval.spec->fill = yyvsp[0].x;
+		}
+break;
+case 114:
+#line 930 "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 115:
+#line 937 "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 116:
+#line 946 "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 117:
+#line 953 "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 118:
+#line 969 "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 119:
+#line 986 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_SAME;
+		}
+break;
+case 120:
+#line 991 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_INVISIBLE;
+		}
+break;
+case 121:
+#line 996 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= HAS_LEFT_ARROW_HEAD;
+		}
+break;
+case 122:
+#line 1001 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= HAS_RIGHT_ARROW_HEAD;
+		}
+break;
+case 123:
+#line 1006 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD);
+		}
+break;
+case 124:
+#line 1011 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_CLOCKWISE;
+		}
+break;
+case 125:
+#line 1016 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags &= ~IS_CLOCKWISE;
+		}
+break;
+case 126:
+#line 1021 "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 127:
+#line 1029 "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 128:
+#line 1039 "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 129:
+#line 1049 "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;
+		  }
+		}
+break;
+case 130:
+#line 1059 "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;
+		  }
+		}
+break;
+case 131:
+#line 1069 "pic.y"
+{
+		  yyval.spec = yyvsp[-2].spec;
+		  yyval.spec->flags |= HAS_THICKNESS;
+		  yyval.spec->thickness = yyvsp[0].x;
+		}
+break;
+case 132:
+#line 1075 "pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;
+		  yyval.spec->flags |= IS_ALIGNED;
+		}
+break;
+case 133:
+#line 1083 "pic.y"
+{ yyval.lstr = yyvsp[0].lstr; }
+break;
+case 134:
+#line 1085 "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 135:
+#line 1096 "pic.y"
+{
+		  yyval.dv.v = 0;
+		  yyval.dv.nv = 0;
+		  yyval.dv.maxv = 0;
+		}
+break;
+case 136:
+#line 1102 "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;
+		    }
+		    else {
+		      double *oldv = yyval.dv.v;
+		      yyval.dv.maxv *= 2;
+		      yyval.dv.v = new double[yyval.dv.maxv];
+		      memcpy(yyval.dv.v, oldv, yyval.dv.nv*sizeof(double));
+		      a_delete oldv;
+		    }
+		  }
+		  yyval.dv.v[yyval.dv.nv] = yyvsp[0].x;
+		  yyval.dv.nv += 1;
+		}
+break;
+case 137:
+#line 1124 "pic.y"
+{ yyval.pair = yyvsp[0].pair; }
+break;
+case 138:
+#line 1126 "pic.y"
+{
+		  position pos = yyvsp[0].pl;
+		  yyval.pair.x = pos.x;
+		  yyval.pair.y = pos.y;
+		}
+break;
+case 139:
+#line 1135 "pic.y"
+{ yyval.pair = yyvsp[0].pair; }
+break;
+case 140:
+#line 1137 "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 141:
+#line 1142 "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 142:
+#line 1147 "pic.y"
+{
+		  yyval.pair.x = yyvsp[-3].pair.x;
+		  yyval.pair.y = yyvsp[-1].pair.y;
+		}
+break;
+case 143:
+#line 1152 "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 144:
+#line 1157 "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 147:
+#line 1170 "pic.y"
+{
+		  yyval.pair.x = yyvsp[-2].x;
+		  yyval.pair.y = yyvsp[0].x;
+		}
+break;
+case 148:
+#line 1175 "pic.y"
+{ yyval.pair = yyvsp[-1].pair; }
+break;
+case 149:
+#line 1181 "pic.y"
+{ yyval.pl = yyvsp[0].pl; }
+break;
+case 150:
+#line 1183 "pic.y"
+{
+		  path pth(yyvsp[0].crn);
+		  if (!pth.follow(yyvsp[-1].pl, & yyval.pl))
+		    YYABORT;
+		}
+break;
+case 151:
+#line 1189 "pic.y"
+{
+		  path pth(yyvsp[-1].crn);
+		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
+		    YYABORT;
+		}
+break;
+case 152:
+#line 1195 "pic.y"
+{
+		  path pth(yyvsp[-2].crn);
+		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
+		    YYABORT;
+		}
+break;
+case 153:
+#line 1201 "pic.y"
+{
+		  yyval.pl.x = current_position.x;
+		  yyval.pl.y = current_position.y;
+		  yyval.pl.obj = 0;
+		}
+break;
+case 154:
+#line 1210 "pic.y"
+{
+		  place *p = lookup_label(yyvsp[0].str);
+		  if (!p) {
+		    lex_error("there is no place `%1'", yyvsp[0].str);
+		    YYABORT;
+		  }
+		  yyval.pl = *p;
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 155:
+#line 1220 "pic.y"
+{ yyval.pl.obj = yyvsp[0].obj; }
+break;
+case 156:
+#line 1222 "pic.y"
+{
+		  path pth(yyvsp[0].str);
+		  if (!pth.follow(yyvsp[-2].pl, & yyval.pl))
+		    YYABORT;
+		}
+break;
+case 157:
+#line 1231 "pic.y"
+{ yyval.n = yyvsp[0].n; }
+break;
+case 158:
+#line 1233 "pic.y"
+{
+		  /* XXX Check for overflow (and non-integers?).*/
+		  yyval.n = (int)yyvsp[-1].x;
+		}
+break;
+case 159:
+#line 1241 "pic.y"
+{ yyval.n = 1; }
+break;
+case 160:
+#line 1243 "pic.y"
+{ yyval.n = yyvsp[-1].n; }
+break;
+case 161:
+#line 1248 "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;
+		      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));
+		    YYABORT;
+		  }
+		}
+break;
+case 162:
+#line 1263 "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;
+		      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));
+		    YYABORT;
+		  }
+		}
+break;
+case 163:
+#line 1281 "pic.y"
+{ yyval.obtype = BOX_OBJECT; }
+break;
+case 164:
+#line 1283 "pic.y"
+{ yyval.obtype = CIRCLE_OBJECT; }
+break;
+case 165:
+#line 1285 "pic.y"
+{ yyval.obtype = ELLIPSE_OBJECT; }
+break;
+case 166:
+#line 1287 "pic.y"
+{ yyval.obtype = ARC_OBJECT; }
+break;
+case 167:
+#line 1289 "pic.y"
+{ yyval.obtype = LINE_OBJECT; }
+break;
+case 168:
+#line 1291 "pic.y"
+{ yyval.obtype = ARROW_OBJECT; }
+break;
+case 169:
+#line 1293 "pic.y"
+{ yyval.obtype = SPLINE_OBJECT; }
+break;
+case 170:
+#line 1295 "pic.y"
+{ yyval.obtype = BLOCK_OBJECT; }
+break;
+case 171:
+#line 1297 "pic.y"
+{ yyval.obtype = TEXT_OBJECT; }
+break;
+case 172:
+#line 1302 "pic.y"
+{ yyval.pth = new path(yyvsp[0].str); }
+break;
+case 173:
+#line 1304 "pic.y"
+{
+		  yyval.pth = yyvsp[-2].pth;
+		  yyval.pth->append(yyvsp[0].str);
+		}
+break;
+case 174:
+#line 1312 "pic.y"
+{ yyval.pth = new path(yyvsp[0].crn); }
+break;
+case 175:
+#line 1316 "pic.y"
+{ yyval.pth = yyvsp[0].pth; }
+break;
+case 176:
+#line 1318 "pic.y"
+{
+		  yyval.pth = yyvsp[-1].pth;
+		  yyval.pth->append(yyvsp[0].crn);
+		}
+break;
+case 177:
+#line 1326 "pic.y"
+{ yyval.pth = yyvsp[0].pth; }
+break;
+case 178:
+#line 1328 "pic.y"
+{
+		  yyval.pth = yyvsp[-3].pth;
+		  yyval.pth->set_ypath(yyvsp[-1].pth);
+		}
+break;
+case 179:
+#line 1334 "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;
+		}
+break;
+case 180:
+#line 1340 "pic.y"
+{
+		  lex_warning("`last %1' in `with' argument ignored",
+			      object_type_name(yyvsp[-1].obtype));
+		  yyval.pth = yyvsp[0].pth;
+		}
+break;
+case 181:
+#line 1346 "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;
+		}
+break;
+case 182:
+#line 1352 "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 183:
+#line 1361 "pic.y"
+{ yyval.crn = &object::north; }
+break;
+case 184:
+#line 1363 "pic.y"
+{ yyval.crn = &object::east; }
+break;
+case 185:
+#line 1365 "pic.y"
+{ yyval.crn = &object::west; }
+break;
+case 186:
+#line 1367 "pic.y"
+{ yyval.crn = &object::south; }
+break;
+case 187:
+#line 1369 "pic.y"
+{ yyval.crn = &object::north_east; }
+break;
+case 188:
+#line 1371 "pic.y"
+{ yyval.crn = &object:: south_east; }
+break;
+case 189:
+#line 1373 "pic.y"
+{ yyval.crn = &object::north_west; }
+break;
+case 190:
+#line 1375 "pic.y"
+{ yyval.crn = &object::south_west; }
+break;
+case 191:
+#line 1377 "pic.y"
+{ yyval.crn = &object::center; }
+break;
+case 192:
+#line 1379 "pic.y"
+{ yyval.crn = &object::start; }
+break;
+case 193:
+#line 1381 "pic.y"
+{ yyval.crn = &object::end; }
+break;
+case 194:
+#line 1383 "pic.y"
+{ yyval.crn = &object::north; }
+break;
+case 195:
+#line 1385 "pic.y"
+{ yyval.crn = &object::south; }
+break;
+case 196:
+#line 1387 "pic.y"
+{ yyval.crn = &object::west; }
+break;
+case 197:
+#line 1389 "pic.y"
+{ yyval.crn = &object::east; }
+break;
+case 198:
+#line 1391 "pic.y"
+{ yyval.crn = &object::north_west; }
+break;
+case 199:
+#line 1393 "pic.y"
+{ yyval.crn = &object::south_west; }
+break;
+case 200:
+#line 1395 "pic.y"
+{ yyval.crn = &object::north_east; }
+break;
+case 201:
+#line 1397 "pic.y"
+{ yyval.crn = &object::south_east; }
+break;
+case 202:
+#line 1399 "pic.y"
+{ yyval.crn = &object::west; }
+break;
+case 203:
+#line 1401 "pic.y"
+{ yyval.crn = &object::east; }
+break;
+case 204:
+#line 1403 "pic.y"
+{ yyval.crn = &object::north_west; }
+break;
+case 205:
+#line 1405 "pic.y"
+{ yyval.crn = &object::south_west; }
+break;
+case 206:
+#line 1407 "pic.y"
+{ yyval.crn = &object::north_east; }
+break;
+case 207:
+#line 1409 "pic.y"
+{ yyval.crn = &object::south_east; }
+break;
+case 208:
+#line 1411 "pic.y"
+{ yyval.crn = &object::north; }
+break;
+case 209:
+#line 1413 "pic.y"
+{ yyval.crn = &object::south; }
+break;
+case 210:
+#line 1415 "pic.y"
+{ yyval.crn = &object::east; }
+break;
+case 211:
+#line 1417 "pic.y"
+{ yyval.crn = &object::west; }
+break;
+case 212:
+#line 1419 "pic.y"
+{ yyval.crn = &object::center; }
+break;
+case 213:
+#line 1421 "pic.y"
+{ yyval.crn = &object::start; }
+break;
+case 214:
+#line 1423 "pic.y"
+{ yyval.crn = &object::end; }
+break;
+case 215:
+#line 1428 "pic.y"
+{
+		  if (!lookup_variable(yyvsp[0].str, & yyval.x)) {
+		    lex_error("there is no variable `%1'", yyvsp[0].str);
+		    YYABORT;
+		  }
+		  a_delete yyvsp[0].str;
+		}
+break;
+case 216:
+#line 1436 "pic.y"
+{ yyval.x = yyvsp[0].x; }
+break;
+case 217:
+#line 1438 "pic.y"
+{
+		  if (yyvsp[-1].pl.obj != 0)
+		    yyval.x = yyvsp[-1].pl.obj->origin().x;
+		  else
+		    yyval.x = yyvsp[-1].pl.x;
+		}
+break;
+case 218:
+#line 1445 "pic.y"
+{
+		  if (yyvsp[-1].pl.obj != 0)
+		    yyval.x = yyvsp[-1].pl.obj->origin().y;
+		  else
+		    yyval.x = yyvsp[-1].pl.y;
+		}
+break;
+case 219:
+#line 1452 "pic.y"
+{
+		  if (yyvsp[-1].pl.obj != 0)
+		    yyval.x = yyvsp[-1].pl.obj->height();
+		  else
+		    yyval.x = 0.0;
+		}
+break;
+case 220:
+#line 1459 "pic.y"
+{
+		  if (yyvsp[-1].pl.obj != 0)
+		    yyval.x = yyvsp[-1].pl.obj->width();
+		  else
+		    yyval.x = 0.0;
+		}
+break;
+case 221:
+#line 1466 "pic.y"
+{
+		  if (yyvsp[-1].pl.obj != 0)
+		    yyval.x = yyvsp[-1].pl.obj->radius();
+		  else
+		    yyval.x = 0.0;
+		}
+break;
+case 222:
+#line 1473 "pic.y"
+{ yyval.x = yyvsp[-2].x + yyvsp[0].x; }
+break;
+case 223:
+#line 1475 "pic.y"
+{ yyval.x = yyvsp[-2].x - yyvsp[0].x; }
+break;
+case 224:
+#line 1477 "pic.y"
+{ yyval.x = yyvsp[-2].x * yyvsp[0].x; }
+break;
+case 225:
+#line 1479 "pic.y"
+{
+		  if (yyvsp[0].x == 0.0) {
+		    lex_error("division by zero");
+		    YYABORT;
+		  }
+		  yyval.x = yyvsp[-2].x/yyvsp[0].x;
+		}
+break;
+case 226:
+#line 1487 "pic.y"
+{
+		  if (yyvsp[0].x == 0.0) {
+		    lex_error("modulus by zero");
+		    YYABORT;
+		  }
+		  yyval.x = fmod(yyvsp[-2].x, yyvsp[0].x);
+		}
+break;
+case 227:
+#line 1495 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = pow(yyvsp[-2].x, yyvsp[0].x);
+		  if (errno == EDOM) {
+		    lex_error("arguments to `^' operator out of domain");
+		    YYABORT;
+		  }
+		  if (errno == ERANGE) {
+		    lex_error("result of `^' operator out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 228:
+#line 1508 "pic.y"
+{ yyval.x = -yyvsp[0].x; }
+break;
+case 229:
+#line 1510 "pic.y"
+{ yyval.x = yyvsp[-1].x; }
+break;
+case 230:
+#line 1512 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = sin(yyvsp[-1].x);
+		  if (errno == ERANGE) {
+		    lex_error("sin result out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 231:
+#line 1521 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = cos(yyvsp[-1].x);
+		  if (errno == ERANGE) {
+		    lex_error("cos result out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 232:
+#line 1530 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = atan2(yyvsp[-3].x, yyvsp[-1].x);
+		  if (errno == EDOM) {
+		    lex_error("atan2 argument out of domain");
+		    YYABORT;
+		  }
+		  if (errno == ERANGE) {
+		    lex_error("atan2 result out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 233:
+#line 1543 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = log10(yyvsp[-1].x);
+		  if (errno == ERANGE) {
+		    lex_error("log result out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 234:
+#line 1552 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = pow(10.0, yyvsp[-1].x);
+		  if (errno == ERANGE) {
+		    lex_error("exp result out of range");
+		    YYABORT;
+		  }
+		}
+break;
+case 235:
+#line 1561 "pic.y"
+{
+		  errno = 0;
+		  yyval.x = sqrt(yyvsp[-1].x);
+		  if (errno == EDOM) {
+		    lex_error("sqrt argument out of domain");
+		    YYABORT;
+		  }
+		}
+break;
+case 236:
+#line 1570 "pic.y"
+{ yyval.x = yyvsp[-3].x > yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
+break;
+case 237:
+#line 1572 "pic.y"
+{ yyval.x = yyvsp[-3].x < yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
+break;
+case 238:
+#line 1574 "pic.y"
+{ yyval.x = floor(yyvsp[-1].x); }
+break;
+case 239:
+#line 1576 "pic.y"
+{ yyval.x = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*yyvsp[-1].x); }
+break;
+case 240:
+#line 1578 "pic.y"
+{
+		  /* return a random number in the range [0,1) */
+		  /* portable, but not very random */
+		  yyval.x = (rand() & 0x7fff) / double(0x8000);
+		}
+break;
+case 241:
+#line 1584 "pic.y"
+{
+		  yyval.x = 0;
+		  srand((unsigned int)yyvsp[-1].x);
+		}
+break;
+case 242:
+#line 1589 "pic.y"
+{ yyval.x = (yyvsp[-2].x < yyvsp[0].x); }
+break;
+case 243:
+#line 1591 "pic.y"
+{ yyval.x = (yyvsp[-2].x <= yyvsp[0].x); }
+break;
+case 244:
+#line 1593 "pic.y"
+{ yyval.x = (yyvsp[-2].x > yyvsp[0].x); }
+break;
+case 245:
+#line 1595 "pic.y"
+{ yyval.x = (yyvsp[-2].x >= yyvsp[0].x); }
+break;
+case 246:
+#line 1597 "pic.y"
+{ yyval.x = (yyvsp[-2].x == yyvsp[0].x); }
+break;
+case 247:
+#line 1599 "pic.y"
+{ yyval.x = (yyvsp[-2].x != yyvsp[0].x); }
+break;
+case 248:
+#line 1601 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
+break;
+case 249:
+#line 1603 "pic.y"
+{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
+break;
+case 250:
+#line 1605 "pic.y"
+{ yyval.x = (yyvsp[0].x == 0.0); }
+break;
+#line 5564 "y.tab.c"
+    }
+    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 >= yyss + yystacksize - 1)
+    {
+        goto yyoverflow;
+    }
+    *++yyssp = yystate;
+    *++yyvsp = yyval;
+    goto yyloop;
+yyoverflow:
+    yyerror("yacc stack overflow");
+yyabort:
+    return (1);
+yyaccept:
+    return (0);
+}
diff --git a/contrib/groff/src/preproc/pic/pic.h b/contrib/groff/src/preproc/pic/pic.h
index 0a092fe..166e4e7 100644
--- a/contrib/groff/src/preproc/pic/pic.h
+++ b/contrib/groff/src/preproc/pic/pic.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -31,6 +31,30 @@ extern "C" {
 }
 #endif /* NEED_DECLARATION_HYPOT */
 
+#ifdef NEED_DECLARATION_RAND
+#undef rand
+extern "C" {
+  int rand();
+}
+#endif /* NEED_DECLARATION_RAND */
+
+#ifdef NEED_DECLARATION_SRAND
+#undef srand
+extern "C" {
+#ifdef RET_TYPE_SRAND_IS_VOID
+  void srand(unsigned int);
+#else
+  int srand(unsigned int);
+#endif
+}
+#endif /* NEED_DECLARATION_SRAND */
+
+#ifndef HAVE_FMOD
+extern "C" {
+  double fmod(double, double);
+}
+#endif
+
 #include "assert.h"
 #include "cset.h"
 #include "stringclass.h"
@@ -102,3 +126,4 @@ extern int zero_length_line_flag;
 extern int driver_extension_flag;
 extern int compatible_flag;
 extern int safer_flag;
+extern char *graphname;
diff --git a/contrib/groff/src/preproc/pic/pic.man b/contrib/groff/src/preproc/pic/pic.man
index 406246f..c12e93a 100644
--- a/contrib/groff/src/preproc/pic/pic.man
+++ b/contrib/groff/src/preproc/pic/pic.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -25,8 +25,14 @@ the original English.
 .el .TP "\\$1"
 ..
 .
-.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
-.el   .ds tx TeX
+.ie t \{\
+.  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
+.  ds lx L\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\*(tx
+.\}
+.el \{\
+.  ds tx TeX
+.  ds lx LaTeX
+.\}
 .
 .ie \n(.g .ds ic \/
 .el       .ds ic \^
@@ -95,7 +101,7 @@ When the macro package being used does not supply such definitions
 (for example, old versions of \-ms),
 appropriate definitions can be obtained with
 .BR \-mpic :
-these will center each picture.
+These will center each picture.
 .
 .
 .SH OPTIONS
@@ -233,6 +239,9 @@ In \*(tx mode,
 will define a vbox called
 .B \egraph
 for each picture.
+Use the
+.B figname
+command to change the name of the vbox.
 You must yourself print that vbox using, for example, the command
 .RS
 .LP
@@ -240,8 +249,9 @@ You must yourself print that vbox using, for example, the command
 \ecenterline{\ebox\egraph}
 .RE
 .LP
-Actually, since the vbox has a height of zero this will produce
-slightly more vertical space above the picture than below it;
+Actually, since the vbox has a height of zero (it is defined with
+\evtop) this will produce slightly more vertical space above the
+picture than below it;
 .RS
 .LP
 .B
@@ -250,6 +260,21 @@ slightly more vertical space above the picture than below it;
 .LP
 would avoid this.
 .LP
+To make the vbox having a positive height and a depth of zero
+(as used e.g.\& by \*(lx's
+.BR \%graphics.sty ),
+define the following macro in your document:
+.RS
+.LP
+.B \edef\egpicbox#1{%
+.br
+.B "   \evbox{\eunvbox\ecsname #1\eendcsname\ekern 0pt}}"
+.RE
+.LP
+Now you can simply say
+.B \egpicbox{graph}
+instead of \ebox\egraph.
+.LP
 You must use a \*(tx driver that supports the
 .B tpic
 specials, version 2.
@@ -799,6 +824,24 @@ request (see the manual page of
 .BR @g@troff (@MAN1EXT@)
 for more details).
 .LP
+To change the name of the vbox in \*(tx mode, set the pseudo-variable
+.B figname
+(which is actually a specially parsed command) within a picture.
+Example:
+.RS
+.LP
+.B .PS
+.br
+.B figname = foobar;
+.br
+.B ...
+.br
+.B .PE
+.RE
+.LP
+The picture is then available in the box
+.BR \efoobar .
+.LP
 .B pic
 assumes that at the beginning of a picture both glyph and fill color are
 set to the default value.
diff --git a/contrib/groff/src/preproc/pic/pic.y b/contrib/groff/src/preproc/pic/pic.y
index 15b6b3f..2ee1dec 100644
--- a/contrib/groff/src/preproc/pic/pic.y
+++ b/contrib/groff/src/preproc/pic/pic.y
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -31,23 +31,6 @@ extern void do_for(char *var, double from, double to,
 		   int by_is_multiplicative, double by, char *body);
 extern void do_lookahead();
 
-#ifndef HAVE_FMOD
-extern "C" {
-  double fmod(double, double);
-}
-#endif
-
-#undef rand
-#undef srand
-extern "C" {
-  int rand();
-#ifdef RET_TYPE_SRAND_IS_VOID
-  void srand(unsigned int);
-#else
-  int srand(unsigned int);
-#endif
-}
-
 /* Maximum number of characters produced by printf("%g") */
 #define GDIGITS 14
 
@@ -125,6 +108,7 @@ char *do_sprintf(const char *form, const double *v, int nv);
 %token SPLINE
 %token HEIGHT
 %token RADIUS
+%token FIGNAME
 %token WIDTH
 %token DIAMETER
 %token UP
@@ -283,7 +267,7 @@ works */
 %type <pair> position
 %type <obtype> object_type
 %type <n> optional_ordinal_last ordinal
-%type <str> until
+%type <str> macro_name until
 %type <dv> sprintf_args
 %type <lstr> text print_args print_arg
 
@@ -322,6 +306,14 @@ separator:
 	;
 
 placeless_element:
+	FIGNAME '=' macro_name
+		{
+		  a_delete graphname;
+		  graphname = new char[strlen($3) + 1];
+		  strcpy(graphname, $3);
+		  a_delete $3;
+		}
+	|
 	VARIABLE '=' any_expr
 		{
 		  define_variable($1, $3);
@@ -442,6 +434,11 @@ placeless_element:
 		{ define_variable("scale", 1.0); }
 	;
 
+macro_name:
+	VARIABLE
+	| LABEL
+	;
+
 reset_variables:
 	RESET VARIABLE
 		{
@@ -1664,7 +1661,7 @@ place *lookup_label(const char *label)
 
 void define_label(const char *label, const place *pl)
 {
-  place *p = new place;
+  place *p = new place[1];
   *p = *pl;
   current_table->define(label, p);
 }
@@ -1681,7 +1678,7 @@ int lookup_variable(const char *name, double *val)
 
 void define_variable(const char *name, double val)
 {
-  place *p = new place;
+  place *p = new place[1];
   p->obj = 0;
   p->x = val;
   p->y = 0.0;
diff --git a/contrib/groff/src/preproc/pic/pic_tab.h b/contrib/groff/src/preproc/pic/pic_tab.h
index 10d97f1..12611ba 100644
--- a/contrib/groff/src/preproc/pic/pic_tab.h
+++ b/contrib/groff/src/preproc/pic/pic_tab.h
@@ -24,99 +24,100 @@
 #define SPLINE 280
 #define HEIGHT 281
 #define RADIUS 282
-#define WIDTH 283
-#define DIAMETER 284
-#define FROM 285
-#define TO 286
-#define AT 287
-#define WITH 288
-#define BY 289
-#define THEN 290
-#define SOLID 291
-#define DOTTED 292
-#define DASHED 293
-#define CHOP 294
-#define SAME 295
-#define INVISIBLE 296
-#define LJUST 297
-#define RJUST 298
-#define ABOVE 299
-#define BELOW 300
-#define OF 301
-#define THE 302
-#define WAY 303
-#define BETWEEN 304
-#define AND 305
-#define HERE 306
-#define DOT_N 307
-#define DOT_E 308
-#define DOT_W 309
-#define DOT_S 310
-#define DOT_NE 311
-#define DOT_SE 312
-#define DOT_NW 313
-#define DOT_SW 314
-#define DOT_C 315
-#define DOT_START 316
-#define DOT_END 317
-#define DOT_X 318
-#define DOT_Y 319
-#define DOT_HT 320
-#define DOT_WID 321
-#define DOT_RAD 322
-#define SIN 323
-#define COS 324
-#define ATAN2 325
-#define LOG 326
-#define EXP 327
-#define SQRT 328
-#define K_MAX 329
-#define K_MIN 330
-#define INT 331
-#define RAND 332
-#define SRAND 333
-#define COPY 334
-#define THRU 335
-#define TOP 336
-#define BOTTOM 337
-#define UPPER 338
-#define LOWER 339
-#define SH 340
-#define PRINT 341
-#define CW 342
-#define CCW 343
-#define FOR 344
-#define DO 345
-#define IF 346
-#define ELSE 347
-#define ANDAND 348
-#define OROR 349
-#define NOTEQUAL 350
-#define EQUALEQUAL 351
-#define LESSEQUAL 352
-#define GREATEREQUAL 353
-#define LEFT_CORNER 354
-#define RIGHT_CORNER 355
-#define NORTH 356
-#define SOUTH 357
-#define EAST 358
-#define WEST 359
-#define CENTER 360
-#define END 361
-#define START 362
-#define RESET 363
-#define UNTIL 364
-#define PLOT 365
-#define THICKNESS 366
-#define FILL 367
-#define COLORED 368
-#define OUTLINED 369
-#define SHADED 370
-#define ALIGNED 371
-#define SPRINTF 372
-#define COMMAND 373
-#define DEFINE 374
-#define UNDEF 375
+#define FIGNAME 283
+#define WIDTH 284
+#define DIAMETER 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 ALIGNED 372
+#define SPRINTF 373
+#define COMMAND 374
+#define DEFINE 375
+#define UNDEF 376
 typedef union {
 	char *str;
 	int n;
diff --git a/contrib/groff/src/preproc/pic/tex.cpp b/contrib/groff/src/preproc/pic/tex.cpp
new file mode 100644
index 0000000..dbebe46
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/tex.cpp
@@ -0,0 +1,446 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+
+#ifdef TEX_SUPPORT
+
+#include "common.h"
+
+class tex_output : public common_output {
+public:
+  tex_output();
+  ~tex_output();
+  void start_picture(double, const position &ll, const position &ur);
+  void finish_picture();
+  void text(const position &, text_piece *, int, double);
+  void line(const position &, const position *, int n,
+	    const line_type &);
+  void polygon(const position *, int n,
+	       const line_type &, double);
+  void spline(const position &, const position *, int n,
+	      const line_type &);
+  void arc(const position &, const position &, const position &,
+	   const line_type &);
+  void circle(const position &, double rad, const line_type &, double);
+  void ellipse(const position &, const distance &, const line_type &, double);
+  void command(const char *, const char *, int);
+  void set_color(char *, char *);
+  void reset_color();
+  char *get_last_filled();
+  char *get_outline_color();
+  int supports_filled_polygons();
+private:
+  position upper_left;
+  double height;
+  double width;
+  double scale;
+  double pen_size;
+
+  void point(const position &);
+  void dot(const position &, const line_type &);
+  void solid_arc(const position &cent, double rad, double start_angle,
+		 double end_angle, const line_type &lt);
+  position transform(const position &);
+protected:
+  virtual void set_pen_size(double ps);
+};
+
+// convert inches to milliinches
+
+inline int milliinches(double x)
+{
+  return int(x*1000.0 + .5);
+}
+
+inline position tex_output::transform(const position &pos)
+{
+  return position((pos.x - upper_left.x)/scale,
+		  (upper_left.y - pos.y)/scale);
+}
+
+output *make_tex_output()
+{
+  return new tex_output;
+}
+
+tex_output::tex_output()
+{
+}
+
+tex_output::~tex_output()
+{
+}
+
+const int DEFAULT_PEN_SIZE = 8;
+
+void tex_output::set_pen_size(double ps)
+{
+  if (ps < 0.0)
+    ps = -1.0;
+  if (ps != pen_size) {
+    pen_size = ps;
+    printf("    \\special{pn %d}%%\n", 
+	   ps < 0.0 ? DEFAULT_PEN_SIZE : int(ps*(1000.0/72.0) + .5));
+  }
+}
+
+void tex_output::start_picture(double sc, const position &ll,
+			       const position &ur)
+{
+  upper_left.x = ll.x;
+  upper_left.y = ur.y;
+  scale = compute_scale(sc, ll, ur);
+  height = (ur.y - ll.y)/scale;
+  width = (ur.x - ll.x)/scale;
+  /* The point of \vskip 0pt is to ensure that the vtop gets
+     a height of 0 rather than the height of the hbox; this
+     might be non-zero if text from text attributes lies outside pic's
+     idea of the bounding box of the picture. */
+  /* \newbox and \newdimen are defined with \outer in plain.tex and can't
+     be used directly in an \if clause. */
+  printf("\\expandafter\\ifx\\csname %s\\endcsname\\relax\n"
+	 "   \\csname newbox\\expandafter\\endcsname\\csname %s\\endcsname\n"
+	 "\\fi\n"
+	 "\\ifx\\graphtemp\\undefined\n"
+	 "  \\csname newdimen\\endcsname\\graphtemp\n"
+	 "\\fi\n"
+	 "\\expandafter\\setbox\\csname %s\\endcsname\n"
+	 " =\\vtop{\\vskip 0pt\\hbox{%%\n",
+	 graphname, graphname, graphname);
+  pen_size = -2.0;
+}
+
+void tex_output::finish_picture()
+{
+  printf("    \\hbox{\\vrule depth%.3fin width0pt height 0pt}%%\n"
+	 "    \\kern %.3fin\n"
+	 "  }%%\n"
+	 "}%%\n",
+	 height, width);
+}
+
+void tex_output::text(const position &center, text_piece *v, int n, double)
+{
+  position c = transform(center);
+  for (int i = 0; i < n; i++)
+    if (v[i].text != 0 && *v[i].text != '\0') {
+      int j = 2*i - n + 1;
+      if (v[i].adj.v == ABOVE_ADJUST)
+	j--;
+      else if (v[i].adj.v == BELOW_ADJUST)
+	j++;
+      if (j == 0) {
+	printf("    \\graphtemp=.5ex\n"
+	       "    \\advance\\graphtemp by %.3fin\n", c.y);
+      }
+      else {
+	printf("    \\graphtemp=\\baselineskip\n"
+	       "    \\multiply\\graphtemp by %d\n"
+	       "    \\divide\\graphtemp by 2\n"
+	       "    \\advance\\graphtemp by .5ex\n"
+	       "    \\advance\\graphtemp by %.3fin\n",
+	       j, c.y);
+      }
+      printf("    \\rlap{\\kern %.3fin\\lower\\graphtemp", c.x);
+      fputs("\\hbox to 0pt{", stdout);
+      if (v[i].adj.h != LEFT_ADJUST)
+	fputs("\\hss ", stdout);
+      fputs(v[i].text, stdout);
+      if (v[i].adj.h != RIGHT_ADJUST)
+	fputs("\\hss", stdout);
+      fputs("}}%\n", stdout);
+    }
+}
+
+void tex_output::point(const position &pos)
+{
+  position p = transform(pos);
+  printf("    \\special{pa %d %d}%%\n", milliinches(p.x), milliinches(p.y));
+}
+
+void tex_output::line(const position &start, const position *v, int n,
+		      const line_type &lt)
+{
+  set_pen_size(lt.thickness);
+  point(start);
+  for (int i = 0; i < n; i++)
+    point(v[i]);
+  fputs("    \\special{", stdout);
+  switch(lt.type) {
+  case line_type::invisible:
+    fputs("ip", stdout);
+    break;
+  case line_type::solid:
+    fputs("fp", stdout);
+    break;
+  case line_type::dotted:
+    printf("dt %.3f", lt.dash_width/scale);
+    break;
+  case line_type::dashed:
+    printf("da %.3f", lt.dash_width/scale);
+    break;
+  }
+  fputs("}%\n", stdout);
+}
+
+void tex_output::polygon(const position *v, int n,
+			 const line_type &lt, double fill)
+{
+  if (fill >= 0.0) {
+    if (fill > 1.0)
+      fill = 1.0;
+    printf("    \\special{sh %.3f}%%\n", fill);
+  }
+  line(v[n-1], v, n, lt);
+}
+
+void tex_output::spline(const position &start, const position *v, int n,
+			const line_type &lt)
+{
+  if (lt.type == line_type::invisible)
+    return;
+  set_pen_size(lt.thickness);
+  point(start);
+  for (int i = 0; i < n; i++)
+    point(v[i]);
+  fputs("    \\special{sp", stdout);
+  switch(lt.type) {
+  case line_type::solid:
+    break;
+  case line_type::dotted:
+    printf(" %.3f", -lt.dash_width/scale);
+    break;
+  case line_type::dashed:
+    printf(" %.3f", lt.dash_width/scale);
+    break;
+  case line_type::invisible:
+    assert(0);
+  }
+  fputs("}%\n", stdout);
+}
+
+void tex_output::solid_arc(const position &cent, double rad,
+			   double start_angle, double end_angle,
+			   const line_type &lt)
+{
+  set_pen_size(lt.thickness);
+  position c = transform(cent);
+  printf("    \\special{ar %d %d %d %d %f %f}%%\n",
+	 milliinches(c.x),
+	 milliinches(c.y),
+	 milliinches(rad/scale),
+	 milliinches(rad/scale),
+	 -end_angle,
+	 (-end_angle > -start_angle) ? (double)M_PI * 2 - start_angle
+	 			     : -start_angle);
+}
+  
+void tex_output::arc(const position &start, const position &cent,
+		     const position &end, const line_type &lt)
+{
+  switch (lt.type) {
+  case line_type::invisible:
+    break;
+  case line_type::dashed:
+    dashed_arc(start, cent, end, lt);
+    break;
+  case line_type::dotted:
+    dotted_arc(start, cent, end, lt);
+    break;
+  case line_type::solid:
+    {
+      position c;
+      if (!compute_arc_center(start, cent, end, &c)) {
+	line(start, &end, 1, lt);
+	break;
+      }
+      solid_arc(c,
+		hypot(cent - start),
+		atan2(start.y - c.y, start.x - c.x),
+		atan2(end.y - c.y, end.x - c.x),
+		lt);
+      break;
+    }
+  }
+}
+
+void tex_output::circle(const position &cent, double rad,
+			const line_type &lt, double fill)
+{
+  if (fill >= 0.0 && lt.type != line_type::solid) {
+    if (fill > 1.0)
+      fill = 1.0;
+    line_type ilt;
+    ilt.type = line_type::invisible;
+    ellipse(cent, position(rad*2.0, rad*2.0), ilt, fill);
+  }
+  switch (lt.type) {
+  case line_type::dashed:
+    dashed_circle(cent, rad, lt);
+    break;
+  case line_type::invisible:
+    break;
+  case line_type::solid:
+    ellipse(cent, position(rad*2.0,rad*2.0), lt, fill);
+    break;
+  case line_type::dotted:
+    dotted_circle(cent, rad, lt);
+    break;
+  default:
+    assert(0);
+  }
+}
+
+void tex_output::ellipse(const position &cent, const distance &dim,
+			 const line_type &lt, double fill)
+{
+  if (lt.type == line_type::invisible) {
+    if (fill < 0.0)
+      return;
+  }
+  else
+    set_pen_size(lt.thickness);
+  if (fill >= 0.0) {
+    if (fill > 1.0)
+      fill = 1.0;
+    printf("    \\special{sh %.3f}%%\n", fill);
+  }
+  position c = transform(cent);
+  printf("    \\special{%s %d %d %d %d 0 6.28319}%%\n",
+	 (lt.type == line_type::invisible ? "ia" : "ar"),
+	 milliinches(c.x),
+	 milliinches(c.y),
+	 milliinches(dim.x/(2.0*scale)),
+	 milliinches(dim.y/(2.0*scale)));
+}
+
+void tex_output::command(const char *s, const char *, int)
+{
+  fputs(s, stdout);
+  putchar('%');			// avoid unwanted spaces
+  putchar('\n');
+}
+
+int tex_output::supports_filled_polygons()
+{
+  return 1;
+}
+
+void tex_output::dot(const position &pos, const line_type &lt)
+{
+  if (zero_length_line_flag) {
+    line_type slt = lt;
+    slt.type = line_type::solid;
+    line(pos, &pos, 1, slt);
+  }
+  else {
+    int dot_rad = int(lt.thickness*(1000.0/(72.0*2)) + .5);
+    if (dot_rad == 0)
+      dot_rad = 1;
+    position p = transform(pos);
+    printf("    \\special{sh 1}%%\n"
+	   "    \\special{ia %d %d %d %d 0 6.28319}%%\n",
+	   milliinches(p.x), milliinches(p.y), dot_rad, dot_rad);
+  }
+}
+
+void tex_output::set_color(char *, char *)
+{
+  /* not implemented yet */
+}
+
+void tex_output::reset_color()
+{
+  /* not implemented yet */
+}
+
+char *tex_output::get_last_filled()
+{
+  /* not implemented yet */
+  return NULL;
+}
+
+char *tex_output::get_outline_color()
+{
+  /* not implemented yet */
+  return NULL;
+}
+
+class tpic_output : public tex_output {
+public:
+  tpic_output();
+  void command(const char *, const char *, int);
+private:
+  void set_pen_size(double ps);
+  int default_pen_size;
+  int prev_default_pen_size;
+};
+
+tpic_output::tpic_output()
+: default_pen_size(DEFAULT_PEN_SIZE), prev_default_pen_size(DEFAULT_PEN_SIZE)
+{
+}
+
+void tpic_output::command(const char *s, const char *filename, int lineno)
+{
+  assert(s[0] == '.');
+  if (s[1] == 'p' && s[2] == 's' && (s[3] == '\0' || !csalpha(s[3]))) {
+    const char *p = s + 3;
+    while (csspace(*p))
+      p++;
+    if (*p == '\0') {
+      int temp = default_pen_size;
+      default_pen_size = prev_default_pen_size;
+      prev_default_pen_size = temp;
+    }
+    else {
+      char *ptr;
+      int temp = (int)strtol(p, &ptr, 10);
+      if (temp == 0 && ptr == p)
+	error_with_file_and_line(filename, lineno,
+				 "argument to `.ps' not an integer");
+      else if (temp < 0)
+	error_with_file_and_line(filename, lineno,
+				 "negative pen size");
+      else {
+	prev_default_pen_size = default_pen_size;
+	default_pen_size = temp;
+      }
+    }
+  }
+  else
+    printf("\\%s%%\n", s + 1);
+}
+
+void tpic_output::set_pen_size(double ps)
+{
+  if (ps < 0.0)
+    printf("    \\special{pn %d}%%\n", default_pen_size);
+  else
+    tex_output::set_pen_size(ps);
+}
+
+output *make_tpic_output()
+{
+  return new tpic_output;
+}
+ 
+#endif
diff --git a/contrib/groff/src/preproc/pic/troff.cpp b/contrib/groff/src/preproc/pic/troff.cpp
new file mode 100644
index 0000000..cf8f5ee
--- /dev/null
+++ b/contrib/groff/src/preproc/pic/troff.cpp
@@ -0,0 +1,559 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "pic.h"
+#include "common.h"
+
+
+const double RELATIVE_THICKNESS = -1.0;
+const double BAD_THICKNESS = -2.0;
+
+class simple_output : public common_output {
+  virtual void simple_line(const position &, const position &) = 0;
+  virtual void simple_spline(const position &, const position *, int n) = 0;
+  virtual void simple_arc(const position &, const position &,
+			  const position &) = 0;
+  virtual void simple_circle(int, const position &, double rad) = 0;
+  virtual void simple_ellipse(int, const position &, const distance &) = 0;
+  virtual void simple_polygon(int, const position *, int) = 0;
+  virtual void line_thickness(double) = 0;
+  virtual void set_fill(double) = 0;
+  virtual void set_color(char *, char *) = 0;
+  virtual void reset_color() = 0;
+  virtual char *get_last_filled() = 0;
+  void dot(const position &, const line_type &) = 0;
+public:
+  void start_picture(double sc, const position &ll, const position &ur) = 0;
+  void finish_picture() = 0;
+  void text(const position &, text_piece *, int, double) = 0;
+  void line(const position &, const position *, int n,
+	    const line_type &);
+  void polygon(const position *, int n,
+	       const line_type &, double);
+  void spline(const position &, const position *, int n,
+	      const line_type &);
+  void arc(const position &, const position &, const position &,
+	   const line_type &);
+  void circle(const position &, double rad, const line_type &, double);
+  void ellipse(const position &, const distance &, const line_type &, double);
+  int supports_filled_polygons();
+};
+
+int simple_output::supports_filled_polygons()
+{
+  return driver_extension_flag != 0;
+}
+
+void simple_output::arc(const position &start, const position &cent,
+			const position &end, const line_type &lt)
+{
+  switch (lt.type) {
+  case line_type::solid:
+    line_thickness(lt.thickness);
+    simple_arc(start, cent, end);
+    break;
+  case line_type::invisible:
+    break;
+  case line_type::dashed:
+    dashed_arc(start, cent, end, lt);
+    break;
+  case line_type::dotted:
+    dotted_arc(start, cent, end, lt);
+    break;
+  }
+}
+
+void simple_output::line(const position &start, const position *v, int n,
+			 const line_type &lt)
+{
+  position pos = start;
+  line_thickness(lt.thickness);
+  for (int i = 0; i < n; i++) {
+    switch (lt.type) {
+    case line_type::solid:
+      simple_line(pos, v[i]);
+      break;
+    case line_type::dotted:
+      {
+	distance vec(v[i] - pos);
+	double dist = hypot(vec);
+	int ndots = int(dist/lt.dash_width + .5);
+	if (ndots == 0)
+	  dot(pos, lt);
+	else {
+	  vec /= double(ndots);
+	  for (int j = 0; j <= ndots; j++)
+	    dot(pos + vec*j, lt);
+	}
+      }
+      break;
+    case line_type::dashed:
+      {
+	distance vec(v[i] - pos);
+	double dist = hypot(vec);
+	if (dist <= lt.dash_width*2.0)
+	  simple_line(pos, v[i]);
+	else {
+	  int ndashes = int((dist - lt.dash_width)/(lt.dash_width*2.0) + .5);
+	  distance dash_vec = vec*(lt.dash_width/dist);
+	  double dash_gap = (dist - lt.dash_width)/ndashes;
+	  distance dash_gap_vec = vec*(dash_gap/dist);
+	  for (int j = 0; j <= ndashes; j++) {
+	    position s(pos + dash_gap_vec*j);
+	    simple_line(s, s + dash_vec);
+	  }
+	}
+      }
+      break;
+    case line_type::invisible:
+      break;
+    default:
+      assert(0);
+    }
+    pos = v[i];
+  }
+}
+
+void simple_output::spline(const position &start, const position *v, int n,
+			   const line_type &lt)
+{
+  line_thickness(lt.thickness);
+  simple_spline(start, v, n);
+}
+
+void simple_output::polygon(const position *v, int n,
+			    const line_type &lt, double fill)
+{
+  if (driver_extension_flag && ((fill >= 0.0) || (get_last_filled() != 0))) {
+    if (get_last_filled() == 0)
+      set_fill(fill);
+    simple_polygon(1, v, n);
+  }
+  if (lt.type == line_type::solid && driver_extension_flag) {
+    line_thickness(lt.thickness);
+    simple_polygon(0, v, n);
+  }
+  else if (lt.type != line_type::invisible) {
+    line_thickness(lt.thickness);
+    line(v[n - 1], v, n, lt);
+  }
+}
+
+void simple_output::circle(const position &cent, double rad,
+			   const line_type &lt, double fill)
+{
+  if (driver_extension_flag && ((fill >= 0.0) || (get_last_filled() != 0))) {
+    if (get_last_filled() == 0)
+      set_fill(fill);
+    simple_circle(1, cent, rad);
+  }
+  line_thickness(lt.thickness);
+  switch (lt.type) {
+  case line_type::invisible:
+    break;
+  case line_type::dashed:
+    dashed_circle(cent, rad, lt);
+    break;
+  case line_type::dotted:
+    dotted_circle(cent, rad, lt);
+    break;
+  case line_type::solid:
+    simple_circle(0, cent, rad);
+    break;
+  default:
+    assert(0);
+  }
+}
+
+void simple_output::ellipse(const position &cent, const distance &dim,
+			    const line_type &lt, double fill)
+{
+  if (driver_extension_flag && ((fill >= 0.0) || (get_last_filled() != 0))) {
+    if (get_last_filled() == 0)
+      set_fill(fill);
+    simple_ellipse(1, cent, dim);
+  }
+  if (lt.type != line_type::invisible)
+    line_thickness(lt.thickness);
+  switch (lt.type) {
+  case line_type::invisible:
+    break;
+  case line_type::dotted:
+  case line_type::dashed:
+  case line_type::solid:
+    simple_ellipse(0, cent, dim);
+    break;
+  default:
+    assert(0);
+  }
+}
+
+class troff_output : public simple_output {
+  const char *last_filename;
+  position upper_left;
+  double height;
+  double scale;
+  double last_line_thickness;
+  double last_fill;
+  char *last_filled;		// color
+  char *last_outlined;		// color
+public:
+  troff_output();
+  ~troff_output();
+  void start_picture(double, const position &ll, const position &ur);
+  void finish_picture();
+  void text(const position &, text_piece *, int, double);
+  void dot(const position &, const line_type &);
+  void command(const char *, const char *, int);
+  void set_location(const char *, int);
+  void simple_line(const position &, const position &);
+  void simple_spline(const position &, const position *, int n);
+  void simple_arc(const position &, const position &, const position &);
+  void simple_circle(int, const position &, double rad);
+  void simple_ellipse(int, const position &, const distance &);
+  void simple_polygon(int, const position *, int);
+  void line_thickness(double p);
+  void set_fill(double);
+  void set_color(char *, char *);
+  void reset_color();
+  char *get_last_filled();
+  char *get_outline_color();
+  position transform(const position &);
+};
+
+output *make_troff_output()
+{
+  return new troff_output;
+}
+
+troff_output::troff_output()
+: last_filename(0), last_line_thickness(BAD_THICKNESS),
+  last_fill(-1.0), last_filled(0), last_outlined(0)
+{
+}
+
+troff_output::~troff_output()
+{
+}
+
+inline position troff_output::transform(const position &pos)
+{
+  return position((pos.x - upper_left.x)/scale,
+		  (upper_left.y - pos.y)/scale);
+}
+
+#define FILL_REG "00"
+
+// If this register > 0, then pic will generate \X'ps: ...' commands
+// if the aligned attribute is used.
+#define GROPS_REG "0p"
+
+// If this register is defined, geqn won't produce `\x's.
+#define EQN_NO_EXTRA_SPACE_REG "0x"
+
+void troff_output::start_picture(double sc,
+				 const position &ll, const position &ur)
+{
+  upper_left.x = ll.x;
+  upper_left.y = ur.y;
+  scale = compute_scale(sc, ll, ur);
+  height = (ur.y - ll.y)/scale;
+  double width = (ur.x - ll.x)/scale;
+  printf(".PS %.3fi %.3fi", height, width);
+  if (args)
+    printf(" %s\n", args);
+  else
+    putchar('\n');
+  printf(".\\\" %g %g %g %g\n", ll.x, ll.y, ur.x, ur.y);
+  printf(".\\\" %.3fi %.3fi %.3fi %.3fi\n", 0.0, height, width, 0.0);
+  printf(".nr " FILL_REG " \\n(.u\n.nf\n");
+  printf(".nr " EQN_NO_EXTRA_SPACE_REG " 1\n");
+  // This guarantees that if the picture is used in a diversion it will
+  // have the right width.
+  printf("\\h'%.3fi'\n.sp -1\n", width);
+}
+
+void troff_output::finish_picture()
+{
+  line_thickness(BAD_THICKNESS);
+  last_fill = -1.0;		// force it to be reset for each picture
+  reset_color();
+  if (!flyback_flag)
+    printf(".sp %.3fi+1\n", height);
+  printf(".if \\n(" FILL_REG " .fi\n");
+  printf(".br\n");
+  printf(".nr " EQN_NO_EXTRA_SPACE_REG " 0\n");
+  // this is a little gross
+  set_location(current_filename, current_lineno);
+  fputs(flyback_flag ? ".PF\n" : ".PE\n", stdout);
+}
+
+void troff_output::command(const char *s,
+			   const char *filename, int lineno)
+{
+  if (filename != 0)
+    set_location(filename, lineno);
+  fputs(s, stdout);
+  putchar('\n');
+}
+
+void troff_output::simple_circle(int filled, const position &cent, double rad)
+{
+  position c = transform(cent);
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'"
+	 "\\D'%c%.3fi'"
+	 "\n.sp -1\n",
+	 c.x - rad/scale,
+	 c.y,
+	 (filled ? 'C' : 'c'),
+	 rad*2.0/scale);
+}
+
+void troff_output::simple_ellipse(int filled, const position &cent,
+				  const distance &dim)
+{
+  position c = transform(cent);
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'"
+	 "\\D'%c%.3fi %.3fi'"
+	 "\n.sp -1\n",
+	 c.x - dim.x/(2.0*scale),
+	 c.y,
+	 (filled ? 'E' : 'e'),
+	 dim.x/scale, dim.y/scale);
+}
+
+void troff_output::simple_arc(const position &start, const distance &cent,
+			      const distance &end)
+{
+  position s = transform(start);
+  position c = transform(cent);
+  distance cv = c - s;
+  distance ev = transform(end) - c;
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'"
+	 "\\D'a%.3fi %.3fi %.3fi %.3fi'"
+	 "\n.sp -1\n",
+	 s.x, s.y, cv.x, cv.y, ev.x, ev.y);
+}
+
+void troff_output::simple_line(const position &start, const position &end)
+{
+  position s = transform(start);
+  distance ev = transform(end) - s;
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'"
+	 "\\D'l%.3fi %.3fi'"
+	 "\n.sp -1\n",
+	 s.x, s.y, ev.x, ev.y);
+}
+
+void troff_output::simple_spline(const position &start,
+				 const position *v, int n)
+{
+  position pos = transform(start);
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'",
+	 pos.x, pos.y);
+  fputs("\\D'~", stdout);
+  for (int i = 0; i < n; i++) {
+    position temp = transform(v[i]);
+    distance d = temp - pos;
+    pos = temp;
+    if (i != 0)
+      putchar(' ');
+    printf("%.3fi %.3fi", d.x, d.y);
+  }
+  printf("'\n.sp -1\n");
+}
+
+// a solid polygon
+
+void troff_output::simple_polygon(int filled, const position *v, int n)
+{
+  position pos = transform(v[0]);
+  printf("\\h'%.3fi'"
+	 "\\v'%.3fi'",
+	 pos.x, pos.y);
+  printf("\\D'%c", (filled ? 'P' : 'p'));
+  for (int i = 1; i < n; i++) {
+    position temp = transform(v[i]);
+    distance d = temp - pos;
+    pos = temp;
+    if (i != 1)
+      putchar(' ');
+    printf("%.3fi %.3fi", d.x, d.y);
+  }
+  printf("'\n.sp -1\n");
+}
+
+const double TEXT_AXIS = 0.22;	// in ems
+
+static const char *choose_delimiter(const char *text)
+{
+  if (strchr(text, '\'') == 0)
+    return "'";
+  else
+    return "\\(ts";
+}
+
+void troff_output::text(const position &center, text_piece *v, int n,
+			double ang)
+{
+  line_thickness(BAD_THICKNESS); // the text might use lines (eg in equations)
+  int rotate_flag = 0;
+  if (driver_extension_flag && ang != 0.0) {
+    rotate_flag = 1;
+    position c = transform(center);
+    printf(".if \\n(" GROPS_REG " \\{\\\n"
+	   "\\h'%.3fi'"
+	   "\\v'%.3fi'"
+	   "\\X'ps: exec gsave currentpoint 2 copy translate %.4f rotate neg exch neg exch translate'"
+	   "\n.sp -1\n"
+	   ".\\}\n",
+	   c.x, c.y, -ang*180.0/M_PI);
+  }
+  for (int i = 0; i < n; i++)
+    if (v[i].text != 0 && *v[i].text != '\0') {
+      position c = transform(center);
+      if (v[i].filename != 0)
+	set_location(v[i].filename, v[i].lineno);
+      printf("\\h'%.3fi", c.x);
+      const char *delim = choose_delimiter(v[i].text);
+      if (v[i].adj.h == RIGHT_ADJUST)
+	printf("-\\w%s%s%su", delim, v[i].text, delim);
+      else if (v[i].adj.h != LEFT_ADJUST)
+	printf("-(\\w%s%s%su/2u)", delim, v[i].text, delim);
+      putchar('\'');
+      printf("\\v'%.3fi-(%dv/2u)+%dv+%.2fm",
+	     c.y,
+	     n - 1,
+	     i,
+	     TEXT_AXIS);
+      if (v[i].adj.v == ABOVE_ADJUST)
+	printf("-.5v");
+      else if (v[i].adj.v == BELOW_ADJUST)
+	printf("+.5v");
+      putchar('\'');
+      fputs(v[i].text, stdout);
+      fputs("\n.sp -1\n", stdout);
+    }
+  if (rotate_flag)
+    printf(".if '\\*(.T'ps' \\{\\\n"
+	   "\\X'ps: exec grestore'\n.sp -1\n"
+	   ".\\}\n");
+}
+
+void troff_output::line_thickness(double p)
+{
+  if (p < 0.0)
+    p = RELATIVE_THICKNESS;
+  if (driver_extension_flag && p != last_line_thickness) {
+    printf("\\D't %.3fp'\\h'%.3fp'\n.sp -1\n", p, -p);
+    last_line_thickness = p;
+  }
+}
+
+void troff_output::set_fill(double f)
+{
+  if (driver_extension_flag && f != last_fill) {
+    printf("\\D'Fg %.3f'\n.sp -1\n", 1.0 - f);
+    last_fill = f;
+  }
+  if (last_filled) {
+    free(last_filled);
+    last_filled = 0;
+    printf("\\M[]\n.sp -1\n");
+  }
+}
+
+void troff_output::set_color(char *color_fill, char *color_outlined)
+{
+  if (driver_extension_flag) {
+    if (last_filled || last_outlined) {
+      reset_color();
+    }
+    if (color_fill) {
+      printf("\\M[%s]\n.sp -1\n", color_fill);
+      last_filled = strsave(color_fill);
+    }
+    if (color_outlined) {
+      printf("\\m[%s]\n.sp -1\n", color_outlined);
+      last_outlined = strsave(color_outlined);
+    }
+  }
+}
+
+void troff_output::reset_color()
+{
+  if (driver_extension_flag) {
+    if (last_filled) {
+      printf("\\M[]\n.sp -1\n");
+      a_delete last_filled;
+      last_filled = 0;
+    }
+    if (last_outlined) {
+      printf("\\m[]\n.sp -1\n");
+      a_delete last_outlined;
+      last_outlined = 0;
+    }
+  }
+}
+
+char *troff_output::get_last_filled()
+{
+  return last_filled;
+}
+
+char *troff_output::get_outline_color()
+{
+  return last_outlined;
+}
+
+const double DOT_AXIS = .044;
+
+void troff_output::dot(const position &cent, const line_type &lt)
+{
+  if (driver_extension_flag) {
+    line_thickness(lt.thickness);
+    simple_line(cent, cent);
+  }
+  else {
+    position c = transform(cent);
+    printf("\\h'%.3fi-(\\w'.'u/2u)'"
+	   "\\v'%.3fi+%.2fm'"
+	   ".\n.sp -1\n",
+	   c.x,
+	   c.y, 
+	   DOT_AXIS);
+  }
+}
+
+void troff_output::set_location(const char *s, int n)
+{
+  if (last_filename != 0 && strcmp(s, last_filename) == 0)
+    printf(".lf %d\n", n);
+  else {
+    printf(".lf %d %s\n", n, s);
+    last_filename = s;
+  }
+}
diff --git a/contrib/groff/src/preproc/refer/Makefile.sub b/contrib/groff/src/preproc/refer/Makefile.sub
index 9f4a53b..2e22a3a 100644
--- a/contrib/groff/src/preproc/refer/Makefile.sub
+++ b/contrib/groff/src/preproc/refer/Makefile.sub
@@ -9,15 +9,15 @@ OBJS=\
   refer.$(OBJEXT) \
   token.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/command.cc \
-  $(srcdir)/ref.cc \
-  $(srcdir)/refer.cc \
-  $(srcdir)/token.cc
+  $(srcdir)/command.cpp \
+  $(srcdir)/ref.cpp \
+  $(srcdir)/refer.cpp \
+  $(srcdir)/token.cpp
 HDRS=\
   $(srcdir)/refer.h \
   $(srcdir)/token.h \
   $(srcdir)/command.h \
   $(srcdir)/ref.h
 GRAM=$(srcdir)/label.y
-YTABC=label.cc
+YTABC=label.cpp
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/preproc/refer/command.cpp b/contrib/groff/src/preproc/refer/command.cpp
new file mode 100644
index 0000000..a7c6bfb
--- /dev/null
+++ b/contrib/groff/src/preproc/refer/command.cpp
@@ -0,0 +1,809 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "refer.h"
+#include "refid.h"
+#include "search.h"
+#include "command.h"
+
+cset cs_field_name = csalpha;
+
+class input_item {
+  input_item *next;
+  char *filename;
+  int first_lineno;
+  string buffer;
+  const char *ptr;
+  const char *end;
+public:
+  input_item(string &, const char *, int = 1);
+  ~input_item();
+  int get_char();
+  int peek_char();
+  void skip_char();
+  int get_location(const char **, int *);
+
+  friend class input_stack;
+};
+
+input_item::input_item(string &s, const char *fn, int ln)
+: filename(strsave(fn)), first_lineno(ln)
+{
+  buffer.move(s);
+  ptr = buffer.contents();
+  end = ptr + buffer.length();
+}
+
+input_item::~input_item()
+{
+  a_delete filename;
+}
+
+inline int input_item::peek_char()
+{
+  if (ptr >= end)
+    return EOF;
+  else
+    return (unsigned char)*ptr;
+}
+
+inline int input_item::get_char()
+{
+  if (ptr >= end)
+    return EOF;
+  else
+    return (unsigned char)*ptr++;
+}
+
+inline void input_item::skip_char()
+{
+  ptr++;
+}
+
+int input_item::get_location(const char **filenamep, int *linenop)
+{
+  *filenamep = filename;
+  if (ptr == buffer.contents())
+    *linenop = first_lineno;
+  else {
+    int ln = first_lineno;
+    const char *e = ptr - 1;
+    for (const char *p = buffer.contents(); p < e; p++)
+      if (*p == '\n')
+	ln++;
+    *linenop = ln;
+  }
+  return 1;
+}
+
+class input_stack {
+  static input_item *top;
+public:
+  static void init();
+  static int get_char();
+  static int peek_char();
+  static void skip_char() { top->skip_char(); }
+  static void push_file(const char *);
+  static void push_string(string &, const char *, int);
+  static void error(const char *format,
+		    const errarg &arg1 = empty_errarg,
+		    const errarg &arg2 = empty_errarg,
+		    const errarg &arg3 = empty_errarg);
+};
+
+input_item *input_stack::top = 0;
+
+void input_stack::init()
+{
+  while (top) {
+    input_item *tem = top;
+    top = top->next;
+    delete tem;
+  }
+}
+
+int input_stack::get_char()
+{
+  while (top) {
+    int c = top->get_char();
+    if (c >= 0)
+      return c;
+    input_item *tem = top;
+    top = top->next;
+    delete tem;
+  }
+  return -1;
+}
+
+int input_stack::peek_char()
+{
+  while (top) {
+    int c = top->peek_char();
+    if (c >= 0)
+      return c;
+    input_item *tem = top;
+    top = top->next;
+    delete tem;
+  }
+  return -1;
+}
+
+void input_stack::push_file(const char *fn)
+{
+  FILE *fp;
+  if (strcmp(fn, "-") == 0) {
+    fp = stdin;
+    fn = "<standard input>";
+  }
+  else {
+    errno = 0;
+    fp = fopen(fn, "r");
+    if (fp == 0) {
+      error("can't open `%1': %2", fn, strerror(errno));
+      return;
+    }
+  }
+  string buf;
+  int bol = 1;
+  int lineno = 1;
+  for (;;) {
+    int c = getc(fp);
+    if (bol && c == '.') {
+      // replace lines beginning with .R1 or .R2 with a blank line
+      c = getc(fp);
+      if (c == 'R') {
+	c = getc(fp);
+	if (c == '1' || c == '2') {
+	  int cc = c;
+	  c = getc(fp);
+	  if (compatible_flag || c == ' ' || c == '\n' || c == EOF) {
+	    while (c != '\n' && c != EOF)
+	      c = getc(fp);
+	  }
+	  else {
+	    buf += '.';
+	    buf += 'R';
+	    buf += cc;
+	  }
+	}
+	else {
+	  buf += '.';
+	  buf += 'R';
+	}
+      }
+      else
+	buf += '.';
+    }
+    if (c == EOF)
+      break;
+    if (invalid_input_char(c))
+      error_with_file_and_line(fn, lineno,
+			       "invalid input character code %1", int(c));
+    else {
+      buf += c;
+      if (c == '\n') {
+	bol = 1;
+	lineno++;
+      }
+      else
+	bol = 0;
+    }
+  }
+  if (fp != stdin)
+    fclose(fp);
+  if (buf.length() > 0 && buf[buf.length() - 1] != '\n')
+    buf += '\n';
+  input_item *it = new input_item(buf, fn);
+  it->next = top;
+  top = it;
+}
+
+void input_stack::push_string(string &s, const char *filename, int lineno)
+{
+  input_item *it = new input_item(s, filename, lineno);
+  it->next = top;
+  top = it;
+}
+
+void input_stack::error(const char *format, const errarg &arg1,
+			const errarg &arg2, const errarg &arg3)
+{
+  const char *filename;
+  int lineno;
+  for (input_item *it = top; it; it = it->next)
+    if (it->get_location(&filename, &lineno)) {
+      error_with_file_and_line(filename, lineno, format, arg1, arg2, arg3);
+      return;
+    }
+  ::error(format, arg1, arg2, arg3);
+}
+
+void command_error(const char *format, const errarg &arg1,
+		   const errarg &arg2, const errarg &arg3)
+{
+  input_stack::error(format, arg1, arg2, arg3);
+}
+
+// # not recognized in ""
+// \<newline> is recognized in ""
+// # does not conceal newline
+// if missing closing quote, word extends to end of line
+// no special treatment of \ other than before newline
+// \<newline> not recognized after #
+// ; allowed as alternative to newline
+// ; not recognized in ""
+// don't clear word_buffer; just append on
+// return -1 for EOF, 0 for newline, 1 for word
+
+int get_word(string &word_buffer)
+{
+  int c = input_stack::get_char();
+  for (;;) {
+    if (c == '#') {
+      do {
+	c = input_stack::get_char();
+      } while (c != '\n' && c != EOF);
+      break;
+    }
+    if (c == '\\' && input_stack::peek_char() == '\n')
+      input_stack::skip_char();
+    else if (c != ' ' && c != '\t')
+      break;
+    c = input_stack::get_char();
+  }
+  if (c == EOF)
+    return -1;
+  if (c == '\n' || c == ';')
+    return 0;
+  if (c == '"') {
+    for (;;) {
+      c = input_stack::peek_char();
+      if (c == EOF || c == '\n')
+	break;
+      input_stack::skip_char();
+      if (c == '"') {
+	int d = input_stack::peek_char();
+	if (d == '"')
+	  input_stack::skip_char();
+	else
+	  break;
+      }
+      else if (c == '\\') {
+	int d = input_stack::peek_char();
+	if (d == '\n')
+	  input_stack::skip_char();
+	else
+	  word_buffer += '\\';
+      }
+      else
+	word_buffer += c;
+    }
+    return 1;
+  }
+  word_buffer += c;
+  for (;;) {
+    c = input_stack::peek_char();
+    if (c == ' ' || c == '\t' || c == '\n' || c == '#' || c == ';')
+      break;
+    input_stack::skip_char();
+    if (c == '\\') {
+      int d = input_stack::peek_char();
+      if (d == '\n')
+	input_stack::skip_char();
+      else
+	word_buffer += '\\';
+    }
+    else
+      word_buffer += c;
+  }
+  return 1;
+}
+
+union argument {
+  const char *s;
+  int n;
+};
+
+// This is for debugging.
+
+static void echo_command(int argc, argument *argv)
+{
+  for (int i = 0; i < argc; i++)
+    fprintf(stderr, "%s\n", argv[i].s);
+}
+
+static void include_command(int argc, argument *argv)
+{
+  assert(argc == 1);
+  input_stack::push_file(argv[0].s);
+}
+
+static void capitalize_command(int argc, argument *argv)
+{
+  if (argc > 0)
+    capitalize_fields = argv[0].s;
+  else
+    capitalize_fields.clear();
+}
+
+static void accumulate_command(int, argument *)
+{
+  accumulate = 1;
+}
+
+static void no_accumulate_command(int, argument *)
+{
+  accumulate = 0;
+}
+
+static void move_punctuation_command(int, argument *)
+{
+  move_punctuation = 1;
+}
+
+static void no_move_punctuation_command(int, argument *)
+{
+  move_punctuation = 0;
+}
+
+static void sort_command(int argc, argument *argv)
+{
+  if (argc == 0)
+    sort_fields = "AD";
+  else
+    sort_fields = argv[0].s;
+  accumulate = 1;
+}
+
+static void no_sort_command(int, argument *)
+{
+  sort_fields.clear();
+}
+
+static void articles_command(int argc, argument *argv)
+{
+  articles.clear();
+  int i;
+  for (i = 0; i < argc; i++) {
+    articles += argv[i].s;
+    articles += '\0';
+  }
+  int len = articles.length();
+  for (i = 0; i < len; i++)
+    articles[i] = cmlower(articles[i]);
+}
+
+static void database_command(int argc, argument *argv)
+{
+  for (int i = 0; i < argc; i++)
+    database_list.add_file(argv[i].s);
+}
+
+static void default_database_command(int, argument *)
+{
+  search_default = 1;
+}
+
+static void no_default_database_command(int, argument *)
+{
+  search_default = 0;
+}
+
+static void bibliography_command(int argc, argument *argv)
+{
+  const char *saved_filename = current_filename;
+  int saved_lineno = current_lineno;
+  int saved_label_in_text = label_in_text;
+  label_in_text = 0;
+  if (!accumulate)
+    fputs(".]<\n", stdout);
+  for (int i = 0; i < argc; i++)
+    do_bib(argv[i].s);
+  if (accumulate)
+    output_references();
+  else
+    fputs(".]>\n", stdout);
+  current_filename = saved_filename;
+  current_lineno = saved_lineno;
+  label_in_text = saved_label_in_text;
+}
+
+static void annotate_command(int argc, argument *argv)
+{
+  if (argc > 0)
+    annotation_field = argv[0].s[0];
+  else
+    annotation_field = 'X';
+  if (argc == 2)
+    annotation_macro = argv[1].s;
+  else
+    annotation_macro = "AP";
+}
+
+static void no_annotate_command(int, argument *)
+{
+  annotation_macro.clear();
+  annotation_field = -1;
+}
+
+static void reverse_command(int, argument *argv)
+{
+  reverse_fields = argv[0].s;
+}
+
+static void no_reverse_command(int, argument *)
+{
+  reverse_fields.clear();
+}
+
+static void abbreviate_command(int argc, argument *argv)
+{
+  abbreviate_fields = argv[0].s;
+  period_before_initial = argc > 1 ? argv[1].s : ". ";
+  period_before_last_name = argc > 2 ? argv[2].s : ". ";
+  period_before_other = argc > 3 ? argv[3].s : ". ";
+  period_before_hyphen = argc > 4 ? argv[4].s : ".";
+}
+
+static void no_abbreviate_command(int, argument *)
+{
+  abbreviate_fields.clear();
+}
+
+string search_ignore_fields;
+
+static void search_ignore_command(int argc, argument *argv)
+{
+  if (argc > 0)
+    search_ignore_fields = argv[0].s;
+  else
+    search_ignore_fields = "XYZ";
+  search_ignore_fields += '\0';
+  linear_ignore_fields = search_ignore_fields.contents();
+}
+
+static void no_search_ignore_command(int, argument *)
+{
+  linear_ignore_fields = "";
+}
+
+static void search_truncate_command(int argc, argument *argv)
+{
+  if (argc > 0)
+    linear_truncate_len = argv[0].n;
+  else
+    linear_truncate_len = 6;
+}
+
+static void no_search_truncate_command(int, argument *)
+{
+  linear_truncate_len = -1;
+}
+
+static void discard_command(int argc, argument *argv)
+{
+  if (argc == 0)
+    discard_fields = "XYZ";
+  else
+    discard_fields = argv[0].s;
+  accumulate = 1;
+}
+
+static void no_discard_command(int, argument *)
+{
+  discard_fields.clear();
+}
+
+static void label_command(int, argument *argv)
+{
+  set_label_spec(argv[0].s);
+}
+
+static void abbreviate_label_ranges_command(int argc, argument *argv)
+{
+  abbreviate_label_ranges = 1;
+  label_range_indicator = argc > 0 ? argv[0].s : "-";
+}
+
+static void no_abbreviate_label_ranges_command(int, argument *)
+{
+  abbreviate_label_ranges = 0;
+}
+
+static void label_in_reference_command(int, argument *)
+{
+  label_in_reference = 1;
+}
+
+static void no_label_in_reference_command(int, argument *)
+{
+  label_in_reference = 0;
+}
+
+static void label_in_text_command(int, argument *)
+{
+  label_in_text = 1;
+}
+
+static void no_label_in_text_command(int, argument *)
+{
+  label_in_text = 0;
+}
+
+static void sort_adjacent_labels_command(int, argument *)
+{
+  sort_adjacent_labels = 1;
+}
+
+static void no_sort_adjacent_labels_command(int, argument *)
+{
+  sort_adjacent_labels = 0;
+}
+
+static void date_as_label_command(int argc, argument *argv)
+{
+  if (set_date_label_spec(argc > 0 ? argv[0].s : "D%a*"))
+    date_as_label = 1;
+}
+
+static void no_date_as_label_command(int, argument *)
+{
+  date_as_label = 0;
+}
+
+static void short_label_command(int, argument *argv)
+{
+  if (set_short_label_spec(argv[0].s))
+    short_label_flag = 1;
+}
+
+static void no_short_label_command(int, argument *)
+{
+  short_label_flag = 0;
+}
+
+static void compatible_command(int, argument *)
+{
+  compatible_flag = 1;
+}
+
+static void no_compatible_command(int, argument *)
+{
+  compatible_flag = 0;
+}
+
+static void join_authors_command(int argc, argument *argv)
+{
+  join_authors_exactly_two = argv[0].s;
+  join_authors_default = argc > 1 ? argv[1].s : argv[0].s;
+  join_authors_last_two = argc == 3 ? argv[2].s : argv[0].s;
+}
+
+static void bracket_label_command(int, argument *argv)
+{
+  pre_label = argv[0].s;
+  post_label = argv[1].s;
+  sep_label = argv[2].s;
+}
+
+static void separate_label_second_parts_command(int, argument *argv)
+{
+  separate_label_second_parts = argv[0].s;
+}
+
+static void et_al_command(int argc, argument *argv)
+{
+  et_al = argv[0].s;
+  et_al_min_elide = argv[1].n;
+  if (et_al_min_elide < 1)
+    et_al_min_elide = 1;
+  et_al_min_total = argc >= 3 ? argv[2].n : 0;
+}
+
+static void no_et_al_command(int, argument *)
+{
+  et_al.clear();
+  et_al_min_elide = 0;
+}
+
+typedef void (*command_t)(int, argument *);
+
+/* arg_types is a string describing the numbers and types of arguments.
+s means a string, i means an integer, f is a list of fields, F is
+a single field,
+? means that the previous argument is optional, * means that the
+previous argument can occur any number of times. */
+
+struct {
+  const char *name;
+  command_t func;
+  const char *arg_types;
+} command_table[] = {
+  { "include", include_command, "s" },
+  { "echo", echo_command, "s*" },
+  { "capitalize", capitalize_command, "f?" },
+  { "accumulate", accumulate_command, "" },
+  { "no-accumulate", no_accumulate_command, "" },
+  { "move-punctuation", move_punctuation_command, "" },
+  { "no-move-punctuation", no_move_punctuation_command, "" },
+  { "sort", sort_command, "s?" },
+  { "no-sort", no_sort_command, "" },
+  { "articles", articles_command, "s*" },
+  { "database", database_command, "ss*" },
+  { "default-database", default_database_command, "" },
+  { "no-default-database", no_default_database_command, "" },
+  { "bibliography", bibliography_command, "ss*" },
+  { "annotate", annotate_command, "F?s?" },
+  { "no-annotate", no_annotate_command, "" },
+  { "reverse", reverse_command, "s" },
+  { "no-reverse", no_reverse_command, "" },
+  { "abbreviate", abbreviate_command, "ss?s?s?s?" },
+  { "no-abbreviate", no_abbreviate_command, "" },
+  { "search-ignore", search_ignore_command, "f?" },
+  { "no-search-ignore", no_search_ignore_command, "" },
+  { "search-truncate", search_truncate_command, "i?" },
+  { "no-search-truncate", no_search_truncate_command, "" },
+  { "discard", discard_command, "f?" },
+  { "no-discard", no_discard_command, "" },
+  { "label", label_command, "s" },
+  { "abbreviate-label-ranges", abbreviate_label_ranges_command, "s?" },
+  { "no-abbreviate-label-ranges", no_abbreviate_label_ranges_command, "" },
+  { "label-in-reference", label_in_reference_command, "" },
+  { "no-label-in-reference", no_label_in_reference_command, "" },
+  { "label-in-text", label_in_text_command, "" },
+  { "no-label-in-text", no_label_in_text_command, "" },
+  { "sort-adjacent-labels", sort_adjacent_labels_command, "" },
+  { "no-sort-adjacent-labels", no_sort_adjacent_labels_command, "" },
+  { "date-as-label", date_as_label_command, "s?" },
+  { "no-date-as-label", no_date_as_label_command, "" },
+  { "short-label", short_label_command, "s" },
+  { "no-short-label", no_short_label_command, "" },
+  { "compatible", compatible_command, "" },
+  { "no-compatible", no_compatible_command, "" },
+  { "join-authors", join_authors_command, "sss?" },
+  { "bracket-label", bracket_label_command, "sss" },
+  { "separate-label-second-parts", separate_label_second_parts_command, "s" },
+  { "et-al", et_al_command, "sii?" },
+  { "no-et-al", no_et_al_command, "" },
+};
+
+static int check_args(const char *types, const char *name,
+		      int argc, argument *argv)
+{
+  int argno = 0;
+  while (*types) {
+    if (argc == 0) {
+      if (types[1] == '?')
+	break;
+      else if (types[1] == '*') {
+	assert(types[2] == '\0');
+	break;
+      }
+      else {
+	input_stack::error("missing argument for command `%1'", name);
+	return 0;
+      }
+    }
+    switch (*types) {
+    case 's':
+      break;
+    case 'i':
+      {
+	char *ptr;
+	long n = strtol(argv->s, &ptr, 10);
+	if ((n == 0 && ptr == argv->s)
+	    || *ptr != '\0') {
+	  input_stack::error("argument %1 for command `%2' must be an integer",
+			     argno + 1, name);
+	  return 0;
+	}
+	argv->n = (int)n;
+	break;
+      }
+    case 'f':
+      {
+	for (const char *ptr = argv->s; *ptr != '\0'; ptr++)
+	  if (!cs_field_name(*ptr)) {
+	    input_stack::error("argument %1 for command `%2' must be a list of fields",
+			     argno + 1, name);
+	    return 0;
+	  }
+	break;
+      }
+    case 'F':
+      if (argv->s[0] == '\0' || argv->s[1] != '\0'
+	  || !cs_field_name(argv->s[0])) {
+	input_stack::error("argument %1 for command `%2' must be a field name",
+			   argno + 1, name);
+	return 0;
+      }
+      break;
+    default:
+      assert(0);
+    }
+    if (types[1] == '?')
+      types += 2;
+    else if (types[1] != '*')
+      types += 1;
+    --argc;
+    ++argv;
+    ++argno;
+  }
+  if (argc > 0) {
+    input_stack::error("too many arguments for command `%1'", name);
+    return 0;
+  }
+  return 1;
+}
+
+static void execute_command(const char *name, int argc, argument *argv)
+{
+  for (unsigned int i = 0;
+       i < sizeof(command_table)/sizeof(command_table[0]); i++)
+    if (strcmp(name, command_table[i].name) == 0) {
+      if (check_args(command_table[i].arg_types, name, argc, argv))
+	(*command_table[i].func)(argc, argv);
+      return;
+    }
+  input_stack::error("unknown command `%1'", name);
+}
+
+static void command_loop()
+{
+  string command;
+  for (;;) {
+    command.clear();
+    int res = get_word(command);
+    if (res != 1) {
+      if (res == 0)
+	continue;
+      break;
+    }
+    int argc = 0;
+    command += '\0';
+    while ((res = get_word(command)) == 1) {
+      argc++;
+      command += '\0';
+    }
+    argument *argv = new argument[argc];
+    const char *ptr = command.contents();
+    for (int i = 0; i < argc; i++)
+      argv[i].s = ptr = strchr(ptr, '\0') + 1;
+    execute_command(command.contents(), argc, argv);
+    a_delete argv;
+    if (res == -1)
+      break;
+  }
+}
+
+void process_commands(const char *file)
+{
+  input_stack::init();
+  input_stack::push_file(file);
+  command_loop();
+}
+
+void process_commands(string &s, const char *file, int lineno)
+{
+  input_stack::init();
+  input_stack::push_string(s, file, lineno);
+  command_loop();
+}
diff --git a/contrib/groff/src/preproc/refer/label.cpp b/contrib/groff/src/preproc/refer/label.cpp
new file mode 100644
index 0000000..8d915a8
--- /dev/null
+++ b/contrib/groff/src/preproc/refer/label.cpp
@@ -0,0 +1,1605 @@
+#ifndef lint
+static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93 (groff)";
+#endif
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+#define yyclearin (yychar=(-1))
+#define yyerrok (yyerrflag=0)
+#define YYRECOVERING (yyerrflag!=0)
+#define YYPREFIX "yy"
+#line 22 "label.y"
+
+#include "refer.h"
+#include "refid.h"
+#include "ref.h"
+#include "token.h"
+
+int yylex();
+void yyerror(const char *);
+int yyparse();
+
+static const char *format_serial(char c, int n);
+
+struct label_info {
+  int start;
+  int length;
+  int count;
+  int total;
+  label_info(const string &);
+};
+
+label_info *lookup_label(const string &label);
+
+struct expression {
+  enum {
+    /* Does the tentative label depend on the reference?*/
+    CONTAINS_VARIABLE = 01, 
+    CONTAINS_STAR = 02,
+    CONTAINS_FORMAT = 04,
+    CONTAINS_AT = 010
+  };
+  virtual ~expression() { }
+  virtual void evaluate(int, const reference &, string &,
+			substring_position &) = 0;
+  virtual unsigned analyze() { return 0; }
+};
+
+class at_expr : public expression {
+public:
+  at_expr() { }
+  void evaluate(int, const reference &, string &, substring_position &);
+  unsigned analyze() { return CONTAINS_VARIABLE|CONTAINS_AT; }
+};
+
+class format_expr : public expression {
+  char type;
+  int width;
+  int first_number;
+public:
+  format_expr(char c, int w = 0, int f = 1)
+    : type(c), width(w), first_number(f) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+  unsigned analyze() { return CONTAINS_FORMAT; }
+};
+
+class field_expr : public expression {
+  int number;
+  char name;
+public:
+  field_expr(char nm, int num) : number(num), name(nm) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+  unsigned analyze() { return CONTAINS_VARIABLE; }
+};
+
+class literal_expr : public expression {
+  string s;
+public:
+  literal_expr(const char *ptr, int len) : s(ptr, len) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class unary_expr : public expression {
+protected:
+  expression *expr;
+public:
+  unary_expr(expression *e) : expr(e) { }
+  ~unary_expr() { delete expr; }
+  void evaluate(int, const reference &, string &, substring_position &) = 0;
+  unsigned analyze() { return expr ? expr->analyze() : 0; }
+};
+
+/* 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 221 "label.y"
+typedef union {
+  int num;
+  expression *expr;
+  struct { int ndigits; int val; } dig;
+  struct { int start; int len; } str;
+} YYSTYPE;
+#line 217 "y.tab.c"
+#define TOKEN_LETTER 257
+#define TOKEN_LITERAL 258
+#define TOKEN_DIGIT 259
+#define YYERRCODE 256
+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,
+};
+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,
+};
+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,
+};
+short yydgoto[] = {                                       7,
+    8,    9,   10,   11,   12,   13,   15,   18,   47,   39,
+};
+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,
+};
+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,
+};
+short yygindex[] = {                                      0,
+   19,    0,    7,   37,  -10,   10,  -23,    0,    0,    0,
+};
+#define YYTABLESIZE 511
+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,
+};
+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
+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,0,0,0,0,0,0,"TOKEN_LETTER","TOKEN_LITERAL","TOKEN_DIGIT",
+};
+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 : '-'",
+};
+#endif
+#ifdef YYSTACKSIZE
+#undef YYMAXDEPTH
+#define YYMAXDEPTH YYSTACKSIZE
+#else
+#ifdef YYMAXDEPTH
+#define YYSTACKSIZE YYMAXDEPTH
+#else
+#define YYSTACKSIZE 500
+#define YYMAXDEPTH 500
+#endif
+#endif
+int yydebug;
+int yynerrs;
+int yyerrflag;
+int yychar;
+short *yyssp;
+YYSTYPE *yyvsp;
+YYSTYPE yyval;
+YYSTYPE yylval;
+short yyss[YYSTACKSIZE];
+YYSTYPE yyvs[YYSTACKSIZE];
+#define yystacksize YYSTACKSIZE
+#line 397 "label.y"
+
+/* bison defines const to be empty unless __STDC__ is defined, which it
+isn't under cfront */
+
+#ifdef const
+#undef const
+#endif
+
+const char *spec_ptr;
+const char *spec_end;
+const char *spec_cur;
+
+int yylex()
+{
+  while (spec_ptr < spec_end && csspace(*spec_ptr))
+    spec_ptr++;
+  spec_cur = spec_ptr;
+  if (spec_ptr >= spec_end)
+    return 0;
+  unsigned char c = *spec_ptr++;
+  if (csalpha(c)) {
+    yylval.num = c;
+    return TOKEN_LETTER;
+  }
+  if (csdigit(c)) {
+    yylval.num = c - '0';
+    return TOKEN_DIGIT;
+  }
+  if (c == '\'') {
+    yylval.str.start = literals.length();
+    for (; spec_ptr < spec_end; spec_ptr++) {
+      if (*spec_ptr == '\'') {
+	if (++spec_ptr < spec_end && *spec_ptr == '\'')
+	  literals += '\'';
+	else {
+	  yylval.str.len = literals.length() - yylval.str.start;
+	  return TOKEN_LITERAL;
+	}
+      }
+      else
+	literals += *spec_ptr;
+    }
+    yylval.str.len = literals.length() - yylval.str.start;
+    return TOKEN_LITERAL;
+  }
+  return c;
+}
+
+int set_label_spec(const char *label_spec)
+{
+  spec_cur = spec_ptr = label_spec;
+  spec_end = strchr(label_spec, '\0');
+  literals.clear();
+  if (yyparse())
+    return 0;
+  delete parsed_label;
+  parsed_label = parse_result;
+  return 1;
+}
+
+int set_date_label_spec(const char *label_spec)
+{
+  spec_cur = spec_ptr = label_spec;
+  spec_end = strchr(label_spec, '\0');
+  literals.clear();
+  if (yyparse())
+    return 0;
+  delete parsed_date_label;
+  parsed_date_label = parse_result;
+  return 1;
+}
+
+int set_short_label_spec(const char *label_spec)
+{
+  spec_cur = spec_ptr = label_spec;
+  spec_end = strchr(label_spec, '\0');
+  literals.clear();
+  if (yyparse())
+    return 0;
+  delete parsed_short_label;
+  parsed_short_label = parse_result;
+  return 1;
+}
+
+void yyerror(const char *message)
+{
+  if (spec_cur < spec_end)
+    command_error("label specification %1 before `%2'", message, spec_cur);
+  else
+    command_error("label specification %1 at end of string",
+		  message, spec_cur);
+}
+
+void at_expr::evaluate(int tentative, const reference &ref,
+		       string &result, substring_position &)
+{
+  if (tentative)
+    ref.canonicalize_authors(result);
+  else {
+    const char *end, *start = ref.get_authors(&end);
+    if (start)
+      result.append(start, end - start);
+  }
+}
+
+void format_expr::evaluate(int tentative, const reference &ref,
+			   string &result, substring_position &)
+{
+  if (tentative)
+    return;
+  const label_info *lp = ref.get_label_ptr();
+  int num = lp == 0 ? ref.get_number() : lp->count;
+  if (type != '0')
+    result += format_serial(type, num + 1);
+  else {
+    const char *ptr = i_to_a(num + first_number);
+    int pad = width - strlen(ptr);
+    while (--pad >= 0)
+      result += '0';
+    result += ptr;
+  }
+}
+
+static const char *format_serial(char c, int n)
+{
+  assert(n > 0);
+  static char buf[128]; // more than enough.
+  switch (c) {
+  case 'i':
+  case 'I':
+    {
+      char *p = buf;
+      // troff uses z and w to represent 10000 and 5000 in Roman
+      // numerals; I can find no historical basis for this usage
+      const char *s = c == 'i' ? "zwmdclxvi" : "ZWMDCLXVI";
+      if (n >= 40000)
+	return i_to_a(n);
+      while (n >= 10000) {
+	*p++ = s[0];
+	n -= 10000;
+      }
+      for (int i = 1000; i > 0; i /= 10, s += 2) {
+	int m = n/i;
+	n -= m*i;
+	switch (m) {
+	case 3:
+	  *p++ = s[2];
+	  /* falls through */
+	case 2:
+	  *p++ = s[2];
+	  /* falls through */
+	case 1:
+	  *p++ = s[2];
+	  break;
+	case 4:
+	  *p++ = s[2];
+	  *p++ = s[1];
+	  break;
+	case 8:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  break;
+	case 7:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  break;
+	case 6:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  break;
+	case 5:
+	  *p++ = s[1];
+	  break;
+	case 9:
+	  *p++ = s[2];
+	  *p++ = s[0];
+	}
+      }
+      *p = 0;
+      break;
+    }
+  case 'a':
+  case 'A':
+    {
+      char *p = buf;
+      // this is derived from troff/reg.c
+      while (n > 0) {
+	int d = n % 26;
+	if (d == 0)
+	  d = 26;
+	n -= d;
+	n /= 26;
+	*p++ = c + d - 1;	// ASCII dependent
+      }
+      *p-- = 0;
+      // Reverse it.
+      char *q = buf;
+      while (q < p) {
+	char temp = *q;
+	*q = *p;
+	*p = temp;
+	--p;
+	++q;
+      }
+      break;
+    }
+  default:
+    assert(0);
+  }
+  return buf;
+}
+
+void field_expr::evaluate(int, const reference &ref,
+			  string &result, substring_position &)
+{
+  const char *end;
+  const char *start = ref.get_field(name, &end);
+  if (start) {
+    start = nth_field(number, start, &end);
+    if (start)
+      result.append(start, end - start);
+  }
+}
+
+void literal_expr::evaluate(int, const reference &,
+			    string &result, substring_position &)
+{
+  result += s;
+}
+
+analyzed_expr::analyzed_expr(expression *e)
+: unary_expr(e), flags(e ? e->analyze() : 0)
+{
+}
+
+void analyzed_expr::evaluate(int tentative, const reference &ref,
+			     string &result, substring_position &pos)
+{
+  if (expr)
+    expr->evaluate(tentative, ref, result, pos);
+}
+
+void star_expr::evaluate(int tentative, const reference &ref,
+			 string &result, substring_position &pos)
+{
+  const label_info *lp = ref.get_label_ptr();
+  if (!tentative
+      && (lp == 0 || lp->total > 1)
+      && expr)
+    expr->evaluate(tentative, ref, result, pos);
+}
+
+void separator_expr::evaluate(int tentative, const reference &ref,
+			      string &result, substring_position &pos)
+{
+  int start_length = result.length();
+  int is_first = pos.start < 0;
+  if (expr)
+    expr->evaluate(tentative, ref, result, pos);
+  if (is_first) {
+    pos.start = start_length;
+    pos.length = result.length() - start_length;
+  }
+}
+
+void map_expr::evaluate(int tentative, const reference &ref,
+			string &result, substring_position &)
+{
+  if (expr) {
+    string temp;
+    substring_position temp_pos;
+    expr->evaluate(tentative, ref, temp, temp_pos);
+    (*func)(temp.contents(), temp.contents() + temp.length(), result);
+  }
+}
+
+void extractor_expr::evaluate(int tentative, const reference &ref,
+			      string &result, substring_position &)
+{
+  if (expr) {
+    string temp;
+    substring_position temp_pos;
+    expr->evaluate(tentative, ref, temp, temp_pos);
+    const char *end, *start = (*func)(temp.contents(),
+				      temp.contents() + temp.length(),
+				      &end);
+    switch (part) {
+    case BEFORE:
+      if (start)
+	result.append(temp.contents(), start - temp.contents());
+      else
+	result += temp;
+      break;
+    case MATCH:
+      if (start)
+	result.append(start, end - start);
+      break;
+    case AFTER:
+      if (start)
+	result.append(end, temp.contents() + temp.length() - end);
+      break;
+    default:
+      assert(0);
+    }
+  }
+}
+
+static void first_part(int len, const char *ptr, const char *end,
+			  string &result)
+{
+  for (;;) {
+    const char *token_start = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    const token_info *ti = lookup_token(token_start, ptr);
+    int counts = ti->sortify_non_empty(token_start, ptr);
+    if (counts && --len < 0)
+      break;
+    if (counts || ti->is_accent())
+      result.append(token_start, ptr - token_start);
+  }
+}
+
+static void last_part(int len, const char *ptr, const char *end,
+		      string &result)
+{
+  const char *start = ptr;
+  int count = 0;
+  for (;;) {
+    const char *token_start = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    const token_info *ti = lookup_token(token_start, ptr);
+    if (ti->sortify_non_empty(token_start, ptr))
+      count++;
+  }
+  ptr = start;
+  int skip = count - len;
+  if (skip > 0) {
+    for (;;) {
+      const char *token_start = ptr;
+      if (!get_token(&ptr, end))
+	assert(0);
+      const token_info *ti = lookup_token(token_start, ptr);
+      if (ti->sortify_non_empty(token_start, ptr) && --skip < 0) {
+	ptr = token_start;
+	break;
+      }
+    }
+  }
+  first_part(len, ptr, end, result);
+}
+
+void truncate_expr::evaluate(int tentative, const reference &ref,
+			     string &result, substring_position &)
+{
+  if (expr) {
+    string temp;
+    substring_position temp_pos;
+    expr->evaluate(tentative, ref, temp, temp_pos);
+    const char *start = temp.contents();
+    const char *end = start + temp.length();
+    if (n > 0)
+      first_part(n, start, end, result);
+    else if (n < 0)
+      last_part(-n, start, end, result);
+  }
+}
+
+void alternative_expr::evaluate(int tentative, const reference &ref,
+				string &result, substring_position &pos)
+{
+  int start_length = result.length();
+  if (expr1)
+    expr1->evaluate(tentative, ref, result, pos);
+  if (result.length() == start_length && expr2)
+    expr2->evaluate(tentative, ref, result, pos);
+}
+
+void list_expr::evaluate(int tentative, const reference &ref,
+			 string &result, substring_position &pos)
+{
+  if (expr1)
+    expr1->evaluate(tentative, ref, result, pos);
+  if (expr2)
+    expr2->evaluate(tentative, ref, result, pos);
+}
+
+void substitute_expr::evaluate(int tentative, const reference &ref,
+			       string &result, substring_position &pos)
+{
+  int start_length = result.length();
+  if (expr1)
+    expr1->evaluate(tentative, ref, result, pos);
+  if (result.length() > start_length && result[result.length() - 1] == '-') {
+    // ought to see if pos covers the -
+    result.set_length(result.length() - 1);
+    if (expr2)
+      expr2->evaluate(tentative, ref, result, pos);
+  }
+}
+
+void conditional_expr::evaluate(int tentative, const reference &ref,
+				string &result, substring_position &pos)
+{
+  string temp;
+  substring_position temp_pos;
+  if (expr1)
+    expr1->evaluate(tentative, ref, temp, temp_pos);
+  if (temp.length() > 0) {
+    if (expr2)
+      expr2->evaluate(tentative, ref, result, pos);
+  }
+  else {
+    if (expr3)
+      expr3->evaluate(tentative, ref, result, pos);
+  }
+}
+
+void reference::pre_compute_label()
+{
+  if (parsed_label != 0
+      && (parsed_label->analyze() & expression::CONTAINS_VARIABLE)) {
+    label.clear();
+    substring_position temp_pos;
+    parsed_label->evaluate(1, *this, label, temp_pos);
+    label_ptr = lookup_label(label);
+  }
+}
+
+void reference::compute_label()
+{
+  label.clear();
+  if (parsed_label)
+    parsed_label->evaluate(0, *this, label, separator_pos);
+  if (short_label_flag && parsed_short_label)
+    parsed_short_label->evaluate(0, *this, short_label, short_separator_pos);
+  if (date_as_label) {
+    string new_date;
+    if (parsed_date_label) {
+      substring_position temp_pos;
+      parsed_date_label->evaluate(0, *this, new_date, temp_pos);
+    }
+    set_date(new_date);
+  }
+  if (label_ptr)
+    label_ptr->count += 1;
+}
+
+void reference::immediate_compute_label()
+{
+  if (label_ptr)
+    label_ptr->total = 2;	// force use of disambiguator
+  compute_label();
+}
+
+int reference::merge_labels(reference **v, int n, label_type type,
+			    string &result)
+{
+  if (abbreviate_label_ranges)
+    return merge_labels_by_number(v, n, type, result);
+  else
+    return merge_labels_by_parts(v, n, type, result);
+}
+
+int reference::merge_labels_by_number(reference **v, int n, label_type type,
+				      string &result)
+{
+  if (n <= 1)
+    return 0;
+  int num = get_number();
+  // Only merge three or more labels.
+  if (v[0]->get_number() != num + 1
+      || v[1]->get_number() != num + 2)
+    return 0;
+  int i;
+  for (i = 2; i < n; i++)
+    if (v[i]->get_number() != num + i + 1)
+      break;
+  result = get_label(type);
+  result += label_range_indicator;
+  result += v[i - 1]->get_label(type);
+  return i;
+}
+
+const substring_position &reference::get_separator_pos(label_type type) const
+{
+  if (type == SHORT_LABEL && short_label_flag)
+    return short_separator_pos;
+  else
+    return separator_pos;
+}
+
+const string &reference::get_label(label_type type) const
+{
+  if (type == SHORT_LABEL && short_label_flag)
+    return short_label; 
+  else
+    return label;
+}
+
+int reference::merge_labels_by_parts(reference **v, int n, label_type type,
+				     string &result)
+{
+  if (n <= 0)
+    return 0;
+  const string &lb = get_label(type);
+  const substring_position &sp = get_separator_pos(type);
+  if (sp.start < 0
+      || sp.start != v[0]->get_separator_pos(type).start 
+      || memcmp(lb.contents(), v[0]->get_label(type).contents(),
+		sp.start) != 0)
+    return 0;
+  result = lb;
+  int i = 0;
+  do {
+    result += separate_label_second_parts;
+    const substring_position &s = v[i]->get_separator_pos(type);
+    int sep_end_pos = s.start + s.length;
+    result.append(v[i]->get_label(type).contents() + sep_end_pos,
+		  v[i]->get_label(type).length() - sep_end_pos);
+  } while (++i < n
+	   && sp.start == v[i]->get_separator_pos(type).start
+	   && memcmp(lb.contents(), v[i]->get_label(type).contents(),
+		     sp.start) == 0);
+  return i;
+}
+
+string label_pool;
+
+label_info::label_info(const string &s)
+: start(label_pool.length()), length(s.length()), count(0), total(1)
+{
+  label_pool += s;
+}
+
+static label_info **label_table = 0;
+static int label_table_size = 0;
+static int label_table_used = 0;
+
+label_info *lookup_label(const string &label)
+{
+  if (label_table == 0) {
+    label_table = new label_info *[17];
+    label_table_size = 17;
+    for (int i = 0; i < 17; i++)
+      label_table[i] = 0;
+  }
+  unsigned h = hash_string(label.contents(), label.length()) % label_table_size;
+  label_info **ptr;
+  for (ptr = label_table + h;
+       *ptr != 0;
+       (ptr == label_table)
+       ? (ptr = label_table + label_table_size - 1)
+       : ptr--)
+    if ((*ptr)->length == label.length()
+	&& memcmp(label_pool.contents() + (*ptr)->start, label.contents(),
+		  label.length()) == 0) {
+      (*ptr)->total += 1;
+      return *ptr;
+    }
+  label_info *result = *ptr = new label_info(label);
+  if (++label_table_used * 2 > label_table_size) {
+    // Rehash the table.
+    label_info **old_table = label_table;
+    int old_size = label_table_size;
+    label_table_size = next_size(label_table_size);
+    label_table = new label_info *[label_table_size];
+    int i;
+    for (i = 0; i < label_table_size; i++)
+      label_table[i] = 0;
+    for (i = 0; i < old_size; i++)
+      if (old_table[i]) {
+	unsigned h = hash_string(label_pool.contents() + old_table[i]->start,
+				 old_table[i]->length);
+	label_info **p;
+	for (p = label_table + (h % label_table_size);
+	     *p != 0;
+	     (p == label_table)
+	     ? (p = label_table + label_table_size - 1)
+	     : --p)
+	    ;
+	*p = old_table[i];
+	}
+    a_delete old_table;
+  }
+  return result;
+}
+
+void clear_labels()
+{
+  for (int i = 0; i < label_table_size; i++) {
+    delete label_table[i];
+    label_table[i] = 0;
+  }
+  label_table_used = 0;
+  label_pool.clear();
+}
+
+static void consider_authors(reference **start, reference **end, int i);
+
+void compute_labels(reference **v, int n)
+{
+  if (parsed_label
+      && (parsed_label->analyze() & expression::CONTAINS_AT)
+      && sort_fields.length() >= 2
+      && sort_fields[0] == 'A'
+      && sort_fields[1] == '+')
+    consider_authors(v, v + n, 0);
+  for (int i = 0; i < n; i++)
+    v[i]->compute_label();
+}
+
+
+/* A reference with a list of authors <A0,A1,...,AN> _needs_ author i
+where 0 <= i <= N if there exists a reference with a list of authors
+<B0,B1,...,BM> such that <A0,A1,...,AN> != <B0,B1,...,BM> and M >= i
+and Aj = Bj for 0 <= j < i. In this case if we can't say ``A0,
+A1,...,A(i-1) et al'' because this would match both <A0,A1,...,AN> and
+<B0,B1,...,BM>.  If a reference needs author i we only have to call
+need_author(j) for some j >= i such that the reference also needs
+author j. */
+
+/* This function handles 2 tasks:
+determine which authors are needed (cannot be elided with et al.);
+determine which authors can have only last names in the labels.
+
+References >= start and < end have the same first i author names.
+Also they're sorted by A+. */
+
+static void consider_authors(reference **start, reference **end, int i)
+{
+  if (start >= end)
+    return;
+  reference **p = start;
+  if (i >= (*p)->get_nauthors()) {
+    for (++p; p < end && i >= (*p)->get_nauthors(); p++)
+      ;
+    if (p < end && i > 0) {
+      // If we have an author list <A B C> and an author list <A B C D>,
+      // then both lists need C.
+      for (reference **q = start; q < end; q++)
+	(*q)->need_author(i - 1);
+    }
+    start = p;
+  }
+  while (p < end) {
+    reference **last_name_start = p;
+    reference **name_start = p;
+    for (++p;
+	 p < end && i < (*p)->get_nauthors()
+	 && same_author_last_name(**last_name_start, **p, i);
+	 p++) {
+      if (!same_author_name(**name_start, **p, i)) {
+	consider_authors(name_start, p, i + 1);
+	name_start = p;
+      }
+    }
+    consider_authors(name_start, p, i + 1);
+    if (last_name_start == name_start) {
+      for (reference **q = last_name_start; q < p; q++)
+	(*q)->set_last_name_unambiguous(i);
+    }
+    // If we have an author list <A B C D> and <A B C E>, then the lists
+    // need author D and E respectively.
+    if (name_start > start || p < end) {
+      for (reference **q = last_name_start; q < p; q++)
+	(*q)->need_author(i);
+    }
+  }
+}
+
+int same_author_last_name(const reference &r1, const reference &r2, int n)
+{
+  const char *ae1;
+  const char *as1 = r1.get_sort_field(0, n, 0, &ae1);
+  assert(as1 != 0);
+  const char *ae2;
+  const char *as2 = r2.get_sort_field(0, n, 0, &ae2);
+  assert(as2 != 0);
+  return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0;
+}
+
+int same_author_name(const reference &r1, const reference &r2, int n)
+{
+  const char *ae1;
+  const char *as1 = r1.get_sort_field(0, n, -1, &ae1);
+  assert(as1 != 0);
+  const char *ae2;
+  const char *as2 = r2.get_sort_field(0, n, -1, &ae2);
+  assert(as2 != 0);
+  return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0;
+}
+
+
+void int_set::set(int i)
+{
+  assert(i >= 0);
+  int bytei = i >> 3;
+  if (bytei >= v.length()) {
+    int old_length = v.length();
+    v.set_length(bytei + 1);
+    for (int j = old_length; j <= bytei; j++)
+      v[j] = 0;
+  }
+  v[bytei] |= 1 << (i & 7);
+}
+
+int int_set::get(int i) const
+{
+  assert(i >= 0);
+  int bytei = i >> 3;
+  return bytei >= v.length() ? 0 : (v[bytei] & (1 << (i & 7))) != 0;
+}
+
+void reference::set_last_name_unambiguous(int i)
+{
+  last_name_unambiguous.set(i);
+}
+
+void reference::need_author(int n)
+{
+  if (n > last_needed_author)
+    last_needed_author = n;
+}
+
+const char *reference::get_authors(const char **end) const
+{
+  if (!computed_authors) {
+    ((reference *)this)->computed_authors = 1;
+    string &result = ((reference *)this)->authors;
+    int na = get_nauthors();
+    result.clear();
+    for (int i = 0; i < na; i++) {
+      if (last_name_unambiguous.get(i)) {
+	const char *e, *start = get_author_last_name(i, &e);
+	assert(start != 0);
+	result.append(start, e - start);
+      }
+      else {
+	const char *e, *start = get_author(i, &e);
+	assert(start != 0);
+	result.append(start, e - start);
+      }
+      if (i == last_needed_author
+	  && et_al.length() > 0
+	  && et_al_min_elide > 0
+	  && last_needed_author + et_al_min_elide < na
+	  && na >= et_al_min_total) {
+	result += et_al;
+	break;
+      }
+      if (i < na - 1) {
+	if (na == 2)
+	  result += join_authors_exactly_two;
+	else if (i < na - 2)
+	  result += join_authors_default;
+	else
+	  result += join_authors_last_two;
+      }
+    }
+  }
+  const char *start = authors.contents();
+  *end = start + authors.length();
+  return start;
+}
+
+int reference::get_nauthors() const
+{
+  if (nauthors < 0) {
+    const char *dummy;
+    int na;
+    for (na = 0; get_author(na, &dummy) != 0; na++)
+      ;
+    ((reference *)this)->nauthors = na;
+  }
+  return nauthors;
+}
+#line 1227 "y.tab.c"
+#define YYABORT goto yyabort
+#define YYREJECT goto yyabort
+#define YYACCEPT goto yyaccept
+#define YYERROR goto yyerrlab
+int
+#if defined(__STDC__)
+yyparse(void)
+#else
+yyparse()
+#endif
+{
+    register int yym, yyn, yystate;
+#if YYDEBUG
+    register char *yys;
+    extern char *getenv();
+
+    if (yys = getenv("YYDEBUG"))
+    {
+        yyn = *yys;
+        if (yyn >= '0' && yyn <= '9')
+            yydebug = yyn - '0';
+    }
+#endif
+
+    yynerrs = 0;
+    yyerrflag = 0;
+    yychar = (-1);
+
+    yyssp = yyss;
+    yyvsp = yyvs;
+    *yyssp = yystate = 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 >= yyss + yystacksize - 1)
+        {
+            goto yyoverflow;
+        }
+        *++yyssp = yystate = yytable[yyn];
+        *++yyvsp = yylval;
+        yychar = (-1);
+        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;
+#ifdef lint
+    goto yynewerror;
+#endif
+yynewerror:
+    yyerror("syntax error");
+#ifdef lint
+    goto yyerrlab;
+#endif
+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 >= yyss + yystacksize - 1)
+                {
+                    goto yyoverflow;
+                }
+                *++yyssp = yystate = 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 = (-1);
+        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];
+    yyval = yyvsp[1-yym];
+    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 1550 "y.tab.c"
+    }
+    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 >= yyss + yystacksize - 1)
+    {
+        goto yyoverflow;
+    }
+    *++yyssp = yystate;
+    *++yyvsp = yyval;
+    goto yyloop;
+yyoverflow:
+    yyerror("yacc stack overflow");
+yyabort:
+    return (1);
+yyaccept:
+    return (0);
+}
diff --git a/contrib/groff/src/preproc/refer/ref.cpp b/contrib/groff/src/preproc/refer/ref.cpp
new file mode 100644
index 0000000..9c04078
--- /dev/null
+++ b/contrib/groff/src/preproc/refer/ref.cpp
@@ -0,0 +1,1160 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+     
+#include "refer.h"
+#include "refid.h"
+#include "ref.h"
+#include "token.h"
+
+static const char *find_day(const char *, const char *, const char **);
+static int find_month(const char *start, const char *end);
+static void abbreviate_names(string &);
+
+#define DEFAULT_ARTICLES "the\000a\000an"
+     
+string articles(DEFAULT_ARTICLES, sizeof(DEFAULT_ARTICLES));
+
+// Multiple occurrences of fields are separated by FIELD_SEPARATOR.
+const char FIELD_SEPARATOR = '\0';
+
+const char MULTI_FIELD_NAMES[] = "AE";
+const char *AUTHOR_FIELDS = "AQ";
+
+enum { OTHER, JOURNAL_ARTICLE, BOOK, ARTICLE_IN_BOOK, TECH_REPORT, BELL_TM };
+
+const char *reference_types[] = {
+  "other",
+  "journal-article",
+  "book",
+  "article-in-book",
+  "tech-report",
+  "bell-tm",
+};
+
+static string temp_fields[256];
+
+reference::reference(const char *start, int len, reference_id *ridp)
+: h(0), merged(0), no(-1), field(0), nfields(0), label_ptr(0),
+  computed_authors(0), last_needed_author(-1), nauthors(-1)
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    field_index[i] = NULL_FIELD_INDEX;
+  if (ridp)
+    rid = *ridp;
+  if (start == 0)
+    return;
+  if (len <= 0)
+    return;
+  const char *end = start + len;
+  const char *ptr = start;
+  assert(*ptr == '%');
+  while (ptr < end) {
+    if (ptr + 1 < end && ptr[1] != '\0'
+	&& ((ptr[1] != '%' && ptr[1] == annotation_field)
+	    || (ptr + 2 < end && ptr[1] == '%' && ptr[2] != '\0'
+		&& discard_fields.search(ptr[2]) < 0))) {
+      if (ptr[1] == '%')
+	ptr++;
+      string &f = temp_fields[(unsigned char)ptr[1]];
+      ptr += 2;
+      while (ptr < end && csspace(*ptr))
+	ptr++;
+      for (;;) {
+	for (;;) {
+	  if (ptr >= end) {
+	    f += '\n';
+	    break;
+	  }
+	  f += *ptr;
+	  if (*ptr++ == '\n')
+	    break;
+	}
+	if (ptr >= end || *ptr == '%')
+	  break;
+      }
+    }
+    else if (ptr + 1 < end && ptr[1] != '\0' && ptr[1] != '%'
+	     && discard_fields.search(ptr[1]) < 0) {
+      string &f = temp_fields[(unsigned char)ptr[1]];
+      if (f.length() > 0) {
+	if (strchr(MULTI_FIELD_NAMES, ptr[1]) != 0)
+	  f += FIELD_SEPARATOR;
+	else
+	  f.clear();
+      }
+      ptr += 2;
+      if (ptr < end) {
+	if (*ptr == ' ')
+	  ptr++;
+	for (;;) {
+	  const char *p = ptr;
+	  while (ptr < end && *ptr != '\n')
+	    ptr++;
+	  // strip trailing white space
+	  const char *q = ptr;
+	  while (q > p && q[-1] != '\n' && csspace(q[-1]))
+	    q--;
+	  while (p < q)
+	    f += *p++;
+	  if (ptr >= end)
+	    break;
+	  ptr++;
+	  if (ptr >= end)
+	    break;
+	  if (*ptr == '%')
+	    break;
+	  f += ' ';
+	}
+      }
+    }
+    else {
+      // skip this field
+      for (;;) {
+	while (ptr < end && *ptr++ != '\n')
+	  ;
+	if (ptr >= end || *ptr == '%')
+	  break;
+      }
+    }
+  }
+  for (i = 0; i < 256; i++)
+    if (temp_fields[i].length() > 0)
+      nfields++;
+  field = new string[nfields];
+  int j = 0;
+  for (i = 0; i < 256; i++)
+    if (temp_fields[i].length() > 0) {
+      field[j].move(temp_fields[i]);
+      if (abbreviate_fields.search(i) >= 0)
+	abbreviate_names(field[j]);
+      field_index[i] = j;
+      j++;
+    }
+}
+
+reference::~reference()
+{
+  if (nfields > 0)
+    ad_delete(nfields) field;
+}
+
+// ref is the inline, this is the database ref
+
+void reference::merge(reference &ref)
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (field_index[i] != NULL_FIELD_INDEX)
+      temp_fields[i].move(field[field_index[i]]);
+  for (i = 0; i < 256; i++)
+    if (ref.field_index[i] != NULL_FIELD_INDEX)
+      temp_fields[i].move(ref.field[ref.field_index[i]]);
+  for (i = 0; i < 256; i++)
+    field_index[i] = NULL_FIELD_INDEX;
+  int old_nfields = nfields;
+  nfields = 0;
+  for (i = 0; i < 256; i++)
+    if (temp_fields[i].length() > 0)
+      nfields++;
+  if (nfields != old_nfields) {
+    if (old_nfields > 0)
+      ad_delete(old_nfields) field;
+    field = new string[nfields];
+  }
+  int j = 0;
+  for (i = 0; i < 256; i++)
+    if (temp_fields[i].length() > 0) {
+      field[j].move(temp_fields[i]);
+      field_index[i] = j;
+      j++;
+    }
+  merged = 1;
+}
+
+void reference::insert_field(unsigned char c, string &s)
+{
+  assert(s.length() > 0);
+  if (field_index[c] != NULL_FIELD_INDEX) {
+    field[field_index[c]].move(s);
+    return;
+  }
+  assert(field_index[c] == NULL_FIELD_INDEX);
+  string *old_field = field;
+  field = new string[nfields + 1];
+  int pos = 0;
+  int i;
+  for (i = 0; i < int(c); i++)
+    if (field_index[i] != NULL_FIELD_INDEX)
+      pos++;
+  for (i = 0; i < pos; i++)
+    field[i].move(old_field[i]);
+  field[pos].move(s);
+  for (i = pos; i < nfields; i++)
+    field[i + 1].move(old_field[i]);
+  if (nfields > 0)
+    ad_delete(nfields) old_field;
+  nfields++;
+  field_index[c] = pos;
+  for (i = c + 1; i < 256; i++)
+    if (field_index[i] != NULL_FIELD_INDEX)
+      field_index[i] += 1;
+}
+
+void reference::delete_field(unsigned char c)
+{
+  if (field_index[c] == NULL_FIELD_INDEX)
+    return;
+  string *old_field = field;
+  field = new string[nfields - 1];
+  int i;
+  for (i = 0; i < int(field_index[c]); i++)
+    field[i].move(old_field[i]);
+  for (i = field_index[c]; i < nfields - 1; i++)
+    field[i].move(old_field[i + 1]);
+  if (nfields > 0)
+    ad_delete(nfields) old_field;
+  nfields--;
+  field_index[c] = NULL_FIELD_INDEX;
+  for (i = c + 1; i < 256; i++)
+    if (field_index[i] != NULL_FIELD_INDEX)
+      field_index[i] -= 1;
+}
+    
+void reference::compute_hash_code()
+{
+  if (!rid.is_null())
+    h = rid.hash();
+  else {
+    h = 0;
+    for (int i = 0; i < nfields; i++)
+      if (field[i].length() > 0) {
+	h <<= 4;
+	h ^= hash_string(field[i].contents(), field[i].length());
+      }
+  }
+}
+
+void reference::set_number(int n)
+{
+  no = n;
+}
+
+const char SORT_SEP = '\001';
+const char SORT_SUB_SEP = '\002';
+const char SORT_SUB_SUB_SEP = '\003';
+
+// sep specifies additional word separators
+
+void sortify_words(const char *s, const char *end, const char *sep,
+		   string &result)
+{
+  int non_empty = 0;
+  int need_separator = 0;
+  for (;;) {
+    const char *token_start = s;
+    if (!get_token(&s, end))
+      break;
+    if ((s - token_start == 1
+	 && (*token_start == ' '
+	     || *token_start == '\n'
+	     || (sep && *token_start != '\0'
+		 && strchr(sep, *token_start) != 0)))
+	|| (s - token_start == 2
+	    && token_start[0] == '\\' && token_start[1] == ' ')) {
+      if (non_empty)
+	need_separator = 1;
+    }
+    else {
+      const token_info *ti = lookup_token(token_start, s);
+      if (ti->sortify_non_empty(token_start, s)) {
+	if (need_separator) {
+	  result += ' ';
+	  need_separator = 0;
+	}
+	ti->sortify(token_start, s, result);
+	non_empty = 1;
+      }
+    }
+  }
+}
+
+void sortify_word(const char *s, const char *end, string &result)
+{
+  for (;;) {
+    const char *token_start = s;
+    if (!get_token(&s, end))
+      break;
+    const token_info *ti = lookup_token(token_start, s);
+    ti->sortify(token_start, s, result);
+  }
+}
+
+void sortify_other(const char *s, int len, string &key)
+{
+  sortify_words(s, s + len, 0, key);
+}
+
+void sortify_title(const char *s, int len, string &key)
+{
+  const char *end = s + len;
+  for (; s < end && (*s == ' ' || *s == '\n'); s++) 
+    ;
+  const char *ptr = s;
+  for (;;) {
+    const char *token_start = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    if (ptr - token_start == 1
+	&& (*token_start == ' ' || *token_start == '\n'))
+      break;
+  }
+  if (ptr < end) {
+    unsigned int first_word_len = ptr - s - 1;
+    const char *ae = articles.contents() + articles.length();
+    for (const char *a = articles.contents();
+	 a < ae;
+	 a = strchr(a, '\0') + 1)
+      if (first_word_len == strlen(a)) {
+	unsigned int j;
+	for (j = 0; j < first_word_len; j++)
+	  if (a[j] != cmlower(s[j]))
+	    break;
+	if (j >= first_word_len) {
+	  s = ptr;
+	  for (; s < end && (*s == ' ' || *s == '\n'); s++)
+	    ;
+	  break;
+	}
+      }
+  }
+  sortify_words(s, end, 0, key);
+}
+
+void sortify_name(const char *s, int len, string &key)
+{
+  const char *last_name_end;
+  const char *last_name = find_last_name(s, s + len, &last_name_end);
+  sortify_word(last_name, last_name_end, key);
+  key += SORT_SUB_SUB_SEP;
+  if (last_name > s)
+    sortify_words(s, last_name, ".", key);
+  key += SORT_SUB_SUB_SEP;
+  if (last_name_end < s + len)
+    sortify_words(last_name_end, s + len, ".,", key);
+}
+
+void sortify_date(const char *s, int len, string &key)
+{
+  const char *year_end;
+  const char *year_start = find_year(s, s + len, &year_end);
+  if (!year_start) {
+    // Things without years are often `forthcoming', so it makes sense
+    // that they sort after things with explicit years.
+    key += 'A';
+    sortify_words(s, s + len, 0, key);
+    return;
+  }
+  int n = year_end - year_start;
+  while (n < 4) {
+    key += '0';
+    n++;
+  }
+  while (year_start < year_end)
+    key += *year_start++;
+  int m = find_month(s, s + len);
+  if (m < 0)
+    return;
+  key += 'A' + m;
+  const char *day_end;
+  const char *day_start = find_day(s, s + len, &day_end);
+  if (!day_start)
+    return;
+  if (day_end - day_start == 1)
+    key += '0';
+  while (day_start < day_end)
+    key += *day_start++;
+}
+
+// SORT_{SUB,SUB_SUB}_SEP can creep in from use of @ in label specification.
+
+void sortify_label(const char *s, int len, string &key)
+{
+  const char *end = s + len;
+  for (;;) {
+    const char *ptr;
+    for (ptr = s;
+	 ptr < end && *ptr != SORT_SUB_SEP && *ptr != SORT_SUB_SUB_SEP;
+	 ptr++)
+      ;
+    if (ptr > s)
+      sortify_words(s, ptr, 0, key);
+    s = ptr;
+    if (s >= end)
+      break;
+    key += *s++;
+  }
+}
+
+void reference::compute_sort_key()
+{
+  if (sort_fields.length() == 0)
+    return;
+  sort_fields += '\0';
+  const char *sf = sort_fields.contents();
+  while (*sf != '\0') {
+    if (sf > sort_fields)
+      sort_key += SORT_SEP;
+    char f = *sf++;
+    int n = 1;
+    if (*sf == '+') {
+      n = INT_MAX;
+      sf++;
+    }
+    else if (csdigit(*sf)) {
+      char *ptr;
+      long l = strtol(sf, &ptr, 10);
+      if (l == 0 && ptr == sf)
+	;
+      else {
+	sf = ptr;
+	if (l < 0) {
+	  n = 1;
+	}
+	else {
+	  n = int(l);
+	}
+      }
+    }
+    if (f == '.')
+      sortify_label(label.contents(), label.length(), sort_key);
+    else if (f == AUTHOR_FIELDS[0])
+      sortify_authors(n, sort_key);
+    else
+      sortify_field(f, n, sort_key);
+  }
+  sort_fields.set_length(sort_fields.length() - 1);
+}
+
+void reference::sortify_authors(int n, string &result) const
+{
+  for (const char *p = AUTHOR_FIELDS; *p != '\0'; p++)
+    if (contains_field(*p)) {
+      sortify_field(*p, n, result);
+      return;
+    }
+  sortify_field(AUTHOR_FIELDS[0], n, result);
+}
+
+void reference::canonicalize_authors(string &result) const
+{
+  int len = result.length();
+  sortify_authors(INT_MAX, result);
+  if (result.length() > len)
+    result += SORT_SUB_SEP;
+}
+
+void reference::sortify_field(unsigned char f, int n, string &result) const
+{
+  typedef void (*sortify_t)(const char *, int, string &);
+  sortify_t sortifier = sortify_other;
+  switch (f) {
+  case 'A':
+  case 'E':
+    sortifier = sortify_name;
+    break;
+  case 'D':
+    sortifier = sortify_date;
+    break;
+  case 'B':
+  case 'J':
+  case 'T':
+    sortifier = sortify_title;
+    break;
+  }
+  int fi = field_index[(unsigned char)f];
+  if (fi != NULL_FIELD_INDEX) {
+    string &str = field[fi];
+    const char *start = str.contents();
+    const char *end = start + str.length();
+    for (int i = 0; i < n && start < end; i++) {
+      const char *p = start;
+      while (start < end && *start != FIELD_SEPARATOR)
+	start++;
+      if (i > 0)
+	result += SORT_SUB_SEP;
+      (*sortifier)(p, start - p, result);
+      if (start < end)
+	start++;
+    }
+  }
+}
+
+int compare_reference(const reference &r1, const reference &r2)
+{
+  assert(r1.no >= 0);
+  assert(r2.no >= 0);
+  const char *s1 = r1.sort_key.contents();
+  int n1 = r1.sort_key.length();
+  const char *s2 = r2.sort_key.contents();
+  int n2 = r2.sort_key.length();
+  for (; n1 > 0 && n2 > 0; --n1, --n2, ++s1, ++s2)
+    if (*s1 != *s2)
+      return (int)(unsigned char)*s1 - (int)(unsigned char)*s2;
+  if (n2 > 0)
+    return -1;
+  if (n1 > 0)
+    return 1;
+  return r1.no - r2.no;
+}
+
+int same_reference(const reference &r1, const reference &r2)
+{
+  if (!r1.rid.is_null() && r1.rid == r2.rid)
+    return 1;
+  if (r1.h != r2.h)
+    return 0;
+  if (r1.nfields != r2.nfields)
+    return 0;
+  int i = 0; 
+  for (i = 0; i < 256; i++)
+    if (r1.field_index != r2.field_index)
+      return 0;
+  for (i = 0; i < r1.nfields; i++)
+    if (r1.field[i] != r2.field[i])
+      return 0;
+  return 1;
+}
+
+const char *find_last_name(const char *start, const char *end,
+			   const char **endp)
+{
+  const char *ptr = start;
+  const char *last_word = start;
+  for (;;) {
+    const char *token_start = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    if (ptr - token_start == 1) {
+      if (*token_start == ',') {
+	*endp = token_start;
+	return last_word;
+      }
+      else if (*token_start == ' ' || *token_start == '\n') {
+	if (ptr < end && *ptr != ' ' && *ptr != '\n')
+	  last_word = ptr;
+      }
+    }
+  }
+  *endp = end;
+  return last_word;
+}
+
+void abbreviate_name(const char *ptr, const char *end, string &result)
+{
+  const char *last_name_end;
+  const char *last_name_start = find_last_name(ptr, end, &last_name_end);
+  int need_period = 0;
+  for (;;) {
+    const char *token_start = ptr;
+    if (!get_token(&ptr, last_name_start))
+      break;
+    const token_info *ti = lookup_token(token_start, ptr);
+    if (need_period) {
+      if ((ptr - token_start == 1 && *token_start == ' ')
+	  || (ptr - token_start == 2 && token_start[0] == '\\'
+	      && token_start[1] == ' '))
+	continue;
+      if (ti->is_upper())
+	result += period_before_initial;
+      else
+	result += period_before_other;
+      need_period = 0;
+    }
+    result.append(token_start, ptr - token_start);
+    if (ti->is_upper()) {
+      const char *lower_ptr = ptr;
+      int first_token = 1;
+      for (;;) {
+	token_start = ptr;
+	if (!get_token(&ptr, last_name_start))
+	  break;
+	if ((ptr - token_start == 1 && *token_start == ' ')
+	    || (ptr - token_start == 2 && token_start[0] == '\\'
+		&& token_start[1] == ' '))
+	  break;
+	ti = lookup_token(token_start, ptr);
+	if (ti->is_hyphen()) {
+	  const char *ptr1 = ptr;
+	  if (get_token(&ptr1, last_name_start)) {
+	    ti = lookup_token(ptr, ptr1);
+	    if (ti->is_upper()) {
+	      result += period_before_hyphen;
+	      result.append(token_start, ptr1 - token_start);
+	      ptr = ptr1;
+	    }
+	  }
+	}
+	else if (ti->is_upper()) {
+	  // MacDougal -> MacD.
+	  result.append(lower_ptr, ptr - lower_ptr);
+	  lower_ptr = ptr;
+	  first_token = 1;
+	}
+	else if (first_token && ti->is_accent()) {
+	  result.append(token_start, ptr - token_start);
+	  lower_ptr = ptr;
+	}
+	first_token = 0;
+      }
+      need_period = 1;
+    }
+  }
+  if (need_period)
+    result += period_before_last_name;
+  result.append(last_name_start, end - last_name_start);
+}
+
+static void abbreviate_names(string &result)
+{
+  string str;
+  str.move(result);
+  const char *ptr = str.contents();
+  const char *end = ptr + str.length();
+  while (ptr < end) {
+    const char *name_end = (char *)memchr(ptr, FIELD_SEPARATOR, end - ptr);
+    if (name_end == 0)
+      name_end = end;
+    abbreviate_name(ptr, name_end, result);
+    if (name_end >= end)
+      break;
+    ptr = name_end + 1;
+    result += FIELD_SEPARATOR;
+  }
+}
+
+void reverse_name(const char *ptr, const char *name_end, string &result)
+{
+  const char *last_name_end;
+  const char *last_name_start = find_last_name(ptr, name_end, &last_name_end);
+  result.append(last_name_start, last_name_end - last_name_start);
+  while (last_name_start > ptr
+	 && (last_name_start[-1] == ' ' || last_name_start[-1] == '\n'))
+    last_name_start--;
+  if (last_name_start > ptr) {
+    result += ", ";
+    result.append(ptr, last_name_start - ptr);
+  }
+  if (last_name_end < name_end)
+    result.append(last_name_end, name_end - last_name_end);
+}
+
+void reverse_names(string &result, int n)
+{
+  if (n <= 0)
+    return;
+  string str;
+  str.move(result);
+  const char *ptr = str.contents();
+  const char *end = ptr + str.length();
+  while (ptr < end) {
+    if (--n < 0) {
+      result.append(ptr, end - ptr);
+      break;
+    }
+    const char *name_end = (char *)memchr(ptr, FIELD_SEPARATOR, end - ptr);
+    if (name_end == 0)
+      name_end = end;
+    reverse_name(ptr, name_end, result);
+    if (name_end >= end)
+      break;
+    ptr = name_end + 1;
+    result += FIELD_SEPARATOR;
+  }
+}
+
+// Return number of field separators.
+
+int join_fields(string &f)
+{
+  const char *ptr = f.contents();
+  int len = f.length();
+  int nfield_seps = 0;
+  int j;
+  for (j = 0; j < len; j++)
+    if (ptr[j] == FIELD_SEPARATOR)
+      nfield_seps++;
+  if (nfield_seps == 0)
+    return 0;
+  string temp;
+  int field_seps_left = nfield_seps;
+  for (j = 0; j < len; j++) {
+    if (ptr[j] == FIELD_SEPARATOR) {
+      if (nfield_seps == 1)
+	temp += join_authors_exactly_two;
+      else if (--field_seps_left == 0)
+	temp += join_authors_last_two;
+      else
+	temp += join_authors_default;
+    }
+    else
+      temp += ptr[j];
+  }
+  f = temp;
+  return nfield_seps;
+}
+
+void uppercase(const char *start, const char *end, string &result)
+{
+  for (;;) {
+    const char *token_start = start;
+    if (!get_token(&start, end))
+      break;
+    const token_info *ti = lookup_token(token_start, start);
+    ti->upper_case(token_start, start, result);
+  }
+}
+
+void lowercase(const char *start, const char *end, string &result)
+{
+  for (;;) {
+    const char *token_start = start;
+    if (!get_token(&start, end))
+      break;
+    const token_info *ti = lookup_token(token_start, start);
+    ti->lower_case(token_start, start, result);
+  }
+}
+
+void capitalize(const char *ptr, const char *end, string &result)
+{
+  int in_small_point_size = 0;
+  for (;;) {
+    const char *start = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    const token_info *ti = lookup_token(start, ptr);
+    const char *char_end = ptr;
+    int is_lower = ti->is_lower();
+    if ((is_lower || ti->is_upper()) && get_token(&ptr, end)) {
+      const token_info *ti2 = lookup_token(char_end, ptr);
+      if (!ti2->is_accent())
+	ptr = char_end;
+    }
+    if (is_lower) {
+      if (!in_small_point_size) {
+	result += "\\s-2";
+	in_small_point_size = 1;
+      }
+      ti->upper_case(start, char_end, result);
+      result.append(char_end, ptr - char_end);
+    }
+    else {
+      if (in_small_point_size) {
+	result += "\\s+2";
+	in_small_point_size = 0;
+      }
+      result.append(start, ptr - start);
+    }
+  }
+  if (in_small_point_size)
+    result += "\\s+2";
+}
+
+void capitalize_field(string &str)
+{
+  string temp;
+  capitalize(str.contents(), str.contents() + str.length(), temp);
+  str.move(temp);
+}
+
+int is_terminated(const char *ptr, const char *end)
+{
+  const char *last_token = end;
+  for (;;) {
+    const char *p = ptr;
+    if (!get_token(&ptr, end))
+      break;
+    last_token = p;
+  }
+  return end - last_token == 1
+    && (*last_token == '.' || *last_token == '!' || *last_token == '?');
+}
+
+void reference::output(FILE *fp)
+{
+  fputs(".]-\n", fp);
+  for (int i = 0; i < 256; i++)
+    if (field_index[i] != NULL_FIELD_INDEX && i != annotation_field) {
+      string &f = field[field_index[i]];
+      if (!csdigit(i)) {
+	int j = reverse_fields.search(i);
+	if (j >= 0) {
+	  int n;
+	  int len = reverse_fields.length();
+	  if (++j < len && csdigit(reverse_fields[j])) {
+	    n = reverse_fields[j] - '0';
+	    for (++j; j < len && csdigit(reverse_fields[j]); j++)
+	      // should check for overflow
+	      n = n*10 + reverse_fields[j] - '0';
+	  }
+	  else 
+	    n = INT_MAX;
+	  reverse_names(f, n);
+	}
+      }
+      int is_multiple = join_fields(f) > 0;
+      if (capitalize_fields.search(i) >= 0)
+	capitalize_field(f);
+      if (memchr(f.contents(), '\n', f.length()) == 0) {
+	fprintf(fp, ".ds [%c ", i);
+	if (f[0] == ' ' || f[0] == '\\' || f[0] == '"')
+	  putc('"', fp);
+	put_string(f, fp);
+	putc('\n', fp);
+      }
+      else {
+	fprintf(fp, ".de [%c\n", i);
+	put_string(f, fp);
+	fputs("..\n", fp);
+      }
+      if (i == 'P') {
+	int multiple_pages = 0;
+	const char *s = f.contents();
+	const char *end = f.contents() + f.length();
+	for (;;) {
+	  const char *token_start = s;
+	  if (!get_token(&s, end))
+	    break;
+	  const token_info *ti = lookup_token(token_start, s);
+	  if (ti->is_hyphen() || ti->is_range_sep()) {
+	    multiple_pages = 1;
+	    break;
+	  }
+	}
+	fprintf(fp, ".nr [P %d\n", multiple_pages);
+      }
+      else if (i == 'E')
+	fprintf(fp, ".nr [E %d\n", is_multiple);
+    }
+  for (const char *p = "TAO"; *p; p++) {
+    int fi = field_index[(unsigned char)*p];
+    if (fi != NULL_FIELD_INDEX) {
+      string &f = field[fi];
+      fprintf(fp, ".nr [%c %d\n", *p,
+	      is_terminated(f.contents(), f.contents() + f.length()));
+    }
+  }
+  int t = classify();
+  fprintf(fp, ".][ %d %s\n", t, reference_types[t]);
+  if (annotation_macro.length() > 0 && annotation_field >= 0
+      && field_index[annotation_field] != NULL_FIELD_INDEX) {
+    putc('.', fp);
+    put_string(annotation_macro, fp);
+    putc('\n', fp);
+    put_string(field[field_index[annotation_field]], fp);
+  }
+}
+
+void reference::print_sort_key_comment(FILE *fp)
+{
+  fputs(".\\\"", fp);
+  put_string(sort_key, fp);
+  putc('\n', fp);
+}
+
+const char *find_year(const char *start, const char *end, const char **endp)
+{
+  for (;;) {
+    while (start < end && !csdigit(*start))
+      start++;
+    const char *ptr = start;
+    if (start == end)
+      break;
+    while (ptr < end && csdigit(*ptr))
+      ptr++;
+    if (ptr - start == 4 || ptr - start == 3
+	|| (ptr - start == 2
+	    && (start[0] >= '4' || (start[0] == '3' && start[1] >= '2')))) {
+      *endp = ptr;
+      return start;
+    }
+    start = ptr;
+  }
+  return 0;
+}
+
+static const char *find_day(const char *start, const char *end,
+			    const char **endp)
+{
+  for (;;) {
+    while (start < end && !csdigit(*start))
+      start++;
+    const char *ptr = start;
+    if (start == end)
+      break;
+    while (ptr < end && csdigit(*ptr))
+      ptr++;
+    if ((ptr - start == 1 && start[0] != '0')
+	|| (ptr - start == 2 &&
+	    (start[0] == '1'
+	     || start[0] == '2'
+	     || (start[0] == '3' && start[1] <= '1')
+	     || (start[0] == '0' && start[1] != '0')))) {
+      *endp = ptr;
+      return start;
+    }
+    start = ptr;
+  }
+  return 0;
+}
+
+static int find_month(const char *start, const char *end)
+{
+  static const char *months[] = {
+    "january",
+    "february",
+    "march",
+    "april",
+    "may",
+    "june",
+    "july",
+    "august",
+    "september",
+    "october",
+    "november",
+    "december",
+  };
+  for (;;) {
+    while (start < end && !csalpha(*start))
+      start++;
+    const char *ptr = start;
+    if (start == end)
+      break;
+    while (ptr < end && csalpha(*ptr))
+      ptr++;
+    if (ptr - start >= 3) {
+      for (unsigned int i = 0; i < sizeof(months)/sizeof(months[0]); i++) {
+	const char *q = months[i];
+	const char *p = start;
+	for (; p < ptr; p++, q++)
+	  if (cmlower(*p) != *q)
+	    break;
+	if (p >= ptr)
+	  return i;
+      }
+    }
+    start = ptr;
+  }
+  return -1;
+}
+
+int reference::contains_field(char c) const
+{
+  return field_index[(unsigned char)c] != NULL_FIELD_INDEX;
+}
+
+int reference::classify()
+{
+  if (contains_field('J'))
+    return JOURNAL_ARTICLE;
+  if (contains_field('B'))
+    return ARTICLE_IN_BOOK;
+  if (contains_field('G'))
+    return TECH_REPORT;
+  if (contains_field('R'))
+    return TECH_REPORT;
+  if (contains_field('I'))
+    return BOOK;
+  if (contains_field('M'))
+    return BELL_TM;
+  return OTHER;
+}
+
+const char *reference::get_year(const char **endp) const
+{
+  if (field_index['D'] != NULL_FIELD_INDEX) {
+    string &date = field[field_index['D']];
+    const char *start = date.contents();
+    const char *end = start + date.length();
+    return find_year(start, end, endp);
+  }
+  else
+    return 0;
+}
+
+const char *reference::get_field(unsigned char c, const char **endp) const
+{
+  if (field_index[c] != NULL_FIELD_INDEX) {
+    string &f = field[field_index[c]];
+    const char *start = f.contents();
+    *endp = start + f.length();
+    return start;
+  }
+  else
+    return 0;
+}
+
+const char *reference::get_date(const char **endp) const
+{
+  return get_field('D', endp);
+}
+
+const char *nth_field(int i, const char *start, const char **endp)
+{
+  while (--i >= 0) {
+    start = (char *)memchr(start, FIELD_SEPARATOR, *endp - start);
+    if (!start)
+      return 0;
+    start++;
+  }
+  const char *e = (char *)memchr(start, FIELD_SEPARATOR, *endp - start);
+  if (e)
+    *endp = e;
+  return start;
+}
+
+const char *reference::get_author(int i, const char **endp) const
+{
+  for (const char *f = AUTHOR_FIELDS; *f != '\0'; f++) {
+    const char *start = get_field(*f, endp);
+    if (start) {
+      if (strchr(MULTI_FIELD_NAMES, *f) != 0)
+	return nth_field(i, start, endp);
+      else if (i == 0)
+	return start;
+      else
+	return 0;
+    }
+  }
+  return 0;
+}
+
+const char *reference::get_author_last_name(int i, const char **endp) const
+{
+  for (const char *f = AUTHOR_FIELDS; *f != '\0'; f++) {
+    const char *start = get_field(*f, endp);
+    if (start) {
+      if (strchr(MULTI_FIELD_NAMES, *f) != 0) {
+	start = nth_field(i, start, endp);
+	if (!start)
+	  return 0;
+      }
+      if (*f == 'A')
+	return find_last_name(start, *endp, endp);
+      else
+	return start;
+    }
+  }
+  return 0;
+}
+
+void reference::set_date(string &d)
+{
+  if (d.length() == 0)
+    delete_field('D');
+  else
+    insert_field('D', d);
+}
+
+int same_year(const reference &r1, const reference &r2)
+{
+  const char *ye1;
+  const char *ys1 = r1.get_year(&ye1);
+  const char *ye2;
+  const char *ys2 = r2.get_year(&ye2);
+  if (ys1 == 0) {
+    if (ys2 == 0)
+      return same_date(r1, r2);
+    else
+      return 0;
+  }
+  else if (ys2 == 0)
+    return 0;
+  else if (ye1 - ys1 != ye2 - ys2)
+    return 0;
+  else
+    return memcmp(ys1, ys2, ye1 - ys1) == 0;
+}
+
+int same_date(const reference &r1, const reference &r2)
+{
+  const char *e1;
+  const char *s1 = r1.get_date(&e1);
+  const char *e2;
+  const char *s2 = r2.get_date(&e2);
+  if (s1 == 0)
+    return s2 == 0;
+  else if (s2 == 0)
+    return 0;
+  else if (e1 - s1 != e2 - s2)
+    return 0;
+  else
+    return memcmp(s1, s2, e1 - s1) == 0;
+}
+
+const char *reference::get_sort_field(int i, int si, int ssi,
+				      const char **endp) const
+{
+  const char *start = sort_key.contents();
+  const char *end = start + sort_key.length();
+  if (i < 0) {
+    *endp = end;
+    return start;
+  }
+  while (--i >= 0) {
+    start = (char *)memchr(start, SORT_SEP, end - start);
+    if (!start)
+      return 0;
+    start++;
+  }
+  const char *e = (char *)memchr(start, SORT_SEP, end - start);
+  if (e)
+    end = e;
+  if (si < 0) {
+    *endp = end;
+    return start;
+  }
+  while (--si >= 0) {
+    start = (char *)memchr(start, SORT_SUB_SEP, end - start);
+    if (!start)
+      return 0;
+    start++;
+  }
+  e = (char *)memchr(start, SORT_SUB_SEP, end - start);
+  if (e)
+    end = e;
+  if (ssi < 0) {
+    *endp = end;
+    return start;
+  }
+  while (--ssi >= 0) {
+    start = (char *)memchr(start, SORT_SUB_SUB_SEP, end - start);
+    if (!start)
+      return 0;
+    start++;
+  }
+  e = (char *)memchr(start, SORT_SUB_SUB_SEP, end - start);
+  if (e)
+    end = e;
+  *endp = end;
+  return start;
+}
+
diff --git a/contrib/groff/src/preproc/refer/refer.cpp b/contrib/groff/src/preproc/refer/refer.cpp
new file mode 100644
index 0000000..33df35c
--- /dev/null
+++ b/contrib/groff/src/preproc/refer/refer.cpp
@@ -0,0 +1,1235 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "refer.h"
+#include "refid.h"
+#include "ref.h"
+#include "token.h"
+#include "search.h"
+#include "command.h"
+
+extern "C" const char *Version_string;
+
+const char PRE_LABEL_MARKER = '\013';
+const char POST_LABEL_MARKER = '\014';
+const char LABEL_MARKER = '\015'; // label_type is added on
+
+#define FORCE_LEFT_BRACKET 04
+#define FORCE_RIGHT_BRACKET 010
+
+static FILE *outfp = stdout;
+
+string capitalize_fields;
+string reverse_fields;
+string abbreviate_fields;
+string period_before_last_name = ". ";
+string period_before_initial = ".";
+string period_before_hyphen = "";
+string period_before_other = ". ";
+string sort_fields;
+int annotation_field = -1;
+string annotation_macro;
+string discard_fields = "XYZ";
+string pre_label = "\\*([.";
+string post_label = "\\*(.]";
+string sep_label = ", ";
+int accumulate = 0;
+int move_punctuation = 0;
+int abbreviate_label_ranges = 0;
+string label_range_indicator;
+int label_in_text = 1;
+int label_in_reference = 1;
+int date_as_label = 0;
+int sort_adjacent_labels = 0;
+// Join exactly two authors with this.
+string join_authors_exactly_two = " and ";
+// When there are more than two authors join the last two with this.
+string join_authors_last_two = ", and ";
+// Otherwise join authors with this.
+string join_authors_default = ", ";
+string separate_label_second_parts = ", ";
+// Use this string to represent that there are other authors.
+string et_al = " et al";
+// Use et al only if it can replace at least this many authors.
+int et_al_min_elide = 2;
+// Use et al only if the total number of authors is at least this.
+int et_al_min_total = 3;
+
+
+int compatible_flag = 0;
+
+int short_label_flag = 0;
+
+static int recognize_R1_R2 = 1;
+
+search_list database_list;
+int search_default = 1;
+static int default_database_loaded = 0;
+
+static reference **citation = 0;
+static int ncitations = 0;
+static int citation_max = 0;
+
+static reference **reference_hash_table = 0;
+static int hash_table_size;
+static int nreferences = 0;
+
+static int need_syncing = 0;
+string pending_line;
+string pending_lf_lines;
+
+static void output_pending_line();
+static unsigned immediately_handle_reference(const string &);
+static void immediately_output_references();
+static unsigned store_reference(const string &);
+static void divert_to_temporary_file();
+static reference *make_reference(const string &, unsigned *);
+static void usage(FILE *stream);
+static void do_file(const char *);
+static void split_punct(string &line, string &punct);
+static void output_citation_group(reference **v, int n, label_type, FILE *fp);
+static void possibly_load_default_database();
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  outfp = stdout;
+  int finished_options = 0;
+  int bib_flag = 0;
+  int done_spec = 0;
+
+  for (--argc, ++argv;
+       !finished_options && argc > 0 && argv[0][0] == '-'
+       && argv[0][1] != '\0';
+       argv++, argc--) {
+    const char *opt = argv[0] + 1; 
+    while (opt != 0 && *opt != '\0') {
+      switch (*opt) {
+      case 'C':
+	compatible_flag = 1;
+	opt++;
+	break;
+      case 'B':
+	bib_flag = 1;
+	label_in_reference = 0;
+	label_in_text = 0;
+	++opt;
+	if (*opt == '\0') {
+	  annotation_field = 'X';
+	  annotation_macro = "AP";
+	}
+	else if (csalnum(opt[0]) && opt[1] == '.' && opt[2] != '\0') {
+	  annotation_field = opt[0];
+	  annotation_macro = opt + 2;
+	}
+	opt = 0;
+	break;
+      case 'P':
+	move_punctuation = 1;
+	opt++;
+	break;
+      case 'R':
+	recognize_R1_R2 = 0;
+	opt++;
+	break;
+      case 'S':
+	// Not a very useful spec.
+	set_label_spec("(A.n|Q)', '(D.y|D)");
+	done_spec = 1;
+	pre_label = " (";
+	post_label = ")";
+	sep_label = "; ";
+	opt++;
+	break;
+      case 'V':
+	verify_flag = 1;
+	opt++;
+	break;
+      case 'f':
+	{
+	  const char *num = 0;
+	  if (*++opt == '\0') {
+	    if (argc > 1) {
+	      num = *++argv;
+	      --argc;
+	    }
+	    else {
+	      error("option `f' requires an argument");
+	      usage(stderr);
+	      exit(1);
+	    }
+	  }
+	  else {
+	    num = opt;
+	    opt = 0;
+	  }
+	  const char *ptr;
+	  for (ptr = num; *ptr; ptr++)
+	    if (!csdigit(*ptr)) {
+	      error("bad character `%1' in argument to -f option", *ptr);
+	      break;
+	    }
+	  if (*ptr == '\0') {
+	    string spec;
+	    spec = '%';
+	    spec += num;
+	    spec += '\0';
+	    set_label_spec(spec.contents());
+	    done_spec = 1;
+	  }
+	  break;
+	}
+      case 'b':
+	label_in_text = 0;
+	label_in_reference = 0;
+	opt++;
+	break;
+      case 'e':
+	accumulate = 1;
+	opt++;
+	break;
+      case 'c':
+	capitalize_fields = ++opt;
+	opt = 0;
+	break;
+      case 'k':
+	{
+	  char buf[5];
+	  if (csalpha(*++opt))
+	    buf[0] = *opt++;
+	  else {
+	    if (*opt != '\0')
+	      error("bad field name `%1'", *opt++);
+	    buf[0] = 'L';
+	  }
+	  buf[1] = '~';
+	  buf[2] = '%';
+	  buf[3] = 'a';
+	  buf[4] = '\0';
+	  set_label_spec(buf);
+	  done_spec = 1;
+	}
+	break;
+      case 'a':
+	{
+	  const char *ptr;
+	  for (ptr = ++opt; *ptr; ptr++)
+	    if (!csdigit(*ptr)) {
+	      error("argument to `a' option not a number");
+	      break;
+	    }
+	  if (*ptr == '\0') {
+	    reverse_fields = 'A';
+	    reverse_fields += opt;
+	  }
+	  opt = 0;
+	}
+	break;
+      case 'i':
+	linear_ignore_fields = ++opt;
+	opt = 0;
+	break;
+      case 'l':
+	{
+	  char buf[INT_DIGITS*2 + 11]; // A.n+2D.y-3%a
+	  strcpy(buf, "A.n");
+	  if (*++opt != '\0' && *opt != ',') {
+	    char *ptr;
+	    long n = strtol(opt, &ptr, 10);
+	    if (n == 0 && ptr == opt) {
+	      error("bad integer `%1' in `l' option", opt);
+	      opt = 0;
+	      break;
+	    }
+	    if (n < 0)
+	      n = 0;
+	    opt = ptr;
+	    sprintf(strchr(buf, '\0'), "+%ld", n);
+	  }
+	  strcat(buf, "D.y");
+	  if (*opt == ',')
+	    opt++;
+	  if (*opt != '\0') {
+	    char *ptr;
+	    long n = strtol(opt, &ptr, 10);
+	    if (n == 0 && ptr == opt) {
+	      error("bad integer `%1' in `l' option", opt);
+	      opt = 0;
+	      break;
+	    }
+	    if (n < 0)
+	      n = 0;
+	    sprintf(strchr(buf, '\0'), "-%ld", n);
+	    opt = ptr;
+	    if (*opt != '\0')
+	      error("argument to `l' option not of form `m,n'");
+	  }
+	  strcat(buf, "%a");
+	  if (!set_label_spec(buf))
+	    assert(0);
+	  done_spec = 1;
+	}
+	break;
+      case 'n':
+	search_default = 0;
+	opt++;
+	break;
+      case 'p':
+	{
+	  const char *filename = 0;
+	  if (*++opt == '\0') {
+	    if (argc > 1) {
+	      filename = *++argv;
+	      argc--;
+	    }
+	    else {
+	      error("option `p' requires an argument");
+	      usage(stderr);
+	      exit(1);
+	    }
+	  }
+	  else {
+	    filename = opt;
+	    opt = 0;
+	  }
+	  database_list.add_file(filename);
+	}
+	break;
+      case 's':
+	if (*++opt == '\0')
+	  sort_fields = "AD";
+	else {
+	  sort_fields = opt;
+	  opt = 0;
+	}
+	accumulate = 1;
+	break;
+      case 't':
+	{
+	  char *ptr;
+	  long n = strtol(opt, &ptr, 10);
+	  if (n == 0 && ptr == opt) {
+	    error("bad integer `%1' in `t' option", opt);
+	    opt = 0;
+	    break;
+	  }
+	  if (n < 1)
+	    n = 1;
+	  linear_truncate_len = int(n);
+	  opt = ptr;
+	  break;
+	}
+      case '-':
+	if (opt[1] == '\0') {
+	  finished_options = 1;
+	  opt++;
+	  break;
+	}
+	if (strcmp(opt,"-version")==0) {
+      case 'v':
+	  printf("GNU refer (groff) version %s\n", Version_string);
+	  exit(0);
+	  break;
+	}
+	if (strcmp(opt,"-help")==0) {
+	  usage(stdout);
+	  exit(0);
+	  break;
+	}
+	// fall through
+      default:
+	error("unrecognized option `%1'", *opt);
+	usage(stderr);
+	exit(1);
+	break;
+      }
+    }
+  }
+  if (!done_spec)
+    set_label_spec("%1");
+  if (argc <= 0) {
+    if (bib_flag)
+      do_bib("-");
+    else
+      do_file("-");
+  }
+  else {
+    for (int i = 0; i < argc; i++) {
+      if (bib_flag)
+	do_bib(argv[i]);
+      else
+	do_file(argv[i]);
+    }
+  }
+  if (accumulate)
+    output_references();
+  if (fflush(stdout) < 0)
+    fatal("output error");
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream,
+"usage: %s [-benvCPRS] [-aN] [-cXYZ] [-fN] [-iXYZ] [-kX] [-lM,N] [-p file]\n"
+"       [-sXYZ] [-tN] [-BL.M] [files ...]\n",
+	  program_name);
+}
+
+static void possibly_load_default_database()
+{
+  if (search_default && !default_database_loaded) {
+    char *filename = getenv("REFER");
+    if (filename)
+      database_list.add_file(filename);
+    else
+      database_list.add_file(DEFAULT_INDEX, 1);
+    default_database_loaded = 1;
+  }
+}
+
+static int is_list(const string &str)
+{
+  const char *start = str.contents();
+  const char *end = start + str.length();
+  while (end > start && csspace(end[-1]))
+    end--;
+  while (start < end && csspace(*start))
+    start++;
+  return end - start == 6 && memcmp(start, "$LIST$", 6) == 0;
+}
+
+static void do_file(const char *filename)
+{
+  FILE *fp;
+  if (strcmp(filename, "-") == 0) {
+    fp = stdin;
+  }
+  else {
+    errno = 0;
+    fp = fopen(filename, "r");
+    if (fp == 0) {
+      error("can't open `%1': %2", filename, strerror(errno));
+      return;
+    }
+  }
+  current_filename = filename;
+  fprintf(outfp, ".lf 1 %s\n", filename);
+  string line;
+  current_lineno = 0;
+  for (;;) {
+    line.clear();
+    for (;;) {
+      int c = getc(fp);
+      if (c == EOF) {
+	if (line.length() > 0)
+	  line += '\n';
+	break;
+      }
+      if (invalid_input_char(c))
+	error("invalid input character code %1", c);
+      else {
+	line += c;
+	if (c == '\n')
+	  break;
+      }
+    }
+    int len = line.length();
+    if (len == 0)
+      break;
+    current_lineno++;
+    if (len >= 2 && line[0] == '.' && line[1] == '[') {
+      int start_lineno = current_lineno;
+      int start_of_line = 1;
+      string str;
+      string post;
+      string pre(line.contents() + 2, line.length() - 3);
+      for (;;) {
+	int c = getc(fp);
+	if (c == EOF) {
+	  error_with_file_and_line(current_filename, start_lineno,
+				   "missing `.]' line");
+	  break;
+	}
+	if (start_of_line)
+	  current_lineno++;
+	if (start_of_line && c == '.') {
+	  int d = getc(fp);
+	  if (d == ']') {
+	    while ((d = getc(fp)) != '\n' && d != EOF) {
+	      if (invalid_input_char(d))
+		error("invalid input character code %1", d);
+	      else
+		post += d;
+	    }
+	    break;
+	  }
+	  if (d != EOF)
+	    ungetc(d, fp);
+	}
+	if (invalid_input_char(c))
+	  error("invalid input character code %1", c);
+	else
+	  str += c;
+	start_of_line = (c == '\n');
+      }
+      if (is_list(str)) {
+	output_pending_line();
+	if (accumulate)
+	  output_references();
+	else
+	  error("found `$LIST$' but not accumulating references");
+      }
+      else {
+	unsigned flags = (accumulate
+			  ? store_reference(str)
+			  : immediately_handle_reference(str));
+	if (label_in_text) {
+	  if (accumulate && outfp == stdout)
+	    divert_to_temporary_file();
+	  if (pending_line.length() == 0) {
+	    warning("can't attach citation to previous line");
+	  }
+	  else
+	    pending_line.set_length(pending_line.length() - 1);
+	  string punct;
+	  if (move_punctuation)
+	    split_punct(pending_line, punct);
+	  int have_text = pre.length() > 0 || post.length() > 0;
+	  label_type lt = label_type(flags & ~(FORCE_LEFT_BRACKET
+					       |FORCE_RIGHT_BRACKET));
+	  if ((flags & FORCE_LEFT_BRACKET) || !have_text)
+	    pending_line += PRE_LABEL_MARKER;
+	  pending_line += pre;
+	  char lm = LABEL_MARKER + (int)lt;
+	  pending_line += lm;
+	  pending_line += post;
+	  if ((flags & FORCE_RIGHT_BRACKET) || !have_text)
+	    pending_line += POST_LABEL_MARKER;
+	  pending_line += punct;
+	  pending_line += '\n';
+	}
+      }
+      need_syncing = 1;
+    }
+    else if (len >= 4
+	     && line[0] == '.' && line[1] == 'l' && line[2] == 'f'
+	     && (compatible_flag || line[3] == '\n' || line[3] == ' ')) {
+      pending_lf_lines += line;
+      line += '\0';
+      if (interpret_lf_args(line.contents() + 3))
+	current_lineno--;
+    }
+    else if (recognize_R1_R2
+	     && len >= 4
+	     && line[0] == '.' && line[1] == 'R' && line[2] == '1'
+	     && (compatible_flag || line[3] == '\n' || line[3] == ' ')) {
+      line.clear();
+      int start_of_line = 1;
+      int start_lineno = current_lineno;
+      for (;;) {
+	int c = getc(fp);
+	if (c != EOF && start_of_line)
+	  current_lineno++;
+	if (start_of_line && c == '.') {
+	  c = getc(fp);
+	  if (c == 'R') {
+	    c = getc(fp);
+	    if (c == '2') {
+	      c = getc(fp);
+	      if (compatible_flag || c == ' ' || c == '\n' || c == EOF) {
+		while (c != EOF && c != '\n')
+		  c = getc(fp);
+		break;
+	      }
+	      else {
+		line += '.';
+		line += 'R';
+		line += '2';
+	      }
+	    }
+	    else {
+	      line += '.';
+	      line += 'R';
+	    }
+	  }
+	  else
+	    line += '.';
+	}
+	if (c == EOF) {
+	  error_with_file_and_line(current_filename, start_lineno,
+				   "missing `.R2' line");
+	  break;
+	}
+	if (invalid_input_char(c))
+	  error("invalid input character code %1", int(c));
+	else {
+	  line += c;
+	  start_of_line = c == '\n';
+	}
+      }
+      output_pending_line();
+      if (accumulate)
+	output_references();
+      else
+	nreferences = 0;
+      process_commands(line, current_filename, start_lineno + 1);
+      need_syncing = 1;
+    }
+    else {
+      output_pending_line();
+      pending_line = line;
+    }
+  }
+  need_syncing = 0;
+  output_pending_line();
+  if (fp != stdin)
+    fclose(fp);
+}
+
+class label_processing_state {
+  enum {
+    NORMAL,
+    PENDING_LABEL,
+    PENDING_LABEL_POST,
+    PENDING_LABEL_POST_PRE,
+    PENDING_POST
+    } state;
+  label_type type;		// type of pending labels
+  int count;			// number of pending labels
+  reference **rptr;		// pointer to next reference
+  int rcount;			// number of references left
+  FILE *fp;
+  int handle_pending(int c);
+public:
+  label_processing_state(reference **, int, FILE *);
+  ~label_processing_state();
+  void process(int c);
+};
+
+static void output_pending_line()
+{
+  if (label_in_text && !accumulate && ncitations > 0) {
+    label_processing_state state(citation, ncitations, outfp);
+    int len = pending_line.length();
+    for (int i = 0; i < len; i++)
+      state.process((unsigned char)(pending_line[i]));
+  }
+  else
+    put_string(pending_line, outfp);
+  pending_line.clear();
+  if (pending_lf_lines.length() > 0) {
+    put_string(pending_lf_lines, outfp);
+    pending_lf_lines.clear();
+  }
+  if (!accumulate)
+    immediately_output_references();
+  if (need_syncing) {
+    fprintf(outfp, ".lf %d %s\n", current_lineno, current_filename);
+    need_syncing = 0;
+  }
+}
+
+static void split_punct(string &line, string &punct)
+{
+  const char *start = line.contents();
+  const char *end = start + line.length();
+  const char *ptr = start;
+  const char *last_token_start = 0;
+  for (;;) {
+    if (ptr >= end)
+      break;
+    last_token_start = ptr;
+    if (*ptr == PRE_LABEL_MARKER || *ptr == POST_LABEL_MARKER
+	|| (*ptr >= LABEL_MARKER && *ptr < LABEL_MARKER + N_LABEL_TYPES))
+      ptr++;
+    else if (!get_token(&ptr, end))
+      break;
+  }
+  if (last_token_start) {
+    const token_info *ti = lookup_token(last_token_start, end);
+    if (ti->is_punct()) {
+      punct.append(last_token_start, end - last_token_start);
+      line.set_length(last_token_start - start);
+    }
+  }
+}
+
+static void divert_to_temporary_file()
+{
+  outfp = xtmpfile();
+}
+
+static void store_citation(reference *ref)
+{
+  if (ncitations >= citation_max) {
+    if (citation == 0)
+      citation = new reference*[citation_max = 100];
+    else {
+      reference **old_citation = citation;
+      citation_max *= 2;
+      citation = new reference *[citation_max];
+      memcpy(citation, old_citation, ncitations*sizeof(reference *));
+      a_delete old_citation;
+    }
+  }
+  citation[ncitations++] = ref;
+}
+
+static unsigned store_reference(const string &str)
+{
+  if (reference_hash_table == 0) {
+    reference_hash_table = new reference *[17];
+    hash_table_size = 17;
+    for (int i = 0; i < hash_table_size; i++)
+      reference_hash_table[i] = 0;
+  }
+  unsigned flags;
+  reference *ref = make_reference(str, &flags);
+  ref->compute_hash_code();
+  unsigned h = ref->hash();
+  reference **ptr;
+  for (ptr = reference_hash_table + (h % hash_table_size);
+       *ptr != 0;
+       ((ptr == reference_hash_table)
+	? (ptr = reference_hash_table + hash_table_size - 1)
+	: --ptr))
+    if (same_reference(**ptr, *ref))
+      break;
+  if (*ptr != 0) {
+    if (ref->is_merged())
+      warning("fields ignored because reference already used");
+    delete ref;
+    ref = *ptr;
+  }
+  else {
+    *ptr = ref;
+    ref->set_number(nreferences);
+    nreferences++;
+    ref->pre_compute_label();
+    ref->compute_sort_key();
+    if (nreferences*2 >= hash_table_size) {
+      // Rehash it.
+      reference **old_table = reference_hash_table;
+      int old_size = hash_table_size;
+      hash_table_size = next_size(hash_table_size);
+      reference_hash_table = new reference*[hash_table_size];
+      int i;
+      for (i = 0; i < hash_table_size; i++)
+	reference_hash_table[i] = 0;
+      for (i = 0; i < old_size; i++)
+	if (old_table[i]) {
+	  reference **p;
+	  for (p = (reference_hash_table
+				+ (old_table[i]->hash() % hash_table_size));
+	       *p;
+	       ((p == reference_hash_table)
+		? (p = reference_hash_table + hash_table_size - 1)
+		: --p))
+	    ;
+	  *p = old_table[i];
+	}
+      a_delete old_table;
+    }
+  }
+  if (label_in_text)
+    store_citation(ref);
+  return flags;
+}
+
+unsigned immediately_handle_reference(const string &str)
+{
+  unsigned flags;
+  reference *ref = make_reference(str, &flags);
+  ref->set_number(nreferences);
+  if (label_in_text || label_in_reference) {
+    ref->pre_compute_label();
+    ref->immediate_compute_label();
+  }
+  nreferences++;
+  store_citation(ref);
+  return flags;
+}
+
+static void immediately_output_references()
+{
+  for (int i = 0; i < ncitations; i++) {
+    reference *ref = citation[i];
+    if (label_in_reference) {
+      fputs(".ds [F ", outfp);
+      const string &label = ref->get_label(NORMAL_LABEL);
+      if (label.length() > 0
+	  && (label[0] == ' ' || label[0] == '\\' || label[0] == '"'))
+	putc('"', outfp);
+      put_string(label, outfp);
+      putc('\n', outfp);
+    }
+    ref->output(outfp);
+    delete ref;
+  }
+  ncitations = 0;
+}
+
+static void output_citation_group(reference **v, int n, label_type type,
+				  FILE *fp)
+{
+  if (sort_adjacent_labels) {
+    // Do an insertion sort.  Usually n will be very small.
+    for (int i = 1; i < n; i++) {
+      int num = v[i]->get_number();
+      reference *temp = v[i];
+      int j;
+      for (j = i - 1; j >= 0 && v[j]->get_number() > num; j--)
+	v[j + 1] = v[j];
+      v[j + 1] = temp;
+    }
+  }
+  // This messes up if !accumulate.
+  if (accumulate && n > 1) {
+    // remove duplicates
+    int j = 1;
+    for (int i = 1; i < n; i++)
+      if (v[i]->get_label(type) != v[i - 1]->get_label(type))
+	v[j++] = v[i];
+    n = j;
+  }
+  string merged_label;
+  for (int i = 0; i < n; i++) {
+    int nmerged = v[i]->merge_labels(v + i + 1, n - i - 1, type, merged_label);
+    if (nmerged > 0) {
+      put_string(merged_label, fp);
+      i += nmerged;
+    }
+    else
+      put_string(v[i]->get_label(type), fp);
+    if (i < n - 1)
+      put_string(sep_label, fp);
+  }
+}
+
+
+label_processing_state::label_processing_state(reference **p, int n, FILE *f)
+: state(NORMAL), count(0), rptr(p), rcount(n), fp(f)
+{
+}
+
+label_processing_state::~label_processing_state()
+{
+  int handled = handle_pending(EOF);
+  assert(!handled);
+  assert(rcount == 0);
+}
+
+int label_processing_state::handle_pending(int c)
+{
+  switch (state) {
+  case NORMAL:
+    break;
+  case PENDING_LABEL:
+    if (c == POST_LABEL_MARKER) {
+      state = PENDING_LABEL_POST;
+      return 1;
+    }
+    else {
+      output_citation_group(rptr, count, type, fp);
+      rptr += count ;
+      rcount -= count;
+      state = NORMAL;
+    }
+    break;
+  case PENDING_LABEL_POST:
+    if (c == PRE_LABEL_MARKER) {
+      state = PENDING_LABEL_POST_PRE;
+      return 1;
+    }
+    else {
+      output_citation_group(rptr, count, type, fp);
+      rptr += count;
+      rcount -= count;
+      put_string(post_label, fp);
+      state = NORMAL;
+    }
+    break;
+  case PENDING_LABEL_POST_PRE:
+    if (c >= LABEL_MARKER
+	&& c < LABEL_MARKER + N_LABEL_TYPES
+	&& c - LABEL_MARKER == type) {
+      count += 1;
+      state = PENDING_LABEL;
+      return 1;
+    }
+    else {
+      output_citation_group(rptr, count, type, fp);
+      rptr += count;
+      rcount -= count;
+      put_string(sep_label, fp);
+      state = NORMAL;
+    }
+    break;
+  case PENDING_POST:
+    if (c == PRE_LABEL_MARKER) {
+      put_string(sep_label, fp);
+      state = NORMAL;
+      return 1;
+    }
+    else {
+      put_string(post_label, fp);
+      state = NORMAL;
+    }
+    break;
+  }
+  return 0;
+}
+
+void label_processing_state::process(int c)
+{
+  if (handle_pending(c))
+    return;
+  assert(state == NORMAL);
+  switch (c) {
+  case PRE_LABEL_MARKER:
+    put_string(pre_label, fp);
+    state = NORMAL;
+    break;
+  case POST_LABEL_MARKER:
+    state = PENDING_POST;
+    break;
+  case LABEL_MARKER:
+  case LABEL_MARKER + 1:
+    count = 1;
+    state = PENDING_LABEL;
+    type = label_type(c - LABEL_MARKER);
+    break;
+  default:
+    state = NORMAL;
+    putc(c, fp);
+    break;
+  }
+}
+
+extern "C" {
+
+int rcompare(const void *p1, const void *p2)
+{
+  return compare_reference(**(reference **)p1, **(reference **)p2);
+}
+
+}
+
+void output_references()
+{
+  assert(accumulate);
+  if (nreferences > 0) {
+    int j = 0;
+    int i;
+    for (i = 0; i < hash_table_size; i++)
+      if (reference_hash_table[i] != 0)
+	reference_hash_table[j++] = reference_hash_table[i];
+    assert(j == nreferences);
+    for (; j < hash_table_size; j++)
+      reference_hash_table[j] = 0;
+    qsort(reference_hash_table, nreferences, sizeof(reference*), rcompare);
+    for (i = 0; i < nreferences; i++)
+      reference_hash_table[i]->set_number(i);
+    compute_labels(reference_hash_table, nreferences);
+  }
+  if (outfp != stdout) {
+    rewind(outfp);
+    {
+      label_processing_state state(citation, ncitations, stdout);
+      int c;
+      while ((c = getc(outfp)) != EOF)
+	state.process(c);
+    }
+    ncitations = 0;
+    fclose(outfp);
+    outfp = stdout;
+  }
+  if (nreferences > 0) {
+    fputs(".]<\n", outfp);
+    for (int i = 0; i < nreferences; i++) {
+      if (sort_fields.length() > 0)
+	reference_hash_table[i]->print_sort_key_comment(outfp);
+      if (label_in_reference) {
+	fputs(".ds [F ", outfp);
+	const string &label = reference_hash_table[i]->get_label(NORMAL_LABEL);
+	if (label.length() > 0
+	    && (label[0] == ' ' || label[0] == '\\' || label[0] == '"'))
+	  putc('"', outfp);
+	put_string(label, outfp);
+	putc('\n', outfp);
+      }
+      reference_hash_table[i]->output(outfp);
+      delete reference_hash_table[i];
+      reference_hash_table[i] = 0;
+    }
+    fputs(".]>\n", outfp);
+    nreferences = 0;
+  }
+  clear_labels();
+}
+
+static reference *find_reference(const char *query, int query_len)
+{
+  // This is so that error messages look better.
+  while (query_len > 0 && csspace(query[query_len - 1]))
+    query_len--;
+  string str;
+  for (int i = 0; i < query_len; i++)
+    str += query[i] == '\n' ? ' ' : query[i];
+  str += '\0';
+  possibly_load_default_database();
+  search_list_iterator iter(&database_list, str.contents());
+  reference_id rid;
+  const char *start;
+  int len;
+  if (!iter.next(&start, &len, &rid)) {
+    error("no matches for `%1'", str.contents());
+    return 0;
+  }
+  const char *end = start + len;
+  while (start < end) {
+    if (*start == '%')
+      break;
+    while (start < end && *start++ != '\n')
+      ;
+  }
+  if (start >= end) {
+    error("found a reference for `%1' but it didn't contain any fields",
+	  str.contents());
+    return 0;
+  }
+  reference *result = new reference(start, end - start, &rid);
+  if (iter.next(&start, &len, &rid))
+    warning("multiple matches for `%1'", str.contents());
+  return result;
+}
+
+static reference *make_reference(const string &str, unsigned *flagsp)
+{
+  const char *start = str.contents();
+  const char *end = start + str.length();
+  const char *ptr = start;
+  while (ptr < end) {
+    if (*ptr == '%')
+      break;
+    while (ptr < end && *ptr++ != '\n')
+      ;
+  }
+  *flagsp = 0;
+  for (; start < ptr; start++) {
+    if (*start == '#')
+      *flagsp = (SHORT_LABEL | (*flagsp & (FORCE_RIGHT_BRACKET
+					   | FORCE_LEFT_BRACKET)));
+    else if (*start == '[')
+      *flagsp |= FORCE_LEFT_BRACKET;
+    else if (*start == ']')
+      *flagsp |= FORCE_RIGHT_BRACKET;
+    else if (!csspace(*start))
+      break;
+  }
+  if (start >= end) {
+    error("empty reference");
+    return new reference;
+  }
+  reference *database_ref = 0;
+  if (start < ptr)
+    database_ref = find_reference(start, ptr - start);
+  reference *inline_ref = 0;
+  if (ptr < end)
+    inline_ref = new reference(ptr, end - ptr);
+  if (inline_ref) {
+    if (database_ref) {
+      database_ref->merge(*inline_ref);
+      delete inline_ref;
+      return database_ref;
+    }
+    else
+      return inline_ref;
+  }
+  else if (database_ref)
+    return database_ref;
+  else
+    return new reference;
+}
+
+static void do_ref(const string &str)
+{
+  if (accumulate)
+    (void)store_reference(str);
+  else {
+    (void)immediately_handle_reference(str);
+    immediately_output_references();
+  }
+}
+
+static void trim_blanks(string &str)
+{
+  const char *start = str.contents();
+  const char *end = start + str.length();
+  while (end > start && end[-1] != '\n' && csspace(end[-1]))
+    --end;
+  str.set_length(end - start);
+}
+
+void do_bib(const char *filename)
+{
+  FILE *fp;
+  if (strcmp(filename, "-") == 0)
+    fp = stdin;
+  else {
+    errno = 0;
+    fp = fopen(filename, "r");
+    if (fp == 0) {
+      error("can't open `%1': %2", filename, strerror(errno));
+      return;
+    }
+    current_filename = filename;
+  }
+  enum {
+    START, MIDDLE, BODY, BODY_START, BODY_BLANK, BODY_DOT
+    } state = START;
+  string body;
+  for (;;) {
+    int c = getc(fp);
+    if (c == EOF)
+      break;
+    if (invalid_input_char(c)) {
+      error("invalid input character code %1", c);
+      continue;
+    }
+    switch (state) {
+    case START:
+      if (c == '%') {
+	body = c;
+	state = BODY;
+      }
+      else if (c != '\n')
+	state = MIDDLE;
+      break;
+    case MIDDLE:
+      if (c == '\n')
+	state = START;
+      break;
+    case BODY:
+      body += c;
+      if (c == '\n')
+	state = BODY_START;
+      break;
+    case BODY_START:
+      if (c == '\n') {
+	do_ref(body);
+	state = START;
+      }
+      else if (c == '.')
+	state = BODY_DOT;
+      else if (csspace(c)) {
+	state = BODY_BLANK;
+	body += c;
+      }
+      else {
+	body += c;
+	state = BODY;
+      }
+      break;
+    case BODY_BLANK:
+      if (c == '\n') {
+	trim_blanks(body);
+	do_ref(body);
+	state = START;
+      }
+      else if (csspace(c))
+	body += c;
+      else {
+	body += c;
+	state = BODY;
+      }
+      break;
+    case BODY_DOT:
+      if (c == ']') {
+	do_ref(body);
+	state = MIDDLE;
+      }
+      else {
+	body += '.';
+	body += c;
+	state = c == '\n' ? BODY_START : BODY;
+      }
+      break;
+    default:
+      assert(0);
+    }
+    if (c == '\n')
+      current_lineno++;
+  }
+  switch (state) {
+  case START:
+  case MIDDLE:
+    break;
+  case BODY:
+    body += '\n';
+    do_ref(body);
+    break;
+  case BODY_DOT:
+  case BODY_START:
+    do_ref(body);
+    break;
+  case BODY_BLANK:
+    trim_blanks(body);
+    do_ref(body);
+    break;
+  }
+  fclose(fp);
+}
+
+// from the Dragon Book
+
+unsigned hash_string(const char *s, int len)
+{
+  const char *end = s + len;
+  unsigned h = 0, g;
+  while (s < end) {
+    h <<= 4;
+    h += *s++;
+    if ((g = h & 0xf0000000) != 0) {
+      h ^= g >> 24;
+      h ^= g;
+    }
+  }
+  return h;
+}
+
+int next_size(int n)
+{
+  static const int table_sizes[] = { 
+    101, 503, 1009, 2003, 3001, 4001, 5003, 10007, 20011, 40009,
+    80021, 160001, 500009, 1000003, 2000003, 4000037, 8000009,
+    16000057, 32000011, 64000031, 128000003, 0 
+  };
+
+  const int *p;
+  for (p = table_sizes; *p <= n && *p != 0; p++)
+    ;
+  assert(*p != 0);
+  return *p;
+}
+
diff --git a/contrib/groff/src/preproc/refer/refer.man b/contrib/groff/src/preproc/refer/refer.man
index d8468bb..d39d85d 100644
--- a/contrib/groff/src/preproc/refer/refer.man
+++ b/contrib/groff/src/preproc/refer/refer.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -67,7 +67,7 @@ This file documents the GNU version of
 which is part of the groff document formatting system.
 .B refer
 copies the contents of
-.IR filename \|.\|.\|.
+.IR filename \|.\|.\|.\&
 to the standard output,
 except that lines between
 .B .[
@@ -290,7 +290,7 @@ field or a
 field.
 .TP
 .B B
-For an article that is part of a book, the title of the book
+For an article that is part of a book, the title of the book.
 .TP
 .B C
 The place (city) of publication.
@@ -1289,6 +1289,10 @@ Default database.
 .TP
 .IB file @INDEX_SUFFIX@
 Index files.
+.SH ENVIRONMENT
+.Tp \w'\fBREFER'u+2n
+.B REFER
+If set, overrides the default database.
 .SH "SEE ALSO"
 .BR @g@indxbib (@MAN1EXT@),
 .BR @g@lookbib (@MAN1EXT@),
diff --git a/contrib/groff/src/preproc/refer/token.cpp b/contrib/groff/src/preproc/refer/token.cpp
new file mode 100644
index 0000000..e9fac5d
--- /dev/null
+++ b/contrib/groff/src/preproc/refer/token.cpp
@@ -0,0 +1,378 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "refer.h"
+#include "token.h"
+
+#define TOKEN_TABLE_SIZE 1009
+// I believe in Icelandic thorn sorts after z.
+#define THORN_SORT_KEY "{"
+
+struct token_table_entry {
+  const char *tok;
+  token_info ti;
+  token_table_entry();
+};
+
+token_table_entry token_table[TOKEN_TABLE_SIZE];
+int ntokens = 0;
+
+static void skip_name(const char **ptr, const char *end)
+{
+  if (*ptr < end) {
+    switch (*(*ptr)++) {
+    case '(':
+      if (*ptr < end) {
+	*ptr += 1;
+	if (*ptr < end)
+	  *ptr += 1;
+      }
+      break;
+    case '[':
+      while (*ptr < end)
+	if (*(*ptr)++ == ']')
+	  break;
+      break;
+    }
+  }
+}
+
+int get_token(const char **ptr, const char *end)
+{
+  if (*ptr >= end)
+    return 0;
+  char c = *(*ptr)++;
+  if (c == '\\' && *ptr < end) {
+    switch (**ptr) {
+    default:
+      *ptr += 1;
+      break;
+    case '(':
+    case '[':
+      skip_name(ptr, end);
+      break;
+    case '*':
+    case 'f':
+      *ptr += 1;
+      skip_name(ptr, end);
+      break;
+    }
+  }
+  return 1;
+}
+
+token_info::token_info()
+: type(TOKEN_OTHER), sort_key(0), other_case(0)
+{
+}
+
+void token_info::set(token_type t, const char *sk, const char *oc)
+{
+  assert(oc == 0 || t == TOKEN_UPPER || t == TOKEN_LOWER);
+  type = t;
+  sort_key = sk;
+  other_case = oc;
+}
+
+void token_info::sortify(const char *start, const char *end, string &result)
+     const
+{
+  if (sort_key)
+    result += sort_key;
+  else if (type == TOKEN_UPPER || type == TOKEN_LOWER) {
+    for (; start < end; start++)
+      if (csalpha(*start))
+	result += cmlower(*start);
+  }
+}
+
+int token_info::sortify_non_empty(const char *start, const char *end) const
+{
+  if (sort_key)
+    return *sort_key != '\0';
+  if (type != TOKEN_UPPER && type != TOKEN_LOWER)
+    return 0;
+  for (; start < end; start++)
+    if (csalpha(*start))
+      return 1;
+  return 0;
+}
+
+
+void token_info::lower_case(const char *start, const char *end,
+			    string &result) const
+{
+  if (type != TOKEN_UPPER) {
+    while (start < end)
+      result += *start++;
+  }
+  else if (other_case)
+    result += other_case;
+  else {
+    while (start < end)
+      result += cmlower(*start++);
+  }
+}
+
+void token_info::upper_case(const char *start, const char *end,
+			    string &result) const
+{
+  if (type != TOKEN_LOWER) {
+    while (start < end)
+      result += *start++;
+  }
+  else if (other_case)
+    result += other_case;
+  else {
+    while (start < end)
+      result += cmupper(*start++);
+  }
+}
+
+token_table_entry::token_table_entry()
+: tok(0)
+{
+}
+
+static void store_token(const char *tok, token_type typ,
+			const char *sk = 0, const char *oc = 0)
+{
+  unsigned n = hash_string(tok, strlen(tok)) % TOKEN_TABLE_SIZE;
+  for (;;) {
+    if (token_table[n].tok == 0) {
+      if (++ntokens == TOKEN_TABLE_SIZE)
+	assert(0);
+      token_table[n].tok = tok;
+      break;
+    }
+    if (strcmp(tok, token_table[n].tok) == 0)
+      break;
+    if (n == 0)
+      n = TOKEN_TABLE_SIZE - 1;
+    else
+      --n;
+  }
+  token_table[n].ti.set(typ, sk, oc);
+}
+
+
+token_info default_token_info;
+
+const token_info *lookup_token(const char *start, const char *end)
+{
+  unsigned n = hash_string(start, end - start) % TOKEN_TABLE_SIZE;
+  for (;;) {
+    if (token_table[n].tok == 0)
+      break;
+    if (strlen(token_table[n].tok) == size_t(end - start)
+	&& memcmp(token_table[n].tok, start, end - start) == 0)
+      return &(token_table[n].ti);
+    if (n == 0)
+      n = TOKEN_TABLE_SIZE - 1;
+    else
+      --n;
+  }
+  return &default_token_info;
+}
+
+static void init_ascii()
+{
+  const char *p;
+  for (p = "abcdefghijklmnopqrstuvwxyz"; *p; p++) {
+    char buf[2];
+    buf[0] = *p;
+    buf[1] = '\0';
+    store_token(strsave(buf), TOKEN_LOWER);
+    buf[0] = cmupper(buf[0]);
+    store_token(strsave(buf), TOKEN_UPPER);
+  }
+  for (p = "0123456789"; *p; p++) {
+    char buf[2];
+    buf[0] = *p;
+    buf[1] = '\0';
+    const char *s = strsave(buf);
+    store_token(s, TOKEN_OTHER, s);
+  }
+  for (p = ".,:;?!"; *p; p++) {
+    char buf[2];
+    buf[0] = *p;
+    buf[1] = '\0';
+    store_token(strsave(buf), TOKEN_PUNCT);
+  }
+  store_token("-", TOKEN_HYPHEN);
+}
+
+static void store_letter(const char *lower, const char *upper,
+		  const char *sort_key = 0)
+{
+  store_token(lower, TOKEN_LOWER, sort_key, upper);
+  store_token(upper, TOKEN_UPPER, sort_key, lower);
+}
+
+static void init_letter(unsigned char uc_code, unsigned char lc_code,
+		 const char *sort_key)
+{
+  char lbuf[2];
+  lbuf[0] = lc_code;
+  lbuf[1] = 0;
+  char ubuf[2];
+  ubuf[0] = uc_code;
+  ubuf[1] = 0;
+  store_letter(strsave(lbuf), strsave(ubuf), sort_key);
+}
+
+static void init_latin1()
+{
+  init_letter(0xc0, 0xe0, "a");
+  init_letter(0xc1, 0xe1, "a");
+  init_letter(0xc2, 0xe2, "a");
+  init_letter(0xc3, 0xe3, "a");
+  init_letter(0xc4, 0xe4, "a");
+  init_letter(0xc5, 0xe5, "a");
+  init_letter(0xc6, 0xe6, "ae");
+  init_letter(0xc7, 0xe7, "c");
+  init_letter(0xc8, 0xe8, "e");
+  init_letter(0xc9, 0xe9, "e");
+  init_letter(0xca, 0xea, "e");
+  init_letter(0xcb, 0xeb, "e");
+  init_letter(0xcc, 0xec, "i");
+  init_letter(0xcd, 0xed, "i");
+  init_letter(0xce, 0xee, "i");
+  init_letter(0xcf, 0xef, "i");
+
+  init_letter(0xd0, 0xf0, "d");
+  init_letter(0xd1, 0xf1, "n");
+  init_letter(0xd2, 0xf2, "o");
+  init_letter(0xd3, 0xf3, "o");
+  init_letter(0xd4, 0xf4, "o");
+  init_letter(0xd5, 0xf5, "o");
+  init_letter(0xd6, 0xf6, "o");
+  init_letter(0xd8, 0xf8, "o");
+  init_letter(0xd9, 0xf9, "u");
+  init_letter(0xda, 0xfa, "u");
+  init_letter(0xdb, 0xfb, "u");
+  init_letter(0xdc, 0xfc, "u");
+  init_letter(0xdd, 0xfd, "y");
+  init_letter(0xde, 0xfe, THORN_SORT_KEY);
+
+  store_token("\337", TOKEN_LOWER, "ss", "SS");
+  store_token("\377", TOKEN_LOWER, "y", "Y");
+}
+
+static void init_two_char_letter(char l1, char l2, char u1, char u2,
+				 const char *sk = 0)
+{
+  char buf[6];
+  buf[0] = '\\';
+  buf[1] = '(';
+  buf[2] = l1;
+  buf[3] = l2;
+  buf[4] = '\0';
+  const char *p = strsave(buf);
+  buf[2] = u1;
+  buf[3] = u2;
+  store_letter(p, strsave(buf), sk);
+  buf[1] = '[';
+  buf[4] = ']';
+  buf[5] = '\0';
+  p = strsave(buf);
+  buf[2] = l1;
+  buf[3] = l2;
+  store_letter(strsave(buf), p, sk);
+  
+}
+
+static void init_special_chars()
+{
+  const char *p;
+  for (p = "':^`~"; *p; p++)
+    for (const char *q = "aeiouy"; *q; q++) {
+      // Use a variable to work around bug in gcc 2.0
+      char c = cmupper(*q);
+      init_two_char_letter(*p, *q, *p, c);
+    }
+  for (p = "/l/o~n,coeaeij"; *p; p += 2) {
+    // Use variables to work around bug in gcc 2.0
+    char c0 = cmupper(p[0]);
+    char c1 = cmupper(p[1]);
+    init_two_char_letter(p[0], p[1], c0, c1);
+  }
+  init_two_char_letter('v', 's', 'v', 'S', "s");
+  init_two_char_letter('v', 'z', 'v', 'Z', "z");
+  init_two_char_letter('o', 'a', 'o', 'A', "a");
+  init_two_char_letter('T', 'p', 'T', 'P', THORN_SORT_KEY);
+  init_two_char_letter('-', 'd', '-', 'D');
+  
+  store_token("\\(ss", TOKEN_LOWER, 0, "SS");
+  store_token("\\[ss]", TOKEN_LOWER, 0, "SS");
+
+  store_token("\\(Sd", TOKEN_LOWER, "d", "\\(-D");
+  store_token("\\[Sd]", TOKEN_LOWER, "d", "\\[-D]");
+  store_token("\\(hy", TOKEN_HYPHEN);
+  store_token("\\[hy]", TOKEN_HYPHEN);
+  store_token("\\(en", TOKEN_RANGE_SEP);
+  store_token("\\[en]", TOKEN_RANGE_SEP);
+}
+
+static void init_strings()
+{
+  char buf[6];
+  buf[0] = '\\';
+  buf[1] = '*';
+  for (const char *p = "'`^^,:~v_o./;"; *p; p++) {
+    buf[2] = *p;
+    buf[3] = '\0';
+    store_token(strsave(buf), TOKEN_ACCENT);
+    buf[2] = '[';
+    buf[3] = *p;
+    buf[4] = ']';
+    buf[5] = '\0';
+    store_token(strsave(buf), TOKEN_ACCENT);
+  }
+
+  // -ms special letters
+  store_letter("\\*(th", "\\*(Th", THORN_SORT_KEY);
+  store_letter("\\*[th]", "\\*[Th]", THORN_SORT_KEY);
+  store_letter("\\*(d-", "\\*(D-");
+  store_letter("\\*[d-]", "\\*[D-]");
+  store_letter("\\*(ae", "\\*(Ae", "ae");
+  store_letter("\\*[ae]", "\\*[Ae]", "ae");
+  store_letter("\\*(oe", "\\*(Oe", "oe");
+  store_letter("\\*[oe]", "\\*[Oe]", "oe");
+
+  store_token("\\*3", TOKEN_LOWER, "y", "Y");
+  store_token("\\*8", TOKEN_LOWER, "ss", "SS");
+  store_token("\\*q", TOKEN_LOWER, "o", "O");
+}
+
+struct token_initer {
+  token_initer();
+};
+
+static token_initer the_token_initer;
+
+token_initer::token_initer()
+{
+  init_ascii();
+  init_latin1();
+  init_special_chars();
+  init_strings();
+  default_token_info.set(TOKEN_OTHER);
+}
diff --git a/contrib/groff/src/preproc/soelim/Makefile.sub b/contrib/groff/src/preproc/soelim/Makefile.sub
index 4b59ab6..a43dfc2 100644
--- a/contrib/groff/src/preproc/soelim/Makefile.sub
+++ b/contrib/groff/src/preproc/soelim/Makefile.sub
@@ -2,5 +2,5 @@ PROG=soelim$(EXEEXT)
 MAN1=soelim.n
 XLIBS=$(LIBGROFF)
 OBJS=soelim.$(OBJEXT)
-CCSRCS=$(srcdir)/soelim.cc
+CCSRCS=$(srcdir)/soelim.cpp
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/preproc/soelim/soelim.cpp b/contrib/groff/src/preproc/soelim/soelim.cpp
new file mode 100644
index 0000000..96ad6dd
--- /dev/null
+++ b/contrib/groff/src/preproc/soelim/soelim.cpp
@@ -0,0 +1,359 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "nonposix.h"
+
+static size_t include_list_length;
+static const char **include_list;
+
+int compatible_flag = 0;
+int raw_flag = 0;
+int tex_flag = 0;
+
+extern int interpret_lf_args(const char *);
+extern "C" const char *Version_string;
+
+int do_file(const char *filename);
+
+
+static void
+include_path_append(const char *path)
+{
+  ++include_list_length;
+  size_t nbytes = include_list_length * sizeof(char *);
+  if (include_list)
+    include_list = (const char **)realloc((void *)include_list, nbytes);
+  else
+    include_list = (const char **)malloc(nbytes);
+  if (include_list == NULL)
+    {
+      fprintf(stderr, "%s: out of memory\n", program_name);
+      exit(2);
+    }
+  include_list[include_list_length - 1] = path;
+}
+
+
+void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [ -Crtv ] [ -I file ] [ files ]\n", program_name);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  include_path_append(".");
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "CI:rtv", long_options, NULL)) != EOF)
+    switch (opt) {
+    case 'v':
+      {
+	printf("GNU soelim (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'C':
+      compatible_flag = 1;
+      break;
+    case 'I':
+      include_path_append(optarg);
+      break;
+    case 'r':
+      raw_flag = 1;
+      break;
+    case 't':
+      tex_flag = 1;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  int nbad = 0;
+  if (optind >= argc)
+    nbad += !do_file("-");
+  else
+    for (int i = optind; i < argc; i++)
+      nbad += !do_file(argv[i]);
+  if (ferror(stdout) || fflush(stdout) < 0)
+    fatal("output error");
+  return nbad != 0;
+}
+
+void set_location()
+{
+  if(!raw_flag) {
+    if(!tex_flag)
+      printf(".lf %d %s\n", current_lineno, current_filename);
+    else
+      printf("%% file %s, line %d\n", current_filename, current_lineno);
+  }
+}
+
+void do_so(const char *line)
+{
+  const char *p = line;
+  while (*p == ' ')
+    p++;
+  string filename;
+  int success = 1;
+  for (const char *q = p;
+       success && *q != '\0' && *q != '\n' && *q != ' ';
+       q++)
+    if (*q == '\\') {
+      switch (*++q) {
+      case 'e':
+      case '\\':
+	filename += '\\';
+	break;
+      case ' ':
+	filename += ' ';
+	break;
+      default:
+	success = 0;
+	break;
+      }
+    }
+    else
+      filename += char(*q);
+  if (success && filename.length() > 0) {
+    filename += '\0';
+    const char *fn = current_filename;
+    int ln = current_lineno;
+    current_lineno--;
+    if (do_file(filename.contents())) {
+      current_filename = fn;
+      current_lineno = ln;
+      set_location();
+      return;
+    }
+    current_lineno++;
+  }
+  fputs(".so", stdout);
+  fputs(line, stdout);
+}
+
+int do_file(const char *filename)
+{
+  FILE *fp;
+  string whole_filename;
+  if (strcmp(filename, "-") == 0) {
+    fp = stdin;
+    whole_filename = filename;
+    whole_filename += '\0';
+  }
+  else if (IS_ABSOLUTE(filename)) {
+    whole_filename = filename;
+    whole_filename += '\0';
+    errno = 0;
+    fp = fopen(filename, "r");
+    if (fp == 0) {
+      error("can't open `%1': %2", filename, strerror(errno));
+      return 0;
+    }
+  }
+  else {
+    size_t j;
+    for (j = 0; j < include_list_length; ++j)
+    {
+      const char *path = include_list[j];
+      if (0 == strcmp(path, "."))
+	whole_filename = filename;
+      else
+	whole_filename = string(path) + "/" + filename;
+      whole_filename += '\0';
+      errno = 0;
+      fp = fopen(whole_filename.contents(), "r");
+      if (fp != 0)
+	break;
+      if (errno != ENOENT) {
+	error("can't open `%1': %2",
+	      whole_filename.contents(), strerror(errno));
+	return 0;
+      }
+    }
+    if (j >= include_list_length)
+    {
+      errno = ENOENT;
+      error("can't open `%1': %2", filename, strerror(errno));
+      return 0;
+    }
+  }
+  current_filename = whole_filename.contents();
+  current_lineno = 1;
+  set_location();
+  enum { START, MIDDLE, HAD_DOT, HAD_s, HAD_so, HAD_l, HAD_lf } state = START;
+  for (;;) {
+    int c = getc(fp);
+    if (c == EOF)
+      break;
+    switch (state) {
+    case START:
+      if (c == '.')
+	state = HAD_DOT;
+      else {
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case MIDDLE:
+      putchar(c);
+      if (c == '\n') {
+	current_lineno++;
+	state = START;
+      }
+      break;
+    case HAD_DOT:
+      if (c == 's')
+	state = HAD_s;
+      else if (c == 'l')
+	state = HAD_l;
+      else {
+	putchar('.');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_s:
+      if (c == 'o')
+	state = HAD_so;
+      else  {
+	putchar('.');
+	putchar('s');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_so:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	string line;
+	for (; c != EOF && c != '\n'; c = getc(fp))
+	  line += c;
+	current_lineno++;
+	line += '\n';
+	line += '\0';
+	do_so(line.contents());
+	state = START;
+      }
+      else {
+	fputs(".so", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    case HAD_l:
+      if (c == 'f')
+	state = HAD_lf;
+      else {
+	putchar('.');
+	putchar('l');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_lf:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	string line;
+	for (; c != EOF && c != '\n'; c = getc(fp))
+	  line += c;
+	current_lineno++;
+	line += '\n';
+	line += '\0';
+	interpret_lf_args(line.contents());
+	printf(".lf%s", line.contents());
+	state = START;
+      }
+      else {
+	fputs(".lf", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    default:
+      assert(0);
+    }
+  }
+  switch (state) {
+  case HAD_DOT:
+    fputs(".\n", stdout);
+    break;
+  case HAD_l:
+    fputs(".l\n", stdout);
+    break;
+  case HAD_s:
+    fputs(".s\n", stdout);
+    break;
+  case HAD_lf:
+    fputs(".lf\n", stdout);
+    break;
+  case HAD_so:
+    fputs(".so\n", stdout);
+    break;
+  case MIDDLE:
+    putc('\n', stdout);
+    break;
+  case START:
+    break;
+  }
+  if (fp != stdin)
+    fclose(fp);
+  current_filename = 0;
+  return 1;
+}
diff --git a/contrib/groff/src/preproc/soelim/soelim.man b/contrib/groff/src/preproc/soelim/soelim.man
index cf363d5..7663e3b 100644
--- a/contrib/groff/src/preproc/soelim/soelim.man
+++ b/contrib/groff/src/preproc/soelim/soelim.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -17,12 +17,14 @@ translations approved by the Free Software Foundation instead of in
 the original English.
 ..
 .TH @G@SOELIM @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
 .SH NAME
 @g@soelim \- interpret .so requests in groff input
+.
 .SH SYNOPSIS
 .B @g@soelim
 [
-.B \-Cv
+.B \-Crtv
 ]
 [
 .BI \-I dir
@@ -30,10 +32,12 @@ the original English.
 [
 .IR files \|.\|.\|.\|
 ]
+.
 .PP
 It is possible to have whitespace between the
 .B \-I
 command line option and its parameter.
+.
 .SH DESCRIPTION
 .B @g@soelim
 reads
@@ -53,6 +57,7 @@ should be invoked with the
 .B \-s
 option of
 .BR groff .
+.
 .PP
 Note that there must be no whitespace between the leading dot and
 the two characters `s' and `o'.  Otherwise, only
@@ -62,12 +67,14 @@ interprets the
 request (and
 .B soelim
 ignores it).
+.
 .SH OPTIONS
 .TP
 .B \-C
 Recognize
 .B .so
 even when followed by a character other than space or newline.
+.
 .TP
 .BI \-I dir
 This option may be used to specify a directory to search for
@@ -78,9 +85,20 @@ The current directory is always searched first.
 This option may be specified more than once,
 the directories will be searched in the order specified.
 No directory search is performed for files specified using an absolute path.
+.
+.TP
+.B \-r
+Do not add .lf requests (for general use, with non-groff files).
+.
+.TP
+.B \-t
+Don't emit .lf requests but TeX comment lines (starting with `%') giving
+the current file and line number.
+.
 .TP
 .B \-v
 Print the version number.
+.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@)
 .
diff --git a/contrib/groff/src/preproc/tbl/Makefile.sub b/contrib/groff/src/preproc/tbl/Makefile.sub
index fb14818..8decd31 100644
--- a/contrib/groff/src/preproc/tbl/Makefile.sub
+++ b/contrib/groff/src/preproc/tbl/Makefile.sub
@@ -5,8 +5,8 @@ OBJS=\
   main.$(OBJEXT) \
   table.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/main.cc \
-  $(srcdir)/table.cc
+  $(srcdir)/main.cpp \
+  $(srcdir)/table.cpp
 HDRS=\
   $(srcdir)/table.h
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/preproc/tbl/main.cpp b/contrib/groff/src/preproc/tbl/main.cpp
new file mode 100644
index 0000000..fe3aabf
--- /dev/null
+++ b/contrib/groff/src/preproc/tbl/main.cpp
@@ -0,0 +1,1529 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "table.h"
+
+#define MAX_POINT_SIZE 99
+#define MAX_VERTICAL_SPACING 72
+
+extern "C" const char *Version_string;
+
+static int compatible_flag = 0;
+
+class table_input {
+  FILE *fp;
+  enum { START, MIDDLE, REREAD_T, REREAD_TE, REREAD_E, END, ERROR } state;
+  string unget_stack;
+public:
+  table_input(FILE *);
+  int get();
+  int ended() { return unget_stack.empty() && state == END; }
+  void unget(char);
+};
+
+table_input::table_input(FILE *p)
+: fp(p), state(START)
+{
+}
+
+void table_input::unget(char c)
+{
+  assert(c != '\0');
+  unget_stack += c;
+  if (c == '\n')
+    current_lineno--;
+}
+
+int table_input::get()
+{
+  int len = unget_stack.length();
+  if (len != 0) {
+    unsigned char c = unget_stack[len - 1];
+    unget_stack.set_length(len - 1);
+    if (c == '\n')
+      current_lineno++;
+    return c;
+  }
+  int c;
+  for (;;) {
+    switch (state) {
+    case START:
+      if ((c = getc(fp)) == '.') {
+	if ((c = getc(fp)) == 'T') {
+	  if ((c = getc(fp)) == 'E') {
+	    if (compatible_flag) {
+	      state = END;
+	      return EOF;
+	    }
+	    else {
+	      c = getc(fp);
+	      if (c != EOF)
+		ungetc(c, fp);
+	      if (c == EOF || c == ' ' || c == '\n') {
+		state = END;
+		return EOF;
+	      }
+	      state = REREAD_TE;
+	      return '.';
+	    }
+	  }
+	  else {
+	    if (c != EOF)
+	      ungetc(c, fp);
+	    state = REREAD_T;
+	    return '.';
+	  }
+	}
+	else {
+	  if (c != EOF)
+	    ungetc(c, fp);
+	  state = MIDDLE;
+	  return '.';
+	}
+      }
+      else if (c == EOF) {
+	state = ERROR;
+	return EOF;
+      }
+      else {
+	if (c == '\n')
+	  current_lineno++;
+	else {
+	  state = MIDDLE;
+	  if (c == '\0') {
+	    error("invalid input character code 0");
+	    break;
+	  }
+	}
+	return c;
+      }
+      break;
+    case MIDDLE:
+      // handle line continuation
+      if ((c = getc(fp)) == '\\') {
+	c = getc(fp);
+	if (c == '\n')
+	  c = getc(fp);		// perhaps state ought to be START now
+	else {
+	  if (c != EOF)
+	    ungetc(c, fp);
+	  c = '\\';
+	}
+      }
+      if (c == EOF) {
+	state = ERROR;
+	return EOF;
+      }
+      else {
+	if (c == '\n') {
+	  state = START;
+	  current_lineno++;
+	}
+	else if (c == '\0') {
+	  error("invalid input character code 0");
+	  break;
+	}
+	return c;
+      }
+    case REREAD_T:
+      state = MIDDLE;
+      return 'T';
+    case REREAD_TE:
+      state = REREAD_E;
+      return 'T';
+    case REREAD_E:
+      state = MIDDLE;
+      return 'E';
+    case END:
+    case ERROR:
+      return EOF;
+    }
+  }
+}
+
+void process_input_file(FILE *);
+void process_table(table_input &in);
+
+void process_input_file(FILE *fp)
+{
+  enum { START, MIDDLE, HAD_DOT, HAD_T, HAD_TS, HAD_l, HAD_lf } state;
+  state = START;
+  int c;
+  while ((c = getc(fp)) != EOF)
+    switch (state) {
+    case START:
+      if (c == '.')
+	state = HAD_DOT;
+      else {
+	if (c == '\n')
+	  current_lineno++;
+	else
+	  state = MIDDLE;
+	putchar(c);
+      }
+      break;
+    case MIDDLE:
+      if (c == '\n') {
+	current_lineno++;
+	state = START;
+      }
+      putchar(c);
+      break;
+    case HAD_DOT:
+      if (c == 'T')
+	state = HAD_T;
+      else if (c == 'l')
+	state = HAD_l;
+      else {
+	putchar('.');
+	putchar(c);
+	if (c == '\n') {
+	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_T:
+      if (c == 'S')
+	state = HAD_TS;
+      else {
+	putchar('.');
+	putchar('T');
+	putchar(c);
+	if (c == '\n') {
+ 	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_TS:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	putchar('.');
+	putchar('T');
+	putchar('S');
+	while (c != '\n') {
+	  if (c == EOF) {
+	    error("end of file at beginning of table");
+	    return;
+	  }
+	  putchar(c);
+	  c = getc(fp);
+	}
+	putchar('\n');
+	current_lineno++;
+	{
+	  table_input input(fp);
+	  process_table(input);
+	  set_troff_location(current_filename, current_lineno);
+	  if (input.ended()) {
+	    fputs(".TE", stdout);
+	    while ((c = getc(fp)) != '\n') {
+	      if (c == EOF) {
+		putchar('\n');
+		return;
+	      }
+	      putchar(c);
+	    }
+	    putchar('\n');
+	    current_lineno++;
+	  }
+	}
+	state = START;
+      }
+      else {
+	fputs(".TS", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    case HAD_l:
+      if (c == 'f')
+	state = HAD_lf;
+      else {
+	putchar('.');
+	putchar('l');
+	putchar(c);
+	if (c == '\n') {
+ 	  current_lineno++;
+	  state = START;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case HAD_lf:
+      if (c == ' ' || c == '\n' || compatible_flag) {
+	string line;
+	while (c != EOF) {
+	  line += c;
+	  if (c == '\n') {
+	    current_lineno++;
+	    break;
+	  }
+	  c = getc(fp);
+	}
+	line += '\0';
+	interpret_lf_args(line.contents());
+	printf(".lf%s", line.contents());
+	state = START;
+      }
+      else {
+	fputs(".lf", stdout);
+	putchar(c);
+	state = MIDDLE;
+      }
+      break;
+    default:
+      assert(0);
+    }
+  switch(state) {
+  case START:
+    break;
+  case MIDDLE:
+    putchar('\n');
+    break;
+  case HAD_DOT:
+    fputs(".\n", stdout);
+    break;
+  case HAD_l:
+    fputs(".l\n", stdout);
+    break;
+  case HAD_T:
+    fputs(".T\n", stdout);
+    break;
+  case HAD_lf:
+    fputs(".lf\n", stdout);
+    break;
+  case HAD_TS:
+    fputs(".TS\n", stdout);
+    break;
+  }
+  if (fp != stdin)
+    fclose(fp);
+}
+
+struct options {
+  unsigned flags;
+  int linesize;
+  char delim[2];
+  char tab_char;
+  char decimal_point_char;
+
+  options();
+};
+
+options::options()
+: flags(0), linesize(0), tab_char('\t'), decimal_point_char('.')
+{
+  delim[0] = delim[1] = '\0';
+}
+
+// Return non-zero if p and q are the same ignoring case.
+
+int strieq(const char *p, const char *q)
+{
+  for (; cmlower(*p) == cmlower(*q); p++, q++)
+    if (*p == '\0')
+      return 1;
+  return 0;
+}
+
+// return 0 if we should give up in this table
+
+options *process_options(table_input &in)
+{
+  options *opt = new options;
+  string line;
+  int level = 0;
+  for (;;) {
+    int c = in.get();
+    if (c == EOF) {
+      int i = line.length();
+      while (--i >= 0)
+	in.unget(line[i]);
+      return opt;
+    }
+    if (c == '\n') {
+      in.unget(c);
+      int i = line.length();
+      while (--i >= 0)
+	in.unget(line[i]);
+      return opt;
+    }
+    else if (c == '(')
+      level++;
+    else if (c == ')')
+      level--;
+    else if (c == ';' && level == 0) {
+      line += '\0';
+      break;
+    }
+    line += c;
+  }
+  if (line.empty())
+    return opt;
+  char *p = &line[0];
+  for (;;) {
+    while (!csalpha(*p) && *p != '\0')
+      p++;
+    if (*p == '\0')
+      break;
+    char *q = p;
+    while (csalpha(*q))
+      q++;
+    char *arg = 0;
+    if (*q != '(' && *q != '\0')
+      *q++ = '\0';
+    while (csspace(*q))
+      q++;
+    if (*q == '(') {
+      *q++ = '\0';
+      arg = q;
+      while (*q != ')' && *q != '\0')
+	q++;
+      if (*q == '\0')
+	error("missing `)'");
+      else
+	*q++ = '\0';
+    }
+    if (*p == '\0') {
+      if (arg)
+	error("argument without option");
+    }
+    else if (strieq(p, "tab")) {
+      if (!arg)
+	error("`tab' option requires argument in parentheses");
+      else {
+	if (arg[0] == '\0' || arg[1] != '\0')
+	  error("argument to `tab' option must be a single character");
+	else
+	  opt->tab_char = arg[0];
+      }
+    }
+    else if (strieq(p, "linesize")) {
+      if (!arg)
+	error("`linesize' option requires argument in parentheses");
+      else {
+	if (sscanf(arg, "%d", &opt->linesize) != 1)
+	  error("bad linesize `%s'", arg);
+	else if (opt->linesize <= 0) {
+	  error("linesize must be positive");
+	  opt->linesize = 0;
+	}
+      }
+    }
+    else if (strieq(p, "delim")) {
+      if (!arg)
+	error("`delim' option requires argument in parentheses");
+      else if (arg[0] == '\0' || arg[1] == '\0' || arg[2] != '\0')
+	error("argument to `delim' option must be two characters");
+      else {
+	opt->delim[0] = arg[0];
+	opt->delim[1] = arg[1];
+      }
+    }
+    else if (strieq(p, "center") || strieq(p, "centre")) {
+      if (arg)
+	error("`center' option does not take an argument");
+      opt->flags |= table::CENTER;
+    }
+    else if (strieq(p, "expand")) {
+      if (arg)
+	error("`expand' option does not take an argument");
+      opt->flags |= table::EXPAND;
+    }
+    else if (strieq(p, "box") || strieq(p, "frame")) {
+      if (arg)
+	error("`box' option does not take an argument");
+      opt->flags |= table::BOX;
+    }
+    else if (strieq(p, "doublebox") || strieq(p, "doubleframe")) {
+      if (arg)
+	error("`doublebox' option does not take an argument");
+      opt->flags |= table::DOUBLEBOX;
+    }
+    else if (strieq(p, "allbox")) {
+      if (arg)
+	error("`allbox' option does not take an argument");
+      opt->flags |= table::ALLBOX;
+    }
+    else if (strieq(p, "nokeep")) {
+      if (arg)
+	error("`nokeep' option does not take an argument");
+      opt->flags |= table::NOKEEP;
+    }
+    else if (strieq(p, "nospaces")) {
+      if (arg)
+	error("`nospaces' option does not take an argument");
+      opt->flags |= table::NOSPACES;
+    }
+    else if (strieq(p, "decimalpoint")) {
+      if (!arg)
+	error("`decimalpoint' option requires argument in parentheses");
+      else {
+	if (arg[0] == '\0' || arg[1] != '\0')
+	  error("argument to `decimalpoint' option must be a single character");
+	else
+	  opt->decimal_point_char = arg[0];
+      }
+    }
+    else {
+      error("unrecognised global option `%1'", p);
+      // delete opt;
+      // return 0;
+    }
+    p = q;
+  }
+  return opt;
+}
+
+entry_modifier::entry_modifier()
+: vertical_alignment(CENTER), zero_width(0), stagger(0)
+{
+  vertical_spacing.inc = vertical_spacing.val = 0;
+  point_size.inc = point_size.val = 0;
+}
+
+entry_modifier::~entry_modifier()
+{
+}
+
+entry_format::entry_format() : type(FORMAT_LEFT)
+{
+}
+
+entry_format::entry_format(format_type t) : type(t)
+{
+}
+
+void entry_format::debug_print() const
+{
+  switch (type) {
+  case FORMAT_LEFT:
+    putc('l', stderr);
+    break;
+  case FORMAT_CENTER:
+    putc('c', stderr);
+    break;
+  case FORMAT_RIGHT:
+    putc('r', stderr);
+    break;
+  case FORMAT_NUMERIC:
+    putc('n', stderr);
+    break;
+  case FORMAT_ALPHABETIC:
+    putc('a', stderr);
+    break;
+  case FORMAT_SPAN:
+    putc('s', stderr);
+    break;
+  case FORMAT_VSPAN:
+    putc('^', stderr);
+    break;
+  case FORMAT_HLINE:
+    putc('_', stderr);
+    break;
+  case FORMAT_DOUBLE_HLINE:
+    putc('=', stderr);
+    break;
+  default:
+    assert(0);
+    break;
+  }
+  if (point_size.val != 0) {
+    putc('p', stderr);
+    if (point_size.inc > 0)
+      putc('+', stderr);
+    else if (point_size.inc < 0)
+      putc('-', stderr);
+    fprintf(stderr, "%d ", point_size.val);
+  }
+  if (vertical_spacing.val != 0) {
+    putc('v', stderr);
+    if (vertical_spacing.inc > 0)
+      putc('+', stderr);
+    else if (vertical_spacing.inc < 0)
+      putc('-', stderr);
+    fprintf(stderr, "%d ", vertical_spacing.val);
+  }
+  if (!font.empty()) {
+    putc('f', stderr);
+    put_string(font, stderr);
+    putc(' ', stderr);
+  }
+  switch (vertical_alignment) {
+  case entry_modifier::CENTER:
+    break;
+  case entry_modifier::TOP:
+    putc('t', stderr);
+    break;
+  case entry_modifier::BOTTOM:
+    putc('d', stderr);
+    break;
+  }
+  if (zero_width)
+    putc('z', stderr);
+  if (stagger)
+    putc('u', stderr);
+}
+
+struct format {
+  int nrows;
+  int ncolumns;
+  int *separation;
+  string *width;
+  char *equal;
+  entry_format **entry;
+  char **vline;
+
+  format(int nr, int nc);
+  ~format();
+  void add_rows(int n);
+};
+
+format::format(int nr, int nc) : nrows(nr), ncolumns(nc)
+{
+  int i;
+  separation = ncolumns > 1 ? new int[ncolumns - 1] : 0;
+  for (i = 0; i < ncolumns-1; i++)
+    separation[i] = -1;
+  width = new string[ncolumns];
+  equal = new char[ncolumns];
+  for (i = 0; i < ncolumns; i++)
+    equal[i] = 0;
+  entry = new entry_format *[nrows];
+  for (i = 0; i < nrows; i++)
+    entry[i] = new entry_format[ncolumns];
+  vline = new char*[nrows];
+  for (i = 0; i < nrows; i++) {
+    vline[i] = new char[ncolumns+1];
+    for (int j = 0; j < ncolumns+1; j++)
+      vline[i][j] = 0;
+  }
+}
+
+void format::add_rows(int n)
+{
+  int i;
+  char **old_vline = vline;
+  vline = new char*[nrows + n];
+  for (i = 0; i < nrows; i++)
+    vline[i] = old_vline[i];
+  a_delete old_vline;
+  for (i = 0; i < n; i++) {
+    vline[nrows + i] = new char[ncolumns + 1];
+    for (int j = 0; j < ncolumns + 1; j++)
+      vline[nrows + i][j] = 0;
+  }
+  entry_format **old_entry = entry;
+  entry = new entry_format *[nrows + n];
+  for (i = 0; i < nrows; i++)
+    entry[i] = old_entry[i];
+  a_delete old_entry;
+  for (i = 0; i < n; i++)
+    entry[nrows + i] = new entry_format[ncolumns];
+  nrows += n;
+}
+
+format::~format()
+{
+  a_delete separation;
+  ad_delete(ncolumns) width;
+  a_delete equal;
+  for (int i = 0; i < nrows; i++) {
+    a_delete vline[i];
+    ad_delete(ncolumns) entry[i];
+  }
+  a_delete vline;
+  a_delete entry;
+}
+
+struct input_entry_format : public entry_format {
+  input_entry_format *next;
+  string width;
+  int separation;
+  int vline;
+  int pre_vline;
+  int last_column;
+  int equal;
+  input_entry_format(format_type, input_entry_format * = 0);
+  ~input_entry_format();
+  void debug_print();
+};
+
+input_entry_format::input_entry_format(format_type t, input_entry_format *p)
+: entry_format(t), next(p)
+{
+  separation = -1;
+  last_column = 0;
+  vline = 0;
+  pre_vline = 0;
+  equal = 0;
+}
+
+input_entry_format::~input_entry_format()
+{
+}
+
+void free_input_entry_format_list(input_entry_format *list)
+{
+  while (list) {
+    input_entry_format *tem = list;
+    list = list->next;
+    delete tem;
+  }
+}
+
+void input_entry_format::debug_print()
+{
+  int i;
+  for (i = 0; i < pre_vline; i++)
+    putc('|', stderr);
+  entry_format::debug_print();
+  if (!width.empty()) {
+    putc('w', stderr);
+    putc('(', stderr);
+    put_string(width, stderr);
+    putc(')', stderr);
+  }
+  if (equal)
+    putc('e', stderr);
+  if (separation >= 0)
+    fprintf(stderr, "%d", separation); 
+  for (i = 0; i < vline; i++)
+    putc('|', stderr);
+  if (last_column)
+    putc(',', stderr);
+}
+
+// Return zero if we should give up on this table.
+// If this is a continuation format line, current_format will be the current
+// format line.
+
+format *process_format(table_input &in, options *opt,
+		       format *current_format = 0)
+{
+  input_entry_format *list = 0;
+  int c = in.get();
+  for (;;) {
+    int pre_vline = 0;
+    int got_format = 0;
+    int got_period = 0;
+    format_type t = FORMAT_LEFT;
+    for (;;) {
+      if (c == EOF) {
+	error("end of input while processing format");
+	free_input_entry_format_list(list);
+	return 0;
+      }
+      switch (c) {
+      case 'n':
+      case 'N':
+	t = FORMAT_NUMERIC;
+	got_format = 1;
+	break;
+      case 'a':
+      case 'A':
+	got_format = 1;
+	t = FORMAT_ALPHABETIC;
+	break;
+      case 'c':
+      case 'C':
+	got_format = 1;
+	t = FORMAT_CENTER;
+	break;
+      case 'l':
+      case 'L':
+	got_format = 1;
+	t = FORMAT_LEFT;
+	break;
+      case 'r':
+      case 'R':
+	got_format = 1;
+	t = FORMAT_RIGHT;
+	break;
+      case 's':
+      case 'S':
+	got_format = 1;
+	t = FORMAT_SPAN;
+	break;
+      case '^':
+	got_format = 1;
+	t = FORMAT_VSPAN;
+	break;
+      case '_':
+      case '-':			// tbl also accepts this
+	got_format = 1;
+	t = FORMAT_HLINE;
+	break;
+      case '=':
+	got_format = 1;
+	t = FORMAT_DOUBLE_HLINE;
+	break;
+      case '.':
+	got_period = 1;
+	break;
+      case '|':
+	pre_vline++;
+	break;
+      case ' ':
+      case '\t':
+      case '\n':
+	break;
+      default:
+	if (c == opt->tab_char)
+	  break;
+	error("unrecognised format `%1'", char(c));
+	free_input_entry_format_list(list);
+	return 0;
+      }
+      if (got_period)
+	break;
+      c = in.get();
+      if (got_format)
+	break;
+    }
+    if (got_period)
+      break;
+    list = new input_entry_format(t, list);
+    if (pre_vline)
+      list->pre_vline = pre_vline;
+    int success = 1;
+    do {
+      switch (c) {
+      case 't':
+      case 'T':
+	c = in.get();
+	list->vertical_alignment = entry_modifier::TOP;
+	break;
+      case 'd':
+      case 'D':
+	c = in.get();
+	list->vertical_alignment = entry_modifier::BOTTOM;
+	break;
+      case 'u':
+      case 'U':
+	c = in.get();
+	list->stagger = 1;
+	break;
+      case 'z':
+      case 'Z':
+	c = in.get();
+	list->zero_width = 1;
+	break;
+      case '0':
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+      case '8':
+      case '9':
+	{
+	  int w = 0;
+	  do {
+	    w = w*10 + (c - '0');
+	    c = in.get();
+	  } while (c != EOF && csdigit(c));
+	  list->separation = w;
+	}
+	break;
+      case 'f':
+      case 'F':
+	do {
+	  c = in.get();
+	} while (c == ' ' || c == '\t');
+	if (c == EOF) {
+	  error("missing font name");
+	  break;
+	}
+	if (c == '(') {
+	  for (;;) {
+	    c = in.get();
+	    if (c == EOF || c == ' ' || c == '\t') {
+	      error("missing `)'");
+	      break;
+	    }
+	    if (c == ')') {
+	      c = in.get();
+	      break;
+	    }
+	    list->font += char(c);
+	  }
+	}
+	else {
+	  list->font = c;
+	  char cc = c;
+	  c = in.get();
+	  if (!csdigit(cc)
+	      && c != EOF && c != ' ' && c != '\t' && c != '.' && c != '\n') {
+	    list->font += char(c);
+	    c = in.get();
+	  }
+	}
+	break;
+      case 'v':
+      case 'V':
+	c = in.get();
+	list->vertical_spacing.val = 0;
+	list->vertical_spacing.inc = 0;
+	if (c == '+' || c == '-') {
+	  list->vertical_spacing.inc = (c == '+' ? 1 : -1);
+	  c = in.get();
+	}
+	if (c == EOF || !csdigit(c)) {
+	  error("`v' modifier must be followed by number");
+	  list->vertical_spacing.inc = 0;
+	}
+	else {
+	  do {
+	    list->vertical_spacing.val *= 10;
+	    list->vertical_spacing.val += c - '0';
+	    c = in.get();
+	  } while (c != EOF && csdigit(c));
+	}
+	if (list->vertical_spacing.val > MAX_VERTICAL_SPACING
+	    || list->vertical_spacing.val < -MAX_VERTICAL_SPACING) {
+	  error("unreasonable vertical spacing");
+	  list->vertical_spacing.val = 0;
+	  list->vertical_spacing.inc = 0;
+	}
+	break;
+      case 'p':
+      case 'P':
+	c = in.get();
+	list->point_size.val = 0;
+	list->point_size.inc = 0;
+	if (c == '+' || c == '-') {
+	  list->point_size.inc = (c == '+' ? 1 : -1);
+	  c = in.get();
+	}
+	if (c == EOF || !csdigit(c)) {
+	  error("`p' modifier must be followed by number");
+	  list->point_size.inc = 0;
+	}
+	else {
+	  do {
+	    list->point_size.val *= 10;
+	    list->point_size.val += c - '0';
+	    c = in.get();
+	  } while (c != EOF && csdigit(c));
+	}
+	if (list->point_size.val > MAX_POINT_SIZE
+	    || list->point_size.val < -MAX_POINT_SIZE) {
+	  error("unreasonable point size");
+	  list->point_size.val = 0;
+	  list->point_size.inc = 0;
+	}
+	break;
+      case 'w':
+      case 'W':
+	c = in.get();
+	while (c == ' ' || c == '\t')
+	  c = in.get();
+	if (c == '(') {
+	  list->width = "";
+	  c = in.get();
+	  while (c != ')') {
+	    if (c == EOF || c == '\n') {
+	      error("missing `)'");
+	      free_input_entry_format_list(list);
+	      return 0;
+	    }
+	    list->width += c;
+	    c = in.get();
+	  }
+	  c = in.get();
+	}
+	else {
+	  if (c == '+' || c == '-') {
+	    list->width = char(c);
+	    c = in.get();
+	  }
+	  else
+	    list->width = "";
+	  if (c == EOF || !csdigit(c))
+	    error("bad argument for `w' modifier");
+	  else {
+	    do {
+	      list->width += char(c);
+	      c = in.get();
+	    } while (c != EOF && csdigit(c));
+	  }
+	}
+	break;
+      case 'e':
+      case 'E':
+	c = in.get();
+	list->equal++;
+	break;
+      case '|':
+	c = in.get();
+	list->vline++;
+	break;
+      case 'B':
+      case 'b':
+	c = in.get();
+	list->font = "B";
+	break;
+      case 'I':
+      case 'i':
+	c = in.get();
+	list->font = "I";
+	break;
+      case ' ':
+      case '\t':
+	c = in.get();
+	break;
+      default:
+	if (c == opt->tab_char)
+	  c = in.get();
+	else
+	  success = 0;
+	break;
+      }
+    } while (success);
+    if (list->vline > 2) {
+      list->vline = 2;
+      error("more than 2 vertical bars between key letters");
+    }
+    if (c == '\n' || c == ',') {
+      c = in.get();
+      list->last_column = 1;
+    }
+  }
+  if (c == '.') {
+    do {
+      c = in.get();
+    } while (c == ' ' || c == '\t');
+    if (c != '\n') {
+      error("`.' not last character on line");
+      free_input_entry_format_list(list);
+      return 0;
+    }
+  }
+  if (!list) {
+    error("no format");
+    free_input_entry_format_list(list);
+    return 0;
+  }
+  list->last_column = 1;
+  // now reverse the list so that the first row is at the beginning
+  input_entry_format *rev = 0;
+  while (list != 0) {
+    input_entry_format *tem = list->next;
+    list->next = rev;
+    rev = list;
+    list = tem;
+  }
+  list = rev;
+  input_entry_format *tem;
+
+#if 0
+  for (tem = list; tem; tem = tem->next)
+    tem->debug_print();
+  putc('\n', stderr);
+#endif
+  // compute number of columns and rows
+  int ncolumns = 0;
+  int nrows = 0;
+  int col = 0;
+  for (tem = list; tem; tem = tem->next) {
+    if (tem->last_column) {
+      if (col >= ncolumns)
+	ncolumns = col + 1;
+      col = 0;
+      nrows++;
+    }
+    else
+      col++;
+  }
+  int row;
+  format *f;
+  if (current_format) {
+    if (ncolumns > current_format->ncolumns) {
+      error("cannot increase the number of columns in a continued format");
+      free_input_entry_format_list(list);
+      return 0;
+    }
+    f = current_format;
+    row = f->nrows;
+    f->add_rows(nrows);
+  }
+  else {
+    f = new format(nrows, ncolumns);
+    row = 0;
+  }
+  col = 0;
+  for (tem = list; tem; tem = tem->next) {
+    f->entry[row][col] = *tem;
+    if (col < ncolumns-1) {
+      // use the greatest separation
+      if (tem->separation > f->separation[col]) {
+	if (current_format)
+	  error("cannot change column separation in continued format");
+	else
+	  f->separation[col] = tem->separation;
+      }
+    }
+    else if (tem->separation >= 0)
+      error("column separation specified for last column");
+    if (tem->equal && !f->equal[col]) {
+      if (current_format)
+	error("cannot change which columns are equal in continued format");
+      else
+	f->equal[col] = 1;
+    }
+    if (!tem->width.empty()) {
+      // use the last width
+      if (!f->width[col].empty() && f->width[col] != tem->width)
+	error("multiple widths for column %1", col+1);
+      f->width[col] = tem->width;
+    }
+    if (tem->pre_vline) {
+      assert(col == 0);
+      f->vline[row][col] = tem->pre_vline;
+    }
+    f->vline[row][col+1] = tem->vline;
+    if (tem->last_column) {
+      row++;
+      col = 0;
+    }
+    else
+      col++;
+  }
+  free_input_entry_format_list(list);
+  for (col = 0; col < ncolumns; col++) {
+    entry_format *e = f->entry[f->nrows-1] + col;
+    if (e->type != FORMAT_HLINE
+	&& e->type != FORMAT_DOUBLE_HLINE
+	&& e->type != FORMAT_SPAN)
+      break;
+  }
+  if (col >= ncolumns) {
+    error("last row of format is all lines");
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+table *process_data(table_input &in, format *f, options *opt)
+{
+  char tab_char = opt->tab_char;
+  int ncolumns = f->ncolumns;
+  int current_row = 0;
+  int format_index = 0;
+  int give_up = 0;
+  enum { DATA_INPUT_LINE, TROFF_INPUT_LINE, SINGLE_HLINE, DOUBLE_HLINE } type;
+  table *tbl = new table(ncolumns, opt->flags, opt->linesize,
+			 opt->decimal_point_char);
+  if (opt->delim[0] != '\0')
+    tbl->set_delim(opt->delim[0], opt->delim[1]);
+  for (;;) {
+    // first determine what type of line this is
+    int c = in.get();
+    if (c == EOF)
+      break;
+    if (c == '.') {
+      int d = in.get();
+      if (d != EOF && csdigit(d)) {
+	in.unget(d);
+	type = DATA_INPUT_LINE;
+      }
+      else {
+	in.unget(d);
+	type = TROFF_INPUT_LINE;
+      }
+    }
+    else if (c == '_' || c == '=') {
+      int d = in.get();
+      if (d == '\n') {
+	if (c == '_')
+	  type = SINGLE_HLINE;
+	else
+	  type = DOUBLE_HLINE;
+      }
+      else {
+	in.unget(d);
+	type = DATA_INPUT_LINE;
+      }
+    }
+    else {
+      type = DATA_INPUT_LINE;
+    }
+    switch (type) {
+    case DATA_INPUT_LINE:
+      {
+	string input_entry;
+	if (format_index >= f->nrows)
+	  format_index = f->nrows - 1;
+	// A format row that is all lines doesn't use up a data line.
+	while (format_index < f->nrows - 1) {
+	  int c;
+	  for (c = 0; c < ncolumns; c++) {
+	    entry_format *e = f->entry[format_index] + c;
+	    if (e->type != FORMAT_HLINE
+		&& e->type != FORMAT_DOUBLE_HLINE
+		// Unfortunately tbl treats a span as needing data.
+		// && e->type != FORMAT_SPAN
+		)
+	      break;
+	  }
+	  if (c < ncolumns)
+	    break;
+	  for (c = 0; c < ncolumns; c++)
+	    tbl->add_entry(current_row, c, input_entry,
+			   f->entry[format_index] + c, current_filename,
+			   current_lineno);
+	  tbl->add_vlines(current_row, f->vline[format_index]);
+	  format_index++;
+	  current_row++;
+	}
+	entry_format *line_format = f->entry[format_index];
+	int col = 0;
+	int row_comment = 0;
+	for (;;) {
+	  if (c == tab_char || c == '\n') {
+	    int ln = current_lineno;
+	    if (c == '\n')
+	      --ln;
+	    if ((opt->flags & table::NOSPACES))
+	      input_entry.remove_spaces();
+	    while (col < ncolumns
+		   && line_format[col].type == FORMAT_SPAN) {
+	      tbl->add_entry(current_row, col, "", &line_format[col],
+			     current_filename, ln);
+	      col++;
+	    }
+	    if (c == '\n' && input_entry.length() == 2
+		&& input_entry[0] == 'T' && input_entry[1] == '{') {
+	      input_entry = "";
+	      ln++;
+	      enum {
+		START, MIDDLE, GOT_T, GOT_RIGHT_BRACE, GOT_DOT,
+		GOT_l, GOT_lf, END
+	      } state = START;
+	      while (state != END) {
+		c = in.get();
+		if (c == EOF)
+		  break;
+		switch (state) {
+		case START:
+		  if (c == 'T')
+		    state = GOT_T;
+		  else if (c == '.')
+		    state = GOT_DOT;
+		  else {
+		    input_entry += c;
+		    if (c != '\n')
+		      state = MIDDLE;
+		  }
+		  break;
+		case GOT_T:
+		  if (c == '}')
+		    state = GOT_RIGHT_BRACE;
+		  else {
+		    input_entry += 'T';
+		    input_entry += c;
+		    state = c == '\n' ? START : MIDDLE;
+		  }
+		  break;
+		case GOT_DOT:
+		  if (c == 'l')
+		    state = GOT_l;
+		  else {
+		    input_entry += '.';
+		    input_entry += c;
+		    state = c == '\n' ? START : MIDDLE;
+		  }
+		  break;
+		case GOT_l:
+		  if (c == 'f')
+		    state = GOT_lf;
+		  else {
+		    input_entry += ".l";
+		    input_entry += c;
+		    state = c == '\n' ? START : MIDDLE;
+		  }
+		  break;
+		case GOT_lf:
+		  if (c == ' ' || c == '\n' || compatible_flag) {
+		    string args;
+		    input_entry += ".lf";
+		    while (c != EOF) {
+		      args += c;
+		      if (c == '\n')
+			break;
+		      c = in.get();
+		    }
+		    args += '\0';
+		    interpret_lf_args(args.contents());
+		    // remove the '\0'
+		    args.set_length(args.length() - 1);
+		    input_entry += args;
+		    state = START;
+		  }
+		  else {
+		    input_entry += ".lf";
+		    input_entry += c;
+		    state = MIDDLE;
+		  }
+		  break;
+		case GOT_RIGHT_BRACE:
+		  if (c == '\n' || c == tab_char)
+		    state = END;
+		  else {
+		    input_entry += 'T';
+		    input_entry += '}';
+		    input_entry += c;
+		    state = c == '\n' ? START : MIDDLE;
+		  }
+		  break;
+		case MIDDLE:
+		  if (c == '\n')
+		    state = START;
+		  input_entry += c;
+		  break;
+		case END:
+		default:
+		  assert(0);
+		}
+	      }
+	      if (c == EOF) {
+		error("end of data in middle of text block");
+		give_up = 1;
+		break;
+	      }
+	    }
+	    if (col >= ncolumns) {
+	      if (!input_entry.empty()) {
+		if (input_entry.length() >= 2
+		    && input_entry[0] == '\\'
+		    && input_entry[1] == '"')
+		  row_comment = 1;
+		else if (!row_comment) {
+		  if (c == '\n')
+		    in.unget(c);
+		  input_entry += '\0';
+		  error("excess data entry `%1' discarded",
+			input_entry.contents());
+		  if (c == '\n')
+		    (void)in.get();
+		}
+	      }
+	    }
+	    else
+	      tbl->add_entry(current_row, col, input_entry,
+			     &line_format[col], current_filename, ln);
+	    col++;
+	    if (c == '\n')
+	      break;
+	    input_entry = "";
+	  }
+	  else
+	    input_entry += c;
+	  c = in.get();
+	  if (c == EOF)
+	    break;
+	}
+	if (give_up)
+	  break;
+	input_entry = "";
+	for (; col < ncolumns; col++)
+	  tbl->add_entry(current_row, col, input_entry, &line_format[col],
+			 current_filename, current_lineno - 1);
+	tbl->add_vlines(current_row, f->vline[format_index]);
+	current_row++;
+	format_index++;
+      }
+      break;
+    case TROFF_INPUT_LINE:
+      {
+	string line;
+	int ln = current_lineno;
+	for (;;) {
+	  line += c;
+	  if (c == '\n')
+	    break;
+	  c = in.get();
+	  if (c == EOF) {
+	    break;
+	  }
+	}
+	tbl->add_text_line(current_row, line, current_filename, ln);
+	if (line.length() >= 4 
+	    && line[0] == '.' && line[1] == 'T' && line[2] == '&') {
+	  format *newf = process_format(in, opt, f);
+	  if (newf == 0)
+	    give_up = 1;
+	  else
+	    f = newf;
+	}
+	if (line.length() >= 3
+	    && line[0] == '.' && line[1] == 'l' && line[2] == 'f') {
+	  line += '\0';
+	  interpret_lf_args(line.contents() + 3);
+	}
+      }
+      break;
+    case SINGLE_HLINE:
+      tbl->add_single_hline(current_row);
+      break;
+    case DOUBLE_HLINE:
+      tbl->add_double_hline(current_row);
+      break;
+    default:
+      assert(0);
+    }
+    if (give_up)
+      break;
+  }
+  if (!give_up && current_row == 0) {
+    error("no real data");
+    give_up = 1;
+  }
+  if (give_up) {
+    delete tbl;
+    return 0;
+  }
+  // Do this here rather than at the beginning in case continued formats
+  // change it.
+  int i;
+  for (i = 0; i < ncolumns - 1; i++)
+    if (f->separation[i] >= 0)
+      tbl->set_column_separation(i, f->separation[i]);
+  for (i = 0; i < ncolumns; i++)
+    if (!f->width[i].empty())
+      tbl->set_minimum_width(i, f->width[i]);
+  for (i = 0; i < ncolumns; i++)
+    if (f->equal[i])
+      tbl->set_equal_column(i);
+  return tbl;
+}
+
+void process_table(table_input &in)
+{
+  int c;
+  options *opt = 0;
+  format *form = 0;
+  table *tbl = 0;
+  if ((opt = process_options(in)) != 0 
+      && (form = process_format(in, opt)) != 0
+      && (tbl = process_data(in, form, opt)) != 0) {
+    tbl->print();
+    delete tbl;
+  }
+  else {
+    error("giving up on this table");
+    while ((c = in.get()) != EOF)
+      ;
+  }
+  delete opt;
+  delete form;
+  if (!in.ended())
+    error("premature end of file");
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [ -vC ] [ files... ]\n", program_name);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "vCT:", long_options, NULL)) != EOF)
+    switch (opt) {
+    case 'C':
+      compatible_flag = 1;
+      break;
+    case 'v':
+      {
+	printf("GNU tbl (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'T':
+      // I'm sick of getting bug reports from IRIX users
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  printf(".if !\\n(.g .ab GNU tbl requires GNU troff.\n"
+	 ".if !dTS .ds TS\n"
+	 ".if !dTE .ds TE\n");
+  if (argc > optind) {
+    for (int i = optind; i < argc; i++) 
+      if (argv[i][0] == '-' && argv[i][1] == '\0') {
+	current_filename = "-";
+	current_lineno = 1;
+	printf(".lf 1 -\n");
+	process_input_file(stdin);
+      }
+      else {
+	errno = 0;
+	FILE *fp = fopen(argv[i], "r");
+	if (fp == 0) {
+	  current_lineno = -1;
+	  error("can't open `%1': %2", argv[i], strerror(errno));
+	}
+	else {
+	  current_lineno = 1;
+	  current_filename = argv[i];
+	  printf(".lf 1 %s\n", current_filename);
+	  process_input_file(fp);
+	}
+      }
+  }
+  else {
+    current_filename = "-";
+    current_lineno = 1;
+    printf(".lf 1 -\n");
+    process_input_file(stdin);
+  }
+  if (ferror(stdout) || fflush(stdout) < 0)
+    fatal("output error");
+  return 0;
+}
+
diff --git a/contrib/groff/src/preproc/tbl/table.cpp b/contrib/groff/src/preproc/tbl/table.cpp
new file mode 100644
index 0000000..32068c3
--- /dev/null
+++ b/contrib/groff/src/preproc/tbl/table.cpp
@@ -0,0 +1,2767 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "table.h"
+
+#define BAR_HEIGHT ".25m"
+#define DOUBLE_LINE_SEP "2p"
+#define HALF_DOUBLE_LINE_SEP "1p"
+#define LINE_SEP "2p"
+#define BODY_DEPTH ".25m"
+
+const int DEFAULT_COLUMN_SEPARATION = 3;
+
+#define DELIMITER_CHAR "\\[tbl]"
+#define PREFIX "3"
+#define SEPARATION_FACTOR_REG PREFIX "sep"
+#define BOTTOM_REG PREFIX "bot"
+#define RESET_MACRO_NAME PREFIX "init"
+#define LINESIZE_REG PREFIX "lps"
+#define TOP_REG PREFIX "top"
+#define CURRENT_ROW_REG PREFIX "crow"
+#define LAST_PASSED_ROW_REG PREFIX "passed"
+#define TRANSPARENT_STRING_NAME PREFIX "trans"
+#define QUOTE_STRING_NAME PREFIX "quote"
+#define SECTION_DIVERSION_NAME PREFIX "section"
+#define SECTION_DIVERSION_FLAG_REG PREFIX "sflag"
+#define SAVED_VERTICAL_POS_REG PREFIX "vert"
+#define NEED_BOTTOM_RULE_REG PREFIX "brule"
+#define KEEP_MACRO_NAME PREFIX "keep"
+#define RELEASE_MACRO_NAME PREFIX "release"
+#define SAVED_FONT_REG PREFIX "fnt"
+#define SAVED_SIZE_REG PREFIX "sz"
+#define SAVED_FILL_REG PREFIX "fll"
+#define SAVED_INDENT_REG PREFIX "ind"
+#define SAVED_CENTER_REG PREFIX "cent"
+#define TABLE_DIVERSION_NAME PREFIX "table"
+#define TABLE_DIVERSION_FLAG_REG PREFIX "tflag"
+#define TABLE_KEEP_MACRO_NAME PREFIX "tkeep"
+#define TABLE_RELEASE_MACRO_NAME PREFIX "trelease"
+#define NEEDED_REG PREFIX "needed"
+#define REPEATED_MARK_MACRO PREFIX "rmk"
+#define REPEATED_VPT_MACRO PREFIX "rvpt"
+#define SUPPRESS_BOTTOM_REG PREFIX "supbot"
+#define SAVED_DN_REG PREFIX "dn"
+
+// this must be one character
+#define COMPATIBLE_REG PREFIX "c"
+
+#define BLOCK_WIDTH_PREFIX PREFIX "tbw"
+#define BLOCK_DIVERSION_PREFIX PREFIX "tbd"
+#define BLOCK_HEIGHT_PREFIX PREFIX "tbh"
+#define SPAN_WIDTH_PREFIX PREFIX "w"
+#define SPAN_LEFT_NUMERIC_WIDTH_PREFIX PREFIX "lnw"
+#define SPAN_RIGHT_NUMERIC_WIDTH_PREFIX PREFIX "rnw"
+#define SPAN_ALPHABETIC_WIDTH_PREFIX PREFIX "aw"
+#define COLUMN_SEPARATION_PREFIX PREFIX "cs"
+#define ROW_START_PREFIX PREFIX "rs"
+#define COLUMN_START_PREFIX PREFIX "cl"
+#define COLUMN_END_PREFIX PREFIX "ce"
+#define COLUMN_DIVIDE_PREFIX PREFIX "cd"
+#define ROW_TOP_PREFIX PREFIX "rt"
+
+string block_width_reg(int r, int c);
+string block_diversion_name(int r, int c);
+string block_height_reg(int r, int c);
+string span_width_reg(int start_col, int end_col);
+string span_left_numeric_width_reg(int start_col, int end_col);
+string span_right_numeric_width_reg(int start_col, int end_col);
+string span_alphabetic_width_reg(int start_col, int end_col);
+string column_separation_reg(int col);
+string row_start_reg(int r);
+string column_start_reg(int c);
+string column_end_reg(int c);
+string column_divide_reg(int c);
+string row_top_reg(int r);
+
+void set_inline_modifier(const entry_modifier *);
+void restore_inline_modifier(const entry_modifier *m);
+void set_modifier(const entry_modifier *);
+int find_decimal_point(const char *s, char decimal_point_char,
+		       const char *delim);
+
+string an_empty_string;
+int location_force_filename = 0;
+
+void printfs(const char *,
+	     const string &arg1 = an_empty_string,
+	     const string &arg2 = an_empty_string,
+	     const string &arg3 = an_empty_string,
+	     const string &arg4 = an_empty_string,
+	     const string &arg5 = an_empty_string);
+
+void prints(const string &);
+
+inline void prints(char c)
+{
+  putchar(c);
+}
+
+inline void prints(const char *s)
+{
+  fputs(s, stdout);
+}
+
+void prints(const string &s)
+{
+  if (!s.empty())
+    fwrite(s.contents(), 1, s.length(), stdout);
+}
+
+struct horizontal_span {
+  horizontal_span *next;
+  short start_col;
+  short end_col;
+  horizontal_span(int, int, horizontal_span *);
+};
+
+struct single_line_entry;
+struct double_line_entry;
+struct simple_entry;
+
+class table_entry {
+friend class table;
+  table_entry *next;
+  int input_lineno;
+  const char *input_filename;
+protected:
+  int start_row;
+  int end_row;
+  short start_col;
+  short end_col;
+  const entry_modifier *mod;
+public:
+  void set_location();
+  table_entry(const entry_modifier *);
+  virtual ~table_entry();
+  virtual int divert(int ncols, const string *mw, int *sep);
+  virtual void do_width();
+  virtual void do_depth();
+  virtual void print() = 0;
+  virtual void position_vertically() = 0;
+  virtual single_line_entry *to_single_line_entry();
+  virtual double_line_entry *to_double_line_entry();
+  virtual simple_entry *to_simple_entry();
+  virtual int line_type();
+  virtual void note_double_vrule_on_right(int);
+  virtual void note_double_vrule_on_left(int);
+};
+
+class simple_entry : public table_entry {
+public:
+  simple_entry(const entry_modifier *);
+  void print();
+  void position_vertically();
+  simple_entry *to_simple_entry();
+  virtual void add_tab();
+  virtual void simple_print(int);
+};
+
+class empty_entry : public simple_entry {
+public:
+  empty_entry(const entry_modifier *);
+  int line_type();
+};
+
+class text_entry : public simple_entry {
+protected:
+  char *contents;
+  void print_contents();
+public:
+  text_entry(char *, const entry_modifier *);
+  ~text_entry();
+};
+
+void text_entry::print_contents()
+{
+  set_inline_modifier(mod);
+  prints(contents);
+  restore_inline_modifier(mod);
+}
+
+class repeated_char_entry : public text_entry {
+public:
+  repeated_char_entry(char *s, const entry_modifier *m);
+  void simple_print(int);
+};
+
+class simple_text_entry : public text_entry {
+public:
+  simple_text_entry(char *s, const entry_modifier *m);
+  void do_width();
+};
+
+class left_text_entry : public simple_text_entry {
+public:
+  left_text_entry(char *s, const entry_modifier *m);
+  void simple_print(int);
+  void add_tab();
+};
+
+class right_text_entry : public simple_text_entry {
+public:
+  right_text_entry(char *s, const entry_modifier *m);
+  void simple_print(int);
+  void add_tab();
+};
+
+class center_text_entry : public simple_text_entry {
+public:
+  center_text_entry(char *s, const entry_modifier *m);
+  void simple_print(int);
+  void add_tab();
+};
+
+class numeric_text_entry : public text_entry {
+  int dot_pos;
+public:
+  numeric_text_entry(char *s, const entry_modifier *m, int pos);
+  void do_width();
+  void simple_print(int);
+};
+
+class alphabetic_text_entry : public text_entry {
+public:
+  alphabetic_text_entry(char *s, const entry_modifier *m);
+  void do_width();
+  void simple_print(int);
+  void add_tab();
+};
+
+class line_entry : public simple_entry {
+protected:
+  char double_vrule_on_right;
+  char double_vrule_on_left;
+public:
+  line_entry(const entry_modifier *);
+  void note_double_vrule_on_right(int);
+  void note_double_vrule_on_left(int);
+  void simple_print(int) = 0;
+};
+
+class single_line_entry : public line_entry {
+public:
+  single_line_entry(const entry_modifier *m);
+  void simple_print(int);
+  single_line_entry *to_single_line_entry();
+  int line_type();
+};
+
+class double_line_entry : public line_entry {
+public:
+  double_line_entry(const entry_modifier *m);
+  void simple_print(int);
+  double_line_entry *to_double_line_entry();
+  int line_type();
+};
+
+class short_line_entry : public simple_entry {
+public:
+  short_line_entry(const entry_modifier *m);
+  void simple_print(int);
+  int line_type();
+};
+
+class short_double_line_entry : public simple_entry {
+public:
+  short_double_line_entry(const entry_modifier *m);
+  void simple_print(int);
+  int line_type();
+};
+
+class block_entry : public table_entry {
+  char *contents;
+protected:
+  void do_divert(int alphabetic, int ncols, const string *mw, int *sep);
+public:
+  block_entry(char *s, const entry_modifier *m);
+  ~block_entry();
+  int divert(int ncols, const string *mw, int *sep);
+  void do_width();
+  void do_depth();
+  void position_vertically();
+  void print() = 0;
+};
+
+class left_block_entry : public block_entry {
+public:
+  left_block_entry(char *s, const entry_modifier *m);
+  void print();
+};
+
+class right_block_entry : public block_entry {
+public:
+  right_block_entry(char *s, const entry_modifier *m);
+  void print();
+};
+
+class center_block_entry : public block_entry {
+public:
+  center_block_entry(char *s, const entry_modifier *m);
+  void print();
+};
+
+class alphabetic_block_entry : public block_entry {
+public:
+  alphabetic_block_entry(char *s, const entry_modifier *m);
+  void print();
+  int divert(int ncols, const string *mw, int *sep);
+};
+
+table_entry::table_entry(const entry_modifier *m)
+: next(0), input_lineno(-1), input_filename(0),
+  start_row(-1), end_row(-1), start_col(-1), end_col(-1), mod(m)
+{
+}
+
+table_entry::~table_entry()
+{
+}
+
+int table_entry::divert(int, const string *, int *)
+{
+  return 0;
+}
+
+void table_entry::do_width()
+{
+}
+
+single_line_entry *table_entry::to_single_line_entry()
+{
+  return 0;
+}
+
+double_line_entry *table_entry::to_double_line_entry()
+{
+  return 0;
+}
+
+simple_entry *table_entry::to_simple_entry()
+{
+  return 0;
+}
+
+void table_entry::do_depth()
+{
+}
+
+void table_entry::set_location()
+{
+  set_troff_location(input_filename, input_lineno);
+}
+
+int table_entry::line_type()
+{
+  return -1;
+}
+
+void table_entry::note_double_vrule_on_right(int)
+{
+}
+
+void table_entry::note_double_vrule_on_left(int)
+{
+}
+
+simple_entry::simple_entry(const entry_modifier *m) : table_entry(m)
+{
+}
+
+void simple_entry::add_tab()
+{
+  // do nothing
+}
+
+void simple_entry::simple_print(int)
+{
+  // do nothing
+}
+
+void simple_entry::position_vertically()
+{
+  if (start_row != end_row)
+    switch (mod->vertical_alignment) {
+    case entry_modifier::TOP:
+      printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
+      break;
+    case entry_modifier::CENTER:
+      // Peform the motion in two stages so that the center is rounded
+      // vertically upwards even if net vertical motion is upwards.
+      printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
+      printfs(".sp \\n[" BOTTOM_REG "]u-\\n[%1]u-1v/2u\n", 
+	      row_start_reg(start_row));
+      break;
+    case entry_modifier::BOTTOM:
+      printfs(".sp |\\n[%1]u+\\n[" BOTTOM_REG "]u-\\n[%1]u-1v\n", 
+	      row_start_reg(start_row));
+      break;
+    default:
+      assert(0);
+    }
+}
+
+void simple_entry::print()
+{
+  prints(".ta");
+  add_tab();
+  prints('\n');
+  set_location();
+  prints("\\&");
+  simple_print(0);
+  prints('\n');
+}
+
+simple_entry *simple_entry::to_simple_entry()
+{
+  return this;
+}
+
+empty_entry::empty_entry(const entry_modifier *m)
+: simple_entry(m)
+{
+}
+
+int empty_entry::line_type()
+{
+  return 0;
+}
+
+text_entry::text_entry(char *s, const entry_modifier *m)
+: simple_entry(m), contents(s)
+{
+}
+
+text_entry::~text_entry()
+{
+  a_delete contents;
+}
+
+repeated_char_entry::repeated_char_entry(char *s, const entry_modifier *m)
+: text_entry(s, m)
+{
+}
+
+void repeated_char_entry::simple_print(int)
+{
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  set_inline_modifier(mod);
+  printfs("\\l" DELIMITER_CHAR "\\n[%1]u\\&",
+	  span_width_reg(start_col, end_col));
+  prints(contents);
+  prints(DELIMITER_CHAR);
+  restore_inline_modifier(mod);
+}
+
+simple_text_entry::simple_text_entry(char *s, const entry_modifier *m)
+: text_entry(s, m)
+{
+}
+
+void simple_text_entry::do_width()
+{
+  set_location();
+  printfs(".nr %1 \\n[%1]>?\\w" DELIMITER_CHAR,
+	  span_width_reg(start_col, end_col));
+  print_contents();
+  prints(DELIMITER_CHAR "\n");
+}
+
+left_text_entry::left_text_entry(char *s, const entry_modifier *m)
+: simple_text_entry(s, m)
+{
+}
+
+void left_text_entry::simple_print(int)
+{
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  print_contents();
+}
+
+// The only point of this is to make `\a' ``work'' as in Unix tbl.  Grrr.
+
+void left_text_entry::add_tab()
+{
+  printfs(" \\n[%1]u", column_end_reg(end_col));
+}
+
+right_text_entry::right_text_entry(char *s, const entry_modifier *m)
+: simple_text_entry(s, m)
+{
+}
+
+void right_text_entry::simple_print(int)
+{
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  prints("\002\003");
+  print_contents();
+  prints("\002");
+}
+
+void right_text_entry::add_tab()
+{
+  printfs(" \\n[%1]u", column_end_reg(end_col));
+}
+
+center_text_entry::center_text_entry(char *s, const entry_modifier *m)
+: simple_text_entry(s, m)
+{
+}
+
+void center_text_entry::simple_print(int)
+{
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  prints("\002\003");
+  print_contents();
+  prints("\003\002");
+}
+
+void center_text_entry::add_tab()
+{
+  printfs(" \\n[%1]u", column_end_reg(end_col));
+}
+
+numeric_text_entry::numeric_text_entry(char *s, const entry_modifier *m, int pos)
+: text_entry(s, m), dot_pos(pos)
+{
+}
+
+void numeric_text_entry::do_width()
+{
+  if (dot_pos != 0) {
+    set_location();
+    printfs(".nr %1 0\\w" DELIMITER_CHAR,
+	    block_width_reg(start_row, start_col));
+    set_inline_modifier(mod);
+    for (int i = 0; i < dot_pos; i++)
+      prints(contents[i]);
+    restore_inline_modifier(mod);
+    prints(DELIMITER_CHAR "\n");
+    printfs(".nr %1 \\n[%1]>?\\n[%2]\n",
+	    span_left_numeric_width_reg(start_col, end_col),
+	    block_width_reg(start_row, start_col));
+  }
+  else
+    printfs(".nr %1 0\n", block_width_reg(start_row, start_col));
+  if (contents[dot_pos] != '\0') {
+    set_location();
+    printfs(".nr %1 \\n[%1]>?\\w" DELIMITER_CHAR,
+	    span_right_numeric_width_reg(start_col, end_col));
+    set_inline_modifier(mod);
+    prints(contents + dot_pos);
+    restore_inline_modifier(mod);
+    prints(DELIMITER_CHAR "\n");
+  }
+}
+
+void numeric_text_entry::simple_print(int)
+{
+  printfs("\\h'|(\\n[%1]u-\\n[%2]u-\\n[%3]u/2u+\\n[%2]u+\\n[%4]u-\\n[%5]u)'",
+	  span_width_reg(start_col, end_col),
+	  span_left_numeric_width_reg(start_col, end_col),
+	  span_right_numeric_width_reg(start_col, end_col),
+	  column_start_reg(start_col),
+	  block_width_reg(start_row, start_col));
+  print_contents();
+}
+
+alphabetic_text_entry::alphabetic_text_entry(char *s, const entry_modifier *m)
+: text_entry(s, m)
+{
+}
+
+void alphabetic_text_entry::do_width()
+{
+  set_location();
+  printfs(".nr %1 \\n[%1]>?\\w" DELIMITER_CHAR,
+	  span_alphabetic_width_reg(start_col, end_col));
+  print_contents();
+  prints(DELIMITER_CHAR "\n");
+}
+
+void alphabetic_text_entry::simple_print(int)
+{
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  printfs("\\h'\\n[%1]u-\\n[%2]u/2u'",
+	  span_width_reg(start_col, end_col),
+	  span_alphabetic_width_reg(start_col, end_col));
+  print_contents();
+}
+
+// The only point of this is to make `\a' ``work'' as in Unix tbl.  Grrr.
+
+void alphabetic_text_entry::add_tab()
+{
+  printfs(" \\n[%1]u", column_end_reg(end_col));
+}
+
+block_entry::block_entry(char *s, const entry_modifier *m)
+: table_entry(m), contents(s)
+{
+}
+
+block_entry::~block_entry()
+{
+  a_delete contents;
+}
+
+void block_entry::position_vertically()
+{
+  if (start_row != end_row)
+    switch(mod->vertical_alignment) {
+    case entry_modifier::TOP:
+      printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
+      break;
+    case entry_modifier::CENTER:
+      // Peform the motion in two stages so that the center is rounded
+      // vertically upwards even if net vertical motion is upwards.
+      printfs(".sp |\\n[%1]u\n", row_start_reg(start_row));
+      printfs(".sp \\n[" BOTTOM_REG "]u-\\n[%1]u-\\n[%2]u/2u\n", 
+	      row_start_reg(start_row),
+	      block_height_reg(start_row, start_col));
+      break;
+    case entry_modifier::BOTTOM:
+      printfs(".sp |\\n[%1]u+\\n[" BOTTOM_REG "]u-\\n[%1]u-\\n[%2]u\n", 
+	      row_start_reg(start_row),
+	      block_height_reg(start_row, start_col));
+      break;
+    default:
+      assert(0);
+    }
+  if (mod->stagger)
+    prints(".sp -.5v\n");
+}
+
+int block_entry::divert(int ncols, const string *mw, int *sep)
+{
+  do_divert(0, ncols, mw, sep);
+  return 1;
+}
+
+void block_entry::do_divert(int alphabetic, int ncols, const string *mw,
+			    int *sep)
+{
+  printfs(".di %1\n", block_diversion_name(start_row, start_col));
+  prints(".if \\n[" SAVED_FILL_REG "] .fi\n"
+	 ".in 0\n");
+  prints(".ll ");
+  int i;
+  for (i = start_col; i <= end_col; i++)
+    if (mw[i].empty())
+      break;
+  if (i > end_col) {
+    // Every column spanned by this entry has a minimum width.
+    for (int j = start_col; j <= end_col; j++) {
+      if (j > start_col) {
+	if (sep)
+	  printfs("+%1n", as_string(sep[j - 1]));
+	prints('+');
+      }
+      printfs("(n;%1)", mw[j]);
+    }
+    printfs(">?\\n[%1]u", span_width_reg(start_col, end_col));
+  }
+  else
+    printfs("(u;\\n[%1]>?(\\n[.l]*%2/%3))", 
+	    span_width_reg(start_col, end_col), 
+	    as_string(end_col - start_col + 1),
+	    as_string(ncols + 1));
+  if (alphabetic)
+    prints("-2n");
+  prints("\n");
+  set_modifier(mod);
+  prints(".cp \\n(" COMPATIBLE_REG "\n");
+  set_location();
+  prints(contents);
+  prints(".br\n.di\n.cp 0\n");
+  if (!mod->zero_width) {
+    if (alphabetic) {
+      printfs(".nr %1 \\n[%1]>?(\\n[dl]+2n)\n",
+	      span_width_reg(start_col, end_col));
+      printfs(".nr %1 \\n[%1]>?\\n[dl]\n",
+	      span_alphabetic_width_reg(start_col, end_col));
+    }
+    else
+      printfs(".nr %1 \\n[%1]>?\\n[dl]\n", span_width_reg(start_col, end_col));
+  }
+  printfs(".nr %1 \\n[dn]\n", block_height_reg(start_row, start_col));
+  printfs(".nr %1 \\n[dl]\n", block_width_reg(start_row, start_col));
+  prints("." RESET_MACRO_NAME "\n"
+	 ".in \\n[" SAVED_INDENT_REG "]u\n"
+	 ".nf\n");
+  // the block might have contained .lf commands
+  location_force_filename = 1;
+}
+
+void block_entry::do_width()
+{
+  // do nothing; the action happens in divert
+}
+
+void block_entry::do_depth()
+{
+  printfs(".nr " BOTTOM_REG " \\n[" BOTTOM_REG "]>?(\\n[%1]+\\n[%2])\n",
+	  row_start_reg(start_row),
+	  block_height_reg(start_row, start_col));
+}
+
+left_block_entry::left_block_entry(char *s, const entry_modifier *m)
+: block_entry(s, m)
+{
+}
+
+void left_block_entry::print()
+{
+  printfs(".in +\\n[%1]u\n", column_start_reg(start_col));
+  printfs(".%1\n", block_diversion_name(start_row, start_col));
+  prints(".in\n");
+}
+
+right_block_entry::right_block_entry(char *s, const entry_modifier *m)
+: block_entry(s, m)
+{
+}
+
+void right_block_entry::print()
+{
+  printfs(".in +\\n[%1]u+\\n[%2]u-\\n[%3]u\n",
+	  column_start_reg(start_col),
+	  span_width_reg(start_col, end_col),
+	  block_width_reg(start_row, start_col));
+  printfs(".%1\n", block_diversion_name(start_row, start_col));
+  prints(".in\n");
+}
+
+center_block_entry::center_block_entry(char *s, const entry_modifier *m)
+: block_entry(s, m)
+{
+}
+
+void center_block_entry::print()
+{
+  printfs(".in +\\n[%1]u+(\\n[%2]u-\\n[%3]u/2u)\n",
+	  column_start_reg(start_col),
+	  span_width_reg(start_col, end_col),
+	  block_width_reg(start_row, start_col));
+  printfs(".%1\n", block_diversion_name(start_row, start_col));
+  prints(".in\n");
+}
+
+alphabetic_block_entry::alphabetic_block_entry(char *s,
+					       const entry_modifier *m)
+: block_entry(s, m)
+{
+}
+
+int alphabetic_block_entry::divert(int ncols, const string *mw, int *sep)
+{
+  do_divert(1, ncols, mw, sep);
+  return 1;
+}
+
+void alphabetic_block_entry::print()
+{
+  printfs(".in +\\n[%1]u+(\\n[%2]u-\\n[%3]u/2u)\n",
+	  column_start_reg(start_col),
+	  span_width_reg(start_col, end_col),
+	  span_alphabetic_width_reg(start_col, end_col));
+  printfs(".%1\n", block_diversion_name(start_row, start_col));
+  prints(".in\n");
+}
+
+line_entry::line_entry(const entry_modifier *m)
+: simple_entry(m), double_vrule_on_right(0), double_vrule_on_left(0)
+{
+}
+
+void line_entry::note_double_vrule_on_right(int is_corner)
+{
+  double_vrule_on_right = is_corner ? 1 : 2;
+}
+
+void line_entry::note_double_vrule_on_left(int is_corner)
+{
+  double_vrule_on_left = is_corner ? 1 : 2;
+}
+
+single_line_entry::single_line_entry(const entry_modifier *m)
+: line_entry(m)
+{
+}
+
+int single_line_entry::line_type()
+{
+  return 1;
+}
+
+void single_line_entry::simple_print(int dont_move)
+{
+  printfs("\\h'|\\n[%1]u",
+	  column_divide_reg(start_col));
+  if (double_vrule_on_left) {
+    prints(double_vrule_on_left == 1 ? "-" : "+");
+    prints(HALF_DOUBLE_LINE_SEP);
+  }
+  prints("'");
+  if (!dont_move)
+    prints("\\v'-" BAR_HEIGHT "'");
+  printfs("\\s[\\n[" LINESIZE_REG "]]" "\\D'l |\\n[%1]u",
+	  column_divide_reg(end_col+1));
+  if (double_vrule_on_right) {
+    prints(double_vrule_on_left == 1 ? "+" : "-");
+    prints(HALF_DOUBLE_LINE_SEP);
+  }
+  prints("0'\\s0");
+  if (!dont_move)
+    prints("\\v'" BAR_HEIGHT "'");
+}
+  
+single_line_entry *single_line_entry::to_single_line_entry()
+{
+  return this;
+}
+
+double_line_entry::double_line_entry(const entry_modifier *m)
+: line_entry(m)
+{
+}
+
+int double_line_entry::line_type()
+{
+  return 2;
+}
+
+void double_line_entry::simple_print(int dont_move)
+{
+  if (!dont_move)
+    prints("\\v'-" BAR_HEIGHT "'");
+  printfs("\\h'|\\n[%1]u",
+	  column_divide_reg(start_col));
+  if (double_vrule_on_left) {
+    prints(double_vrule_on_left == 1 ? "-" : "+");
+    prints(HALF_DOUBLE_LINE_SEP);
+  }
+  prints("'");
+  printfs("\\v'-" HALF_DOUBLE_LINE_SEP "'"
+	  "\\s[\\n[" LINESIZE_REG "]]"
+	  "\\D'l |\\n[%1]u",
+	  column_divide_reg(end_col+1));
+  if (double_vrule_on_right)
+    prints("-" HALF_DOUBLE_LINE_SEP);
+  prints(" 0'");
+  printfs("\\v'" DOUBLE_LINE_SEP "'"
+	  "\\D'l |\\n[%1]u",
+	  column_divide_reg(start_col));
+  if (double_vrule_on_right) {
+    prints(double_vrule_on_left == 1 ? "+" : "-");
+    prints(HALF_DOUBLE_LINE_SEP);
+  }
+  prints(" 0'");
+  prints("\\s0"
+	 "\\v'-" HALF_DOUBLE_LINE_SEP "'");
+  if (!dont_move)
+    prints("\\v'" BAR_HEIGHT "'");
+}
+
+double_line_entry *double_line_entry::to_double_line_entry()
+{
+  return this;
+}
+
+short_line_entry::short_line_entry(const entry_modifier *m)
+: simple_entry(m)
+{
+}
+
+int short_line_entry::line_type()
+{
+  return 1;
+}
+
+void short_line_entry::simple_print(int dont_move)
+{
+  if (mod->stagger)
+    prints("\\v'-.5v'");
+  if (!dont_move)
+    prints("\\v'-" BAR_HEIGHT "'");
+  printfs("\\h'|\\n[%1]u'", column_start_reg(start_col));
+  printfs("\\s[\\n[" LINESIZE_REG "]]"
+	  "\\D'l \\n[%1]u 0'"
+	  "\\s0",
+	  span_width_reg(start_col, end_col));
+  if (!dont_move)
+    prints("\\v'" BAR_HEIGHT "'");
+  if (mod->stagger)
+    prints("\\v'.5v'");
+}
+
+short_double_line_entry::short_double_line_entry(const entry_modifier *m)
+: simple_entry(m)
+{
+}
+
+int short_double_line_entry::line_type()
+{
+  return 2;
+}
+
+void short_double_line_entry::simple_print(int dont_move)
+{
+  if (mod->stagger)
+    prints("\\v'-.5v'");
+  if (!dont_move)
+    prints("\\v'-" BAR_HEIGHT "'");
+  printfs("\\h'|\\n[%2]u'"
+	  "\\v'-" HALF_DOUBLE_LINE_SEP "'"
+	  "\\s[\\n[" LINESIZE_REG "]]"
+	  "\\D'l \\n[%1]u 0'"
+	  "\\v'" DOUBLE_LINE_SEP "'"
+	  "\\D'l |\\n[%2]u 0'"
+	  "\\s0"
+	  "\\v'-" HALF_DOUBLE_LINE_SEP "'",
+	  span_width_reg(start_col, end_col),
+	  column_start_reg(start_col));
+  if (!dont_move)
+    prints("\\v'" BAR_HEIGHT "'");
+  if (mod->stagger)
+    prints("\\v'.5v'");
+}
+
+void set_modifier(const entry_modifier *m)
+{
+  if (!m->font.empty())
+    printfs(".ft %1\n", m->font);
+  if (m->point_size.val != 0) {
+    prints(".ps ");
+    if (m->point_size.inc > 0)
+      prints('+');
+    else if (m->point_size.inc < 0)
+      prints('-');
+    printfs("%1\n", as_string(m->point_size.val));
+  }
+  if (m->vertical_spacing.val != 0) {
+    prints(".vs ");
+    if (m->vertical_spacing.inc > 0)
+      prints('+');
+    else if (m->vertical_spacing.inc < 0)
+      prints('-');
+    printfs("%1\n", as_string(m->vertical_spacing.val));
+  }
+}
+
+void set_inline_modifier(const entry_modifier *m)
+{
+  if (!m->font.empty())
+    printfs("\\f[%1]", m->font);
+  if (m->point_size.val != 0) {
+    prints("\\s[");
+    if (m->point_size.inc > 0)
+      prints('+');
+    else if (m->point_size.inc < 0)
+      prints('-');
+    printfs("%1]", as_string(m->point_size.val));
+  }
+  if (m->stagger)
+    prints("\\v'-.5v'");
+}
+
+void restore_inline_modifier(const entry_modifier *m)
+{
+  if (!m->font.empty())
+    prints("\\f[\\n[" SAVED_FONT_REG "]]");
+  if (m->point_size.val != 0)
+    prints("\\s[\\n[" SAVED_SIZE_REG "]]");
+  if (m->stagger)
+    prints("\\v'.5v'");
+}
+
+struct stuff {
+  stuff *next;
+  int row;			// occurs before row `row'
+  char printed;			// has it been printed?
+
+  stuff(int);
+  virtual void print(table *) = 0;
+  virtual ~stuff();
+  virtual int is_single_line() { return 0; };
+  virtual int is_double_line() { return 0; };
+};
+
+stuff::stuff(int r) : next(0), row(r), printed(0)
+{
+}
+
+stuff::~stuff()
+{
+}
+
+struct text_stuff : public stuff {
+  string contents;
+  const char *filename;
+  int lineno;
+
+  text_stuff(const string &, int r, const char *fn, int ln);
+  ~text_stuff();
+  void print(table *);
+};
+
+text_stuff::text_stuff(const string &s, int r, const char *fn, int ln)
+: stuff(r), contents(s), filename(fn), lineno(ln)
+{
+}
+
+text_stuff::~text_stuff()
+{
+}
+
+void text_stuff::print(table *)
+{
+  printed = 1;
+  prints(".cp \\n(" COMPATIBLE_REG "\n");
+  set_troff_location(filename, lineno);
+  prints(contents);
+  prints(".cp 0\n");
+  location_force_filename = 1;	// it might have been a .lf command
+}
+
+struct single_hline_stuff : public stuff {
+  single_hline_stuff(int r);
+  void print(table *);
+  int is_single_line();
+};
+
+single_hline_stuff::single_hline_stuff(int r) : stuff(r)
+{
+}
+
+void single_hline_stuff::print(table *tbl)
+{
+  printed = 1;
+  tbl->print_single_hline(row);
+}
+
+int single_hline_stuff::is_single_line()
+{
+  return 1;
+}
+
+struct double_hline_stuff : stuff {
+  double_hline_stuff(int r);
+  void print(table *);
+  int is_double_line();
+};
+
+double_hline_stuff::double_hline_stuff(int r) : stuff(r)
+{
+}
+
+void double_hline_stuff::print(table *tbl)
+{
+  printed = 1;
+  tbl->print_double_hline(row);
+}
+
+int double_hline_stuff::is_double_line()
+{
+  return 1;
+}
+
+struct vertical_rule {
+  vertical_rule *next;
+  int start_row;
+  int end_row;
+  short col;
+  char is_double;
+  string top_adjust;
+  string bot_adjust;
+
+  vertical_rule(int sr, int er, int c, int dbl, vertical_rule *);
+  ~vertical_rule();
+  void contribute_to_bottom_macro(table *);
+  void print();
+};
+
+vertical_rule::vertical_rule(int sr, int er, int c, int dbl, vertical_rule *p)
+: next(p), start_row(sr), end_row(er), col(c), is_double(dbl)
+{
+}
+
+vertical_rule::~vertical_rule()
+{
+}
+
+void vertical_rule::contribute_to_bottom_macro(table *tbl)
+{
+  printfs(".if \\n[" CURRENT_ROW_REG "]>=%1",
+	  as_string(start_row));
+  if (end_row != tbl->get_nrows() - 1)
+    printfs("&(\\n[" CURRENT_ROW_REG "]<%1)",
+	    as_string(end_row));
+  prints(" \\{");
+  printfs(".if %1<=\\n[" LAST_PASSED_ROW_REG "] .nr %2 \\n[#T]\n",
+	  as_string(start_row),
+	  row_top_reg(start_row));
+  const char *offset_table[3];
+  if (is_double) {
+    offset_table[0] = "-" HALF_DOUBLE_LINE_SEP;
+    offset_table[1] = "+" HALF_DOUBLE_LINE_SEP;
+    offset_table[2] = 0;
+  }
+  else {
+    offset_table[0] = "";
+    offset_table[1] = 0;
+  }
+  for (const char **offsetp = offset_table; *offsetp; offsetp++) {
+    prints(".sp -1\n"
+	   "\\v'" BODY_DEPTH);
+    if (!bot_adjust.empty())
+      printfs("+%1", bot_adjust);
+    prints("'");
+    printfs("\\h'\\n[%1]u%3'\\s[\\n[" LINESIZE_REG "]]\\D'l 0 |\\n[%2]u-1v",
+	    column_divide_reg(col),
+	    row_top_reg(start_row),
+	    *offsetp);
+    if (!bot_adjust.empty())
+      printfs("-(%1)", bot_adjust);
+    // don't perform the top adjustment if the top is actually #T
+    if (!top_adjust.empty())
+      printfs("+((%1)*(%2>\\n[" LAST_PASSED_ROW_REG "]))",
+	      top_adjust,
+	      as_string(start_row));
+    prints("'\\s0\n");
+  }
+  prints(".\\}\n");
+}
+
+void vertical_rule::print()
+{
+  printfs("\\*[" TRANSPARENT_STRING_NAME "]"
+	  ".if %1<=\\*[" QUOTE_STRING_NAME "]\\n[" LAST_PASSED_ROW_REG "] "
+	  ".nr %2 \\*[" QUOTE_STRING_NAME "]\\n[#T]\n",
+	  as_string(start_row),
+	  row_top_reg(start_row));
+  const char *offset_table[3];
+  if (is_double) {
+    offset_table[0] = "-" HALF_DOUBLE_LINE_SEP;
+    offset_table[1] = "+" HALF_DOUBLE_LINE_SEP;
+    offset_table[2] = 0;
+  }
+  else {
+    offset_table[0] = "";
+    offset_table[1] = 0;
+  }
+  for (const char **offsetp = offset_table; *offsetp; offsetp++) {
+    prints("\\*[" TRANSPARENT_STRING_NAME "].sp -1\n"
+	   "\\*[" TRANSPARENT_STRING_NAME "]\\v'" BODY_DEPTH);
+    if (!bot_adjust.empty())
+      printfs("+%1", bot_adjust);
+    prints("'");
+    printfs("\\h'\\n[%1]u%3'"
+	    "\\s[\\n[" LINESIZE_REG "]]"
+	    "\\D'l 0 |\\*[" QUOTE_STRING_NAME "]\\n[%2]u-1v",
+	    column_divide_reg(col),
+	    row_top_reg(start_row),
+	    *offsetp);
+    if (!bot_adjust.empty())
+      printfs("-(%1)", bot_adjust);
+    // don't perform the top adjustment if the top is actually #T
+    if (!top_adjust.empty())
+      printfs("+((%1)*(%2>\\*[" QUOTE_STRING_NAME "]\\n["
+	      LAST_PASSED_ROW_REG "]))",
+	      top_adjust,
+	      as_string(start_row));
+    prints("'"
+	   "\\s0\n");
+  }
+}
+
+table::table(int nc, unsigned f, int ls, char dpc)
+: flags(f), nrows(0), ncolumns(nc), linesize(ls), decimal_point_char(dpc),
+  vrule_list(0), stuff_list(0), span_list(0),
+  entry_list(0), entry_list_tailp(&entry_list), entry(0),
+  vline(0), row_is_all_lines(0), left_separation(0), right_separation(0),
+  allocated_rows(0)
+{
+  minimum_width = new string[ncolumns];
+  column_separation = ncolumns > 1 ? new int[ncolumns - 1] : 0;
+  equal = new char[ncolumns];
+  int i;
+  for (i = 0; i < ncolumns; i++)
+    equal[i] = 0;
+  for (i = 0; i < ncolumns-1; i++)
+    column_separation[i] = DEFAULT_COLUMN_SEPARATION;
+  delim[0] = delim[1] = '\0';
+}
+
+table::~table()
+{
+  for (int i = 0; i < nrows; i++) {
+    a_delete entry[i];
+    a_delete vline[i];
+  }
+  a_delete entry;
+  a_delete vline;
+  while (entry_list) {
+    table_entry *tem = entry_list;
+    entry_list = entry_list->next;
+    delete tem;
+  }
+  ad_delete(ncolumns) minimum_width;
+  a_delete column_separation;
+  a_delete equal;
+  while (stuff_list) {
+    stuff *tem = stuff_list;
+    stuff_list = stuff_list->next;
+    delete tem;
+  }
+  while (vrule_list) {
+    vertical_rule *tem = vrule_list;
+    vrule_list = vrule_list->next;
+    delete tem;
+  }
+  a_delete row_is_all_lines;
+  while (span_list) {
+    horizontal_span *tem = span_list;
+    span_list = span_list->next;
+    delete tem;
+  }
+}
+
+void table::set_delim(char c1, char c2)
+{
+  delim[0] = c1;
+  delim[1] = c2;
+}
+
+void table::set_minimum_width(int c, const string &w)
+{
+  assert(c >= 0 && c < ncolumns);
+  minimum_width[c] = w;
+}
+
+void table::set_column_separation(int c, int n)
+{
+  assert(c >= 0 && c < ncolumns - 1);
+  column_separation[c] = n;
+}
+
+void table::set_equal_column(int c)
+{
+  assert(c >= 0 && c < ncolumns);
+  equal[c] = 1;
+}
+
+void table::add_stuff(stuff *p)
+{
+  stuff **pp;
+  for (pp = &stuff_list; *pp; pp = &(*pp)->next)
+    ;
+  *pp = p;
+}
+
+void table::add_text_line(int r, const string &s, const char *filename, int lineno)
+{
+  add_stuff(new text_stuff(s, r, filename, lineno));
+}
+
+void table::add_single_hline(int r)
+{
+  add_stuff(new single_hline_stuff(r));
+}
+
+void table::add_double_hline(int r)
+{
+  add_stuff(new double_hline_stuff(r));
+}
+
+void table::allocate(int r)
+{
+  if (r >= nrows) {
+    typedef table_entry **PPtable_entry; // work around g++ 1.36.1 bug
+    if (r >= allocated_rows) {
+      if (allocated_rows == 0) {
+	allocated_rows = 16;
+	if (allocated_rows <= r)
+	  allocated_rows = r + 1;
+	entry = new PPtable_entry[allocated_rows];
+	vline = new char*[allocated_rows];
+      }
+      else {
+	table_entry ***old_entry = entry;
+	int old_allocated_rows = allocated_rows;
+	allocated_rows *= 2;
+	if (allocated_rows <= r)
+	  allocated_rows = r + 1;
+	entry = new PPtable_entry[allocated_rows];
+	memcpy(entry, old_entry, sizeof(table_entry**)*old_allocated_rows);
+	a_delete old_entry;
+	char **old_vline = vline;
+	vline = new char*[allocated_rows];
+	memcpy(vline, old_vline, sizeof(char*)*old_allocated_rows);
+	a_delete old_vline;
+      }
+    }
+    assert(allocated_rows > r);
+    while (nrows <= r) {
+      entry[nrows] = new table_entry*[ncolumns];
+      int i;
+      for (i = 0; i < ncolumns; i++)
+	entry[nrows][i] = 0;
+      vline[nrows] = new char[ncolumns+1];
+      for (i = 0; i < ncolumns+1; i++)
+	vline[nrows][i] = 0;
+      nrows++;
+    }
+  }
+}
+
+void table::do_hspan(int r, int c)
+{
+  assert(r >= 0 && c >= 0 && r < nrows && c < ncolumns);
+  if (c == 0) {
+    error("first column cannot be horizontally spanned");
+    return;
+  }
+  table_entry *e = entry[r][c];
+  if (e) {
+    assert(e->start_row <= r && r <= e->end_row
+	   && e->start_col <= c && c <= e->end_col
+	   && e->end_row - e->start_row > 0
+	   && e->end_col - e->start_col > 0);
+    return;
+  }
+  e = entry[r][c-1];
+  // e can be 0 if we had an empty entry or an error
+  if (e == 0)
+    return;
+  if (e->start_row != r) {
+    /*
+      l l
+      ^ s */
+    error("impossible horizontal span at row %1, column %2", r + 1, c + 1);
+  }
+  else {
+    e->end_col = c;
+    entry[r][c] = e;
+  }
+}
+
+void table::do_vspan(int r, int c)
+{
+  assert(r >= 0 && c >= 0 && r < nrows && c < ncolumns);
+  if (r == 0) {
+    error("first row cannot be vertically spanned");
+    return;
+  }
+  table_entry *e = entry[r][c];
+  if (e) {
+    assert(e->start_row <= r && r <= e->end_row
+	   && e->start_col <= c && c <= e->end_col
+	   && e->end_row - e->start_row > 0
+	   && e->end_col - e->start_col > 0);
+    return;
+  }
+  e = entry[r-1][c];
+  // e can be 0 if we had an empty entry or an error
+  if (e == 0)
+    return;
+  if (e->start_col != c) {
+    /* l s
+       l ^ */
+    error("impossible vertical span at row %1, column %2", r + 1, c + 1);
+  }
+  else {
+    for (int i = c; i <= e->end_col; i++) {
+      assert(entry[r][i] == 0);
+      entry[r][i] = e;
+    }
+    e->end_row = r;
+  }
+}
+
+int find_decimal_point(const char *s, char decimal_point_char,
+		       const char *delim)
+{
+  if (s == 0 || *s == '\0')
+    return -1;
+  const char *p;
+  int in_delim = 0;		// is p within eqn delimiters?
+  // tbl recognises \& even within eqn delimiters; I don't
+  for (p = s; *p; p++)
+    if (in_delim) {
+      if (*p == delim[1])
+	in_delim = 0;
+    }
+    else if (*p == delim[0])
+      in_delim = 1;
+    else if (p[0] == '\\' && p[1] == '&')
+      return p - s;
+  int possible_pos = -1;
+  in_delim = 0;
+  for (p = s; *p; p++)
+    if (in_delim) {
+      if (*p == delim[1])
+	in_delim = 0;
+    }
+    else if (*p == delim[0])
+      in_delim = 1;
+    else if (p[0] == decimal_point_char && csdigit(p[1]))
+      possible_pos = p - s;
+  if (possible_pos >= 0)
+    return possible_pos;
+  in_delim = 0;
+  for (p = s; *p; p++)
+    if (in_delim) {
+      if (*p == delim[1])
+	in_delim = 0;
+    }
+    else if (*p == delim[0])
+      in_delim = 1;
+    else if (csdigit(*p))
+      possible_pos = p + 1 - s;
+  return possible_pos;
+}
+
+void table::add_entry(int r, int c, const string &str, const entry_format *f,
+		      const char *fn, int ln)
+{
+  allocate(r);
+  table_entry *e = 0;
+  if (str == "\\_") {
+    e = new short_line_entry(f);
+  }
+  else if (str == "\\=") {
+    e = new short_double_line_entry(f);
+  }
+  else if (str == "_") {
+    single_line_entry *lefte;
+    if (c > 0 && entry[r][c-1] != 0 &&
+	(lefte = entry[r][c-1]->to_single_line_entry()) != 0
+	&& lefte->start_row == r
+	&& lefte->mod->stagger == f->stagger) {
+      lefte->end_col = c;
+      entry[r][c] = lefte;
+    }
+    else
+      e = new single_line_entry(f);
+  }
+  else if (str == "=") {
+    double_line_entry *lefte;
+    if (c > 0 && entry[r][c-1] != 0 &&
+	(lefte = entry[r][c-1]->to_double_line_entry()) != 0
+	&& lefte->start_row == r
+	&& lefte->mod->stagger == f->stagger) {
+      lefte->end_col = c;
+      entry[r][c] = lefte;
+    }
+    else
+      e = new double_line_entry(f);
+  }
+  else if (str == "\\^") {
+    do_vspan(r, c);
+  }
+  else if (str.length() > 2 && str[0] == '\\' && str[1] == 'R') {
+    if (str.search('\n') >= 0)
+      error_with_file_and_line(fn, ln, "bad repeated character");
+    else {
+      char *s = str.substring(2, str.length() - 2).extract();
+      e = new repeated_char_entry(s, f);
+    }
+  }
+  else {
+    int is_block = str.search('\n') >= 0;
+    char *s;
+    switch (f->type) {
+    case FORMAT_SPAN:
+      assert(str.empty());
+      do_hspan(r, c);
+      break;
+    case FORMAT_LEFT:
+      if (!str.empty()) {
+	s = str.extract();
+	if (is_block)
+	  e = new left_block_entry(s, f);
+	else
+	  e = new left_text_entry(s, f);
+      }
+      else
+	e = new empty_entry(f);
+      break;
+    case FORMAT_CENTER:
+      if (!str.empty()) {
+	s = str.extract();
+	if (is_block)
+	  e = new center_block_entry(s, f);
+	else
+	  e = new center_text_entry(s, f);
+      }
+      else
+	e = new empty_entry(f);
+      break;
+    case FORMAT_RIGHT:
+      if (!str.empty()) {
+	s = str.extract();
+	if (is_block)
+	  e = new right_block_entry(s, f);
+	else
+	  e = new right_text_entry(s, f);
+      }
+      else
+	e = new empty_entry(f);
+      break;
+    case FORMAT_NUMERIC:
+      if (!str.empty()) {
+	s = str.extract();
+	if (is_block) {
+	  error_with_file_and_line(fn, ln, "can't have numeric text block");
+	  e = new left_block_entry(s, f);
+	}
+	else {
+	  int pos = find_decimal_point(s, decimal_point_char, delim);
+	  if (pos < 0)
+	    e = new center_text_entry(s, f);
+	  else
+	    e = new numeric_text_entry(s, f, pos);
+	}
+      }
+      else
+	e = new empty_entry(f);
+      break;
+    case FORMAT_ALPHABETIC:
+      if (!str.empty()) {
+	s = str.extract();
+	if (is_block)
+	  e = new alphabetic_block_entry(s, f);
+	else
+	  e = new alphabetic_text_entry(s, f);
+      }
+      else
+	e = new empty_entry(f);
+      break;
+    case FORMAT_VSPAN:
+      do_vspan(r, c);
+      break;
+    case FORMAT_HLINE:
+      if (str.length() != 0)
+	error_with_file_and_line(fn, ln,
+				 "non-empty data entry for `_' format ignored");
+      e = new single_line_entry(f);
+      break;
+    case FORMAT_DOUBLE_HLINE:
+      if (str.length() != 0)
+	error_with_file_and_line(fn, ln,
+				 "non-empty data entry for `=' format ignored");
+      e = new double_line_entry(f);
+      break;
+    default:
+      assert(0);
+    }
+  }
+  if (e) {
+    table_entry *preve = entry[r][c];
+    if (preve) {
+      /* c s
+         ^ l */
+      error_with_file_and_line(fn, ln, "row %1, column %2 already spanned",
+			       r + 1, c + 1);
+      delete e;
+    }
+    else {
+      e->input_lineno = ln;
+      e->input_filename = fn;
+      e->start_row = e->end_row = r;
+      e->start_col = e->end_col = c;
+      *entry_list_tailp = e;
+      entry_list_tailp = &e->next;
+      entry[r][c] = e;
+    }
+  }
+}
+
+// add vertical lines for row r
+
+void table::add_vlines(int r, const char *v)
+{
+  allocate(r);
+  for (int i = 0; i < ncolumns+1; i++)
+    vline[r][i] = v[i];
+}
+
+void table::check()
+{
+  table_entry *p = entry_list;
+  int i, j;
+  while (p) {
+    for (i = p->start_row; i <= p->end_row; i++)
+      for (j = p->start_col; j <= p->end_col; j++)
+	assert(entry[i][j] == p);
+    p = p->next;
+  }
+}
+
+void table::print()
+{
+  location_force_filename = 1;
+  check();
+  init_output();
+  determine_row_type();
+  compute_widths();
+  if (!(flags & CENTER))
+    prints(".if \\n[" SAVED_CENTER_REG "] \\{");
+  prints(".in +(u;\\n[.l]-\\n[.i]-\\n[TW]/2>?-\\n[.i])\n"
+	 ".nr " SAVED_INDENT_REG " \\n[.i]\n");
+  if (!(flags & CENTER))
+    prints(".\\}\n");
+  build_vrule_list();
+  define_bottom_macro();
+  do_top();
+  for (int i = 0; i < nrows; i++)
+    do_row(i);
+  do_bottom();
+}
+
+void table::determine_row_type()
+{
+  row_is_all_lines = new char[nrows];
+  for (int i = 0; i < nrows; i++) {
+    int had_single = 0;
+    int had_double = 0;
+    int had_non_line = 0;
+    for (int c = 0; c < ncolumns; c++) {
+      table_entry *e = entry[i][c];
+      if (e != 0) {
+	if (e->start_row == e->end_row) {
+	  int t = e->line_type();
+	  switch (t) {
+	  case -1:
+	    had_non_line = 1;
+	    break;
+	  case 0:
+	    // empty
+	    break;
+	  case 1:
+	    had_single = 1;
+	    break;
+	  case 2:
+	    had_double = 1;
+	    break;
+	  default:
+	    assert(0);
+	  }
+	  if (had_non_line)
+	    break;
+	}
+	c = e->end_col;
+      }
+    }
+    if (had_non_line)
+      row_is_all_lines[i] = 0;
+    else if (had_double)
+      row_is_all_lines[i] = 2;
+    else if (had_single)
+      row_is_all_lines[i] = 1;
+    else
+      row_is_all_lines[i] = 0;
+  }
+}
+
+void table::init_output()
+{
+  prints(".nr " COMPATIBLE_REG " \\n(.C\n"
+	 ".cp 0\n");
+  if (linesize > 0)
+    printfs(".nr " LINESIZE_REG " %1\n", as_string(linesize));
+  else
+    prints(".nr " LINESIZE_REG " \\n[.s]\n");
+  if (!(flags & CENTER))
+    prints(".nr " SAVED_CENTER_REG " \\n[.ce]\n");
+  prints(".de " RESET_MACRO_NAME "\n"
+	 ".ft \\n[.f]\n"
+	 ".ps \\n[.s]\n"
+	 ".vs \\n[.v]u\n"
+	 ".in \\n[.i]u\n"
+	 ".ll \\n[.l]u\n"
+	 ".ls \\n[.L]\n"
+	 ".ad \\n[.j]\n"
+	 ".ie \\n[.u] .fi\n"
+	 ".el .nf\n"
+	 ".ce \\n[.ce]\n"
+	 "..\n"
+	 ".nr " SAVED_INDENT_REG " \\n[.i]\n"
+	 ".nr " SAVED_FONT_REG " \\n[.f]\n"
+	 ".nr " SAVED_SIZE_REG " \\n[.s]\n"
+	 ".nr " SAVED_FILL_REG " \\n[.u]\n"
+	 ".nr T. 0\n"
+	 ".nr " CURRENT_ROW_REG " 0-1\n"
+	 ".nr " LAST_PASSED_ROW_REG " 0-1\n"
+	 ".nr " SECTION_DIVERSION_FLAG_REG " 0\n"
+	 ".ds " TRANSPARENT_STRING_NAME "\n"
+	 ".ds " QUOTE_STRING_NAME "\n"
+	 ".nr " NEED_BOTTOM_RULE_REG " 1\n"
+	 ".nr " SUPPRESS_BOTTOM_REG " 0\n"
+	 ".eo\n"
+	 ".de " REPEATED_MARK_MACRO "\n"
+	 ".mk \\$1\n"
+	 ".if !'\\n(.z'' \\!." REPEATED_MARK_MACRO " \"\\$1\"\n"
+	 "..\n"
+	 ".de " REPEATED_VPT_MACRO "\n"
+	 ".vpt \\$1\n"
+	 ".if !'\\n(.z'' \\!." REPEATED_VPT_MACRO " \"\\$1\"\n"
+	 "..\n");
+  if (!(flags & NOKEEP))
+    prints(".de " KEEP_MACRO_NAME "\n"
+	   ".if '\\n[.z]'' \\{.ds " QUOTE_STRING_NAME " \\\\\n"
+	   ".ds " TRANSPARENT_STRING_NAME " \\!\n"
+	   ".di " SECTION_DIVERSION_NAME "\n"
+	   ".nr " SECTION_DIVERSION_FLAG_REG " 1\n"
+	   ".in 0\n"
+	   ".\\}\n"
+	   "..\n"
+	   ".de " RELEASE_MACRO_NAME "\n"
+	   ".if \\n[" SECTION_DIVERSION_FLAG_REG "] \\{"
+	   ".di\n"
+	   ".in \\n[" SAVED_INDENT_REG "]u\n"
+	   ".nr " SAVED_DN_REG " \\n[dn]\n"
+	   ".ds " QUOTE_STRING_NAME "\n"
+	   ".ds " TRANSPARENT_STRING_NAME "\n"
+	   ".nr " SECTION_DIVERSION_FLAG_REG " 0\n"
+	   ".if \\n[.t]<=\\n[dn] \\{"
+	   ".nr T. 1\n"
+	   ".T#\n"
+	   ".nr " SUPPRESS_BOTTOM_REG " 1\n"
+	   ".sp \\n[.t]u\n"
+	   ".nr " SUPPRESS_BOTTOM_REG " 0\n"
+	   ".mk #T\n"
+	   ".\\}\n"
+	   ".if \\n[.t]<=\\n[" SAVED_DN_REG "] "
+	   /* Since we turn off traps, it won't get into an infinite loop
+	   when we try and print it; it will just go off the bottom of the
+	   page. */
+	   ".tm warning: page \\n%: table text block will not fit on one page\n"
+	   ".nf\n"
+	   ".ls 1\n"
+	   "." SECTION_DIVERSION_NAME "\n"
+	   ".ls\n"
+	   ".rm " SECTION_DIVERSION_NAME "\n"
+	   ".\\}\n"
+	   "..\n"
+	   ".nr " TABLE_DIVERSION_FLAG_REG " 0\n"
+	   ".de " TABLE_KEEP_MACRO_NAME "\n"
+	   ".if '\\n[.z]'' \\{"
+	   ".di " TABLE_DIVERSION_NAME "\n"
+	   ".nr " TABLE_DIVERSION_FLAG_REG " 1\n"
+	   ".\\}\n"
+	   "..\n"
+	   ".de " TABLE_RELEASE_MACRO_NAME "\n"
+	   ".if \\n[" TABLE_DIVERSION_FLAG_REG "] \\{.br\n"
+	   ".di\n"
+	   ".nr " SAVED_DN_REG " \\n[dn]\n"
+	   ".ne \\n[dn]u+\\n[.V]u\n"
+	   ".ie \\n[.t]<=\\n[" SAVED_DN_REG "] "
+	   ".tm error: page \\n%: table will not fit on one page; use .TS H/.TH with a supporting macro package\n"
+	   ".el \\{"
+	   ".in 0\n"
+	   ".ls 1\n"
+	   ".nf\n"
+	   "." TABLE_DIVERSION_NAME "\n"
+	   ".\\}\n"
+	   ".rm " TABLE_DIVERSION_NAME "\n"
+	   ".\\}\n"
+	   "..\n");
+  prints(".ec\n"
+	 ".ce 0\n"
+	 ".nf\n");
+}
+
+string block_width_reg(int r, int c)
+{
+  static char name[sizeof(BLOCK_WIDTH_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, BLOCK_WIDTH_PREFIX "%d,%d", r, c);
+  return string(name);
+}
+
+string block_diversion_name(int r, int c)
+{
+  static char name[sizeof(BLOCK_DIVERSION_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, BLOCK_DIVERSION_PREFIX "%d,%d", r, c);
+  return string(name);
+}
+
+string block_height_reg(int r, int c)
+{
+  static char name[sizeof(BLOCK_HEIGHT_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, BLOCK_HEIGHT_PREFIX "%d,%d", r, c);
+  return string(name);
+}
+
+string span_width_reg(int start_col, int end_col)
+{
+  static char name[sizeof(SPAN_WIDTH_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, SPAN_WIDTH_PREFIX "%d", start_col);
+  if (end_col != start_col)
+    sprintf(strchr(name, '\0'), ",%d", end_col);
+  return string(name);
+}
+
+string span_left_numeric_width_reg(int start_col, int end_col)
+{
+  static char name[sizeof(SPAN_LEFT_NUMERIC_WIDTH_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, SPAN_LEFT_NUMERIC_WIDTH_PREFIX "%d", start_col);
+  if (end_col != start_col)
+    sprintf(strchr(name, '\0'), ",%d", end_col);
+  return string(name);
+}
+
+string span_right_numeric_width_reg(int start_col, int end_col)
+{
+  static char name[sizeof(SPAN_RIGHT_NUMERIC_WIDTH_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, SPAN_RIGHT_NUMERIC_WIDTH_PREFIX "%d", start_col);
+  if (end_col != start_col)
+    sprintf(strchr(name, '\0'), ",%d", end_col);
+  return string(name);
+}
+
+string span_alphabetic_width_reg(int start_col, int end_col)
+{
+  static char name[sizeof(SPAN_ALPHABETIC_WIDTH_PREFIX)+INT_DIGITS+1+INT_DIGITS];
+  sprintf(name, SPAN_ALPHABETIC_WIDTH_PREFIX "%d", start_col);
+  if (end_col != start_col)
+    sprintf(strchr(name, '\0'), ",%d", end_col);
+  return string(name);
+}
+
+string column_separation_reg(int col)
+{
+  static char name[sizeof(COLUMN_SEPARATION_PREFIX)+INT_DIGITS];
+  sprintf(name, COLUMN_SEPARATION_PREFIX "%d", col);
+  return string(name);
+}
+
+string row_start_reg(int row)
+{
+  static char name[sizeof(ROW_START_PREFIX)+INT_DIGITS];
+  sprintf(name, ROW_START_PREFIX "%d", row);
+  return string(name);
+}  
+
+string column_start_reg(int col)
+{
+  static char name[sizeof(COLUMN_START_PREFIX)+INT_DIGITS];
+  sprintf(name, COLUMN_START_PREFIX "%d", col);
+  return string(name);
+}  
+
+string column_end_reg(int col)
+{
+  static char name[sizeof(COLUMN_END_PREFIX)+INT_DIGITS];
+  sprintf(name, COLUMN_END_PREFIX "%d", col);
+  return string(name);
+}
+
+string column_divide_reg(int col)
+{
+  static char name[sizeof(COLUMN_DIVIDE_PREFIX)+INT_DIGITS];
+  sprintf(name, COLUMN_DIVIDE_PREFIX "%d", col);
+  return string(name);
+}
+
+string row_top_reg(int row)
+{
+  static char name[sizeof(ROW_TOP_PREFIX)+INT_DIGITS];
+  sprintf(name, ROW_TOP_PREFIX "%d", row);
+  return string(name);
+}
+
+void init_span_reg(int start_col, int end_col)
+{
+  printfs(".nr %1 \\n(.H\n.nr %2 0\n.nr %3 0\n.nr %4 0\n",
+	  span_width_reg(start_col, end_col),
+	  span_alphabetic_width_reg(start_col, end_col),
+	  span_left_numeric_width_reg(start_col, end_col),
+	  span_right_numeric_width_reg(start_col, end_col));
+}
+
+void compute_span_width(int start_col, int end_col)
+{
+  printfs(".nr %1 \\n[%1]>?(\\n[%2]+\\n[%3])\n"
+	  ".if \\n[%4] .nr %1 \\n[%1]>?(\\n[%4]+2n)\n", 
+	  span_width_reg(start_col, end_col),
+	  span_left_numeric_width_reg(start_col, end_col),
+	  span_right_numeric_width_reg(start_col, end_col),
+	  span_alphabetic_width_reg(start_col, end_col));
+}
+
+// Increase the widths of columns so that the width of any spanning entry
+// is not greater than the sum of the widths of the columns that it spans.
+// Ensure that the widths of columns remain equal.
+
+void table::divide_span(int start_col, int end_col)
+{
+  assert(end_col > start_col);
+  printfs(".nr " NEEDED_REG " \\n[%1]-(\\n[%2]", 
+	  span_width_reg(start_col, end_col),
+	  span_width_reg(start_col, start_col));
+  int i;
+  for (i = start_col + 1; i <= end_col; i++) {
+    // The column separation may shrink with the expand option.
+    if (!(flags & EXPAND))
+      printfs("+%1n", as_string(column_separation[i - 1]));
+    printfs("+\\n[%1]", span_width_reg(i, i));
+  }
+  prints(")\n");
+  printfs(".nr " NEEDED_REG " \\n[" NEEDED_REG "]/%1\n",
+	  as_string(end_col - start_col + 1));
+  prints(".if \\n[" NEEDED_REG "] \\{");
+  for (i = start_col; i <= end_col; i++)
+    printfs(".nr %1 +\\n[" NEEDED_REG "]\n", 
+	    span_width_reg(i, i));
+  int equal_flag = 0;
+  for (i = start_col; i <= end_col && !equal_flag; i++)
+    if (equal[i])
+      equal_flag = 1;
+  if (equal_flag) {
+    for (i = 0; i < ncolumns; i++)
+      if (i < start_col || i > end_col)
+	printfs(".nr %1 +\\n[" NEEDED_REG "]\n", 
+	    span_width_reg(i, i));
+  }
+  prints(".\\}\n");
+}
+
+void table::sum_columns(int start_col, int end_col)
+{
+  assert(end_col > start_col);
+  printfs(".nr %1 \\n[%2]", 
+	  span_width_reg(start_col, end_col),
+	  span_width_reg(start_col, start_col));
+  for (int i = start_col + 1; i <= end_col; i++)
+    printfs("+(%1*\\n[" SEPARATION_FACTOR_REG "])+\\n[%2]",
+	    as_string(column_separation[i - 1]),
+	    span_width_reg(i, i));
+  prints('\n');
+}
+
+horizontal_span::horizontal_span(int sc, int ec, horizontal_span *p)
+: next(p), start_col(sc), end_col(ec)
+{
+}
+
+void table::build_span_list()
+{
+  span_list = 0;
+  table_entry *p = entry_list;
+  while (p) {
+    if (p->end_col != p->start_col) {
+      horizontal_span *q;
+      for (q = span_list; q; q = q->next)
+	if (q->start_col == p->start_col
+	    && q->end_col == p->end_col)
+	  break;
+      if (!q)
+	span_list = new horizontal_span(p->start_col, p->end_col, span_list);
+    }
+    p = p->next;
+  }
+  // Now sort span_list primarily by order of end_row, and secondarily
+  // by reverse order of start_row. This ensures that if we divide
+  // spans using the order in span_list, we will get reasonable results.
+  horizontal_span *unsorted = span_list;
+  span_list = 0;
+  while (unsorted) {
+    horizontal_span **pp;
+    for (pp = &span_list; *pp; pp = &(*pp)->next)
+      if (unsorted->end_col < (*pp)->end_col
+	  || (unsorted->end_col == (*pp)->end_col
+	      && (unsorted->start_col > (*pp)->start_col)))
+	break;
+    horizontal_span *tem = unsorted->next;
+    unsorted->next = *pp;
+    *pp = unsorted;
+    unsorted = tem;
+  }
+}
+
+void table::compute_separation_factor()
+{
+  if (flags & (ALLBOX|BOX|DOUBLEBOX))
+    left_separation = right_separation = 1;
+  else {
+    for (int i = 0; i < nrows; i++) {
+      if (vline[i][0] > 0)
+	left_separation = 1;
+      if (vline[i][ncolumns] > 0)
+	right_separation = 1;
+    }
+  }
+  if (flags & EXPAND) {
+    int total_sep = left_separation + right_separation;
+    int i;
+    for (i = 0; i < ncolumns - 1; i++)
+      total_sep += column_separation[i];
+    if (total_sep != 0) {
+      // Don't let the separation factor be negative.
+      prints(".nr " SEPARATION_FACTOR_REG " \\n[.l]-\\n[.i]");
+      for (i = 0; i < ncolumns; i++)
+	printfs("-\\n[%1]", span_width_reg(i, i));
+      printfs("/%1>?0\n", as_string(total_sep));
+    }
+  }
+}
+
+void table::compute_column_positions()
+{
+  printfs(".nr %1 0\n", column_divide_reg(0));
+  printfs(".nr %1 %2*\\n[" SEPARATION_FACTOR_REG "]\n",
+	  column_start_reg(0),
+	  as_string(left_separation));
+  int i;
+  for (i = 1;; i++) {
+    printfs(".nr %1 \\n[%2]+\\n[%3]\n",
+	    column_end_reg(i-1),
+	    column_start_reg(i-1),
+	    span_width_reg(i-1, i-1));
+    if (i >= ncolumns)
+      break;
+    printfs(".nr %1 \\n[%2]+(%3*\\n[" SEPARATION_FACTOR_REG "])\n",
+	    column_start_reg(i),
+	    column_end_reg(i-1),
+	    as_string(column_separation[i-1]));
+    printfs(".nr %1 \\n[%2]+\\n[%3]/2\n",
+	    column_divide_reg(i),
+	    column_end_reg(i-1),
+	    column_start_reg(i));
+  }
+  printfs(".nr %1 \\n[%2]+(%3*\\n[" SEPARATION_FACTOR_REG "])\n",
+	  column_divide_reg(ncolumns),
+	  column_end_reg(i-1),
+	  as_string(right_separation));
+  printfs(".nr TW \\n[%1]\n",
+	  column_divide_reg(ncolumns));
+  if (flags & DOUBLEBOX) {
+    printfs(".nr %1 +" DOUBLE_LINE_SEP "\n", column_divide_reg(0));
+    printfs(".nr %1 -" DOUBLE_LINE_SEP "\n", column_divide_reg(ncolumns));
+  }
+}
+
+void table::make_columns_equal()
+{
+  int first = -1;		// index of first equal column
+  int i;
+  for (i = 0; i < ncolumns; i++)
+    if (equal[i]) {
+      if (first < 0) {
+	printfs(".nr %1 \\n[%1]", span_width_reg(i, i));
+	first = i;
+      }
+      else
+	printfs(">?\\n[%1]", span_width_reg(i, i));
+    }
+  if (first >= 0) {
+    prints('\n');
+    for (i = first + 1; i < ncolumns; i++)
+      if (equal[i])
+	printfs(".nr %1 \\n[%2]\n", 
+		span_width_reg(i, i),
+		span_width_reg(first, first));
+  }
+}
+
+void table::compute_widths()
+{
+  build_span_list();
+  int i;
+  horizontal_span *p;
+  prints(".nr " SEPARATION_FACTOR_REG " 1n\n");
+  for (i = 0; i < ncolumns; i++) {
+    init_span_reg(i, i);
+    if (!minimum_width[i].empty())
+      printfs(".nr %1 %2\n", span_width_reg(i, i), minimum_width[i]);
+  }
+  for (p = span_list; p; p = p->next)
+    init_span_reg(p->start_col, p->end_col);
+  table_entry *q;
+  for (q = entry_list; q; q = q->next)
+    if (!q->mod->zero_width)
+      q->do_width();
+  for (i = 0; i < ncolumns; i++)
+    compute_span_width(i, i);
+  for (p = span_list; p; p = p->next)
+    compute_span_width(p->start_col, p->end_col);
+  make_columns_equal();
+  // Note that divide_span keeps equal width columns equal.
+  for (p = span_list; p; p = p->next)
+    divide_span(p->start_col, p->end_col);
+  for (p = span_list; p; p = p->next)
+    sum_columns(p->start_col, p->end_col);
+  int had_spanning_block = 0;
+  int had_equal_block = 0;
+  for (q = entry_list; q; q = q->next)
+    if (q->divert(ncolumns, minimum_width,
+		  (flags & EXPAND) ? column_separation : 0)) {
+      if (q->end_col > q->start_col)
+	had_spanning_block = 1;
+      for (i = q->start_col; i <= q->end_col && !had_equal_block; i++)
+	if (equal[i])
+	  had_equal_block = 1;
+    }
+  if (had_equal_block)
+    make_columns_equal();
+  if (had_spanning_block)
+    for (p = span_list; p; p = p->next)
+      divide_span(p->start_col, p->end_col);
+  compute_separation_factor();
+  for (p = span_list; p; p = p->next)
+    sum_columns(p->start_col, p->end_col);
+  compute_column_positions();
+}
+
+void table::print_single_hline(int r)
+{
+  prints(".vs " LINE_SEP ">?\\n[.V]u\n"
+	 ".ls 1\n"
+	 "\\v'" BODY_DEPTH "'"
+	 "\\s[\\n[" LINESIZE_REG "]]");
+  if (r > nrows - 1)
+    prints("\\D'l |\\n[TW]u 0'");
+  else {
+    int start_col = 0;
+    for (;;) {
+      while (start_col < ncolumns 
+	     && entry[r][start_col] != 0
+	     && entry[r][start_col]->start_row != r)
+	start_col++;
+      int end_col;
+      for (end_col = start_col;
+	   end_col < ncolumns
+	   && (entry[r][end_col] == 0
+	       || entry[r][end_col]->start_row == r);
+	   end_col++)
+	;
+      if (end_col <= start_col)
+	break;
+      printfs("\\h'|\\n[%1]u",
+	      column_divide_reg(start_col));
+      if ((r > 0 && vline[r-1][start_col] == 2)
+	  || (r < nrows && vline[r][start_col] == 2))
+	prints("-" HALF_DOUBLE_LINE_SEP);
+      prints("'");
+      printfs("\\D'l |\\n[%1]u",
+	      column_divide_reg(end_col));
+      if ((r > 0 && vline[r-1][end_col] == 2)
+	  || (r < nrows && vline[r][end_col] == 2))
+	prints("+" HALF_DOUBLE_LINE_SEP);
+      prints(" 0'");
+      start_col = end_col;
+    }
+  }
+  prints("\\s0\n");
+  prints(".ls\n"
+	 ".vs\n");
+}
+
+void table::print_double_hline(int r)
+{
+  prints(".vs " LINE_SEP "+" DOUBLE_LINE_SEP
+	 ">?\\n[.V]u\n"
+	 ".ls 1\n"
+	 "\\v'" BODY_DEPTH "'"
+	 "\\s[\\n[" LINESIZE_REG "]]");
+  if (r > nrows - 1)
+    prints("\\v'-" DOUBLE_LINE_SEP "'"
+	   "\\D'l |\\n[TW]u 0'"
+	   "\\v'" DOUBLE_LINE_SEP "'"
+	   "\\h'|0'"
+	   "\\D'l |\\n[TW]u 0'");
+  else {
+    int start_col = 0;
+    for (;;) {
+      while (start_col < ncolumns 
+	     && entry[r][start_col] != 0
+	     && entry[r][start_col]->start_row != r)
+	start_col++;
+      int end_col;
+      for (end_col = start_col;
+	   end_col < ncolumns
+	   && (entry[r][end_col] == 0
+	       || entry[r][end_col]->start_row == r);
+	   end_col++)
+	;
+      if (end_col <= start_col)
+	break;
+      const char *left_adjust = 0;
+      if ((r > 0 && vline[r-1][start_col] == 2)
+	  || (r < nrows && vline[r][start_col] == 2))
+	left_adjust = "-" HALF_DOUBLE_LINE_SEP;
+      const char *right_adjust = 0;
+      if ((r > 0 && vline[r-1][end_col] == 2)
+	  || (r < nrows && vline[r][end_col] == 2))
+	right_adjust = "+" HALF_DOUBLE_LINE_SEP;
+      printfs("\\v'-" DOUBLE_LINE_SEP "'"
+	      "\\h'|\\n[%1]u",
+	      column_divide_reg(start_col));
+      if (left_adjust)
+	prints(left_adjust);
+      prints("'");
+      printfs("\\D'l |\\n[%1]u",
+	      column_divide_reg(end_col));
+      if (right_adjust)
+	prints(right_adjust);
+      prints(" 0'");
+      printfs("\\v'" DOUBLE_LINE_SEP "'"
+	      "\\h'|\\n[%1]u",
+	      column_divide_reg(start_col));
+      if (left_adjust)
+	prints(left_adjust);
+      prints("'");
+      printfs("\\D'l |\\n[%1]u",
+	      column_divide_reg(end_col));
+      if (right_adjust)
+	prints(right_adjust);
+      prints(" 0'");
+      start_col = end_col;
+    }
+  }
+  prints("\\s0\n"
+	 ".ls\n"
+	 ".vs\n");
+}
+
+void table::compute_vrule_top_adjust(int start_row, int col, string &result)
+{
+  if (row_is_all_lines[start_row] && start_row < nrows - 1) {
+    if (row_is_all_lines[start_row] == 2)
+      result = LINE_SEP ">?\\n[.V]u" "+" DOUBLE_LINE_SEP;
+    else
+      result = LINE_SEP ">?\\n[.V]u";
+    start_row++;
+  }
+  else {
+    result = "";
+    if (start_row == 0)
+      return;
+    for (stuff *p = stuff_list; p && p->row <= start_row; p = p->next)
+      if (p->row == start_row 
+	  && (p->is_single_line() || p->is_double_line()))
+	return;
+  }
+  int left = 0;
+  if (col > 0) {
+    table_entry *e = entry[start_row-1][col-1];
+    if (e && e->start_row == e->end_row) {
+      if (e->to_double_line_entry() != 0)
+	left = 2;
+      else if (e->to_single_line_entry() != 0)
+	left = 1;
+    }
+  }
+  int right = 0;
+  if (col < ncolumns) {
+    table_entry *e = entry[start_row-1][col];
+    if (e && e->start_row == e->end_row) {
+      if (e->to_double_line_entry() != 0)
+	right = 2;
+      else if (e->to_single_line_entry() != 0)
+	right = 1;
+    }
+  }
+  if (row_is_all_lines[start_row-1] == 0) {
+    if (left > 0 || right > 0) {
+      result += "-" BODY_DEPTH "-" BAR_HEIGHT;
+      if ((left == 2 && right != 2) || (right == 2 && left != 2))
+	result += "-" HALF_DOUBLE_LINE_SEP;
+      else if (left == 2 && right == 2)
+	result += "+" HALF_DOUBLE_LINE_SEP;
+    }
+  }
+  else if (row_is_all_lines[start_row-1] == 2) {
+    if ((left == 2 && right != 2) || (right == 2 && left != 2))
+      result += "-" DOUBLE_LINE_SEP;
+    else if (left == 1 || right == 1)
+      result += "-" HALF_DOUBLE_LINE_SEP;
+  }
+}
+
+void table::compute_vrule_bot_adjust(int end_row, int col, string &result)
+{
+  if (row_is_all_lines[end_row] && end_row > 0) {
+    end_row--;
+    result = "";
+  }
+  else {
+    stuff *p;
+    for (p = stuff_list; p && p->row < end_row + 1; p = p->next)
+      ;
+    if (p && p->row == end_row + 1 && p->is_double_line()) {
+      result = "-" DOUBLE_LINE_SEP;
+      return;
+    }
+    if ((p != 0 && p->row == end_row + 1)
+	|| end_row == nrows - 1) {
+      result = "";
+      return;
+    }
+    if (row_is_all_lines[end_row+1] == 1)
+      result = LINE_SEP;
+    else if (row_is_all_lines[end_row+1] == 2)
+      result = LINE_SEP "+" DOUBLE_LINE_SEP;
+    else
+      result = "";
+  }
+  int left = 0;
+  if (col > 0) {
+    table_entry *e = entry[end_row+1][col-1];
+    if (e && e->start_row == e->end_row) {
+      if (e->to_double_line_entry() != 0)
+	left = 2;
+      else if (e->to_single_line_entry() != 0)
+	left = 1;
+    }
+  }
+  int right = 0;
+  if (col < ncolumns) {
+    table_entry *e = entry[end_row+1][col];
+    if (e && e->start_row == e->end_row) {
+      if (e->to_double_line_entry() != 0)
+	right = 2;
+      else if (e->to_single_line_entry() != 0)
+	right = 1;
+    }
+  }
+  if (row_is_all_lines[end_row+1] == 0) {
+    if (left > 0 || right > 0) {
+      result = "1v-" BODY_DEPTH "-" BAR_HEIGHT;
+      if ((left == 2 && right != 2) || (right == 2 && left != 2))
+	result += "+" HALF_DOUBLE_LINE_SEP;
+      else if (left == 2 && right == 2)
+	result += "-" HALF_DOUBLE_LINE_SEP;
+    }
+  }
+  else if (row_is_all_lines[end_row+1] == 2) {
+    if (left == 2 && right == 2)
+      result += "-" DOUBLE_LINE_SEP;
+    else if (left != 2 && right != 2 && (left == 1 || right == 1))
+      result += "-" HALF_DOUBLE_LINE_SEP;
+  }
+}
+
+void table::add_vertical_rule(int start_row, int end_row, int col, int is_double)
+{
+  vrule_list = new vertical_rule(start_row, end_row, col, is_double,
+				 vrule_list);
+  compute_vrule_top_adjust(start_row, col, vrule_list->top_adjust);
+  compute_vrule_bot_adjust(end_row, col, vrule_list->bot_adjust);
+}
+
+void table::build_vrule_list()
+{
+  int col;
+  if (flags & ALLBOX) {
+    for (col = 1; col < ncolumns; col++) {
+      int start_row = 0;
+      for (;;) {
+	while (start_row < nrows && vline_spanned(start_row, col))
+	  start_row++;
+	if (start_row >= nrows)
+	  break;
+	int end_row = start_row;
+	while (end_row < nrows && !vline_spanned(end_row, col))
+	  end_row++;
+	end_row--;
+	add_vertical_rule(start_row, end_row, col, 0);
+	start_row = end_row + 1;
+      }
+    }
+  }
+  if (flags & (BOX|ALLBOX|DOUBLEBOX)) {
+    add_vertical_rule(0, nrows - 1, 0, 0);
+    add_vertical_rule(0, nrows - 1, ncolumns, 0);
+  }
+  for (int end_row = 0; end_row < nrows; end_row++)
+    for (col = 0; col < ncolumns+1; col++)
+      if (vline[end_row][col] > 0
+	  && !vline_spanned(end_row, col)
+	  && (end_row == nrows - 1 
+	      || vline[end_row+1][col] != vline[end_row][col]
+	      || vline_spanned(end_row+1, col))) {
+	int start_row;
+	for (start_row = end_row - 1;
+	     start_row >= 0
+	     && vline[start_row][col] == vline[end_row][col]
+	     && !vline_spanned(start_row, col);
+	     start_row--)
+	  ;
+	start_row++;
+	add_vertical_rule(start_row, end_row, col, vline[end_row][col] > 1);
+      }
+  for (vertical_rule *p = vrule_list; p; p = p->next)
+    if (p->is_double)
+      for (int r = p->start_row; r <= p->end_row; r++) {
+	if (p->col > 0 && entry[r][p->col-1] != 0
+	    && entry[r][p->col-1]->end_col == p->col-1) {
+	  int is_corner = r == p->start_row || r == p->end_row;
+	  entry[r][p->col-1]->note_double_vrule_on_right(is_corner);
+	}
+	if (p->col < ncolumns && entry[r][p->col] != 0
+	    && entry[r][p->col]->start_col == p->col) {
+	  int is_corner = r == p->start_row || r == p->end_row;
+	  entry[r][p->col]->note_double_vrule_on_left(is_corner);
+	}
+      }
+}
+
+void table::define_bottom_macro()
+{
+  prints(".eo\n"
+	 ".de T#\n"
+	 ".if !\\n[" SUPPRESS_BOTTOM_REG "] \\{"
+	 "." REPEATED_VPT_MACRO " 0\n"
+	 ".mk " SAVED_VERTICAL_POS_REG "\n");
+  if (flags & (BOX|ALLBOX|DOUBLEBOX)) {
+    prints(".if \\n[T.]&\\n[" NEED_BOTTOM_RULE_REG "] \\{");
+    print_single_hline(0);
+    prints(".\\}\n");
+  }
+  prints(".ls 1\n");
+  for (vertical_rule *p = vrule_list; p; p = p->next)
+    p->contribute_to_bottom_macro(this);
+  if (flags & DOUBLEBOX)
+    prints(".if \\n[T.] \\{.vs " DOUBLE_LINE_SEP ">?\\n[.V]u\n"
+	   "\\v'" BODY_DEPTH "'\\s[\\n[" LINESIZE_REG "]]"
+	   "\\D'l \\n[TW]u 0'\\s0\n"
+	   ".vs\n"
+	   ".\\}\n"
+	   ".if \\n[" LAST_PASSED_ROW_REG "]>=0 "
+	   ".nr " TOP_REG " \\n[#T]-" DOUBLE_LINE_SEP "\n"
+	   ".sp -1\n"
+	   "\\v'" BODY_DEPTH "'\\s[\\n[" LINESIZE_REG "]]"
+	   "\\D'l 0 |\\n[" TOP_REG "]u-1v'\\s0\n"
+	   ".sp -1\n"
+	   "\\v'" BODY_DEPTH "'\\h'|\\n[TW]u'\\s[\\n[" LINESIZE_REG "]]"
+	   "\\D'l 0 |\\n[" TOP_REG "]u-1v'\\s0\n");
+  prints(".ls\n");
+  prints(".nr " LAST_PASSED_ROW_REG " \\n[" CURRENT_ROW_REG "]\n"
+	 ".sp |\\n[" SAVED_VERTICAL_POS_REG "]u\n"
+	 "." REPEATED_VPT_MACRO " 1\n"
+	 ".\\}\n"
+	 "..\n"
+	 ".ec\n");
+}
+
+// is the vertical line before column c in row r horizontally spanned?
+
+int table::vline_spanned(int r, int c)
+{
+  assert(r >= 0 && r < nrows && c >= 0 && c < ncolumns + 1);
+  return (c != 0 && c != ncolumns && entry[r][c] != 0
+	  && entry[r][c]->start_col != c
+	  // horizontally spanning lines don't count
+	  && entry[r][c]->to_double_line_entry() == 0
+	  && entry[r][c]->to_single_line_entry() == 0);
+}
+
+int table::row_begins_section(int r)
+{
+  assert(r >= 0 && r < nrows);
+  for (int i = 0; i < ncolumns; i++)
+    if (entry[r][i] && entry[r][i]->start_row != r)
+      return 0;
+  return 1;
+}
+
+int table::row_ends_section(int r)
+{
+  assert(r >= 0 && r < nrows);
+  for (int i = 0; i < ncolumns; i++)
+    if (entry[r][i] && entry[r][i]->end_row != r)
+      return 0;
+  return 1;
+}
+
+void table::do_row(int r)
+{
+  if (!(flags & NOKEEP) && row_begins_section(r))
+    prints("." KEEP_MACRO_NAME "\n");
+  int had_line = 0;
+  stuff *p;
+  for (p = stuff_list; p && p->row < r; p = p->next)
+    ;
+  for (stuff *p1 = p; p1 && p1->row == r; p1 = p1->next)
+    if (!p1->printed && (p1->is_single_line() || p1->is_double_line())) {
+      had_line = 1;
+      break;
+    }
+  if (!had_line && !row_is_all_lines[r])
+    printfs("." REPEATED_MARK_MACRO " %1\n", row_top_reg(r));
+  had_line = 0;
+  for (; p && p->row == r; p = p->next)
+    if (!p->printed) {
+      p->print(this);
+      if (!had_line && (p->is_single_line() || p->is_double_line())) {
+	printfs("." REPEATED_MARK_MACRO " %1\n", row_top_reg(r));
+	had_line = 1;
+      }
+    }
+  // Change the row *after* printing the stuff list (which might contain .TH).
+  printfs("\\*[" TRANSPARENT_STRING_NAME "].nr " CURRENT_ROW_REG " %1\n",
+	  as_string(r));
+  if (!had_line && row_is_all_lines[r])
+    printfs("." REPEATED_MARK_MACRO " %1\n", row_top_reg(r));
+  // we might have had a .TH, for example,  since we last tried
+  if (!(flags & NOKEEP) && row_begins_section(r))
+    prints("." KEEP_MACRO_NAME "\n");
+  printfs(".mk %1\n", row_start_reg(r));
+  prints(".mk " BOTTOM_REG "\n"
+	 "." REPEATED_VPT_MACRO " 0\n");
+  int c;
+  int row_is_blank = 1;
+  int first_start_row = r;
+  for (c = 0; c < ncolumns; c++) {
+    table_entry *e = entry[r][c];
+    if (e) {
+      if (e->end_row == r) {
+	e->do_depth();
+	if (e->start_row < first_start_row)
+	  first_start_row = e->start_row;
+	row_is_blank = 0;
+      }
+      c = e->end_col;
+    }
+  }
+  if (row_is_blank)
+    prints(".nr " BOTTOM_REG " +1v\n");
+  if (row_is_all_lines[r]) {
+    prints(".vs " LINE_SEP);
+    if (row_is_all_lines[r] == 2)
+      prints("+" DOUBLE_LINE_SEP);
+    prints(">?\\n[.V]u\n.ls 1\n");
+    prints("\\&");
+    prints("\\v'" BODY_DEPTH);
+    if (row_is_all_lines[r] == 2)
+      prints("-" HALF_DOUBLE_LINE_SEP);
+    prints("'");
+    for (c = 0; c < ncolumns; c++) {
+      table_entry *e = entry[r][c];
+      if (e) {
+	if (e->end_row == e->start_row)
+	  e->to_simple_entry()->simple_print(1);
+	c = e->end_col;
+      }
+    }
+    prints("\n");
+    prints(".ls\n"
+	   ".vs\n");
+    prints(".nr " BOTTOM_REG " \\n[" BOTTOM_REG "]>?\\n[.d]\n");
+    printfs(".sp |\\n[%1]u\n", row_start_reg(r));
+  }
+  for (int i = row_is_all_lines[r] ? r - 1 : r;
+       i >= first_start_row;
+       i--) {
+    simple_entry *first = 0;
+    for (c = 0; c < ncolumns; c++) {
+      table_entry *e = entry[r][c];
+      if (e) {
+	if (e->end_row == r && e->start_row == i) {
+	  simple_entry *simple = e->to_simple_entry();
+	  if (simple) {
+	    if (!first) {
+	      prints(".ta");
+	      first = simple;
+	    }
+	    simple->add_tab();
+	  }
+	}
+	c = e->end_col;
+      }
+    }
+    if (first) {
+      prints('\n');
+      first->position_vertically();
+      first->set_location();
+      prints("\\&");
+      first->simple_print(0);
+      for (c = first->end_col + 1; c < ncolumns; c++) {
+	table_entry *e = entry[r][c];
+	if (e) {
+	  if (e->end_row == r && e->start_row == i) {
+	    simple_entry *simple = e->to_simple_entry();
+	    if (simple)
+	      simple->simple_print(0);
+	  }
+	  c = e->end_col;
+	}
+      }
+      prints('\n');
+      prints(".nr " BOTTOM_REG " \\n[" BOTTOM_REG "]>?\\n[.d]\n");
+      printfs(".sp |\\n[%1]u\n", row_start_reg(r));
+    }
+  }
+  for (c = 0; c < ncolumns; c++) {
+    table_entry *e = entry[r][c];
+    if (e) {
+      if (e->end_row == r && e->to_simple_entry() == 0) {
+	e->position_vertically();
+	e->print();
+	prints(".nr " BOTTOM_REG " \\n[" BOTTOM_REG "]>?\\n[.d]\n");
+	printfs(".sp |\\n[%1]u\n", row_start_reg(r));
+      }
+      c = e->end_col;
+    }
+  }
+  prints("." REPEATED_VPT_MACRO " 1\n"
+	 ".sp |\\n[" BOTTOM_REG "]u\n"
+	 "\\*[" TRANSPARENT_STRING_NAME "].nr " NEED_BOTTOM_RULE_REG " 1\n");
+  if (r != nrows - 1 && (flags & ALLBOX)) {
+    print_single_hline(r + 1);
+    prints("\\*[" TRANSPARENT_STRING_NAME "].nr " NEED_BOTTOM_RULE_REG " 0\n");
+  }
+  if (r != nrows - 1) {
+    if (p && p->row == r + 1
+	&& (p->is_single_line() || p->is_double_line())) {
+      p->print(this);
+      prints("\\*[" TRANSPARENT_STRING_NAME "].nr " NEED_BOTTOM_RULE_REG
+	     " 0\n");
+    }
+    int printed_one = 0;
+    for (vertical_rule *vr = vrule_list; vr; vr = vr->next)
+      if (vr->end_row == r) {
+	if (!printed_one) {
+	  prints("." REPEATED_VPT_MACRO " 0\n");
+	  printed_one = 1;
+	}
+	vr->print();
+      }
+    if (printed_one)
+      prints("." REPEATED_VPT_MACRO " 1\n");
+    if (!(flags & NOKEEP) && row_ends_section(r))
+      prints("." RELEASE_MACRO_NAME "\n");
+  }
+}
+
+void table::do_top()
+{
+  prints(".fc \002\003\n");
+  if (!(flags & NOKEEP) && (flags & (BOX|DOUBLEBOX|ALLBOX)))
+    prints("." TABLE_KEEP_MACRO_NAME "\n");
+  if (flags & DOUBLEBOX) {
+    prints(".ls 1\n"
+	   ".vs " LINE_SEP ">?\\n[.V]u\n"
+	   "\\v'" BODY_DEPTH "'\\s[\\n[" LINESIZE_REG "]]\\D'l \\n[TW]u 0'\\s0\n"
+	   ".vs\n"
+	   "." REPEATED_MARK_MACRO " " TOP_REG "\n"
+	   ".vs " DOUBLE_LINE_SEP ">?\\n[.V]u\n");
+    printfs("\\v'" BODY_DEPTH "'"
+	    "\\s[\\n[" LINESIZE_REG "]]"
+	    "\\h'\\n[%1]u'"
+	    "\\D'l |\\n[%2]u 0'"
+	    "\\s0"
+	    "\n",
+	    column_divide_reg(0),
+	    column_divide_reg(ncolumns));
+    prints(".ls\n"
+	   ".vs\n");
+  }
+  else if (flags & (ALLBOX|BOX)) {
+    print_single_hline(0);
+  }
+  //printfs(".mk %1\n", row_top_reg(0));
+}
+
+void table::do_bottom()
+{
+  // print stuff after last row
+  for (stuff *p = stuff_list; p; p = p->next)
+    if (p->row > nrows - 1)
+      p->print(this);
+  if (!(flags & NOKEEP))
+    prints("." RELEASE_MACRO_NAME "\n");
+  printfs(".mk %1\n", row_top_reg(nrows));
+  prints(".nr " NEED_BOTTOM_RULE_REG " 1\n"
+	 ".nr T. 1\n"
+	 ".T#\n");
+  if (!(flags & NOKEEP) && (flags & (BOX|DOUBLEBOX|ALLBOX)))
+    prints("." TABLE_RELEASE_MACRO_NAME "\n");
+  if (flags & DOUBLEBOX)
+    prints(".sp " DOUBLE_LINE_SEP "\n");
+  prints("." RESET_MACRO_NAME "\n"
+	 ".fc\n"
+	 ".cp \\n(" COMPATIBLE_REG "\n");
+}
+
+int table::get_nrows()
+{
+  return nrows;
+}
+
+const char *last_filename = 0;
+
+void set_troff_location(const char *fn, int ln)
+{
+  if (!location_force_filename && last_filename != 0
+      && strcmp(fn, last_filename) == 0)
+    printfs(".lf %1\n", as_string(ln));
+  else {
+    printfs(".lf %1 %2\n", as_string(ln), fn);
+    last_filename = fn;
+    location_force_filename = 0;
+  }
+}
+
+void printfs(const char *s, const string &arg1, const string &arg2,
+	     const string &arg3, const string &arg4, const string &arg5)
+{
+  if (s) {
+    char c;
+    while ((c = *s++) != '\0') {
+      if (c == '%') {
+	switch (*s++) {
+	case '1':
+	  prints(arg1);
+	  break;
+	case '2':
+	  prints(arg2);
+	  break;
+	case '3':
+	  prints(arg3);
+	  break;
+	case '4':
+	  prints(arg4);
+	  break;
+	case '5':
+	  prints(arg5);
+	  break;
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  break;
+	case '%':
+	  prints('%');
+	  break;
+	default:
+	  assert(0);
+	}
+      }
+      else
+	prints(c);
+    }
+  }
+}  
+
diff --git a/contrib/groff/src/preproc/tbl/tbl.man b/contrib/groff/src/preproc/tbl/tbl.man
index f661fde..7f12bf9 100644
--- a/contrib/groff/src/preproc/tbl/tbl.man
+++ b/contrib/groff/src/preproc/tbl/tbl.man
@@ -283,7 +283,8 @@ Must be followed either by a
 width expression in parentheses or a unitless integer.
 If no unit is given, en units are used.
 Also used as the default line length for included text blocks.
-If used multiple times, the last entry takes effect.
+If used multiple times to specify the width for a particular column,
+the last entry takes effect.
 .
 .TP
 e,E
@@ -336,8 +337,8 @@ above spans downward over this row.
 A text block can be used to enter data as a single entry which would be
 too long as a simple string between tabs.
 It is started with `T{' and closed with `T}'.
-The latter must start a line, probably followed by other data columns
-(separated with tabs).
+The former must end a line, and the latter must start a line, probably
+followed by other data columns (separated with tabs).
 .LP
 To change the data format within a table, use the
 .B .T&
diff --git a/contrib/groff/src/roff/groff/Makefile.sub b/contrib/groff/src/roff/groff/Makefile.sub
index 3b26caa..798f2d8 100644
--- a/contrib/groff/src/roff/groff/Makefile.sub
+++ b/contrib/groff/src/roff/groff/Makefile.sub
@@ -3,6 +3,6 @@ MAN1=groff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT)
-CCSRCS=$(srcdir)/groff.cc
+CCSRCS=$(srcdir)/groff.cpp
 CSRCS=$(srcdir)/pipeline.c
 HDRS=$(srcdir)/pipeline.h
diff --git a/contrib/groff/src/roff/groff/groff.cpp b/contrib/groff/src/roff/groff/groff.cpp
new file mode 100644
index 0000000..49104b2
--- /dev/null
+++ b/contrib/groff/src/roff/groff/groff.cpp
@@ -0,0 +1,753 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+// A front end for groff.
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <signal.h>
+#include <errno.h>
+
+#include "assert.h"
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "font.h"
+#include "device.h"
+#include "pipeline.h"
+#include "nonposix.h"
+#include "defs.h"
+
+#define GXDITVIEW "gxditview"
+
+// troff will be passed an argument of -rXREG=1 if the -X option is
+// specified
+#define XREG ".X"
+
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
+// The number of commands must be in sync with MAX_COMMANDS in pipeline.h
+const int SOELIM_INDEX = 0;
+const int REFER_INDEX = SOELIM_INDEX + 1;
+const int GRAP_INDEX = REFER_INDEX + 1;
+const int PIC_INDEX = GRAP_INDEX + 1;
+const int TBL_INDEX = PIC_INDEX + 1;
+const int GRN_INDEX = TBL_INDEX + 1;
+const int EQN_INDEX = GRN_INDEX + 1;
+const int TROFF_INDEX = EQN_INDEX + 1;
+const int POST_INDEX = TROFF_INDEX + 1;
+const int SPOOL_INDEX = POST_INDEX + 1;
+
+const int NCOMMANDS = SPOOL_INDEX + 1;
+
+class possible_command {
+  char *name;
+  string args;
+  char **argv;
+
+  void build_argv();
+public:
+  possible_command();
+  ~possible_command();
+  void set_name(const char *);
+  void set_name(const char *, const char *);
+  const char *get_name();
+  void append_arg(const char *, const char * = 0);
+  void insert_arg(const char *);
+  void insert_args(string s);
+  void clear_args();
+  char **get_argv();
+  void print(int is_last, FILE *fp);
+};
+
+extern "C" const char *Version_string;
+
+int lflag = 0;
+char *spooler = 0;
+char *postdriver = 0;
+char *predriver = 0;
+
+possible_command commands[NCOMMANDS];
+
+int run_commands(int no_pipe);
+void print_commands();
+void append_arg_to_string(const char *arg, string &str);
+void handle_unknown_desc_command(const char *command, const char *arg,
+				 const char *filename, int lineno);
+const char *xbasename(const char *);
+
+void usage(FILE *stream);
+void help();
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  assert(NCOMMANDS <= MAX_COMMANDS);
+  string Pargs, Largs, Fargs;
+  int vflag = 0;
+  int Vflag = 0;
+  int zflag = 0;
+  int iflag = 0;
+  int Xflag = 0;
+  int safer_flag = 1;
+  int opt;
+  const char *command_prefix = getenv("GROFF_COMMAND_PREFIX");
+  if (!command_prefix)
+    command_prefix = PROG_PREFIX;
+  commands[TROFF_INDEX].set_name(command_prefix, "troff");
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, 'h' },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv,
+			    "abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+			    long_options, NULL))
+	 != EOF) {
+    char buf[3];
+    buf[0] = '-';
+    buf[1] = opt;
+    buf[2] = '\0';
+    switch (opt) {
+    case 'i':
+      iflag = 1;
+      break;
+    case 'I':
+      commands[SOELIM_INDEX].set_name(command_prefix, "soelim");
+      commands[SOELIM_INDEX].append_arg(buf, optarg);
+      break;
+    case 't':
+      commands[TBL_INDEX].set_name(command_prefix, "tbl");
+      break;
+    case 'p':
+      commands[PIC_INDEX].set_name(command_prefix, "pic");
+      break;
+    case 'g':
+      commands[GRN_INDEX].set_name(command_prefix, "grn");
+      break;
+    case 'G':
+      commands[GRAP_INDEX].set_name(command_prefix, "grap");
+      break;
+    case 'e':
+      commands[EQN_INDEX].set_name(command_prefix, "eqn");
+      break;
+    case 's':
+      commands[SOELIM_INDEX].set_name(command_prefix, "soelim");
+      break;
+    case 'R':
+      commands[REFER_INDEX].set_name(command_prefix, "refer");
+      break;
+    case 'z':
+    case 'a':
+      commands[TROFF_INDEX].append_arg(buf);
+      // fall through
+    case 'Z':
+      zflag++;
+      break;
+    case 'l':
+      lflag++;
+      break;
+    case 'V':
+      Vflag++;
+      break;
+    case 'v':
+      vflag = 1;
+      {
+	printf("GNU groff version %s\n", Version_string);
+	printf("Copyright (C) 2002 Free Software Foundation, Inc.\n"
+	       "GNU groff comes with ABSOLUTELY NO WARRANTY.\n"
+	       "You may redistribute copies of groff and its subprograms\n"
+	       "under the terms of the GNU General Public License.\n"
+	       "For more information about these matters, see the file named COPYING.\n");
+	printf("\ncalled subprograms:\n\n");
+        fflush(stdout);
+      }
+      commands[POST_INDEX].append_arg(buf);
+      // fall through
+    case 'C':
+      commands[SOELIM_INDEX].append_arg(buf);
+      commands[REFER_INDEX].append_arg(buf);
+      commands[PIC_INDEX].append_arg(buf);
+      commands[GRAP_INDEX].append_arg(buf);
+      commands[TBL_INDEX].append_arg(buf);
+      commands[GRN_INDEX].append_arg(buf);
+      commands[EQN_INDEX].append_arg(buf);
+      commands[TROFF_INDEX].append_arg(buf);
+      break;
+    case 'N':
+      commands[EQN_INDEX].append_arg(buf);
+      break;
+    case 'h':
+      help();
+      break;
+    case 'E':
+    case 'b':
+      commands[TROFF_INDEX].append_arg(buf);
+      break;
+    case 'c':
+      commands[TROFF_INDEX].append_arg(buf);
+      break;
+    case 'S':
+      safer_flag = 1;
+      break;
+    case 'U':
+      safer_flag = 0;
+      break;
+    case 'T':
+      if (strcmp(optarg, "html") == 0) {
+	// force soelim to aid the html preprocessor
+	commands[SOELIM_INDEX].set_name(command_prefix, "soelim");
+      }
+      if (strcmp(optarg, "Xps") == 0) {
+	warning("-TXps option is obsolete: use -X -Tps instead");
+	device = "ps";
+	Xflag++;
+      }
+      else
+	device = optarg;
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      if (Fargs.length() > 0) {
+	Fargs += PATH_SEP[0];
+	Fargs += optarg;
+      }
+      else
+	Fargs = optarg;
+      break;
+    case 'f':
+    case 'o':
+    case 'm':
+    case 'r':
+    case 'd':
+    case 'n':
+    case 'w':
+    case 'W':
+      commands[TROFF_INDEX].append_arg(buf, optarg);
+      break;
+    case 'M':
+      commands[EQN_INDEX].append_arg(buf, optarg);
+      commands[GRAP_INDEX].append_arg(buf, optarg);
+      commands[GRN_INDEX].append_arg(buf, optarg);
+      commands[TROFF_INDEX].append_arg(buf, optarg);
+      break;
+    case 'P':
+      Pargs += optarg;
+      Pargs += '\0';
+      break;
+    case 'L':
+      append_arg_to_string(optarg, Largs);
+      break;
+    case 'X':
+      Xflag++;
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+      break;
+    }
+  }
+  if (safer_flag)
+    commands[PIC_INDEX].append_arg("-S");
+  else
+    commands[TROFF_INDEX].insert_arg("-U");
+  font::set_unknown_desc_command_handler(handle_unknown_desc_command);
+  if (!font::load_desc())
+    fatal("invalid device `%1'", device);
+  if (!postdriver)
+    fatal("no `postpro' command in DESC file for device `%1'", device);
+  if (predriver && !zflag) {
+    commands[TROFF_INDEX].insert_arg(commands[TROFF_INDEX].get_name());
+    commands[TROFF_INDEX].set_name(predriver);
+    // pass the device arguments to the predrivers as well
+    commands[TROFF_INDEX].insert_args(Pargs);
+    if (vflag)
+      commands[TROFF_INDEX].insert_arg("-v");
+  }
+  const char *real_driver = 0;
+  if (Xflag) {
+    real_driver = postdriver;
+    postdriver = GXDITVIEW;
+    commands[TROFF_INDEX].append_arg("-r" XREG "=", "1");
+  }
+  if (postdriver)
+    commands[POST_INDEX].set_name(postdriver);
+  int gxditview_flag = postdriver && strcmp(xbasename(postdriver), GXDITVIEW) == 0;
+  if (gxditview_flag && argc - optind == 1) {
+    commands[POST_INDEX].append_arg("-title");
+    commands[POST_INDEX].append_arg(argv[optind]);
+    commands[POST_INDEX].append_arg("-xrm");
+    commands[POST_INDEX].append_arg("*iconName:", argv[optind]);
+    string filename_string("|");
+    append_arg_to_string(argv[0], filename_string);
+    append_arg_to_string("-Z", filename_string);
+    for (int i = 1; i < argc; i++)
+      append_arg_to_string(argv[i], filename_string);
+    filename_string += '\0';
+    commands[POST_INDEX].append_arg("-filename");
+    commands[POST_INDEX].append_arg(filename_string.contents());
+  }
+  if (gxditview_flag && Xflag) {
+    string print_string(real_driver);
+    if (spooler) {
+      print_string += " | ";
+      print_string += spooler;
+      print_string += Largs;
+    }
+    print_string += '\0';
+    commands[POST_INDEX].append_arg("-printCommand");
+    commands[POST_INDEX].append_arg(print_string.contents());
+  }
+  const char *p = Pargs.contents();
+  const char *end = p + Pargs.length();
+  while (p < end) {
+    commands[POST_INDEX].append_arg(p);
+    p = strchr(p, '\0') + 1;
+  }
+  if (gxditview_flag)
+    commands[POST_INDEX].append_arg("-");
+  if (lflag && !Xflag && spooler) {
+    commands[SPOOL_INDEX].set_name(BSHELL);
+    commands[SPOOL_INDEX].append_arg(BSHELL_DASH_C);
+    Largs += '\0';
+    Largs = spooler + Largs;
+    commands[SPOOL_INDEX].append_arg(Largs.contents());
+  }
+  if (zflag) {
+    commands[POST_INDEX].set_name(0);
+    commands[SPOOL_INDEX].set_name(0);
+  }
+  commands[TROFF_INDEX].append_arg("-T", device);
+  // html renders equations as images via ps
+  if (strcmp(device, "html") == 0)
+    commands[EQN_INDEX].append_arg("-Tps:html");
+  else
+    commands[EQN_INDEX].append_arg("-T", device);
+
+  commands[GRN_INDEX].append_arg("-T", device);
+
+  int first_index;
+  for (first_index = 0; first_index < TROFF_INDEX; first_index++)
+    if (commands[first_index].get_name() != 0)
+      break;
+  if (optind < argc) {
+    if (argv[optind][0] == '-' && argv[optind][1] != '\0')
+      commands[first_index].append_arg("--");
+    for (int i = optind; i < argc; i++)
+      commands[first_index].append_arg(argv[i]);
+    if (iflag)
+      commands[first_index].append_arg("-");
+  }
+  if (Fargs.length() > 0) {
+    string e = "GROFF_FONT_PATH";
+    e += '=';
+    e += Fargs;
+    char *fontpath = getenv("GROFF_FONT_PATH");
+    if (fontpath && *fontpath) {
+      e += PATH_SEP[0];
+      e += fontpath;
+    }
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+  }
+  {
+    // we save the original path in GROFF_PATH__ and put it into the
+    // environment -- troff will pick it up later.
+    char *path = getenv("PATH");
+    string e = "GROFF_PATH__";
+    e += '=';
+    if (path && *path)
+      e += path;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+    char *binpath = getenv("GROFF_BIN_PATH");
+    string f = "PATH";
+    f += '=';
+    if (binpath && *binpath)
+      f += binpath;
+    else
+      f += BINPATH;
+    if (path && *path) {
+      f += PATH_SEP[0];
+      f += path;
+    }
+    f += '\0';
+    if (putenv(strsave(f.contents())))
+      fatal("putenv failed");
+  }
+  if (Vflag) {
+    print_commands();
+    exit(0);
+  }
+  return run_commands(vflag);
+}
+
+const char *xbasename(const char *s)
+{
+  if (!s)
+    return 0;
+  // DIR_SEPS[] are possible directory separator characters, see nonposix.h
+  // We want the rightmost separator of all possible ones.
+  // Example: d:/foo\\bar.
+  const char *p = strrchr(s, DIR_SEPS[0]), *p1;
+  const char *sep = &DIR_SEPS[1];
+
+  while (*sep)
+    {
+      p1 = strrchr(s, *sep);
+      if (p1 && (!p || p1 > p))
+	p = p1;
+      sep++;
+    }
+  return p ? p + 1 : s;
+}
+
+void handle_unknown_desc_command(const char *command, const char *arg,
+				 const char *filename, int lineno)
+{
+  if (strcmp(command, "print") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`print' command requires an argument");
+    else
+      spooler = strsave(arg);
+  }
+  if (strcmp(command, "prepro") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`prepro' command requires an argument");
+    else {
+      for (const char *p = arg; *p; p++)
+	if (csspace(*p)) {
+	  error_with_file_and_line(filename, lineno,
+				   "invalid `prepro' argument `%1'"
+				   ": program name required", arg);
+	  return;
+	}
+      predriver = strsave(arg);
+    }
+  }
+  if (strcmp(command, "postpro") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`postpro' command requires an argument");
+    else {
+      for (const char *p = arg; *p; p++)
+	if (csspace(*p)) {
+	  error_with_file_and_line(filename, lineno,
+				   "invalid `postpro' argument `%1'"
+				   ": program name required", arg);
+	  return;
+	}
+      postdriver = strsave(arg);
+    }
+  }
+}
+
+void print_commands()
+{
+  int last;
+  for (last = SPOOL_INDEX; last >= 0; last--)
+    if (commands[last].get_name() != 0)
+      break;
+  for (int i = 0; i <= last; i++)
+    if (commands[i].get_name() != 0)
+      commands[i].print(i == last, stdout);
+}
+
+// Run the commands. Return the code with which to exit.
+
+int run_commands(int no_pipe)
+{
+  char **v[NCOMMANDS];
+  int j = 0;
+  for (int i = 0; i < NCOMMANDS; i++)
+    if (commands[i].get_name() != 0)
+      v[j++] = commands[i].get_argv();
+  return run_pipeline(j, v, no_pipe);
+}
+
+possible_command::possible_command()
+: name(0), argv(0)
+{
+}
+
+possible_command::~possible_command()
+{
+  a_delete name;
+  a_delete argv;
+}
+
+void possible_command::set_name(const char *s)
+{
+  a_delete name;
+  name = strsave(s);
+}
+
+void possible_command::set_name(const char *s1, const char *s2)
+{
+  a_delete name;
+  name = new char[strlen(s1) + strlen(s2) + 1];
+  strcpy(name, s1);
+  strcat(name, s2);
+}
+
+const char *possible_command::get_name()
+{
+  return name;
+}
+
+void possible_command::clear_args()
+{
+  args.clear();
+}
+
+void possible_command::append_arg(const char *s, const char *t)
+{
+  args += s;
+  if (t)
+    args += t;
+  args += '\0';
+}
+
+void possible_command::insert_arg(const char *s)
+{
+  string str(s);
+  str += '\0';
+  str += args;
+  args = str;
+}
+
+void possible_command::insert_args(string s)
+{
+  const char *p = s.contents();
+  const char *end = p + s.length();
+  int l = 0;
+  if (p >= end)
+    return;
+  // find the total number of arguments in our string
+  do {
+    l++;
+    p = strchr(p, '\0') + 1;
+  } while (p < end);
+  // now insert each argument preserving the order
+  for (int i = l - 1; i >= 0; i--) {
+    p = s.contents();
+    for (int j = 0; j < i; j++)
+      p = strchr(p, '\0') + 1;
+    insert_arg(p);
+  }
+}
+
+void possible_command::build_argv()
+{
+  if (argv)
+    return;
+  // Count the number of arguments.
+  int len = args.length();
+  int argc = 1;
+  char *p = 0;
+  if (len > 0) {
+    p = &args[0];
+    for (int i = 0; i < len; i++)
+      if (p[i] == '\0')
+	argc++;
+  }
+  // Build an argument vector.
+  argv = new char *[argc + 1];
+  argv[0] = name;
+  for (int i = 1; i < argc; i++) {
+    argv[i] = p;
+    p = strchr(p, '\0') + 1;
+  }
+  argv[argc] = 0;
+}
+
+void possible_command::print(int is_last, FILE *fp)
+{
+  build_argv();
+  if (IS_BSHELL(argv[0])
+      && argv[1] != 0 && strcmp(argv[1], BSHELL_DASH_C) == 0
+      && argv[2] != 0 && argv[3] == 0)
+    fputs(argv[2], fp);
+  else {
+    fputs(argv[0], fp);
+    string str;
+    for (int i = 1; argv[i] != 0; i++) {
+      str.clear();
+      append_arg_to_string(argv[i], str);
+      put_string(str, fp);
+    }
+  }
+  if (is_last)
+    putc('\n', fp);
+  else
+    fputs(" | ", fp);
+}
+
+void append_arg_to_string(const char *arg, string &str)
+{
+  str += ' ';
+  int needs_quoting = 0;
+  int contains_single_quote = 0;
+  const char*p;
+  for (p = arg; *p != '\0'; p++)
+    switch (*p) {
+    case ';':
+    case '&':
+    case '(':
+    case ')':
+    case '|':
+    case '^':
+    case '<':
+    case '>':
+    case '\n':
+    case ' ':
+    case '\t':
+    case '\\':
+    case '"':
+    case '$':
+    case '?':
+    case '*':
+      needs_quoting = 1;
+      break;
+    case '\'':
+      contains_single_quote = 1;
+      break;
+    }
+  if (contains_single_quote || arg[0] == '\0') {
+    str += '"';
+    for (p = arg; *p != '\0'; p++)
+      switch (*p) {
+      case '"':
+      case '\\':
+      case '$':
+	str += '\\';
+	// fall through
+      default:
+	str += *p;
+	break;
+      }
+    str += '"';
+  }
+  else if (needs_quoting) {
+    str += '\'';
+    str += arg;
+    str += '\'';
+  }
+  else
+    str += arg;
+}
+
+char **possible_command::get_argv()
+{
+  build_argv();
+  return argv;
+}
+
+void synopsis(FILE *stream)
+{
+  fprintf(stream,
+"usage: %s [-abceghilpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
+"       [-wname] [-Wname] [-Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg]\n"
+"       [-Larg] [-Idir] [files...]\n",
+	  program_name);
+}
+
+void help()
+{
+  synopsis(stdout);
+  fputs("\n"
+"-h\tprint this message\n"
+"-t\tpreprocess with tbl\n"
+"-p\tpreprocess with pic\n"
+"-e\tpreprocess with eqn\n"
+"-g\tpreprocess with grn\n"
+"-G\tpreprocess with grap\n"
+"-s\tpreprocess with soelim\n"
+"-R\tpreprocess with refer\n"
+"-Tdev\tuse device dev\n"
+"-X\tuse X11 previewer rather than usual postprocessor\n"
+"-mname\tread macros tmac.name\n"
+"-dcs\tdefine a string c as s\n"
+"-rcn\tdefine a number register c as n\n"
+"-nnum\tnumber first page n\n"
+"-olist\toutput only pages in list\n"
+"-ffam\tuse fam as the default font family\n"
+"-Fdir\tsearch dir for device directories\n"
+"-Mdir\tsearch dir for macro files\n"
+"-v\tprint version number\n"
+"-z\tsuppress formatted output\n"
+"-Z\tdon't postprocess\n"
+"-a\tproduce ASCII description of output\n"
+"-i\tread standard input after named input files\n"
+"-wname\tenable warning name\n"
+"-Wname\tinhibit warning name\n"
+"-E\tinhibit all errors\n"
+"-b\tprint backtraces with errors or warnings\n"
+"-l\tspool the output\n"
+"-c\tdisable color output\n"
+"-C\tenable compatibility mode\n"
+"-V\tprint commands on stdout instead of running them\n"
+"-Parg\tpass arg to the postprocessor\n"
+"-Larg\tpass arg to the spooler\n"
+"-N\tdon't allow newlines within eqn delimiters\n"
+"-S\tenable safer mode (the default)\n"
+"-U\tenable unsafe mode\n"
+"-Idir\tsearch dir for soelim.  Implies -s\n"
+"\n",
+	stdout);
+  exit(0);
+}
+
+void usage(FILE *stream)
+{
+  synopsis(stream);
+  fprintf(stream, "%s -h gives more help\n", program_name);
+}
+
+extern "C" {
+
+void c_error(const char *format, const char *arg1, const char *arg2,
+	     const char *arg3)
+{
+  error(format, arg1, arg2, arg3);
+}
+
+void c_fatal(const char *format, const char *arg1, const char *arg2,
+	     const char *arg3)
+{
+  fatal(format, arg1, arg2, arg3);
+}
+
+}
diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man
index 8d60560..2227b71 100644
--- a/contrib/groff/src/roff/groff/groff.man
+++ b/contrib/groff/src/roff/groff/groff.man
@@ -1,9 +1,9 @@
 .ig
 groff.man
 
-Last update: 14 July 2002
+Last update: 18 Mar 2003
 
-Copyright (C) 1989, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2002, 2003 Free Software Foundation, Inc.
 Rewritten in 2002 by Bernd Warken <bwarken@mayn.de>
 
 Permission is granted to copy, distribute and/or modify this document
@@ -118,7 +118,7 @@ FDL in the main directory of the groff source package.
 .c --------------------------------------------------------------------
 .c ShortOpt ([char [punct]])
 .c
-.c `-c' somwhere in the text 
+.c `-c' somewhere in the text 
 .c second arg is punctuation
 .c
 .de ShortOpt
@@ -130,7 +130,7 @@ FDL in the main directory of the groff source package.
 .c --------------------------------------------------------------------
 .c LongOpt  ([name [punct]])
 .c
-.c `--name' somwhere in the text 
+.c `--name' somewhere in the text 
 .c second arg is punctuation
 .c
 .de LongOpt
@@ -314,7 +314,7 @@ The
 .B groff
 program allows to control the whole
 .I groff
-system by comand line options.
+system by command line options.
 .
 This is a great simplification in comparison to the classical case (which
 uses pipes only).
@@ -430,12 +430,12 @@ Preprocess with
 .BR @g@pic .
 .
 .
-.OptDef P "" "-option"
-.OptDef+ P "" "-option \f[CB]-P\f[] arg"
+.OptDef P "" "\*[@-]option"
+.OptDef+ P "" "\*[@-]option \f[CB]\*[@-]P\f[] arg"
 Pass
-.I -option
+.I \*[@-]option
 or
-.I -option arg
+.I \*[@-]option arg
 to the postprocessor.
 .
 The option must be specified with the necessary preceding minus
@@ -449,11 +449,12 @@ postprocessor.
 For example, to pass a title to the gxditview postprocessor, the shell
 command
 .IP
-.ShellCommand groff -X -P -title -P 'groff it' \f[I]foo\f[]
+.ShellCommand groff \*[@-]X \*[@-]P \*[@-]title \*[@-]P 'groff it' \f[I]foo\f[]
 .IP
 is equivalent to
 .IP
-.ShellCommand groff -X -Z \f[I]foo\f[] | gxditview -title 'groff it' -
+.ShellCommand groff \*[@-]X \*[@-]Z \f[I]foo\f[] | \
+gxditview \*[@-]title 'groff it' \*[@-]
 .
 .
 .OptDef R
@@ -504,28 +505,79 @@ Preprocess with
 .OptDef T "" dev
 Set output device to
 .IR dev .
-The possible values in
-.I groff
+Contrary to
+.BR @g@troff ,
+.B groff
+calls a postprocessor to convert
+.BR @g@troff 's
+intermediate output to its final format.
+Real devices in
+.B groff
 are
-.BR ascii ,
-.BR cp1047 ,
-.BR dvi ,
-.BR html ,
-.BR latin1 ,
-.BR lbp ,
-.BR lj4 ,
-.BR ps ,
-.BR utf8 ,
-.BR X75 ,
-and
-.BR X100 .
 .
-Additionally,
-.B X75-12
+.RS
+.RS
+.IP dvi
+TeX DVI format (postprocessor is
+.BR grodvi ).
+.IP html
+HTML output (preprocessors are
+.B @g@soelim
 and
-.B X100-12
-are available for documents which use 12\|pt as the base document size.
+.BR \%pre-grohtml ,
+postprocessor is
+.BR \%post-grohtml ).
+.IP lbp
+Canon CAPSL printers (\%LBP-4 and \%LBP-8 series laser printers;
+postprocessor is
+.BR grolbp ).
+.IP lj4
+HP LaserJet4 compatible (or other PCL5 compatible) printers (postprocessor
+is
+.BR grolj4 ).
+.IP ps
+PostScript output (postprocessor is
+.BR grops ).
+.RE
+.RE
+.
+.IP
+For the following TTY output devices (postprocessor is always
+.BR grotty ),
+.ShortOpt T
+selects the output encoding:
+.RS
+.RS
+.IP ascii
+7bit ASCII.
+.IP cp1047
+\%Latin-1 character set for EBCDIC hosts.
+.IP latin1
+ISO \%8859-1.
+.IP utf8
+Unicode character set in \%UTF-8 encoding.
+.RE
+.RE
 .
+.IP
+The following arguments select
+.B gxditview
+as the `postprocessor' (it is rather a viewing program):
+.
+.RS
+.RS
+.IP X75
+75dpi resolution, 10pt document base font.
+.IP X75-12
+75dpi resolution, 12pt document base font.
+.IP X100
+100dpi resolution, 10pt document base font.
+.IP X100-12
+100dpi resolution, 12pt document base font.
+.RE
+.RE
+.
+.IP
 The default device is
 .BR @DEVICE@ .
 .
@@ -564,7 +616,7 @@ and
 is carried over to 
 .BR \%gxditview (@MAN1EXT@)
 by determining an argument for the
-.B -printCommand
+.B \*[@-]printCommand
 option of
 .BR \%gxditview (@MAN1EXT@).
 .
@@ -590,7 +642,7 @@ option to
 for example
 .
 .IP
-.ShellCommand groff -X -P-resolution -P100 -man foo.1
+.ShellCommand groff \*[@-]X \*[@-]P\*[@-]resolution \*[@-]P100 \*[@-]man foo.1
 .
 .
 .OptDef z
@@ -610,7 +662,7 @@ This will print the intermediate output to standard output; see
 .
 .
 .\" --------------------------------------------------------------------
-.SS Tranparent Options
+.SS Transparent Options
 .\" --------------------------------------------------------------------
 .
 The following options are transparently handed over to the formatter
@@ -695,7 +747,7 @@ Due to the front-end programs available within the groff system, using
 is much easier than
 .IR "classical roff" .
 .
-This section gives an overview of the parts that consitute the groff
+This section gives an overview of the parts that constitute the groff
 system.
 .
 It complements
@@ -957,12 +1009,12 @@ HTML output.
 .
 .TP
 .B latin1
-Text output using the ISO Latin-1 (ISO 8859-1) character set; see
-.BR iso_8859_1 (7).
+Text output using the ISO \%Latin-1 (ISO \%8859-1) character set; see
+.BR \%iso_8859_1 (7).
 .
 .TP
 .B lbp
-Output for Canon CAPSL printers (LBP-4 and LBP-8 series laser printers).
+Output for Canon CAPSL printers (\%LBP-4 and \%LBP-8 series laser printers).
 .
 .TP 
 .B lj4
@@ -975,7 +1027,7 @@ PostScript output; suitable for printers and previewers like
 .
 .TP
 .B utf8
-Text output using the Unicode (ISO 10646) character set with UTF-8
+Text output using the Unicode (ISO 10646) character set with \%UTF-8
 encoding; see
 .BR unicode (7).
 .
@@ -986,7 +1038,7 @@ encoding; see
 and
 .BR \%gxditview (@MAN1EXT@).
 A variant for a 12\|pt document base font is
-.BR X75-12 .
+.BR \%X75-12 .
 .
 .TP
 .B X100
@@ -995,7 +1047,7 @@ A variant for a 12\|pt document base font is
 and
 .BR \%gxditview (@MAN1EXT@).
 A variant for a 12\|pt document base font is
-.BR X100-12 .
+.BR \%X100-12 .
 .
 .P
 The postprocessor to be used for a device is specified by the
@@ -1004,7 +1056,7 @@ command in the device description file; see
 .BR \%groff_font (@MAN5EXT@).
 .
 This can be overridden with the
-.B \-X
+.B \*[@-]X
 option.
 .
 .P
@@ -1031,7 +1083,7 @@ terminals or line-printers.
 .
 .P
 Today, most printing or drawing hardware is handled by the operating
-system, by device drivers, or by software interfaces, usally accepting
+system, by device drivers, or by software interfaces, usually accepting
 PostScript.
 .
 Consequently, there isn't an urgent need for more hardware device
@@ -1347,22 +1399,22 @@ and the
 macro set, classical troff had to be called by
 .
 .P
-.ShellCommand pic foo.me | tbl | troff -me -Tlatin1 | grotty
+.ShellCommand pic foo.me | tbl | troff \*[@-]me \*[@-]Tlatin1 | grotty
 .
 .P
 Using
 .BR groff ,
 this pipe can be shortened to the equivalent command
 .P
-.ShellCommand groff -p -t -me -T latin1 foo.me
+.ShellCommand groff \*[@-]p \*[@-]t \*[@-]me \*[@-]T latin1 foo.me
 .
 .P
 An even easier way to call this is to use
 .BR grog (@MAN1EXT@)
 to guess the preprocessor and macro options and execute the generated
-command (by specifying shell left quotes)
+command (by using backquotes to specify shell command substitution)
 .P
-.ShellCommand `grog -Tlatin1 foo.me`
+.ShellCommand \`grog \*[@-]Tlatin1 foo.me\`
 .
 .P
 The simplest way is to view the contents in an automated way by
@@ -1442,7 +1494,7 @@ This is the only grap version supported by groff.
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright \(co 1989, 2002 Free Software Foundation, Inc.
+Copyright \(co 1989, 2002, 2003 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free
@@ -1560,6 +1612,7 @@ Groff macro packages and macro-specific utilities:
 .BR \%groff_mom (@MAN7EXT@),
 .BR \%groff_ms (@MAN7EXT@),
 .BR \%groff_www (@MAN7EXT@),
+.BR \%groff_trace (@MAN7EXT@),
 .BR \%mmroff (@MAN7EXT@).
 .
 .TP
diff --git a/contrib/groff/src/roff/groff/pipeline.c b/contrib/groff/src/roff/groff/pipeline.c
index 59480dd..985b24f 100644
--- a/contrib/groff/src/roff/groff/pipeline.c
+++ b/contrib/groff/src/roff/groff/pipeline.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -36,14 +36,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 extern char *strerror();
 #endif
 
-#ifndef HAVE_STRCASECMP
-#define strcasecmp(a,b) strcmp((a),(b))
-#endif
-
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp(a,b,c) strncmp((a),(b),(c))
-#endif
-
 #ifdef _POSIX_VERSION
 
 #include <sys/wait.h>
@@ -90,8 +82,10 @@ extern char *strerror();
 #define P(parms) parms
 #else
 #define P(parms) ()
+#ifndef _WIN32
 #define const /* as nothing */
 #endif
+#endif
 
 #define error c_error
 extern void error P((const char *, const char *, const char *, const char *));
@@ -120,7 +114,7 @@ static char *i_to_a P((int));
 /* A signal handler that just records that a signal has happened.  */
 static int child_interrupted;
 
-static RETSIGTYPE signal_catcher (int signo)
+static RETSIGTYPE signal_catcher(int signo)
 {
   child_interrupted++;
 }
@@ -129,36 +123,35 @@ static const char *sh = "sh";
 static const char *command = "command";
 
 const char *
-system_shell_name (void)
+system_shell_name(void)
 {
   static const char *shell_name;
 
   /* We want them to be able to use a Unixy shell if they have it
      installed.  Let spawnlp try to find it, but if it fails, default
      to COMMAND.COM.  */
-  if (shell_name == NULL)
-    {
-      int sh_found = spawnlp (P_WAIT, sh, sh, "-c", ":", NULL) == 0;
+  if (shell_name == NULL) {
+    int sh_found = spawnlp(P_WAIT, sh, sh, "-c", ":", NULL) == 0;
 
-      if (sh_found)
-	shell_name = sh;
-      else
-	shell_name = command;
-    }
+    if (sh_found)
+      shell_name = sh;
+    else
+      shell_name = command;
+  }
   return shell_name;
 }
 
 const char *
-system_shell_dash_c (void)
+system_shell_dash_c(void)
 {
-  if (strcmp (system_shell_name(), sh) == 0)
+  if (strcmp(system_shell_name(), sh) == 0)
     return "-c";
   else
     return "/c";
 }
 
 int
-is_system_shell (const char *shell)
+is_system_shell(const char *shell)
 {
   size_t shlen;
   size_t ibase = 0, idot, i;
@@ -167,32 +160,151 @@ is_system_shell (const char *shell)
     return 0;
   idot = shlen = strlen(shell);
 
-  for (i = 0; i < shlen; i++)
-    {
-      if (shell[i] == '.')
-	idot = i;
-      else if (shell[i] == '/' || shell[i] == '\\' || shell[i] == ':')
-	{
-	  ibase = i + 1;
-	  idot = shlen;
-	}
+  for (i = 0; i < shlen; i++) {
+    if (shell[i] == '.')
+      idot = i;
+    else if (shell[i] == '/' || shell[i] == '\\' || shell[i] == ':') {
+      ibase = i + 1;
+      idot = shlen;
     }
+  }
 
   /* "sh" and "sh.exe" should compare equal.  */
-  return
-    (strncasecmp (shell + ibase, system_shell_name (), idot - ibase) == 0
-     && (idot == shlen
-	 || strcasecmp (shell + idot, ".exe") == 0
-	 || strcasecmp (shell + idot, ".com") == 0));
+  return (strncasecmp(shell + ibase, system_shell_name(), idot - ibase) == 0
+	  && (idot == shlen
+	      || strcasecmp(shell + idot, ".exe") == 0
+	      || strcasecmp(shell + idot, ".com") == 0));
+}
+
+#ifdef _WIN32
+
+/* Win32 doesn't have fork() */
+
+int
+run_pipeline(int ncommands, char ***commands, int no_pipe)
+{
+  int save_stdin, save_stdout;
+  int i;
+  int last_input = 0;
+  int proc_count = ncommands;
+  int ret = 0;
+  char err_str[BUFSIZ];
+  PID_T pids[MAX_COMMANDS];
+
+  for (i = 0; i < ncommands; i++) {
+    int pdes[2];
+    PID_T pid;
+
+    /* If no_pipe is set, just run the commands in sequence
+       to show the version numbers */
+    if (ncommands > 1 && !no_pipe) {
+      /* last command doesn't need a new pipe */
+      if (i < ncommands - 1) {
+	if (_pipe(pdes, BUFSIZ, O_BINARY | O_NOINHERIT) < 0)
+	  sys_fatal("pipe");
+      }
+      /* 1st command; writer */
+      if (i == 0) {
+	/* save stdout */
+	if ((save_stdout = _dup(1)) < 0)
+	  sys_fatal("dup stdout");
+	/* connect stdout to write end of pipe */
+	if (_dup2(pdes[1], 1) < 0) {
+	  sprintf(err_str, "%s: dup2(stdout)", commands[i][0]);
+	  sys_fatal(err_str);
+	}
+	if (close(pdes[1]) < 0) {
+	  sprintf(err_str, "%s: close(pipe[WRITE])", commands[i][0]);
+	  sys_fatal(err_str);
+	}
+	last_input = pdes[0];
+      }
+      /* reader and writer */
+      else if (i < ncommands - 1) {
+	/* connect stdin to read end of last pipe */
+	if (_dup2(last_input, 0) < 0) {
+	  sprintf(err_str, " %s: dup2(stdin)", commands[i][0]);
+	  sys_fatal("err_str");
+	}
+	/* connect stdout to write end of new pipe */
+	if (_dup2(pdes[1], 1) < 0) {
+	  sprintf(err_str, "%s: dup2(stdout)", commands[i][0]);
+	  sys_fatal("err_str");
+	}
+	if (close(pdes[1]) < 0) {
+	  sprintf(err_str, "%s: close(pipe[WRITE])", commands[i][0]);
+	  sys_fatal(err_str);
+	}
+	last_input = pdes[0];
+      }
+      /* last command; reader */
+      else {
+	/* connect stdin to read end of last pipe */
+	if (_dup2(last_input, 0) < 0) {
+	  sprintf(err_str, "%s: dup2(stdin)", commands[i][0]);
+	  sys_fatal("err_str");
+	}
+	if (close(last_input) < 0) {
+	  sprintf(err_str, "%s: close(pipe[READ])", commands[i][0]);
+	  sys_fatal(err_str);
+	}
+	/* restore original stdout */
+	if (_dup2(save_stdout, 1) < 0) {
+	  sprintf(err_str, "%s: dup2(stdout))", "groff");
+	  sys_fatal(err_str);
+	}
+      }
+    }
+    if ((pid = _spawnvp(_P_NOWAIT, commands[i][0], commands[i])) < 0) {
+      error("couldn't exec %1: %2",
+	    commands[i][0], strerror(errno), (char *)0);
+      fflush(stderr);			/* just in case error() doesn't */
+      _exit(EXEC_FAILED_EXIT_STATUS);
+    }
+    pids[i] = pid;
+  }
+  for (i = 0; i < ncommands; i++) {
+    int status;
+    int pid;
+
+    pid = pids[i];
+    if ((pid = _cwait(&status, pid, _WAIT_CHILD)) < 0) {
+      perror(NULL);
+      sys_fatal("wait");
+      if (WIFSIGNALED(status)) {
+	int sig = WTERMSIG(status);
+
+	error("%1: %2%3",
+	      commands[i][0],
+	      xstrsignal(sig),
+	      WCOREDUMP(status) ? " (core dumped)" : "");
+	ret |= 2;
+      }
+      else if (WIFEXITED(status)) {
+	int exit_status = WEXITSTATUS(status);
+
+	if (exit_status == EXEC_FAILED_EXIT_STATUS)
+	  ret |= 4;
+	else if (exit_status != 0)
+	  ret |= 1;
+      }
+      else
+        error("unexpected status %1", itoa(status), (char *)0, (char *)0);
+      break;
+    }
+  }
+  return ret;
 }
 
-/* MSDOS doesn't have `fork', so we need to simulate the pipe by
-   running the programs in sequence with redirected standard streams.  */
+#else  /* _WIN32 */
 
-int run_pipeline (ncommands, commands, no_pipe)
-     int ncommands;
-     char ***commands;
-     int no_pipe;
+/* MSDOS doesn't have `fork', so we need to simulate the pipe by running
+   the programs in sequence with standard streams redirected fot and
+   from temporary files.
+*/
+
+int
+run_pipeline(int ncommands, char ***commands, int no_pipe)
 {
   int save_stdin = dup(0);
   int save_stdout = dup(1);
@@ -205,81 +317,71 @@ int run_pipeline (ncommands, commands, no_pipe)
   tmpfiles[0] = tmpnam(tem1);
   tmpfiles[1] = tmpnam(tem2);
 
-  for (i = 0; i < ncommands; i++)
-    {
-      int exit_status;
-      RETSIGTYPE (*prev_handler)(int);
-
-      if (i)
-	{
-	  /* redirect stdin from temp file */
-	  f = open(tmpfiles[infile], O_RDONLY|O_BINARY, 0666);
-	  if (f < 0)
-	    sys_fatal("open stdin");
-	  if (dup2(f, 0) < 0)
-	    sys_fatal("dup2 stdin"); 
-	  if (close(f) < 0)
-	    sys_fatal("close stdin");
-	}
-      if ((i < ncommands - 1) && !no_pipe)
-	{
-	  /* redirect stdout to temp file */
-	  f = open(tmpfiles[outfile], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0666);
-	  if (f < 0)
-	    sys_fatal("open stdout");
-	  if (dup2(f, 1) < 0)
-	    sys_fatal("dup2 stdout");
-	  if (close(f) < 0)
-	    sys_fatal("close stdout");
-	}
-      else if (dup2(save_stdout, 1) < 0)
-	sys_fatal("restore stdout");
-
-      /* run the program */
-      child_interrupted = 0;
-      prev_handler = signal(SIGINT, signal_catcher);
-      exit_status = spawnvp(P_WAIT, commands[i][0], commands[i]);
-      signal(SIGINT, prev_handler);
-      if (child_interrupted)
-	{
-	  error("%1: Interrupted", commands[i][0], (char *)0, (char *)0);
-	  ret |= 2;
-	}
-      else if (exit_status < 0)
-	{
-	  error("couldn't exec %1: %2", commands[i][0],
-		strerror(errno), (char *)0);
-	  fflush(stderr);		/* just in case error() doesn't */
-	  ret |= 4;
-	}
-      if (exit_status != 0)
-	ret |= 1;
-
-      /* There's no sense to continue with the pipe if one of the
-	 programs has ended abnormally, is there?  */
-      if (ret != 0)
-	break;
-
-      /* swap temp files: make output of this program be input for the next */
-      infile = 1 - infile;
-      outfile = 1 - outfile;
+  for (i = 0; i < ncommands; i++) {
+    int exit_status;
+    RETSIGTYPE (*prev_handler)(int);
+
+    if (i) {
+      /* redirect stdin from temp file */
+      f = open(tmpfiles[infile], O_RDONLY|O_BINARY, 0666);
+      if (f < 0)
+	sys_fatal("open stdin");
+      if (dup2(f, 0) < 0)
+	sys_fatal("dup2 stdin"); 
+      if (close(f) < 0)
+	sys_fatal("close stdin");
     }
-
+    if ((i < ncommands - 1) && !no_pipe) {
+      /* redirect stdout to temp file */
+      f = open(tmpfiles[outfile], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0666);
+      if (f < 0)
+	sys_fatal("open stdout");
+      if (dup2(f, 1) < 0)
+	sys_fatal("dup2 stdout");
+      if (close(f) < 0)
+	sys_fatal("close stdout");
+    }
+    else if (dup2(save_stdout, 1) < 0)
+      sys_fatal("restore stdout");
+
+    /* run the program */
+    child_interrupted = 0;
+    prev_handler = signal(SIGINT, signal_catcher);
+    exit_status = spawnvp(P_WAIT, commands[i][0], commands[i]);
+    signal(SIGINT, prev_handler);
+    if (child_interrupted) {
+      error("%1: Interrupted", commands[i][0], (char *)0, (char *)0);
+      ret |= 2;
+    }
+    else if (exit_status < 0) {
+      error("couldn't exec %1: %2",
+	    commands[i][0], strerror(errno), (char *)0);
+      fflush(stderr);			/* just in case error() doesn't */
+      ret |= 4;
+    }
+    if (exit_status != 0)
+      ret |= 1;
+    /* There's no sense to continue with the pipe if one of the
+       programs has ended abnormally, is there? */
+    if (ret != 0)
+      break;
+    /* swap temp files: make output of this program be input for the next */
+    infile = 1 - infile;
+    outfile = 1 - outfile;
+  }
   if (dup2(save_stdin, 0) < 0)
     sys_fatal("restore stdin");
-
   unlink(tmpfiles[0]);
   unlink(tmpfiles[1]);
-
   return ret;
 }
 
-#else  /* not __MSDOS__, not _WIN32 */
+#endif /* MS-DOS */
 
-int run_pipeline(ncommands, commands, no_pipe)
-     int ncommands;
-     char ***commands;
-     int no_pipe;
+#else /* not __MSDOS__, not _WIN32 */
+
+int
+run_pipeline(int ncommands, char ***commands, int no_pipe)
 {
   int i;
   int last_input = 0;
@@ -288,56 +390,58 @@ int run_pipeline(ncommands, commands, no_pipe)
   int proc_count = ncommands;
 
   for (i = 0; i < ncommands; i++) {
-      int pdes[2];
-      PID_T pid;
-      if ((i != ncommands - 1) && !no_pipe) {
-	if (pipe(pdes) < 0)
-	  sys_fatal("pipe");
-      }
-      pid = fork();
-      if (pid < 0)
-	sys_fatal("fork");
-      if (pid == 0) {
-	/* child */
-	if (last_input != 0) {
-	  if (close(0) < 0)
-	    sys_fatal("close");
-	  if (dup(last_input) < 0)
-	    sys_fatal("dup");
-	  if (close(last_input) < 0)
-	    sys_fatal("close");
-	}
-	if ((i != ncommands - 1) && !no_pipe) {
-	  if (close(1) < 0)
-	    sys_fatal("close");
-	  if (dup(pdes[1]) < 0)
-	    sys_fatal("dup");
-	  if (close(pdes[1]) < 0)
-	    sys_fatal("close");
-	  if (close(pdes[0]))
-	    sys_fatal("close");
-	}
-	execvp(commands[i][0], commands[i]);
-	error("couldn't exec %1: %2", commands[i][0],
-	      strerror(errno), (char *)0);
-	fflush(stderr);		/* just in case error() doesn't */
-	_exit(EXEC_FAILED_EXIT_STATUS);
-      }
-      /* in the parent */
+    int pdes[2];
+    PID_T pid;
+
+    if ((i != ncommands - 1) && !no_pipe) {
+      if (pipe(pdes) < 0)
+	sys_fatal("pipe");
+    }
+    pid = fork();
+    if (pid < 0)
+      sys_fatal("fork");
+    if (pid == 0) {
+      /* child */
       if (last_input != 0) {
+	if (close(0) < 0)
+	  sys_fatal("close");
+	if (dup(last_input) < 0)
+	  sys_fatal("dup");
 	if (close(last_input) < 0)
 	  sys_fatal("close");
       }
       if ((i != ncommands - 1) && !no_pipe) {
+	if (close(1) < 0)
+	  sys_fatal("close");
+	if (dup(pdes[1]) < 0)
+	  sys_fatal("dup");
 	if (close(pdes[1]) < 0)
 	  sys_fatal("close");
-	last_input = pdes[0];
+	if (close(pdes[0]))
+	  sys_fatal("close");
       }
-      pids[i] = pid;
+      execvp(commands[i][0], commands[i]);
+      error("couldn't exec %1: %2",
+	    commands[i][0], strerror(errno), (char *)0);
+      fflush(stderr);			/* just in case error() doesn't */
+      _exit(EXEC_FAILED_EXIT_STATUS);
     }
+    /* in the parent */
+    if (last_input != 0) {
+      if (close(last_input) < 0)
+	sys_fatal("close");
+    }
+    if ((i != ncommands - 1) && !no_pipe) {
+      if (close(pdes[1]) < 0)
+	sys_fatal("close");
+      last_input = pdes[0];
+    }
+    pids[i] = pid;
+  }
   while (proc_count > 0) {
     int status;
     PID_T pid = wait(&status);
+
     if (pid < 0)
       sys_fatal("wait");
     for (i = 0; i < ncommands; i++)
@@ -349,7 +453,6 @@ int run_pipeline(ncommands, commands, no_pipe)
 #ifdef SIGPIPE
 	  if (sig == SIGPIPE) {
 	    if (i == ncommands - 1) {
-
 	      /* This works around a problem that occurred when using the
 		 rerasterize action in gxditview.  What seemed to be
 		 happening (on SunOS 4.1.1) was that pclose() closed the
@@ -359,6 +462,7 @@ int run_pipeline(ncommands, commands, no_pipe)
 		 groff.  I don't understand why gpic wasn't getting a
 		 SIGPIPE. */
 	      int j;
+
 	      for (j = 0; j < ncommands; j++)
 		if (pids[j] > 0)
 		  (void)kill(pids[j], SIGPIPE);
@@ -376,14 +480,14 @@ int run_pipeline(ncommands, commands, no_pipe)
 	}
 	else if (WIFEXITED(status)) {
 	  int exit_status = WEXITSTATUS(status);
+
 	  if (exit_status == EXEC_FAILED_EXIT_STATUS)
 	    ret |= 4;
 	  else if (exit_status != 0)
 	    ret |= 1;
 	}
 	else
-	  error("unexpected status %1",
-		i_to_a(status), (char *)0, (char *)0);
+	  error("unexpected status %1",	i_to_a(status), (char *)0, (char *)0);
 	break;
       }
   }
@@ -392,24 +496,25 @@ int run_pipeline(ncommands, commands, no_pipe)
 
 #endif /* not __MSDOS__, not _WIN32 */
 
-static void sys_fatal(s)
-     const char *s;
+static void
+sys_fatal(const char *s)
 {
   c_fatal("%1: %2", s, strerror(errno), (char *)0);
 }
 
-static char *i_to_a(n)
-     int n;
+static char *
+i_to_a(int n)
 {
   static char buf[12];
   sprintf(buf, "%d", n);
   return buf;
 }
 
-static const char *xstrsignal(n)
-     int n;
+static const char *
+xstrsignal(int n)
 {
-  static char buf[sizeof("Signal ") + 1 + sizeof(int)*3];
+  static char buf[sizeof("Signal ") + 1 + sizeof(int) * 3];
+
 #ifdef NSIG
 #ifdef SYS_SIGLIST_DECLARED
   if (n >= 0 && n < NSIG && sys_siglist[n] != 0)
diff --git a/contrib/groff/src/roff/grog/grog.man b/contrib/groff/src/roff/grog/grog.man
index e1ab74e..4428233 100644
--- a/contrib/groff/src/roff/grog/grog.man
+++ b/contrib/groff/src/roff/grog/grog.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -67,7 +67,7 @@ to print the version number.
 .LP
 For example,
 .IP
-.B `grog \-Tdvi paper.ms`
+.B \`grog \-Tdvi paper.ms\`
 .LP
 will guess the appropriate command to print
 .B paper.ms
diff --git a/contrib/groff/src/roff/nroff/Makefile.sub b/contrib/groff/src/roff/nroff/Makefile.sub
index b9cb482..138c870 100644
--- a/contrib/groff/src/roff/nroff/Makefile.sub
+++ b/contrib/groff/src/roff/nroff/Makefile.sub
@@ -7,6 +7,7 @@ all: nroff
 nroff: nroff.sh
 	rm -f $@
 	sed -e "s|@BINDIR@|$(bindir)|g" \
+	-e "s|@SEP@|$(SEP)|g" \
 	-e $(SH_SCRIPT_SED_CMD) \
 	-e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
 	chmod +x $@
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index eb070b0..7e1262f 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -30,18 +30,12 @@ the original English.
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-h
-.OP \-i
+.OP \-CchipStUv
 .OP \-m name
 .OP \-n num
 .OP \-o list
-.OP \-p
 .OP \-r cn
-.OP \-S
-.OP \-t
 .OP \-T name
-.OP \-U
-.OP \-v
 .RI "[\ " "file" "\ .\|.\|.\ ]"
 .br
 .ad \na
@@ -59,7 +53,9 @@ and
 .B cp1047
 are valid arguments for the
 .B -T
-option.
+option, selecting the output encoding emitted by
+.BR grotty ,
+groff's TTY output device.
 If an invalid or no
 .BR \-T
 option is given,
@@ -91,8 +87,8 @@ options
 The
 .BR \-C ,
 .BR \-i ,
-.BR \-n ,
 .BR \-m ,
+.BR \-n ,
 .BR \-o ,
 and
 .B \-r
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index ed1df0b..39268f7 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -65,7 +65,7 @@ for i
       echo "GNU nroff (groff) version @VERSION@"
       exit 0 ;;
     --help)
-      echo "usage: nroff [-cChipt] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
+      echo "usage: nroff [-CchipStUv] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
       exit 0 ;;
     --)
       shift
@@ -86,6 +86,6 @@ done
 
 : ${GROFF_BIN_PATH=@BINDIR@}
 export GROFF_BIN_PATH
-PATH=$GROFF_BIN_PATH:$PATH groff -mtty-char $T $opts ${1+"$@"}
+PATH=$GROFF_BIN_PATH@SEP@$PATH groff -mtty-char $T $opts ${1+"$@"}
 
 # eof
diff --git a/contrib/groff/src/roff/troff/Makefile.sub b/contrib/groff/src/roff/troff/Makefile.sub
index e889cdd..7fa8024 100644
--- a/contrib/groff/src/roff/troff/Makefile.sub
+++ b/contrib/groff/src/roff/troff/Makefile.sub
@@ -3,25 +3,33 @@ MAN1=troff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
+  dictionary.$(OBJEXT) \
+  div.$(OBJEXT) \
   env.$(OBJEXT) \
-  node.$(OBJEXT) \
+  glyphuni.$(OBJEXT) \
   input.$(OBJEXT) \
-  div.$(OBJEXT) \
-  symbol.$(OBJEXT) \
-  dictionary.$(OBJEXT) \
-  reg.$(OBJEXT) \
+  majorminor.$(OBJEXT) \
+  node.$(OBJEXT) \
   number.$(OBJEXT) \
-  majorminor.$(OBJEXT)
+  reg.$(OBJEXT) \
+  symbol.$(OBJEXT) \
+  unicode.$(OBJEXT) \
+  uniglyph.$(OBJEXT) \
+  uniuni.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/env.cc \
-  $(srcdir)/node.cc \
-  $(srcdir)/input.cc \
-  $(srcdir)/div.cc \
-  $(srcdir)/symbol.cc \
-  $(srcdir)/dictionary.cc \
-  $(srcdir)/reg.cc \
-  $(srcdir)/number.cc \
-  majorminor.cc
+  $(srcdir)/dictionary.cpp \
+  $(srcdir)/div.cpp \
+  $(srcdir)/env.cpp \
+  $(srcdir)/glyphuni.cpp \
+  $(srcdir)/input.cpp \
+  majorminor.cpp \
+  $(srcdir)/node.cpp \
+  $(srcdir)/number.cpp \
+  $(srcdir)/reg.cpp \
+  $(srcdir)/symbol.cpp \
+  $(srcdir)/unicode.cpp \
+  $(srcdir)/uniglyph.cpp \
+  $(srcdir)/uniuni.cpp
 HDRS=\
   $(srcdir)/charinfo.h \
   $(srcdir)/dictionary.h \
@@ -34,11 +42,12 @@ HDRS=\
   $(srcdir)/request.h \
   $(srcdir)/symbol.h \
   $(srcdir)/token.h \
-  $(srcdir)/troff.h
-GENSRCS=majorminor.cc
+  $(srcdir)/troff.h \
+  $(srcdir)/unicode.h
+GENSRCS=majorminor.cpp
 NAMEPREFIX=$(g)
 
-majorminor.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
+majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 	@echo Making $@
 	@-rm -f $@
 	@echo const char \*major_version = \
diff --git a/contrib/groff/src/roff/troff/charinfo.h b/contrib/groff/src/roff/troff/charinfo.h
index b907ae4..4123fba 100644
--- a/contrib/groff/src/roff/troff/charinfo.h
+++ b/contrib/groff/src/roff/troff/charinfo.h
@@ -37,7 +37,7 @@ class charinfo {
 				// to transparent throughput
   char translate_input;		// non-zero means that asciify_code is
 				// active for .asciify (set by .trin)
-  char fallback;
+  char_mode mode;
 public:
   enum { 
     ENDS_SENTENCE = 1,
@@ -47,7 +47,7 @@ public:
     OVERLAPS_VERTICALLY = 16,
     TRANSPARENT = 32,
     NUMBERED = 64
-    };
+  };
   enum {
     TRANSLATE_NONE,
     TRANSLATE_SPACE,
@@ -77,13 +77,16 @@ public:
   void set_flags(unsigned char);
   void set_special_translation(int, int);
   int get_special_translation(int = 0);
-  macro *set_macro(macro *, int = 0);
+  macro *set_macro(macro *);
+  macro *setx_macro(macro *, char_mode);
   macro *get_macro();
   int first_time_not_found();
   void set_number(int);
   int get_number();
   int numbered();
+  int is_normal();
   int is_fallback();
+  int is_special();
   symbol *get_symbol();
 };
 
@@ -126,9 +129,19 @@ inline int charinfo::numbered()
   return flags & NUMBERED;
 }
 
+inline int charinfo::is_normal()
+{
+  return mode == CHAR_NORMAL;
+}
+
 inline int charinfo::is_fallback()
 {
-  return fallback;
+  return mode == CHAR_FALLBACK;
+}
+
+inline int charinfo::is_special()
+{
+  return mode == CHAR_SPECIAL;
 }
 
 inline charinfo *charinfo::get_translation(int transparent_throughput)
diff --git a/contrib/groff/src/roff/troff/column.cpp b/contrib/groff/src/roff/troff/column.cpp
new file mode 100644
index 0000000..8d6a6eb
--- /dev/null
+++ b/contrib/groff/src/roff/troff/column.cpp
@@ -0,0 +1,732 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifdef COLUMN
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+#include "hvunits.h"
+#include "env.h"
+#include "request.h"
+#include "node.h"
+#include "token.h"
+#include "div.h"
+#include "reg.h"
+#include "stringclass.h"
+
+void output_file::vjustify(vunits, symbol)
+{
+  // do nothing
+}
+
+struct justification_spec;
+struct output_line;
+
+class column : public output_file {
+private:
+  output_file *out;
+  vunits bottom;
+  output_line *col;
+  output_line **tail;
+  void add_output_line(output_line *);
+  void begin_page(int pageno, vunits page_length);
+  void flush();
+  void print_line(hunits, vunits, node *, vunits, vunits);
+  void vjustify(vunits, symbol);
+  void transparent_char(unsigned char c);
+  void copy_file(hunits, vunits, const char *);
+  int is_printing();
+  void check_bottom();
+public:
+  column();
+  ~column();
+  void start();
+  void output();
+  void justify(const justification_spec &);
+  void trim();
+  void reset();
+  vunits get_bottom();
+  vunits get_last_extra_space();
+  int is_active() { return out != 0; }
+};
+
+column *the_column = 0;
+
+struct transparent_output_line;
+struct vjustify_output_line;
+
+class output_line {
+  output_line *next;
+public:
+  output_line();
+  virtual ~output_line();
+  virtual void output(output_file *, vunits);
+  virtual transparent_output_line *as_transparent_output_line();
+  virtual vjustify_output_line *as_vjustify_output_line();
+  virtual vunits distance();
+  virtual vunits height();
+  virtual void reset();
+  virtual vunits extra_space();	// post line
+  friend class column;
+  friend class justification_spec;
+};
+
+class position_output_line : public output_line {
+  vunits dist;
+public:
+  position_output_line(vunits);
+  vunits distance();
+};
+  
+class node_output_line : public position_output_line {
+  node *nd;
+  hunits page_offset;
+  vunits before;
+  vunits after;
+public:
+  node_output_line(vunits, node *, hunits, vunits, vunits);
+  ~node_output_line();
+  void output(output_file *, vunits);
+  vunits height();
+  vunits extra_space();
+};
+
+class vjustify_output_line : public position_output_line {
+  vunits current;
+  symbol typ;
+public:
+  vjustify_output_line(vunits dist, symbol);
+  vunits height();
+  vjustify_output_line *as_vjustify_output_line();
+  void vary(vunits amount);
+  void reset();
+  symbol type();
+};
+
+inline symbol vjustify_output_line::type()
+{
+  return typ;
+}
+
+class copy_file_output_line : public position_output_line {
+  symbol filename;
+  hunits hpos;
+public:
+  copy_file_output_line(vunits, const char *, hunits);
+  void output(output_file *, vunits);
+};
+
+class transparent_output_line : public output_line {
+  string buf;
+public:
+  transparent_output_line();
+  void output(output_file *, vunits);
+  void append_char(unsigned char c);
+  transparent_output_line *as_transparent_output_line();
+};
+
+output_line::output_line() : next(0)
+{
+}
+
+output_line::~output_line()
+{
+}
+
+void output_line::reset()
+{
+}
+
+transparent_output_line *output_line::as_transparent_output_line()
+{
+  return 0;
+}
+
+vjustify_output_line *output_line::as_vjustify_output_line()
+{
+  return 0;
+}
+
+void output_line::output(output_file *, vunits)
+{
+}
+
+vunits output_line::distance()
+{
+  return V0;
+}
+
+vunits output_line::height()
+{
+  return V0;
+}
+
+vunits output_line::extra_space()
+{
+  return V0;
+}
+
+position_output_line::position_output_line(vunits d)
+: dist(d)
+{
+}
+
+vunits position_output_line::distance()
+{
+  return dist;
+}
+
+node_output_line::node_output_line(vunits d, node *n, hunits po, vunits b, vunits a)
+: position_output_line(d), nd(n), page_offset(po), before(b), after(a)
+{
+}
+
+node_output_line::~node_output_line()
+{
+  delete_node_list(nd);
+}
+
+void node_output_line::output(output_file *out, vunits pos)
+{
+  out->print_line(page_offset, pos, nd, before, after);
+  nd = 0;
+}
+
+vunits node_output_line::height()
+{
+  return after;
+}
+
+vunits node_output_line::extra_space()
+{
+  return after;
+}
+
+vjustify_output_line::vjustify_output_line(vunits d, symbol t)
+: position_output_line(d), typ(t)
+{
+}
+
+void vjustify_output_line::reset()
+{
+  current = V0;
+}
+
+vunits vjustify_output_line::height()
+{
+  return current;
+}
+
+vjustify_output_line *vjustify_output_line::as_vjustify_output_line()
+{
+  return this;
+}
+
+inline void vjustify_output_line::vary(vunits amount)
+{
+  current += amount;
+}
+
+transparent_output_line::transparent_output_line()
+{
+}
+
+transparent_output_line *transparent_output_line::as_transparent_output_line()
+{
+  return this;
+}
+
+void transparent_output_line::append_char(unsigned char c)
+{
+  assert(c != 0);
+  buf += c;
+}
+
+void transparent_output_line::output(output_file *out, vunits)
+{
+  int len = buf.length();
+  for (int i = 0; i < len; i++)
+    out->transparent_char(buf[i]);
+}
+
+copy_file_output_line::copy_file_output_line(vunits d, const char *f, hunits h)
+: position_output_line(d), hpos(h), filename(f)
+{
+}
+
+void copy_file_output_line::output(output_file *out, vunits pos)
+{
+  out->copy_file(hpos, pos, filename.contents());
+}
+
+column::column()
+: bottom(V0), col(0), tail(&col), out(0)
+{
+}
+
+column::~column()
+{
+  assert(out != 0);
+  error("automatically outputting column before exiting");
+  output();
+  delete the_output;
+}
+
+void column::start()
+{
+  assert(out == 0);
+  if (!the_output)
+    init_output();
+  assert(the_output != 0);
+  out = the_output;
+  the_output = this;
+}
+
+void column::begin_page(int pageno, vunits page_length)
+{
+  assert(out != 0);
+  if (col) {
+    error("automatically outputting column before beginning next page");
+    output();
+    the_output->begin_page(pageno, page_length);
+  }
+  else
+    out->begin_page(pageno, page_length);
+    
+}
+
+void column::flush()
+{
+  assert(out != 0);
+  out->flush();
+}
+
+int column::is_printing()
+{
+  assert(out != 0);
+  return out->is_printing();
+}
+
+vunits column::get_bottom()
+{
+  return bottom;
+}
+
+void column::add_output_line(output_line *ln)
+{
+  *tail = ln;
+  bottom += ln->distance();
+  bottom += ln->height();
+  ln->next = 0;
+  tail = &(*tail)->next;
+}
+
+void column::print_line(hunits page_offset, vunits pos, node *nd,
+			vunits before, vunits after)
+{
+  assert(out != 0);
+  add_output_line(new node_output_line(pos - bottom, nd, page_offset, before, after));
+}
+
+void column::vjustify(vunits pos, symbol typ)
+{
+  assert(out != 0);
+  add_output_line(new vjustify_output_line(pos - bottom, typ));
+}
+
+void column::transparent_char(unsigned char c)
+{
+  assert(out != 0);
+  transparent_output_line *tl = 0;
+  if (*tail)
+    tl = (*tail)->as_transparent_output_line();
+  if (!tl) {
+    tl = new transparent_output_line;
+    add_output_line(tl);
+  }
+  tl->append_char(c);
+}
+
+void column::copy_file(hunits page_offset, vunits pos, const char *filename)
+{
+  assert(out != 0);
+  add_output_line(new copy_file_output_line(pos - bottom, filename, page_offset));
+}
+
+void column::trim()
+{
+  output_line **spp = 0;
+  for (output_line **pp = &col; *pp; pp = &(*pp)->next)
+    if ((*pp)->as_vjustify_output_line() == 0)
+      spp = 0;
+    else if (!spp)
+      spp = pp;
+  if (spp) {
+    output_line *ln = *spp;
+    *spp = 0;
+    tail = spp;
+    while (ln) {
+      output_line *tem = ln->next;
+      bottom -= ln->distance();
+      bottom -= ln->height();
+      delete ln;
+      ln = tem;
+    }
+  }
+}
+
+void column::reset()
+{
+  bottom = V0;
+  for (output_line *ln = col; ln; ln = ln->next) {
+    bottom += ln->distance();
+    ln->reset();
+    bottom += ln->height();
+  }
+}
+
+void column::check_bottom()
+{
+  vunits b;
+  for (output_line *ln = col; ln; ln = ln->next) {
+    b += ln->distance();
+    b += ln->height();
+  }
+  assert(b == bottom);
+}
+
+void column::output()
+{
+  assert(out != 0);
+  vunits vpos(V0);
+  output_line *ln = col;
+  while (ln) {
+    vpos += ln->distance();
+    ln->output(out, vpos);
+    vpos += ln->height();
+    output_line *tem = ln->next;
+    delete ln;
+    ln = tem;
+  }
+  tail = &col;
+  bottom = V0;
+  col = 0;
+  the_output = out;
+  out = 0;
+}
+
+vunits column::get_last_extra_space()
+{
+  if (!col)
+    return V0;
+  for (output_line *p = col; p->next; p = p->next)
+    ;
+  return p->extra_space();
+}
+
+class justification_spec {
+  vunits height;
+  symbol *type;
+  vunits *amount;
+  int n;
+  int maxn;
+public:
+  justification_spec(vunits);
+  ~justification_spec();
+  void append(symbol t, vunits v);
+  void justify(output_line *, vunits *bottomp) const;
+};
+
+justification_spec::justification_spec(vunits h)
+: height(h), n(0), maxn(10)
+{
+  type = new symbol[maxn];
+  amount = new vunits[maxn];
+}
+
+justification_spec::~justification_spec()
+{
+  a_delete type;
+  a_delete amount;
+}
+
+void justification_spec::append(symbol t, vunits v)
+{
+  if (v <= V0) {
+    if (v < V0)
+      warning(WARN_RANGE,
+	      "maximum space for vertical justification must not be negative");
+    else
+      warning(WARN_RANGE,
+	      "maximum space for vertical justification must not be zero");
+    return;
+  }
+  if (n >= maxn) {
+    maxn *= 2;
+    symbol *old_type = type;
+    type = new symbol[maxn];
+    int i;
+    for (i = 0; i < n; i++)
+      type[i] = old_type[i];
+    a_delete old_type;
+    vunits *old_amount = amount;
+    amount = new vunits[maxn];
+    for (i = 0; i < n; i++)
+      amount[i] = old_amount[i];
+    a_delete old_amount;
+  }
+  assert(n < maxn);
+  type[n] = t;
+  amount[n] = v;
+  n++;
+}
+
+void justification_spec::justify(output_line *col, vunits *bottomp) const
+{
+  if (*bottomp >= height)
+    return;
+  vunits total;
+  output_line *p;
+  for (p = col; p; p = p->next) {
+    vjustify_output_line *sp = p->as_vjustify_output_line();
+    if (sp) {
+      symbol t = sp->type();
+      for (int i = 0; i < n; i++) {
+	if (t == type[i])
+	  total += amount[i];
+      }
+    }
+  }
+  vunits gap = height - *bottomp;
+  for (p = col; p; p = p->next) {
+    vjustify_output_line *sp = p->as_vjustify_output_line();
+    if (sp) {
+      symbol t = sp->type();
+      for (int i = 0; i < n; i++) {
+	if (t == type[i]) {
+	  if (total <= gap) {
+	    sp->vary(amount[i]);
+	    gap -= amount[i];
+	  }
+	  else {
+	    // gap < total
+	    vunits v = scale(amount[i], gap, total);
+	    sp->vary(v);
+	    gap -= v;
+	  }
+	  total -= amount[i];
+	}
+      }
+    }
+  }
+  assert(total == V0);
+  *bottomp = height - gap;
+}
+  
+void column::justify(const justification_spec &js)
+{
+  check_bottom();
+  js.justify(col, &bottom);
+  check_bottom();
+}
+
+void column_justify()
+{
+  vunits height;
+  if (!the_column->is_active())
+    error("can't justify column - column not active");
+  else if (get_vunits(&height, 'v')) {
+    justification_spec js(height);
+    symbol nm = get_long_name(1);
+    if (!nm.is_null()) {
+      vunits v;
+      if (get_vunits(&v, 'v')) {
+	js.append(nm, v);
+	int err = 0;
+	while (has_arg()) {
+	  nm = get_long_name(1);
+	  if (nm.is_null()) {
+	    err = 1;
+	    break;
+	  }
+	  if (!get_vunits(&v, 'v')) {
+	    err = 1;
+	    break;
+	  }
+	  js.append(nm, v);
+	}
+	if (!err)
+	  the_column->justify(js);
+      }
+    }
+  }
+  skip_line();
+}
+
+void column_start()
+{
+  if (the_column->is_active())
+    error("can't start column - column already active");
+  else
+    the_column->start();
+  skip_line();
+}
+
+void column_output()
+{
+  if (!the_column->is_active())
+    error("can't output column - column not active");
+  else
+    the_column->output();
+  skip_line();
+}
+
+void column_trim()
+{
+  if (!the_column->is_active())
+    error("can't trim column - column not active");
+  else
+    the_column->trim();
+  skip_line();
+}
+
+void column_reset()
+{
+  if (!the_column->is_active())
+    error("can't reset column - column not active");
+  else
+    the_column->reset();
+  skip_line();
+}
+
+class column_bottom_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *column_bottom_reg::get_string()
+{
+  return i_to_a(the_column->get_bottom().to_units());
+}
+
+class column_extra_space_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *column_extra_space_reg::get_string()
+{
+  return i_to_a(the_column->get_last_extra_space().to_units());
+}
+
+class column_active_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *column_active_reg::get_string()
+{
+  return the_column->is_active() ? "1" : "0";
+}
+
+static int no_vjustify_mode = 0;
+
+class vjustify_node : public node {
+  symbol typ;
+public:
+  vjustify_node(symbol);
+  int reread(int *);
+  const char *type();
+  int same(node *);
+  node *copy();
+};
+
+vjustify_node::vjustify_node(symbol t)
+: typ(t)
+{
+}
+
+node *vjustify_node::copy()
+{
+  return new vjustify_node(typ);
+}
+
+const char *vjustify_node::type()
+{
+  return "vjustify_node";
+}
+
+int vjustify_node::same(node *nd)
+{
+  return typ == ((vjustify_node *)nd)->typ;
+}
+
+int vjustify_node::reread(int *bolp)
+{
+  curdiv->vjustify(typ);
+  *bolp = 1;
+  return 1;
+}
+
+void macro_diversion::vjustify(symbol type)
+{
+  if (!no_vjustify_mode)
+    mac->append(new vjustify_node(type));
+}
+
+void top_level_diversion::vjustify(symbol type)
+{
+  if (no_space_mode || no_vjustify_mode)
+    return;
+  assert(first_page_begun);	// I'm not sure about this.
+  the_output->vjustify(vertical_position, type);
+}
+
+void no_vjustify()
+{
+  skip_line();
+  no_vjustify_mode = 1;
+}
+
+void restore_vjustify()
+{
+  skip_line();
+  no_vjustify_mode = 0;
+}
+
+void init_column_requests()
+{
+  the_column = new column;
+  init_request("cols", column_start);
+  init_request("colo", column_output);
+  init_request("colj", column_justify);
+  init_request("colr", column_reset);
+  init_request("colt", column_trim);
+  init_request("nvj", no_vjustify);
+  init_request("rvj", restore_vjustify);
+  number_reg_dictionary.define(".colb", new column_bottom_reg);
+  number_reg_dictionary.define(".colx", new column_extra_space_reg);
+  number_reg_dictionary.define(".cola", new column_active_reg);
+  number_reg_dictionary.define(".nvj",
+			       new constant_int_reg(&no_vjustify_mode));
+}
+
+#endif /* COLUMN */
diff --git a/contrib/groff/src/roff/troff/dictionary.cpp b/contrib/groff/src/roff/troff/dictionary.cpp
new file mode 100644
index 0000000..a70ebb0
--- /dev/null
+++ b/contrib/groff/src/roff/troff/dictionary.cpp
@@ -0,0 +1,212 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+  
+// is `p' a good size for a hash table
+
+static int is_good_size(unsigned int p)
+{
+  const unsigned int SMALL = 10;
+  unsigned int i;
+  for (i = 2; i <= p/2; i++)
+    if (p % i == 0)
+      return 0;
+  for (i = 0x100; i != 0; i <<= 8)
+    if (i % p <= SMALL || i % p > p - SMALL)
+      return 0;
+  return 1;
+}
+
+dictionary::dictionary(int n) : size(n), used(0), threshold(0.5), factor(1.5)
+{
+  table = new association[n];
+}
+
+// see Knuth, Sorting and Searching, p518, Algorithm L
+// we can't use double-hashing because we want a remove function
+
+void *dictionary::lookup(symbol s, void *v)
+{
+  int i;
+  for (i = int(s.hash() % size); 
+       table[i].v != 0;
+       i == 0 ? i = size - 1: --i)
+    if (s == table[i].s) {
+      if (v != 0) {
+	void *temp = table[i].v;
+	table[i].v = v;
+	return temp;
+      }
+      else
+	return table[i].v;
+    }
+  if (v == 0)
+    return 0;
+  ++used;
+  table[i].v = v;
+  table[i].s = s;
+  if ((double)used/(double)size >= threshold || used + 1 >= size) {
+    int old_size = size;
+    size = int(size*factor);
+    while (!is_good_size(size))
+      ++size;
+    association *old_table = table;
+    table = new association[size];
+    used = 0;
+    for (i = 0; i < old_size; i++)
+      if (old_table[i].v != 0)
+	(void)lookup(old_table[i].s, old_table[i].v);
+    a_delete old_table;
+  }
+  return 0;
+}
+
+void *dictionary::lookup(const char *p)
+{
+  symbol s(p, MUST_ALREADY_EXIST);
+  if (s.is_null())
+    return 0;
+  else
+    return lookup(s);
+}
+
+// see Knuth, Sorting and Searching, p527, Algorithm R
+  
+void *dictionary::remove(symbol s)
+{
+  // this relies on the fact that we are using linear probing
+  int i;
+  for (i = int(s.hash() % size);
+       table[i].v != 0 && s != table[i].s;
+       i == 0 ? i = size - 1: --i)
+    ;
+  void *p = table[i].v;
+  while (table[i].v != 0) {
+    table[i].v = 0;
+    int j = i;
+    int r;
+    do {
+      --i;
+      if (i < 0)
+	i = size - 1;
+      if (table[i].v == 0)
+	break;
+      r = int(table[i].s.hash() % size);
+    } while ((i <= r && r < j) || (r < j && j < i) || (j < i && i <= r));
+    table[j] = table[i];
+  }
+  if (p != 0)
+    --used;
+  return p;
+}
+
+dictionary_iterator::dictionary_iterator(dictionary &d) : dict(&d), i(0)
+{
+}
+
+int dictionary_iterator::get(symbol *sp, void **vp)
+{
+  for (; i < dict->size; i++)
+    if (dict->table[i].v) {
+      *sp = dict->table[i].s;
+      *vp = dict->table[i].v;
+      i++;
+      return 1;
+    }
+  return 0;
+}
+
+object_dictionary_iterator::object_dictionary_iterator(object_dictionary &od)
+: di(od.d)
+{
+}
+
+object::object() : rcount(0)
+{
+}
+
+object::~object()
+{
+}
+
+void object::add_reference()
+{
+  rcount += 1;
+}
+
+void object::remove_reference()
+{
+  if (--rcount == 0)
+    delete this;
+}
+
+object_dictionary::object_dictionary(int n) : d(n)
+{
+}
+
+object *object_dictionary::lookup(symbol nm)
+{
+  return (object *)d.lookup(nm);
+}
+
+void object_dictionary::define(symbol nm, object *obj)
+{
+  obj->add_reference();
+  obj = (object *)d.lookup(nm, obj);
+  if (obj)
+    obj->remove_reference();
+}
+
+void object_dictionary::rename(symbol oldnm, symbol newnm)
+{
+  object *obj = (object *)d.remove(oldnm);
+  if (obj) {
+    obj = (object *)d.lookup(newnm, obj);
+    if (obj)
+      obj->remove_reference();
+  }
+}
+
+void object_dictionary::remove(symbol nm)
+{
+  object *obj = (object *)d.remove(nm);
+  if (obj)
+    obj->remove_reference();
+}
+
+// Return non-zero if oldnm was defined.
+
+int object_dictionary::alias(symbol newnm, symbol oldnm)
+{
+  object *obj = (object *)d.lookup(oldnm);
+  if (obj) {
+    obj->add_reference();
+    obj = (object *)d.lookup(newnm, obj);
+    if (obj)
+      obj->remove_reference();
+    return 1;
+  }
+  return 0;
+}
+
diff --git a/contrib/groff/src/roff/troff/div.cpp b/contrib/groff/src/roff/troff/div.cpp
new file mode 100644
index 0000000..1bbbe45
--- /dev/null
+++ b/contrib/groff/src/roff/troff/div.cpp
@@ -0,0 +1,1182 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+// diversions
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+#include "hvunits.h"
+#include "env.h"
+#include "request.h"
+#include "node.h"
+#include "token.h"
+#include "div.h"
+#include "reg.h"
+
+int exit_started = 0;		// the exit process has started
+int done_end_macro = 0;		// the end macro (if any) has finished
+int seen_last_page_ejector = 0;	// seen the LAST_PAGE_EJECTOR cookie
+int last_page_number = 0;	// if > 0, the number of the last page
+				// specified with -o
+static int began_page_in_end_macro = 0;	// a new page was begun during the end macro
+
+static int last_post_line_extra_space = 0; // needed for \n(.a
+static int nl_reg_contents = -1;
+static int dl_reg_contents = 0;
+static int dn_reg_contents = 0;
+static int vertical_position_traps_flag = 1;
+static vunits truncated_space;
+static vunits needed_space;
+
+diversion::diversion(symbol s) 
+: prev(0), nm(s), vertical_position(V0), high_water_mark(V0),
+  no_space_mode(0), marked_place(V0)
+{
+}
+
+struct vertical_size {
+  vunits pre_extra, post_extra, pre, post;
+  vertical_size(vunits vs, vunits post_vs);
+};
+
+vertical_size::vertical_size(vunits vs, vunits post_vs)
+: pre_extra(V0), post_extra(V0), pre(vs), post(post_vs)
+{
+}
+
+void node::set_vertical_size(vertical_size *)
+{
+}
+
+void extra_size_node::set_vertical_size(vertical_size *v)
+{
+  if (n < V0) {
+    if (-n > v->pre_extra)
+      v->pre_extra = -n;
+  }
+  else if (n > v->post_extra)
+    v->post_extra = n;
+}
+
+void vertical_size_node::set_vertical_size(vertical_size *v)
+{
+  if (n < V0)
+    v->pre = -n;
+  else
+    v->post = n;
+}
+
+top_level_diversion *topdiv;
+
+diversion *curdiv;
+
+void do_divert(int append, int boxing)
+{
+  tok.skip();
+  symbol nm = get_name();
+  if (nm.is_null()) {
+    if (curdiv->prev) {
+      if (boxing) {
+	curenv->line = curdiv->saved_line;
+	curenv->width_total = curdiv->saved_width_total;
+	curenv->space_total = curdiv->saved_space_total;
+	curenv->saved_indent = curdiv->saved_saved_indent;
+	curenv->target_text_length = curdiv->saved_target_text_length;
+	curenv->prev_line_interrupted = curdiv->saved_prev_line_interrupted;
+      }
+      diversion *temp = curdiv;
+      curdiv = curdiv->prev;
+      delete temp;
+    }
+    else
+      warning(WARN_DI, "diversion stack underflow");
+  }
+  else {
+    macro_diversion *md = new macro_diversion(nm, append);
+    md->prev = curdiv;
+    curdiv = md;
+    if (boxing) {
+      curdiv->saved_line = curenv->line;
+      curdiv->saved_width_total = curenv->width_total;
+      curdiv->saved_space_total = curenv->space_total;
+      curdiv->saved_saved_indent = curenv->saved_indent;
+      curdiv->saved_target_text_length = curenv->target_text_length;
+      curdiv->saved_prev_line_interrupted = curenv->prev_line_interrupted;
+      curenv->line = 0;
+      curenv->start_line();
+    }
+  }
+  skip_line();
+}
+
+void divert()
+{
+  do_divert(0, 0);
+}
+
+void divert_append()
+{
+  do_divert(1, 0);
+}
+  
+void box()
+{
+  do_divert(0, 1);
+}
+
+void box_append()
+{
+  do_divert(1, 1);
+}
+
+void diversion::need(vunits n)
+{
+  vunits d = distance_to_next_trap();
+  if (d < n) {
+    truncated_space = -d;
+    needed_space = n;
+    space(d, 1);
+  }
+}
+
+macro_diversion::macro_diversion(symbol s, int append)
+: diversion(s), max_width(H0)
+{
+#if 0
+  if (append) {
+    /* We don't allow recursive appends eg:
+
+      .da a
+      .a
+      .di
+      
+      This causes an infinite loop in troff anyway.
+      This is because the user could do
+
+      .as a foo
+
+      in the diversion, and this would mess things up royally,
+      since there would be two things appending to the same
+      macro_header.
+      To make it work, we would have to copy the _contents_
+      of the macro into which we were diverting; this doesn't
+      strike me as worthwhile.
+      However,
+
+      .di a
+      .a
+      .a
+      .di
+
+       will work and will make `a' contain two copies of what it contained
+       before; in troff, `a' would contain nothing. */
+    request_or_macro *rm 
+      = (request_or_macro *)request_dictionary.remove(s);
+    if (!rm || (mac = rm->to_macro()) == 0)
+      mac = new macro;
+  }
+  else
+    mac = new macro;
+#endif
+  // We can now catch the situation described above by comparing
+  // the length of the charlist in the macro_header with the length
+  // stored in the macro. When we detect this, we copy the contents.
+  mac = new macro;
+  if (append) {
+    request_or_macro *rm 
+      = (request_or_macro *)request_dictionary.lookup(s);
+    if (rm) {
+      macro *m = rm->to_macro();
+      if (m)
+	*mac = *m;
+    }
+  }
+}
+
+macro_diversion::~macro_diversion()
+{
+  request_or_macro *rm = (request_or_macro *)request_dictionary.lookup(nm);
+  macro *m = rm ? rm->to_macro() : 0;
+  if (m) {
+    *m = *mac;
+    delete mac;
+  }
+  else
+    request_dictionary.define(nm, mac);
+  mac = 0;
+  dl_reg_contents = max_width.to_units();
+  dn_reg_contents = vertical_position.to_units();
+}
+
+vunits macro_diversion::distance_to_next_trap()
+{
+  if (!diversion_trap.is_null() && diversion_trap_pos > vertical_position)
+    return diversion_trap_pos - vertical_position;
+  else
+    // Substract vresolution so that vunits::vunits does not overflow.
+    return vunits(INT_MAX - vresolution);
+}
+
+void macro_diversion::transparent_output(unsigned char c)
+{
+  mac->append(c);
+}
+
+void macro_diversion::transparent_output(node *n)
+{
+  mac->append(n);
+}
+
+void macro_diversion::output(node *nd, int retain_size,
+			     vunits vs, vunits post_vs, hunits width)
+{
+  no_space_mode = 0;
+  vertical_size v(vs, post_vs);
+  while (nd != 0) {
+    nd->set_vertical_size(&v);
+    node *temp = nd;
+    nd = nd->next;
+    if (temp->interpret(mac)) {
+      delete temp;
+    }
+    else {
+#if 1
+      temp->freeze_space();
+#endif
+      mac->append(temp);
+    }
+  }
+  last_post_line_extra_space = v.post_extra.to_units();
+  if (!retain_size) {
+    v.pre = vs;
+    v.post = post_vs;
+  }
+  if (width > max_width)
+    max_width = width;
+  vunits x = v.pre + v.pre_extra + v.post + v.post_extra;
+  if (vertical_position_traps_flag
+      && !diversion_trap.is_null() && diversion_trap_pos > vertical_position
+      && diversion_trap_pos <= vertical_position + x) {
+    vunits trunc = vertical_position + x - diversion_trap_pos;
+    if (trunc > v.post)
+      trunc = v.post;
+    v.post -= trunc;
+    x -= trunc;
+    truncated_space = trunc;
+    spring_trap(diversion_trap);
+  }
+  mac->append(new vertical_size_node(-v.pre));
+  mac->append(new vertical_size_node(v.post));
+  mac->append('\n');
+  vertical_position += x;
+  if (vertical_position - v.post > high_water_mark)
+    high_water_mark = vertical_position - v.post;
+}
+
+void macro_diversion::space(vunits n, int)
+{
+  if (vertical_position_traps_flag
+      && !diversion_trap.is_null() && diversion_trap_pos > vertical_position
+      && diversion_trap_pos <= vertical_position + n) {
+    truncated_space = vertical_position + n - diversion_trap_pos;
+    n = diversion_trap_pos - vertical_position;
+    spring_trap(diversion_trap);
+  }
+  else if (n + vertical_position < V0)
+    n = -vertical_position;
+  mac->append(new diverted_space_node(n));
+  vertical_position += n;
+}
+
+void macro_diversion::copy_file(const char *filename)
+{
+  mac->append(new diverted_copy_file_node(filename));
+}
+
+top_level_diversion::top_level_diversion()
+: page_number(0), page_count(0), last_page_count(-1),
+  page_length(units_per_inch*11),
+  prev_page_offset(units_per_inch), page_offset(units_per_inch),
+  page_trap_list(0), have_next_page_number(0),
+  ejecting_page(0), before_first_page(1)
+{
+}
+
+// find the next trap after pos
+
+trap *top_level_diversion::find_next_trap(vunits *next_trap_pos)
+{
+  trap *next_trap = 0;
+  for (trap *pt = page_trap_list; pt != 0; pt = pt->next)
+    if (!pt->nm.is_null()) {
+      if (pt->position >= V0) {
+	if (pt->position > vertical_position 
+	    && pt->position < page_length
+	    && (next_trap == 0 || pt->position < *next_trap_pos)) {
+	      next_trap = pt;
+	      *next_trap_pos = pt->position;
+	    }
+      }
+      else {
+	vunits pos = pt->position;
+	pos += page_length;
+	if (pos > 0 && pos > vertical_position && (next_trap == 0 || pos < *next_trap_pos)) {
+	  next_trap = pt;
+	  *next_trap_pos = pos;
+	}
+      }
+    }
+  return next_trap;
+}
+
+vunits top_level_diversion::distance_to_next_trap()
+{
+  vunits d;
+  if (!find_next_trap(&d))
+    return page_length - vertical_position;
+  else
+    return d - vertical_position;
+}
+
+void top_level_diversion::output(node *nd, int retain_size,
+				 vunits vs, vunits post_vs, hunits width)
+{
+  no_space_mode = 0;
+  vunits next_trap_pos;
+  trap *next_trap = find_next_trap(&next_trap_pos);
+  if (before_first_page && begin_page()) 
+    fatal("sorry, I didn't manage to begin the first page in time: use an explicit .br request");
+  vertical_size v(vs, post_vs);
+  for (node *tem = nd; tem != 0; tem = tem->next)
+    tem->set_vertical_size(&v);
+  last_post_line_extra_space = v.post_extra.to_units();
+  if (!retain_size) {
+    v.pre = vs;
+    v.post = post_vs;
+  }
+  vertical_position += v.pre;
+  vertical_position += v.pre_extra;
+  the_output->print_line(page_offset, vertical_position, nd,
+			 v.pre + v.pre_extra, v.post_extra, width);
+  vertical_position += v.post_extra;
+  if (vertical_position > high_water_mark)
+    high_water_mark = vertical_position;
+  if (vertical_position_traps_flag && vertical_position >= page_length)
+    begin_page();
+  else if (vertical_position_traps_flag
+	   && next_trap != 0 && vertical_position >= next_trap_pos) {
+    nl_reg_contents = vertical_position.to_units();
+    truncated_space = v.post;
+    spring_trap(next_trap->nm);
+  }
+  else if (v.post > V0) {
+    vertical_position += v.post;
+    if (vertical_position_traps_flag
+	&& next_trap != 0 && vertical_position >= next_trap_pos) {
+      truncated_space = vertical_position - next_trap_pos;
+      vertical_position = next_trap_pos;
+      nl_reg_contents = vertical_position.to_units();
+      spring_trap(next_trap->nm);
+    }
+    else if (vertical_position_traps_flag && vertical_position >= page_length)
+      begin_page();
+    else
+      nl_reg_contents = vertical_position.to_units();
+  }
+  else
+    nl_reg_contents = vertical_position.to_units();
+}
+
+void top_level_diversion::transparent_output(unsigned char c)
+{
+  if (before_first_page && begin_page())
+    // This can only happen with the .output request.
+    fatal("sorry, I didn't manage to begin the first page in time: use an explicit .br request");
+  const char *s = asciify(c);
+  while (*s)
+    the_output->transparent_char(*s++);
+}
+
+void top_level_diversion::transparent_output(node * /*n*/)
+{
+  error("can't transparently output node at top level");
+}
+
+void top_level_diversion::copy_file(const char *filename)
+{
+  if (before_first_page && begin_page())
+    fatal("sorry, I didn't manage to begin the first page in time: use an explicit .br request");
+  the_output->copy_file(page_offset, vertical_position, filename);
+}
+
+void top_level_diversion::space(vunits n, int forced)
+{
+  if (no_space_mode) {
+    if (!forced)
+      return;
+    else
+      no_space_mode = 0;
+  }
+  if (before_first_page) {
+    begin_page(n);
+    return;
+  }
+  vunits next_trap_pos;
+  trap *next_trap = find_next_trap(&next_trap_pos);
+  vunits y = vertical_position + n;
+  if (vertical_position_traps_flag && next_trap != 0 && y >= next_trap_pos) {
+    vertical_position = next_trap_pos;
+    nl_reg_contents = vertical_position.to_units();
+    truncated_space = y - vertical_position;
+    spring_trap(next_trap->nm);
+  }
+  else if (y < V0) {
+    vertical_position = V0;
+    nl_reg_contents = vertical_position.to_units();
+  }
+  else if (vertical_position_traps_flag && y >= page_length && n >= V0)
+    begin_page(y - page_length);
+  else {
+    vertical_position = y;
+    nl_reg_contents = vertical_position.to_units();
+  }
+}
+
+trap::trap(symbol s, vunits n, trap *p)
+: next(p), position(n), nm(s)
+{
+}
+
+void top_level_diversion::add_trap(symbol nm, vunits pos)
+{
+  trap *first_free_slot = 0;
+  trap **p;
+  for (p = &page_trap_list; *p; p = &(*p)->next) {
+    if ((*p)->nm.is_null()) {
+      if (first_free_slot == 0)
+	first_free_slot = *p;
+    }
+    else if ((*p)->position == pos) {
+      (*p)->nm = nm;
+      return;
+    }
+  }
+  if (first_free_slot) {
+    first_free_slot->nm = nm;
+    first_free_slot->position = pos;
+  }
+  else
+    *p = new trap(nm, pos, 0);
+}  
+
+void top_level_diversion::remove_trap(symbol nm)
+{
+  for (trap *p = page_trap_list; p; p = p->next)
+    if (p->nm == nm) {
+      p->nm = NULL_SYMBOL;
+      return;
+    }
+}
+
+void top_level_diversion::remove_trap_at(vunits pos)
+{
+  for (trap *p = page_trap_list; p; p = p->next)
+    if (p->position == pos) {
+      p->nm = NULL_SYMBOL;
+      return;
+    }
+}
+      
+void top_level_diversion::change_trap(symbol nm, vunits pos)
+{
+  for (trap *p = page_trap_list; p; p = p->next)
+    if (p->nm == nm) {
+      p->position = pos;
+      return;
+    }
+}
+
+void top_level_diversion::print_traps()
+{
+  for (trap *p = page_trap_list; p; p = p->next)
+    if (p->nm.is_null())
+      fprintf(stderr, "  empty\n");
+    else
+      fprintf(stderr, "%s\t%d\n", p->nm.contents(), p->position.to_units());
+  fflush(stderr);
+}
+
+void end_diversions()
+{
+  while (curdiv != topdiv) {
+    error("automatically ending diversion `%1' on exit",
+	    curdiv->nm.contents());
+    diversion *tem = curdiv;
+    curdiv = curdiv->prev;
+    delete tem;
+  }
+}
+
+void cleanup_and_exit(int exit_code)
+{
+  if (the_output) {
+    the_output->trailer(topdiv->get_page_length());
+    delete the_output;
+  }
+  exit(exit_code);
+}
+
+// Returns non-zero if it sprung a top-of-page trap.
+// The optional parameter is for the .trunc register.
+int top_level_diversion::begin_page(vunits n)
+{
+  if (exit_started) {
+    if (page_count == last_page_count
+	? curenv->is_empty()
+	: (done_end_macro && (seen_last_page_ejector || began_page_in_end_macro)))
+      cleanup_and_exit(0);
+    if (!done_end_macro)
+      began_page_in_end_macro = 1;
+  }
+  if (last_page_number > 0 && page_number == last_page_number)
+    cleanup_and_exit(0);
+  if (!the_output)
+    init_output();
+  ++page_count;
+  if (have_next_page_number) {
+    page_number = next_page_number;
+    have_next_page_number = 0;
+  }
+  else if (before_first_page == 1)
+    page_number = 1;
+  else
+    page_number++;
+  // spring the top of page trap if there is one
+  vunits next_trap_pos;
+  vertical_position = -vresolution;
+  trap *next_trap = find_next_trap(&next_trap_pos);
+  vertical_position = V0;
+  high_water_mark = V0;
+  ejecting_page = 0;
+  // If before_first_page was 2, then the top of page transition was undone
+  // using eg .nr nl 0-1.  See nl_reg::set_value.
+  if (before_first_page != 2)
+    the_output->begin_page(page_number, page_length);
+  before_first_page = 0;
+  nl_reg_contents = vertical_position.to_units();
+  if (vertical_position_traps_flag && next_trap != 0 && next_trap_pos == V0) {
+    truncated_space = n;
+    spring_trap(next_trap->nm);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void continue_page_eject()
+{
+  if (topdiv->get_ejecting()) {
+    if (curdiv != topdiv)
+      error("can't continue page ejection because of current diversion");
+    else if (!vertical_position_traps_flag)
+      error("can't continue page ejection because vertical position traps disabled");
+    else {
+      push_page_ejector();
+      topdiv->space(topdiv->get_page_length(), 1);
+    }
+  }
+}
+
+void top_level_diversion::set_next_page_number(int n)
+{
+  next_page_number= n;
+  have_next_page_number = 1;
+}
+
+int top_level_diversion::get_next_page_number()
+{
+  return have_next_page_number ? next_page_number : page_number + 1;
+}
+
+void top_level_diversion::set_page_length(vunits n)
+{
+  page_length = n;
+}
+
+diversion::~diversion()
+{
+}
+
+void page_offset()
+{
+  hunits n;
+  // The troff manual says that the default scaling indicator is v,
+  // but it is in fact m: v wouldn't make sense for a horizontally
+  // oriented request.
+  if (!has_arg() || !get_hunits(&n, 'm', topdiv->page_offset))
+    n = topdiv->prev_page_offset;
+  topdiv->prev_page_offset = topdiv->page_offset;
+  topdiv->page_offset = n;
+  curenv->add_html_tag(0, ".po", n.to_units());
+  skip_line();
+}
+
+void page_length()
+{
+  vunits n;
+  if (has_arg() && get_vunits(&n, 'v', topdiv->get_page_length()))
+    topdiv->set_page_length(n);
+  else
+    topdiv->set_page_length(11*units_per_inch);
+  skip_line();
+}
+
+void when_request()
+{
+  vunits n;
+  if (get_vunits(&n, 'v')) {
+    symbol s = get_name();
+    if (s.is_null())
+      topdiv->remove_trap_at(n);
+    else
+      topdiv->add_trap(s, n);
+  }
+  skip_line();
+}
+
+void begin_page()
+{
+  int got_arg = 0;
+  int n;
+  if (has_arg() && get_integer(&n, topdiv->get_page_number()))
+    got_arg = 1;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (curdiv == topdiv) {
+    if (topdiv->before_first_page) {
+      if (!break_flag) {
+	if (got_arg)
+	  topdiv->set_next_page_number(n);
+	if (got_arg || !topdiv->no_space_mode)
+	  topdiv->begin_page();
+      }
+      else if (topdiv->no_space_mode && !got_arg)
+	topdiv->begin_page();
+      else {
+	/* Given this
+
+         .wh 0 x
+	 .de x
+	 .tm \\n%
+	 ..
+	 .bp 3
+
+	 troff prints
+
+	 1
+	 3
+
+	 This code makes groff do the same. */
+
+	push_page_ejector();
+	topdiv->begin_page();
+	if (got_arg)
+	  topdiv->set_next_page_number(n);
+	topdiv->set_ejecting();
+      }
+    }
+    else {
+      push_page_ejector();
+      if (break_flag)
+	curenv->do_break();
+      if (got_arg)
+	topdiv->set_next_page_number(n);
+      if (!(topdiv->no_space_mode && !got_arg))
+	topdiv->set_ejecting();
+    }
+  }
+  tok.next();
+}
+
+void no_space()
+{
+  curdiv->no_space_mode = 1;
+  skip_line();
+}
+
+void restore_spacing()
+{
+  curdiv->no_space_mode = 0;
+  skip_line();
+}
+
+/* It is necessary to generate a break before before reading the argument,
+because otherwise arguments using | will be wrong. But if we just
+generate a break as usual, then the line forced out may spring a trap
+and thus push a macro onto the input stack before we have had a chance
+to read the argument to the sp request. We resolve this dilemma by
+setting, before generating the break, a flag which will postpone the
+actual pushing of the macro associated with the trap sprung by the
+outputting of the line forced out by the break till after we have read
+the argument to the request.  If the break did cause a trap to be
+sprung, then we don't actually do the space. */
+
+void space_request()
+{
+  postpone_traps();
+  if (break_flag)
+    curenv->do_break();
+  vunits n;
+  if (!has_arg() || !get_vunits(&n, 'v'))
+    n = curenv->get_vertical_spacing();
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (!unpostpone_traps() && !curdiv->no_space_mode)
+    curdiv->space(n);
+  else
+    // The line might have had line spacing that was truncated.
+    truncated_space += n;
+  curenv->add_html_tag(1, ".sp", n.to_units());
+  tok.next();
+}
+
+void blank_line()
+{
+  curenv->do_break();
+  if (!trap_sprung_flag && !curdiv->no_space_mode) {
+    curdiv->space(curenv->get_vertical_spacing());
+    curenv->add_html_tag(1, ".sp", 1);
+  }
+  else
+    truncated_space += curenv->get_vertical_spacing();
+}
+
+/* need_space might spring a trap and so we must be careful that the
+BEGIN_TRAP token is not skipped over. */
+
+void need_space()
+{
+  vunits n;
+  if (!has_arg() || !get_vunits(&n, 'v'))
+    n = curenv->get_vertical_spacing();
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  curdiv->need(n);
+  tok.next();
+}
+
+void page_number()
+{
+  int n;
+
+  // the ps4html register is set if we are using -Tps
+  // to generate images for html
+  reg *r = (reg *)number_reg_dictionary.lookup("ps4html");
+  if (r == NULL)
+    if (has_arg() && get_integer(&n, topdiv->get_page_number()))
+      topdiv->set_next_page_number(n);
+  skip_line();
+}
+
+vunits saved_space;
+
+void save_vertical_space()
+{
+  vunits x;
+  if (!has_arg() || !get_vunits(&x, 'v'))
+    x = curenv->get_vertical_spacing();
+  if (curdiv->distance_to_next_trap() > x)
+    curdiv->space(x, 1);
+  else
+    saved_space = x;
+  skip_line();
+}
+
+void output_saved_vertical_space()
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (saved_space > V0)
+    curdiv->space(saved_space, 1);
+  saved_space = V0;
+  tok.next();
+}
+
+void flush_output()
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  if (the_output)
+    the_output->flush();
+  curenv->add_html_tag(1, ".fl");
+  tok.next();
+}
+
+void macro_diversion::set_diversion_trap(symbol s, vunits n)
+{
+  diversion_trap = s;
+  diversion_trap_pos = n;
+}
+
+void macro_diversion::clear_diversion_trap()
+{
+  diversion_trap = NULL_SYMBOL;
+}
+
+void top_level_diversion::set_diversion_trap(symbol, vunits)
+{
+  error("can't set diversion trap when no current diversion");
+}
+
+void top_level_diversion::clear_diversion_trap()
+{
+  error("can't set diversion trap when no current diversion");
+}
+
+void diversion_trap()
+{
+  vunits n;
+  if (has_arg() && get_vunits(&n, 'v')) {
+    symbol s = get_name();
+    if (!s.is_null())
+      curdiv->set_diversion_trap(s, n);
+    else
+      curdiv->clear_diversion_trap();
+  }
+  else
+    curdiv->clear_diversion_trap();
+  skip_line();
+}
+
+void change_trap()
+{
+  symbol s = get_name(1);
+  if (!s.is_null()) {
+    vunits x;
+    if (has_arg() && get_vunits(&x, 'v'))
+      topdiv->change_trap(s, x);
+    else
+      topdiv->remove_trap(s);
+  }
+  skip_line();
+}
+
+void print_traps()
+{
+  topdiv->print_traps();
+  skip_line();
+}
+
+void mark()
+{
+  symbol s = get_name();
+  if (s.is_null())
+    curdiv->marked_place = curdiv->get_vertical_position();
+  else if (curdiv == topdiv)
+    set_number_reg(s, nl_reg_contents);
+  else
+    set_number_reg(s, curdiv->get_vertical_position().to_units());
+  skip_line();
+}
+
+// This is truly bizarre.  It is documented in the SQ manual.
+
+void return_request()
+{
+  vunits dist = curdiv->marked_place - curdiv->get_vertical_position();
+  if (has_arg()) {
+    if (tok.ch() == '-') {
+      tok.next();
+      vunits x;
+      if (get_vunits(&x, 'v'))
+	dist = -x;
+    }
+    else {
+      vunits x;
+      if (get_vunits(&x, 'v'))
+	dist = x >= V0 ? x - curdiv->get_vertical_position() : V0;
+    }
+  }
+  if (dist < V0)
+    curdiv->space(dist);
+  skip_line();
+}
+
+void vertical_position_traps()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    vertical_position_traps_flag = (n != 0);
+  else
+    vertical_position_traps_flag = 1;
+  skip_line();
+}
+
+class page_offset_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+  
+int page_offset_reg::get_value(units *res)
+{
+  *res = topdiv->get_page_offset().to_units();
+  return 1;
+}
+
+const char *page_offset_reg::get_string()
+{
+  return i_to_a(topdiv->get_page_offset().to_units());
+}
+
+class page_length_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+  
+int page_length_reg::get_value(units *res)
+{
+  *res = topdiv->get_page_length().to_units();
+  return 1;
+}
+
+const char *page_length_reg::get_string()
+{
+  return i_to_a(topdiv->get_page_length().to_units());
+}
+
+class vertical_position_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+  
+int vertical_position_reg::get_value(units *res)
+{
+  if (curdiv == topdiv && topdiv->before_first_page)
+    *res = -1;
+  else
+    *res = curdiv->get_vertical_position().to_units();
+  return 1;
+}
+
+const char *vertical_position_reg::get_string()
+{
+  if (curdiv == topdiv && topdiv->before_first_page)
+    return "-1";
+  else
+    return i_to_a(curdiv->get_vertical_position().to_units());
+}
+
+class high_water_mark_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+  
+int high_water_mark_reg::get_value(units *res)
+{
+  *res = curdiv->get_high_water_mark().to_units();
+  return 1;
+}
+
+const char *high_water_mark_reg::get_string()
+{
+  return i_to_a(curdiv->get_high_water_mark().to_units());
+}
+
+class distance_to_next_trap_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+  
+int distance_to_next_trap_reg::get_value(units *res)
+{
+  *res = curdiv->distance_to_next_trap().to_units();
+  return 1;
+}
+
+const char *distance_to_next_trap_reg::get_string()
+{
+  return i_to_a(curdiv->distance_to_next_trap().to_units());
+}
+
+class diversion_name_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *diversion_name_reg::get_string()
+{
+  return curdiv->get_diversion_name();
+}
+
+class page_number_reg : public general_reg {
+public:
+  page_number_reg();
+  int get_value(units *);
+  void set_value(units);
+};
+
+page_number_reg::page_number_reg()
+{
+}
+
+void page_number_reg::set_value(units n)
+{
+  topdiv->set_page_number(n);
+}
+
+int page_number_reg::get_value(units *res)
+{
+  *res = topdiv->get_page_number();
+  return 1;
+}
+
+class next_page_number_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *next_page_number_reg::get_string()
+{
+  return i_to_a(topdiv->get_next_page_number());
+}
+
+class page_ejecting_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *page_ejecting_reg::get_string()
+{
+  return i_to_a(topdiv->get_ejecting());
+}
+
+class constant_vunits_reg : public reg {
+  vunits *p;
+public:
+  constant_vunits_reg(vunits *);
+  const char *get_string();
+};
+
+constant_vunits_reg::constant_vunits_reg(vunits *q) : p(q)
+{
+}
+
+const char *constant_vunits_reg::get_string()
+{
+  return i_to_a(p->to_units());
+}
+
+class nl_reg : public variable_reg {
+public:
+  nl_reg();
+  void set_value(units);
+};
+
+nl_reg::nl_reg() : variable_reg(&nl_reg_contents)
+{
+}
+
+void nl_reg::set_value(units n)
+{
+  variable_reg::set_value(n);
+  // Setting nl to a negative value when the vertical position in
+  // the top-level diversion is 0 undoes the top of page transition,
+  // so that the header macro will be called as if the top of page
+  // transition hasn't happened.  This is used by Larry Wall's
+  // wrapman program.  Setting before_first_page to 2 rather than 1,
+  // tells top_level_diversion::begin_page not to call
+  // output_file::begin_page again.
+  if (n < 0 && topdiv->get_vertical_position() == V0)
+    topdiv->before_first_page = 2;
+}
+
+class no_space_mode_reg : public reg {
+public:
+  int get_value(units *);
+  const char *get_string();
+};
+
+int no_space_mode_reg::get_value(units *val)
+{
+  *val = curdiv->no_space_mode;
+  return 1;
+}
+
+const char *no_space_mode_reg::get_string()
+{
+  return curdiv->no_space_mode ? "1" : "0";
+}
+
+void init_div_requests()
+{
+  init_request("box", box);
+  init_request("boxa", box_append);
+  init_request("bp", begin_page);
+  init_request("ch", change_trap);
+  init_request("da", divert_append);
+  init_request("di", divert);
+  init_request("dt", diversion_trap);
+  init_request("fl", flush_output);
+  init_request("mk", mark);
+  init_request("ne", need_space);
+  init_request("ns", no_space);
+  init_request("os", output_saved_vertical_space);
+  init_request("pl", page_length);
+  init_request("pn", page_number);
+  init_request("po", page_offset);
+  init_request("ptr", print_traps);
+  init_request("rs", restore_spacing);
+  init_request("rt", return_request);
+  init_request("sp", space_request);
+  init_request("sv", save_vertical_space);
+  init_request("vpt", vertical_position_traps);
+  init_request("wh", when_request);
+  number_reg_dictionary.define(".a",
+		       new constant_int_reg(&last_post_line_extra_space));
+  number_reg_dictionary.define(".d", new vertical_position_reg);
+  number_reg_dictionary.define(".h", new high_water_mark_reg);
+  number_reg_dictionary.define(".ne",
+			       new constant_vunits_reg(&needed_space));
+  number_reg_dictionary.define(".ns", new no_space_mode_reg);
+  number_reg_dictionary.define(".o", new page_offset_reg);
+  number_reg_dictionary.define(".p", new page_length_reg);
+  number_reg_dictionary.define(".pe", new page_ejecting_reg);
+  number_reg_dictionary.define(".pn", new next_page_number_reg);
+  number_reg_dictionary.define(".t", new distance_to_next_trap_reg);
+  number_reg_dictionary.define(".trunc",
+			       new constant_vunits_reg(&truncated_space));
+  number_reg_dictionary.define(".vpt", 
+		       new constant_int_reg(&vertical_position_traps_flag));
+  number_reg_dictionary.define(".z", new diversion_name_reg);
+  number_reg_dictionary.define("dl", new variable_reg(&dl_reg_contents));
+  number_reg_dictionary.define("dn", new variable_reg(&dn_reg_contents));
+  number_reg_dictionary.define("nl", new nl_reg);
+  number_reg_dictionary.define("%", new page_number_reg);
+}
diff --git a/contrib/groff/src/roff/troff/div.h b/contrib/groff/src/roff/troff/div.h
index 31b9af3..bde41a8 100644
--- a/contrib/groff/src/roff/troff/div.h
+++ b/contrib/groff/src/roff/troff/div.h
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -123,7 +124,7 @@ public:
   int get_page_number() { return page_number; }
   int get_next_page_number();
   void set_page_number(int n) { page_number = n; }
-  int begin_page();
+  int begin_page(vunits = V0);
   void set_next_page_number(int);
   void set_page_length(vunits);
   void copy_file(const char *filename);
diff --git a/contrib/groff/src/roff/troff/env.cpp b/contrib/groff/src/roff/troff/env.cpp
new file mode 100644
index 0000000..264b441
--- /dev/null
+++ b/contrib/groff/src/roff/troff/env.cpp
@@ -0,0 +1,3818 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+#include "hvunits.h"
+#include "env.h"
+#include "request.h"
+#include "node.h"
+#include "token.h"
+#include "div.h"
+#include "reg.h"
+#include "charinfo.h"
+#include "macropath.h"
+#include "input.h"
+#include <math.h>
+
+symbol default_family("T");
+
+enum { ADJUST_LEFT = 0, ADJUST_BOTH = 1, ADJUST_CENTER = 3, ADJUST_RIGHT = 5 };
+
+enum { HYPHEN_LAST_LINE = 2, HYPHEN_LAST_CHARS = 4, HYPHEN_FIRST_CHARS = 8 };
+
+struct env_list {
+  environment *env;
+  env_list *next;
+  env_list(environment *e, env_list *p) : env(e), next(p) {}
+};
+
+env_list *env_stack;
+const int NENVIRONMENTS = 10;
+environment *env_table[NENVIRONMENTS];
+dictionary env_dictionary(10);
+environment *curenv;
+static int next_line_number = 0;
+
+charinfo *field_delimiter_char;
+charinfo *padding_indicator_char;
+
+int translate_space_to_dummy = 0;
+
+class pending_output_line {
+  node *nd;
+  int no_fill;
+  vunits vs;
+  vunits post_vs;
+  hunits width;
+#ifdef WIDOW_CONTROL
+  int last_line;		// Is it the last line of the paragraph?
+#endif /* WIDOW_CONTROL */
+public:
+  pending_output_line *next;
+
+  pending_output_line(node *, int, vunits, vunits, hunits,
+		      pending_output_line * = 0);
+  ~pending_output_line();
+  int output();
+
+#ifdef WIDOW_CONTROL
+  friend void environment::mark_last_line();
+  friend void environment::output(node *, int, vunits, vunits, hunits);
+#endif /* WIDOW_CONTROL */
+};
+
+pending_output_line::pending_output_line(node *n, int nf, vunits v, vunits pv,
+					 hunits w, pending_output_line *p)
+: nd(n), no_fill(nf), vs(v), post_vs(pv), width(w),
+#ifdef WIDOW_CONTROL
+  last_line(0),
+#endif /* WIDOW_CONTROL */
+  next(p)
+{
+}
+
+pending_output_line::~pending_output_line()
+{
+  delete_node_list(nd);
+}
+
+int pending_output_line::output()
+{
+  if (trap_sprung_flag)
+    return 0;
+#ifdef WIDOW_CONTROL
+  if (next && next->last_line && !no_fill) {
+    curdiv->need(vs + post_vs + vunits(vresolution));
+    if (trap_sprung_flag) {
+      next->last_line = 0;	// Try to avoid infinite loops.
+      return 0;
+    }
+  }
+#endif
+  curdiv->output(nd, no_fill, vs, post_vs, width);
+  nd = 0;
+  return 1;
+}
+
+void environment::output(node *nd, int no_fill, vunits vs, vunits post_vs,
+			 hunits width)
+{
+#ifdef WIDOW_CONTROL
+  while (pending_lines) {
+    if (widow_control && !pending_lines->no_fill && !pending_lines->next)
+      break;
+    if (!pending_lines->output())
+      break;
+    pending_output_line *tem = pending_lines;
+    pending_lines = pending_lines->next;
+    delete tem;
+  }
+#else /* WIDOW_CONTROL */
+  output_pending_lines();
+#endif /* WIDOW_CONTROL */
+  if (!trap_sprung_flag && !pending_lines
+#ifdef WIDOW_CONTROL
+      && (!widow_control || no_fill)
+#endif /* WIDOW_CONTROL */
+      ) {
+    curdiv->output(nd, no_fill, vs, post_vs, width);
+    emitted_node = 1;
+  } else {
+    pending_output_line **p;
+    for (p = &pending_lines; *p; p = &(*p)->next)
+      ;
+    *p = new pending_output_line(nd, no_fill, vs, post_vs, width);
+  }
+}
+
+// a line from .tl goes at the head of the queue
+
+void environment::output_title(node *nd, int no_fill, vunits vs,
+			       vunits post_vs, hunits width)
+{
+  if (!trap_sprung_flag)
+    curdiv->output(nd, no_fill, vs, post_vs, width);
+  else
+    pending_lines = new pending_output_line(nd, no_fill, vs, post_vs, width,
+					    pending_lines);
+}
+
+void environment::output_pending_lines()
+{
+  while (pending_lines && pending_lines->output()) {
+    pending_output_line *tem = pending_lines;
+    pending_lines = pending_lines->next;
+    delete tem;
+  }
+}
+
+#ifdef WIDOW_CONTROL
+
+void environment::mark_last_line()
+{
+  if (!widow_control || !pending_lines)
+    return;
+  for (pending_output_line *p = pending_lines; p->next; p = p->next)
+    ;
+  if (!p->no_fill)
+    p->last_line = 1;
+}
+
+void widow_control_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->widow_control = n != 0;
+  else
+    curenv->widow_control = 1;
+  skip_line();
+}
+
+#endif /* WIDOW_CONTROL */
+
+/* font_size functions */
+
+size_range *font_size::size_table = 0;
+int font_size::nranges = 0;
+
+extern "C" {
+
+int compare_ranges(const void *p1, const void *p2)
+{
+  return ((size_range *)p1)->min - ((size_range *)p2)->min;
+}
+
+}
+
+void font_size::init_size_table(int *sizes)
+{
+  nranges = 0;
+  while (sizes[nranges*2] != 0)
+    nranges++;
+  assert(nranges > 0);
+  size_table = new size_range[nranges];
+  for (int i = 0; i < nranges; i++) {
+    size_table[i].min = sizes[i*2];
+    size_table[i].max = sizes[i*2 + 1];
+  }
+  qsort(size_table, nranges, sizeof(size_range), compare_ranges);
+}
+
+font_size::font_size(int sp)
+{
+  for (int i = 0; i < nranges; i++) {
+    if (sp < size_table[i].min) {
+      if (i > 0 && size_table[i].min - sp >= sp - size_table[i - 1].max)
+	p = size_table[i - 1].max;
+      else
+	p = size_table[i].min;
+      return;
+    }
+    if (sp <= size_table[i].max) {
+      p = sp;
+      return;
+    }
+  }
+  p = size_table[nranges - 1].max;
+}
+
+int font_size::to_units()
+{
+  return scale(p, units_per_inch, sizescale*72);
+}
+
+// we can't do this in a static constructor because various dictionaries
+// have to get initialized first
+
+void init_environments()
+{
+  curenv = env_table[0] = new environment("0");
+}
+
+void tab_character()
+{
+  curenv->tab_char = get_optional_char();
+  skip_line();
+}
+
+void leader_character()
+{
+  curenv->leader_char = get_optional_char();
+  skip_line();
+}
+
+void environment::add_char(charinfo *ci)
+{
+  int s;
+  if (interrupted)
+    ;
+  // don't allow fields in dummy environments
+  else if (ci == field_delimiter_char && !dummy) {
+    if (current_field)
+      wrap_up_field();
+    else
+      start_field();
+  }
+  else if (current_field && ci == padding_indicator_char)
+    add_padding();
+  else if (current_tab) {
+    if (tab_contents == 0)
+      tab_contents = new line_start_node;
+    if (ci != hyphen_indicator_char)
+      tab_contents = tab_contents->add_char(ci, this, &tab_width, &s);
+    else
+      tab_contents = tab_contents->add_discretionary_hyphen();
+  }
+  else {
+    if (line == 0)
+      start_line();
+    if (ci != hyphen_indicator_char)
+      line = line->add_char(ci, this, &width_total, &space_total);
+    else
+      line = line->add_discretionary_hyphen();
+  }
+}
+
+node *environment::make_char_node(charinfo *ci)
+{
+  return make_node(ci, this);
+}
+
+void environment::add_node(node *n)
+{
+  if (n == 0)
+    return;
+  if (current_tab || current_field)
+    n->freeze_space();
+  if (interrupted) {
+    delete n;
+  }
+  else if (current_tab) {
+    n->next = tab_contents;
+    tab_contents = n;
+    tab_width += n->width();
+  }
+  else {
+    if (line == 0) {
+      if (discarding && n->discardable()) {
+	// XXX possibly: input_line_start -= n->width();
+	delete n;
+	return;
+      }
+      start_line();
+    }
+    width_total += n->width();
+    space_total += n->nspaces();
+    n->next = line;
+    line = n;
+  }
+}
+
+
+void environment::add_hyphen_indicator()
+{
+  if (current_tab || interrupted || current_field
+      || hyphen_indicator_char != 0)
+    return;
+  if (line == 0)
+    start_line();
+  line = line->add_discretionary_hyphen();
+}
+
+int environment::get_hyphenation_flags()
+{
+  return hyphenation_flags;
+}
+
+int environment::get_hyphen_line_max()
+{
+  return hyphen_line_max;
+}
+
+int environment::get_hyphen_line_count()
+{
+  return hyphen_line_count;
+}
+
+int environment::get_center_lines()
+{
+  return center_lines;
+}
+
+int environment::get_right_justify_lines()
+{
+  return right_justify_lines;
+}
+
+void environment::add_italic_correction()
+{
+  if (current_tab) {
+    if (tab_contents)
+      tab_contents = tab_contents->add_italic_correction(&tab_width);
+  }
+  else if (line)
+    line = line->add_italic_correction(&width_total);
+}
+
+void environment::space_newline()
+{
+  assert(!current_tab && !current_field);
+  if (interrupted)
+    return;
+  hunits x = H0;
+  hunits sw = env_space_width(this);
+  hunits ssw = env_sentence_space_width(this);
+  if (!translate_space_to_dummy) {
+    x = sw;
+    if (node_list_ends_sentence(line) == 1)
+      x += ssw;
+  }
+  width_list *w = new width_list(sw, ssw);
+  if (node_list_ends_sentence(line) == 1)
+    w->next = new width_list(sw, ssw);
+  if (line != 0 && line->merge_space(x, sw, ssw)) {
+    width_total += x;
+    return;
+  }
+  add_node(new word_space_node(x, get_fill_color(), w));
+  possibly_break_line(0, spread_flag);
+  spread_flag = 0;
+}
+
+void environment::space()
+{
+  space(env_space_width(this), env_sentence_space_width(this));
+}
+
+void environment::space(hunits space_width, hunits sentence_space_width)
+{
+  if (interrupted)
+    return;
+  if (current_field && padding_indicator_char == 0) {
+    add_padding();
+    return;
+  }
+  hunits x = translate_space_to_dummy ? H0 : space_width;
+  node *p = current_tab ? tab_contents : line;
+  hunits *tp = current_tab ? &tab_width : &width_total;
+  if (p && p->nspaces() == 1 && p->width() == x
+      && node_list_ends_sentence(p->next) == 1) {
+    hunits xx = translate_space_to_dummy ? H0 : sentence_space_width;
+    if (p->merge_space(xx, space_width, sentence_space_width)) {
+      *tp += xx;
+      return;
+    }
+  }
+  if (p && p->merge_space(x, space_width, sentence_space_width)) {
+    *tp += x;
+    return;
+  }
+  add_node(new word_space_node(x,
+			       get_fill_color(),
+			       new width_list(space_width,
+					      sentence_space_width)));
+  possibly_break_line(0, spread_flag);
+  spread_flag = 0;
+}
+
+node *do_underline_special(int);
+
+void environment::set_font(symbol nm)
+{
+  if (interrupted)
+    return;
+  if (nm == symbol("P") || nm.is_empty()) {
+    if (family->make_definite(prev_fontno) < 0)
+      return;
+    int tem = fontno;
+    fontno = prev_fontno;
+    prev_fontno = tem;
+  }
+  else {
+    prev_fontno = fontno;
+    int n = symbol_fontno(nm);
+    if (n < 0) {
+      n = next_available_font_position();
+      if (!mount_font(n, nm))
+	return;
+    }
+    if (family->make_definite(n) < 0)
+      return;
+    fontno = n;
+  }
+  if (underline_spaces && fontno != prev_fontno) {
+    if (fontno == get_underline_fontno())
+      add_node(do_underline_special(1));
+    if (prev_fontno == get_underline_fontno())
+      add_node(do_underline_special(0));
+  }
+}
+
+void environment::set_font(int n)
+{
+  if (interrupted)
+    return;
+  if (is_good_fontno(n)) {
+    prev_fontno = fontno;
+    fontno = n;
+  }
+  else
+    warning(WARN_FONT, "bad font number");
+}
+
+void environment::set_family(symbol fam)
+{
+  if (interrupted)
+    return;
+  if (fam.is_null() || fam.is_empty()) {
+    if (prev_family->make_definite(fontno) < 0)
+      return;
+    font_family *tem = family;
+    family = prev_family;
+    prev_family = tem;
+  }
+  else {
+    font_family *f = lookup_family(fam);
+    if (f->make_definite(fontno) < 0)
+      return;
+    prev_family = family;
+    family = f;
+  }
+}
+
+void environment::set_size(int n)
+{
+  if (interrupted)
+    return;
+  if (n == 0) {
+    font_size temp = prev_size;
+    prev_size = size;
+    size = temp;
+    int temp2 = prev_requested_size;
+    prev_requested_size = requested_size;
+    requested_size = temp2;
+  }
+  else {
+    prev_size = size;
+    size = font_size(n);
+    prev_requested_size = requested_size;
+    requested_size = n;
+  }
+}
+
+void environment::set_char_height(int n)
+{
+  if (interrupted)
+    return;
+  if (n == requested_size || n <= 0)
+    char_height = 0;
+  else
+    char_height = n;
+}
+
+void environment::set_char_slant(int n)
+{
+  if (interrupted)
+    return;
+  char_slant = n;
+}
+
+color *environment::get_prev_glyph_color()
+{
+  return prev_glyph_color;
+}
+
+color *environment::get_glyph_color()
+{
+  return glyph_color;
+}
+
+color *environment::get_prev_fill_color()
+{
+  return prev_fill_color;
+}
+
+color *environment::get_fill_color()
+{
+  return fill_color;
+}
+
+void environment::set_glyph_color(color *c)
+{
+  if (interrupted)
+    return;
+  curenv->prev_glyph_color = curenv->glyph_color;
+  curenv->glyph_color = c;
+}
+
+void environment::set_fill_color(color *c)
+{
+  if (interrupted)
+    return;
+  curenv->prev_fill_color = curenv->fill_color;
+  curenv->fill_color = c;
+}
+
+environment::environment(symbol nm)
+: dummy(0),
+  prev_line_length((units_per_inch*13)/2),
+  line_length((units_per_inch*13)/2),
+  prev_title_length((units_per_inch*13)/2),
+  title_length((units_per_inch*13)/2),
+  prev_size(sizescale*10),
+  size(sizescale*10),
+  requested_size(sizescale*10),
+  prev_requested_size(sizescale*10),
+  char_height(0),
+  char_slant(0),
+  space_size(12),
+  sentence_space_size(12),
+  adjust_mode(ADJUST_BOTH),
+  fill(1),
+  interrupted(0),
+  prev_line_interrupted(0),
+  center_lines(0),
+  right_justify_lines(0),
+  prev_vertical_spacing(points_to_units(12)),
+  vertical_spacing(points_to_units(12)),
+  prev_post_vertical_spacing(0),
+  post_vertical_spacing(0),
+  prev_line_spacing(1),
+  line_spacing(1),
+  prev_indent(0),
+  indent(0),
+  temporary_indent(0),
+  have_temporary_indent(0),
+  underline_lines(0),
+  underline_spaces(0),
+  input_trap_count(0),
+  continued_input_trap(0),
+  line(0),
+  prev_text_length(0),
+  width_total(0),
+  space_total(0),
+  input_line_start(0),
+  tabs(units_per_inch/2, TAB_LEFT),
+  line_tabs(0),
+  current_tab(TAB_NONE),
+  leader_node(0),
+  tab_char(0),
+  leader_char(charset_table['.']),
+  current_field(0),
+  discarding(0),
+  spread_flag(0),
+  margin_character_flags(0),
+  margin_character_node(0),
+  margin_character_distance(points_to_units(10)),
+  numbering_nodes(0),
+  number_text_separation(1),
+  line_number_indent(0),
+  line_number_multiple(1),
+  no_number_count(0),
+  hyphenation_flags(1),
+  hyphen_line_count(0),
+  hyphen_line_max(-1),
+  hyphenation_space(H0),
+  hyphenation_margin(H0),
+  composite(0),
+  pending_lines(0),
+#ifdef WIDOW_CONTROL
+  widow_control(0),
+#endif /* WIDOW_CONTROL */
+  ignore_next_eol(0),
+  emitted_node(0),
+  glyph_color(&default_color),
+  prev_glyph_color(&default_color),
+  fill_color(&default_color),
+  prev_fill_color(&default_color),
+  name(nm),
+  control_char('.'),
+  no_break_control_char('\''),
+  hyphen_indicator_char(0)
+{
+  prev_family = family = lookup_family(default_family);
+  prev_fontno = fontno = 1;
+  if (!is_good_fontno(1))
+    fatal("font number 1 not a valid font");
+  if (family->make_definite(1) < 0)
+    fatal("invalid default family `%1'", default_family.contents());
+  prev_fontno = fontno;
+}
+
+environment::environment(const environment *e)
+: dummy(1),
+  prev_line_length(e->prev_line_length),
+  line_length(e->line_length),
+  prev_title_length(e->prev_title_length),
+  title_length(e->title_length),
+  prev_size(e->prev_size),
+  size(e->size),
+  requested_size(e->requested_size),
+  prev_requested_size(e->prev_requested_size),
+  char_height(e->char_height),
+  char_slant(e->char_slant),
+  prev_fontno(e->prev_fontno),
+  fontno(e->fontno),
+  prev_family(e->prev_family),
+  family(e->family),
+  space_size(e->space_size),
+  sentence_space_size(e->sentence_space_size),
+  adjust_mode(e->adjust_mode),
+  fill(e->fill),
+  interrupted(0),
+  prev_line_interrupted(0),
+  center_lines(0),
+  right_justify_lines(0),
+  prev_vertical_spacing(e->prev_vertical_spacing),
+  vertical_spacing(e->vertical_spacing),
+  prev_post_vertical_spacing(e->prev_post_vertical_spacing),
+  post_vertical_spacing(e->post_vertical_spacing),
+  prev_line_spacing(e->prev_line_spacing),
+  line_spacing(e->line_spacing),
+  prev_indent(e->prev_indent),
+  indent(e->indent),
+  temporary_indent(0),
+  have_temporary_indent(0),
+  underline_lines(0),
+  underline_spaces(0),
+  input_trap_count(0),
+  continued_input_trap(0),
+  line(0),
+  prev_text_length(e->prev_text_length),
+  width_total(0),
+  space_total(0),
+  input_line_start(0),
+  tabs(e->tabs),
+  line_tabs(e->line_tabs),
+  current_tab(TAB_NONE),
+  leader_node(0),
+  tab_char(e->tab_char),
+  leader_char(e->leader_char),
+  current_field(0),
+  discarding(0),
+  spread_flag(0),
+  margin_character_flags(e->margin_character_flags),
+  margin_character_node(e->margin_character_node),
+  margin_character_distance(e->margin_character_distance),
+  numbering_nodes(0),
+  number_text_separation(e->number_text_separation),
+  line_number_indent(e->line_number_indent),
+  line_number_multiple(e->line_number_multiple),
+  no_number_count(e->no_number_count),
+  hyphenation_flags(e->hyphenation_flags),
+  hyphen_line_count(0),
+  hyphen_line_max(e->hyphen_line_max),
+  hyphenation_space(e->hyphenation_space),
+  hyphenation_margin(e->hyphenation_margin),
+  composite(0),
+  pending_lines(0),
+#ifdef WIDOW_CONTROL
+  widow_control(e->widow_control),
+#endif /* WIDOW_CONTROL */
+  ignore_next_eol(0),
+  emitted_node(0),
+  glyph_color(e->glyph_color),
+  prev_glyph_color(e->prev_glyph_color),
+  fill_color(e->fill_color),
+  prev_fill_color(e->prev_fill_color),
+  name(e->name),		// so that eg `.if "\n[.ev]"0"' works
+  control_char(e->control_char),
+  no_break_control_char(e->no_break_control_char),
+  hyphen_indicator_char(e->hyphen_indicator_char)
+{
+}
+
+void environment::copy(const environment *e)
+{
+  prev_line_length = e->prev_line_length;
+  line_length = e->line_length;
+  prev_title_length = e->prev_title_length;
+  title_length = e->title_length;
+  prev_size = e->prev_size;
+  size = e->size;
+  prev_requested_size = e->prev_requested_size;
+  requested_size = e->requested_size;
+  char_height = e->char_height;
+  char_slant = e->char_slant;
+  space_size = e->space_size;
+  sentence_space_size = e->sentence_space_size;
+  adjust_mode = e->adjust_mode;
+  fill = e->fill;
+  interrupted = 0;
+  prev_line_interrupted = 0;
+  center_lines = 0;
+  right_justify_lines = 0;
+  prev_vertical_spacing = e->prev_vertical_spacing;
+  vertical_spacing = e->vertical_spacing;
+  prev_post_vertical_spacing = e->prev_post_vertical_spacing,
+  post_vertical_spacing = e->post_vertical_spacing,
+  prev_line_spacing = e->prev_line_spacing;
+  line_spacing = e->line_spacing;
+  prev_indent = e->prev_indent;
+  indent = e->indent;
+  have_temporary_indent = 0;
+  temporary_indent = 0;
+  underline_lines = 0;
+  underline_spaces = 0;
+  input_trap_count = 0;
+  continued_input_trap = 0;
+  prev_text_length = e->prev_text_length;
+  width_total = 0;
+  space_total = 0;
+  input_line_start = 0;
+  control_char = e->control_char;
+  no_break_control_char = e->no_break_control_char;
+  hyphen_indicator_char = e->hyphen_indicator_char;
+  spread_flag = 0;
+  line = 0;
+  pending_lines = 0;
+  discarding = 0;
+  tabs = e->tabs;
+  line_tabs = e->line_tabs;
+  current_tab = TAB_NONE;
+  current_field = 0;
+  margin_character_flags = e->margin_character_flags;
+  margin_character_node = e->margin_character_node;
+  margin_character_distance = e->margin_character_distance;
+  numbering_nodes = 0;
+  number_text_separation = e->number_text_separation;
+  line_number_multiple = e->line_number_multiple;
+  line_number_indent = e->line_number_indent;
+  no_number_count = e->no_number_count;
+  tab_char = e->tab_char;
+  leader_char = e->leader_char;
+  hyphenation_flags = e->hyphenation_flags;
+  fontno = e->fontno;
+  prev_fontno = e->prev_fontno;
+  dummy = e->dummy;
+  family = e->family;
+  prev_family = e->prev_family;
+  leader_node = 0;
+#ifdef WIDOW_CONTROL
+  widow_control = e->widow_control;
+#endif /* WIDOW_CONTROL */
+  hyphen_line_max = e->hyphen_line_max;
+  hyphen_line_count = 0;
+  hyphenation_space = e->hyphenation_space;
+  hyphenation_margin = e->hyphenation_margin;
+  composite = 0;
+  ignore_next_eol = e->ignore_next_eol;
+  emitted_node = e->emitted_node;
+  glyph_color= e->glyph_color;
+  prev_glyph_color = e->prev_glyph_color;
+  fill_color = e->fill_color;
+  prev_fill_color = e->prev_fill_color;
+}
+
+environment::~environment()
+{
+  delete leader_node;
+  delete_node_list(line);
+  delete_node_list(numbering_nodes);
+}
+
+hunits environment::get_input_line_position()
+{
+  hunits n;
+  if (line == 0)
+    n = -input_line_start;
+  else
+    n = width_total - input_line_start;
+  if (current_tab)
+    n += tab_width;
+  return n;
+}
+
+void environment::set_input_line_position(hunits n)
+{
+  input_line_start = line == 0 ? -n : width_total - n;
+  if (current_tab)
+    input_line_start += tab_width;
+}
+
+hunits environment::get_line_length()
+{
+  return line_length;
+}
+
+hunits environment::get_saved_line_length()
+{
+  if (line)
+    return target_text_length + saved_indent;
+  else
+    return line_length;
+}
+
+vunits environment::get_vertical_spacing()
+{
+  return vertical_spacing;
+}
+
+vunits environment::get_post_vertical_spacing()
+{
+  return post_vertical_spacing;
+}
+
+int environment::get_line_spacing()
+{
+  return line_spacing;
+}
+
+vunits environment::total_post_vertical_spacing()
+{
+  vunits tem(post_vertical_spacing);
+  if (line_spacing > 1)
+    tem += (line_spacing - 1)*vertical_spacing;
+  return tem;
+}
+
+int environment::get_bold()
+{
+  return get_bold_fontno(fontno);
+}
+
+hunits environment::get_digit_width()
+{
+  return env_digit_width(this);
+} 
+
+int environment::get_adjust_mode()
+{
+  return adjust_mode;
+}
+
+int environment::get_fill()
+{
+  return fill;
+}
+
+hunits environment::get_indent()
+{
+  return indent;
+}
+
+hunits environment::get_saved_indent()
+{
+  if (line)
+    return saved_indent;
+  else if (have_temporary_indent)
+    return temporary_indent;
+  else
+    return indent;
+}
+
+hunits environment::get_temporary_indent()
+{
+  return temporary_indent;
+}
+
+hunits environment::get_title_length()
+{
+  return title_length;
+}
+
+node *environment::get_prev_char()
+{
+  for (node *n = current_tab ? tab_contents : line; n; n = n->next) {
+    node *last = n->last_char_node();
+    if (last)
+      return last;
+  }
+  return 0;
+}
+
+hunits environment::get_prev_char_width()
+{
+  node *last = get_prev_char();
+  if (!last)
+    return H0;
+  return last->width();
+}
+
+hunits environment::get_prev_char_skew()
+{
+  node *last = get_prev_char();
+  if (!last)
+    return H0;
+  return last->skew();
+}
+
+vunits environment::get_prev_char_height()
+{
+  node *last = get_prev_char();
+  if (!last)
+    return V0;
+  vunits min, max;
+  last->vertical_extent(&min, &max);
+  return -min;
+}
+
+vunits environment::get_prev_char_depth()
+{
+  node *last = get_prev_char();
+  if (!last)
+    return V0;
+  vunits min, max;
+  last->vertical_extent(&min, &max);
+  return max;
+}
+
+hunits environment::get_text_length()
+{
+  hunits n = line == 0 ? H0 : width_total;
+  if (current_tab)
+    n += tab_width;
+  return n;
+}
+
+hunits environment::get_prev_text_length()
+{
+  return prev_text_length;
+}
+
+
+static int sb_reg_contents = 0;
+static int st_reg_contents = 0;
+static int ct_reg_contents = 0;
+static int rsb_reg_contents = 0;
+static int rst_reg_contents = 0;
+static int skw_reg_contents = 0;
+static int ssc_reg_contents = 0;
+
+void environment::width_registers()
+{
+  // this is used to implement \w; it sets the st, sb, ct registers
+  vunits min = 0, max = 0, cur = 0;
+  int character_type = 0;
+  ssc_reg_contents = line ? line->subscript_correction().to_units() : 0;
+  skw_reg_contents = line ? line->skew().to_units() : 0;
+  line = reverse_node_list(line);
+  vunits real_min = V0;
+  vunits real_max = V0;
+  vunits v1, v2;
+  for (node *tem = line; tem; tem = tem->next) {
+    tem->vertical_extent(&v1, &v2);
+    v1 += cur;
+    if (v1 < real_min)
+      real_min = v1;
+    v2 += cur;
+    if (v2 > real_max)
+      real_max = v2;
+    if ((cur += tem->vertical_width()) < min)
+      min = cur;
+    else if (cur > max)
+      max = cur;
+    character_type |= tem->character_type();
+  }
+  line = reverse_node_list(line);
+  st_reg_contents = -min.to_units();
+  sb_reg_contents = -max.to_units();
+  rst_reg_contents = -real_min.to_units();
+  rsb_reg_contents = -real_max.to_units();
+  ct_reg_contents = character_type;
+}
+
+node *environment::extract_output_line()
+{
+  if (current_tab)
+    wrap_up_tab();
+  node *n = line;
+  line = 0;
+  return n;
+}
+
+/* environment related requests */
+
+void environment_switch()
+{
+  int pop = 0;	// 1 means pop, 2 means pop but no error message on underflow
+  if (curenv->is_dummy())
+    error("can't switch environments when current environment is dummy");
+  else if (!has_arg())
+    pop = 1;
+  else {
+    symbol nm;
+    if (!tok.delimiter()) {
+      // It looks like a number.
+      int n;
+      if (get_integer(&n)) {
+	if (n >= 0 && n < NENVIRONMENTS) {
+	  env_stack = new env_list(curenv, env_stack);
+	  if (env_table[n] == 0)
+	    env_table[n] = new environment(i_to_a(n));
+	  curenv = env_table[n];
+	}
+	else
+	  nm = i_to_a(n);
+      }
+      else
+	pop = 2;
+    }
+    else {
+      nm = get_long_name(1);
+      if (nm.is_null())
+	pop = 2;
+    }
+    if (!nm.is_null()) {
+      environment *e = (environment *)env_dictionary.lookup(nm);
+      if (!e) {
+	e = new environment(nm);
+	(void)env_dictionary.lookup(nm, e);
+      }
+      env_stack = new env_list(curenv, env_stack);
+      curenv = e;
+    }
+  }
+  if (pop) {
+    if (env_stack == 0) {
+      if (pop == 1)
+	error("environment stack underflow");
+    }
+    else {
+      curenv = env_stack->env;
+      env_list *tem = env_stack;
+      env_stack = env_stack->next;
+      delete tem;
+    }
+  }
+  skip_line();
+}
+
+void environment_copy()
+{
+  symbol nm;
+  environment *e=0;
+  tok.skip();
+  if (!tok.delimiter()) {
+    // It looks like a number.
+    int n;
+    if (get_integer(&n)) {
+      if (n >= 0 && n < NENVIRONMENTS)
+	e = env_table[n];
+      else
+	nm = i_to_a(n);
+    }
+  }
+  else
+    nm = get_long_name(1);
+  if (!e && !nm.is_null())
+    e = (environment *)env_dictionary.lookup(nm);
+  if (e == 0) {
+    error("No environment to copy from");
+    return;
+  }
+  else
+    curenv->copy(e);
+  skip_line();
+}
+
+static symbol P_symbol("P");
+
+void font_change()
+{
+  symbol s = get_name();
+  int is_number = 1;
+  if (s.is_null() || s == P_symbol) {
+    s = P_symbol;
+    is_number = 0;
+  }
+  else {
+    for (const char *p = s.contents(); p != 0 && *p != 0; p++)
+      if (!csdigit(*p)) {
+	is_number = 0;
+	break;
+      }
+  }
+  if (is_number)
+    curenv->set_font(atoi(s.contents()));
+  else
+    curenv->set_font(s);
+  skip_line();
+}
+
+void family_change()
+{
+  symbol s = get_name();
+  curenv->set_family(s);
+  skip_line();
+}
+
+void point_size()
+{
+  int n;
+  if (has_arg() && get_number(&n, 'z', curenv->get_requested_point_size())) {
+    if (n <= 0)
+      n = 1;
+    curenv->set_size(n);
+    curenv->add_html_tag(0, ".ps", n);
+  }
+  else
+    curenv->set_size(0);
+  skip_line();
+}
+
+void override_sizes()
+{
+  int n = 16;
+  int *sizes = new int[n];
+  int i = 0;
+  char *buf = read_string();
+  if (!buf)
+    return;
+  char *p = strtok(buf, " \t");
+  for (;;) {
+    if (!p)
+      break;
+    int lower, upper;
+    switch (sscanf(p, "%d-%d", &lower, &upper)) {
+    case 1:
+      upper = lower;
+      // fall through
+    case 2:
+      if (lower <= upper && lower >= 0)
+	break;
+      // fall through
+    default:
+      warning(WARN_RANGE, "bad size range `%1'", p);
+      return;
+    }
+    if (i + 2 > n) {
+      int *old_sizes = sizes;
+      sizes = new int[n*2];
+      memcpy(sizes, old_sizes, n*sizeof(int));
+      n *= 2;
+      a_delete old_sizes;
+    }
+    sizes[i++] = lower;
+    if (lower == 0)
+      break;
+    sizes[i++] = upper;
+    p = strtok(0, " \t");
+  }
+  font_size::init_size_table(sizes);
+}
+
+void space_size()
+{
+  int n;
+  if (get_integer(&n)) {
+    curenv->space_size = n;
+    if (has_arg() && get_integer(&n))
+      curenv->sentence_space_size = n;
+    else
+      curenv->sentence_space_size = curenv->space_size;
+  }
+  skip_line();
+}
+
+void fill()
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  curenv->fill = 1;
+  curenv->add_html_tag(1, ".fi");
+  curenv->add_html_tag(0, ".br");
+  tok.next();
+}
+
+void no_fill()
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  curenv->fill = 0;
+  curenv->add_html_tag(1, ".nf");
+  curenv->add_html_tag(0, ".br");
+  curenv->add_html_tag(0, ".po", topdiv->get_page_offset().to_units());
+  tok.next();
+}
+
+void center()
+{
+  int n;
+  if (!has_arg() || !get_integer(&n))
+    n = 1;
+  else if (n < 0)
+    n = 0;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  curenv->right_justify_lines = 0;
+  curenv->center_lines = n;
+  curenv->add_html_tag(1, ".ce", n);
+  tok.next();
+}
+
+void right_justify()
+{
+  int n;
+  if (!has_arg() || !get_integer(&n))
+    n = 1;
+  else if (n < 0)
+    n = 0;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  curenv->center_lines = 0;
+  curenv->right_justify_lines = n;
+  curenv->add_html_tag(1, ".rj", n);
+  tok.next();
+}
+
+void line_length()
+{
+  hunits temp;
+  if (has_arg() && get_hunits(&temp, 'm', curenv->line_length)) {
+    if (temp < H0) {
+      warning(WARN_RANGE, "bad line length %1u", temp.to_units());
+      temp = H0;
+    }
+  }
+  else
+    temp = curenv->prev_line_length;
+  curenv->prev_line_length = curenv->line_length;
+  curenv->line_length = temp;
+  curenv->add_html_tag(1, ".ll", temp.to_units());
+  skip_line();
+}
+
+void title_length()
+{
+  hunits temp;
+  if (has_arg() && get_hunits(&temp, 'm', curenv->title_length)) {
+    if (temp < H0) {
+      warning(WARN_RANGE, "bad title length %1u", temp.to_units());
+      temp = H0;
+    }
+  }
+  else
+    temp = curenv->prev_title_length;
+  curenv->prev_title_length = curenv->title_length;
+  curenv->title_length = temp;
+  skip_line();
+}
+
+void vertical_spacing()
+{
+  vunits temp;
+  if (has_arg() && get_vunits(&temp, 'p', curenv->vertical_spacing)) {
+    if (temp < V0) {
+      warning(WARN_RANGE, "vertical spacing must not be negative");
+      temp = vresolution;
+    }
+  }
+  else
+    temp = curenv->prev_vertical_spacing;
+  curenv->prev_vertical_spacing = curenv->vertical_spacing;
+  curenv->vertical_spacing = temp;
+  skip_line();
+}
+
+void post_vertical_spacing()
+{
+  vunits temp;
+  if (has_arg() && get_vunits(&temp, 'p', curenv->post_vertical_spacing)) {
+    if (temp < V0) {
+      warning(WARN_RANGE,
+	      "post vertical spacing must be greater than or equal to 0");
+      temp = V0;
+    }
+  }
+  else
+    temp = curenv->prev_post_vertical_spacing;
+  curenv->prev_post_vertical_spacing = curenv->post_vertical_spacing;
+  curenv->post_vertical_spacing = temp;
+  skip_line();
+}
+
+void line_spacing()
+{
+  int temp;
+  if (has_arg() && get_integer(&temp)) {
+    if (temp < 1) {
+      warning(WARN_RANGE, "value %1 out of range: interpreted as 1", temp);
+      temp = 1;
+    }
+  }
+  else
+    temp = curenv->prev_line_spacing;
+  curenv->prev_line_spacing = curenv->line_spacing;
+  curenv->line_spacing = temp;
+  skip_line();
+}
+
+void indent()
+{
+  hunits temp;
+  if (has_arg() && get_hunits(&temp, 'm', curenv->indent)) {
+    if (temp < H0) {
+      warning(WARN_RANGE, "indent cannot be negative");
+      temp = H0;
+    }
+  }
+  else
+    temp = curenv->prev_indent;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  curenv->have_temporary_indent = 0;
+  curenv->prev_indent = curenv->indent;
+  curenv->indent = temp;
+  if (break_flag)
+    curenv->add_html_tag(1, ".in", temp.to_units());
+  tok.next();
+}
+
+void temporary_indent()
+{
+  int err = 0;
+  hunits temp;
+  if (!get_hunits(&temp, 'm', curenv->get_indent()))
+    err = 1;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  if (temp < H0) {
+    warning(WARN_RANGE, "total indent cannot be negative");
+    temp = H0;
+  }
+  if (!err) {
+    curenv->temporary_indent = temp;
+    curenv->have_temporary_indent = 1;
+    curenv->add_html_tag(1, ".ti", temp.to_units());
+  }
+  tok.next();
+}
+
+node *do_underline_special(int underline_spaces)
+{
+  macro m;
+  m.append_str("x u ");
+  m.append(underline_spaces + '0');
+  return new special_node(m, 1);
+}
+
+void do_underline(int underline_spaces)
+{
+  int n;
+  if (!has_arg() || !get_integer(&n))
+    n = 1;
+  if (n <= 0) {
+    if (curenv->underline_lines > 0) {
+      curenv->prev_fontno = curenv->fontno;
+      curenv->fontno = curenv->pre_underline_fontno;
+      if (underline_spaces) {
+	curenv->underline_spaces = 0;
+	curenv->add_node(do_underline_special(0));
+      }
+    }
+    curenv->underline_lines = 0;
+  }
+  else {
+    curenv->underline_lines = n;
+    curenv->pre_underline_fontno = curenv->fontno;
+    curenv->fontno = get_underline_fontno();
+    if (underline_spaces) {
+      curenv->underline_spaces = 1;
+      curenv->add_node(do_underline_special(1));
+    }
+  }
+  skip_line();
+}
+
+void continuous_underline()
+{
+  do_underline(1);
+}
+
+void underline()
+{
+  do_underline(0);
+}
+
+void control_char()
+{
+  curenv->control_char = '.';
+  if (has_arg()) {
+    if (tok.ch() == 0)
+      error("bad control character");
+    else
+      curenv->control_char = tok.ch();
+  }
+  skip_line();
+}
+
+void no_break_control_char()
+{
+  curenv->no_break_control_char = '\'';
+  if (has_arg()) {
+    if (tok.ch() == 0)
+      error("bad control character");
+    else
+      curenv->no_break_control_char = tok.ch();
+  }
+  skip_line();
+}
+
+void margin_character()
+{
+  while (tok.space())
+    tok.next();
+  charinfo *ci = tok.get_char();
+  if (ci) {
+    // Call tok.next() only after making the node so that
+    // .mc \s+9\(br\s0 works.
+    node *nd = curenv->make_char_node(ci);
+    tok.next();
+    if (nd) {
+      delete curenv->margin_character_node;
+      curenv->margin_character_node = nd;
+      curenv->margin_character_flags = (MARGIN_CHARACTER_ON
+					|MARGIN_CHARACTER_NEXT);
+      hunits d;
+      if (has_arg() && get_hunits(&d, 'm'))
+	curenv->margin_character_distance = d;
+    }
+  }
+  else {
+    check_missing_character();
+    curenv->margin_character_flags &= ~MARGIN_CHARACTER_ON;
+    if (curenv->margin_character_flags == 0) {
+      delete curenv->margin_character_node;
+      curenv->margin_character_node = 0;
+    }
+  }
+  skip_line();
+}
+
+void number_lines()
+{
+  delete_node_list(curenv->numbering_nodes);
+  curenv->numbering_nodes = 0;
+  if (has_arg()) {
+    node *nd = 0;
+    for (int i = '9'; i >= '0'; i--) {
+      node *tem = make_node(charset_table[i], curenv);
+      if (!tem) {
+	skip_line();
+	return;
+      }
+      tem->next = nd;
+      nd = tem;
+    }
+    curenv->numbering_nodes = nd;
+    curenv->line_number_digit_width = env_digit_width(curenv);
+    int n;
+    if (!tok.delimiter()) {
+      if (get_integer(&n, next_line_number)) {
+	next_line_number = n;
+	if (next_line_number < 0) {
+	  warning(WARN_RANGE, "negative line number");
+	  next_line_number = 0;
+	}
+      }
+    }
+    else
+      while (!tok.space() && !tok.newline() && !tok.eof())
+	tok.next();
+    if (has_arg()) {
+      if (!tok.delimiter()) {
+	if (get_integer(&n)) {
+	  if (n <= 0) {
+	    warning(WARN_RANGE, "negative or zero line number multiple");
+	  }
+	  else
+	    curenv->line_number_multiple = n;
+	}
+      }
+      else
+	while (!tok.space() && !tok.newline() && !tok.eof())
+	  tok.next();
+      if (has_arg()) {
+	if (!tok.delimiter()) {
+	  if (get_integer(&n))
+	    curenv->number_text_separation = n;
+	}
+	else
+	  while (!tok.space() && !tok.newline() && !tok.eof())
+	    tok.next();
+	if (has_arg() && !tok.delimiter() && get_integer(&n))
+	  curenv->line_number_indent = n;
+      }
+    }
+  }
+  skip_line();
+}
+
+void no_number()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->no_number_count = n > 0 ? n : 0;
+  else
+    curenv->no_number_count = 1;
+  skip_line();
+}
+
+void no_hyphenate()
+{
+  curenv->hyphenation_flags = 0;
+  skip_line();
+}
+
+void hyphenate_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->hyphenation_flags = n;
+  else
+    curenv->hyphenation_flags = 1;
+  skip_line();
+}
+
+void hyphen_char()
+{
+  curenv->hyphen_indicator_char = get_optional_char();
+  skip_line();
+}
+
+void hyphen_line_max_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->hyphen_line_max = n;
+  else
+    curenv->hyphen_line_max = -1;
+  skip_line();
+}
+
+void environment::interrupt()
+{
+  if (!dummy) {
+    add_node(new transparent_dummy_node);
+    interrupted = 1;
+  }
+}
+
+void environment::newline()
+{
+  if (underline_lines > 0) {
+    if (--underline_lines == 0) {
+      prev_fontno = fontno;
+      fontno = pre_underline_fontno;
+      if (underline_spaces) {
+        underline_spaces = 0;
+        add_node(do_underline_special(0));
+      }
+    }
+  }
+  if (current_field)
+    wrap_up_field();
+  if (current_tab)
+    wrap_up_tab();
+  // strip trailing spaces
+  while (line != 0 && line->discardable()) {
+    width_total -= line->width();
+    space_total -= line->nspaces();
+    node *tem = line;
+    line = line->next;
+    delete tem;
+  }
+  node *to_be_output = 0;
+  hunits to_be_output_width;
+  prev_line_interrupted = 0;
+  if (dummy)
+    space_newline();
+  else if (interrupted) {
+    interrupted = 0;
+    // see environment::final_break
+    prev_line_interrupted = exit_started ? 2 : 1;
+  }
+  else if (center_lines > 0) {
+    --center_lines;
+    hunits x = target_text_length - width_total;
+    if (x > H0)
+      saved_indent += x/2;
+    to_be_output = line;
+    if (is_html) {
+      node *n = make_html_tag("eol.ce");
+      n->next = to_be_output;
+      to_be_output = n;
+    }
+    to_be_output_width = width_total;
+    line = 0;
+  }
+  else if (right_justify_lines > 0) {
+    --right_justify_lines;
+    hunits x = target_text_length - width_total;
+    if (x > H0)
+      saved_indent += x;
+    to_be_output = line;
+    to_be_output_width = width_total;
+    line = 0;
+  }
+  else if (fill)
+    space_newline();
+  else {
+    to_be_output = line;
+    to_be_output_width = width_total;
+    line = 0;
+  }
+  input_line_start = line == 0 ? H0 : width_total;
+  if (to_be_output) {
+    if (is_html && !fill) {
+      if (curdiv == topdiv) {
+	node *n = make_html_tag("eol");
+
+	n->next = to_be_output;
+	to_be_output = n;
+      }
+    }
+    output_line(to_be_output, to_be_output_width);
+    hyphen_line_count = 0;
+  }
+  if (input_trap_count > 0) {
+    if (!(continued_input_trap && prev_line_interrupted))
+      if (--input_trap_count == 0)
+	spring_trap(input_trap);
+  }
+}
+
+void environment::output_line(node *n, hunits width)
+{
+  prev_text_length = width;
+  if (margin_character_flags) {
+    hunits d = line_length + margin_character_distance - saved_indent - width;
+    if (d > 0) {
+      n = new hmotion_node(d, get_fill_color(), n);
+      width += d;
+    }
+    margin_character_flags &= ~MARGIN_CHARACTER_NEXT;
+    node *tem;
+    if (!margin_character_flags) {
+      tem = margin_character_node;
+      margin_character_node = 0;
+    }
+    else
+      tem = margin_character_node->copy();
+    tem->next = n;
+    n = tem;
+    width += tem->width();
+  }
+  node *nn = 0;
+  while (n != 0) {
+    node *tem = n->next;
+    n->next = nn;
+    nn = n;
+    n = tem;
+  }
+  if (!saved_indent.is_zero())
+    nn = new hmotion_node(saved_indent, get_fill_color(), nn);
+  width += saved_indent;
+  if (no_number_count > 0)
+    --no_number_count;
+  else if (numbering_nodes) {
+    hunits w = (line_number_digit_width
+		*(3+line_number_indent+number_text_separation));
+    if (next_line_number % line_number_multiple != 0)
+      nn = new hmotion_node(w, get_fill_color(), nn);
+    else {
+      hunits x = w;
+      nn = new hmotion_node(number_text_separation * line_number_digit_width,
+			    get_fill_color(), nn);
+      x -= number_text_separation*line_number_digit_width;
+      char buf[30];
+      sprintf(buf, "%3d", next_line_number);
+      for (char *p = strchr(buf, '\0') - 1; p >= buf && *p != ' '; --p) {
+	node *gn = numbering_nodes;
+	for (int count = *p - '0'; count > 0; count--)
+	  gn = gn->next;
+	gn = gn->copy();
+	x -= gn->width();
+	gn->next = nn;
+	nn = gn;
+      }
+      nn = new hmotion_node(x, get_fill_color(), nn);
+    }
+    width += w;
+    ++next_line_number;
+  }
+  output(nn, !fill, vertical_spacing, total_post_vertical_spacing(), width);
+}
+
+void environment::start_line()
+{
+  assert(line == 0);
+  discarding = 0;
+  line = new line_start_node;
+  if (have_temporary_indent) {
+    saved_indent = temporary_indent;
+    have_temporary_indent = 0;
+  }
+  else
+    saved_indent = indent;
+  target_text_length = line_length - saved_indent;
+  width_total = H0;
+  space_total = 0;
+}
+
+hunits environment::get_hyphenation_space()
+{
+  return hyphenation_space;
+}
+
+void hyphenation_space_request()
+{
+  hunits n;
+  if (get_hunits(&n, 'm')) {
+    if (n < H0) {
+      warning(WARN_RANGE, "hyphenation space cannot be negative");
+      n = H0;
+    }
+    curenv->hyphenation_space = n;
+  }
+  skip_line();
+}
+
+hunits environment::get_hyphenation_margin()
+{
+  return hyphenation_margin;
+}
+
+void hyphenation_margin_request()
+{
+  hunits n;
+  if (get_hunits(&n, 'm')) {
+    if (n < H0) {
+      warning(WARN_RANGE, "hyphenation margin cannot be negative");
+      n = H0;
+    }
+    curenv->hyphenation_margin = n;
+  }
+  skip_line();
+}
+
+breakpoint *environment::choose_breakpoint()
+{
+  hunits x = width_total;
+  int s = space_total;
+  node *n = line;
+  breakpoint *best_bp = 0;	// the best breakpoint so far
+  int best_bp_fits = 0;
+  while (n != 0) {
+    x -= n->width();
+    s -= n->nspaces();
+    breakpoint *bp = n->get_breakpoints(x, s);
+    while (bp != 0) {
+      if (bp->width <= target_text_length) {
+	if (!bp->hyphenated) {
+	  breakpoint *tem = bp->next;
+	  bp->next = 0;
+	  while (tem != 0) {
+	    breakpoint *tem1 = tem;
+	    tem = tem->next;
+	    delete tem1;
+	  }
+	  if (best_bp_fits
+	      // Decide whether to use the hyphenated breakpoint.
+	      && (hyphen_line_max < 0
+		  // Only choose the hyphenated breakpoint if it would not
+		  // exceed the maximum number of consecutive hyphenated
+		  // lines.
+		  || hyphen_line_count + 1 <= hyphen_line_max)
+	      && !(adjust_mode == ADJUST_BOTH
+		   // Don't choose the hyphenated breakpoint if the line
+		   // can be justified by adding no more than
+		   // hyphenation_space to any word space.
+		   ? (bp->nspaces > 0
+		      && (((target_text_length - bp->width
+			    + (bp->nspaces - 1)*hresolution)/bp->nspaces)
+			  <= hyphenation_space))
+		   // Don't choose the hyphenated breakpoint if the line
+		   // is no more than hyphenation_margin short.
+		   : target_text_length - bp->width <= hyphenation_margin)) {
+	    delete bp;
+	    return best_bp;
+	  }
+	  if (best_bp)
+	    delete best_bp;
+	  return bp;
+	}
+	else {
+	  if ((adjust_mode == ADJUST_BOTH
+	       ? hyphenation_space == H0
+	       : hyphenation_margin == H0)
+	      && (hyphen_line_max < 0
+		  || hyphen_line_count + 1 <= hyphen_line_max)) {
+	    // No need to consider a non-hyphenated breakpoint.
+	    if (best_bp)
+	      delete best_bp;
+	    breakpoint *tem = bp->next;
+	    bp->next = 0;
+	    while (tem != 0) {
+	      breakpoint *tem1 = tem;
+	      tem = tem->next;
+	      delete tem1;
+	    }
+	    return bp;
+	  }
+	  // It fits but it's hyphenated.
+	  if (!best_bp_fits) {
+	    if (best_bp)
+	      delete best_bp;
+	    best_bp = bp;
+	    bp = bp->next;
+	    best_bp_fits = 1;
+	  }
+	  else {
+	    breakpoint *tem = bp;
+	    bp = bp->next;
+	    delete tem;
+	  }
+	}
+      }
+      else {
+	if (best_bp)
+	  delete best_bp;
+	best_bp = bp;
+	bp = bp->next;
+      }
+    }
+    n = n->next;
+  }
+  if (best_bp) {
+    if (!best_bp_fits)
+      output_warning(WARN_BREAK, "can't break line");
+    return best_bp;
+  }
+  return 0;
+}
+
+void environment::hyphenate_line(int start_here)
+{
+  assert(line != 0);
+  hyphenation_type prev_type = line->get_hyphenation_type();
+  node **startp;
+  if (start_here)
+    startp = &line;
+  else
+    for (startp = &line->next; *startp != 0; startp = &(*startp)->next) {
+      hyphenation_type this_type = (*startp)->get_hyphenation_type();
+      if (prev_type == HYPHEN_BOUNDARY && this_type == HYPHEN_MIDDLE)
+	break;
+      prev_type = this_type;
+    }
+  if (*startp == 0)
+    return;
+  node *tem = *startp;
+  do {
+    tem = tem->next;
+  } while (tem != 0 && tem->get_hyphenation_type() == HYPHEN_MIDDLE);
+  int inhibit = (tem != 0 && tem->get_hyphenation_type() == HYPHEN_INHIBIT);
+  node *end = tem;
+  hyphen_list *sl = 0;
+  tem = *startp;
+  node *forward = 0;
+  int i = 0;
+  while (tem != end) {
+    sl = tem->get_hyphen_list(sl, &i);
+    node *tem1 = tem;
+    tem = tem->next;
+    tem1->next = forward;
+    forward = tem1;
+  }
+  if (!inhibit) {
+    // this is for characters like hyphen and emdash
+    int prev_code = 0;
+    for (hyphen_list *h = sl; h; h = h->next) {
+      h->breakable = (prev_code != 0
+		      && h->next != 0
+		      && h->next->hyphenation_code != 0);
+      prev_code = h->hyphenation_code;
+    }
+  }
+  if (hyphenation_flags != 0
+      && !inhibit
+      // this may not be right if we have extra space on this line
+      && !((hyphenation_flags & HYPHEN_LAST_LINE)
+	   && (curdiv->distance_to_next_trap()
+	       <= vertical_spacing + total_post_vertical_spacing()))
+      && i >= 4)
+    hyphenate(sl, hyphenation_flags);
+  while (forward != 0) {
+    node *tem1 = forward;
+    forward = forward->next;
+    tem1->next = 0;
+    tem = tem1->add_self(tem, &sl);
+  }
+  *startp = tem;
+}
+
+static node *node_list_reverse(node *n)
+{
+  node *res = 0;
+  while (n) {
+    node *tem = n;
+    n = n->next;
+    tem->next = res;
+    res = tem;
+  }
+  return res;
+}
+
+static void distribute_space(node *n, int nspaces, hunits desired_space,
+			     int force_reverse = 0)
+{
+  static int reverse = 0;
+  if (force_reverse || reverse)
+    n = node_list_reverse(n);
+  if (!force_reverse && nspaces > 0 && spread_limit >= 0
+      && desired_space.to_units() > 0) {
+    hunits em = curenv->get_size();
+    double Ems = (double)desired_space.to_units() / nspaces
+		 / (em.is_zero() ? hresolution : em.to_units());
+    if (Ems > spread_limit)
+      output_warning(WARN_BREAK, "spreading %1m per space", Ems);
+  }
+  for (node *tem = n; tem; tem = tem->next)
+    tem->spread_space(&nspaces, &desired_space);
+  if (force_reverse || reverse)
+    (void)node_list_reverse(n);
+  if (!force_reverse)
+    reverse = !reverse;
+  assert(desired_space.is_zero() && nspaces == 0);
+}
+
+void environment::possibly_break_line(int start_here, int forced)
+{
+  if (!fill || current_tab || current_field || dummy)
+    return;
+  while (line != 0
+	 && (forced
+	     // When a macro follows a paragraph in fill mode, the
+	     // current line should not be empty.
+	     || (width_total - line->width()) > target_text_length)) {
+    hyphenate_line(start_here);
+    breakpoint *bp = choose_breakpoint();
+    if (bp == 0)
+      // we'll find one eventually
+      return;
+    node *pre, *post;
+    node **ndp = &line;
+    while (*ndp != bp->nd)
+      ndp = &(*ndp)->next;
+    bp->nd->split(bp->index, &pre, &post);
+    *ndp = post;
+    hunits extra_space_width = H0;
+    switch(adjust_mode) {
+    case ADJUST_BOTH:
+      if (bp->nspaces != 0)
+	extra_space_width = target_text_length - bp->width;
+      else if (bp->width > 0 && target_text_length > 0
+	       && target_text_length > bp->width)
+	output_warning(WARN_BREAK, "cannot adjust line");
+      break;
+    case ADJUST_CENTER:
+      saved_indent += (target_text_length - bp->width)/2;
+      break;
+    case ADJUST_RIGHT:
+      saved_indent += target_text_length - bp->width;
+      break;
+    }
+    distribute_space(pre, bp->nspaces, extra_space_width);
+    hunits output_width = bp->width + extra_space_width;
+    input_line_start -= output_width;
+    if (bp->hyphenated)
+      hyphen_line_count++;
+    else
+      hyphen_line_count = 0;
+    delete bp;
+    space_total = 0;
+    width_total = 0;
+    node *first_non_discardable = 0;
+    node *tem;
+    for (tem = line; tem != 0; tem = tem->next)
+      if (!tem->discardable())
+	first_non_discardable = tem;
+    node *to_be_discarded;
+    if (first_non_discardable) {
+      to_be_discarded = first_non_discardable->next;
+      first_non_discardable->next = 0;
+      for (tem = line; tem != 0; tem = tem->next) {
+	width_total += tem->width();
+	space_total += tem->nspaces();
+      }
+      discarding = 0;
+    }
+    else {
+      discarding = 1;
+      to_be_discarded = line;
+      line = 0;
+    }
+    // Do output_line() here so that line will be 0 iff the
+    // the environment will be empty.
+    output_line(pre, output_width);
+    while (to_be_discarded != 0) {
+      tem = to_be_discarded;
+      to_be_discarded = to_be_discarded->next;
+      input_line_start -= tem->width();
+      delete tem;
+    }
+    if (line != 0) {
+      if (have_temporary_indent) {
+	saved_indent = temporary_indent;
+	have_temporary_indent = 0;
+      }
+      else
+	saved_indent = indent;
+      target_text_length = line_length - saved_indent;
+    }
+  }
+}
+
+/*
+Do the break at the end of input after the end macro (if any).
+
+Unix troff behaves as follows:  if the last line is
+
+foo bar\c
+
+it will output foo on the current page, and bar on the next page;
+if the last line is
+
+foo\c
+
+or
+
+foo bar
+
+everything will be output on the current page.  This behaviour must be
+considered a bug.
+
+The problem is that some macro packages rely on this.  For example,
+the ATK macros have an end macro that emits \c if it needs to print a
+table of contents but doesn't do a 'bp in the end macro; instead the
+'bp is done in the bottom of page trap.  This works with Unix troff,
+provided that the current environment is not empty at the end of the
+input file.
+
+The following will make macro packages that do that sort of thing work
+even if the current environment is empty at the end of the input file.
+If the last input line used \c and this line occurred in the end macro,
+then we'll force everything out on the current page, but we'll make
+sure that the environment isn't empty so that we won't exit at the
+bottom of this page.
+*/
+
+void environment::final_break()
+{
+  if (prev_line_interrupted == 2) {
+    do_break();
+    add_node(new transparent_dummy_node);
+  }
+  else
+    do_break();
+}
+
+/*
+ *  add_html_tag - emits a special html-tag: to help post-grohtml understand
+ *                 the key troff commands
+ */
+
+void environment::add_html_tag(int force, const char *name)
+{
+  if (!force && (curdiv != topdiv))
+    return;
+
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!invalid_input_char((unsigned char)*p))
+	m->append(*p);
+    curdiv->output(new special_node(*m), 1, 0, 0, 0);
+    if (strcmp(name, ".nf") == 0)
+      curenv->ignore_next_eol = 1;
+  }
+}
+
+/*
+ *  add_html_tag - emits a special html-tag: to help post-grohtml understand
+ *                 the key troff commands, it appends a string representation
+ *                 of i.
+ */
+
+void environment::add_html_tag(int force, const char *name, int i)
+{
+  if (!force && (curdiv != topdiv))
+    return;
+
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!invalid_input_char((unsigned char)*p))
+	m->append(*p);
+    m->append(' ');
+    m->append_int(i);
+    node *n = new special_node(*m);
+    curdiv->output(n, 1, 0, 0, 0);
+  }
+}
+
+/*
+ *  add_html_tag_tabs - emits the tab settings for post-grohtml
+ */
+
+void environment::add_html_tag_tabs(int force)
+{
+  if (!force && (curdiv != topdiv))
+    return;
+
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    hunits d, l;
+    enum tab_type t;
+    m->append_str("html-tag:.ta ");  
+    do {
+      t = curenv->tabs.distance_to_next_tab(l, &d);
+      l += d;
+      switch (t) {
+      case TAB_LEFT:
+	m->append_str(" L ");
+	m->append_int(l.to_units());
+	break;
+      case TAB_CENTER:
+	m->append_str(" C ");
+	m->append_int(l.to_units());
+	break;
+      case TAB_RIGHT:
+	m->append_str(" R ");
+	m->append_int(l.to_units());
+	break;
+      case TAB_NONE:
+	break;
+      }
+    } while ((t != TAB_NONE) && (l < get_line_length()));
+    curdiv->output(new special_node(*m), 1, 0, 0, 0);
+  }
+}
+
+node *environment::make_html_tag(const char *name, int i)
+{
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!invalid_input_char((unsigned char)*p))
+	m->append(*p);
+    m->append(' ');
+    m->append_int(i);
+    return new special_node(*m);
+  }
+  return 0;
+}
+
+node *environment::make_html_tag(const char *name)
+{
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!invalid_input_char((unsigned char)*p))
+	m->append(*p);
+    return new special_node(*m);
+  }
+  return 0;
+}
+
+void environment::do_break(int spread)
+{
+  if (curdiv == topdiv && topdiv->before_first_page) {
+    topdiv->begin_page();
+    return;
+  }
+  if (current_tab)
+    wrap_up_tab();
+  if (line) {
+    // this is so that hyphenation works
+    line = new space_node(H0, get_fill_color(), line);
+    space_total++;
+    possibly_break_line(0, spread);
+  }
+  while (line != 0 && line->discardable()) {
+    width_total -= line->width();
+    space_total -= line->nspaces();
+    node *tem = line;
+    line = line->next;
+    delete tem;
+  }
+  discarding = 0;
+  input_line_start = H0;
+  if (line != 0) {
+    if (fill) {
+      switch (adjust_mode) {
+      case ADJUST_CENTER:
+	saved_indent += (target_text_length - width_total)/2;
+	break;
+      case ADJUST_RIGHT:
+	saved_indent += target_text_length - width_total;
+	break;
+      }
+    }
+    node *tem = line;
+    line = 0;
+    output_line(tem, width_total);
+    hyphen_line_count = 0;
+  }
+  prev_line_interrupted = 0;
+#ifdef WIDOW_CONTROL
+  mark_last_line();
+  output_pending_lines();
+#endif /* WIDOW_CONTROL */
+}
+
+int environment::is_empty()
+{
+  return !current_tab && line == 0 && pending_lines == 0;
+}
+
+void do_break_request(int spread)
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag) {
+    curenv->do_break(spread);
+    curenv->add_html_tag(0, ".br");
+  }
+  tok.next();
+}
+
+void break_request()
+{
+  do_break_request(0);
+}
+
+void break_spread_request()
+{
+  do_break_request(1);
+}
+
+void title()
+{
+  if (curdiv == topdiv && topdiv->before_first_page) {
+    handle_initial_title();
+    return;
+  }
+  node *part[3];
+  hunits part_width[3];
+  part[0] = part[1] = part[2] = 0;
+  environment env(curenv);
+  environment *oldenv = curenv;
+  curenv = &env;
+  read_title_parts(part, part_width);
+  curenv = oldenv;
+  curenv->size = env.size;
+  curenv->prev_size = env.prev_size;
+  curenv->requested_size = env.requested_size;
+  curenv->prev_requested_size = env.prev_requested_size;
+  curenv->char_height = env.char_height;
+  curenv->char_slant = env.char_slant;
+  curenv->fontno = env.fontno;
+  curenv->prev_fontno = env.prev_fontno;
+  curenv->glyph_color = env.glyph_color;
+  curenv->prev_glyph_color = env.prev_glyph_color;
+  curenv->fill_color = env.fill_color;
+  curenv->prev_fill_color = env.prev_fill_color;
+  node *n = 0;
+  node *p = part[2];
+  while (p != 0) {
+    node *tem = p;
+    p = p->next;
+    tem->next = n;
+    n = tem;
+  }
+  hunits title_length(curenv->title_length);
+  hunits f = title_length - part_width[1];
+  hunits f2 = f/2;
+  n = new hmotion_node(f2 - part_width[2], curenv->get_fill_color(), n);
+  p = part[1];
+  while (p != 0) {
+    node *tem = p;
+    p = p->next;
+    tem->next = n;
+    n = tem;
+  }
+  n = new hmotion_node(f - f2 - part_width[0], curenv->get_fill_color(), n);
+  p = part[0];
+  while (p != 0) {
+    node *tem = p;
+    p = p->next;
+    tem->next = n;
+    n = tem;
+  }
+  curenv->output_title(n, !curenv->fill, curenv->vertical_spacing,
+		       curenv->total_post_vertical_spacing(), title_length);
+  curenv->hyphen_line_count = 0;
+  tok.next();
+}  
+
+void adjust()
+{
+  curenv->adjust_mode |= 1;
+  if (has_arg()) {
+    switch (tok.ch()) {
+    case 'l':
+      curenv->adjust_mode = ADJUST_LEFT;
+      break;
+    case 'r':
+      curenv->adjust_mode = ADJUST_RIGHT;
+      break;
+    case 'c':
+      curenv->adjust_mode = ADJUST_CENTER;
+      break;
+    case 'b':
+    case 'n':
+      curenv->adjust_mode = ADJUST_BOTH;
+      break;
+    default:
+      int n;
+      if (get_integer(&n)) {
+	if (n < 0)
+	  warning(WARN_RANGE, "negative adjustment mode");
+	else if (n > 5) {
+	  curenv->adjust_mode = 5;
+	  warning(WARN_RANGE, "adjustment mode `%1' out of range", n);
+	}
+	else
+	  curenv->adjust_mode = n;
+      }
+    }
+  }
+  skip_line();
+}
+
+void no_adjust()
+{
+  curenv->adjust_mode &= ~1;
+  skip_line();
+}
+
+void do_input_trap(int continued)
+{
+  curenv->input_trap_count = 0;
+  if (continued)
+    curenv->continued_input_trap = 1;
+  int n;
+  if (has_arg() && get_integer(&n)) {
+    if (n <= 0)
+      warning(WARN_RANGE,
+	      "number of lines for input trap must be greater than zero");
+    else {
+      symbol s = get_name(1);
+      if (!s.is_null()) {
+	curenv->input_trap_count = n;
+	curenv->input_trap = s;
+      }
+    }
+  }
+  skip_line();
+}
+
+void input_trap()
+{
+  do_input_trap(0);
+}
+
+void input_trap_continued()
+{
+  do_input_trap(1);
+}
+
+/* tabs */
+
+// must not be R or C or L or a legitimate part of a number expression
+const char TAB_REPEAT_CHAR = 'T';
+
+struct tab {
+  tab *next;
+  hunits pos;
+  tab_type type;
+  tab(hunits, tab_type);
+  enum { BLOCK = 1024 };
+  static tab *free_list;
+  void *operator new(size_t);
+  void operator delete(void *);
+};
+
+tab *tab::free_list = 0;
+
+void *tab::operator new(size_t n)
+{
+  assert(n == sizeof(tab));
+  if (!free_list) {
+    free_list = (tab *)new char[sizeof(tab)*BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK-1].next = 0;
+  }
+  tab *p = free_list;
+  free_list = (tab *)(free_list->next);
+  p->next = 0;
+  return p;
+}
+
+#ifdef __GNUG__
+/* cfront can't cope with this. */
+inline
+#endif
+void tab::operator delete(void *p)
+{
+  if (p) {
+    ((tab *)p)->next = free_list;
+    free_list = (tab *)p;
+  }
+}
+
+tab::tab(hunits x, tab_type t) : next(0), pos(x), type(t)
+{
+}
+
+tab_stops::tab_stops(hunits distance, tab_type type) 
+: initial_list(0)
+{
+  repeated_list = new tab(distance, type);
+}
+
+tab_stops::~tab_stops()
+{
+  clear();
+}
+
+tab_type tab_stops::distance_to_next_tab(hunits curpos, hunits *distance)
+{
+  hunits nextpos;
+
+  return distance_to_next_tab(curpos, distance, &nextpos);
+}
+
+tab_type tab_stops::distance_to_next_tab(hunits curpos, hunits *distance,
+					 hunits *nextpos)
+{
+  hunits lastpos = 0;
+  tab *tem;
+  for (tem = initial_list; tem && tem->pos <= curpos; tem = tem->next)
+    lastpos = tem->pos;
+  if (tem) {
+    *distance = tem->pos - curpos;
+    *nextpos  = tem->pos;
+    return tem->type;
+  }
+  if (repeated_list == 0)
+    return TAB_NONE;
+  hunits base = lastpos;
+  for (;;) {
+    for (tem = repeated_list; tem && tem->pos + base <= curpos; tem = tem->next)
+      lastpos = tem->pos;
+    if (tem) {
+      *distance = tem->pos + base - curpos;
+      *nextpos  = tem->pos + base;
+      return tem->type;
+    }
+    assert(lastpos > 0);
+    base += lastpos;
+  }
+  return TAB_NONE;
+}
+
+const char *tab_stops::to_string()
+{
+  static char *buf = 0;
+  static int buf_size = 0;
+  // figure out a maximum on the amount of space we can need
+  int count = 0;
+  tab *p;
+  for (p = initial_list; p; p = p->next)
+    ++count;
+  for (p = repeated_list; p; p = p->next)
+    ++count;
+  // (10 for digits + 1 for u + 1 for 'C' or 'R') + 2 for ' &' + 1 for '\0'
+  int need = count*12 + 3;
+  if (buf == 0 || need > buf_size) {
+    if (buf)
+      a_delete buf;
+    buf_size = need;
+    buf = new char[buf_size];
+  }
+  char *ptr = buf;
+  for (p = initial_list; p; p = p->next) {
+    strcpy(ptr, i_to_a(p->pos.to_units()));
+    ptr = strchr(ptr, '\0');
+    *ptr++ = 'u';
+    *ptr = '\0';
+    switch (p->type) {
+    case TAB_LEFT:
+      break;
+    case TAB_RIGHT:
+      *ptr++ = 'R';
+      break;
+    case TAB_CENTER:
+      *ptr++ = 'C';
+      break;
+    case TAB_NONE:
+    default:
+      assert(0);
+    }
+  }
+  if (repeated_list)
+    *ptr++ = TAB_REPEAT_CHAR;
+  for (p = repeated_list; p; p = p->next) {
+    strcpy(ptr, i_to_a(p->pos.to_units()));
+    ptr = strchr(ptr, '\0');
+    *ptr++ = 'u';
+    *ptr = '\0';
+    switch (p->type) {
+    case TAB_LEFT:
+      break;
+    case TAB_RIGHT:
+      *ptr++ = 'R';
+      break;
+    case TAB_CENTER:
+      *ptr++ = 'C';
+      break;
+    case TAB_NONE:
+    default:
+      assert(0);
+    }
+  }
+  *ptr++ = '\0';
+  return buf;
+}
+
+tab_stops::tab_stops() : initial_list(0), repeated_list(0)
+{
+}
+
+tab_stops::tab_stops(const tab_stops &ts) 
+: initial_list(0), repeated_list(0)
+{
+  tab **p = &initial_list;
+  tab *t = ts.initial_list;
+  while (t) {
+    *p = new tab(t->pos, t->type);
+    t = t->next;
+    p = &(*p)->next;
+  }
+  p = &repeated_list;
+  t = ts.repeated_list;
+  while (t) {
+    *p = new tab(t->pos, t->type);
+    t = t->next;
+    p = &(*p)->next;
+  }
+}
+
+void tab_stops::clear()
+{
+  while (initial_list) {
+    tab *tem = initial_list;
+    initial_list = initial_list->next;
+    delete tem;
+  }
+  while (repeated_list) {
+    tab *tem = repeated_list;
+    repeated_list = repeated_list->next;
+    delete tem;
+  }
+}
+
+void tab_stops::add_tab(hunits pos, tab_type type, int repeated)
+{
+  tab **p;
+  for (p = repeated ? &repeated_list : &initial_list; *p; p = &(*p)->next)
+    ;
+  *p = new tab(pos, type);
+}
+
+
+void tab_stops::operator=(const tab_stops &ts)
+{
+  clear();
+  tab **p = &initial_list;
+  tab *t = ts.initial_list;
+  while (t) {
+    *p = new tab(t->pos, t->type);
+    t = t->next;
+    p = &(*p)->next;
+  }
+  p = &repeated_list;
+  t = ts.repeated_list;
+  while (t) {
+    *p = new tab(t->pos, t->type);
+    t = t->next;
+    p = &(*p)->next;
+  }
+}
+    
+void set_tabs()
+{
+  hunits pos;
+  hunits prev_pos = 0;
+  int first = 1;
+  int repeated = 0;
+  tab_stops tabs;
+  while (has_arg()) {
+    if (tok.ch() == TAB_REPEAT_CHAR) {
+      tok.next();
+      repeated = 1;
+      prev_pos = 0;
+    }
+    if (!get_hunits(&pos, 'm', prev_pos))
+      break;
+    tab_type type = TAB_LEFT;
+    if (tok.ch() == 'C') {
+      tok.next();
+      type = TAB_CENTER;
+    }
+    else if (tok.ch() == 'R') {
+      tok.next();
+      type = TAB_RIGHT;
+    }
+    else if (tok.ch() == 'L') {
+      tok.next();
+    }
+    if (pos <= prev_pos && !first)
+      warning(WARN_RANGE,
+	      "positions of tab stops must be strictly increasing");
+    else {
+      tabs.add_tab(pos, type, repeated);
+      prev_pos = pos;
+      first = 0;
+    }
+  }
+  curenv->tabs = tabs;
+  curenv->add_html_tag_tabs(1);
+  skip_line();
+}
+
+const char *environment::get_tabs()
+{
+  return tabs.to_string();
+}
+
+tab_type environment::distance_to_next_tab(hunits *distance)
+{
+  return line_tabs
+    ? curenv->tabs.distance_to_next_tab(get_text_length(), distance)
+    : curenv->tabs.distance_to_next_tab(get_input_line_position(), distance);
+}
+
+tab_type environment::distance_to_next_tab(hunits *distance, hunits *leftpos)
+{
+  return line_tabs
+    ? curenv->tabs.distance_to_next_tab(get_text_length(), distance, leftpos)
+    : curenv->tabs.distance_to_next_tab(get_input_line_position(), distance,
+					leftpos);
+}
+
+void field_characters()
+{
+  field_delimiter_char = get_optional_char();
+  if (field_delimiter_char)
+    padding_indicator_char = get_optional_char();
+  else
+    padding_indicator_char = 0;
+  skip_line();
+}
+
+void line_tabs_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->line_tabs = n != 0;
+  else
+    curenv->line_tabs = 1;
+  skip_line();
+}
+
+int environment::get_line_tabs()
+{
+  return line_tabs;
+}
+
+void environment::wrap_up_tab()
+{
+  if (!current_tab)
+    return;
+  if (line == 0)
+    start_line();
+  hunits tab_amount;
+  switch (current_tab) {
+  case TAB_RIGHT:
+    tab_amount = tab_distance - tab_width;
+    line = make_tab_node(tab_amount, line);
+    break;
+  case TAB_CENTER:
+    tab_amount = tab_distance - tab_width/2;
+    line = make_tab_node(tab_amount, line);
+    break;
+  case TAB_NONE:
+  case TAB_LEFT:
+  default:
+    assert(0);
+  }
+  width_total += tab_amount;
+  width_total += tab_width;
+  if (current_field) {
+    if (tab_precedes_field) {
+      pre_field_width += tab_amount;
+      tab_precedes_field = 0;
+    }
+    field_distance -= tab_amount;
+    field_spaces += tab_field_spaces;
+  }
+  if (tab_contents != 0) {
+    node *tem;
+    for (tem = tab_contents; tem->next != 0; tem = tem->next)
+      ;
+    tem->next = line;
+    line = tab_contents;
+  }
+  tab_field_spaces = 0;
+  tab_contents = 0;
+  tab_width = H0;
+  tab_distance = H0;
+  current_tab = TAB_NONE;
+}
+
+node *environment::make_tab_node(hunits d, node *next)
+{
+  if (leader_node != 0 && d < 0) {
+    error("motion generated by leader cannot be negative");
+    delete leader_node;
+    leader_node = 0;
+  }
+  if (!leader_node)
+    return new hmotion_node(d, 1, 0, get_fill_color(), next);
+  node *n = new hline_node(d, leader_node, next);
+  leader_node = 0;
+  return n;
+}
+
+void environment::handle_tab(int is_leader)
+{
+  hunits d;
+  hunits abs;
+  if (current_tab)
+    wrap_up_tab();
+  charinfo *ci = is_leader ? leader_char : tab_char;
+  delete leader_node;
+  leader_node = ci ? make_char_node(ci) : 0;
+  tab_type t = distance_to_next_tab(&d, &abs);
+  switch (t) {
+  case TAB_NONE:
+    return;
+  case TAB_LEFT:
+    add_node(make_tab_node(d));
+    add_node(make_html_tag("tab L", abs.to_units()));
+    return;
+  case TAB_RIGHT:
+    add_node(make_html_tag("tab R", abs.to_units()));
+    break;
+  case TAB_CENTER:
+    add_node(make_html_tag("tab C", abs.to_units()));
+    break;
+  default:
+    assert(0);
+  }
+  tab_width = 0;
+  tab_distance = d;
+  tab_contents = 0;
+  current_tab = t;
+  tab_field_spaces = 0;
+}
+
+void environment::start_field()
+{
+  assert(!current_field);
+  hunits d;
+  if (distance_to_next_tab(&d) != TAB_NONE) {
+    pre_field_width = get_text_length();
+    field_distance = d;
+    current_field = 1;
+    field_spaces = 0;
+    tab_field_spaces = 0;
+    for (node *p = line; p; p = p->next)
+      if (p->nspaces()) {
+	p->freeze_space();
+	space_total--;
+      }
+    tab_precedes_field = current_tab != TAB_NONE;
+  }
+  else
+    error("zero field width");
+}
+
+void environment::wrap_up_field()
+{
+  if (!current_tab && field_spaces == 0)
+    add_padding();
+  hunits padding = field_distance - (get_text_length() - pre_field_width);
+  if (current_tab && tab_field_spaces != 0) {
+    hunits tab_padding = scale(padding, 
+			       tab_field_spaces, 
+			       field_spaces + tab_field_spaces);
+    padding -= tab_padding;
+    distribute_space(tab_contents, tab_field_spaces, tab_padding, 1);
+    tab_field_spaces = 0;
+    tab_width += tab_padding;
+  }
+  if (field_spaces != 0) {
+    distribute_space(line, field_spaces, padding, 1);
+    width_total += padding;
+    if (current_tab) {
+      // the start of the tab has been moved to the right by padding, so
+      tab_distance -= padding;
+      if (tab_distance <= H0) {
+	// use the next tab stop instead
+	current_tab = tabs.distance_to_next_tab(get_input_line_position()
+						- tab_width,
+						&tab_distance);
+	if (current_tab == TAB_NONE || current_tab == TAB_LEFT) {
+	  width_total += tab_width;
+	  if (current_tab == TAB_LEFT) {
+	    line = make_tab_node(tab_distance, line);
+	    width_total += tab_distance;
+	    current_tab = TAB_NONE;
+	  }
+	  if (tab_contents != 0) {
+	    node *tem;
+	    for (tem = tab_contents; tem->next != 0; tem = tem->next)
+	      ;
+	    tem->next = line;
+	    line = tab_contents;
+	    tab_contents = 0;
+	  }
+	  tab_width = H0;
+	  tab_distance = H0;
+	}
+      }
+    }
+  }
+  current_field = 0;
+}
+
+void environment::add_padding()
+{
+  if (current_tab) {
+    tab_contents = new space_node(H0, get_fill_color(), tab_contents);
+    tab_field_spaces++;
+  }
+  else {
+    if (line == 0)
+      start_line();
+    line = new space_node(H0, get_fill_color(), line);
+    field_spaces++;
+  }
+}
+
+typedef int (environment::*INT_FUNCP)();
+typedef vunits (environment::*VUNITS_FUNCP)();
+typedef hunits (environment::*HUNITS_FUNCP)();
+typedef const char *(environment::*STRING_FUNCP)();
+
+class int_env_reg : public reg {
+  INT_FUNCP func;
+ public:
+  int_env_reg(INT_FUNCP);
+  const char *get_string();
+  int get_value(units *val);
+};
+
+class vunits_env_reg : public reg {
+  VUNITS_FUNCP func;
+ public:
+  vunits_env_reg(VUNITS_FUNCP f);
+  const char *get_string();
+  int get_value(units *val);
+};
+
+
+class hunits_env_reg : public reg {
+  HUNITS_FUNCP func;
+ public:
+  hunits_env_reg(HUNITS_FUNCP f);
+  const char *get_string();
+  int get_value(units *val);
+};
+
+class string_env_reg : public reg {
+  STRING_FUNCP func;
+public:
+  string_env_reg(STRING_FUNCP);
+  const char *get_string();
+};
+
+int_env_reg::int_env_reg(INT_FUNCP f) : func(f)
+{
+}
+
+int int_env_reg::get_value(units *val)
+{
+  *val = (curenv->*func)();
+  return 1;
+}
+
+const char *int_env_reg::get_string()
+{
+  return i_to_a((curenv->*func)());
+}
+ 
+vunits_env_reg::vunits_env_reg(VUNITS_FUNCP f) : func(f)
+{
+}
+
+int vunits_env_reg::get_value(units *val)
+{
+  *val = (curenv->*func)().to_units();
+  return 1;
+}
+
+const char *vunits_env_reg::get_string()
+{
+  return i_to_a((curenv->*func)().to_units());
+}
+
+hunits_env_reg::hunits_env_reg(HUNITS_FUNCP f) : func(f)
+{
+}
+
+int hunits_env_reg::get_value(units *val)
+{
+  *val = (curenv->*func)().to_units();
+  return 1;
+}
+
+const char *hunits_env_reg::get_string()
+{
+  return i_to_a((curenv->*func)().to_units());
+}
+
+string_env_reg::string_env_reg(STRING_FUNCP f) : func(f)
+{
+}
+
+const char *string_env_reg::get_string()
+{
+  return (curenv->*func)();
+}
+
+class horizontal_place_reg : public general_reg {
+public:
+  horizontal_place_reg();
+  int get_value(units *);
+  void set_value(units);
+};
+
+horizontal_place_reg::horizontal_place_reg()
+{
+}
+
+int horizontal_place_reg::get_value(units *res)
+{
+  *res = curenv->get_input_line_position().to_units();
+  return 1;
+}
+
+void horizontal_place_reg::set_value(units n)
+{
+  curenv->set_input_line_position(hunits(n));
+}
+
+const char *environment::get_font_family_string()
+{
+  return family->nm.contents();
+}
+
+const char *environment::get_font_name_string()
+{
+  symbol f = get_font_name(fontno, this);
+  return f.contents();
+}
+
+const char *environment::get_name_string()
+{
+  return name.contents();
+}
+
+// Convert a quantity in scaled points to ascii decimal fraction.
+
+const char *sptoa(int sp)
+{
+  assert(sp > 0);
+  assert(sizescale > 0);
+  if (sizescale == 1)
+    return i_to_a(sp);
+  if (sp % sizescale == 0)
+    return i_to_a(sp/sizescale);
+  // See if 1/sizescale is exactly representable as a decimal fraction,
+  // ie its only prime factors are 2 and 5.
+  int n = sizescale;
+  int power2 = 0;
+  while ((n & 1) == 0) {
+    n >>= 1;
+    power2++;
+  }
+  int power5 = 0;
+  while ((n % 5) == 0) {
+    n /= 5;
+    power5++;
+  }
+  if (n == 1) {
+    int decimal_point = power5 > power2 ? power5 : power2;
+    if (decimal_point <= 10) {
+      int factor = 1;
+      int t;
+      for (t = decimal_point - power2; --t >= 0;)
+	factor *= 2;
+      for (t = decimal_point - power5; --t >= 0;)
+	factor *= 5;
+      if (factor == 1 || sp <= INT_MAX/factor)
+	return if_to_a(sp*factor, decimal_point);
+    }
+  }
+  double s = double(sp)/double(sizescale);
+  double factor = 10.0;
+  double val = s;
+  int decimal_point = 0;
+  do  {
+    double v = ceil(s*factor);
+    if (v > INT_MAX)
+      break;
+    val = v;
+    factor *= 10.0;
+  } while (++decimal_point < 10);
+  return if_to_a(int(val), decimal_point);
+}
+
+const char *environment::get_point_size_string()
+{
+  return sptoa(curenv->get_point_size());
+}
+
+const char *environment::get_requested_point_size_string()
+{
+  return sptoa(curenv->get_requested_point_size());
+}
+
+#define init_int_env_reg(name, func) \
+  number_reg_dictionary.define(name, new int_env_reg(&environment::func))
+
+#define init_vunits_env_reg(name, func) \
+  number_reg_dictionary.define(name, new vunits_env_reg(&environment::func))
+
+#define init_hunits_env_reg(name, func) \
+  number_reg_dictionary.define(name, new hunits_env_reg(&environment::func))
+
+#define init_string_env_reg(name, func) \
+  number_reg_dictionary.define(name, new string_env_reg(&environment::func))
+
+void init_env_requests()
+{
+  init_request("ad", adjust);
+  init_request("br", break_request);
+  init_request("brp", break_spread_request);
+  init_request("c2", no_break_control_char);
+  init_request("cc", control_char);
+  init_request("ce", center);
+  init_request("cu", continuous_underline);
+  init_request("ev", environment_switch);
+  init_request("evc", environment_copy);
+  init_request("fam", family_change);
+  init_request("fc", field_characters);
+  init_request("fi", fill);
+  init_request("ft", font_change);
+  init_request("hc", hyphen_char);
+  init_request("hlm", hyphen_line_max_request);
+  init_request("hy", hyphenate_request);
+  init_request("hym", hyphenation_margin_request);
+  init_request("hys", hyphenation_space_request);
+  init_request("in", indent);
+  init_request("it", input_trap);
+  init_request("itc", input_trap_continued);
+  init_request("lc", leader_character);
+  init_request("linetabs", line_tabs_request);
+  init_request("ll", line_length);
+  init_request("ls", line_spacing);
+  init_request("lt", title_length);
+  init_request("mc", margin_character);
+  init_request("na", no_adjust);
+  init_request("nf", no_fill);
+  init_request("nh", no_hyphenate);
+  init_request("nm", number_lines);
+  init_request("nn", no_number);
+  init_request("ps", point_size);
+  init_request("pvs", post_vertical_spacing);
+  init_request("rj", right_justify);
+  init_request("sizes", override_sizes);
+  init_request("ss", space_size);
+  init_request("ta", set_tabs);
+  init_request("ti", temporary_indent);
+  init_request("tc", tab_character);
+  init_request("tl", title);
+  init_request("ul", underline);
+  init_request("vs", vertical_spacing);
+#ifdef WIDOW_CONTROL
+  init_request("wdc", widow_control_request);
+#endif /* WIDOW_CONTROL */
+  init_int_env_reg(".b", get_bold);
+  init_vunits_env_reg(".cdp", get_prev_char_depth);
+  init_int_env_reg(".ce", get_center_lines);
+  init_vunits_env_reg(".cht", get_prev_char_height);
+  init_hunits_env_reg(".csk", get_prev_char_skew);
+  init_string_env_reg(".ev", get_name_string);
+  init_int_env_reg(".f", get_font);
+  init_string_env_reg(".fam", get_font_family_string);
+  init_string_env_reg(".fn", get_font_name_string);
+  init_int_env_reg(".height", get_char_height);
+  init_int_env_reg(".hlc", get_hyphen_line_count);
+  init_int_env_reg(".hlm", get_hyphen_line_max);
+  init_int_env_reg(".hy", get_hyphenation_flags);
+  init_hunits_env_reg(".hym", get_hyphenation_margin);
+  init_hunits_env_reg(".hys", get_hyphenation_space);
+  init_hunits_env_reg(".i", get_indent);
+  init_hunits_env_reg(".in", get_saved_indent);
+  init_int_env_reg(".int", get_prev_line_interrupted);
+  init_int_env_reg(".linetabs", get_line_tabs);
+  init_hunits_env_reg(".lt", get_title_length);
+  init_int_env_reg(".j", get_adjust_mode);
+  init_hunits_env_reg(".k", get_text_length);
+  init_int_env_reg(".L", get_line_spacing);
+  init_hunits_env_reg(".l", get_line_length);
+  init_hunits_env_reg(".ll", get_saved_line_length);
+  init_hunits_env_reg(".n", get_prev_text_length);
+  init_int_env_reg(".ps", get_point_size);
+  init_int_env_reg(".psr", get_requested_point_size);
+  init_vunits_env_reg(".pvs", get_post_vertical_spacing);
+  init_int_env_reg(".rj", get_right_justify_lines);
+  init_string_env_reg(".s", get_point_size_string);
+  init_int_env_reg(".slant", get_char_slant);
+  init_int_env_reg(".ss", get_space_size);
+  init_int_env_reg(".sss", get_sentence_space_size);
+  init_string_env_reg(".sr", get_requested_point_size_string);
+  init_string_env_reg(".tabs", get_tabs);
+  init_int_env_reg(".u", get_fill);
+  init_vunits_env_reg(".v", get_vertical_spacing);
+  init_hunits_env_reg(".w", get_prev_char_width);
+  number_reg_dictionary.define("ct", new variable_reg(&ct_reg_contents));
+  number_reg_dictionary.define("hp", new horizontal_place_reg);
+  number_reg_dictionary.define("ln", new variable_reg(&next_line_number));
+  number_reg_dictionary.define("rsb", new variable_reg(&rsb_reg_contents));
+  number_reg_dictionary.define("rst", new variable_reg(&rst_reg_contents));
+  number_reg_dictionary.define("sb", new variable_reg(&sb_reg_contents));
+  number_reg_dictionary.define("skw", new variable_reg(&skw_reg_contents));
+  number_reg_dictionary.define("ssc", new variable_reg(&ssc_reg_contents));
+  number_reg_dictionary.define("st", new variable_reg(&st_reg_contents));
+}
+
+// Hyphenation - TeX's hyphenation algorithm with a less fancy implementation.
+
+struct trie_node;
+
+class trie {
+  trie_node *tp;
+  virtual void do_match(int len, void *val) = 0;
+  virtual void do_delete(void *) = 0;
+  void delete_trie_node(trie_node *);
+public:
+  trie() : tp(0) {}
+  virtual ~trie();		// virtual to shut up g++
+  void insert(const char *, int, void *);
+  // find calls do_match for each match it finds
+  void find(const char *pat, int patlen);
+  void clear();
+};
+
+class hyphen_trie : private trie {
+  int *h;
+  void do_match(int i, void *v);
+  void do_delete(void *v);
+  void insert_pattern(const char *pat, int patlen, int *num);
+  void insert_hyphenation(dictionary *ex, const char *pat, int patlen);
+  int hpf_getc(FILE *f);
+public:
+  hyphen_trie() {}
+  ~hyphen_trie() {}
+  void hyphenate(const char *word, int len, int *hyphens);
+  void read_patterns_file(const char *name, int append, dictionary *ex);
+};
+
+struct hyphenation_language {
+  symbol name;
+  dictionary exceptions;
+  hyphen_trie patterns;
+  hyphenation_language(symbol nm) : name(nm), exceptions(501) {}
+  ~hyphenation_language() { }
+};
+
+dictionary language_dictionary(5);
+hyphenation_language *current_language = 0;
+
+static void set_hyphenation_language()
+{
+  symbol nm = get_name(1);
+  if (!nm.is_null()) {
+    current_language = (hyphenation_language *)language_dictionary.lookup(nm);
+    if (!current_language) {
+      current_language = new hyphenation_language(nm);
+      (void)language_dictionary.lookup(nm, (void *)current_language);
+    }
+  }
+  skip_line();
+}
+
+const int WORD_MAX = 256;	// we use unsigned char for offsets in
+				// hyphenation exceptions
+
+static void hyphen_word()
+{
+  if (!current_language) {
+    error("no current hyphenation language");
+    skip_line();
+    return;
+  }
+  char buf[WORD_MAX + 1];
+  unsigned char pos[WORD_MAX + 2];
+  for (;;) {
+    tok.skip();
+    if (tok.newline() || tok.eof())
+      break;
+    int i = 0;
+    int npos = 0;
+    while (i < WORD_MAX && !tok.space() && !tok.newline() && !tok.eof()) {
+      charinfo *ci = tok.get_char(1);
+      if (ci == 0) {
+	skip_line();
+	return;
+      }
+      tok.next();
+      if (ci->get_ascii_code() == '-') {
+	if (i > 0 && (npos == 0 || pos[npos - 1] != i))
+	  pos[npos++] = i;
+      }
+      else {
+	int c = ci->get_hyphenation_code();
+	if (c == 0)
+	  break;
+	buf[i++] = c;
+      }
+    }
+    if (i > 0) {
+      pos[npos] = 0;
+      buf[i] = 0;
+      unsigned char *tem = new unsigned char[npos + 1];
+      memcpy(tem, pos, npos + 1);
+      tem = (unsigned char *)current_language->exceptions.lookup(symbol(buf),
+								 tem);
+      if (tem)
+	a_delete tem;
+    }
+  }
+  skip_line();
+}
+
+struct trie_node {
+  char c;
+  trie_node *down;
+  trie_node *right;
+  void *val;
+  trie_node(char, trie_node *);
+};
+
+trie_node::trie_node(char ch, trie_node *p) 
+: c(ch), down(0), right(p), val(0)
+{
+}
+
+trie::~trie()
+{
+  clear();
+}
+
+void trie::clear()
+{
+  delete_trie_node(tp);
+  tp = 0;
+}
+
+
+void trie::delete_trie_node(trie_node *p)
+{
+  if (p) {
+    delete_trie_node(p->down);
+    delete_trie_node(p->right);
+    if (p->val)
+      do_delete(p->val);
+    delete p;
+  }
+}
+
+void trie::insert(const char *pat, int patlen, void *val)
+{
+  trie_node **p = &tp;
+  assert(patlen > 0 && pat != 0);
+  for (;;) {
+    while (*p != 0 && (*p)->c < pat[0])
+      p = &((*p)->right);
+    if (*p == 0 || (*p)->c != pat[0])
+      *p = new trie_node(pat[0], *p);
+    if (--patlen == 0) {
+      (*p)->val = val;
+      break;
+    }
+    ++pat;
+    p = &((*p)->down);
+  }
+}
+
+void trie::find(const char *pat, int patlen)
+{
+  trie_node *p = tp;
+  for (int i = 0; p != 0 && i < patlen; i++) {
+    while (p != 0 && p->c < pat[i])
+      p = p->right;
+    if (p != 0 && p->c == pat[i]) {
+      if (p->val != 0)
+	do_match(i+1, p->val);
+      p = p->down;
+    }
+    else
+      break;
+  }
+}
+
+struct operation {
+  operation *next;
+  short distance;
+  short num;
+  operation(int, int, operation *);
+};
+
+operation::operation(int i, int j, operation *op)
+: next(op), distance(j), num(i)
+{
+}
+
+void hyphen_trie::insert_pattern(const char *pat, int patlen, int *num)
+{
+  operation *op = 0;
+  for (int i = 0; i < patlen+1; i++)
+    if (num[i] != 0)
+      op = new operation(num[i], patlen - i, op);
+  insert(pat, patlen, op);
+}
+
+void hyphen_trie::insert_hyphenation(dictionary *ex, const char *pat,
+				     int patlen)
+{
+  char buf[WORD_MAX + 1];
+  unsigned char pos[WORD_MAX + 2];
+  int i = 0, j = 0;
+  int npos = 0;
+  while (j < patlen) {
+    unsigned char c = pat[j++];
+    if (c == '-') {
+      if (i > 0 && (npos == 0 || pos[npos - 1] != i))
+	pos[npos++] = i;
+    }
+    else
+      buf[i++] = hpf_code_table[c];
+  }
+  if (i > 0) {
+    pos[npos] = 0;
+    buf[i] = 0;
+    unsigned char *tem = new unsigned char[npos + 1];
+    memcpy(tem, pos, npos + 1);
+    tem = (unsigned char *)ex->lookup(symbol(buf), tem);
+    if (tem)
+      a_delete tem;
+  }
+}
+
+void hyphen_trie::hyphenate(const char *word, int len, int *hyphens)
+{
+  int j;
+  for (j = 0; j < len + 1; j++)
+    hyphens[j] = 0;
+  for (j = 0; j < len - 1; j++) {
+    h = hyphens + j;
+    find(word + j, len - j);
+  }
+}
+
+inline int max(int m, int n)
+{
+  return m > n ? m : n;
+}
+
+void hyphen_trie::do_match(int i, void *v)
+{
+  operation *op = (operation *)v;
+  while (op != 0) {
+    h[i - op->distance] = max(h[i - op->distance], op->num);
+    op = op->next;
+  }
+}
+
+void hyphen_trie::do_delete(void *v)
+{
+  operation *op = (operation *)v;
+  while (op) {
+    operation *tem = op;
+    op = tem->next;
+    delete tem;
+  }
+}
+
+/* We use very simple rules to parse TeX's hyphenation patterns.
+
+   . `%' starts a comment even if preceded by `\'.
+
+   . No support for digraphs and like `\$'.
+
+   . `^^xx' (`x' is 0-9 or a-f), and `^^x' (character code of `x' in the
+     range 0-127) are recognized; other use of `^' causes an error.
+
+   . No macro expansion.
+
+   . We check for the expression `\patterns{...}' (possibly with
+     whitespace before and after the braces).  Everything between the
+     braces is taken as hyphenation patterns.  Consequently, `{' and `}'
+     are not allowed in patterns.
+
+   . Similarly, `\hyphenation{...}' gives a list of hyphenation
+     exceptions.
+
+   . `\endinput' is recognized also.
+
+   . For backwards compatibility, if `\patterns' is missing, the
+     whole file is treated as a list of hyphenation patterns (only
+     recognizing `%' as the start of a comment.
+
+*/
+
+int hyphen_trie::hpf_getc(FILE *f)
+{
+  int c = getc(f);
+  int c1;
+  int cc = 0;
+  if (c != '^')
+    return c;
+  c = getc(f);
+  if (c != '^')
+    goto fail;
+  c = getc(f);
+  c1 = getc(f);
+  if (((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'))
+      && ((c1 >= '0' && c1 <= '9') || (c1 >= 'a' && c1 <= 'f'))) {
+    if (c >= '0' && c <= '9')
+      c -= '0';
+    else
+      c = c - 'a' + 10;
+    if (c1 >= '0' && c1 <= '9')
+      c1 -= '0';
+    else
+      c1 = c1 - 'a' + 10;
+    cc = c * 16 + c1;
+  }
+  else {
+    ungetc(c1, f);
+    if (c >= 0 && c <= 63)
+      cc = c + 64;
+    else if (c >= 64 && c <= 127)
+      cc = c - 64;
+    else
+      goto fail;
+  }
+  return cc;
+fail:
+  error("invalid ^, ^^x, or ^^xx character in hyphenation patterns file");
+  return c;
+}
+
+void hyphen_trie::read_patterns_file(const char *name, int append,
+				     dictionary *ex)
+{
+  if (!append)
+    clear();
+  char buf[WORD_MAX];
+  for (int i = 0; i < WORD_MAX; i++)
+    buf[i] = 0;
+  int num[WORD_MAX+1];
+  errno = 0;
+  char *path = 0;
+  FILE *fp = mac_path->open_file(name, &path);
+  if (fp == 0) {
+    error("can't find hyphenation patterns file `%1'", name);
+    return;
+  }
+  int c = hpf_getc(fp);
+  int have_patterns = 0;	// we've seen \patterns
+  int final_pattern = 0;	// 1 if we have a trailing closing brace
+  int have_hyphenation = 0;	// we've seen \hyphenation
+  int final_hyphenation = 0;	// 1 if we have a trailing closing brace
+  int have_keyword = 0;		// we've seen either \patterns or \hyphenation
+  int traditional = 0;		// don't handle \patterns
+  for (;;) {
+    for (;;) {
+      if (c == '%') {		// skip comments
+	do {
+	  c = getc(fp);
+	} while (c != EOF && c != '\n');
+      }
+      if (c == EOF || !csspace(c))
+	break;
+      c = hpf_getc(fp);
+    }
+    if (c == EOF) {
+      if (have_keyword || traditional)	// we are done
+	break;
+      else {				// rescan file in `traditional' mode
+	rewind(fp);
+	traditional = 1;
+	c = hpf_getc(fp);
+	continue;
+      }
+    }
+    int i = 0;
+    num[0] = 0;
+    if (!(c == '{' || c == '}')) {	// skip braces at line start
+      do {				// scan patterns
+	if (csdigit(c))
+	  num[i] = c - '0';
+	else {
+	  buf[i++] = c;
+	  num[i] = 0;
+	}
+	c = hpf_getc(fp);
+      } while (i < WORD_MAX && c != EOF && !csspace(c)
+	       && c != '%' && c != '{' && c != '}');
+    }
+    if (!traditional) {
+      if (i >= 9 && !strncmp(buf + i - 9, "\\patterns", 9)) {
+	while (csspace(c))
+	  c = hpf_getc(fp);
+	if (c == '{') {
+	  if (have_patterns || have_hyphenation)
+	    error("`{' not allowed inside of \\patterns or \\hyphenation");
+	  else {
+	    have_patterns = 1;
+	    have_keyword = 1;
+	  }
+	  c = hpf_getc(fp);
+	  continue;
+	}
+      }
+      else if (i >= 12 && !strncmp(buf + i - 12, "\\hyphenation", 12)) {
+	while (csspace(c))
+	  c = hpf_getc(fp);
+	if (c == '{') {
+	  if (have_patterns || have_hyphenation)
+	    error("`{' not allowed inside of \\patterns or \\hyphenation");
+	  else {
+	    have_hyphenation = 1;
+	    have_keyword = 1;
+	  }
+	  c = hpf_getc(fp);
+	  continue;
+	}
+      }
+      else if (strstr(buf, "\\endinput")) {
+	if (have_patterns || have_hyphenation)
+	  error("found \\endinput inside of %1 group",
+		have_patterns ? "\\patterns" : "\\hyphenation");
+	break;
+      }
+      else if (c == '}') {
+	if (have_patterns) {
+	  have_patterns = 0;
+	  if (i > 0)
+	    final_pattern = 1;
+	}
+	else if (have_hyphenation) {
+	  have_hyphenation = 0;
+	  if (i > 0)
+	    final_hyphenation = 1;
+	}
+	c = hpf_getc(fp);
+      }
+      else if (c == '{')		// skipped if not starting \patterns
+	c = hpf_getc(fp);		// or \hyphenation
+    }
+    if (i > 0) {
+      if (have_patterns || final_pattern || traditional) {
+	for (int j = 0; j < i; j++)
+	  buf[j] = hpf_code_table[(unsigned char)buf[j]];
+	insert_pattern(buf, i, num);
+	final_pattern = 0;
+      }
+      else if (have_hyphenation || final_hyphenation) {
+	insert_hyphenation(ex, buf, i);
+	final_hyphenation = 0;
+      }
+    }
+  }
+  fclose(fp);
+  a_delete path;
+  return;
+}
+
+void hyphenate(hyphen_list *h, unsigned flags)
+{
+  if (!current_language)
+    return;
+  while (h) {
+    while (h && h->hyphenation_code == 0)
+      h = h->next;
+    int len = 0;
+    char hbuf[WORD_MAX+2];
+    char *buf = hbuf + 1;
+    hyphen_list *tem;
+    for (tem = h; tem && len < WORD_MAX; tem = tem->next) {
+      if (tem->hyphenation_code != 0)
+	buf[len++] = tem->hyphenation_code;
+      else
+	break;
+    }
+    hyphen_list *nexth = tem;
+    if (len > 2) {
+      buf[len] = 0;
+      unsigned char *pos
+	= (unsigned char *)current_language->exceptions.lookup(buf);
+      if (pos != 0) {
+	int j = 0;
+	int i = 1;
+	for (tem = h; tem != 0; tem = tem->next, i++)
+	  if (pos[j] == i) {
+	    tem->hyphen = 1;
+	    j++;
+	  }
+      }
+      else {
+	hbuf[0] = hbuf[len+1] = '.';
+	int num[WORD_MAX+3];
+	current_language->patterns.hyphenate(hbuf, len+2, num);
+	int i;
+	num[2] = 0;
+	if (flags & 8)
+	  num[3] = 0;
+	if (flags & 4)
+	  --len;
+	for (i = 2, tem = h; i < len && tem; tem = tem->next, i++)
+	  if (num[i] & 1)
+	    tem->hyphen = 1;
+      }
+    }
+    h = nexth;
+  }
+}
+
+static void do_hyphenation_patterns_file(int append)
+{
+  symbol name = get_long_name(1);
+  if (!name.is_null()) {
+    if (!current_language)
+      error("no current hyphenation language");
+    else
+      current_language->patterns.read_patterns_file(
+			  name.contents(), append,
+			  &current_language->exceptions);
+  }
+  skip_line();
+}
+
+static void hyphenation_patterns_file()
+{
+  do_hyphenation_patterns_file(0);
+}
+
+static void hyphenation_patterns_file_append()
+{
+  do_hyphenation_patterns_file(1);
+}
+
+class hyphenation_language_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *hyphenation_language_reg::get_string()
+{
+  return current_language ? current_language->name.contents() : "";
+}
+
+void init_hyphen_requests()
+{
+  init_request("hw", hyphen_word);
+  init_request("hla", set_hyphenation_language);
+  init_request("hpf", hyphenation_patterns_file);
+  init_request("hpfa", hyphenation_patterns_file_append);
+  number_reg_dictionary.define(".hla", new hyphenation_language_reg);
+}
diff --git a/contrib/groff/src/roff/troff/glyphuni.cpp b/contrib/groff/src/roff/troff/glyphuni.cpp
new file mode 100644
index 0000000..7e242ce
--- /dev/null
+++ b/contrib/groff/src/roff/troff/glyphuni.cpp
@@ -0,0 +1,503 @@
+// -*- C++ -*-
+/* Copyright (C) 2002, 2003
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg <wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+#include "stringclass.h"
+#include "ptable.h"
+
+#include "unicode.h"
+
+struct glyph_to_unicode {
+  char *value;
+};
+
+declare_ptable(glyph_to_unicode)
+implement_ptable(glyph_to_unicode)
+
+PTABLE(glyph_to_unicode) glyph_to_unicode_table;
+
+struct {
+  const char *key;
+  const char *value;
+} glyph_to_unicode_list[] = {
+  { "!", "0021" },
+  { "\"", "0022" },
+  { "dq", "0022" },
+  { "#", "0023" },
+  { "sh", "0023" },
+  { "$", "0024" },
+  { "Do", "0024" },
+  { "%", "0025" },
+  { "&", "0026" },
+  { "aq", "0027" },
+  { "(", "0028" },
+  { ")", "0029" },
+  { "*", "002A" },
+  { "+", "002B" },
+  { "pl", "002B" },
+  { ",", "002C" },
+  { ".", "002E" },
+  { "/", "002F" },
+  { "sl", "002F" },
+  { "0", "0030" },
+  { "1", "0031" },
+  { "2", "0032" },
+  { "3", "0033" },
+  { "4", "0034" },
+  { "5", "0035" },
+  { "6", "0036" },
+  { "7", "0037" },
+  { "8", "0038" },
+  { "9", "0039" },
+  { ":", "003A" },
+  { ";", "003B" },
+  { "<", "003C" },
+  { "=", "003D" },
+  { "eq", "003D" },
+  { ">", "003E" },
+  { "?", "003F" },
+  { "@", "0040" },
+  { "at", "0040" },
+  { "A", "0041" },
+  { "B", "0042" },
+  { "C", "0043" },
+  { "D", "0044" },
+  { "E", "0045" },
+  { "F", "0046" },
+  { "G", "0047" },
+  { "H", "0048" },
+  { "I", "0049" },
+  { "J", "004A" },
+  { "K", "004B" },
+  { "L", "004C" },
+  { "M", "004D" },
+  { "N", "004E" },
+  { "O", "004F" },
+  { "P", "0050" },
+  { "Q", "0051" },
+  { "R", "0052" },
+  { "S", "0053" },
+  { "T", "0054" },
+  { "U", "0055" },
+  { "V", "0056" },
+  { "W", "0057" },
+  { "X", "0058" },
+  { "Y", "0059" },
+  { "Z", "005A" },
+//{ "[", "005B" },
+  { "lB", "005B" },
+//{ "\\", "005C" },
+  { "rs", "005C" },
+//{ "]", "005D" },
+  { "rB", "005D" },
+  { "a^", "005E" },
+  { "^", "005E" },
+  { "ha", "005E" },
+  { "_", "005F" },
+  { "ru", "005F" },
+  { "ul", "005F" },
+//{ "\\`", "0060" },
+  { "ga", "0060" },
+  { "a", "0061" },
+  { "b", "0062" },
+  { "c", "0063" },
+  { "d", "0064" },
+  { "e", "0065" },
+  { "f", "0066" },
+  { "ff", "0066_0066" },
+  { "Fi", "0066_0066_0069" },
+  { "Fl", "0066_0066_006C" },
+  { "fi", "0066_0069" },
+  { "fl", "0066_006C" },
+  { "g", "0067" },
+  { "h", "0068" },
+  { "i", "0069" },
+  { "j", "006A" },
+  { "k", "006B" },
+  { "l", "006C" },
+  { "m", "006D" },
+  { "n", "006E" },
+  { "o", "006F" },
+  { "p", "0070" },
+  { "q", "0071" },
+  { "r", "0072" },
+  { "s", "0073" },
+  { "t", "0074" },
+  { "u", "0075" },
+  { "v", "0076" },
+  { "w", "0077" },
+  { "x", "0078" },
+  { "y", "0079" },
+  { "z", "007A" },
+  { "lC", "007B" },
+  { "{", "007B" },
+  { "ba", "007C" },
+  { "or", "007C" },
+  { "|", "007C" },
+  { "rC", "007D" },
+  { "}", "007D" },
+  { "a~", "007E" },
+  { "~", "007E" },
+  { "ti", "007E" },
+  { "r!", "00A1" },
+  { "ct", "00A2" },
+  { "Po", "00A3" },
+  { "Cs", "00A4" },
+  { "Ye", "00A5" },
+  { "bb", "00A6" },
+  { "sc", "00A7" },
+  { "ad", "00A8" },
+  { "co", "00A9" },
+  { "Of", "00AA" },
+  { "Fo", "00AB" },
+  { "no", "00AC" },
+  { "tno", "00AC" },
+  { "shc", "00AD" },
+  { "rg", "00AE" },
+  { "a-", "00AF" },
+  { "de", "00B0" },
+  { "+-", "00B1" },
+  { "t+-", "00B1" },
+  { "S2", "00B2" },
+  { "S3", "00B3" },
+  { "aa", "00B4" },
+//{ "\\'", "00B4" },
+  { "mc", "00B5" },
+  { "ps", "00B6" },
+  { "pc", "00B7" },
+  { "ac", "00B8" },
+  { "S1", "00B9" },
+  { "Om", "00BA" },
+  { "Fc", "00BB" },
+  { "14", "00BC" },
+  { "12", "00BD" },
+  { "34", "00BE" },
+  { "r?", "00BF" },
+  { "`A", "00C0" },
+  { "'A", "00C1" },
+  { "^A", "00C2" },
+  { "~A", "00C3" },
+  { ":A", "00C4" },
+  { "oA", "00C5" },
+  { "AE", "00C6" },
+  { ",C", "00C7" },
+  { "`E", "00C8" },
+  { "'E", "00C9" },
+  { "^E", "00CA" },
+  { ":E", "00CB" },
+  { "`I", "00CC" },
+  { "'I", "00CD" },
+  { "^I", "00CE" },
+  { ":I", "00CF" },
+  { "-D", "00D0" },
+  { "~N", "00D1" },
+  { "`O", "00D2" },
+  { "'O", "00D3" },
+  { "^O", "00D4" },
+  { "~O", "00D5" },
+  { ":O", "00D6" },
+  { "mu", "00D7" },
+  { "tmu", "00D7" },
+  { "/O", "00D8" },
+  { "`U", "00D9" },
+  { "'U", "00DA" },
+  { "^U", "00DB" },
+  { ":U", "00DC" },
+  { "'Y", "00DD" },
+  { "TP", "00DE" },
+  { "ss", "00DF" },
+  { "`a", "00E0" },
+  { "'a", "00E1" },
+  { "^a", "00E2" },
+  { "~a", "00E3" },
+  { ":a", "00E4" },
+  { "oa", "00E5" },
+  { "ae", "00E6" },
+  { ",c", "00E7" },
+  { "`e", "00E8" },
+  { "'e", "00E9" },
+  { "^e", "00EA" },
+  { ":e", "00EB" },
+  { "`i", "00EC" },
+  { "'i", "00ED" },
+  { "^i", "00EE" },
+  { ":i", "00EF" },
+  { "Sd", "00F0" },
+  { "~n", "00F1" },
+  { "`o", "00F2" },
+  { "'o", "00F3" },
+  { "^o", "00F4" },
+  { "~o", "00F5" },
+  { ":o", "00F6" },
+  { "di", "00F7" },
+  { "tdi", "00F7" },
+  { "/o", "00F8" },
+  { "`u", "00F9" },
+  { "'u", "00FA" },
+  { "^u", "00FB" },
+  { ":u", "00FC" },
+  { "'y", "00FD" },
+  { "Tp", "00FE" },
+  { ":y", "00FF" },
+  { "'C", "0106" },
+  { "'c", "0107" },
+  { ".i", "0131" },
+  { "IJ", "0132" },
+  { "ij", "0133" },
+  { "/L", "0141" },
+  { "/l", "0142" },
+  { "OE", "0152" },
+  { "oe", "0153" },
+  { "vS", "0160" },
+  { "vs", "0161" },
+  { ":Y", "0178" },
+  { "vZ", "017D" },
+  { "vz", "017E" },
+  { "Fn", "0192" },
+  { "ah", "02C7" },
+  { "ab", "02D8" },
+  { "a.", "02D9" },
+  { "ao", "02DA" },
+  { "ho", "02DB" },
+  { "a\"", "02DD" },
+  { "*A", "0391" },
+  { "*B", "0392" },
+  { "*G", "0393" },
+  { "*D", "0394" },
+  { "*E", "0395" },
+  { "*Z", "0396" },
+  { "*Y", "0397" },
+  { "*H", "0398" },
+  { "*I", "0399" },
+  { "*K", "039A" },
+  { "*L", "039B" },
+  { "*M", "039C" },
+  { "*N", "039D" },
+  { "*C", "039E" },
+  { "*O", "039F" },
+  { "*P", "03A0" },
+  { "*R", "03A1" },
+  { "*S", "03A3" },
+  { "*T", "03A4" },
+  { "*U", "03A5" },
+  { "*F", "03A6" },
+  { "*X", "03A7" },
+  { "*Q", "03A8" },
+  { "*W", "03A9" },
+  { "*a", "03B1" },
+  { "*b", "03B2" },
+  { "*g", "03B3" },
+  { "*d", "03B4" },
+  { "*e", "03B5" },
+  { "*z", "03B6" },
+  { "*y", "03B7" },
+  { "*h", "03B8" },
+  { "*i", "03B9" },
+  { "*k", "03BA" },
+  { "*l", "03BB" },
+  { "*m", "03BC" },
+  { "*n", "03BD" },
+  { "*c", "03BE" },
+  { "*o", "03BF" },
+  { "*p", "03C0" },
+  { "*r", "03C1" },
+  { "ts", "03C2" },
+  { "*s", "03C3" },
+  { "*t", "03C4" },
+  { "*u", "03C5" },
+  { "*f", "03C6" },
+  { "*x", "03C7" },
+  { "*q", "03C8" },
+  { "*w", "03C9" },
+  { "+h", "03D1" },
+  { "+f", "03D5" },
+  { "+p", "03D6" },
+  { "+e", "03F5" },
+  { "-", "2010" },
+  { "hy", "2010" },
+  { "en", "2013" },
+  { "em", "2014" },
+  { "`", "2018" },
+  { "oq", "2018" },
+  { "'", "2019" },
+  { "cq", "2019" },
+  { "bq", "201A" },
+  { "lq", "201C" },
+  { "rq", "201D" },
+  { "Bq", "201E" },
+  { "dg", "2020" },
+  { "dd", "2021" },
+  { "bu", "2022" },
+  { "%0", "2030" },
+  { "fm", "2032" },
+  { "sd", "2033" },
+  { "fo", "2039" },
+  { "fc", "203A" },
+  { "rn", "203E" },
+  { "f/", "2044" },
+  { "eu", "20AC" },
+  { "Eu", "20AC" },
+  { "-h", "210F" },
+  { "hbar", "210F" },
+  { "Im", "2111" },
+  { "wp", "2118" },
+  { "Re", "211C" },
+  { "tm", "2122" },
+  { "Ah", "2135" },
+  { "18", "215B" },
+  { "38", "215C" },
+  { "58", "215D" },
+  { "78", "215E" },
+  { "<-", "2190" },
+  { "ua", "2191" },
+  { "->", "2192" },
+  { "da", "2193" },
+  { "<>", "2194" },
+  { "va", "2195" },
+  { "CR", "21B5" },
+  { "lA", "21D0" },
+  { "uA", "21D1" },
+  { "rA", "21D2" },
+  { "dA", "21D3" },
+  { "hA", "21D4" },
+  { "vA", "21D5" },
+  { "fa", "2200" },
+  { "pd", "2202" },
+  { "te", "2203" },
+  { "es", "2205" },
+  { "gr", "2207" },
+  { "mo", "2208" },
+  { "nm", "2209" },
+  { "st", "220B" },
+  { "product", "220F" },
+  { "sum", "2211" },
+//{ "\\-", "2212" },
+  { "mi", "2212" },
+  { "-+", "2213" },
+  { "**", "2217" },
+  { "sr", "221A" },
+  { "pt", "221D" },
+  { "if", "221E" },
+  { "/_", "2220" },
+  { "AN", "2227" },
+  { "OR", "2228" },
+  { "ca", "2229" },
+  { "cu", "222A" },
+  { "is", "222B" },
+  { "integral", "222B" },
+  { "tf", "2234" },
+  { "3d", "2234" },
+  { "ap", "223C" },
+  { "|=", "2243" },
+  { "=~", "2245" },
+  { "~~", "2248" },
+  { "~=", "2248" },
+  { "!=", "2260" },
+  { "==", "2261" },
+  { "ne", "2262" },
+  { "<=", "2264" },
+  { ">=", "2265" },
+  { ">>", "226A" },
+  { "<<", "226B" },
+  { "sb", "2282" },
+  { "sp", "2283" },
+  { "nb", "2284" },
+  { "nc", "2285" },
+  { "ib", "2286" },
+  { "ip", "2287" },
+  { "c+", "2295" },
+  { "c*", "2297" },
+  { "pp", "22A5" },
+  { "md", "22C5" },
+  { "lc", "2308" },
+  { "rc", "2309" },
+  { "lf", "230A" },
+  { "rf", "230B" },
+  { "parenlefttp", "239B" },
+  { "parenleftex", "239C" },
+  { "parenleftbt", "239D" },
+  { "parenrighttp", "239E" },
+  { "parenrightex", "239F" },
+  { "parenrightbt", "23A0" },
+  { "bracketlefttp", "23A1" },
+  { "bracketleftex", "23A2" },
+  { "bracketleftbt", "23A3" },
+  { "bracketrighttp", "23A4" },
+  { "bracketrightex", "23A5" },
+  { "bracketrightbt", "23A6" },
+  { "lt", "23A7" },
+  { "bracelefttp", "23A7" },
+  { "lk", "23A8" },
+  { "braceleftmid", "23A8" },
+  { "lb", "23A9" },
+  { "braceleftbt", "23A9" },
+  { "bv", "23AA" },
+  { "braceex", "23AA" },
+  { "braceleftex", "23AA" },
+  { "bracerightex", "23AA" },
+  { "rt", "23AB" },
+  { "bracerighttp", "23AB" },
+  { "rk", "23AC" },
+  { "bracerightmid", "23AC" },
+  { "rb", "23AD" },
+  { "bracerightbt", "23AD" },
+  { "an", "23AF" },
+  { "br", "2502" },
+  { "rk", "251D" },
+  { "lk", "2525" },
+  { "lt", "256D" },
+  { "rt", "256E" },
+  { "rb", "256F" },
+  { "lb", "2570" },
+  { "sq", "25A1" },
+  { "lz", "25CA" },
+  { "ci", "25CB" },
+  { "lh", "261C" },
+  { "rh", "261E" },
+  { "SP", "2660" },
+  { "CL", "2663" },
+  { "HE", "2665" },
+  { "DI", "2666" },
+  { "OK", "2713" },
+  { "la", "27E8" },
+  { "ra", "27E9" },
+};
+
+// global constructor
+static struct glyph_to_unicode_init {
+  glyph_to_unicode_init();
+} _glyph_to_unicode_init;
+
+glyph_to_unicode_init::glyph_to_unicode_init() {
+  for (unsigned int i = 0;
+       i < sizeof(glyph_to_unicode_list)/sizeof(glyph_to_unicode_list[0]);
+       i++) {
+    glyph_to_unicode *gtu = new glyph_to_unicode[1];
+    gtu->value = (char *)glyph_to_unicode_list[i].value;
+    glyph_to_unicode_table.define(glyph_to_unicode_list[i].key, gtu);
+  }
+}
+
+const char *glyph_name_to_unicode(const char *s)
+{
+  glyph_to_unicode *result = glyph_to_unicode_table.lookup(s);
+  return result ? result->value : 0;
+}
diff --git a/contrib/groff/src/roff/troff/input.cpp b/contrib/groff/src/roff/troff/input.cpp
new file mode 100644
index 0000000..55178a2
--- /dev/null
+++ b/contrib/groff/src/roff/troff/input.cpp
@@ -0,0 +1,7879 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+#include "hvunits.h"
+#include "env.h"
+#include "request.h"
+#include "node.h"
+#include "reg.h"
+#include "token.h"
+#include "div.h"
+#include "charinfo.h"
+#include "stringclass.h"
+#include "font.h"
+#include "macropath.h"
+#include "defs.h"
+#include "input.h"
+#include "unicode.h"
+
+// Needed for getpid() and isatty()
+#include "posix.h"
+
+#include "nonposix.h"
+
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
+#define MACRO_PREFIX "tmac."
+#define MACRO_POSTFIX ".tmac"
+#define INITIAL_STARTUP_FILE "troffrc"
+#define FINAL_STARTUP_FILE   "troffrc-end"
+#define DEFAULT_INPUT_STACK_LIMIT 1000
+
+#ifndef DEFAULT_WARNING_MASK
+// warnings that are enabled by default
+#define DEFAULT_WARNING_MASK \
+     (WARN_CHAR|WARN_NUMBER|WARN_BREAK|WARN_SPACE|WARN_FONT)
+#endif
+
+// initial size of buffer for reading names; expanded as necessary
+#define ABUF_SIZE 16
+
+extern "C" const char *Version_string;
+
+#ifdef COLUMN
+void init_column_requests();
+#endif /* COLUMN */
+
+static node *read_draw_node();
+static void read_color_draw_node(token &);
+void handle_first_page_transition();
+static void push_token(const token &);
+void copy_file();
+#ifdef COLUMN
+void vjustify();
+#endif /* COLUMN */
+void transparent_file();
+void process_input_stack();
+
+const char *program_name = 0;
+token tok;
+int break_flag = 0;
+int color_flag = 1;		// colors are on by default
+static int backtrace_flag = 0;
+#ifndef POPEN_MISSING
+char *pipe_command = 0;
+#endif
+charinfo *charset_table[256];
+unsigned char hpf_code_table[256];
+
+static int warning_mask = DEFAULT_WARNING_MASK;
+static int inhibit_errors = 0;
+static int ignoring = 0;
+
+static void enable_warning(const char *);
+static void disable_warning(const char *);
+
+static int escape_char = '\\';
+static symbol end_macro_name;
+static symbol blank_line_macro_name;
+static int compatible_flag = 0;
+int ascii_output_flag = 0;
+int suppress_output_flag = 0;
+int is_html = 0;
+int begin_level = 0;		// number of nested .begin requests
+
+int have_input = 0;		// whether \f, \F, \D'F...', \H, \m, \M,
+				// \R, \s, or \S has been processed in
+				// token::next()
+int tcommand_flag = 0;
+int safer_flag = 1;		// safer by default
+
+int have_string_arg = 0;	// whether we have \*[foo bar...]
+
+double spread_limit = -3.0 - 1.0;	// negative means deactivated
+
+double warn_scale;
+char warn_scaling_indicator;
+
+search_path *mac_path = &safer_macro_path;
+
+static int get_copy(node**, int = 0);
+static void copy_mode_error(const char *,
+			    const errarg & = empty_errarg,
+			    const errarg & = empty_errarg,
+			    const errarg & = empty_errarg);
+
+enum read_mode { ALLOW_EMPTY, WITH_ARGS, NO_ARGS };
+static symbol read_escape_name(read_mode mode = NO_ARGS);
+static symbol read_long_escape_name(read_mode mode = NO_ARGS);
+static void interpolate_string(symbol);
+static void interpolate_string_with_args(symbol);
+static void interpolate_macro(symbol);
+static void interpolate_number_format(symbol);
+static void interpolate_environment_variable(symbol);
+
+static symbol composite_glyph_name(symbol);
+static void interpolate_arg(symbol);
+static request_or_macro *lookup_request(symbol);
+static int get_delim_number(units *, int);
+static int get_delim_number(units *, int, units);
+static symbol do_get_long_name(int, char);
+static int get_line_arg(units *res, int si, charinfo **cp);
+static int read_size(int *);
+static symbol get_delim_name();
+static void init_registers();
+static void trapping_blank_line();
+
+struct input_iterator;
+input_iterator *make_temp_iterator(const char *);
+const char *input_char_description(int);
+
+
+void set_escape_char()
+{
+  if (has_arg()) {
+    if (tok.ch() == 0) {
+      error("bad escape character");
+      escape_char = '\\';
+    }
+    else
+      escape_char = tok.ch();
+  }
+  else
+    escape_char = '\\';
+  skip_line();
+}
+
+void escape_off()
+{
+  escape_char = 0;
+  skip_line();
+}
+
+static int saved_escape_char = '\\';
+
+void save_escape_char()
+{
+  saved_escape_char = escape_char;
+  skip_line();
+}
+
+void restore_escape_char()
+{
+  escape_char = saved_escape_char;
+  skip_line();
+}
+
+class input_iterator {
+public:
+  input_iterator();
+  virtual ~input_iterator() {}
+  int get(node **);
+  friend class input_stack;
+protected:
+  const unsigned char *ptr;
+  const unsigned char *eptr;
+  input_iterator *next;
+private:
+  virtual int fill(node **);
+  virtual int peek();
+  virtual int has_args() { return 0; }
+  virtual int nargs() { return 0; }
+  virtual input_iterator *get_arg(int) { return 0; }
+  virtual int get_location(int, const char **, int *) { return 0; }
+  virtual void backtrace() {}
+  virtual int set_location(const char *, int) { return 0; }
+  virtual int next_file(FILE *, const char *) { return 0; }
+  virtual void shift(int) {}
+  virtual int is_boundary() {return 0; }
+  virtual int internal_level() { return 0; }
+  virtual int is_file() { return 0; }
+  virtual int is_macro() { return 0; }
+  virtual void save_compatible_flag(int) {}
+  virtual int get_compatible_flag() { return 0; }
+};
+
+input_iterator::input_iterator()
+: ptr(0), eptr(0)
+{
+}
+
+int input_iterator::fill(node **)
+{
+  return EOF;
+}
+
+int input_iterator::peek()
+{
+  return EOF;
+}
+
+inline int input_iterator::get(node **p)
+{
+  return ptr < eptr ? *ptr++ : fill(p);
+}
+
+class input_boundary : public input_iterator {
+public:
+  int is_boundary() { return 1; }
+};
+
+class input_return_boundary : public input_iterator {
+public:
+  int is_boundary() { return 2; }
+};
+
+class file_iterator : public input_iterator {
+  FILE *fp;
+  int lineno;
+  const char *filename;
+  int popened;
+  int newline_flag;
+  int seen_escape;
+  enum { BUF_SIZE = 512 };
+  unsigned char buf[BUF_SIZE];
+  void close();
+public:
+  file_iterator(FILE *, const char *, int = 0);
+  ~file_iterator();
+  int fill(node **);
+  int peek();
+  int get_location(int, const char **, int *);
+  void backtrace();
+  int set_location(const char *, int);
+  int next_file(FILE *, const char *);
+  int is_file();
+};
+
+file_iterator::file_iterator(FILE *f, const char *fn, int po)
+: fp(f), lineno(1), filename(fn), popened(po),
+  newline_flag(0), seen_escape(0)
+{
+  if ((font::use_charnames_in_special) && (fn != 0)) {
+    if (!the_output)
+      init_output();
+    the_output->put_filename(fn);
+  }
+}
+
+file_iterator::~file_iterator()
+{
+  close();
+}
+
+void file_iterator::close()
+{
+  if (fp == stdin)
+    clearerr(stdin);
+#ifndef POPEN_MISSING
+  else if (popened)
+    pclose(fp);
+#endif /* not POPEN_MISSING */
+  else
+    fclose(fp);
+}
+
+int file_iterator::is_file()
+{
+  return 1;
+}
+
+int file_iterator::next_file(FILE *f, const char *s)
+{
+  close();
+  filename = s;
+  fp = f;
+  lineno = 1;
+  newline_flag = 0;
+  seen_escape = 0;
+  popened = 0;
+  ptr = 0;
+  eptr = 0;
+  return 1;
+}
+
+int file_iterator::fill(node **)
+{
+  if (newline_flag)
+    lineno++;
+  newline_flag = 0;
+  unsigned char *p = buf;
+  ptr = p;
+  unsigned char *e = p + BUF_SIZE;
+  while (p < e) {
+    int c = getc(fp);
+    if (c == EOF)
+      break;
+    if (invalid_input_char(c))
+      warning(WARN_INPUT, "invalid input character code %1", int(c));
+    else {
+      *p++ = c;
+      if (c == '\n') {
+	seen_escape = 0;
+	newline_flag = 1;
+	break;
+      }
+      seen_escape = (c == '\\');
+    }
+  }
+  if (p > buf) {
+    eptr = p;
+    return *ptr++;
+  }
+  else {
+    eptr = p;
+    return EOF;
+  }
+}
+
+int file_iterator::peek()
+{
+  int c = getc(fp);
+  while (invalid_input_char(c)) {
+    warning(WARN_INPUT, "invalid input character code %1", int(c));
+    c = getc(fp);
+  }
+  if (c != EOF)
+    ungetc(c, fp);
+  return c;
+}
+
+int file_iterator::get_location(int /*allow_macro*/,
+				const char **filenamep, int *linenop)
+{
+  *linenop = lineno;
+  if (filename != 0 && strcmp(filename, "-") == 0)
+    *filenamep = "<standard input>";
+  else
+    *filenamep = filename;
+  return 1;
+}
+
+void file_iterator::backtrace()
+{
+  errprint("%1:%2: backtrace: %3 `%1'\n", filename, lineno,
+	   popened ? "process" : "file");
+}
+
+int file_iterator::set_location(const char *f, int ln)
+{
+  if (f) {
+    filename = f;
+    if (!the_output)
+      init_output();
+    the_output->put_filename(f);
+  }
+  lineno = ln;
+  return 1;
+}
+
+input_iterator nil_iterator;
+
+class input_stack {
+public:
+  static int get(node **);
+  static int peek();
+  static void push(input_iterator *);
+  static input_iterator *get_arg(int);
+  static int nargs();
+  static int get_location(int, const char **, int *);
+  static int set_location(const char *, int);
+  static void backtrace();
+  static void backtrace_all();
+  static void next_file(FILE *, const char *);
+  static void end_file();
+  static void shift(int n);
+  static void add_boundary();
+  static void add_return_boundary();
+  static int is_return_boundary();
+  static void remove_boundary();
+  static int get_level();
+  static void clear();
+  static void pop_macro();
+  static void save_compatible_flag(int);
+  static int get_compatible_flag();
+
+  static int limit;
+private:
+  static input_iterator *top;
+  static int level;
+
+  static int finish_get(node **);
+  static int finish_peek();
+};
+
+input_iterator *input_stack::top = &nil_iterator;
+int input_stack::level = 0;
+int input_stack::limit = DEFAULT_INPUT_STACK_LIMIT;
+
+inline int input_stack::get_level()
+{
+  return level + top->internal_level();
+}
+
+inline int input_stack::get(node **np)
+{
+  int res = (top->ptr < top->eptr) ? *top->ptr++ : finish_get(np);
+  if (res == '\n')
+    have_input = 0;
+  return res;
+}
+
+int input_stack::finish_get(node **np)
+{
+  for (;;) {
+    int c = top->fill(np);
+    if (c != EOF || top->is_boundary())
+      return c;
+    if (top == &nil_iterator)
+      break;
+    input_iterator *tem = top;
+    top = top->next;
+    level--;
+    delete tem;
+    if (top->ptr < top->eptr)
+      return *top->ptr++;
+  }
+  assert(level == 0);
+  return EOF;
+}
+
+inline int input_stack::peek()
+{
+  return (top->ptr < top->eptr) ? *top->ptr : finish_peek();
+}
+
+int input_stack::finish_peek()
+{
+  for (;;) {
+    int c = top->peek();
+    if (c != EOF || top->is_boundary())
+      return c;
+    if (top == &nil_iterator)
+      break;
+    input_iterator *tem = top;
+    top = top->next;
+    level--;
+    delete tem;
+    if (top->ptr < top->eptr)
+      return *top->ptr;
+  }
+  assert(level == 0);
+  return EOF;
+}
+
+void input_stack::add_boundary()
+{
+  push(new input_boundary);
+}
+
+void input_stack::add_return_boundary()
+{
+  push(new input_return_boundary);
+}
+
+int input_stack::is_return_boundary()
+{
+  return top->is_boundary() == 2;
+}
+
+void input_stack::remove_boundary()
+{
+  assert(top->is_boundary());
+  input_iterator *temp = top->next;
+  delete top;
+  top = temp;
+  level--;
+}
+
+void input_stack::push(input_iterator *in)
+{
+  if (in == 0)
+    return;
+  if (++level > limit && limit > 0)
+    fatal("input stack limit exceeded (probable infinite loop)");
+  in->next = top;
+  top = in;
+}
+
+input_iterator *input_stack::get_arg(int i)
+{
+  input_iterator *p;
+  for (p = top; p != 0; p = p->next)
+    if (p->has_args())
+      return p->get_arg(i);
+  return 0;
+}
+
+void input_stack::shift(int n)
+{
+  for (input_iterator *p = top; p; p = p->next)
+    if (p->has_args()) {
+      p->shift(n);
+      return;
+    }
+}
+
+int input_stack::nargs()
+{
+  for (input_iterator *p =top; p != 0; p = p->next)
+    if (p->has_args())
+      return p->nargs();
+  return 0;
+}
+
+int input_stack::get_location(int allow_macro, const char **filenamep, int *linenop)
+{
+  for (input_iterator *p = top; p; p = p->next)
+    if (p->get_location(allow_macro, filenamep, linenop))
+      return 1;
+  return 0;
+}
+
+void input_stack::backtrace()
+{
+  const char *f;
+  int n;
+  // only backtrace down to (not including) the topmost file
+  for (input_iterator *p = top;
+       p && !p->get_location(0, &f, &n);
+       p = p->next)
+    p->backtrace();
+}
+
+void input_stack::backtrace_all()
+{
+  for (input_iterator *p = top; p; p = p->next)
+    p->backtrace();
+}
+
+int input_stack::set_location(const char *filename, int lineno)
+{
+  for (input_iterator *p = top; p; p = p->next)
+    if (p->set_location(filename, lineno))
+      return 1;
+  return 0;
+}
+
+void input_stack::next_file(FILE *fp, const char *s)
+{
+  input_iterator **pp;
+  for (pp = &top; *pp != &nil_iterator; pp = &(*pp)->next)
+    if ((*pp)->next_file(fp, s))
+      return;
+  if (++level > limit && limit > 0)
+    fatal("input stack limit exceeded");
+  *pp = new file_iterator(fp, s);
+  (*pp)->next = &nil_iterator;
+}
+
+void input_stack::end_file()
+{
+  for (input_iterator **pp = &top; *pp != &nil_iterator; pp = &(*pp)->next)
+    if ((*pp)->is_file()) {
+      input_iterator *tem = *pp;
+      *pp = (*pp)->next;
+      delete tem;
+      level--;
+      return;
+    }
+}
+
+void input_stack::clear()
+{
+  int nboundaries = 0;
+  while (top != &nil_iterator) {
+    if (top->is_boundary())
+      nboundaries++;
+    input_iterator *tem = top;
+    top = top->next;
+    level--;
+    delete tem;
+  }
+  // Keep while_request happy.
+  for (; nboundaries > 0; --nboundaries)
+    add_return_boundary();
+}
+
+void input_stack::pop_macro()
+{
+  int nboundaries = 0;
+  int is_macro = 0;
+  do {
+    if (top->next == &nil_iterator)
+      break;
+    if (top->is_boundary())
+      nboundaries++;
+    is_macro = top->is_macro();
+    input_iterator *tem = top;
+    top = top->next;
+    level--;
+    delete tem;
+  } while (!is_macro);
+  // Keep while_request happy.
+  for (; nboundaries > 0; --nboundaries)
+    add_return_boundary();
+}
+
+inline void input_stack::save_compatible_flag(int f)
+{
+  top->save_compatible_flag(f);
+}
+
+inline int input_stack::get_compatible_flag()
+{
+  return top->get_compatible_flag();
+}
+
+void backtrace_request()
+{
+  input_stack::backtrace_all();
+  fflush(stderr);
+  skip_line();
+}
+
+void next_file()
+{
+  symbol nm = get_long_name();
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (nm.is_null())
+    input_stack::end_file();
+  else {
+    errno = 0;
+    FILE *fp = fopen(nm.contents(), "r");
+    if (!fp)
+      error("can't open `%1': %2", nm.contents(), strerror(errno));
+    else
+      input_stack::next_file(fp, nm.contents());
+  }
+  tok.next();
+}
+
+void shift()
+{
+  int n;
+  if (!has_arg() || !get_integer(&n))
+    n = 1;
+  input_stack::shift(n);
+  skip_line();
+}
+
+static int get_char_for_escape_name(int allow_space = 0)
+{
+  int c = get_copy(0);
+  switch (c) {
+  case EOF:
+    copy_mode_error("end of input in escape name");
+    return '\0';
+  default:
+    if (!invalid_input_char(c))
+      break;
+    // fall through
+  case '\n':
+    if (c == '\n')
+      input_stack::push(make_temp_iterator("\n"));
+    // fall through
+  case ' ':
+    if (c == ' ' && allow_space)
+      break;
+    // fall through
+  case '\t':
+  case '\001':
+  case '\b':
+    copy_mode_error("%1 is not allowed in an escape name",
+		    input_char_description(c));
+    return '\0';
+  }
+  return c;
+}
+
+static symbol read_two_char_escape_name()
+{
+  char buf[3];
+  buf[0] = get_char_for_escape_name();
+  if (buf[0] != '\0') {
+    buf[1] = get_char_for_escape_name();
+    if (buf[1] == '\0')
+      buf[0] = 0;
+    else
+      buf[2] = 0;
+  }
+  return symbol(buf);
+}
+
+static symbol read_long_escape_name(read_mode mode)
+{
+  int start_level = input_stack::get_level();
+  char abuf[ABUF_SIZE];
+  char *buf = abuf;
+  int buf_size = ABUF_SIZE;
+  int i = 0;
+  int c;
+  int have_char = 0;
+  for (;;) {
+    c = get_char_for_escape_name(have_char && mode == WITH_ARGS);
+    if (c == 0) {
+      if (buf != abuf)
+	a_delete buf;
+      return NULL_SYMBOL;
+    }
+    have_char = 1;
+    if (mode == WITH_ARGS && c == ' ')
+      break;
+    if (i + 2 > buf_size) {
+      if (buf == abuf) {
+	buf = new char[ABUF_SIZE*2];
+	memcpy(buf, abuf, buf_size);
+	buf_size = ABUF_SIZE*2;
+      }
+      else {
+	char *old_buf = buf;
+	buf = new char[buf_size*2];
+	memcpy(buf, old_buf, buf_size);
+	buf_size *= 2;
+	a_delete old_buf;
+      }
+    }
+    if (c == ']' && input_stack::get_level() == start_level)
+      break;
+    buf[i++] = c;
+  }
+  buf[i] = 0;
+  if (c == ' ')
+    have_string_arg = 1;
+  if (buf == abuf) {
+    if (i == 0) {
+      if (mode != ALLOW_EMPTY)
+        copy_mode_error("empty escape name");
+      return EMPTY_SYMBOL;
+    }
+    return symbol(abuf);
+  }
+  else {
+    symbol s(buf);
+    a_delete buf;
+    return s;
+  }
+}
+
+static symbol read_escape_name(read_mode mode)
+{
+  int c = get_char_for_escape_name();
+  if (c == 0)
+    return NULL_SYMBOL;
+  if (c == '(')
+    return read_two_char_escape_name();
+  if (c == '[' && !compatible_flag)
+    return read_long_escape_name(mode);
+  char buf[2];
+  buf[0] = c;
+  buf[1] = '\0';
+  return symbol(buf);
+}
+
+static symbol read_increment_and_escape_name(int *incp)
+{
+  int c = get_char_for_escape_name();
+  switch (c) {
+  case 0:
+    *incp = 0;
+    return NULL_SYMBOL;
+  case '(':
+    *incp = 0;
+    return read_two_char_escape_name();
+  case '+':
+    *incp = 1;
+    return read_escape_name();
+  case '-':
+    *incp = -1;
+    return read_escape_name();
+  case '[':
+    if (!compatible_flag) {
+      *incp = 0;
+      return read_long_escape_name();
+    }
+    break;
+  }
+  *incp = 0;
+  char buf[2];
+  buf[0] = c;
+  buf[1] = '\0';
+  return symbol(buf);
+}
+
+static int get_copy(node **nd, int defining)
+{
+  for (;;) {
+    int c = input_stack::get(nd);
+    if (c == ESCAPE_NEWLINE) {
+      if (defining)
+	return c;
+      do {
+	c = input_stack::get(nd);
+      } while (c == ESCAPE_NEWLINE);
+    }
+    if (c != escape_char || escape_char <= 0)
+      return c;
+    c = input_stack::peek();
+    switch(c) {
+    case 0:
+      return escape_char;
+    case '"':
+      (void)input_stack::get(0);
+      while ((c = input_stack::get(0)) != '\n' && c != EOF)
+	;
+      return c;
+    case '#':			// Like \" but newline is ignored.
+      (void)input_stack::get(0);
+      while ((c = input_stack::get(0)) != '\n')
+	if (c == EOF)
+	  return EOF;
+      break;
+    case '$':
+      {
+	(void)input_stack::get(0);
+	symbol s = read_escape_name();
+	if (!(s.is_null() || s.is_empty()))
+	  interpolate_arg(s);
+	break;
+      }
+    case '*':
+      {
+	(void)input_stack::get(0);
+	symbol s = read_escape_name(WITH_ARGS);
+	if (!(s.is_null() || s.is_empty())) {
+	  if (have_string_arg) {
+	    have_string_arg = 0;
+	    interpolate_string_with_args(s);
+	  }
+	  else
+	    interpolate_string(s);
+	}
+	break;
+      }
+    case 'a':
+      (void)input_stack::get(0);
+      return '\001';
+    case 'e':
+      (void)input_stack::get(0);
+      return ESCAPE_e;
+    case 'E':
+      (void)input_stack::get(0);
+      return ESCAPE_E;
+    case 'n':
+      {
+	(void)input_stack::get(0);
+	int inc;
+	symbol s = read_increment_and_escape_name(&inc);
+	if (!(s.is_null() || s.is_empty()))
+	  interpolate_number_reg(s, inc);
+	break;
+      }
+    case 'g':
+      {
+	(void)input_stack::get(0);
+	symbol s = read_escape_name();
+	if (!(s.is_null() || s.is_empty()))
+	  interpolate_number_format(s);
+	break;
+      }
+    case 't':
+      (void)input_stack::get(0);
+      return '\t';
+    case 'V':
+      {
+	(void)input_stack::get(0);
+	symbol s = read_escape_name();
+	if (!(s.is_null() || s.is_empty()))
+	  interpolate_environment_variable(s);
+	break;
+      }
+    case '\n':
+      (void)input_stack::get(0);
+      if (defining)
+	return ESCAPE_NEWLINE;
+      break;
+    case ' ':
+      (void)input_stack::get(0);
+      return ESCAPE_SPACE;
+    case '~':
+      (void)input_stack::get(0);
+      return ESCAPE_TILDE;
+    case ':':
+      (void)input_stack::get(0);
+      return ESCAPE_COLON;
+    case '|':
+      (void)input_stack::get(0);
+      return ESCAPE_BAR;
+    case '^':
+      (void)input_stack::get(0);
+      return ESCAPE_CIRCUMFLEX;
+    case '{':
+      (void)input_stack::get(0);
+      return ESCAPE_LEFT_BRACE;
+    case '}':
+      (void)input_stack::get(0);
+      return ESCAPE_RIGHT_BRACE;
+    case '`':
+      (void)input_stack::get(0);
+      return ESCAPE_LEFT_QUOTE;
+    case '\'':
+      (void)input_stack::get(0);
+      return ESCAPE_RIGHT_QUOTE;
+    case '-':
+      (void)input_stack::get(0);
+      return ESCAPE_HYPHEN;
+    case '_':
+      (void)input_stack::get(0);
+      return ESCAPE_UNDERSCORE;
+    case 'c':
+      (void)input_stack::get(0);
+      return ESCAPE_c;
+    case '!':
+      (void)input_stack::get(0);
+      return ESCAPE_BANG;
+    case '?':
+      (void)input_stack::get(0);
+      return ESCAPE_QUESTION;
+    case '&':
+      (void)input_stack::get(0);
+      return ESCAPE_AMPERSAND;
+    case ')':
+      (void)input_stack::get(0);
+      return ESCAPE_RIGHT_PARENTHESIS;
+    case '.':
+      (void)input_stack::get(0);
+      return c;			
+    case '%':
+      (void)input_stack::get(0);
+      return ESCAPE_PERCENT;
+    default:
+      if (c == escape_char) {
+	(void)input_stack::get(0);
+	return c;
+      }
+      else
+	return escape_char;
+    }
+  }
+}
+
+class non_interpreted_char_node : public node {
+  unsigned char c;
+public:
+  non_interpreted_char_node(unsigned char);
+  node *copy();
+  int interpret(macro *);
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+int non_interpreted_char_node::same(node *nd)
+{
+  return c == ((non_interpreted_char_node *)nd)->c;
+}
+
+const char *non_interpreted_char_node::type()
+{
+  return "non_interpreted_char_node";
+}
+
+int non_interpreted_char_node::force_tprint()
+{
+  return 0;
+}
+
+non_interpreted_char_node::non_interpreted_char_node(unsigned char n) : c(n)
+{
+  assert(n != 0);
+}
+
+node *non_interpreted_char_node::copy()
+{
+  return new non_interpreted_char_node(c);
+}
+
+int non_interpreted_char_node::interpret(macro *mac)
+{
+  mac->append(c);
+  return 1;
+}
+
+static void do_width();
+static node *do_non_interpreted();
+static node *do_special();
+static node *do_suppress(symbol nm);
+static void do_register();
+
+dictionary color_dictionary(501);
+static symbol default_symbol("default");
+
+static color *lookup_color(symbol nm)
+{
+  assert(!nm.is_null());
+  if (nm == default_symbol)
+    return &default_color;
+  color *c = (color *)color_dictionary.lookup(nm);
+  if (c == 0)
+    warning(WARN_COLOR, "color `%1' not defined", nm.contents());
+  return c;
+}
+
+void do_glyph_color(symbol nm)
+{
+  if (nm.is_null())
+    return;
+  if (nm.is_empty())
+    curenv->set_glyph_color(curenv->get_prev_glyph_color());
+  else {
+    color *tem = lookup_color(nm);
+    if (tem)
+      curenv->set_glyph_color(tem);
+    else
+      (void)color_dictionary.lookup(nm, new color);
+  }
+}
+
+void do_fill_color(symbol nm)
+{
+  if (nm.is_null())
+    return;
+  if (nm.is_empty())
+    curenv->set_fill_color(curenv->get_prev_fill_color());
+  else {
+    color *tem = lookup_color(nm);
+    if (tem)
+      curenv->set_fill_color(tem);
+    else
+      (void)color_dictionary.lookup(nm, new color);
+  }
+}
+
+static unsigned int get_color_element(const char *scheme, const char *col)
+{
+  units val;
+  if (!get_number(&val, 'f')) {
+    warning(WARN_COLOR, "%1 in %2 definition set to 0", col, scheme);
+    tok.next();
+    return 0;
+  }
+  if (val < 0) {
+    warning(WARN_RANGE, "%1 cannot be negative: set to 0", col);
+    return 0;
+  }
+  if (val > color::MAX_COLOR_VAL+1) {
+    warning(WARN_RANGE, "%1 cannot be greater than 1", col);
+    // we change 0x10000 to 0xffff
+    return color::MAX_COLOR_VAL;
+  }
+  return (unsigned int)val;
+}
+
+static color *read_rgb(char end = 0)
+{
+  symbol component = do_get_long_name(0, end);
+  if (component.is_null()) {
+    warning(WARN_COLOR, "missing rgb color values");
+    return 0;
+  }
+  const char *s = component.contents();
+  color *col = new color;
+  if (*s == '#') {
+    if (!col->read_rgb(s)) {
+      warning(WARN_COLOR, "expecting rgb color definition not `%1'", s);
+      delete col;
+      return 0;
+    }
+  }
+  else {
+    if (!end)
+      input_stack::push(make_temp_iterator(" "));
+    input_stack::push(make_temp_iterator(s));
+    tok.next();
+    unsigned int r = get_color_element("rgb color", "red component");
+    unsigned int g = get_color_element("rgb color", "green component");
+    unsigned int b = get_color_element("rgb color", "blue component");
+    col->set_rgb(r, g, b);
+  }
+  return col;
+}
+
+static color *read_cmy(char end = 0)
+{
+  symbol component = do_get_long_name(0, end);
+  if (component.is_null()) {
+    warning(WARN_COLOR, "missing cmy color values");
+    return 0;
+  }
+  const char *s = component.contents();
+  color *col = new color;
+  if (*s == '#') {
+    if (!col->read_cmy(s)) {
+      warning(WARN_COLOR, "expecting cmy color definition not `%1'", s);
+      delete col;
+      return 0;
+    }
+  }
+  else {
+    if (!end)
+      input_stack::push(make_temp_iterator(" "));
+    input_stack::push(make_temp_iterator(s));
+    tok.next();
+    unsigned int c = get_color_element("cmy color", "cyan component");
+    unsigned int m = get_color_element("cmy color", "magenta component");
+    unsigned int y = get_color_element("cmy color", "yellow component");
+    col->set_cmy(c, m, y);
+  }
+  return col;
+}
+
+static color *read_cmyk(char end = 0)
+{
+  symbol component = do_get_long_name(0, end);
+  if (component.is_null()) {
+    warning(WARN_COLOR, "missing cmyk color values");
+    return 0;
+  }
+  const char *s = component.contents();
+  color *col = new color;
+  if (*s == '#') {
+    if (!col->read_cmyk(s)) {
+      warning(WARN_COLOR, "`expecting a cmyk color definition not `%1'", s);
+      delete col;
+      return 0;
+    }
+  }
+  else {
+    if (!end)
+      input_stack::push(make_temp_iterator(" "));
+    input_stack::push(make_temp_iterator(s));
+    tok.next();
+    unsigned int c = get_color_element("cmyk color", "cyan component");
+    unsigned int m = get_color_element("cmyk color", "magenta component");
+    unsigned int y = get_color_element("cmyk color", "yellow component");
+    unsigned int k = get_color_element("cmyk color", "black component");
+    col->set_cmyk(c, m, y, k);
+  }
+  return col;
+}
+
+static color *read_gray(char end = 0)
+{
+  symbol component = do_get_long_name(0, end);
+  if (component.is_null()) {
+    warning(WARN_COLOR, "missing gray values");
+    return 0;
+  }
+  const char *s = component.contents();
+  color *col = new color;
+  if (*s == '#') {
+    if (!col->read_gray(s)) {
+      warning(WARN_COLOR, "`expecting a gray definition not `%1'", s);
+      delete col;
+      return 0;
+    }
+  }
+  else {
+    if (!end)
+      input_stack::push(make_temp_iterator("\n"));
+    input_stack::push(make_temp_iterator(s));
+    tok.next();
+    unsigned int g = get_color_element("gray", "gray value");
+    col->set_gray(g);
+  }
+  return col;
+}
+
+static void activate_color()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    color_flag = n != 0;
+  else
+    color_flag = 1;
+  skip_line();
+}
+
+static void define_color()
+{
+  symbol color_name = get_long_name(1);
+  if (color_name.is_null()) {
+    skip_line();
+    return;
+  }
+  if (color_name == default_symbol) {
+    warning(WARN_COLOR, "default color can't be redefined");
+    skip_line();
+    return;
+  }
+  symbol style = get_long_name(1);
+  if (style.is_null()) {
+    skip_line();
+    return;
+  }
+  color *col;
+  if (strcmp(style.contents(), "rgb") == 0)
+    col = read_rgb();
+  else if (strcmp(style.contents(), "cmyk") == 0)
+    col = read_cmyk();
+  else if (strcmp(style.contents(), "gray") == 0)
+    col = read_gray();
+  else if (strcmp(style.contents(), "grey") == 0)
+    col = read_gray();
+  else if (strcmp(style.contents(), "cmy") == 0)
+    col = read_cmy();
+  else {
+    warning(WARN_COLOR,
+	    "unknown color space `%1'; use rgb, cmyk, gray or cmy",
+	    style.contents());
+    skip_line();
+    return;
+  }
+  if (col)
+    (void)color_dictionary.lookup(color_name, col);
+  skip_line();
+}
+
+static node *do_overstrike()
+{
+  token start;
+  overstrike_node *on = new overstrike_node;
+  int start_level = input_stack::get_level();
+  start.next();
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    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);
+    }
+  }
+  return on;
+}
+
+static node *do_bracket()
+{
+  token start;
+  bracket_node *bn = new bracket_node;
+  start.next();
+  int start_level = input_stack::get_level();
+  for (;;) {
+    tok.next();
+    if (tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      break;
+    }
+    if (tok.newline()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    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)
+	bn->bracket(n);
+    }
+  }
+  return bn;
+}
+
+static int do_name_test()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  int bad_char = 0;
+  int some_char = 0;
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    if (tok == start
+	&& (compatible_flag || input_stack::get_level() == start_level))
+      break;
+    if (!tok.ch())
+      bad_char = 1;
+    some_char = 1;
+  }
+  return some_char && !bad_char;
+}
+
+static int do_expr_test()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  if (!start.delimiter(1))
+    return 0;
+  tok.next();
+  // disable all warning and error messages temporarily
+  int saved_warning_mask = warning_mask;
+  int saved_inhibit_errors = inhibit_errors;
+  warning_mask = 0;
+  inhibit_errors = 1;
+  int dummy;
+  int result = get_number_rigidly(&dummy, 'u');
+  warning_mask = saved_warning_mask;
+  inhibit_errors = saved_inhibit_errors;
+  if (tok == start && input_stack::get_level() == start_level)
+    return result;
+  // ignore everything up to the delimiter in case we aren't right there
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    if (tok == start && input_stack::get_level() == start_level)
+      break;
+  }
+  return 0;
+}
+
+#if 0
+static node *do_zero_width()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  environment env(curenv);
+  environment *oldenv = curenv;
+  curenv = &env;
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      error("missing closing delimiter");
+      break;
+    }
+    if (tok == start
+	&& (compatible_flag || input_stack::get_level() == start_level))
+      break;
+    tok.process();
+  }
+  curenv = oldenv;
+  node *rev = env.extract_output_line();
+  node *n = 0;
+  while (rev) {
+    node *tem = rev;
+    rev = rev->next;
+    tem->next = n;
+    n = tem;
+  }
+  return new zero_width_node(n);
+}
+
+#else
+
+// It's undesirable for \Z to change environments, because then
+// \n(.w won't work as expected.
+
+static node *do_zero_width()
+{
+  node *rev = new dummy_node;
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    if (tok == start
+	&& (compatible_flag || input_stack::get_level() == start_level))
+      break;
+    if (!tok.add_to_node_list(&rev))
+      error("invalid token in argument to \\Z");
+  }
+  node *n = 0;
+  while (rev) {
+    node *tem = rev;
+    rev = rev->next;
+    tem->next = n;
+    n = tem;
+  }
+  return new zero_width_node(n);
+}
+
+#endif
+
+token_node *node::get_token_node()
+{
+  return 0;
+}
+
+class token_node : public node {
+public:
+  token tk;
+  token_node(const token &t);
+  node *copy();
+  token_node *get_token_node();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+token_node::token_node(const token &t) : tk(t)
+{
+}
+
+node *token_node::copy()
+{
+  return new token_node(tk);
+}
+
+token_node *token_node::get_token_node()
+{
+  return this;
+}
+
+int token_node::same(node *nd)
+{
+  return tk == ((token_node *)nd)->tk;
+}
+
+const char *token_node::type()
+{
+  return "token_node";
+}
+
+int token_node::force_tprint()
+{
+  return 0;
+}
+
+token::token() : nd(0), type(TOKEN_EMPTY)
+{
+}
+
+token::~token()
+{
+  delete nd;
+}
+
+token::token(const token &t)
+: nm(t.nm), c(t.c), val(t.val), dim(t.dim), type(t.type)
+{
+  // Use two statements to work around bug in SGI C++.
+  node *tem = t.nd;
+  nd = tem ? tem->copy() : 0;
+}
+
+void token::operator=(const token &t)
+{
+  delete nd;
+  nm = t.nm;
+  // Use two statements to work around bug in SGI C++.
+  node *tem = t.nd;
+  nd = tem ? tem->copy() : 0;
+  c = t.c;
+  val = t.val;
+  dim = t.dim;
+  type = t.type;
+}
+
+void token::skip()
+{
+  while (space())
+    next();
+}
+
+int has_arg()
+{
+  while (tok.space())
+    tok.next();
+  return !tok.newline();
+}
+
+void token::make_space()
+{
+  type = TOKEN_SPACE;
+}
+
+void token::make_newline()
+{
+  type = TOKEN_NEWLINE;
+}
+
+void token::next()
+{
+  if (nd) {
+    delete nd;
+    nd = 0;
+  }
+  units x;
+  for (;;) {
+    node *n;
+    int cc = input_stack::get(&n);
+    if (cc != escape_char || escape_char == 0) {
+    handle_normal_char:
+      switch(cc) {
+      case COMPATIBLE_SAVE:
+	input_stack::save_compatible_flag(compatible_flag);
+	compatible_flag = 0;
+	continue;
+      case COMPATIBLE_RESTORE:
+	compatible_flag = input_stack::get_compatible_flag();
+	continue;
+      case EOF:
+	type = TOKEN_EOF;
+	return;
+      case TRANSPARENT_FILE_REQUEST:
+      case TITLE_REQUEST:
+      case COPY_FILE_REQUEST:
+#ifdef COLUMN
+      case VJUSTIFY_REQUEST:
+#endif /* COLUMN */
+	type = TOKEN_REQUEST;
+	c = cc;
+	return;
+      case BEGIN_TRAP:
+	type = TOKEN_BEGIN_TRAP;
+	return;
+      case END_TRAP:
+	type = TOKEN_END_TRAP;
+	return;
+      case LAST_PAGE_EJECTOR:
+	seen_last_page_ejector = 1;
+	// fall through
+      case PAGE_EJECTOR:
+	type = TOKEN_PAGE_EJECTOR;
+	return;
+      case ESCAPE_PERCENT:
+      ESCAPE_PERCENT:
+	type = TOKEN_HYPHEN_INDICATOR;
+	return;
+      case ESCAPE_SPACE:
+      ESCAPE_SPACE:
+	type = TOKEN_UNSTRETCHABLE_SPACE;
+	return;
+      case ESCAPE_TILDE:
+      ESCAPE_TILDE:
+	type = TOKEN_STRETCHABLE_SPACE;
+	return;
+      case ESCAPE_COLON:
+      ESCAPE_COLON:
+	type = TOKEN_ZERO_WIDTH_BREAK;
+	return;
+      case ESCAPE_e:
+      ESCAPE_e:
+	type = TOKEN_ESCAPE;
+	return;
+      case ESCAPE_E:
+	goto handle_escape_char;
+      case ESCAPE_BAR:
+      ESCAPE_BAR:
+	type = TOKEN_NODE;
+	nd = new hmotion_node(curenv->get_narrow_space_width(),
+			      curenv->get_fill_color());
+	return;
+      case ESCAPE_CIRCUMFLEX:
+      ESCAPE_CIRCUMFLEX:
+	type = TOKEN_NODE;
+	nd = new hmotion_node(curenv->get_half_narrow_space_width(),
+			      curenv->get_fill_color());
+	return;
+      case ESCAPE_NEWLINE:
+	have_input = 0;
+	break;
+      case ESCAPE_LEFT_BRACE:
+      ESCAPE_LEFT_BRACE:
+	type = TOKEN_LEFT_BRACE;
+	return;
+      case ESCAPE_RIGHT_BRACE:
+      ESCAPE_RIGHT_BRACE:
+	type = TOKEN_RIGHT_BRACE;
+	return;
+      case ESCAPE_LEFT_QUOTE:
+      ESCAPE_LEFT_QUOTE:
+	type = TOKEN_SPECIAL;
+	nm = symbol("ga");
+	return;
+      case ESCAPE_RIGHT_QUOTE:
+      ESCAPE_RIGHT_QUOTE:
+	type = TOKEN_SPECIAL;
+	nm = symbol("aa");
+	return;
+      case ESCAPE_HYPHEN:
+      ESCAPE_HYPHEN:
+	type = TOKEN_SPECIAL;
+	nm = symbol("-");
+	return;
+      case ESCAPE_UNDERSCORE:
+      ESCAPE_UNDERSCORE:
+	type = TOKEN_SPECIAL;
+	nm = symbol("ul");
+	return;
+      case ESCAPE_c:
+      ESCAPE_c:
+	type = TOKEN_INTERRUPT;
+	return;
+      case ESCAPE_BANG:
+      ESCAPE_BANG:
+	type = TOKEN_TRANSPARENT;
+	return;
+      case ESCAPE_QUESTION:
+      ESCAPE_QUESTION:
+	nd = do_non_interpreted();
+	if (nd) {
+	  type = TOKEN_NODE;
+	  return;
+	}
+	break;
+      case ESCAPE_AMPERSAND:
+      ESCAPE_AMPERSAND:
+	type = TOKEN_DUMMY;
+	return;
+      case ESCAPE_RIGHT_PARENTHESIS:
+      ESCAPE_RIGHT_PARENTHESIS:
+	type = TOKEN_TRANSPARENT_DUMMY;
+	return;
+      case '\b':
+	type = TOKEN_BACKSPACE;
+	return;
+      case ' ':
+	type = TOKEN_SPACE;
+	return;
+      case '\t':
+	type = TOKEN_TAB;
+	return;
+      case '\n':
+	type = TOKEN_NEWLINE;
+	return;
+      case '\001':
+	type = TOKEN_LEADER;
+	return;
+      case 0:
+	{
+	  assert(n != 0);
+	  token_node *tn = n->get_token_node();
+	  if (tn) {
+	    *this = tn->tk;
+	    delete tn;
+	  }
+	  else {
+	    nd = n;
+	    type = TOKEN_NODE;
+	  }
+	}
+	return;
+      default:
+	type = TOKEN_CHAR;
+	c = cc;
+	return;
+      }
+    }
+    else {
+    handle_escape_char:
+      cc = input_stack::get(0);
+      switch(cc) {
+      case '(':
+	nm = read_two_char_escape_name();
+	type = TOKEN_SPECIAL;
+	return;
+      case EOF:
+	type = TOKEN_EOF;
+	error("end of input after escape character");
+	return;
+      case '`':
+	goto ESCAPE_LEFT_QUOTE;
+      case '\'':
+	goto ESCAPE_RIGHT_QUOTE;
+      case '-':
+	goto ESCAPE_HYPHEN;
+      case '_':
+	goto ESCAPE_UNDERSCORE;
+      case '%':
+	goto ESCAPE_PERCENT;
+      case ' ':
+	goto ESCAPE_SPACE;
+      case '0':
+	nd = new hmotion_node(curenv->get_digit_width(),
+			      curenv->get_fill_color());
+	type = TOKEN_NODE;
+	return;
+      case '|':
+	goto ESCAPE_BAR;
+      case '^':
+	goto ESCAPE_CIRCUMFLEX;
+      case '/':
+	type = TOKEN_ITALIC_CORRECTION;
+	return;
+      case ',':
+	type = TOKEN_NODE;
+	nd = new left_italic_corrected_node;
+	return;
+      case '&':
+	goto ESCAPE_AMPERSAND;
+      case ')':
+	goto ESCAPE_RIGHT_PARENTHESIS;
+      case '!':
+	goto ESCAPE_BANG;
+      case '?':
+	goto ESCAPE_QUESTION;
+      case '~':
+	goto ESCAPE_TILDE;
+      case ':':
+	goto ESCAPE_COLON;
+      case '"':
+	while ((cc = input_stack::get(0)) != '\n' && cc != EOF)
+	  ;
+	if (cc == '\n')
+	  type = TOKEN_NEWLINE;
+	else
+	  type = TOKEN_EOF;
+	return;
+      case '#':			// Like \" but newline is ignored.
+	while ((cc = input_stack::get(0)) != '\n')
+	  if (cc == EOF) {
+	    type = TOKEN_EOF;
+	    return;
+	  }
+	break;
+      case '$':
+	{
+	  symbol s = read_escape_name();
+	  if (!(s.is_null() || s.is_empty()))
+	    interpolate_arg(s);
+	  break;
+	}
+      case '*':
+	{
+	  symbol s = read_escape_name(WITH_ARGS);
+	  if (!(s.is_null() || s.is_empty())) {
+	    if (have_string_arg) {
+	      have_string_arg = 0;
+	      interpolate_string_with_args(s);
+	    }
+	    else
+	      interpolate_string(s);
+	  }
+	  break;
+	}
+      case 'a':
+	nd = new non_interpreted_char_node('\001');
+	type = TOKEN_NODE;
+	return;
+      case 'A':
+	c = '0' + do_name_test();
+	type = TOKEN_CHAR;
+	return;
+      case 'b':
+	nd = do_bracket();
+	type = TOKEN_NODE;
+	return;
+      case 'B':
+	c = '0' + do_expr_test();
+	type = TOKEN_CHAR;
+	return;
+      case 'c':
+	goto ESCAPE_c;
+      case 'C':
+	nm = get_delim_name();
+	if (nm.is_null())
+	  break;
+	type = TOKEN_SPECIAL;
+	return;
+      case 'd':
+	type = TOKEN_NODE;
+	nd = new vmotion_node(curenv->get_size() / 2,
+			      curenv->get_fill_color());
+	return;
+      case 'D':
+	nd = read_draw_node();
+	if (!nd)
+	  break;
+	type = TOKEN_NODE;
+	return;
+      case 'e':
+	goto ESCAPE_e;
+      case 'E':
+	goto handle_escape_char;
+      case 'f':
+	{
+	  symbol s = read_escape_name(ALLOW_EMPTY);
+	  if (s.is_null())
+	    break;
+	  const char *p;
+	  for (p = s.contents(); *p != '\0'; p++)
+	    if (!csdigit(*p))
+	      break;
+	  if (*p || s.is_empty())
+	    curenv->set_font(s);
+	  else
+	    curenv->set_font(atoi(s.contents()));
+	  if (!compatible_flag)
+	    have_input = 1;
+	  break;
+	}
+      case 'F':
+	{
+	  symbol s = read_escape_name(ALLOW_EMPTY);
+	  if (s.is_null())
+	    break;
+	  curenv->set_family(s);
+	  have_input = 1;
+	  break;
+	}
+      case 'g':
+	{
+	  symbol s = read_escape_name();
+	  if (!(s.is_null() || s.is_empty()))
+	    interpolate_number_format(s);
+	  break;
+	}
+      case 'h':
+	if (!get_delim_number(&x, 'm'))
+	  break;
+	type = TOKEN_NODE;
+	nd = new hmotion_node(x, curenv->get_fill_color());
+	return;
+      case 'H':
+	// don't take height increments relative to previous height if
+	// in compatibility mode
+	if (!compatible_flag && curenv->get_char_height())
+	{
+	  if (get_delim_number(&x, 'z', curenv->get_char_height()))
+	    curenv->set_char_height(x);
+	}
+	else
+	{
+	  if (get_delim_number(&x, 'z', curenv->get_requested_point_size()))
+	    curenv->set_char_height(x);
+	}
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 'k':
+	nm = read_escape_name();
+	if (nm.is_null() || nm.is_empty())
+	  break;
+	type = TOKEN_MARK_INPUT;
+	return;
+      case 'l':
+      case 'L':
+	{
+	  charinfo *s = 0;
+	  if (!get_line_arg(&x, (cc == 'l' ? 'm': 'v'), &s))
+	    break;
+	  if (s == 0)
+	    s = get_charinfo(cc == 'l' ? "ru" : "br");
+	  type = TOKEN_NODE;
+	  node *n = curenv->make_char_node(s);
+	  if (cc == 'l')
+	    nd = new hline_node(x, n);
+	  else
+	    nd = new vline_node(x, n);
+	  return;
+	}
+      case 'm':
+	do_glyph_color(read_escape_name(ALLOW_EMPTY));
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 'M':
+	do_fill_color(read_escape_name(ALLOW_EMPTY));
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 'n':
+	{
+	  int inc;
+	  symbol s = read_increment_and_escape_name(&inc);
+	  if (!(s.is_null() || s.is_empty()))
+	    interpolate_number_reg(s, inc);
+	  break;
+	}
+      case 'N':
+	if (!get_delim_number(&val, 0))
+	  break;
+	type = TOKEN_NUMBERED_CHAR;
+	return;
+      case 'o':
+	nd = do_overstrike();
+	type = TOKEN_NODE;
+	return;
+      case 'O':
+	nd = do_suppress(read_escape_name());
+	if (!nd)
+	  break;
+	type = TOKEN_NODE;
+	return;
+      case 'p':
+	type = TOKEN_SPREAD;
+	return;
+      case 'r':
+	type = TOKEN_NODE;
+	nd = new vmotion_node(-curenv->get_size(), curenv->get_fill_color());
+	return;
+      case 'R':
+	do_register();
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 's':
+	if (read_size(&x))
+	  curenv->set_size(x);
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 'S':
+	if (get_delim_number(&x, 0))
+	  curenv->set_char_slant(x);
+	if (!compatible_flag)
+	  have_input = 1;
+	break;
+      case 't':
+	type = TOKEN_NODE;
+	nd = new non_interpreted_char_node('\t');
+	return;
+      case 'u':
+	type = TOKEN_NODE;
+	nd = new vmotion_node(-curenv->get_size() / 2,
+			      curenv->get_fill_color());
+	return;
+      case 'v':
+	if (!get_delim_number(&x, 'v'))
+	  break;
+	type = TOKEN_NODE;
+	nd = new vmotion_node(x, curenv->get_fill_color());
+	return;
+      case 'V':
+	{
+	  symbol s = read_escape_name();
+	  if (!(s.is_null() || s.is_empty()))
+	    interpolate_environment_variable(s);
+	  break;
+	}
+      case 'w':
+	do_width();
+	break;
+      case 'x':
+	if (!get_delim_number(&x, 'v'))
+	  break;
+	type = TOKEN_NODE;
+	nd = new extra_size_node(x);
+	return;
+      case 'X':
+	nd = do_special();
+	if (!nd)
+	  break;
+	type = TOKEN_NODE;
+	return;
+      case 'Y':
+	{
+	  symbol s = read_escape_name();
+	  if (s.is_null() || s.is_empty())
+	    break;
+	  request_or_macro *p = lookup_request(s);
+	  macro *m = p->to_macro();
+	  if (!m) {
+	    error("can't transparently throughput a request");
+	    break;
+	  }
+	  nd = new special_node(*m);
+	  type = TOKEN_NODE;
+	  return;
+	}
+      case 'z':
+	{
+	  next();
+	  if (type == TOKEN_NODE)
+	    nd = new zero_width_node(nd);
+	  else {
+  	    charinfo *ci = get_char(1);
+	    if (ci == 0)
+	      break;
+	    node *gn = curenv->make_char_node(ci);
+	    if (gn == 0)
+	      break;
+	    nd = new zero_width_node(gn);
+	    type = TOKEN_NODE;
+	  }
+	  return;
+	}
+      case 'Z':
+	nd = do_zero_width();
+	if (nd == 0)
+	  break;
+	type = TOKEN_NODE;
+	return;
+      case '{':
+	goto ESCAPE_LEFT_BRACE;
+      case '}':
+	goto ESCAPE_RIGHT_BRACE;
+      case '\n':
+	break;
+      case '[':
+	if (!compatible_flag) {
+	  symbol s = read_long_escape_name(WITH_ARGS);
+	  if (s.is_null() || s.is_empty())
+	    break;
+	  if (have_string_arg) {
+	    have_string_arg = 0;
+	    nm = composite_glyph_name(s);
+	  }
+	  else {
+	    const char *gn = check_unicode_name(s.contents());
+	    if (gn) {
+	      const char *gn_decomposed = decompose_unicode(gn);
+	      if (gn_decomposed)
+		gn = &gn_decomposed[1];
+	      const char *groff_gn = unicode_to_glyph_name(gn);
+	      if (groff_gn)
+		nm = symbol(groff_gn);
+	      else {
+		char *buf = new char[strlen(gn) + 1 + 1];
+		strcpy(buf, "u");
+		strcat(buf, gn);
+		nm = symbol(buf);
+		a_delete buf;
+	      }
+	    }
+	    else
+	      nm = symbol(s.contents());
+	  }
+	  type = TOKEN_SPECIAL;
+	  return;
+	}
+	goto handle_normal_char;
+      default:
+	if (cc != escape_char && cc != '.')
+	  warning(WARN_ESCAPE, "escape character ignored before %1",
+		  input_char_description(cc));
+	goto handle_normal_char;
+      }
+    }
+  }
+}
+
+int token::operator==(const token &t)
+{
+  if (type != t.type)
+    return 0;
+  switch(type) {
+  case TOKEN_CHAR:
+    return c == t.c;
+  case TOKEN_SPECIAL:
+    return nm == t.nm;
+  case TOKEN_NUMBERED_CHAR:
+    return val == t.val;
+  default:
+    return 1;
+  }
+}
+
+int token::operator!=(const token &t)
+{
+  return !(*this == t);
+}
+
+// is token a suitable delimiter (like ')?
+
+int token::delimiter(int err)
+{
+  switch(type) {
+  case TOKEN_CHAR:
+    switch(c) {
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+    case '+':
+    case '-':
+    case '/':
+    case '*':
+    case '%':
+    case '<':
+    case '>':
+    case '=':
+    case '&':
+    case ':':
+    case '(':
+    case ')':
+    case '.':
+      if (err)
+	error("cannot use character `%1' as a starting delimiter", char(c));
+      return 0;
+    default:
+      return 1;
+    }
+  case TOKEN_NODE:
+  case TOKEN_SPACE:
+  case TOKEN_STRETCHABLE_SPACE:
+  case TOKEN_UNSTRETCHABLE_SPACE:
+  case TOKEN_TAB:
+  case TOKEN_NEWLINE:
+    if (err)
+      error("cannot use %1 as a starting delimiter", description());
+    return 0;
+  default:
+    return 1;
+  }
+}
+
+const char *token::description()
+{
+  static char buf[4];
+  switch (type) {
+  case TOKEN_BACKSPACE:
+    return "a backspace character";
+  case TOKEN_CHAR:
+    buf[0] = '`';
+    buf[1] = c;
+    buf[2] = '\'';
+    buf[3] = '\0';
+    return buf;
+  case TOKEN_DUMMY:
+    return "`\\&'";
+  case TOKEN_ESCAPE:
+    return "`\\e'";
+  case TOKEN_HYPHEN_INDICATOR:
+    return "`\\%'";
+  case TOKEN_INTERRUPT:
+    return "`\\c'";
+  case TOKEN_ITALIC_CORRECTION:
+    return "`\\/'";
+  case TOKEN_LEADER:
+    return "a leader character";
+  case TOKEN_LEFT_BRACE:
+    return "`\\{'";
+  case TOKEN_MARK_INPUT:
+    return "`\\k'";
+  case TOKEN_NEWLINE:
+    return "newline";
+  case TOKEN_NODE:
+    return "a node";
+  case TOKEN_NUMBERED_CHAR:
+    return "`\\N'";
+  case TOKEN_RIGHT_BRACE:
+    return "`\\}'";
+  case TOKEN_SPACE:
+    return "a space";
+  case TOKEN_SPECIAL:
+    return "a special character";
+  case TOKEN_SPREAD:
+    return "`\\p'";
+  case TOKEN_STRETCHABLE_SPACE:
+    return "`\\~'";
+  case TOKEN_UNSTRETCHABLE_SPACE:
+    return "`\\ '";
+  case TOKEN_TAB:
+    return "a tab character";
+  case TOKEN_TRANSPARENT:
+    return "`\\!'";
+  case TOKEN_TRANSPARENT_DUMMY:
+    return "`\\)'";
+  case TOKEN_ZERO_WIDTH_BREAK:
+    return "`\\:'";
+  case TOKEN_EOF:
+    return "end of input";
+  default:
+    break;
+  }
+  return "a magic token";
+}
+
+void skip_line()
+{
+  while (!tok.newline())
+    if (tok.eof())
+      return;
+    else
+      tok.next();
+  tok.next();
+}
+
+void compatible()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    compatible_flag = n != 0;
+  else
+    compatible_flag = 1;
+  skip_line();
+}
+
+static void empty_name_warning(int required)
+{
+  if (tok.newline() || tok.eof()) {
+    if (required)
+      warning(WARN_MISSING, "missing name");
+  }
+  else if (tok.right_brace() || tok.tab()) {
+    const char *start = tok.description();
+    do {
+      tok.next();
+    } while (tok.space() || tok.right_brace() || tok.tab());
+    if (!tok.newline() && !tok.eof())
+      error("%1 is not allowed before an argument", start);
+    else if (required)
+      warning(WARN_MISSING, "missing name");
+  }
+  else if (required)
+    error("name expected (got %1)", tok.description());
+  else
+    error("name expected (got %1): treated as missing", tok.description());
+}
+
+static void non_empty_name_warning()
+{
+  if (!tok.newline() && !tok.eof() && !tok.space() && !tok.tab()
+      && !tok.right_brace()
+      // We don't want to give a warning for .el\{
+      && !tok.left_brace())
+    error("%1 is not allowed in a name", tok.description());
+}
+
+symbol get_name(int required)
+{
+  if (compatible_flag) {
+    char buf[3];
+    tok.skip();
+    if ((buf[0] = tok.ch()) != 0) {
+      tok.next();
+      if ((buf[1] = tok.ch()) != 0) {
+	buf[2] = 0;
+	tok.make_space();
+      }
+      else
+	non_empty_name_warning();
+      return symbol(buf);
+    }
+    else {
+      empty_name_warning(required);
+      return NULL_SYMBOL;
+    }
+  }
+  else
+    return get_long_name(required);
+}
+
+symbol get_long_name(int required)
+{
+  return do_get_long_name(required, 0);
+}
+
+static symbol do_get_long_name(int required, char end)
+{
+  while (tok.space())
+    tok.next();
+  char abuf[ABUF_SIZE];
+  char *buf = abuf;
+  int buf_size = ABUF_SIZE;
+  int i = 0;
+  for (;;) {
+    // If end != 0 we normally have to append a null byte
+    if (i + 2 > buf_size) {
+      if (buf == abuf) {
+	buf = new char[ABUF_SIZE*2];
+	memcpy(buf, abuf, buf_size);
+	buf_size = ABUF_SIZE*2;
+      }
+      else {
+	char *old_buf = buf;
+	buf = new char[buf_size*2];
+	memcpy(buf, old_buf, buf_size);
+	buf_size *= 2;
+	a_delete old_buf;
+      }
+    }
+    if ((buf[i] = tok.ch()) == 0 || buf[i] == end)
+      break;
+    i++;
+    tok.next();
+  }
+  if (i == 0) {
+    empty_name_warning(required);
+    return NULL_SYMBOL;
+  }
+  if (end && buf[i] == end)
+    buf[i+1] = '\0';
+  else
+    non_empty_name_warning();
+  if (buf == abuf)
+    return symbol(buf);
+  else {
+    symbol s(buf);
+    a_delete buf;
+    return s;
+  }
+}
+
+void exit_troff()
+{
+  exit_started = 1;
+  topdiv->set_last_page();
+  if (!end_macro_name.is_null()) {
+    spring_trap(end_macro_name);
+    tok.next();
+    process_input_stack();
+  }
+  curenv->final_break();
+  tok.next();
+  process_input_stack();
+  end_diversions();
+  if (topdiv->get_page_length() > 0) {
+    done_end_macro = 1;
+    topdiv->set_ejecting();
+    static unsigned char buf[2] = { LAST_PAGE_EJECTOR, '\0' };
+    input_stack::push(make_temp_iterator((char *)buf));
+    topdiv->space(topdiv->get_page_length(), 1);
+    tok.next();
+    process_input_stack();
+    seen_last_page_ejector = 1;	// should be set already
+    topdiv->set_ejecting();
+    push_page_ejector();
+    topdiv->space(topdiv->get_page_length(), 1);
+    tok.next();
+    process_input_stack();
+  }
+  // This will only happen if a trap-invoked macro starts a diversion,
+  // or if vertical position traps have been disabled.
+  cleanup_and_exit(0);
+}
+
+// This implements .ex.  The input stack must be cleared before calling
+// exit_troff().
+
+void exit_request()
+{
+  input_stack::clear();
+  if (exit_started)
+    tok.next();
+  else
+    exit_troff();
+}
+
+void return_macro_request()
+{
+  input_stack::pop_macro();
+  tok.next();
+}
+
+void end_macro()
+{
+  end_macro_name = get_name();
+  skip_line();
+}
+
+void blank_line_macro()
+{
+  blank_line_macro_name = get_name();
+  skip_line();
+}
+
+static void trapping_blank_line()
+{
+  if (!blank_line_macro_name.is_null())
+    spring_trap(blank_line_macro_name);
+  else
+    blank_line();
+}
+
+void do_request()
+{
+  int old_compatible_flag = compatible_flag;
+  compatible_flag = 0;
+  symbol nm = get_name();
+  if (nm.is_null())
+    skip_line();
+  else
+    interpolate_macro(nm);
+  compatible_flag = old_compatible_flag;
+}
+
+inline int possibly_handle_first_page_transition()
+{
+  if (topdiv->before_first_page && curdiv == topdiv && !curenv->is_dummy()) {
+    handle_first_page_transition();
+    return 1;
+  }
+  else
+    return 0;
+}
+
+static int transparent_translate(int cc)
+{
+  if (!invalid_input_char(cc)) {
+    charinfo *ci = charset_table[cc];
+    switch (ci->get_special_translation(1)) {
+    case charinfo::TRANSLATE_SPACE:
+      return ' ';
+    case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+      return ESCAPE_TILDE;
+    case charinfo::TRANSLATE_DUMMY:
+      return ESCAPE_AMPERSAND;
+    case charinfo::TRANSLATE_HYPHEN_INDICATOR:
+      return ESCAPE_PERCENT;
+    }
+    // This is really ugly.
+    ci = ci->get_translation(1);
+    if (ci) {
+      int c = ci->get_ascii_code();
+      if (c != '\0')
+	return c;
+      error("can't translate %1 to special character `%2'"
+	    " in transparent throughput",
+	    input_char_description(cc),
+	    ci->nm.contents());
+    }
+  }
+  return cc;
+}
+
+class int_stack {
+  struct int_stack_element {
+    int n;
+    int_stack_element *next;
+  } *top;
+public:
+  int_stack();
+  ~int_stack();
+  void push(int);
+  int is_empty();
+  int pop();
+};
+
+int_stack::int_stack()
+{
+  top = 0;
+}
+
+int_stack::~int_stack()
+{
+  while (top != 0) {
+    int_stack_element *temp = top;
+    top = top->next;
+    delete temp;
+  }
+}
+
+int int_stack::is_empty()
+{
+  return top == 0;
+}
+
+void int_stack::push(int n)
+{
+  int_stack_element *p = new int_stack_element;
+  p->next = top;
+  p->n = n;
+  top = p;
+}
+
+int int_stack::pop()
+{
+  assert(top != 0);
+  int_stack_element *p = top;
+  top = top->next;
+  int n = p->n;
+  delete p;
+  return n;
+}
+
+int node::reread(int *)
+{
+  return 0;
+}
+
+int diverted_space_node::reread(int *bolp)
+{
+  if (curenv->get_fill())
+    trapping_blank_line();
+  else
+    curdiv->space(n);
+  *bolp = 1;
+  return 1;
+}
+
+int diverted_copy_file_node::reread(int *bolp)
+{
+  curdiv->copy_file(filename.contents());
+  *bolp = 1;
+  return 1;
+}
+
+int word_space_node::reread(int *)
+{
+  if (unformat) {
+    for (width_list *w = orig_width; w; w = w->next)
+      curenv->space(w->width, w->sentence_width);
+    unformat = 0;
+    return 1;
+  }
+  return 0;
+}
+
+int unbreakable_space_node::reread(int *)
+{
+  return 0;
+}
+
+int hmotion_node::reread(int *)
+{
+  if (unformat && was_tab) {
+    curenv->handle_tab(0);
+    unformat = 0;
+    return 1;
+  }
+  return 0;
+}
+
+void process_input_stack()
+{
+  int_stack trap_bol_stack;
+  int bol = 1;
+  for (;;) {
+    int suppress_next = 0;
+    switch (tok.type) {
+    case token::TOKEN_CHAR:
+      {
+	unsigned char ch = tok.c;
+	if (bol && !have_input
+	    && (ch == curenv->control_char
+		|| ch == curenv->no_break_control_char)) {
+	  break_flag = ch == curenv->control_char;
+	  // skip tabs as well as spaces here
+	  do {
+	    tok.next();
+	  } while (tok.white_space());
+	  symbol nm = get_name();
+	  if (nm.is_null())
+	    skip_line();
+	  else
+	    interpolate_macro(nm);
+	  suppress_next = 1;
+	}
+	else {
+	  if (possibly_handle_first_page_transition())
+	    ;
+	  else {
+	    for (;;) {
+	      curenv->add_char(charset_table[ch]);
+	      tok.next();
+	      if (tok.type != token::TOKEN_CHAR)
+		break;
+	      ch = tok.c;
+	    }
+	    suppress_next = 1;
+	    bol = 0;
+	  }
+	}
+	break;
+      }
+    case token::TOKEN_TRANSPARENT:
+      {
+	if (bol) {
+	  if (possibly_handle_first_page_transition())
+	    ;
+	  else {
+	    int cc;
+	    do {
+	      node *n;
+	      cc = get_copy(&n);
+	      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');
+	  }
+	}
+	break;
+      }
+    case token::TOKEN_NEWLINE:
+      {
+	if (bol && !have_input
+	    && !curenv->get_prev_line_interrupted())
+	  trapping_blank_line();
+	else {
+	  curenv->newline();
+	  bol = 1;
+	}
+	break;
+      }
+    case token::TOKEN_REQUEST:
+      {
+	int request_code = tok.c;
+	tok.next();
+	switch (request_code) {
+	case TITLE_REQUEST:
+	  title();
+	  break;
+	case COPY_FILE_REQUEST:
+	  copy_file();
+	  break;
+	case TRANSPARENT_FILE_REQUEST:
+	  transparent_file();
+	  break;
+#ifdef COLUMN
+	case VJUSTIFY_REQUEST:
+	  vjustify();
+	  break;
+#endif /* COLUMN */
+	default:
+	  assert(0);
+	  break;
+	}
+	suppress_next = 1;
+	break;
+      }
+    case token::TOKEN_SPACE:
+      {
+	if (possibly_handle_first_page_transition())
+	  ;
+	else if (bol && !curenv->get_prev_line_interrupted()) {
+	  int nspaces = 0;
+	  // save space_width now so that it isn't changed by \f or \s
+	  // which we wouldn't notice here
+	  hunits space_width = curenv->get_space_width();
+	  do {
+	    nspaces += tok.nspaces();
+	    tok.next();
+	  } while (tok.space());
+	  if (tok.newline())
+	    trapping_blank_line();
+	  else {
+	    push_token(tok);
+	    curenv->do_break();
+	    curenv->add_node(new hmotion_node(space_width * nspaces,
+					      curenv->get_fill_color()));
+	    bol = 0;
+	  }
+	}
+	else {
+	  curenv->space();
+	  bol = 0;
+	}
+	break;
+      }
+    case token::TOKEN_EOF:
+      return;
+    case token::TOKEN_NODE:
+      {
+	if (possibly_handle_first_page_transition())
+	  ;
+	else if (tok.nd->reread(&bol)) {
+	  delete tok.nd;
+	  tok.nd = 0;
+	}
+	else {
+	  curenv->add_node(tok.nd);
+	  tok.nd = 0;
+	  bol = 0;
+	  curenv->possibly_break_line(1);
+	}
+	break;
+      }
+    case token::TOKEN_PAGE_EJECTOR:
+      {
+	continue_page_eject();
+	// I think we just want to preserve bol.
+	// bol = 1;
+	break;
+      }
+    case token::TOKEN_BEGIN_TRAP:
+      {
+	trap_bol_stack.push(bol);
+	bol = 1;
+	have_input = 0;
+	break;
+      }
+    case token::TOKEN_END_TRAP:
+      {
+	if (trap_bol_stack.is_empty())
+	  error("spurious end trap token detected!");
+	else
+	  bol = trap_bol_stack.pop();
+	have_input = 0;
+
+	/* I'm not totally happy about this.  But I can't think of any other
+	  way to do it.  Doing an output_pending_lines() whenever a
+	  TOKEN_END_TRAP is detected doesn't work: for example,
+
+	  .wh -1i x
+	  .de x
+	  'bp
+	  ..
+	  .wh -.5i y
+	  .de y
+	  .tl ''-%-''
+	  ..
+	  .br
+	  .ll .5i
+	  .sp |\n(.pu-1i-.5v
+	  a\%very\%very\%long\%word
+
+	  will print all but the first lines from the word immediately
+	  after the footer, rather than on the next page. */
+
+	if (trap_bol_stack.is_empty())
+	  curenv->output_pending_lines();
+	break;
+      }
+    default:
+      {
+	bol = 0;
+	tok.process();
+	break;
+      }
+    }
+    if (!suppress_next)
+      tok.next();
+    trap_sprung_flag = 0;
+  }
+}
+
+#ifdef WIDOW_CONTROL
+
+void flush_pending_lines()
+{
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  curenv->output_pending_lines();
+  tok.next();
+}
+
+#endif /* WIDOW_CONTROL */
+
+request_or_macro::request_or_macro()
+{
+}
+
+macro *request_or_macro::to_macro()
+{
+  return 0;
+}
+
+request::request(REQUEST_FUNCP pp) : p(pp)
+{
+}
+
+void request::invoke(symbol)
+{
+  (*p)();
+}
+
+struct char_block {
+  enum { SIZE = 128 };
+  unsigned char s[SIZE];
+  char_block *next;
+  char_block();
+};
+
+char_block::char_block()
+: next(0)
+{
+}
+
+class char_list {
+public:
+  char_list();
+  ~char_list();
+  void append(unsigned char);
+  void set(unsigned char, int);
+  unsigned char get(int);
+  int length();
+private:
+  unsigned char *ptr;
+  int len;
+  char_block *head;
+  char_block *tail;
+  friend class macro_header;
+  friend class string_iterator;
+};
+
+char_list::char_list()
+: ptr(0), len(0), head(0), tail(0)
+{
+}
+
+char_list::~char_list()
+{
+  while (head != 0) {
+    char_block *tem = head;
+    head = head->next;
+    delete tem;
+  }
+}
+
+int char_list::length()
+{
+  return len;
+}
+
+void char_list::append(unsigned char c)
+{
+  if (tail == 0) {
+    head = tail = new char_block;
+    ptr = tail->s;
+  }
+  else {
+    if (ptr >= tail->s + char_block::SIZE) {
+      tail->next = new char_block;
+      tail = tail->next;
+      ptr = tail->s;
+    }
+  }
+  *ptr++ = c;
+  len++;
+}
+
+void char_list::set(unsigned char c, int offset)
+{
+  assert(len > offset);
+  // optimization for access at the end
+  int boundary = len - len % char_block::SIZE;
+  if (offset >= boundary) {
+    *(tail->s + offset - boundary) = c;
+    return;
+  }
+  char_block *tem = head;
+  int l = 0;
+  for (;;) {
+    l += char_block::SIZE;
+    if (l > offset) {
+      *(tem->s + offset % char_block::SIZE) = c;
+      return;
+    }
+    tem = tem->next;
+  }
+}
+
+unsigned char char_list::get(int offset)
+{
+  assert(len > offset);
+  // optimization for access at the end
+  int boundary = len - len % char_block::SIZE;
+  if (offset >= boundary)
+    return *(tail->s + offset - boundary);
+  char_block *tem = head;
+  int l = 0;
+  for (;;) {
+    l += char_block::SIZE;
+    if (l > offset)
+      return *(tem->s + offset % char_block::SIZE);
+    tem = tem->next;
+  }
+}
+
+class node_list {
+  node *head;
+  node *tail;
+public:
+  node_list();
+  ~node_list();
+  void append(node *);
+  int length();
+  node *extract();
+
+  friend class macro_header;
+  friend class string_iterator;
+};
+
+void node_list::append(node *n)
+{
+  if (head == 0) {
+    n->next = 0;
+    head = tail = n;
+  }
+  else {
+    n->next = 0;
+    tail = tail->next = n;
+  }
+}
+
+int node_list::length()
+{
+  int total = 0;
+  for (node *n = head; n != 0; n = n->next)
+    ++total;
+  return total;
+}
+
+node_list::node_list()
+{
+  head = tail = 0;
+}
+
+node *node_list::extract()
+{
+  node *temp = head;
+  head = tail = 0;
+  return temp;
+}
+
+node_list::~node_list()
+{
+  delete_node_list(head);
+}
+
+struct macro_header {
+public:
+  int count;
+  char_list cl;
+  node_list nl;
+  macro_header() { count = 1; }
+  macro_header *copy(int);
+};
+
+macro::~macro()
+{
+  if (p != 0 && --(p->count) <= 0)
+    delete p;
+}
+
+macro::macro()
+{
+  if (!input_stack::get_location(1, &filename, &lineno)) {
+    filename = 0;
+    lineno = 0;
+  }
+  len = 0;
+  empty_macro = 1;
+  p = 0;
+}
+
+macro::macro(const macro &m)
+: p(m.p), filename(m.filename), lineno(m.lineno), len(m.len),
+  empty_macro(m.empty_macro)
+{
+  if (p != 0)
+    p->count++;
+}
+
+macro &macro::operator=(const macro &m)
+{
+  // don't assign object
+  if (m.p != 0)
+    m.p->count++;
+  if (p != 0 && --(p->count) <= 0)
+    delete p;
+  p = m.p;
+  filename = m.filename;
+  lineno = m.lineno;
+  len = m.len;
+  empty_macro = m.empty_macro;
+  return *this;
+}
+
+void macro::append(unsigned char c)
+{
+  assert(c != 0);
+  if (p == 0)
+    p = new macro_header;
+  if (p->cl.length() != len) {
+    macro_header *tem = p->copy(len);
+    if (--(p->count) <= 0)
+      delete p;
+    p = tem;
+  }
+  p->cl.append(c);
+  ++len;
+  if (c != COMPATIBLE_SAVE && c != COMPATIBLE_RESTORE)
+    empty_macro = 0;
+}
+
+void macro::set(unsigned char c, int offset)
+{
+  assert(p != 0);
+  assert(c != 0);
+  p->cl.set(c, offset);
+}
+
+unsigned char macro::get(int offset)
+{
+  assert(p != 0);
+  return p->cl.get(offset);
+}
+
+int macro::length()
+{
+  return len;
+}
+
+void macro::append_str(const char *s)
+{
+  int i = 0;
+
+  if (s) {
+    while (s[i] != (char)0) {
+      append(s[i]);
+      i++;
+    }
+  }
+}
+
+void macro::append(node *n)
+{
+  assert(n != 0);
+  if (p == 0)
+    p = new macro_header;
+  if (p->cl.length() != len) {
+    macro_header *tem = p->copy(len);
+    if (--(p->count) <= 0)
+      delete p;
+    p = tem;
+  }
+  p->cl.append(0);
+  p->nl.append(n);
+  ++len;
+  empty_macro = 0;
+}
+
+void macro::append_unsigned(unsigned int i)
+{
+  unsigned int j = i / 10;
+  if (j != 0)
+    append_unsigned(j);
+  append(((unsigned char)(((int)'0') + i % 10)));
+}
+
+void macro::append_int(int i)
+{
+  if (i < 0) {
+    append('-');
+    i = -i;
+  }
+  append_unsigned((unsigned int)i);
+}
+
+void macro::print_size()
+{
+  errprint("%1", len);
+}
+
+// make a copy of the first n bytes
+
+macro_header *macro_header::copy(int n)
+{
+  macro_header *p = new macro_header;
+  char_block *bp = cl.head;
+  unsigned char *ptr = bp->s;
+  node *nd = nl.head;
+  while (--n >= 0) {
+    if (ptr >= bp->s + char_block::SIZE) {
+      bp = bp->next;
+      ptr = bp->s;
+    }
+    int c = *ptr++;
+    p->cl.append(c);
+    if (c == 0) {
+      p->nl.append(nd->copy());
+      nd = nd->next;
+    }
+  }
+  return p;
+}
+
+void print_macros()
+{
+  object_dictionary_iterator iter(request_dictionary);
+  request_or_macro *rm;
+  symbol s;
+  while (iter.get(&s, (object **)&rm)) {
+    assert(!s.is_null());
+    macro *m = rm->to_macro();
+    if (m) {
+      errprint("%1\t", s.contents());
+      m->print_size();
+      errprint("\n");
+    }
+  }
+  fflush(stderr);
+  skip_line();
+}
+
+class string_iterator : public input_iterator {
+  macro mac;
+  const char *how_invoked;
+  int newline_flag;
+  int lineno;
+  char_block *bp;
+  int count;			// of characters remaining
+  node *nd;
+  int saved_compatible_flag;
+protected:
+  symbol nm;
+  string_iterator();
+public:
+  string_iterator(const macro &m, const char *p = 0, symbol s = NULL_SYMBOL);
+  int fill(node **);
+  int peek();
+  int get_location(int, const char **, int *);
+  void backtrace();
+  void save_compatible_flag(int f) { saved_compatible_flag = f; }
+  int get_compatible_flag() { return saved_compatible_flag; }
+};
+
+string_iterator::string_iterator(const macro &m, const char *p, symbol s)
+: mac(m), how_invoked(p),
+  newline_flag(0), lineno(1), nm(s)
+{
+  count = mac.len;
+  if (count != 0) {
+    bp = mac.p->cl.head;
+    nd = mac.p->nl.head;
+    ptr = eptr = bp->s;
+  }
+  else {
+    bp = 0;
+    nd = 0;
+    ptr = eptr = 0;
+  }
+}
+
+string_iterator::string_iterator()
+{
+  bp = 0;
+  nd = 0;
+  ptr = eptr = 0;
+  newline_flag = 0;
+  how_invoked = 0;
+  lineno = 1;
+  count = 0;
+}
+
+int string_iterator::fill(node **np)
+{
+  if (newline_flag)
+    lineno++;
+  newline_flag = 0;
+  if (count <= 0)
+    return EOF;
+  const unsigned char *p = eptr;
+  if (p >= bp->s + char_block::SIZE) {
+    bp = bp->next;
+    p = bp->s;
+  }
+  if (*p == '\0') {
+    if (np)
+      *np = nd->copy();
+    nd = nd->next;
+    eptr = ptr = p + 1;
+    count--;
+    return 0;
+  }
+  const unsigned char *e = bp->s + char_block::SIZE;
+  if (e - p > count)
+    e = p + count;
+  ptr = p;
+  while (p < e) {
+    unsigned char c = *p;
+    if (c == '\n' || c == ESCAPE_NEWLINE) {
+      newline_flag = 1;
+      p++;
+      break;
+    }
+    if (c == '\0')
+      break;
+    p++;
+  }
+  eptr = p;
+  count -= p - ptr;
+  return *ptr++;
+}
+
+int string_iterator::peek()
+{
+  if (count <= 0)
+    return EOF;
+  const unsigned char *p = eptr;
+  if (p >= bp->s + char_block::SIZE) {
+    p = bp->next->s;
+  }
+  return *p;
+}
+
+int string_iterator::get_location(int allow_macro,
+				  const char **filep, int *linep)
+{
+  if (!allow_macro)
+    return 0;
+  if (mac.filename == 0)
+    return 0;
+  *filep = mac.filename;
+  *linep = mac.lineno + lineno - 1;
+  return 1;
+}
+
+void string_iterator::backtrace()
+{
+  if (mac.filename) {
+    errprint("%1:%2: backtrace", mac.filename, mac.lineno + lineno - 1);
+    if (how_invoked) {
+      if (!nm.is_null())
+	errprint(": %1 `%2'\n", how_invoked, nm.contents());
+      else
+	errprint(": %1\n", how_invoked);
+    }
+    else
+      errprint("\n");
+  }
+}
+
+class temp_iterator : public input_iterator {
+  unsigned char *base;
+  temp_iterator(const char *, int len);
+public:
+  ~temp_iterator();
+  friend input_iterator *make_temp_iterator(const char *);
+};
+
+#ifdef __GNUG__
+inline
+#endif
+temp_iterator::temp_iterator(const char *s, int len)
+{
+  base = new unsigned char[len];
+  memcpy(base, s, len);
+  ptr = base;
+  eptr = base + len;
+}
+
+temp_iterator::~temp_iterator()
+{
+  a_delete base;
+}
+
+class small_temp_iterator : public input_iterator {
+private:
+  small_temp_iterator(const char *, int);
+  ~small_temp_iterator();
+  enum { BLOCK = 16 };
+  static small_temp_iterator *free_list;
+  void *operator new(size_t);
+  void operator delete(void *);
+  enum { SIZE = 12 };
+  unsigned char buf[SIZE];
+  friend input_iterator *make_temp_iterator(const char *);
+};
+
+small_temp_iterator *small_temp_iterator::free_list = 0;
+
+void *small_temp_iterator::operator new(size_t n)
+{
+  assert(n == sizeof(small_temp_iterator));
+  if (!free_list) {
+    free_list =
+      (small_temp_iterator *)new char[sizeof(small_temp_iterator)*BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK-1].next = 0;
+  }
+  small_temp_iterator *p = free_list;
+  free_list = (small_temp_iterator *)(free_list->next);
+  p->next = 0;
+  return p;
+}
+
+#ifdef __GNUG__
+inline
+#endif
+void small_temp_iterator::operator delete(void *p)
+{
+  if (p) {
+    ((small_temp_iterator *)p)->next = free_list;
+    free_list = (small_temp_iterator *)p;
+  }
+}
+
+small_temp_iterator::~small_temp_iterator()
+{
+}
+
+#ifdef __GNUG__
+inline
+#endif
+small_temp_iterator::small_temp_iterator(const char *s, int len)
+{
+  for (int i = 0; i < len; i++)
+    buf[i] = s[i];
+  ptr = buf;
+  eptr = buf + len;
+}
+
+input_iterator *make_temp_iterator(const char *s)
+{
+  if (s == 0)
+    return new small_temp_iterator(s, 0);
+  else {
+    int n = strlen(s);
+    if (n <= small_temp_iterator::SIZE)
+      return new small_temp_iterator(s, n);
+    else
+      return new temp_iterator(s, n);
+  }
+}
+
+// this is used when macros with arguments are interpolated
+
+struct arg_list {
+  macro mac;
+  arg_list *next;
+  arg_list(const macro &);
+  ~arg_list();
+};
+
+arg_list::arg_list(const macro &m) : mac(m), next(0)
+{
+}
+
+arg_list::~arg_list()
+{
+}
+
+class macro_iterator : public string_iterator {
+  arg_list *args;
+  int argc;
+public:
+  macro_iterator(symbol, macro &, const char *how_invoked = "macro");
+  macro_iterator();
+  ~macro_iterator();
+  int has_args() { return 1; }
+  input_iterator *get_arg(int i);
+  int nargs() { return argc; }
+  void add_arg(const macro &m);
+  void shift(int n);
+  int is_macro() { return 1; }
+};
+
+input_iterator *macro_iterator::get_arg(int i)
+{
+  if (i == 0)
+    return make_temp_iterator(nm.contents());
+  if (i > 0 && i <= argc) {
+    arg_list *p = args;
+    for (int j = 1; j < i; j++) {
+      assert(p != 0);
+      p = p->next;
+    }
+    return new string_iterator(p->mac);
+  }
+  else
+    return 0;
+}
+
+void macro_iterator::add_arg(const macro &m)
+{
+  arg_list **p;
+  for (p = &args; *p; p = &((*p)->next))
+    ;
+  *p = new arg_list(m);
+  ++argc;
+}
+
+void macro_iterator::shift(int n)
+{
+  while (n > 0 && argc > 0) {
+    arg_list *tem = args;
+    args = args->next;
+    delete tem;
+    --argc;
+    --n;
+  }
+}
+
+// This gets used by eg .if '\?xxx\?''.
+
+int operator==(const macro &m1, const macro &m2)
+{
+  if (m1.len != m2.len)
+    return 0;
+  string_iterator iter1(m1);
+  string_iterator iter2(m2);
+  int n = m1.len;
+  while (--n >= 0) {
+    node *nd1 = 0;
+    int c1 = iter1.get(&nd1);
+    assert(c1 != EOF);
+    node *nd2 = 0;
+    int c2 = iter2.get(&nd2);
+    assert(c2 != EOF);
+    if (c1 != c2) {
+      if (c1 == 0)
+	delete nd1;
+      else if (c2 == 0)
+	delete nd2;
+      return 0;
+    }
+    if (c1 == 0) {
+      assert(nd1 != 0);
+      assert(nd2 != 0);
+      int are_same = nd1->type() == nd2->type() && nd1->same(nd2);
+      delete nd1;
+      delete nd2;
+      if (!are_same)
+	return 0;
+    }
+  }
+  return 1;
+}
+
+static void interpolate_macro(symbol nm)
+{
+  request_or_macro *p = (request_or_macro *)request_dictionary.lookup(nm);
+  if (p == 0) {
+    int warned = 0;
+    const char *s = nm.contents();
+    if (strlen(s) > 2) {
+      request_or_macro *r;
+      char buf[3];
+      buf[0] = s[0];
+      buf[1] = s[1];
+      buf[2] = '\0';
+      r = (request_or_macro *)request_dictionary.lookup(symbol(buf));
+      if (r) {
+	macro *m = r->to_macro();
+	if (!m || !m->empty())
+	  warned = warning(WARN_SPACE,
+			   "macro `%1' not defined "
+			   "(probably missing space after `%2')",
+			   nm.contents(), buf);
+      }
+    }
+    if (!warned) {
+      warning(WARN_MAC, "macro `%1' not defined", nm.contents());
+      p = new macro;
+      request_dictionary.define(nm, p);
+    }
+  }
+  if (p)
+    p->invoke(nm);
+  else {
+    skip_line();
+    return;
+  }
+}
+
+static void decode_args(macro_iterator *mi)
+{
+  if (!tok.newline() && !tok.eof()) {
+    node *n;
+    int c = get_copy(&n);
+    for (;;) {
+      while (c == ' ')
+	c = get_copy(&n);
+      if (c == '\n' || c == EOF)
+	break;
+      macro arg;
+      int quote_input_level = 0;
+      int done_tab_warning = 0;
+      if (c == '\"') {
+	quote_input_level = input_stack::get_level();
+	c = get_copy(&n);
+      }
+      while (c != EOF && c != '\n' && !(c == ' ' && quote_input_level == 0)) {
+	if (quote_input_level > 0 && c == '\"'
+	    && (compatible_flag
+		|| input_stack::get_level() == quote_input_level)) {
+	  c = get_copy(&n);
+	  if (c == '"') {
+	    arg.append(c);
+	    c = get_copy(&n);
+	  }
+	  else
+	    break;
+	}
+	else {
+	  if (c == 0)
+	    arg.append(n);
+	  else {
+	    if (c == '\t' && quote_input_level == 0 && !done_tab_warning) {
+	      warning(WARN_TAB, "tab character in unquoted macro argument");
+	      done_tab_warning = 1;
+	    }
+	    arg.append(c);
+	  }
+	  c = get_copy(&n);
+	}
+      }
+      mi->add_arg(arg);
+    }
+  }
+}
+
+static void decode_string_args(macro_iterator *mi)
+{
+  node *n;
+  int c = get_copy(&n);
+  for (;;) {
+    while (c == ' ')
+      c = get_copy(&n);
+    if (c == '\n' || c == EOF) {
+      error("missing `]'");
+      break;
+    }
+    if (c == ']')
+      break;
+    macro arg;
+    int quote_input_level = 0;
+    int done_tab_warning = 0;
+    if (c == '\"') {
+      quote_input_level = input_stack::get_level();
+      c = get_copy(&n);
+    }
+    while (c != EOF && c != '\n'
+	   && !(c == ']' && quote_input_level == 0)
+	   && !(c == ' ' && quote_input_level == 0)) {
+      if (quote_input_level > 0 && c == '\"'
+	  && input_stack::get_level() == quote_input_level) {
+	c = get_copy(&n);
+	if (c == '"') {
+	  arg.append(c);
+	  c = get_copy(&n);
+	}
+	else
+	  break;
+      }
+      else {
+	if (c == 0)
+	  arg.append(n);
+	else {
+	  if (c == '\t' && quote_input_level == 0 && !done_tab_warning) {
+	    warning(WARN_TAB, "tab character in unquoted string argument");
+	    done_tab_warning = 1;
+	  }
+	  arg.append(c);
+	}
+	c = get_copy(&n);
+      }
+    }
+    mi->add_arg(arg);
+  }
+}
+
+void macro::invoke(symbol nm)
+{
+  macro_iterator *mi = new macro_iterator(nm, *this);
+  decode_args(mi);
+  input_stack::push(mi);
+  tok.next();
+}
+
+macro *macro::to_macro()
+{
+  return this;
+}
+
+int macro::empty()
+{
+  return empty_macro == 1;
+}
+
+macro_iterator::macro_iterator(symbol s, macro &m, const char *how_invoked)
+: string_iterator(m, how_invoked, s), args(0), argc(0)
+{
+}
+
+macro_iterator::macro_iterator() : args(0), argc(0)
+{
+}
+
+macro_iterator::~macro_iterator()
+{
+  while (args != 0) {
+    arg_list *tem = args;
+    args = args->next;
+    delete tem;
+  }
+}
+
+dictionary composite_dictionary(17);
+
+void composite_request()
+{
+  symbol from = get_name(1);
+  if (!from.is_null()) {
+    const char *from_gn = glyph_name_to_unicode(from.contents());
+    if (!from_gn) {
+      from_gn = check_unicode_name(from.contents());
+      if (!from_gn) {
+	error("invalid composite glyph name `%1'", from.contents());
+	skip_line();
+	return;
+      }
+    }
+    const char *from_decomposed = decompose_unicode(from_gn);
+    if (from_decomposed)
+      from_gn = &from_decomposed[1];
+    symbol to = get_name(1);
+    if (to.is_null())
+      composite_dictionary.remove(symbol(from_gn));
+    else {
+      const char *to_gn = glyph_name_to_unicode(to.contents());
+      if (!to_gn) {
+	to_gn = check_unicode_name(to.contents());
+	if (!to_gn) {
+	  error("invalid composite glyph name `%1'", to.contents());
+	  skip_line();
+	  return;
+	}
+      }
+      const char *to_decomposed = decompose_unicode(to_gn);
+      if (to_decomposed)
+	to_gn = &to_decomposed[1];
+      if (strcmp(from_gn, to_gn) == 0)
+	composite_dictionary.remove(symbol(from_gn));
+      else
+	(void)composite_dictionary.lookup(symbol(from_gn), (void *)to_gn);
+    }
+  }
+  skip_line();
+}
+
+static symbol composite_glyph_name(symbol nm)
+{
+  macro_iterator *mi = new macro_iterator();
+  decode_string_args(mi);
+  input_stack::push(mi);
+  const char *gn = glyph_name_to_unicode(nm.contents());
+  if (!gn) {
+    gn = check_unicode_name(nm.contents());
+    if (!gn) {
+      error("invalid base glyph `%1' in composite glyph name", nm.contents());
+      return EMPTY_SYMBOL;
+    }
+  }
+  const char *gn_decomposed = decompose_unicode(gn);
+  string glyph_name(gn_decomposed ? &gn_decomposed[1] : gn);
+  string gl;
+  int n = input_stack::nargs();
+  for (int i = 1; i <= n; i++) {
+    glyph_name += '_';
+    input_iterator *p = input_stack::get_arg(i);
+    gl.clear();
+    int c;
+    while ((c = p->get(0)) != EOF)
+      gl += c;
+    gl += '\0';
+    const char *u = glyph_name_to_unicode(gl.contents());
+    if (!u) {
+      u = check_unicode_name(gl.contents());
+      if (!u) {
+	error("invalid component `%1' in composite glyph name",
+	      gl.contents());
+	return EMPTY_SYMBOL;
+      }
+    }
+    const char *decomposed = decompose_unicode(u);
+    if (decomposed)
+      u = &decomposed[1];
+    void *mapped_composite = composite_dictionary.lookup(symbol(u));
+    if (mapped_composite)
+      u = (const char *)mapped_composite;
+    glyph_name += u;
+  }
+  glyph_name += '\0';
+  const char *groff_gn = unicode_to_glyph_name(glyph_name.contents());
+  if (groff_gn)
+    return symbol(groff_gn);
+  gl.clear();
+  gl += 'u';
+  gl += glyph_name;
+  return symbol(gl.contents());
+}
+
+int trap_sprung_flag = 0;
+int postpone_traps_flag = 0;
+symbol postponed_trap;
+
+void spring_trap(symbol nm)
+{
+  assert(!nm.is_null());
+  trap_sprung_flag = 1;
+  if (postpone_traps_flag) {
+    postponed_trap = nm;
+    return;
+  }
+  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);
+  macro *m = p->to_macro();
+  if (m)
+    input_stack::push(new macro_iterator(nm, *m, "trap-invoked macro"));
+  else
+    error("you can't invoke a request with a trap");
+  input_stack::push(make_temp_iterator(buf));
+}
+
+void postpone_traps()
+{
+  postpone_traps_flag = 1;
+}
+
+int unpostpone_traps()
+{
+  postpone_traps_flag = 0;
+  if (!postponed_trap.is_null()) {
+    spring_trap(postponed_trap);
+    postponed_trap = NULL_SYMBOL;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void read_request()
+{
+  macro_iterator *mi = new macro_iterator;
+  int reading_from_terminal = isatty(fileno(stdin));
+  int had_prompt = 0;
+  if (!tok.newline() && !tok.eof()) {
+    int c = get_copy(0);
+    while (c == ' ')
+      c = get_copy(0);
+    while (c != EOF && c != '\n' && c != ' ') {
+      if (!invalid_input_char(c)) {
+	if (reading_from_terminal)
+	  fputc(c, stderr);
+	had_prompt = 1;
+      }
+      c = get_copy(0);
+    }
+    if (c == ' ') {
+      tok.make_space();
+      decode_args(mi);
+    }
+  }
+  if (reading_from_terminal) {
+    fputc(had_prompt ? ':' : '\a', stderr);
+    fflush(stderr);
+  }
+  input_stack::push(mi);
+  macro mac;
+  int nl = 0;
+  int c;
+  while ((c = getchar()) != EOF) {
+    if (invalid_input_char(c))
+      warning(WARN_INPUT, "invalid input character code %1", int(c));
+    else {
+      if (c == '\n') {
+	if (nl)
+	  break;
+	else
+	  nl = 1;
+      }
+      else
+	nl = 0;
+      mac.append(c);
+    }
+  }
+  if (reading_from_terminal)
+    clearerr(stdin);
+  input_stack::push(new string_iterator(mac));
+  tok.next();
+}
+
+enum define_mode { DEFINE_NORMAL, DEFINE_APPEND, DEFINE_IGNORE };
+enum calling_mode { CALLING_NORMAL, CALLING_INDIRECT, CALLING_DISABLE_COMP };
+
+void do_define_string(define_mode mode, calling_mode calling)
+{
+  symbol nm;
+  node *n;
+  int c;
+  nm = get_name(1);
+  if (nm.is_null()) {
+    skip_line();
+    return;
+  }
+  if (tok.newline())
+    c = '\n';
+  else if (tok.tab())
+    c = '\t';
+  else if (!tok.space()) {
+    error("bad string definition");
+    skip_line();
+    return;
+  }
+  else
+    c = get_copy(&n);
+  while (c == ' ')
+    c = get_copy(&n);
+  if (c == '"')
+    c = get_copy(&n);
+  macro mac;
+  request_or_macro *rm = (request_or_macro *)request_dictionary.lookup(nm);
+  macro *mm = rm ? rm->to_macro() : 0;
+  if (mode == DEFINE_APPEND && mm)
+    mac = *mm;
+  if (calling == CALLING_DISABLE_COMP)
+    mac.append(COMPATIBLE_SAVE);
+  while (c != '\n' && c != EOF) {
+    if (c == 0)
+      mac.append(n);
+    else
+      mac.append((unsigned char)c);
+    c = get_copy(&n);
+  }
+  if (!mm) {
+    mm = new macro;
+    request_dictionary.define(nm, mm);
+  }
+  if (calling == CALLING_DISABLE_COMP)
+    mac.append(COMPATIBLE_RESTORE);
+  *mm = mac;
+  tok.next();
+}
+
+void define_string()
+{
+  do_define_string(DEFINE_NORMAL, CALLING_NORMAL);
+}
+
+void define_nocomp_string()
+{
+  do_define_string(DEFINE_NORMAL, CALLING_DISABLE_COMP);
+}
+
+void append_string()
+{
+  do_define_string(DEFINE_APPEND, CALLING_NORMAL);
+}
+
+void append_nocomp_string()
+{
+  do_define_string(DEFINE_APPEND, CALLING_DISABLE_COMP);
+}
+
+void do_define_character(char_mode mode, const char *font_name)
+{
+  node *n;
+  int c;
+  tok.skip();
+  charinfo *ci = tok.get_char(1);
+  if (ci == 0) {
+    skip_line();
+    return;
+  }
+  if (font_name) {
+    string s(font_name);
+    s += ' ';
+    s += ci->nm.contents();
+    s += '\0';
+    ci = get_charinfo(symbol(s.contents()));
+  }
+  tok.next();
+  if (tok.newline())
+    c = '\n';
+  else if (tok.tab())
+    c = '\t';
+  else if (!tok.space()) {
+    error("bad character definition");
+    skip_line();
+    return;
+  }
+  else
+    c = get_copy(&n);
+  while (c == ' ' || c == '\t')
+    c = get_copy(&n);
+  if (c == '"')
+    c = get_copy(&n);
+  macro *m = new macro;
+  while (c != '\n' && c != EOF) {
+    if (c == 0)
+      m->append(n);
+    else
+      m->append((unsigned char)c);
+    c = get_copy(&n);
+  }
+  m = ci->setx_macro(m, mode);
+  if (m)
+    delete m;
+  tok.next();
+}
+
+void define_character()
+{
+  do_define_character(CHAR_NORMAL);
+}
+
+void define_fallback_character()
+{
+  do_define_character(CHAR_FALLBACK);
+}
+
+void define_special_character()
+{
+  do_define_character(CHAR_SPECIAL);
+}
+
+static void remove_character()
+{
+  tok.skip();
+  while (!tok.newline() && !tok.eof()) {
+    if (!tok.space() && !tok.tab()) {
+      charinfo *ci = tok.get_char(1);
+      if (!ci)
+	break;
+      macro *m = ci->set_macro(0);
+      if (m)
+	delete m;
+    }
+    tok.next();
+  }
+  skip_line();
+}
+
+static void interpolate_string(symbol nm)
+{
+  request_or_macro *p = lookup_request(nm);
+  macro *m = p->to_macro();
+  if (!m)
+    error("you can only invoke a string or macro using \\*");
+  else {
+    string_iterator *si = new string_iterator(*m, "string", nm);
+    input_stack::push(si);
+  }
+}
+
+static void interpolate_string_with_args(symbol s)
+{
+  request_or_macro *p = lookup_request(s);
+  macro *m = p->to_macro();
+  if (!m)
+    error("you can only invoke a string or macro using \\*");
+  else {
+    macro_iterator *mi = new macro_iterator(s, *m);
+    decode_string_args(mi);
+    input_stack::push(mi);
+  }
+}
+
+/* This class is used for the implementation of \$@.  It is used for
+each of the closing double quotes.  It artificially increases the
+input level by 2, so that the closing double quote will appear to have
+the same input level as the opening quote. */
+
+class end_quote_iterator : public input_iterator {
+  unsigned char buf[1];
+public:
+  end_quote_iterator();
+  ~end_quote_iterator() { }
+  int internal_level() { return 2; }
+};
+
+end_quote_iterator::end_quote_iterator()
+{
+  buf[0] = '"';
+  ptr = buf;
+  eptr = buf + 1;
+}
+
+static void interpolate_arg(symbol nm)
+{
+  const char *s = nm.contents();
+  if (!s || *s == '\0')
+    copy_mode_error("missing argument name");
+  else if (s[1] == 0 && csdigit(s[0]))
+    input_stack::push(input_stack::get_arg(s[0] - '0'));
+  else if (s[0] == '*' && s[1] == '\0') {
+    for (int i = input_stack::nargs(); i > 0; i--) {
+      input_stack::push(input_stack::get_arg(i));
+      if (i != 1)
+	input_stack::push(make_temp_iterator(" "));
+    }
+  }
+  else if (s[0] == '@' && s[1] == '\0') {
+    for (int i = input_stack::nargs(); i > 0; i--) {
+      input_stack::push(new end_quote_iterator);
+      input_stack::push(input_stack::get_arg(i));
+      input_stack::push(make_temp_iterator(i == 1 ? "\"" : " \""));
+    }
+  }
+  else {
+    const char *p;
+    for (p = s; *p && csdigit(*p); p++)
+      ;
+    if (*p)
+      copy_mode_error("bad argument name `%1'", s);
+    else
+      input_stack::push(input_stack::get_arg(atoi(s)));
+  }
+}
+
+void handle_first_page_transition()
+{
+  push_token(tok);
+  topdiv->begin_page();
+}
+
+// We push back a token by wrapping it up in a token_node, and
+// wrapping that up in a string_iterator.
+
+static void push_token(const token &t)
+{
+  macro m;
+  m.append(new token_node(t));
+  input_stack::push(new string_iterator(m));
+}
+
+void push_page_ejector()
+{
+  static char buf[2] = { PAGE_EJECTOR, '\0' };
+  input_stack::push(make_temp_iterator(buf));
+}
+
+void handle_initial_request(unsigned char code)
+{
+  char buf[2];
+  buf[0] = code;
+  buf[1] = '\0';
+  macro mac;
+  mac.append(new token_node(tok));
+  input_stack::push(new string_iterator(mac));
+  input_stack::push(make_temp_iterator(buf));
+  topdiv->begin_page();
+  tok.next();
+}
+
+void handle_initial_title()
+{
+  handle_initial_request(TITLE_REQUEST);
+}
+
+// this should be local to define_macro, but cfront 1.2 doesn't support that
+static symbol dot_symbol(".");
+
+void do_define_macro(define_mode mode, calling_mode calling)
+{
+  symbol nm, term;
+  if (calling == CALLING_INDIRECT) {
+    symbol temp1 = get_name(1);
+    if (temp1.is_null()) {
+      skip_line();
+      return;
+    }
+    symbol temp2 = get_name();
+    input_stack::push(make_temp_iterator("\n"));
+    if (!temp2.is_null()) {
+      interpolate_string(temp2);
+      input_stack::push(make_temp_iterator(" "));
+    }
+    interpolate_string(temp1);
+    input_stack::push(make_temp_iterator(" "));
+    tok.next();
+  }
+  if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND) {
+    nm = get_name(1);
+    if (nm.is_null()) {
+      skip_line();
+      return;
+    }
+  }
+  term = get_name();	// the request that terminates the definition
+  if (term.is_null())
+    term = dot_symbol;
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  const char *start_filename;
+  int start_lineno;
+  int have_start_location = input_stack::get_location(0, &start_filename,
+						      &start_lineno);
+  node *n;
+  // doing this here makes the line numbers come out right
+  int c = get_copy(&n, 1);
+  macro mac;
+  macro *mm = 0;
+  if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND) {
+    request_or_macro *rm =
+      (request_or_macro *)request_dictionary.lookup(nm);
+    if (rm)
+      mm = rm->to_macro();
+    if (mm && mode == DEFINE_APPEND)
+      mac = *mm;
+  }
+  int bol = 1;
+  if (calling == CALLING_DISABLE_COMP)
+    mac.append(COMPATIBLE_SAVE);
+  for (;;) {
+    while (c == ESCAPE_NEWLINE) {
+      if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND)
+	mac.append(c);
+      c = get_copy(&n, 1);
+    }
+    if (bol && c == '.') {
+      const char *s = term.contents();
+      int d = 0;
+      // see if it matches term
+      int i = 0;
+      if (s[0] != 0) {
+	while ((d = get_copy(&n)) == ' ' || d == '\t')
+	  ;
+	if ((unsigned char)s[0] == d) {
+	  for (i = 1; s[i] != 0; i++) {
+	    d = get_copy(&n);
+	    if ((unsigned char)s[i] != d)
+	      break;
+	  }
+	}
+      }
+      if (s[i] == 0
+	  && ((i == 2 && compatible_flag)
+	      || (d = get_copy(&n)) == ' '
+	      || d == '\n')) {	// we found it
+	if (d == '\n')
+	  tok.make_newline();
+	else
+	  tok.make_space();
+	if (mode == DEFINE_APPEND || mode == DEFINE_NORMAL) {
+	  if (!mm) {
+	    mm = new macro;
+	    request_dictionary.define(nm, mm);
+	  }
+	  if (calling == CALLING_DISABLE_COMP)
+	    mac.append(COMPATIBLE_RESTORE);
+	  *mm = mac;
+	}
+	if (term != dot_symbol) {
+	  ignoring = 0;
+	  interpolate_macro(term);
+	}
+	else
+	  skip_line();
+	return;
+      }
+      if (mode == DEFINE_APPEND || mode == DEFINE_NORMAL) {
+	mac.append(c);
+	for (int j = 0; j < i; j++)
+	  mac.append(s[j]);
+      }
+      c = d;
+    }
+    if (c == EOF) {
+      if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND) {
+	if (have_start_location)
+	  error_with_file_and_line(start_filename, start_lineno,
+				   "end of file while defining macro `%1'",
+				   nm.contents());
+	else
+	  error("end of file while defining macro `%1'", nm.contents());
+      }
+      else {
+	if (have_start_location)
+	  error_with_file_and_line(start_filename, start_lineno,
+				   "end of file while ignoring input lines");
+	else
+	  error("end of file while ignoring input lines");
+      }
+      tok.next();
+      return;
+    }
+    if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND) {
+      if (c == 0)
+	mac.append(n);
+      else
+	mac.append(c);
+    }
+    bol = (c == '\n');
+    c = get_copy(&n, 1);
+  }
+}
+
+void define_macro()
+{
+  do_define_macro(DEFINE_NORMAL, CALLING_NORMAL);
+}
+
+void define_nocomp_macro()
+{
+  do_define_macro(DEFINE_NORMAL, CALLING_DISABLE_COMP);
+}
+
+void define_indirect_macro()
+{
+  do_define_macro(DEFINE_NORMAL, CALLING_INDIRECT);
+}
+
+void append_macro()
+{
+  do_define_macro(DEFINE_APPEND, CALLING_NORMAL);
+}
+
+void append_indirect_macro()
+{
+  do_define_macro(DEFINE_APPEND, CALLING_INDIRECT);
+}
+
+void append_nocomp_macro()
+{
+  do_define_macro(DEFINE_APPEND, CALLING_DISABLE_COMP);
+}
+
+void ignore()
+{
+  ignoring = 1;
+  do_define_macro(DEFINE_IGNORE, CALLING_NORMAL);
+  ignoring = 0;
+}
+
+void remove_macro()
+{
+  for (;;) {
+    symbol s = get_name();
+    if (s.is_null())
+      break;
+    request_dictionary.remove(s);
+  }
+  skip_line();
+}
+
+void rename_macro()
+{
+  symbol s1 = get_name(1);
+  if (!s1.is_null()) {
+    symbol s2 = get_name(1);
+    if (!s2.is_null())
+      request_dictionary.rename(s1, s2);
+  }
+  skip_line();
+}
+
+void alias_macro()
+{
+  symbol s1 = get_name(1);
+  if (!s1.is_null()) {
+    symbol s2 = get_name(1);
+    if (!s2.is_null()) {
+      if (!request_dictionary.alias(s1, s2))
+	warning(WARN_MAC, "macro `%1' not defined", s2.contents());
+    }
+  }
+  skip_line();
+}
+
+void chop_macro()
+{
+  symbol s = get_name(1);
+  if (!s.is_null()) {
+    request_or_macro *p = lookup_request(s);
+    macro *m = p->to_macro();
+    if (!m)
+      error("cannot chop request");
+    else if (m->empty())
+      error("cannot chop empty macro");
+    else {
+      int have_restore = 0;
+      // we have to check for additional save/restore pairs which could be
+      // there due to empty am1 requests.
+      for (;;) {
+	if (m->get(m->len - 1) != COMPATIBLE_RESTORE)
+          break;
+	have_restore = 1;
+	m->len -= 1;
+	if (m->get(m->len - 1) != COMPATIBLE_SAVE)
+          break;
+	have_restore = 0;
+	m->len -= 1;
+	if (m->len == 0)
+	  break;
+      }
+      if (m->len == 0)
+	error("cannot chop empty macro");
+      else {
+	if (have_restore)
+	  m->set(COMPATIBLE_RESTORE, m->len - 1);
+	else
+	  m->len -= 1;
+      }
+    }
+  }
+  skip_line();
+}
+
+void substring_request()
+{
+  int start;				// 0, 1, ..., n-1  or  -1, -2, ...
+  symbol s = get_name(1);
+  if (!s.is_null() && get_integer(&start)) {
+    request_or_macro *p = lookup_request(s);
+    macro *m = p->to_macro();
+    if (!m)
+      error("cannot apply `substring' on a request");
+    else {
+      int end = -1;
+      if (!has_arg() || get_integer(&end)) {
+	int real_length = 0;			// 1, 2, ..., n
+	string_iterator iter1(*m);
+	for (int l = 0; l < m->len; l++) {
+	  int c = iter1.get(0);
+	  if (c == COMPATIBLE_SAVE || c == COMPATIBLE_RESTORE)
+	    continue;
+	  if (c == EOF)
+	    break;
+	  real_length++;
+	}
+	if (start < 0)
+	  start += real_length;
+	if (end < 0)
+	  end += real_length;
+	if (start > end) {
+	  int tem = start;
+	  start = end;
+	  end = tem;
+	}
+	if (start >= real_length || end < 0) {
+	  warning(WARN_RANGE,
+		  "start and end index of substring out of range");
+	  m->len = 0;
+	  if (m->p) {
+	    if (--(m->p->count) <= 0)
+	      delete m->p;
+	    m->p = 0;
+	  }
+	  skip_line();
+	  return;
+	}
+	if (start < 0) {
+	  warning(WARN_RANGE,
+		  "start index of substring out of range, set to 0");
+	  start = 0;
+	}
+	if (end >= real_length) {
+	  warning(WARN_RANGE,
+		  "end index of substring out of range, set to string length");
+	  end = real_length - 1;
+	}
+	// now extract the substring
+	string_iterator iter(*m);
+	int i;
+	for (i = 0; i < start; i++) {
+	  int c = iter.get(0);
+	  while (c == COMPATIBLE_SAVE || c == COMPATIBLE_RESTORE)
+	    c = iter.get(0);
+	  if (c == EOF)
+	    break;
+	}
+	macro mac;
+	for (; i <= end; i++) {
+	  node *nd;
+	  int c = iter.get(&nd);
+	  while (c == COMPATIBLE_SAVE || c == COMPATIBLE_RESTORE)
+	    c = iter.get(0);
+	  if (c == EOF)
+	    break;
+	  if (c == 0)
+	    mac.append(nd);
+	  else
+	    mac.append((unsigned char)c);
+	}
+	*m = mac;
+      }
+    }
+  }
+  skip_line();
+}
+
+void length_request()
+{
+  symbol ret;
+  ret = get_name(1);
+  if (ret.is_null()) {
+    skip_line();
+    return;
+  }
+  int c;
+  node *n;
+  if (tok.newline())
+    c = '\n';
+  else if (tok.tab())
+    c = '\t';
+  else if (!tok.space()) {
+    error("bad string definition");
+    skip_line();
+    return;
+  }
+  else
+    c = get_copy(&n);
+  while (c == ' ')
+    c = get_copy(&n);
+  if (c == '"')
+    c = get_copy(&n);
+  int len = 0;
+  while (c != '\n' && c != EOF) {
+    ++len;
+    c = get_copy(&n);
+  }
+  reg *r = (reg*)number_reg_dictionary.lookup(ret);
+  if (r)
+    r->set_value(len);
+  else
+    set_number_reg(ret, len);
+  tok.next();
+}
+
+void asciify_macro()
+{
+  symbol s = get_name(1);
+  if (!s.is_null()) {
+    request_or_macro *p = lookup_request(s);
+    macro *m = p->to_macro();
+    if (!m)
+      error("cannot asciify request");
+    else {
+      macro am;
+      string_iterator iter(*m);
+      for (;;) {
+	node *nd;
+	int c = iter.get(&nd);
+	if (c == EOF)
+	  break;
+	if (c != 0)
+	  am.append(c);
+	else
+	  nd->asciify(&am);
+      }
+      *m = am;
+    }
+  }
+  skip_line();
+}
+
+void unformat_macro()
+{
+  symbol s = get_name(1);
+  if (!s.is_null()) {
+    request_or_macro *p = lookup_request(s);
+    macro *m = p->to_macro();
+    if (!m)
+      error("cannot unformat request");
+    else {
+      macro am;
+      string_iterator iter(*m);
+      for (;;) {
+	node *nd;
+	int c = iter.get(&nd);
+	if (c == EOF)
+	  break;
+	if (c != 0)
+	  am.append(c);
+	else {
+	  if (nd->set_unformat_flag())
+	    am.append(nd);
+	}
+      }
+      *m = am;
+    }
+  }
+  skip_line();
+}
+
+static void interpolate_environment_variable(symbol nm)
+{
+  const char *s = getenv(nm.contents());
+  if (s && *s)
+    input_stack::push(make_temp_iterator(s));
+}
+
+void interpolate_number_reg(symbol nm, int inc)
+{
+  reg *r = lookup_number_reg(nm);
+  if (inc < 0)
+    r->decrement();
+  else if (inc > 0)
+    r->increment();
+  input_stack::push(make_temp_iterator(r->get_string()));
+}
+
+static void interpolate_number_format(symbol nm)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  if (r)
+    input_stack::push(make_temp_iterator(r->get_format()));
+}
+
+static int get_delim_number(units *n, int si, int prev_value)
+{
+  token start;
+  start.next();
+  if (start.delimiter(1)) {
+    tok.next();
+    if (get_number(n, si, prev_value)) {
+      if (start != tok)
+	warning(WARN_DELIM, "closing delimiter does not match");
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static int get_delim_number(units *n, int si)
+{
+  token start;
+  start.next();
+  if (start.delimiter(1)) {
+    tok.next();
+    if (get_number(n, si)) {
+      if (start != tok)
+	warning(WARN_DELIM, "closing delimiter does not match");
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static int get_line_arg(units *n, int si, charinfo **cp)
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  if (!start.delimiter(1))
+    return 0;
+  tok.next();
+  if (get_number(n, si)) {
+    if (tok.dummy() || tok.transparent_dummy())
+      tok.next();
+    if (!(start == tok && input_stack::get_level() == start_level)) {
+      *cp = tok.get_char(1);
+      tok.next();
+    }
+    if (!(start == tok && input_stack::get_level() == start_level))
+      warning(WARN_DELIM, "closing delimiter does not match");
+    return 1;
+  }
+  return 0;
+}
+
+static int read_size(int *x)
+{
+  tok.next();
+  int c = tok.ch();
+  int inc = 0;
+  if (c == '-') {
+    inc = -1;
+    tok.next();
+    c = tok.ch();
+  }
+  else if (c == '+') {
+    inc = 1;
+    tok.next();
+    c = tok.ch();
+  }
+  int val;
+  int bad = 0;
+  if (c == '(') {
+    tok.next();
+    c = tok.ch();
+    if (!inc) {
+      // allow an increment either before or after the left parenthesis
+      if (c == '-') {
+	inc = -1;
+	tok.next();
+	c = tok.ch();
+      }
+      else if (c == '+') {
+	inc = 1;
+	tok.next();
+	c = tok.ch();
+      }
+    }
+    if (!csdigit(c))
+      bad = 1;
+    else {
+      val = c - '0';
+      tok.next();
+      c = tok.ch();
+      if (!csdigit(c))
+	bad = 1;
+      else {
+	val = val*10 + (c - '0');
+	val *= sizescale;
+      }
+    }
+  }
+  else if (csdigit(c)) {
+    val = c - '0';
+    if (!inc && c != '0' && c < '4') {
+      tok.next();
+      c = tok.ch();
+      if (!csdigit(c))
+	bad = 1;
+      else
+	val = val*10 + (c - '0');
+    }
+    val *= sizescale;
+  }
+  else if (!tok.delimiter(1))
+    return 0;
+  else {
+    token start(tok);
+    tok.next();
+    if (!(inc
+	  ? get_number(&val, 'z')
+	  : get_number(&val, 'z', curenv->get_requested_point_size())))
+      return 0;
+    if (!(start.ch() == '[' && tok.ch() == ']') && start != tok) {
+      if (start.ch() == '[')
+	error("missing `]'");
+      else
+	error("missing closing delimiter");
+      return 0;
+    }
+  }
+  if (!bad) {
+    switch (inc) {
+    case 0:
+      if (val == 0) {
+	// special case -- \s[0] and \s0 means to revert to previous size
+	*x = 0;
+	return 1;
+      }
+      *x = val;
+      break;
+    case 1:
+      *x = curenv->get_requested_point_size() + val;
+      break;
+    case -1:
+      *x = curenv->get_requested_point_size() - val;
+      break;
+    default:
+      assert(0);
+    }
+    if (*x <= 0) {
+      warning(WARN_RANGE,
+	      "\\s request results in non-positive point size; set to 1");
+      *x = 1;
+    }
+    return 1;
+  }
+  else {
+    error("bad digit in point size");
+    return 0;
+  }
+}
+
+static symbol get_delim_name()
+{
+  token start;
+  start.next();
+  if (start.eof()) {
+    error("end of input at start of delimited name");
+    return NULL_SYMBOL;
+  }
+  if (start.newline()) {
+    error("can't delimit name with a newline");
+    return NULL_SYMBOL;
+  }
+  int start_level = input_stack::get_level();
+  char abuf[ABUF_SIZE];
+  char *buf = abuf;
+  int buf_size = ABUF_SIZE;
+  int i = 0;
+  for (;;) {
+    if (i + 1 > buf_size) {
+      if (buf == abuf) {
+	buf = new char[ABUF_SIZE*2];
+	memcpy(buf, abuf, buf_size);
+	buf_size = ABUF_SIZE*2;
+      }
+      else {
+	char *old_buf = buf;
+	buf = new char[buf_size*2];
+	memcpy(buf, old_buf, buf_size);
+	buf_size *= 2;
+	a_delete old_buf;
+      }
+    }
+    tok.next();
+    if (tok == start
+	&& (compatible_flag || input_stack::get_level() == start_level))
+      break;
+    if ((buf[i] = tok.ch()) == 0) {
+      error("missing delimiter (got %1)", tok.description());
+      if (buf != abuf)
+	a_delete buf;
+      return NULL_SYMBOL;
+    }
+    i++;
+  }
+  buf[i] = '\0';
+  if (buf == abuf) {
+    if (i == 0) {
+      error("empty delimited name");
+      return NULL_SYMBOL;
+    }
+    else
+      return symbol(buf);
+  }
+  else {
+    symbol s(buf);
+    a_delete buf;
+    return s;
+  }
+}
+
+// Implement \R
+
+static void do_register()
+{
+  token start;
+  start.next();
+  if (!start.delimiter(1))
+    return;
+  tok.next();
+  symbol nm = get_long_name(1);
+  if (nm.is_null())
+    return;
+  while (tok.space())
+    tok.next();
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  int prev_value;
+  if (!r || !r->get_value(&prev_value))
+    prev_value = 0;
+  int val;
+  if (!get_number(&val, 'u', prev_value))
+    return;
+  if (start != tok)
+    warning(WARN_DELIM, "closing delimiter does not match");
+  if (r)
+    r->set_value(val);
+  else
+    set_number_reg(nm, val);
+}
+
+// this implements the \w escape sequence
+
+static void do_width()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  environment env(curenv);
+  environment *oldenv = curenv;
+  curenv = &env;
+  for (;;) {
+    tok.next();
+    if (tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      break;
+    }
+    if (tok.newline()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    if (tok == start
+	&& (compatible_flag || input_stack::get_level() == start_level))
+      break;
+    tok.process();
+  }
+  env.wrap_up_tab();
+  units x = env.get_input_line_position().to_units();
+  input_stack::push(make_temp_iterator(i_to_a(x)));
+  env.width_registers();
+  curenv = oldenv;
+  have_input = 0;
+}
+
+charinfo *page_character;
+
+void set_page_character()
+{
+  page_character = get_optional_char();
+  skip_line();
+}
+
+static const symbol percent_symbol("%");
+
+void read_title_parts(node **part, hunits *part_width)
+{
+  tok.skip();
+  if (tok.newline() || tok.eof())
+    return;
+  token start(tok);
+  int start_level = input_stack::get_level();
+  tok.next();
+  for (int i = 0; i < 3; i++) {
+    while (!tok.newline() && !tok.eof()) {
+      if (tok == start
+	  && (compatible_flag || input_stack::get_level() == start_level)) {
+	tok.next();
+	break;
+      }
+      if (page_character != 0 && tok.get_char() == page_character)
+	interpolate_number_reg(percent_symbol, 0);
+      else
+	tok.process();
+      tok.next();
+    }
+    curenv->wrap_up_tab();
+    part_width[i] = curenv->get_input_line_position();
+    part[i] = curenv->extract_output_line();
+  }
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+}
+
+class non_interpreted_node : public node {
+  macro mac;
+public:
+  non_interpreted_node(const macro &);
+  int interpret(macro *);
+  node *copy();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+non_interpreted_node::non_interpreted_node(const macro &m) : mac(m)
+{
+}
+
+int non_interpreted_node::same(node *nd)
+{
+  return mac == ((non_interpreted_node *)nd)->mac;
+}
+
+const char *non_interpreted_node::type()
+{
+  return "non_interpreted_node";
+}
+
+int non_interpreted_node::force_tprint()
+{
+  return 0;
+}
+
+node *non_interpreted_node::copy()
+{
+  return new non_interpreted_node(mac);
+}
+
+int non_interpreted_node::interpret(macro *m)
+{
+  string_iterator si(mac);
+  node *n;
+  for (;;) {
+    int c = si.get(&n);
+    if (c == EOF)
+      break;
+    if (c == 0)
+      m->append(n);
+    else
+      m->append(c);
+  }
+  return 1;
+}
+
+static node *do_non_interpreted()
+{
+  node *n;
+  int c;
+  macro mac;
+  while ((c = get_copy(&n)) != ESCAPE_QUESTION && c != EOF && c != '\n')
+    if (c == 0)
+      mac.append(n);
+    else
+      mac.append(c);
+  if (c == EOF || c == '\n') {
+    error("missing \\?");
+    return 0;
+  }
+  return new non_interpreted_node(mac);
+}
+
+static void encode_char(macro *mac, char c)
+{
+  if (c == '\0') {
+    if ((font::use_charnames_in_special) && tok.special()) {
+      charinfo *ci = tok.get_char(1);
+      const char *s = ci->get_symbol()->contents();
+      if (s[0] != (char)0) {
+	mac->append('\\');
+	mac->append('(');
+	int i = 0;
+	while (s[i] != (char)0) {
+	  mac->append(s[i]);
+	  i++;
+	}
+	mac->append('\\');
+	mac->append(')');
+      }
+    }
+    else if (tok.stretchable_space()
+	     || tok.unstretchable_space())
+      mac->append(' ');
+    else if (!(tok.hyphen_indicator()
+	       || tok.dummy()
+	       || tok.transparent_dummy()
+	       || tok.zero_width_break()))
+      error("%1 is invalid within \\X", tok.description());
+  }
+  else {
+    if ((font::use_charnames_in_special) && (c == '\\')) {
+      /*
+       * add escape escape sequence
+       */
+      mac->append(c);
+    }
+    mac->append(c);
+  }
+}
+
+node *do_special()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  macro mac;
+  for (tok.next();
+       tok != start || input_stack::get_level() != start_level;
+       tok.next()) {
+    if (tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      return 0;
+    }
+    if (tok.newline()) {
+      input_stack::push(make_temp_iterator("\n"));
+      warning(WARN_DELIM, "missing closing delimiter");
+      break;
+    }
+    unsigned char c;
+    if (tok.space())
+      c = ' ';
+    else if (tok.tab())
+      c = '\t';
+    else if (tok.leader())
+      c = '\001';
+    else if (tok.backspace())
+      c = '\b';
+    else
+      c = tok.ch();
+    encode_char(&mac, c);
+  }
+  return new special_node(mac);
+}
+
+void output_request()
+{
+  if (!tok.newline() && !tok.eof()) {
+    int c;
+    for (;;) {
+      c = get_copy(0);
+      if (c == '"') {
+	c = get_copy(0);
+	break;
+      }
+      if (c != ' ' && c != '\t')
+	break;
+    }
+    for (; c != '\n' && c != EOF; c = get_copy(0))
+      topdiv->transparent_output(c);
+    topdiv->transparent_output('\n');
+  }
+  tok.next();
+}
+
+extern int image_no;		// from node.cpp
+
+static node *do_suppress(symbol nm)
+{
+  if (nm.is_null() || nm.is_empty()) {
+    error("expecting an argument to escape \\O");
+    return 0;
+  }
+  const char *s = nm.contents();
+  switch (*s) {
+  case '0':
+    if (begin_level == 0)
+      // suppress generation of glyphs
+      return new suppress_node(0, 0);
+    break;
+  case '1':
+    if (begin_level == 0)
+      // enable generation of glyphs
+      return new suppress_node(1, 0);
+    break;
+  case '2':
+    if (begin_level == 0)
+      return new suppress_node(1, 1);
+    break;
+  case '3':
+    begin_level++;
+    break;
+  case '4':
+    begin_level--;
+    break;
+  case '5':
+    {
+      s++;			// move over '5'
+      char position = *s;
+      if (*s == (char)0) {
+	error("missing position and filename in \\O");
+	return 0;
+      }
+      if (!(position == 'l'
+	    || position == 'r'
+	    || position == 'c'
+	    || position == 'i')) {
+	error("l, r, c, or i position expected (got %1 in \\O)", position);
+	return 0;
+      }
+      s++;			// onto image name
+      if (s == (char *)0) {
+	error("missing image name for \\O");
+	return 0;
+      }
+      image_no++;
+      if (begin_level == 0)
+	return new suppress_node(symbol(s), position, image_no);
+    }
+    break;
+  default:
+    error("`%1' is an invalid argument to \\O", *s);
+  }
+  return 0;
+}
+
+void special_node::tprint(troff_output_file *out)
+{
+  tprint_start(out);
+  string_iterator iter(mac);
+  for (;;) {
+    int c = iter.get(0);
+    if (c == EOF)
+      break;
+    for (const char *s = ::asciify(c); *s; s++)
+      tprint_char(out, *s);
+  }
+  tprint_end(out);
+}
+
+int get_file_line(const char **filename, int *lineno)
+{
+  return input_stack::get_location(0, filename, lineno);
+}
+
+void line_file()
+{
+  int n;
+  if (get_integer(&n)) {
+    const char *filename = 0;
+    if (has_arg()) {
+      symbol s = get_long_name();
+      filename = s.contents();
+    }
+    (void)input_stack::set_location(filename, n-1);
+  }
+  skip_line();
+}
+
+static int nroff_mode = 0;
+
+static void nroff_request()
+{
+  nroff_mode = 1;
+  skip_line();
+}
+
+static void troff_request()
+{
+  nroff_mode = 0;
+  skip_line();
+}
+
+static void skip_alternative()
+{
+  int level = 0;
+  // ensure that ``.if 0\{'' works as expected
+  if (tok.left_brace())
+    level++;
+  int c;
+  for (;;) {
+    c = input_stack::get(0);
+    if (c == EOF)
+      break;
+    if (c == ESCAPE_LEFT_BRACE)
+      ++level;
+    else if (c == ESCAPE_RIGHT_BRACE)
+      --level;
+    else if (c == escape_char && escape_char > 0)
+      switch(input_stack::get(0)) {
+      case '{':
+	++level;
+	break;
+      case '}':
+	--level;
+	break;
+      case '"':
+	while ((c = input_stack::get(0)) != '\n' && c != EOF)
+	  ;
+      }
+    /*
+      Note that the level can properly be < 0, eg
+	
+	.if 1 \{\
+	.if 0 \{\
+	.\}\}
+
+      So don't give an error message in this case.
+    */
+    if (level <= 0 && c == '\n')
+      break;
+  }
+  tok.next();
+}
+
+static void begin_alternative()
+{
+  while (tok.space() || tok.left_brace())
+    tok.next();
+}
+
+void nop_request()
+{
+  while (tok.space())
+    tok.next();
+}
+
+static int_stack if_else_stack;
+
+int do_if_request()
+{
+  int invert = 0;
+  while (tok.space())
+    tok.next();
+  while (tok.ch() == '!') {
+    tok.next();
+    invert = !invert;
+  }
+  int result;
+  unsigned char c = tok.ch();
+  if (c == 't') {
+    tok.next();
+    result = !nroff_mode;
+  }
+  else if (c == 'n') {
+    tok.next();
+    result = nroff_mode;
+  }
+  else if (c == 'v') {
+    tok.next();
+    result = 0;
+  }
+  else if (c == 'o') {
+    result = (topdiv->get_page_number() & 1);
+    tok.next();
+  }
+  else if (c == 'e') {
+    result = !(topdiv->get_page_number() & 1);
+    tok.next();
+  }
+  else if (c == 'd' || c == 'r') {
+    tok.next();
+    symbol nm = get_name(1);
+    if (nm.is_null()) {
+      skip_alternative();
+      return 0;
+    }
+    result = (c == 'd'
+	      ? request_dictionary.lookup(nm) != 0
+	      : number_reg_dictionary.lookup(nm) != 0);
+  }
+  else if (c == 'm') {
+    tok.next();
+    symbol nm = get_long_name(1);
+    if (nm.is_null()) {
+      skip_alternative();
+      return 0;
+    }
+    result = (nm == default_symbol
+	      || color_dictionary.lookup(nm) != 0);
+  }
+  else if (c == 'c') {
+    tok.next();
+    tok.skip();
+    charinfo *ci = tok.get_char(1);
+    if (ci == 0) {
+      skip_alternative();
+      return 0;
+    }
+    result = character_exists(ci, curenv);
+    tok.next();
+  }
+  else if (tok.space())
+    result = 0;
+  else if (tok.delimiter()) {
+    token delim = tok;
+    int delim_level = input_stack::get_level();
+    environment env1(curenv);
+    environment env2(curenv);
+    environment *oldenv = curenv;
+    curenv = &env1;
+    for (int i = 0; i < 2; i++) {
+      for (;;) {
+	tok.next();
+	if (tok.newline() || tok.eof()) {
+	  warning(WARN_DELIM, "missing closing delimiter");
+	  tok.next();
+	  curenv = oldenv;
+	  return 0;
+	}
+	if (tok == delim
+	    && (compatible_flag || input_stack::get_level() == delim_level))
+	  break;
+	tok.process();
+      }
+      curenv = &env2;
+    }
+    node *n1 = env1.extract_output_line();
+    node *n2 = env2.extract_output_line();
+    result = same_node_list(n1, n2);
+    delete_node_list(n1);
+    delete_node_list(n2);
+    curenv = oldenv;
+    have_input = 0;
+    tok.next();
+  }
+  else {
+    units n;
+    if (!get_number(&n, 'u')) {
+      skip_alternative();
+      return 0;
+    }
+    else
+      result = n > 0;
+  }
+  if (invert)
+    result = !result;
+  if (result)
+    begin_alternative();
+  else
+    skip_alternative();
+  return result;
+}
+
+void if_else_request()
+{
+  if_else_stack.push(do_if_request());
+}
+
+void if_request()
+{
+  do_if_request();
+}
+
+void else_request()
+{
+  if (if_else_stack.is_empty()) {
+    warning(WARN_EL, "unbalanced .el request");
+    skip_alternative();
+  }
+  else {
+    if (if_else_stack.pop())
+      skip_alternative();
+    else
+      begin_alternative();
+  }
+}
+
+static int while_depth = 0;
+static int while_break_flag = 0;
+
+void while_request()
+{
+  macro mac;
+  int escaped = 0;
+  int level = 0;
+  mac.append(new token_node(tok));
+  for (;;) {
+    node *n;
+    int c = input_stack::get(&n);
+    if (c == EOF)
+      break;
+    if (c == 0) {
+      escaped = 0;
+      mac.append(n);
+    }
+    else if (escaped) {
+      if (c == '{')
+	level += 1;
+      else if (c == '}')
+	level -= 1;
+      escaped = 0;
+      mac.append(c);
+    }
+    else {
+      if (c == ESCAPE_LEFT_BRACE)
+	level += 1;
+      else if (c == ESCAPE_RIGHT_BRACE)
+	level -= 1;
+      else if (c == escape_char)
+	escaped = 1;
+      mac.append(c);
+      if (c == '\n' && level <= 0)
+	break;
+    }
+  }
+  if (level != 0)
+    error("unbalanced \\{ \\}");
+  else {
+    while_depth++;
+    input_stack::add_boundary();
+    for (;;) {
+      input_stack::push(new string_iterator(mac, "while loop"));
+      tok.next();
+      if (!do_if_request()) {
+	while (input_stack::get(0) != EOF)
+	  ;
+	break;
+      }
+      process_input_stack();
+      if (while_break_flag || input_stack::is_return_boundary()) {
+	while_break_flag = 0;
+	break;
+      }
+    }
+    input_stack::remove_boundary();
+    while_depth--;
+  }
+  tok.next();
+}
+
+void while_break_request()
+{
+  if (!while_depth) {
+    error("no while loop");
+    skip_line();
+  }
+  else {
+    while_break_flag = 1;
+    while (input_stack::get(0) != EOF)
+      ;
+    tok.next();
+  }
+}
+
+void while_continue_request()
+{
+  if (!while_depth) {
+    error("no while loop");
+    skip_line();
+  }
+  else {
+    while (input_stack::get(0) != EOF)
+      ;
+    tok.next();
+  }
+}
+
+// .so
+
+void source()
+{
+  symbol nm = get_long_name(1);
+  if (nm.is_null())
+    skip_line();
+  else {
+    while (!tok.newline() && !tok.eof())
+      tok.next();
+    errno = 0;
+    FILE *fp = fopen(nm.contents(), "r");
+    if (fp)
+      input_stack::push(new file_iterator(fp, nm.contents()));
+    else
+      error("can't open `%1': %2", nm.contents(), strerror(errno));
+    tok.next();
+  }
+}
+
+// like .so but use popen()
+
+void pipe_source()
+{
+  if (safer_flag) {
+    error(".pso request not allowed in safer mode");
+    skip_line();
+  }
+  else {
+#ifdef POPEN_MISSING
+    error("pipes not available on this system");
+    skip_line();
+#else /* not POPEN_MISSING */
+    if (tok.newline() || tok.eof())
+      error("missing command");
+    else {
+      int c;
+      while ((c = get_copy(0)) == ' ' || c == '\t')
+	;
+      int buf_size = 24;
+      char *buf = new char[buf_size];
+      int buf_used = 0;
+      for (; c != '\n' && c != EOF; c = get_copy(0)) {
+	const char *s = asciify(c);
+	int slen = strlen(s);
+	if (buf_used + slen + 1> buf_size) {
+	  char *old_buf = buf;
+	  int old_buf_size = buf_size;
+	  buf_size *= 2;
+	  buf = new char[buf_size];
+	  memcpy(buf, old_buf, old_buf_size);
+	  a_delete old_buf;
+	}
+	strcpy(buf + buf_used, s);
+	buf_used += slen;
+      }
+      buf[buf_used] = '\0';
+      errno = 0;
+      FILE *fp = popen(buf, POPEN_RT);
+      if (fp)
+	input_stack::push(new file_iterator(fp, symbol(buf).contents(), 1));
+      else
+	error("can't open pipe to process `%1': %2", buf, strerror(errno));
+      a_delete buf;
+    }
+    tok.next();
+#endif /* not POPEN_MISSING */
+  }
+}
+
+// .psbb
+
+static int llx_reg_contents = 0;
+static int lly_reg_contents = 0;
+static int urx_reg_contents = 0;
+static int ury_reg_contents = 0;
+
+struct bounding_box {
+  int llx, lly, urx, ury;
+};
+
+/* Parse the argument to a %%BoundingBox comment.  Return 1 if it
+contains 4 numbers, 2 if it contains (atend), 0 otherwise. */
+
+int parse_bounding_box(char *p, bounding_box *bb)
+{
+  if (sscanf(p, "%d %d %d %d",
+	     &bb->llx, &bb->lly, &bb->urx, &bb->ury) == 4)
+    return 1;
+  else {
+    /* The Document Structuring Conventions say that the numbers
+       should be integers.  Unfortunately some broken applications
+       get this wrong. */
+    double x1, x2, x3, x4;
+    if (sscanf(p, "%lf %lf %lf %lf", &x1, &x2, &x3, &x4) == 4) {
+      bb->llx = (int)x1;
+      bb->lly = (int)x2;
+      bb->urx = (int)x3;
+      bb->ury = (int)x4;
+      return 1;
+    }
+    else {
+      for (; *p == ' ' || *p == '\t'; p++)
+	;
+      if (strncmp(p, "(atend)", 7) == 0) {
+	return 2;
+      }
+    }
+  }
+  bb->llx = bb->lly = bb->urx = bb->ury = 0;
+  return 0;
+}
+
+// This version is taken from psrm.cpp
+
+#define PS_LINE_MAX 255
+cset white_space("\n\r \t");
+
+int ps_get_line(char *buf, FILE *fp, const char* filename)
+{
+  int c = getc(fp);
+  if (c == EOF) {
+    buf[0] = '\0';
+    return 0;
+  }
+  int i = 0;
+  int err = 0;
+  while (c != '\r' && c != '\n' && c != EOF) {
+    if ((c < 0x1b && !white_space(c)) || c == 0x7f)
+      error("invalid input character code %1 in `%2'", int(c), filename);
+    else if (i < PS_LINE_MAX)
+      buf[i++] = c;
+    else if (!err) {
+      err = 1;
+      error("PostScript file `%1' is non-conforming "
+	    "because length of line exceeds 255", filename);
+    }
+    c = getc(fp);
+  }
+  buf[i++] = '\n';
+  buf[i] = '\0';
+  if (c == '\r') {
+    c = getc(fp);
+    if (c != EOF && c != '\n')
+      ungetc(c, fp);
+  }
+  return 1;
+}
+
+inline void assign_registers(int llx, int lly, int urx, int ury)
+{
+  llx_reg_contents = llx;
+  lly_reg_contents = lly;
+  urx_reg_contents = urx;
+  ury_reg_contents = ury;
+}
+
+void do_ps_file(FILE *fp, const char* filename)
+{
+  bounding_box bb;
+  int bb_at_end = 0;
+  char buf[PS_LINE_MAX];
+  llx_reg_contents = lly_reg_contents =
+    urx_reg_contents = ury_reg_contents = 0;
+  if (!ps_get_line(buf, fp, filename)) {
+    error("`%1' is empty", filename);
+    return;
+  }
+  if (strncmp("%!PS-Adobe-", buf, 11) != 0) {
+    error("`%1' is not conforming to the Document Structuring Conventions",
+	  filename);
+    return;
+  }
+  while (ps_get_line(buf, fp, filename) != 0) {
+    if (buf[0] != '%' || buf[1] != '%'
+	|| strncmp(buf + 2, "EndComments", 11) == 0)
+      break;
+    if (strncmp(buf + 2, "BoundingBox:", 12) == 0) {
+      int res = parse_bounding_box(buf + 14, &bb);
+      if (res == 1) {
+	assign_registers(bb.llx, bb.lly, bb.urx, bb.ury);
+	return;
+      }
+      else if (res == 2) {
+	bb_at_end = 1;
+	break;
+      }
+      else {
+	error("the arguments to the %%%%BoundingBox comment in `%1' are bad",
+	      filename);
+	return;
+      }
+    }
+  }
+  if (bb_at_end) {
+    long offset;
+    int last_try = 0;
+    /* in the trailer, the last BoundingBox comment is significant */
+    for (offset = 512; !last_try; offset *= 2) {
+      int had_trailer = 0;
+      int got_bb = 0;
+      if (offset > 32768 || fseek(fp, -offset, 2) == -1) {
+	last_try = 1;
+	if (fseek(fp, 0L, 0) == -1)
+	  break;
+      }
+      while (ps_get_line(buf, fp, filename) != 0) {
+	if (buf[0] == '%' && buf[1] == '%') {
+	  if (!had_trailer) {
+	    if (strncmp(buf + 2, "Trailer", 7) == 0)
+	      had_trailer = 1;
+	  }
+	  else {
+	    if (strncmp(buf + 2, "BoundingBox:", 12) == 0) {
+	      int res = parse_bounding_box(buf + 14, &bb);
+	      if (res == 1)
+		got_bb = 1;
+	      else if (res == 2) {
+		error("`(atend)' not allowed in trailer of `%1'", filename);
+		return;
+	      }
+	      else {
+		error("the arguments to the %%%%BoundingBox comment in `%1' are bad",
+		      filename);
+		return;
+	      }
+	    }
+	  }
+	}
+      }
+      if (got_bb) {
+	assign_registers(bb.llx, bb.lly, bb.urx, bb.ury);
+	return;
+      }
+    }
+  }
+  error("%%%%BoundingBox comment not found in `%1'", filename);
+}
+
+void ps_bbox_request()
+{
+  symbol nm = get_long_name(1);
+  if (nm.is_null())
+    skip_line();
+  else {
+    while (!tok.newline() && !tok.eof())
+      tok.next();
+    errno = 0;
+    // PS files might contain non-printable characters, such as ^Z
+    // and CRs not followed by an LF, so open them in binary mode.
+    FILE *fp = fopen(nm.contents(), FOPEN_RB);
+    if (fp) {
+      do_ps_file(fp, nm.contents());
+      fclose(fp);
+    }
+    else
+      error("can't open `%1': %2", nm.contents(), strerror(errno));
+    tok.next();
+  }
+}
+
+const char *asciify(int c)
+{
+  static char buf[3];
+  buf[0] = escape_char == '\0' ? '\\' : escape_char;
+  buf[1] = buf[2] = '\0';
+  switch (c) {
+  case ESCAPE_QUESTION:
+    buf[1] = '?';
+    break;
+  case ESCAPE_AMPERSAND:
+    buf[1] = '&';
+    break;
+  case ESCAPE_RIGHT_PARENTHESIS:
+    buf[1] = ')';
+    break;
+  case ESCAPE_UNDERSCORE:
+    buf[1] = '_';
+    break;
+  case ESCAPE_BAR:
+    buf[1] = '|';
+    break;
+  case ESCAPE_CIRCUMFLEX:
+    buf[1] = '^';
+    break;
+  case ESCAPE_LEFT_BRACE:
+    buf[1] = '{';
+    break;
+  case ESCAPE_RIGHT_BRACE:
+    buf[1] = '}';
+    break;
+  case ESCAPE_LEFT_QUOTE:
+    buf[1] = '`';
+    break;
+  case ESCAPE_RIGHT_QUOTE:
+    buf[1] = '\'';
+    break;
+  case ESCAPE_HYPHEN:
+    buf[1] = '-';
+    break;
+  case ESCAPE_BANG:
+    buf[1] = '!';
+    break;
+  case ESCAPE_c:
+    buf[1] = 'c';
+    break;
+  case ESCAPE_e:
+    buf[1] = 'e';
+    break;
+  case ESCAPE_E:
+    buf[1] = 'E';
+    break;
+  case ESCAPE_PERCENT:
+    buf[1] = '%';
+    break;
+  case ESCAPE_SPACE:
+    buf[1] = ' ';
+    break;
+  case ESCAPE_TILDE:
+    buf[1] = '~';
+    break;
+  case ESCAPE_COLON:
+    buf[1] = ':';
+    break;
+  case COMPATIBLE_SAVE:
+  case COMPATIBLE_RESTORE:
+    buf[0] = '\0';
+    break;
+  default:
+    if (invalid_input_char(c))
+      buf[0] = '\0';
+    else
+      buf[0] = c;
+    break;
+  }
+  return buf;
+}
+
+const char *input_char_description(int c)
+{
+  switch (c) {
+  case '\n':
+    return "a newline character";
+  case '\b':
+    return "a backspace character";
+  case '\001':
+    return "a leader character";
+  case '\t':
+    return "a tab character";
+  case ' ':
+    return "a space character";
+  case '\0':
+    return "a node";
+  }
+  static char buf[sizeof("magic character code ") + 1 + INT_DIGITS];
+  if (invalid_input_char(c)) {
+    const char *s = asciify(c);
+    if (*s) {
+      buf[0] = '`';
+      strcpy(buf + 1, s);
+      strcat(buf, "'");
+      return buf;
+    }
+    sprintf(buf, "magic character code %d", c);
+    return buf;
+  }
+  if (csprint(c)) {
+    buf[0] = '`';
+    buf[1] = c;
+    buf[2] = '\'';
+    return buf;
+  }
+  sprintf(buf, "character code %d", c);
+  return buf;
+}
+
+// .tm, .tm1, and .tmc
+
+void do_terminal(int newline, int string_like)
+{
+  if (!tok.newline() && !tok.eof()) {
+    int c;
+    for (;;) {
+      c = get_copy(0);
+      if (string_like && c == '"') {
+	c = get_copy(0);
+	break;
+      }
+      if (c != ' ' && c != '\t')
+	break;
+    }
+    for (; c != '\n' && c != EOF; c = get_copy(0))
+      fputs(asciify(c), stderr);
+  }
+  if (newline)
+    fputc('\n', stderr);
+  fflush(stderr);
+  tok.next();
+}
+
+void terminal()
+{
+  do_terminal(1, 0);
+}
+
+void terminal1()
+{
+  do_terminal(1, 1);
+}
+
+void terminal_continue()
+{
+  do_terminal(0, 1);
+}
+
+dictionary stream_dictionary(20);
+
+void do_open(int append)
+{
+  symbol stream = get_name(1);
+  if (!stream.is_null()) {
+    symbol filename = get_long_name(1);
+    if (!filename.is_null()) {
+      errno = 0;
+      FILE *fp = fopen(filename.contents(), append ? "a" : "w");
+      if (!fp) {
+	error("can't open `%1' for %2: %3",
+	      filename.contents(),
+	      append ? "appending" : "writing",
+	      strerror(errno));
+	fp = (FILE *)stream_dictionary.remove(stream);
+      }
+      else
+	fp = (FILE *)stream_dictionary.lookup(stream, fp);
+      if (fp)
+	fclose(fp);
+    }
+  }
+  skip_line();
+}
+
+void open_request()
+{
+  if (safer_flag) {
+    error(".open request not allowed in safer mode");
+    skip_line();
+  }
+  else
+    do_open(0);
+}
+
+void opena_request()
+{
+  if (safer_flag) {
+    error(".opena request not allowed in safer mode");
+    skip_line();
+  }
+  else
+    do_open(1);
+}
+
+void close_request()
+{
+  symbol stream = get_name(1);
+  if (!stream.is_null()) {
+    FILE *fp = (FILE *)stream_dictionary.remove(stream);
+    if (!fp)
+      error("no stream named `%1'", stream.contents());
+    else
+      fclose(fp);
+  }
+  skip_line();
+}
+
+// .write and .writec
+
+void do_write_request(int newline)
+{
+  symbol stream = get_name(1);
+  if (stream.is_null()) {
+    skip_line();
+    return;
+  }
+  FILE *fp = (FILE *)stream_dictionary.lookup(stream);
+  if (!fp) {
+    error("no stream named `%1'", stream.contents());
+    skip_line();
+    return;
+  }
+  int c;
+  while ((c = get_copy(0)) == ' ')
+    ;
+  if (c == '"')
+    c = get_copy(0);
+  for (; c != '\n' && c != EOF; c = get_copy(0))
+    fputs(asciify(c), fp);
+  if (newline)
+    fputc('\n', fp);
+  fflush(fp);
+  tok.next();
+}
+
+void write_request()
+{
+  do_write_request(1);
+}
+
+void write_request_continue()
+{
+  do_write_request(0);
+}
+
+void write_macro_request()
+{
+  symbol stream = get_name(1);
+  if (stream.is_null()) {
+    skip_line();
+    return;
+  }
+  FILE *fp = (FILE *)stream_dictionary.lookup(stream);
+  if (!fp) {
+    error("no stream named `%1'", stream.contents());
+    skip_line();
+    return;
+  }
+  symbol s = get_name(1);
+  if (s.is_null()) {
+    skip_line();
+    return;
+  }
+  request_or_macro *p = lookup_request(s);
+  macro *m = p->to_macro();
+  if (!m)
+    error("cannot write request");
+  else {
+    string_iterator iter(*m);
+    for (;;) {
+      int c = iter.get(0);
+      if (c == EOF)
+	break;
+      fputs(asciify(c), fp);
+    }
+    fflush(fp);
+  }
+  skip_line();
+}
+
+void warnscale_request()
+{
+  if (has_arg()) {
+    char c = tok.ch();
+    if (c == 'u')
+      warn_scale = 1.0;
+    else if (c == 'i')
+      warn_scale = (double)units_per_inch;
+    else if (c == 'c')
+      warn_scale = (double)units_per_inch / 2.54;
+    else if (c == 'p')
+      warn_scale = (double)units_per_inch / 72.0;
+    else if (c == 'P')
+      warn_scale = (double)units_per_inch / 6.0;
+    else {
+      warning(WARN_SCALE,
+	      "invalid scaling indicator `%1', using `i' instead", c);
+      c = 'i';
+    }
+    warn_scaling_indicator = c;
+  }
+  skip_line();
+}
+
+void spreadwarn_request()
+{
+  hunits n;
+  if (has_arg() && get_hunits(&n, 'm')) {
+    if (n < 0)
+      n = 0;
+    hunits em = curenv->get_size();
+    spread_limit = (double)n.to_units()
+		   / (em.is_zero() ? hresolution : em.to_units());
+  }
+  else
+    spread_limit = -spread_limit - 1;	// no arg toggles on/off without
+					// changing value; we mirror at
+					// -0.5 to make zero a valid value
+  skip_line();
+}
+
+static void init_charset_table()
+{
+  char buf[16];
+  strcpy(buf, "char");
+  for (int i = 0; i < 256; i++) {
+    strcpy(buf + 4, i_to_a(i));
+    charset_table[i] = get_charinfo(symbol(buf));
+    charset_table[i]->set_ascii_code(i);
+    if (csalpha(i))
+      charset_table[i]->set_hyphenation_code(cmlower(i));
+  }
+  charset_table['.']->set_flags(charinfo::ENDS_SENTENCE);
+  charset_table['?']->set_flags(charinfo::ENDS_SENTENCE);
+  charset_table['!']->set_flags(charinfo::ENDS_SENTENCE);
+  charset_table['-']->set_flags(charinfo::BREAK_AFTER);
+  charset_table['"']->set_flags(charinfo::TRANSPARENT);
+  charset_table['\'']->set_flags(charinfo::TRANSPARENT);
+  charset_table[')']->set_flags(charinfo::TRANSPARENT);
+  charset_table[']']->set_flags(charinfo::TRANSPARENT);
+  charset_table['*']->set_flags(charinfo::TRANSPARENT);
+  get_charinfo(symbol("dg"))->set_flags(charinfo::TRANSPARENT);
+  get_charinfo(symbol("rq"))->set_flags(charinfo::TRANSPARENT);
+  get_charinfo(symbol("em"))->set_flags(charinfo::BREAK_AFTER);
+  get_charinfo(symbol("ul"))->set_flags(charinfo::OVERLAPS_HORIZONTALLY);
+  get_charinfo(symbol("rn"))->set_flags(charinfo::OVERLAPS_HORIZONTALLY);
+  get_charinfo(symbol("radicalex"))->set_flags(charinfo::OVERLAPS_HORIZONTALLY);
+  get_charinfo(symbol("sqrtex"))->set_flags(charinfo::OVERLAPS_HORIZONTALLY);
+  get_charinfo(symbol("ru"))->set_flags(charinfo::OVERLAPS_HORIZONTALLY);
+  get_charinfo(symbol("br"))->set_flags(charinfo::OVERLAPS_VERTICALLY);
+  page_character = charset_table['%'];
+}
+
+static void init_hpf_code_table()
+{
+  for (int i = 0; i < 256; i++)
+    hpf_code_table[i] = i;
+}
+
+static void do_translate(int translate_transparent, int translate_input)
+{
+  tok.skip();
+  while (!tok.newline() && !tok.eof()) {
+    if (tok.space()) {
+      // This is a really bizarre troff feature.
+      tok.next();
+      translate_space_to_dummy = tok.dummy();
+      if (tok.newline() || tok.eof())
+	break;
+      tok.next();
+      continue;
+    }
+    charinfo *ci1 = tok.get_char(1);
+    if (ci1 == 0)
+      break;
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      ci1->set_special_translation(charinfo::TRANSLATE_SPACE,
+				   translate_transparent);
+      break;
+    }
+    if (tok.space())
+      ci1->set_special_translation(charinfo::TRANSLATE_SPACE,
+				   translate_transparent);
+    else if (tok.stretchable_space())
+      ci1->set_special_translation(charinfo::TRANSLATE_STRETCHABLE_SPACE,
+				   translate_transparent);
+    else if (tok.dummy())
+      ci1->set_special_translation(charinfo::TRANSLATE_DUMMY,
+				   translate_transparent);
+    else if (tok.hyphen_indicator())
+      ci1->set_special_translation(charinfo::TRANSLATE_HYPHEN_INDICATOR,
+				   translate_transparent);
+    else {
+      charinfo *ci2 = tok.get_char(1);
+      if (ci2 == 0)
+	break;
+      if (ci1 == ci2)
+	ci1->set_translation(0, translate_transparent, translate_input);
+      else
+	ci1->set_translation(ci2, translate_transparent, translate_input);
+    }
+    tok.next();
+  }
+  skip_line();
+}
+
+void translate()
+{
+  do_translate(1, 0);
+}
+
+void translate_no_transparent()
+{
+  do_translate(0, 0);
+}
+
+void translate_input()
+{
+  do_translate(1, 1);
+}
+
+void char_flags()
+{
+  int flags;
+  if (get_integer(&flags))
+    while (has_arg()) {
+      charinfo *ci = tok.get_char(1);
+      if (ci) {
+	charinfo *tem = ci->get_translation();
+	if (tem)
+	  ci = tem;
+	ci->set_flags(flags);
+      }
+      tok.next();
+    }
+  skip_line();
+}
+
+void hyphenation_code()
+{
+  tok.skip();
+  while (!tok.newline() && !tok.eof()) {
+    charinfo *ci = tok.get_char(1);
+    if (ci == 0)
+      break;
+    tok.next();
+    tok.skip();
+    unsigned char c = tok.ch();
+    if (c == 0) {
+      error("hyphenation code must be ordinary character");
+      break;
+    }
+    if (csdigit(c)) {
+      error("hyphenation code cannot be digit");
+      break;
+    }
+    ci->set_hyphenation_code(c);
+    if (ci->get_translation()
+	&& ci->get_translation()->get_translation_input())
+      ci->get_translation()->set_hyphenation_code(c);
+    tok.next();
+    tok.skip();
+  }
+  skip_line();
+}
+
+void hyphenation_patterns_file_code()
+{
+  tok.skip();
+  while (!tok.newline() && !tok.eof()) {
+    int n1, n2;
+    if (get_integer(&n1) && (0 <= n1 && n1 <= 255)) {
+      if (!has_arg()) {
+	error("missing output hyphenation code");
+	break;
+      }
+      if (get_integer(&n2) && (0 <= n2 && n2 <= 255)) {
+	hpf_code_table[n1] = n2;
+	tok.skip();
+      }
+      else {
+	error("output hyphenation code must be integer in the range 0..255");
+	break;
+      }
+    }
+    else {
+      error("input hyphenation code must be integer in the range 0..255");
+      break;
+    }
+  }
+  skip_line();
+}
+
+charinfo *token::get_char(int required)
+{
+  if (type == TOKEN_CHAR)
+    return charset_table[c];
+  if (type == TOKEN_SPECIAL)
+    return get_charinfo(nm);
+  if (type == TOKEN_NUMBERED_CHAR)
+    return get_charinfo_by_number(val);
+  if (type == TOKEN_ESCAPE) {
+    if (escape_char != 0)
+      return charset_table[escape_char];
+    else {
+      error("`\\e' used while no current escape character");
+      return 0;
+    }
+  }
+  if (required) {
+    if (type == TOKEN_EOF || type == TOKEN_NEWLINE)
+      warning(WARN_MISSING, "missing normal or special character");
+    else
+      error("normal or special character expected (got %1)", description());
+  }
+  return 0;
+}
+
+charinfo *get_optional_char()
+{
+  while (tok.space())
+    tok.next();
+  charinfo *ci = tok.get_char();
+  if (!ci)
+    check_missing_character();
+  else
+    tok.next();
+  return ci;
+}
+
+void check_missing_character()
+{
+  if (!tok.newline() && !tok.eof() && !tok.right_brace() && !tok.tab())
+    error("normal or special character expected (got %1): "
+	  "treated as missing",
+	  tok.description());
+}
+
+// this is for \Z
+
+int token::add_to_node_list(node **pp)
+{
+  hunits w;
+  int s;
+  node *n = 0;
+  switch (type) {
+  case TOKEN_CHAR:
+    *pp = (*pp)->add_char(charset_table[c], curenv, &w, &s);
+    break;
+  case TOKEN_DUMMY:
+    n = new dummy_node;
+    break;
+  case TOKEN_ESCAPE:
+    if (escape_char != 0)
+      *pp = (*pp)->add_char(charset_table[escape_char], curenv, &w, &s);
+    break;
+  case TOKEN_HYPHEN_INDICATOR:
+    *pp = (*pp)->add_discretionary_hyphen();
+    break;
+  case TOKEN_ITALIC_CORRECTION:
+    *pp = (*pp)->add_italic_correction(&w);
+    break;
+  case TOKEN_LEFT_BRACE:
+    break;
+  case TOKEN_MARK_INPUT:
+    set_number_reg(nm, curenv->get_input_line_position().to_units());
+    break;
+  case TOKEN_NODE:
+    n = nd;
+    nd = 0;
+    break;
+  case TOKEN_NUMBERED_CHAR:
+    *pp = (*pp)->add_char(get_charinfo_by_number(val), curenv, &w, &s);
+    break;
+  case TOKEN_RIGHT_BRACE:
+    break;
+  case TOKEN_SPACE:
+    n = new hmotion_node(curenv->get_space_width(),
+			 curenv->get_fill_color());
+    break;
+  case TOKEN_SPECIAL:
+    *pp = (*pp)->add_char(get_charinfo(nm), curenv, &w, &s);
+    break;
+  case TOKEN_STRETCHABLE_SPACE:
+    n = new unbreakable_space_node(curenv->get_space_width(),
+				   curenv->get_fill_color());
+    break;
+  case TOKEN_UNSTRETCHABLE_SPACE:
+    n = new space_char_hmotion_node(curenv->get_space_width(),
+				    curenv->get_fill_color());
+    break;
+  case TOKEN_TRANSPARENT_DUMMY:
+    n = new transparent_dummy_node;
+    break;
+  case TOKEN_ZERO_WIDTH_BREAK:
+    n = new space_node(H0, curenv->get_fill_color());
+    n->freeze_space();
+    n->is_escape_colon();
+    break;
+  default:
+    return 0;
+  }
+  if (n) {
+    n->next = *pp;
+    *pp = n;
+  }
+  return 1;
+}
+
+void token::process()
+{
+  if (possibly_handle_first_page_transition())
+    return;
+  switch (type) {
+  case TOKEN_BACKSPACE:
+    curenv->add_node(new hmotion_node(-curenv->get_space_width(),
+				      curenv->get_fill_color()));
+    break;
+  case TOKEN_CHAR:
+    curenv->add_char(charset_table[c]);
+    break;
+  case TOKEN_DUMMY:
+    curenv->add_node(new dummy_node);
+    break;
+  case TOKEN_EMPTY:
+    assert(0);
+    break;
+  case TOKEN_EOF:
+    assert(0);
+    break;
+  case TOKEN_ESCAPE:
+    if (escape_char != 0)
+      curenv->add_char(charset_table[escape_char]);
+    break;
+  case TOKEN_BEGIN_TRAP:
+  case TOKEN_END_TRAP:
+  case TOKEN_PAGE_EJECTOR:
+    // these are all handled in process_input_stack()
+    break;
+  case TOKEN_HYPHEN_INDICATOR:
+    curenv->add_hyphen_indicator();
+    break;
+  case TOKEN_INTERRUPT:
+    curenv->interrupt();
+    break;
+  case TOKEN_ITALIC_CORRECTION:
+    curenv->add_italic_correction();
+    break;
+  case TOKEN_LEADER:
+    curenv->handle_tab(1);
+    break;
+  case TOKEN_LEFT_BRACE:
+    break;
+  case TOKEN_MARK_INPUT:
+    set_number_reg(nm, curenv->get_input_line_position().to_units());
+    break;
+  case TOKEN_NEWLINE:
+    curenv->newline();
+    break;
+  case TOKEN_NODE:
+    curenv->add_node(nd);
+    nd = 0;
+    break;
+  case TOKEN_NUMBERED_CHAR:
+    curenv->add_char(get_charinfo_by_number(val));
+    break;
+  case TOKEN_REQUEST:
+    // handled in process_input_stack()
+    break;
+  case TOKEN_RIGHT_BRACE:
+    break;
+  case TOKEN_SPACE:
+    curenv->space();
+    break;
+  case TOKEN_SPECIAL:
+    curenv->add_char(get_charinfo(nm));
+    break;
+  case TOKEN_SPREAD:
+    curenv->spread();
+    break;
+  case TOKEN_STRETCHABLE_SPACE:
+    curenv->add_node(new unbreakable_space_node(curenv->get_space_width(),
+						curenv->get_fill_color()));
+    break;
+  case TOKEN_UNSTRETCHABLE_SPACE:
+    curenv->add_node(new space_char_hmotion_node(curenv->get_space_width(),
+						 curenv->get_fill_color()));
+    break;
+  case TOKEN_TAB:
+    curenv->handle_tab(0);
+    break;
+  case TOKEN_TRANSPARENT:
+    break;
+  case TOKEN_TRANSPARENT_DUMMY:
+    curenv->add_node(new transparent_dummy_node);
+    break;
+  case TOKEN_ZERO_WIDTH_BREAK:
+    {
+      node *tmp = new space_node(H0, curenv->get_fill_color());
+      tmp->freeze_space();
+      tmp->is_escape_colon();
+      curenv->add_node(tmp);
+      break;
+    }
+  default:
+    assert(0);
+  }
+}
+
+class nargs_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *nargs_reg::get_string()
+{
+  return i_to_a(input_stack::nargs());
+}
+
+class lineno_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *lineno_reg::get_string()
+{
+  int line;
+  const char *file;
+  if (!input_stack::get_location(0, &file, &line))
+    line = 0;
+  return i_to_a(line);
+}
+
+class writable_lineno_reg : public general_reg {
+public:
+  writable_lineno_reg();
+  void set_value(units);
+  int get_value(units *);
+};
+
+writable_lineno_reg::writable_lineno_reg()
+{
+}
+
+int writable_lineno_reg::get_value(units *res)
+{
+  int line;
+  const char *file;
+  if (!input_stack::get_location(0, &file, &line))
+    return 0;
+  *res = line;
+  return 1;
+}
+
+void writable_lineno_reg::set_value(units n)
+{
+  input_stack::set_location(0, n);
+}
+
+class filename_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *filename_reg::get_string()
+{
+  int line;
+  const char *file;
+  if (input_stack::get_location(0, &file, &line))
+    return file;
+  else
+    return 0;
+}
+
+class constant_reg : public reg {
+  const char *s;
+public:
+  constant_reg(const char *);
+  const char *get_string();
+};
+
+constant_reg::constant_reg(const char *p) : s(p)
+{
+}
+
+const char *constant_reg::get_string()
+{
+  return s;
+}
+
+constant_int_reg::constant_int_reg(int *q) : p(q)
+{
+}
+
+const char *constant_int_reg::get_string()
+{
+  return i_to_a(*p);
+}
+
+void abort_request()
+{
+  int c;
+  if (tok.eof())
+    c = EOF;
+  else if (tok.newline())
+    c = '\n';
+  else {
+    while ((c = get_copy(0)) == ' ')
+      ;
+  }
+  if (c == EOF || c == '\n')
+    fputs("User Abort.", stderr);
+  else {
+    for (; c != '\n' && c != EOF; c = get_copy(0))
+      fputs(asciify(c), stderr);
+  }
+  fputc('\n', stderr);
+  cleanup_and_exit(1);
+}
+
+char *read_string()
+{
+  int len = 256;
+  char *s = new char[len];
+  int c;
+  while ((c = get_copy(0)) == ' ')
+    ;
+  int i = 0;
+  while (c != '\n' && c != EOF) {
+    if (!invalid_input_char(c)) {
+      if (i + 2 > len) {
+	char *tem = s;
+	s = new char[len*2];
+	memcpy(s, tem, len);
+	len *= 2;
+	a_delete tem;
+      }
+      s[i++] = c;
+    }
+    c = get_copy(0);
+  }
+  s[i] = '\0';
+  tok.next();
+  if (i == 0) {
+    a_delete s;
+    return 0;
+  }
+  return s;
+}
+
+void pipe_output()
+{
+  if (safer_flag) {
+    error(".pi request not allowed in safer mode");
+    skip_line();
+  }
+  else {
+#ifdef POPEN_MISSING
+    error("pipes not available on this system");
+    skip_line();
+#else /* not POPEN_MISSING */
+    if (the_output) {
+      error("can't pipe: output already started");
+      skip_line();
+    }
+    else {
+      char *pc;
+      if ((pc = read_string()) == 0)
+	error("can't pipe to empty command");
+      if (pipe_command) {
+	char *s = new char[strlen(pipe_command) + strlen(pc) + 1 + 1];
+	strcpy(s, pipe_command);
+	strcat(s, "|");
+	strcat(s, pc);
+	a_delete pipe_command;
+	a_delete pc;
+	pipe_command = s;
+      }
+      else
+        pipe_command = pc;
+    }
+#endif /* not POPEN_MISSING */
+  }
+}
+
+static int system_status;
+
+void system_request()
+{
+  if (safer_flag) {
+    error(".sy request not allowed in safer mode");
+    skip_line();
+  }
+  else {
+    char *command = read_string();
+    if (!command)
+      error("empty command");
+    else {
+      system_status = system(command);
+      a_delete command;
+    }
+  }
+}
+
+void copy_file()
+{
+  if (curdiv == topdiv && topdiv->before_first_page) {
+    handle_initial_request(COPY_FILE_REQUEST);
+    return;
+  }
+  symbol filename = get_long_name(1);
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  if (!filename.is_null())
+    curdiv->copy_file(filename.contents());
+  tok.next();
+}
+
+#ifdef COLUMN
+
+void vjustify()
+{
+  if (curdiv == topdiv && topdiv->before_first_page) {
+    handle_initial_request(VJUSTIFY_REQUEST);
+    return;
+  }
+  symbol type = get_long_name(1);
+  if (!type.is_null())
+    curdiv->vjustify(type);
+  skip_line();
+}
+
+#endif /* COLUMN */
+
+void transparent_file()
+{
+  if (curdiv == topdiv && topdiv->before_first_page) {
+    handle_initial_request(TRANSPARENT_FILE_REQUEST);
+    return;
+  }
+  symbol filename = get_long_name(1);
+  while (!tok.newline() && !tok.eof())
+    tok.next();
+  if (break_flag)
+    curenv->do_break();
+  if (!filename.is_null()) {
+    errno = 0;
+    FILE *fp = fopen(filename.contents(), "r");
+    if (!fp)
+      error("can't open `%1': %2", filename.contents(), strerror(errno));
+    else {
+      int bol = 1;
+      for (;;) {
+	int c = getc(fp);
+	if (c == EOF)
+	  break;
+	if (invalid_input_char(c))
+	  warning(WARN_INPUT, "invalid input character code %1", int(c));
+	else {
+	  curdiv->transparent_output(c);
+	  bol = c == '\n';
+	}
+      }
+      if (!bol)
+	curdiv->transparent_output('\n');
+      fclose(fp);
+    }
+  }
+  tok.next();
+}
+
+class page_range {
+  int first;
+  int last;
+public:
+  page_range *next;
+  page_range(int, int, page_range *);
+  int contains(int n);
+};
+
+page_range::page_range(int i, int j, page_range *p)
+: first(i), last(j), next(p)
+{
+}
+
+int page_range::contains(int n)
+{
+  return n >= first && (last <= 0 || n <= last);
+}
+
+page_range *output_page_list = 0;
+
+int in_output_page_list(int n)
+{
+  if (!output_page_list)
+    return 1;
+  for (page_range *p = output_page_list; p; p = p->next)
+    if (p->contains(n))
+      return 1;
+  return 0;
+}
+
+static void parse_output_page_list(char *p)
+{
+  for (;;) {
+    int i;
+    if (*p == '-')
+      i = 1;
+    else if (csdigit(*p)) {
+      i = 0;
+      do
+	i = i*10 + *p++ - '0';
+      while (csdigit(*p));
+    }
+    else
+      break;
+    int j;
+    if (*p == '-') {
+      p++;
+      j = 0;
+      if (csdigit(*p)) {
+	do
+	  j = j*10 + *p++ - '0';
+	while (csdigit(*p));
+      }
+    }
+    else
+      j = i;
+    if (j == 0)
+      last_page_number = -1;
+    else if (last_page_number >= 0 && j > last_page_number)
+      last_page_number = j;
+    output_page_list = new page_range(i, j, output_page_list);
+    if (*p != ',')
+      break;
+    ++p;
+  }
+  if (*p != '\0') {
+    error("bad output page list");
+    output_page_list = 0;
+  }
+}
+
+static FILE *open_mac_file(const char *mac, char **path)
+{
+  // Try first FOOBAR.tmac, then tmac.FOOBAR
+  char *s1 = new char[strlen(mac)+strlen(MACRO_POSTFIX)+1];
+  strcpy(s1, mac);
+  strcat(s1, MACRO_POSTFIX);
+  FILE *fp = mac_path->open_file(s1, path);
+  a_delete s1;
+  if (!fp) {
+    char *s2 = new char[strlen(mac)+strlen(MACRO_PREFIX)+1];
+    strcpy(s2, MACRO_PREFIX);
+    strcat(s2, mac);
+    fp = mac_path->open_file(s2, path);
+    a_delete s2;
+  }
+  return fp;
+}
+
+static void process_macro_file(const char *mac)
+{
+  char *path;
+  FILE *fp = open_mac_file(mac, &path);
+  if (!fp)
+    fatal("can't find macro file %1", mac);
+  const char *s = symbol(path).contents();
+  a_delete path;
+  input_stack::push(new file_iterator(fp, s));
+  tok.next();
+  process_input_stack();
+}
+
+static void process_startup_file(const char *filename)
+{
+  char *path;
+  search_path *orig_mac_path = mac_path;
+  mac_path = &config_macro_path;
+  FILE *fp = mac_path->open_file(filename, &path);
+  if (fp) {
+    input_stack::push(new file_iterator(fp, symbol(path).contents()));
+    a_delete path;
+    tok.next();
+    process_input_stack();
+  }
+  mac_path = orig_mac_path;
+}
+
+void macro_source()
+{
+  symbol nm = get_long_name(1);
+  if (nm.is_null())
+    skip_line();
+  else {
+    while (!tok.newline() && !tok.eof())
+      tok.next();
+    char *path;
+    FILE *fp = mac_path->open_file(nm.contents(), &path);
+    // .mso doesn't (and cannot) go through open_mac_file, so we
+    // need to do it here manually: If we have tmac.FOOBAR, try
+    // FOOBAR.tmac and vice versa
+    if (!fp) {
+      const char *fn = nm.contents();
+      if (strncasecmp(fn, MACRO_PREFIX, sizeof(MACRO_PREFIX) - 1) == 0) {
+	char *s = new char[strlen(fn) + sizeof(MACRO_POSTFIX)];
+	strcpy(s, fn + sizeof(MACRO_PREFIX) - 1);
+	strcat(s, MACRO_POSTFIX);
+	fp = mac_path->open_file(s, &path);
+	a_delete s;
+      }
+      if (!fp) {
+	if (strncasecmp(fn + strlen(fn) - sizeof(MACRO_POSTFIX) + 1,
+			MACRO_POSTFIX, sizeof(MACRO_POSTFIX) - 1) == 0) {
+	  char *s = new char[strlen(fn) + sizeof(MACRO_PREFIX)];
+	  strcpy(s, MACRO_PREFIX);
+	  strncat(s, fn, strlen(fn) - sizeof(MACRO_POSTFIX) + 1);
+	  fp = mac_path->open_file(s, &path);
+	  a_delete s;
+	}
+      }
+    }
+    if (fp) {
+      input_stack::push(new file_iterator(fp, symbol(path).contents()));
+      a_delete path;
+    }
+    else
+      error("can't find macro file `%1'", nm.contents());
+    tok.next();
+  }
+}
+
+static void process_input_file(const char *name)
+{
+  FILE *fp;
+  if (strcmp(name, "-") == 0) {
+    clearerr(stdin);
+    fp = stdin;
+  }
+  else {
+    errno = 0;
+    fp = fopen(name, "r");
+    if (!fp)
+      fatal("can't open `%1': %2", name, strerror(errno));
+  }
+  input_stack::push(new file_iterator(fp, name));
+  tok.next();
+  process_input_stack();
+}
+
+// make sure the_input is empty before calling this
+
+static int evaluate_expression(const char *expr, units *res)
+{
+  input_stack::push(make_temp_iterator(expr));
+  tok.next();
+  int success = get_number(res, 'u');
+  while (input_stack::get(0) != EOF)
+    ;
+  return success;
+}
+
+static void do_register_assignment(const char *s)
+{
+  const char *p = strchr(s, '=');
+  if (!p) {
+    char buf[2];
+    buf[0] = s[0];
+    buf[1] = 0;
+    units n;
+    if (evaluate_expression(s + 1, &n))
+      set_number_reg(buf, n);
+  }
+  else {
+    char *buf = new char[p - s + 1];
+    memcpy(buf, s, p - s);
+    buf[p - s] = 0;
+    units n;
+    if (evaluate_expression(p + 1, &n))
+      set_number_reg(buf, n);
+    a_delete buf;
+  }
+}
+
+static void set_string(const char *name, const char *value)
+{
+  macro *m = new macro;
+  for (const char *p = value; *p; p++)
+    if (!invalid_input_char((unsigned char)*p))
+      m->append(*p);
+  request_dictionary.define(name, m);
+}
+
+static void do_string_assignment(const char *s)
+{
+  const char *p = strchr(s, '=');
+  if (!p) {
+    char buf[2];
+    buf[0] = s[0];
+    buf[1] = 0;
+    set_string(buf, s + 1);
+  }
+  else {
+    char *buf = new char[p - s + 1];
+    memcpy(buf, s, p - s);
+    buf[p - s] = 0;
+    set_string(buf, p + 1);
+    a_delete buf;
+  }
+}
+
+struct string_list {
+  const char *s;
+  string_list *next;
+  string_list(const char *ss) : s(ss), next(0) {}
+};
+
+#if 0
+static void prepend_string(const char *s, string_list **p)
+{
+  string_list *l = new string_list(s);
+  l->next = *p;
+  *p = l;
+}
+#endif
+
+static void add_string(const char *s, string_list **p)
+{
+  while (*p)
+    p = &((*p)->next);
+  *p = new string_list(s);
+}
+
+void usage(FILE *stream, const char *prog)
+{
+  fprintf(stream,
+"usage: %s -abcivzCERU -wname -Wname -dcs -ffam -mname -nnum -olist\n"
+"       -rcn -Tname -Fdir -Mdir [files...]\n",
+	  prog);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  string_list *macros = 0;
+  string_list *register_assignments = 0;
+  string_list *string_assignments = 0;
+  int iflag = 0;
+  int tflag = 0;
+  int fflag = 0;
+  int nflag = 0;
+  int no_rc = 0;		// don't process troffrc and troffrc-end
+  int next_page_number;
+  opterr = 0;
+  hresolution = vresolution = 1;
+  // restore $PATH if called from groff
+  char* groff_path = getenv("GROFF_PATH__");
+  if (groff_path) {
+    string e = "PATH";
+    e += '=';
+    if (*groff_path)
+      e += groff_path;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+  }
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { 0, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "abcivw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RU",
+			  long_options, 0))
+	 != EOF)
+    switch(c) {
+    case 'v':
+      {
+	printf("GNU troff (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'T':
+      device = optarg;
+      tflag = 1;
+      is_html = (strcmp(device, "html") == 0);
+      break;
+    case 'C':
+      compatible_flag = 1;
+      // fall through
+    case 'c':
+      color_flag = 0;
+      break;
+    case 'M':
+      macro_path.command_line_dir(optarg);
+      safer_macro_path.command_line_dir(optarg);
+      config_macro_path.command_line_dir(optarg);
+      break;
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'm':
+      add_string(optarg, &macros);
+      break;
+    case 'E':
+      inhibit_errors = 1;
+      break;
+    case 'R':
+      no_rc = 1;
+      break;
+    case 'w':
+      enable_warning(optarg);
+      break;
+    case 'W':
+      disable_warning(optarg);
+      break;
+    case 'i':
+      iflag = 1;
+      break;
+    case 'b':
+      backtrace_flag = 1;
+      break;
+    case 'a':
+      ascii_output_flag = 1;
+      break;
+    case 'z':
+      suppress_output_flag = 1;
+      break;
+    case 'n':
+      if (sscanf(optarg, "%d", &next_page_number) == 1)
+	nflag++;
+      else
+	error("bad page number");
+      break;
+    case 'o':
+      parse_output_page_list(optarg);
+      break;
+    case 'd':
+      if (*optarg == '\0')
+	error("`-d' requires non-empty argument");
+      else
+	add_string(optarg, &string_assignments);
+      break;
+    case 'r':
+      if (*optarg == '\0')
+	error("`-r' requires non-empty argument");
+      else
+	add_string(optarg, &register_assignments);
+      break;
+    case 'f':
+      default_family = symbol(optarg);
+      fflag = 1;
+      break;
+    case 'q':
+    case 's':
+    case 't':
+      // silently ignore these
+      break;
+    case 'U':
+      safer_flag = 0;	// unsafe behaviour
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout, argv[0]);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr, argv[0]);
+      exit(1);
+      break;		// never reached
+    default:
+      assert(0);
+    }
+  if (!safer_flag)
+    mac_path = &macro_path;
+  set_string(".T", device);
+  init_charset_table();
+  init_hpf_code_table();
+  if (!font::load_desc())
+    fatal("sorry, I can't continue");
+  units_per_inch = font::res;
+  hresolution = font::hor;
+  vresolution = font::vert;
+  sizescale = font::sizescale;
+  tcommand_flag = font::tcommand;
+  warn_scale = (double)units_per_inch;
+  warn_scaling_indicator = 'i';
+  if (!fflag && font::family != 0 && *font::family != '\0')
+    default_family = symbol(font::family);
+  font_size::init_size_table(font::sizes);
+  int i;
+  int j = 1;
+  if (font::style_table) {
+    for (i = 0; font::style_table[i]; i++)
+      mount_style(j++, symbol(font::style_table[i]));
+  }
+  for (i = 0; font::font_name_table[i]; i++, j++)
+    // In the DESC file a font name of 0 (zero) means leave this
+    // position empty.
+    if (strcmp(font::font_name_table[i], "0") != 0)
+      mount_font(j, symbol(font::font_name_table[i]));
+  curdiv = topdiv = new top_level_diversion;
+  if (nflag)
+    topdiv->set_next_page_number(next_page_number);
+  init_input_requests();
+  init_env_requests();
+  init_div_requests();
+#ifdef COLUMN
+  init_column_requests();
+#endif /* COLUMN */
+  init_node_requests();
+  number_reg_dictionary.define(".T", new constant_reg(tflag ? "1" : "0"));
+  init_registers();
+  init_reg_requests();
+  init_hyphen_requests();
+  init_environments();
+  while (string_assignments) {
+    do_string_assignment(string_assignments->s);
+    string_list *tem = string_assignments;
+    string_assignments = string_assignments->next;
+    delete tem;
+  }
+  while (register_assignments) {
+    do_register_assignment(register_assignments->s);
+    string_list *tem = register_assignments;
+    register_assignments = register_assignments->next;
+    delete tem;
+  }
+  if (!no_rc)
+    process_startup_file(INITIAL_STARTUP_FILE);
+  while (macros) {
+    process_macro_file(macros->s);
+    string_list *tem = macros;
+    macros = macros->next;
+    delete tem;
+  }
+  if (!no_rc)
+    process_startup_file(FINAL_STARTUP_FILE);
+  for (i = optind; i < argc; i++)
+    process_input_file(argv[i]);
+  if (optind >= argc || iflag)
+    process_input_file("-");
+  exit_troff();
+  return 0;			// not reached
+}
+
+void warn_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n)) {
+    if (n & ~WARN_TOTAL) {
+      warning(WARN_RANGE, "warning mask must be between 0 and %1", WARN_TOTAL);
+      n &= WARN_TOTAL;
+    }
+    warning_mask = n;
+  }
+  else
+    warning_mask = WARN_TOTAL;
+  skip_line();
+}
+
+static void init_registers()
+{
+#ifdef LONG_FOR_TIME_T
+  long
+#else /* not LONG_FOR_TIME_T */
+  time_t
+#endif /* not LONG_FOR_TIME_T */
+    t = time(0);
+  // Use struct here to work around misfeature in old versions of g++.
+  struct tm *tt = localtime(&t);
+  set_number_reg("seconds", int(tt->tm_sec));
+  set_number_reg("minutes", int(tt->tm_min));
+  set_number_reg("hours", int(tt->tm_hour));
+  set_number_reg("dw", int(tt->tm_wday + 1));
+  set_number_reg("dy", int(tt->tm_mday));
+  set_number_reg("mo", int(tt->tm_mon + 1));
+  set_number_reg("year", int(1900 + tt->tm_year));
+  set_number_reg("yr", int(tt->tm_year));
+  set_number_reg("$$", getpid());
+  number_reg_dictionary.define(".A",
+			       new constant_reg(ascii_output_flag
+						? "1"
+						: "0"));
+}
+
+/*
+ *  registers associated with \O
+ */
+
+static int output_reg_minx_contents = -1;
+static int output_reg_miny_contents = -1;
+static int output_reg_maxx_contents = -1;
+static int output_reg_maxy_contents = -1;
+
+void check_output_limits(int x, int y)
+{
+  if ((output_reg_minx_contents == -1) || (x < output_reg_minx_contents))
+    output_reg_minx_contents = x;
+  if (x > output_reg_maxx_contents)
+    output_reg_maxx_contents = x;
+  if ((output_reg_miny_contents == -1) || (y < output_reg_miny_contents))
+    output_reg_miny_contents = y;
+  if (y > output_reg_maxy_contents)
+    output_reg_maxy_contents = y;
+}
+
+void reset_output_registers()
+{
+  output_reg_minx_contents = -1;
+  output_reg_miny_contents = -1;
+  output_reg_maxx_contents = -1;
+  output_reg_maxy_contents = -1;
+}
+
+void get_output_registers(int *minx, int *miny, int *maxx, int *maxy)
+{
+  *minx = output_reg_minx_contents;
+  *miny = output_reg_miny_contents;
+  *maxx = output_reg_maxx_contents;
+  *maxy = output_reg_maxy_contents;
+}
+
+void init_input_requests()
+{
+  init_request("ab", abort_request);
+  init_request("als", alias_macro);
+  init_request("am", append_macro);
+  init_request("am1", append_nocomp_macro);
+  init_request("ami", append_indirect_macro);
+  init_request("as", append_string);
+  init_request("as1", append_nocomp_string);
+  init_request("asciify", asciify_macro);
+  init_request("backtrace", backtrace_request);
+  init_request("blm", blank_line_macro);
+  init_request("break", while_break_request);
+  init_request("cf", copy_file);
+  init_request("cflags", char_flags);
+  init_request("char", define_character);
+  init_request("chop", chop_macro);
+  init_request("close", close_request);
+  init_request("color", activate_color);
+  init_request("composite", composite_request);
+  init_request("continue", while_continue_request);
+  init_request("cp", compatible);
+  init_request("de", define_macro);
+  init_request("de1", define_nocomp_macro);
+  init_request("defcolor", define_color);
+  init_request("dei", define_indirect_macro);
+  init_request("do", do_request);
+  init_request("ds", define_string);
+  init_request("ds1", define_nocomp_string);
+  init_request("ec", set_escape_char);
+  init_request("ecr", restore_escape_char);
+  init_request("ecs", save_escape_char);
+  init_request("el", else_request);
+  init_request("em", end_macro);
+  init_request("eo", escape_off);
+  init_request("ex", exit_request);
+  init_request("fchar", define_fallback_character);
+#ifdef WIDOW_CONTROL
+  init_request("fpl", flush_pending_lines);
+#endif /* WIDOW_CONTROL */
+  init_request("hcode", hyphenation_code);
+  init_request("hpfcode", hyphenation_patterns_file_code);
+  init_request("ie", if_else_request);
+  init_request("if", if_request);
+  init_request("ig", ignore);
+  init_request("length", length_request);
+  init_request("lf", line_file);
+  init_request("mso", macro_source);
+  init_request("nop", nop_request);
+  init_request("nroff", nroff_request);
+  init_request("nx", next_file);
+  init_request("open", open_request);
+  init_request("opena", opena_request);
+  init_request("output", output_request);
+  init_request("pc", set_page_character);
+  init_request("pi", pipe_output);
+  init_request("pm", print_macros);
+  init_request("psbb", ps_bbox_request);
+#ifndef POPEN_MISSING
+  init_request("pso", pipe_source);
+#endif /* not POPEN_MISSING */
+  init_request("rchar", remove_character);
+  init_request("rd", read_request);
+  init_request("return", return_macro_request);
+  init_request("rm", remove_macro);
+  init_request("rn", rename_macro);
+  init_request("schar", define_special_character);
+  init_request("shift", shift);
+  init_request("so", source);
+  init_request("spreadwarn", spreadwarn_request);
+  init_request("substring", substring_request);
+  init_request("sy", system_request);
+  init_request("tm", terminal);
+  init_request("tm1", terminal1);
+  init_request("tmc", terminal_continue);
+  init_request("tr", translate);
+  init_request("trf", transparent_file);
+  init_request("trin", translate_input);
+  init_request("trnt", translate_no_transparent);
+  init_request("troff", troff_request);
+  init_request("unformat", unformat_macro);
+#ifdef COLUMN
+  init_request("vj", vjustify);
+#endif /* COLUMN */
+  init_request("warn", warn_request);
+  init_request("warnscale", warnscale_request);
+  init_request("while", while_request);
+  init_request("write", write_request);
+  init_request("writec", write_request_continue);
+  init_request("writem", write_macro_request);
+  number_reg_dictionary.define(".$", new nargs_reg);
+  number_reg_dictionary.define(".C", new constant_int_reg(&compatible_flag));
+  number_reg_dictionary.define(".c", new lineno_reg);
+  number_reg_dictionary.define(".color", new constant_int_reg(&color_flag));
+  number_reg_dictionary.define(".F", new filename_reg);
+  number_reg_dictionary.define(".g", new constant_reg("1"));
+  number_reg_dictionary.define(".H", new constant_int_reg(&hresolution));
+  number_reg_dictionary.define(".R", new constant_reg("10000"));
+  number_reg_dictionary.define(".V", new constant_int_reg(&vresolution));
+  number_reg_dictionary.define(".warn", new constant_int_reg(&warning_mask));
+  extern const char *major_version;
+  number_reg_dictionary.define(".x", new constant_reg(major_version));
+  extern const char *revision;
+  number_reg_dictionary.define(".Y", new constant_reg(revision));
+  extern const char *minor_version;
+  number_reg_dictionary.define(".y", new constant_reg(minor_version));
+  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("opmaxx",
+			       new variable_reg(&output_reg_maxx_contents));
+  number_reg_dictionary.define("opmaxy",
+			       new variable_reg(&output_reg_maxy_contents));
+  number_reg_dictionary.define("opminx",
+			       new variable_reg(&output_reg_minx_contents));
+  number_reg_dictionary.define("opminy",
+			       new variable_reg(&output_reg_miny_contents));
+  number_reg_dictionary.define("slimit",
+			       new variable_reg(&input_stack::limit));
+  number_reg_dictionary.define("systat", new variable_reg(&system_status));
+  number_reg_dictionary.define("urx", new variable_reg(&urx_reg_contents));
+  number_reg_dictionary.define("ury", new variable_reg(&ury_reg_contents));
+}
+
+object_dictionary request_dictionary(501);
+
+void init_request(const char *s, REQUEST_FUNCP f)
+{
+  request_dictionary.define(s, new request(f));
+}
+
+static request_or_macro *lookup_request(symbol nm)
+{
+  assert(!nm.is_null());
+  request_or_macro *p = (request_or_macro *)request_dictionary.lookup(nm);
+  if (p == 0) {
+    warning(WARN_MAC, "macro `%1' not defined", nm.contents());
+    p = new macro;
+    request_dictionary.define(nm, p);
+  }
+  return p;
+}
+
+node *charinfo_to_node_list(charinfo *ci, const environment *envp)
+{
+  // Don't interpret character definitions in compatible mode.
+  int old_compatible_flag = compatible_flag;
+  compatible_flag = 0;
+  int old_escape_char = escape_char;
+  escape_char = '\\';
+  macro *mac = ci->set_macro(0);
+  assert(mac != 0);
+  environment *oldenv = curenv;
+  environment env(envp);
+  curenv = &env;
+  curenv->set_composite();
+  token old_tok = tok;
+  input_stack::add_boundary();
+  string_iterator *si =
+    new string_iterator(*mac, "composite character", ci->nm);
+  input_stack::push(si);
+  // we don't use process_input_stack, because we don't want to recognise
+  // requests
+  for (;;) {
+    tok.next();
+    if (tok.eof())
+      break;
+    if (tok.newline()) {
+      error("composite character mustn't contain newline");
+      while (!tok.eof())
+	tok.next();
+      break;
+    }
+    else
+      tok.process();
+  }
+  node *n = curenv->extract_output_line();
+  input_stack::remove_boundary();
+  ci->set_macro(mac);
+  tok = old_tok;
+  curenv = oldenv;
+  compatible_flag = old_compatible_flag;
+  escape_char = old_escape_char;
+  have_input = 0;
+  return n;
+}
+
+static node *read_draw_node()
+{
+  token start;
+  start.next();
+  if (!start.delimiter(1)){
+    do {
+      tok.next();
+    } while (tok != start && !tok.newline() && !tok.eof());
+  }
+  else {
+    tok.next();
+    if (tok == start)
+      error("missing argument");
+    else {
+      unsigned char type = tok.ch();
+      if (type == 'F') {
+	read_color_draw_node(start);
+	return 0;
+      }
+      tok.next();
+      int maxpoints = 10;
+      hvpair *point = new hvpair[maxpoints];
+      int npoints = 0;
+      int no_last_v = 0;
+      int err = 0;
+      int i;
+      for (i = 0; tok != start; i++) {
+	if (i == maxpoints) {
+	  hvpair *oldpoint = point;
+	  point = new hvpair[maxpoints*2];
+	  for (int j = 0; j < maxpoints; j++)
+	    point[j] = oldpoint[j];
+	  maxpoints *= 2;
+	  a_delete oldpoint;
+	}
+	if (!get_hunits(&point[i].h,
+			type == 'f' || type == 't' ? 'u' : 'm')) {
+	  err = 1;
+	  break;
+	}
+	++npoints;
+	tok.skip();
+	point[i].v = V0;
+	if (tok == start) {
+	  no_last_v = 1;
+	  break;
+	}
+	if (!get_vunits(&point[i].v, 'v')) {
+	  err = 1;
+	  break;
+	}
+	tok.skip();
+      }
+      while (tok != start && !tok.newline() && !tok.eof())
+	tok.next();
+      if (!err) {
+	switch (type) {
+	case 'l':
+	  if (npoints != 1 || no_last_v) {
+	    error("two arguments needed for line");
+	    npoints = 1;
+	  }
+	  break;
+	case 'c':
+	  if (npoints != 1 || !no_last_v) {
+	    error("one argument needed for circle");
+	    npoints = 1;
+	    point[0].v = V0;
+	  }
+	  break;
+	case 'e':
+	  if (npoints != 1 || no_last_v) {
+	    error("two arguments needed for ellipse");
+	    npoints = 1;
+	  }
+	  break;
+	case 'a':
+	  if (npoints != 2 || no_last_v) {
+	    error("four arguments needed for arc");
+	    npoints = 2;
+	  }
+	  break;
+	case '~':
+	  if (no_last_v)
+	    error("even number of arguments needed for spline");
+	  break;
+	case 'f':
+	  if (npoints != 1 || !no_last_v) {
+	    error("one argument needed for gray shade");
+	    npoints = 1;
+	    point[0].v = V0;
+	  }
+	default:
+	  // silently pass it through
+	  break;
+	}
+	draw_node *dn = new draw_node(type, point, npoints,
+				      curenv->get_font_size(),
+				      curenv->get_glyph_color(),
+				      curenv->get_fill_color());
+	a_delete point;
+	return dn;
+      }
+      else {
+	a_delete point;
+      }
+    }
+  }
+  return 0;
+}
+
+static void read_color_draw_node(token &start)
+{
+  tok.next();
+  if (tok == start) {
+    error("missing color scheme");
+    return;
+  }
+  unsigned char scheme = tok.ch();
+  tok.next();
+  color *col;
+  char end = start.ch();
+  switch (scheme) {
+  case 'c':
+    col = read_cmy(end);
+    break;
+  case 'd':
+    col = &default_color;
+    break;
+  case 'g':
+    col = read_gray(end);
+    break;
+  case 'k':
+    col = read_cmyk(end);
+    break;
+  case 'r':
+    col = read_rgb(end);
+    break;
+  }
+  if (col)
+    curenv->set_fill_color(col);
+  while (tok != start) {
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      input_stack::push(make_temp_iterator("\n"));
+      break;
+    }
+    tok.next();
+  }
+  have_input = 1;
+}
+
+static struct {
+  const char *name;
+  int mask;
+} warning_table[] = {
+  { "char", WARN_CHAR },
+  { "range", WARN_RANGE },
+  { "break", WARN_BREAK },
+  { "delim", WARN_DELIM },
+  { "el", WARN_EL },
+  { "scale", WARN_SCALE },
+  { "number", WARN_NUMBER },
+  { "syntax", WARN_SYNTAX },
+  { "tab", WARN_TAB },
+  { "right-brace", WARN_RIGHT_BRACE },
+  { "missing", WARN_MISSING },
+  { "input", WARN_INPUT },
+  { "escape", WARN_ESCAPE },
+  { "space", WARN_SPACE },
+  { "font", WARN_FONT },
+  { "di", WARN_DI },
+  { "mac", WARN_MAC },
+  { "reg", WARN_REG },
+  { "ig", WARN_IG },
+  { "color", WARN_COLOR },
+  { "all", WARN_TOTAL & ~(WARN_DI | WARN_MAC | WARN_REG) },
+  { "w", WARN_TOTAL },
+  { "default", DEFAULT_WARNING_MASK },
+};
+
+static int lookup_warning(const char *name)
+{
+  for (unsigned int i = 0;
+       i < sizeof(warning_table)/sizeof(warning_table[0]);
+       i++)
+    if (strcmp(name, warning_table[i].name) == 0)
+      return warning_table[i].mask;
+  return 0;
+}
+
+static void enable_warning(const char *name)
+{
+  int mask = lookup_warning(name);
+  if (mask)
+    warning_mask |= mask;
+  else
+    error("unknown warning `%1'", name);
+}
+
+static void disable_warning(const char *name)
+{
+  int mask = lookup_warning(name);
+  if (mask)
+    warning_mask &= ~mask;
+  else
+    error("unknown warning `%1'", name);
+}
+
+static void copy_mode_error(const char *format,
+			    const errarg &arg1,
+			    const errarg &arg2,
+			    const errarg &arg3)
+{
+  if (ignoring) {
+    static const char prefix[] = "(in ignored input) ";
+    char *s = new char[sizeof(prefix) + strlen(format)];
+    strcpy(s, prefix);
+    strcat(s, format);
+    warning(WARN_IG, s, arg1, arg2, arg3);
+    a_delete s;
+  }
+  else
+    error(format, arg1, arg2, arg3);
+}
+
+enum error_type { WARNING, OUTPUT_WARNING, ERROR, FATAL };
+
+static void do_error(error_type type,
+		     const char *format,
+		     const errarg &arg1,
+		     const errarg &arg2,
+		     const errarg &arg3)
+{
+  const char *filename;
+  int lineno;
+  if (inhibit_errors && type < FATAL)
+    return;
+  if (backtrace_flag)
+    input_stack::backtrace();
+  if (!get_file_line(&filename, &lineno))
+    filename = 0;
+  if (filename)
+    errprint("%1:%2: ", filename, lineno);
+  else if (program_name)
+    fprintf(stderr, "%s: ", program_name);
+  switch (type) {
+  case FATAL:
+    fputs("fatal error: ", stderr);
+    break;
+  case ERROR:
+    break;
+  case WARNING:
+    fputs("warning: ", stderr);
+    break;
+  case OUTPUT_WARNING:
+    double fromtop = topdiv->get_vertical_position().to_units() / warn_scale;
+    fprintf(stderr, "warning [p %d, %.1f%c",
+	    topdiv->get_page_number(), fromtop, warn_scaling_indicator);
+    if (topdiv != curdiv) {
+      double fromtop1 = curdiv->get_vertical_position().to_units()
+			/ warn_scale;
+      fprintf(stderr, ", div `%s', %.1f%c",
+	      curdiv->get_diversion_name(), fromtop1, warn_scaling_indicator);
+    }
+    fprintf(stderr, "]: ");
+    break;
+  }
+  errprint(format, arg1, arg2, arg3);
+  fputc('\n', stderr);
+  fflush(stderr);
+  if (type == FATAL)
+    cleanup_and_exit(1);
+}
+
+int warning(warning_type t,
+	    const char *format,
+	    const errarg &arg1,
+	    const errarg &arg2,
+	    const errarg &arg3)
+{
+  if ((t & warning_mask) != 0) {
+    do_error(WARNING, format, arg1, arg2, arg3);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+int output_warning(warning_type t,
+		   const char *format,
+		   const errarg &arg1,
+		   const errarg &arg2,
+		   const errarg &arg3)
+{
+  if ((t & warning_mask) != 0) {
+    do_error(OUTPUT_WARNING, format, arg1, arg2, arg3);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void error(const char *format,
+	   const errarg &arg1,
+	   const errarg &arg2,
+	   const errarg &arg3)
+{
+  do_error(ERROR, format, arg1, arg2, arg3);
+}
+
+void fatal(const char *format,
+	   const errarg &arg1,
+	   const errarg &arg2,
+	   const errarg &arg3)
+{
+  do_error(FATAL, format, arg1, arg2, arg3);
+}
+
+void fatal_with_file_and_line(const char *filename, int lineno,
+			      const char *format,
+			      const errarg &arg1,
+			      const errarg &arg2,
+			      const errarg &arg3)
+{
+  fprintf(stderr, "%s:%d: fatal error: ", filename, lineno);
+  errprint(format, arg1, arg2, arg3);
+  fputc('\n', stderr);
+  fflush(stderr);
+  cleanup_and_exit(1);
+}
+
+void error_with_file_and_line(const char *filename, int lineno,
+			      const char *format,
+			      const errarg &arg1,
+			      const errarg &arg2,
+			      const errarg &arg3)
+{
+  fprintf(stderr, "%s:%d: error: ", filename, lineno);
+  errprint(format, arg1, arg2, arg3);
+  fputc('\n', stderr);
+  fflush(stderr);
+}
+
+dictionary charinfo_dictionary(501);
+
+charinfo *get_charinfo(symbol nm)
+{
+  void *p = charinfo_dictionary.lookup(nm);
+  if (p != 0)
+    return (charinfo *)p;
+  charinfo *cp = new charinfo(nm);
+  (void)charinfo_dictionary.lookup(nm, cp);
+  return cp;
+}
+
+int charinfo::next_index = 0;
+
+charinfo::charinfo(symbol s)
+: translation(0), mac(0), special_translation(TRANSLATE_NONE),
+  hyphenation_code(0), flags(0), ascii_code(0), asciify_code(0),
+  not_found(0), transparent_translate(1), translate_input(0),
+  mode(CHAR_NORMAL), nm(s)
+{
+  index = next_index++;
+}
+
+void charinfo::set_hyphenation_code(unsigned char c)
+{
+  hyphenation_code = c;
+}
+
+void charinfo::set_translation(charinfo *ci, int tt, int ti)
+{
+  translation = ci;
+  if (ci && ti) {
+    if (hyphenation_code != 0)
+      ci->set_hyphenation_code(hyphenation_code);
+    if (asciify_code != 0)
+      ci->set_asciify_code(asciify_code);
+    else if (ascii_code != 0)
+      ci->set_asciify_code(ascii_code);
+    ci->set_translation_input();
+  }
+  special_translation = TRANSLATE_NONE;
+  transparent_translate = tt;
+}
+
+void charinfo::set_special_translation(int c, int tt)
+{
+  special_translation = c;
+  translation = 0;
+  transparent_translate = tt;
+}
+
+void charinfo::set_ascii_code(unsigned char c)
+{
+  ascii_code = c;
+}
+
+void charinfo::set_asciify_code(unsigned char c)
+{
+  asciify_code = c;
+}
+
+macro *charinfo::set_macro(macro *m)
+{
+  macro *tem = mac;
+  mac = m;
+  return tem;
+}
+
+macro *charinfo::setx_macro(macro *m, char_mode cm)
+{
+  macro *tem = mac;
+  mac = m;
+  mode = cm;
+  return tem;
+}
+
+void charinfo::set_number(int n)
+{
+  number = n;
+  flags |= NUMBERED;
+}
+
+int charinfo::get_number()
+{
+  assert(flags & NUMBERED);
+  return number;
+}
+
+symbol UNNAMED_SYMBOL("---");
+
+// For numbered characters not between 0 and 255, we make a symbol out
+// of the number and store them in this dictionary.
+
+dictionary numbered_charinfo_dictionary(11);
+
+charinfo *get_charinfo_by_number(int n)
+{
+  static charinfo *number_table[256];
+
+  if (n >= 0 && n < 256) {
+    charinfo *ci = number_table[n];
+    if (!ci) {
+      ci = new charinfo(UNNAMED_SYMBOL);
+      ci->set_number(n);
+      number_table[n] = ci;
+    }
+    return ci;
+  }
+  else {
+    symbol ns(i_to_a(n));
+    charinfo *ci = (charinfo *)numbered_charinfo_dictionary.lookup(ns);
+    if (!ci) {
+      ci = new charinfo(UNNAMED_SYMBOL);
+      ci->set_number(n);
+      (void)numbered_charinfo_dictionary.lookup(ns, ci);
+    }
+    return ci;
+  }
+}
+
+int font::name_to_index(const char *nm)
+{
+  charinfo *ci;
+  if (nm[1] == 0)
+    ci = charset_table[nm[0] & 0xff];
+  else if (nm[0] == '\\' && nm[2] == 0)
+    ci = get_charinfo(symbol(nm + 1));
+  else
+    ci = get_charinfo(symbol(nm));
+  if (ci == 0)
+    return -1;
+  else
+    return ci->get_index();
+}
+
+int font::number_to_index(int n)
+{
+  return get_charinfo_by_number(n)->get_index();
+}
diff --git a/contrib/groff/src/roff/troff/node.cpp b/contrib/groff/src/roff/troff/node.cpp
new file mode 100644
index 0000000..73776b1
--- /dev/null
+++ b/contrib/groff/src/roff/troff/node.cpp
@@ -0,0 +1,5993 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "troff.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "symbol.h"
+#include "dictionary.h"
+#include "hvunits.h"
+#include "env.h"
+#include "request.h"
+#include "node.h"
+#include "token.h"
+#include "charinfo.h"
+#include "font.h"
+#include "reg.h"
+#include "input.h"
+#include "div.h"
+#include "geometry.h"
+#include "stringclass.h"
+
+#include "nonposix.h"
+
+#ifdef _POSIX_VERSION
+
+#include <sys/wait.h>
+
+#else /* not _POSIX_VERSION */
+
+/* traditional Unix */
+
+#define WIFEXITED(s) (((s) & 0377) == 0)
+#define WEXITSTATUS(s) (((s) >> 8) & 0377)
+#define WTERMSIG(s) ((s) & 0177)
+#define WIFSTOPPED(s) (((s) & 0377) == 0177)
+#define WSTOPSIG(s) (((s) >> 8) & 0377)
+#define WIFSIGNALED(s) (((s) & 0377) != 0 && (((s) & 0377) != 0177))
+
+#endif /* not _POSIX_VERSION */
+
+/*
+ *  how many boundaries of images have been written? Useful for
+ *  debugging grohtml
+ */
+
+int image_no = 0;
+static int suppress_start_page = 0;
+
+#define STORE_WIDTH 1
+
+symbol HYPHEN_SYMBOL("hy");
+
+// Character used when a hyphen is inserted at a line break.
+static charinfo *soft_hyphen_char;
+
+enum constant_space_type {
+  CONSTANT_SPACE_NONE,
+  CONSTANT_SPACE_RELATIVE,
+  CONSTANT_SPACE_ABSOLUTE
+  };
+
+struct special_font_list {
+  int n;
+  special_font_list *next;
+};
+
+special_font_list *global_special_fonts;
+static int global_ligature_mode = 1;
+static int global_kern_mode = 1;
+
+class track_kerning_function {
+  int non_zero;
+  units min_size;
+  hunits min_amount;
+  units max_size;
+  hunits max_amount;
+public:
+  track_kerning_function();
+  track_kerning_function(units, hunits, units, hunits);
+  int operator==(const track_kerning_function &);
+  int operator!=(const track_kerning_function &);
+  hunits compute(int point_size);
+};
+
+// embolden fontno when this is the current font
+
+struct conditional_bold {
+  conditional_bold *next;
+  int fontno;
+  hunits offset;
+  conditional_bold(int, hunits, conditional_bold * = 0);
+};
+
+struct tfont;
+
+class font_info {
+  tfont *last_tfont;
+  int number;
+  font_size last_size;
+  int last_height;
+  int last_slant;
+  symbol internal_name;
+  symbol external_name;
+  font *fm;
+  char is_bold;
+  hunits bold_offset;
+  track_kerning_function track_kern;
+  constant_space_type is_constant_spaced;
+  units constant_space;
+  int last_ligature_mode;
+  int last_kern_mode;
+  conditional_bold *cond_bold_list;
+  void flush();
+public:
+  special_font_list *sf;
+  font_info(symbol nm, int n, symbol enm, font *f);
+  int contains(charinfo *);
+  void set_bold(hunits);
+  void unbold();
+  void set_conditional_bold(int, hunits);
+  void conditional_unbold(int);
+  void set_track_kern(track_kerning_function &);
+  void set_constant_space(constant_space_type, units = 0);
+  int is_named(symbol);
+  symbol get_name();
+  tfont *get_tfont(font_size, int, int, int);
+  hunits get_space_width(font_size, int);
+  hunits get_narrow_space_width(font_size);
+  hunits get_half_narrow_space_width(font_size);
+  int get_bold(hunits *);
+  int is_special();
+  int is_style();
+  friend symbol get_font_name(int, environment *);
+};
+
+class tfont_spec {
+protected:
+  symbol name;
+  int input_position;
+  font *fm;
+  font_size size;
+  char is_bold;
+  char is_constant_spaced;
+  int ligature_mode;
+  int kern_mode;
+  hunits bold_offset;
+  hunits track_kern;			// add this to the width
+  hunits constant_space_width;
+  int height;
+  int slant;
+public:
+  tfont_spec(symbol nm, int pos, font *, font_size, int, int);
+  tfont_spec(const tfont_spec &spec) { *this = spec; }
+  tfont_spec plain();
+  int operator==(const tfont_spec &);
+  friend tfont *font_info::get_tfont(font_size fs, int, int, int);
+};
+
+class tfont : public tfont_spec {
+  static tfont *tfont_list;
+  tfont *next;
+  tfont *plain_version;
+public:
+  tfont(tfont_spec &);
+  int contains(charinfo *);
+  hunits get_width(charinfo *c);
+  int get_bold(hunits *);
+  int get_constant_space(hunits *);
+  hunits get_track_kern();
+  tfont *get_plain();
+  font_size get_size();
+  symbol get_name();
+  charinfo *get_lig(charinfo *c1, charinfo *c2);
+  int get_kern(charinfo *c1, charinfo *c2, hunits *res);
+  int get_input_position();
+  int get_character_type(charinfo *);
+  int get_height();
+  int get_slant();
+  vunits get_char_height(charinfo *);
+  vunits get_char_depth(charinfo *);
+  hunits get_char_skew(charinfo *);
+  hunits get_italic_correction(charinfo *);
+  hunits get_left_italic_correction(charinfo *);
+  hunits get_subscript_correction(charinfo *);
+  friend tfont *make_tfont(tfont_spec &);
+};
+
+inline int env_definite_font(environment *env)
+{
+  return env->get_family()->make_definite(env->get_font());
+}
+
+/* font_info functions */
+
+static font_info **font_table = 0;
+static int font_table_size = 0;
+
+font_info::font_info(symbol nm, int n, symbol enm, font *f)
+: last_tfont(0), number(n), last_size(0),
+  internal_name(nm), external_name(enm), fm(f),
+  is_bold(0), is_constant_spaced(CONSTANT_SPACE_NONE), last_ligature_mode(1),
+  last_kern_mode(1), cond_bold_list(0), sf(0)
+{
+}
+
+inline int font_info::contains(charinfo *ci)
+{
+  return fm != 0 && fm->contains(ci->get_index());
+}
+
+inline int font_info::is_special()
+{
+  return fm != 0 && fm->is_special();
+}
+
+inline int font_info::is_style()
+{
+  return fm == 0;
+}
+
+tfont *make_tfont(tfont_spec &spec)
+{
+  for (tfont *p = tfont::tfont_list; p; p = p->next)
+    if (*p == spec)
+      return p;
+  return new tfont(spec);
+}
+
+// this is the current_font, fontno is where we found the character,
+// presumably a special font
+
+tfont *font_info::get_tfont(font_size fs, int height, int slant, int fontno)
+{
+  if (last_tfont == 0 || fs != last_size
+      || height != last_height || slant != last_slant
+      || global_ligature_mode != last_ligature_mode
+      || global_kern_mode != last_kern_mode
+      || fontno != number) {
+	font_info *f = font_table[fontno];
+	tfont_spec spec(f->external_name, f->number, f->fm, fs, height, slant);
+	for (conditional_bold *p = cond_bold_list; p; p = p->next)
+	  if (p->fontno == fontno) {
+	    spec.is_bold = 1;
+	    spec.bold_offset = p->offset;
+	    break;
+	  }
+	if (!spec.is_bold && is_bold) {
+	  spec.is_bold = 1;
+	  spec.bold_offset = bold_offset;
+	}
+	spec.track_kern = track_kern.compute(fs.to_scaled_points());
+	spec.ligature_mode = global_ligature_mode;
+	spec.kern_mode = global_kern_mode;
+	switch (is_constant_spaced) {
+	case CONSTANT_SPACE_NONE:
+	  break;
+	case CONSTANT_SPACE_ABSOLUTE:
+	  spec.is_constant_spaced = 1;
+	  spec.constant_space_width = constant_space;
+	  break;
+	case CONSTANT_SPACE_RELATIVE:
+	  spec.is_constant_spaced = 1;
+	  spec.constant_space_width
+	    = scale(constant_space*fs.to_scaled_points(),
+		    units_per_inch,
+		    36*72*sizescale);
+	  break;
+	default:
+	  assert(0);
+	}
+	if (fontno != number)
+	  return make_tfont(spec);
+	last_tfont = make_tfont(spec);
+	last_size = fs;
+	last_height = height;
+	last_slant = slant;
+	last_ligature_mode = global_ligature_mode;
+	last_kern_mode = global_kern_mode;
+      }
+  return last_tfont;
+}
+
+int font_info::get_bold(hunits *res)
+{
+  if (is_bold) {
+    *res = bold_offset;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void font_info::unbold()
+{
+  if (is_bold) {
+    is_bold = 0;
+    flush();
+  }
+}
+
+void font_info::set_bold(hunits offset)
+{
+  if (!is_bold || offset != bold_offset) {
+    is_bold = 1;
+    bold_offset = offset;
+    flush();
+  }
+}
+
+void font_info::set_conditional_bold(int fontno, hunits offset)
+{
+  for (conditional_bold *p = cond_bold_list; p; p = p->next)
+    if (p->fontno == fontno) {
+      if (offset != p->offset) {
+	p->offset = offset;
+	flush();
+      }
+      return;
+    }
+  cond_bold_list = new conditional_bold(fontno, offset, cond_bold_list);
+}
+
+conditional_bold::conditional_bold(int f, hunits h, conditional_bold *x)
+: next(x), fontno(f), offset(h)
+{
+}
+
+void font_info::conditional_unbold(int fontno)
+{
+  for (conditional_bold **p = &cond_bold_list; *p; p = &(*p)->next)
+    if ((*p)->fontno == fontno) {
+      conditional_bold *tem = *p;
+      *p = (*p)->next;
+      delete tem;
+      flush();
+      return;
+    }
+}
+
+void font_info::set_constant_space(constant_space_type type, units x)
+{
+  if (type != is_constant_spaced
+      || (type != CONSTANT_SPACE_NONE && x != constant_space)) {
+    flush();
+    is_constant_spaced = type;
+    constant_space = x;
+  }
+}
+
+void font_info::set_track_kern(track_kerning_function &tk)
+{
+  if (track_kern != tk) {
+    track_kern = tk;
+    flush();
+  }
+}
+
+void font_info::flush()
+{
+  last_tfont = 0;
+}
+
+int font_info::is_named(symbol s)
+{
+  return internal_name == s;
+}
+
+symbol font_info::get_name()
+{
+  return internal_name;
+}
+
+symbol get_font_name(int fontno, environment *env)
+{
+  symbol f = font_table[fontno]->get_name();
+  if (font_table[fontno]->is_style()) {
+    return concat(env->get_family()->nm, f);
+  }
+  return f;
+}
+
+hunits font_info::get_space_width(font_size fs, int space_size)
+{
+  if (is_constant_spaced == CONSTANT_SPACE_NONE)
+    return scale(hunits(fm->get_space_width(fs.to_scaled_points())),
+			space_size, 12);
+  else if (is_constant_spaced == CONSTANT_SPACE_ABSOLUTE)
+    return constant_space;
+  else
+    return scale(constant_space*fs.to_scaled_points(),
+		 units_per_inch, 36*72*sizescale);
+}
+
+hunits font_info::get_narrow_space_width(font_size fs)
+{
+  charinfo *ci = get_charinfo(symbol("|"));
+  if (fm->contains(ci->get_index()))
+    return hunits(fm->get_width(ci->get_index(), fs.to_scaled_points()));
+  else
+    return hunits(fs.to_units()/6);
+}
+
+hunits font_info::get_half_narrow_space_width(font_size fs)
+{
+  charinfo *ci = get_charinfo(symbol("^"));
+  if (fm->contains(ci->get_index()))
+    return hunits(fm->get_width(ci->get_index(), fs.to_scaled_points()));
+  else
+    return hunits(fs.to_units()/12);
+}
+
+/* tfont */
+
+tfont_spec::tfont_spec(symbol nm, int n, font *f,
+		       font_size s, int h, int sl)
+: name(nm), input_position(n), fm(f), size(s),
+  is_bold(0), is_constant_spaced(0), ligature_mode(1), kern_mode(1),
+  height(h), slant(sl)
+{
+  if (height == size.to_scaled_points())
+    height = 0;
+}
+
+int tfont_spec::operator==(const tfont_spec &spec)
+{
+  if (fm == spec.fm
+      && size == spec.size
+      && input_position == spec.input_position
+      && name == spec.name
+      && height == spec.height
+      && slant == spec.slant
+      && (is_bold
+	  ? (spec.is_bold && bold_offset == spec.bold_offset)
+	  : !spec.is_bold)
+      && track_kern == spec.track_kern
+      && (is_constant_spaced
+	  ? (spec.is_constant_spaced
+	     && constant_space_width == spec.constant_space_width)
+	  : !spec.is_constant_spaced)
+      && ligature_mode == spec.ligature_mode
+      && kern_mode == spec.kern_mode)
+    return 1;
+  else
+    return 0;
+}
+
+tfont_spec tfont_spec::plain()
+{
+  return tfont_spec(name, input_position, fm, size, height, slant);
+}
+
+hunits tfont::get_width(charinfo *c)
+{
+  if (is_constant_spaced)
+    return constant_space_width;
+  else if (is_bold)
+    return (hunits(fm->get_width(c->get_index(), size.to_scaled_points()))
+	    + track_kern + bold_offset);
+  else
+    return (hunits(fm->get_width(c->get_index(), size.to_scaled_points()))
+	    + track_kern);
+}
+
+vunits tfont::get_char_height(charinfo *c)
+{
+  vunits v = fm->get_height(c->get_index(), size.to_scaled_points());
+  if (height != 0 && height != size.to_scaled_points())
+    return scale(v, height, size.to_scaled_points());
+  else
+    return v;
+}
+
+vunits tfont::get_char_depth(charinfo *c)
+{
+  vunits v = fm->get_depth(c->get_index(), size.to_scaled_points());
+  if (height != 0 && height != size.to_scaled_points())
+    return scale(v, height, size.to_scaled_points());
+  else
+    return v;
+}
+
+hunits tfont::get_char_skew(charinfo *c)
+{
+  return hunits(fm->get_skew(c->get_index(), size.to_scaled_points(), slant));
+}
+
+hunits tfont::get_italic_correction(charinfo *c)
+{
+  return hunits(fm->get_italic_correction(c->get_index(), size.to_scaled_points()));
+}
+
+hunits tfont::get_left_italic_correction(charinfo *c)
+{
+  return hunits(fm->get_left_italic_correction(c->get_index(),
+					       size.to_scaled_points()));
+}
+
+hunits tfont::get_subscript_correction(charinfo *c)
+{
+  return hunits(fm->get_subscript_correction(c->get_index(),
+					     size.to_scaled_points()));
+}
+
+inline int tfont::get_input_position()
+{
+  return input_position;
+}
+
+inline int tfont::contains(charinfo *ci)
+{
+  return fm->contains(ci->get_index());
+}
+
+inline int tfont::get_character_type(charinfo *ci)
+{
+  return fm->get_character_type(ci->get_index());
+}
+
+inline int tfont::get_bold(hunits *res)
+{
+  if (is_bold) {
+    *res = bold_offset;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+inline int tfont::get_constant_space(hunits *res)
+{
+  if (is_constant_spaced) {
+    *res = constant_space_width;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+inline hunits tfont::get_track_kern()
+{
+  return track_kern;
+}
+
+inline tfont *tfont::get_plain()
+{
+  return plain_version;
+}
+
+inline font_size tfont::get_size()
+{
+  return size;
+}
+
+inline symbol tfont::get_name()
+{
+  return name;
+}
+
+inline int tfont::get_height()
+{
+  return height;
+}
+
+inline int tfont::get_slant()
+{
+  return slant;
+}
+
+symbol SYMBOL_ff("ff");
+symbol SYMBOL_fi("fi");
+symbol SYMBOL_fl("fl");
+symbol SYMBOL_Fi("Fi");
+symbol SYMBOL_Fl("Fl");
+
+charinfo *tfont::get_lig(charinfo *c1, charinfo *c2)
+{
+  if (ligature_mode == 0)
+    return 0;
+  charinfo *ci = 0;
+  if (c1->get_ascii_code() == 'f') {
+    switch (c2->get_ascii_code()) {
+    case 'f':
+      if (fm->has_ligature(font::LIG_ff))
+	ci = get_charinfo(SYMBOL_ff);
+      break;
+    case 'i':
+      if (fm->has_ligature(font::LIG_fi))
+	ci = get_charinfo(SYMBOL_fi);
+      break;
+    case 'l':
+      if (fm->has_ligature(font::LIG_fl))
+	ci = get_charinfo(SYMBOL_fl);
+      break;
+    }
+  }
+  else if (ligature_mode != 2 && c1->nm == SYMBOL_ff) {
+    switch (c2->get_ascii_code()) {
+    case 'i':
+      if (fm->has_ligature(font::LIG_ffi))
+	ci = get_charinfo(SYMBOL_Fi);
+      break;
+    case 'l':
+      if (fm->has_ligature(font::LIG_ffl))
+	ci = get_charinfo(SYMBOL_Fl);
+      break;
+    }
+  }
+  if (ci != 0 && fm->contains(ci->get_index()))
+    return ci;
+  return 0;
+}
+
+inline int tfont::get_kern(charinfo *c1, charinfo *c2, hunits *res)
+{
+  if (kern_mode == 0)
+    return 0;
+  else {
+    int n = fm->get_kern(c1->get_index(),
+			 c2->get_index(),
+			 size.to_scaled_points());
+    if (n) {
+      *res = hunits(n);
+      return 1;
+    }
+    else
+      return 0;
+  }
+}
+
+tfont *tfont::tfont_list = 0;
+
+tfont::tfont(tfont_spec &spec) : tfont_spec(spec)
+{
+  next = tfont_list;
+  tfont_list = this;
+  tfont_spec plain_spec = plain();
+  tfont *p;
+  for (p = tfont_list; p; p = p->next)
+    if (*p == plain_spec) {
+      plain_version = p;
+      break;
+    }
+  if (!p)
+    plain_version = new tfont(plain_spec);
+}
+
+/* output_file */
+
+class real_output_file : public output_file {
+#ifndef POPEN_MISSING
+  int piped;
+#endif
+  int printing;        // decision via optional page list
+  int output_on;       // \O[0] or \O[1] escape calls
+  virtual void really_transparent_char(unsigned char) = 0;
+  virtual void really_print_line(hunits x, vunits y, node *n,
+				 vunits before, vunits after, hunits width) = 0;
+  virtual void really_begin_page(int pageno, vunits page_length) = 0;
+  virtual void really_copy_file(hunits x, vunits y, const char *filename);
+  virtual void really_put_filename(const char *filename);
+  virtual void really_on();
+  virtual void really_off();
+protected:
+  FILE *fp;
+public:
+  real_output_file();
+  ~real_output_file();
+  void flush();
+  void transparent_char(unsigned char);
+  void print_line(hunits x, vunits y, node *n, vunits before, vunits after, hunits width);
+  void begin_page(int pageno, vunits page_length);
+  void put_filename(const char *filename);
+  void on();
+  void off();
+  int is_on();
+  int is_printing();
+  void copy_file(hunits x, vunits y, const char *filename);
+};
+
+class suppress_output_file : public real_output_file {
+public:
+  suppress_output_file();
+  void really_transparent_char(unsigned char);
+  void really_print_line(hunits x, vunits y, node *n, vunits, vunits, hunits width);
+  void really_begin_page(int pageno, vunits page_length);
+};
+
+class ascii_output_file : public real_output_file {
+public:
+  ascii_output_file();
+  void really_transparent_char(unsigned char);
+  void really_print_line(hunits x, vunits y, node *n, vunits, vunits, hunits width);
+  void really_begin_page(int pageno, vunits page_length);
+  void outc(unsigned char c);
+  void outs(const char *s);
+};
+
+void ascii_output_file::outc(unsigned char c)
+{
+  fputc(c, fp);
+}
+
+void ascii_output_file::outs(const char *s)
+{
+  fputc('<', fp);
+  if (s)
+    fputs(s, fp);
+  fputc('>', fp);
+}
+
+struct hvpair;
+
+class troff_output_file : public real_output_file {
+  units hpos;
+  units vpos;
+  units output_vpos;
+  units output_hpos;
+  int force_motion;
+  int current_size;
+  int current_slant;
+  int current_height;
+  tfont *current_tfont;
+  color *current_fill_color;
+  color *current_glyph_color;
+  int current_font_number;
+  symbol *font_position;
+  int nfont_positions;
+  enum { TBUF_SIZE = 256 };
+  char tbuf[TBUF_SIZE];
+  int tbuf_len;
+  int tbuf_kern;
+  int begun_page;
+  void do_motion();
+  void put(char c);
+  void put(unsigned char c);
+  void put(int i);
+  void put(unsigned int i);
+  void put(const char *s);
+  void set_font(tfont *tf);
+  void flush_tbuf();
+public:
+  troff_output_file();
+  ~troff_output_file();
+  void trailer(vunits page_length);
+  void put_char(charinfo *, tfont *, color *, color *);
+  void put_char_width(charinfo *, tfont *, color *, color *, hunits, hunits);
+  void right(hunits);
+  void down(vunits);
+  void moveto(hunits, vunits);
+  void start_special(tfont *, color *, color *, int = 0);
+  void start_special();
+  void special_char(unsigned char c);
+  void end_special();
+  void word_marker();
+  void really_transparent_char(unsigned char c);
+  void really_print_line(hunits x, vunits y, node *n, vunits before, vunits after, hunits width);
+  void really_begin_page(int pageno, vunits page_length);
+  void really_copy_file(hunits x, vunits y, const char *filename);
+  void really_put_filename(const char *filename);
+  void really_on();
+  void really_off();
+  void draw(char, hvpair *, int, font_size, color *, color *);
+  void determine_line_limits (char code, hvpair *point, int npoints);
+  void check_charinfo(tfont *tf, charinfo *ci);
+  void glyph_color(color *c);
+  void fill_color(color *c);
+  int get_hpos() { return hpos; }
+  int get_vpos() { return vpos; }
+  friend void space_char_hmotion_node::tprint(troff_output_file *);
+  friend void unbreakable_space_node::tprint(troff_output_file *);
+};
+
+static void put_string(const char *s, FILE *fp)
+{
+  for (; *s != '\0'; ++s)
+    putc(*s, fp);
+}
+
+inline void troff_output_file::put(char c)
+{
+  putc(c, fp);
+}
+
+inline void troff_output_file::put(unsigned char c)
+{
+  putc(c, fp);
+}
+
+inline void troff_output_file::put(const char *s)
+{
+  put_string(s, fp);
+}
+
+inline void troff_output_file::put(int i)
+{
+  put_string(i_to_a(i), fp);
+}
+
+inline void troff_output_file::put(unsigned int i)
+{
+  put_string(ui_to_a(i), fp);
+}
+
+void troff_output_file::start_special(tfont *tf, color *gcol, color *fcol,
+				      int no_init_string)
+{
+  set_font(tf);
+  glyph_color(gcol);
+  fill_color(fcol);
+  flush_tbuf();
+  do_motion();
+  if (!no_init_string)
+    put("x X ");
+}
+
+void troff_output_file::start_special()
+{
+  flush_tbuf();
+  do_motion();
+  put("x X ");
+}
+
+void troff_output_file::special_char(unsigned char c)
+{
+  put(c);
+  if (c == '\n')
+    put('+');
+}
+
+void troff_output_file::end_special()
+{
+  put('\n');
+}
+
+inline void troff_output_file::moveto(hunits h, vunits v)
+{
+  hpos = h.to_units();
+  vpos = v.to_units();
+}
+
+void troff_output_file::really_print_line(hunits x, vunits y, node *n,
+					  vunits before, vunits after, hunits)
+{
+  moveto(x, y);
+  while (n != 0) {
+    n->tprint(this);
+    n = n->next;
+  }
+  flush_tbuf();
+  // This ensures that transparent throughput will have a more predictable
+  // position.
+  do_motion();
+  force_motion = 1;
+  hpos = 0;
+  put('n');
+  put(before.to_units());
+  put(' ');
+  put(after.to_units());
+  put('\n');
+}
+
+inline void troff_output_file::word_marker()
+{
+  flush_tbuf();
+  if (is_on())
+    put('w');
+}
+
+inline void troff_output_file::right(hunits n)
+{
+  hpos += n.to_units();
+}
+
+inline void troff_output_file::down(vunits n)
+{
+  vpos += n.to_units();
+}
+
+void troff_output_file::do_motion()
+{
+  if (force_motion) {
+    put('V');
+    put(vpos);
+    put('\n');
+    put('H');
+    put(hpos);
+    put('\n');
+  }
+  else {
+    if (hpos != output_hpos) {
+      units n = hpos - output_hpos;
+      if (n > 0 && n < hpos) {
+	put('h');
+	put(n);
+      }
+      else {
+	put('H');
+	put(hpos);
+      }
+      put('\n');
+    }
+    if (vpos != output_vpos) {
+      units n = vpos - output_vpos;
+      if (n > 0 && n < vpos) {
+	put('v');
+	put(n);
+      }
+      else {
+	put('V');
+	put(vpos);
+      }
+      put('\n');
+    }
+  }
+  output_vpos = vpos;
+  output_hpos = hpos;
+  force_motion = 0;
+}
+
+void troff_output_file::flush_tbuf()
+{
+  if (!is_on()) {
+    tbuf_len = 0;
+    return;
+  }
+
+  if (tbuf_len == 0)
+    return;
+  if (tbuf_kern == 0)
+    put('t');
+  else {
+    put('u');
+    put(tbuf_kern);
+    put(' ');
+  }
+  check_output_limits(hpos, vpos);
+  check_output_limits(hpos, vpos - current_size);
+
+  for (int i = 0; i < tbuf_len; i++)
+    put(tbuf[i]);
+  put('\n');
+  tbuf_len = 0;
+}
+
+void troff_output_file::check_charinfo(tfont *tf, charinfo *ci)
+{
+  if (!is_on())
+    return;
+
+  int height = tf->get_char_height(ci).to_units();
+  int width = tf->get_width(ci).to_units()
+	      + tf->get_italic_correction(ci).to_units();
+  int depth = tf->get_char_depth(ci).to_units();
+  check_output_limits(output_hpos, output_vpos - height);
+  check_output_limits(output_hpos + width, output_vpos + depth);
+}
+
+void troff_output_file::put_char_width(charinfo *ci, tfont *tf,
+				       color *gcol, color *fcol,
+				       hunits w, hunits k)
+{
+  int kk = k.to_units();
+  if (!is_on()) {
+    flush_tbuf();
+    hpos += w.to_units() + kk;
+    return;
+  }
+  set_font(tf);
+  char c = ci->get_ascii_code();
+  if (c == '\0') {
+    glyph_color(gcol);
+    fill_color(fcol);
+    flush_tbuf();
+    do_motion();
+    check_charinfo(tf, ci);
+    if (ci->numbered()) {
+      put('N');
+      put(ci->get_number());
+    }
+    else {
+      put('C');
+      const char *s = ci->nm.contents();
+      if (s[1] == 0) {
+	put('\\');
+	put(s[0]);
+      }
+      else
+	put(s);
+    }
+    put('\n');
+    hpos += w.to_units() + kk;
+  }
+  else if (tcommand_flag) {
+    if (tbuf_len > 0 && hpos == output_hpos && vpos == output_vpos
+	&& (!gcol || gcol == current_glyph_color)
+	&& (!fcol || fcol == current_fill_color)
+	&& kk == tbuf_kern
+	&& tbuf_len < TBUF_SIZE) {
+      check_charinfo(tf, ci);
+      tbuf[tbuf_len++] = c;
+      output_hpos += w.to_units() + kk;
+      hpos = output_hpos;
+      return;
+    }
+    glyph_color(gcol);
+    fill_color(fcol);
+    flush_tbuf();
+    do_motion();
+    check_charinfo(tf, ci);
+    tbuf[tbuf_len++] = c;
+    output_hpos += w.to_units() + kk;
+    tbuf_kern = kk;
+    hpos = output_hpos;
+  }
+  else {
+    // flush_tbuf();
+    int n = hpos - output_hpos;
+    check_charinfo(tf, ci);
+    // check_output_limits(output_hpos, output_vpos);
+    if (vpos == output_vpos
+	&& (!gcol || gcol == current_glyph_color)
+	&& (!fcol || fcol == current_fill_color)
+	&& n > 0 && n < 100 && !force_motion) {
+      put(char(n/10 + '0'));
+      put(char(n%10 + '0'));
+      put(c);
+      output_hpos = hpos;
+    }
+    else {
+      glyph_color(gcol);
+      fill_color(fcol);
+      do_motion();
+      put('c');
+      put(c);
+    }
+    hpos += w.to_units() + kk;
+  }
+}
+
+void troff_output_file::put_char(charinfo *ci, tfont *tf,
+				 color *gcol, color *fcol)
+{
+  flush_tbuf();
+  if (!is_on())
+    return;
+  set_font(tf);
+  char c = ci->get_ascii_code();
+  if (c == '\0') {
+    glyph_color(gcol);
+    fill_color(fcol);
+    flush_tbuf();
+    do_motion();
+    if (ci->numbered()) {
+      put('N');
+      put(ci->get_number());
+    }
+    else {
+      put('C');
+      const char *s = ci->nm.contents();
+      if (s[1] == 0) {
+	put('\\');
+	put(s[0]);
+      }
+      else
+	put(s);
+    }
+    put('\n');
+  }
+  else {
+    int n = hpos - output_hpos;
+    if (vpos == output_vpos
+	&& (!gcol || gcol == current_glyph_color)
+	&& (!fcol || fcol == current_fill_color)
+	&& n > 0 && n < 100) {
+      put(char(n/10 + '0'));
+      put(char(n%10 + '0'));
+      put(c);
+      output_hpos = hpos;
+    }
+    else {
+      glyph_color(gcol);
+      fill_color(fcol);
+      flush_tbuf();
+      do_motion();
+      put('c');
+      put(c);
+    }
+  }
+}
+
+// set_font calls `flush_tbuf' if necessary.
+
+void troff_output_file::set_font(tfont *tf)
+{
+  if (current_tfont == tf)
+    return;
+  flush_tbuf();
+  int n = tf->get_input_position();
+  symbol nm = tf->get_name();
+  if (n >= nfont_positions || font_position[n] != nm) {
+    put("x font ");
+    put(n);
+    put(' ');
+    put(nm.contents());
+    put('\n');
+    if (n >= nfont_positions) {
+      int old_nfont_positions = nfont_positions;
+      symbol *old_font_position = font_position;
+      nfont_positions *= 3;
+      nfont_positions /= 2;
+      if (nfont_positions <= n)
+	nfont_positions = n + 10;
+      font_position = new symbol[nfont_positions];
+      memcpy(font_position, old_font_position,
+	     old_nfont_positions*sizeof(symbol));
+      a_delete old_font_position;
+    }
+    font_position[n] = nm;
+  }
+  if (current_font_number != n) {
+    put('f');
+    put(n);
+    put('\n');
+    current_font_number = n;
+  }
+  int size = tf->get_size().to_scaled_points();
+  if (current_size != size) {
+    put('s');
+    put(size);
+    put('\n');
+    current_size = size;
+  }
+  int slant = tf->get_slant();
+  if (current_slant != slant) {
+    put("x Slant ");
+    put(slant);
+    put('\n');
+    current_slant = slant;
+  }
+  int height = tf->get_height();
+  if (current_height != height) {
+    put("x Height ");
+    put(height == 0 ? current_size : height);
+    put('\n');
+    current_height = height;
+  }
+  current_tfont = tf;
+}
+
+// fill_color calls `flush_tbuf' and `do_motion' if necessary.
+
+void troff_output_file::fill_color(color *col)
+{
+  if (!col || current_fill_color == col)
+    return;
+  current_fill_color = col;
+  if (!color_flag)
+    return;
+  flush_tbuf();
+  do_motion();
+  put("DF");
+  unsigned int components[4];
+  color_scheme cs;
+  cs = col->get_components(components);
+  switch (cs) {
+  case DEFAULT:
+    put('d');
+    break;
+  case RGB:
+    put("r ");
+    put(Red);
+    put(' ');
+    put(Green);
+    put(' ');
+    put(Blue);
+    break;
+  case CMY:
+    put("c ");
+    put(Cyan);
+    put(' ');
+    put(Magenta);
+    put(' ');
+    put(Yellow);
+    break;
+  case CMYK:
+    put("k ");
+    put(Cyan);
+    put(' ');
+    put(Magenta);
+    put(' ');
+    put(Yellow);
+    put(' ');
+    put(Black);
+    break;
+  case GRAY:
+    put("g ");
+    put(Gray);
+    break;
+  }
+  put('\n');
+}
+
+// glyph_color calls `flush_tbuf' and `do_motion' if necessary.
+
+void troff_output_file::glyph_color(color *col)
+{
+  if (!col || current_glyph_color == col)
+    return;
+  current_glyph_color = col;
+  if (!color_flag)
+    return;
+  flush_tbuf();
+  // grotty doesn't like a color command if the vertical position is zero.
+  do_motion();
+  put("m");
+  unsigned int components[4];
+  color_scheme cs;
+  cs = col->get_components(components);
+  switch (cs) {
+  case DEFAULT:
+    put('d');
+    break;
+  case RGB:
+    put("r ");
+    put(Red);
+    put(' ');
+    put(Green);
+    put(' ');
+    put(Blue);
+    break;
+  case CMY:
+    put("c ");
+    put(Cyan);
+    put(' ');
+    put(Magenta);
+    put(' ');
+    put(Yellow);
+    break;
+  case CMYK:
+    put("k ");
+    put(Cyan);
+    put(' ');
+    put(Magenta);
+    put(' ');
+    put(Yellow);
+    put(' ');
+    put(Black);
+    break;
+  case GRAY:
+    put("g ");
+    put(Gray);
+    break;
+  }
+  put('\n');
+}
+
+// determine_line_limits - works out the smallest box which will contain
+//			   the entity, code, built from the point array.
+void troff_output_file::determine_line_limits(char code, hvpair *point,
+					      int npoints)
+{
+  int i, x, y;
+
+  if (!is_on())
+    return;
+
+  switch (code) {
+  case 'c':
+  case 'C':
+    // only the h field is used when defining a circle
+    check_output_limits(output_hpos,
+			output_vpos - point[0].h.to_units()/2);
+    check_output_limits(output_hpos + point[0].h.to_units(),
+			output_vpos + point[0].h.to_units()/2);
+    break;
+  case 'E':
+  case 'e':
+    check_output_limits(output_hpos,
+			output_vpos - point[0].v.to_units()/2);
+    check_output_limits(output_hpos + point[0].h.to_units(),
+			output_vpos + point[0].v.to_units()/2);
+    break;
+  case 'P':
+  case 'p':
+    x = output_hpos;
+    y = output_vpos;
+    check_output_limits(x, y);
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+    break;
+  case 't':
+    x = output_hpos;
+    y = output_vpos;
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+    break;
+  case 'a':
+    double c[2];
+    int p[4];
+    int minx, miny, maxx, maxy;
+    x = output_hpos;
+    y = output_vpos;
+    p[0] = point[0].h.to_units();
+    p[1] = point[0].v.to_units();
+    p[2] = point[1].h.to_units();
+    p[3] = point[1].v.to_units();
+    if (adjust_arc_center(p, c)) {
+      check_output_arc_limits(x, y,
+			      p[0], p[1], p[2], p[3],
+			      c[0], c[1],
+			      &minx, &maxx, &miny, &maxy);
+      check_output_limits(minx, miny);
+      check_output_limits(maxx, maxy);
+      break;
+    }
+    // fall through
+  case 'l':
+    x = output_hpos;
+    y = output_vpos;
+    check_output_limits(x, y);
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+    break;
+  default:
+    x = output_hpos;
+    y = output_vpos;
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+  }
+}
+
+void troff_output_file::draw(char code, hvpair *point, int npoints,
+			     font_size fsize, color *gcol, color *fcol)
+{
+  int i;
+  glyph_color(gcol);
+  fill_color(fcol);
+  flush_tbuf();
+  do_motion();
+  if (is_on()) {
+    int size = fsize.to_scaled_points();
+    if (current_size != size) {
+      put('s');
+      put(size);
+      put('\n');
+      current_size = size;
+      current_tfont = 0;
+    }
+    put('D');
+    put(code);
+    if (code == 'c') {
+      put(' ');
+      put(point[0].h.to_units());
+    }
+    else
+      for (i = 0; i < npoints; i++) {
+	put(' ');
+	put(point[i].h.to_units());
+	put(' ');
+	put(point[i].v.to_units());
+      }
+    determine_line_limits(code, point, npoints);
+  }
+
+  for (i = 0; i < npoints; i++)
+    output_hpos += point[i].h.to_units();
+  hpos = output_hpos;
+  if (code != 'e') {
+    for (i = 0; i < npoints; i++)
+      output_vpos += point[i].v.to_units();
+    vpos = output_vpos;
+  }
+  if (is_on())
+    put('\n');
+}
+
+void troff_output_file::really_on()
+{
+  flush_tbuf();
+  force_motion = 1;
+  do_motion();
+}
+
+void troff_output_file::really_off()
+{
+  flush_tbuf();
+}
+
+void troff_output_file::really_put_filename(const char *filename)
+{
+  flush_tbuf();
+  put("F ");
+  put(filename);
+  put('\n');
+}
+
+void troff_output_file::really_begin_page(int pageno, vunits page_length)
+{
+  flush_tbuf();
+  if (begun_page) {
+    if (page_length > V0) {
+      put('V');
+      put(page_length.to_units());
+      put('\n');
+    }
+  }
+  else
+    begun_page = 1;
+  current_tfont = 0;
+  current_font_number = -1;
+  current_size = 0;
+  // current_height = 0;
+  // current_slant = 0;
+  hpos = 0;
+  vpos = 0;
+  output_hpos = 0;
+  output_vpos = 0;
+  force_motion = 1;
+  for (int i = 0; i < nfont_positions; i++)
+    font_position[i] = NULL_SYMBOL;
+  put('p');
+  put(pageno);
+  put('\n');
+}
+
+void troff_output_file::really_copy_file(hunits x, vunits y, const char *filename)
+{
+  moveto(x, y);
+  flush_tbuf();
+  do_motion();
+  errno = 0;
+  FILE *ifp = fopen(filename, "r");
+  if (ifp == 0)
+    error("can't open `%1': %2", filename, strerror(errno));
+  else {
+    int c;
+    while ((c = getc(ifp)) != EOF)
+      put(char(c));
+    fclose(ifp);
+  }
+  force_motion = 1;
+  current_size = 0;
+  current_tfont = 0;
+  current_font_number = -1;
+  for (int i = 0; i < nfont_positions; i++)
+    font_position[i] = NULL_SYMBOL;
+}
+
+void troff_output_file::really_transparent_char(unsigned char c)
+{
+  put(c);
+}
+
+troff_output_file::~troff_output_file()
+{
+  a_delete font_position;
+}
+
+void troff_output_file::trailer(vunits page_length)
+{
+  flush_tbuf();
+  if (page_length > V0) {
+    put("x trailer\n");
+    put('V');
+    put(page_length.to_units());
+    put('\n');
+  }
+  put("x stop\n");
+}
+
+troff_output_file::troff_output_file()
+: current_slant(0), current_height(0), current_fill_color(0),
+  current_glyph_color(0), nfont_positions(10), tbuf_len(0), begun_page(0)
+{
+  font_position = new symbol[nfont_positions];
+  put("x T ");
+  put(device);
+  put('\n');
+  put("x res ");
+  put(units_per_inch);
+  put(' ');
+  put(hresolution);
+  put(' ');
+  put(vresolution);
+  put('\n');
+  put("x init\n");
+}
+
+/* output_file */
+
+output_file *the_output = 0;
+
+output_file::output_file()
+{
+}
+
+output_file::~output_file()
+{
+}
+
+void output_file::trailer(vunits)
+{
+}
+
+void output_file::put_filename(const char *)
+{
+}
+
+void output_file::on()
+{
+}
+
+void output_file::off()
+{
+}
+
+real_output_file::real_output_file()
+: printing(0), output_on(1)
+{
+#ifndef POPEN_MISSING
+  if (pipe_command) {
+    if ((fp = popen(pipe_command, POPEN_WT)) != 0) {
+      piped = 1;
+      return;
+    }
+    error("pipe open failed: %1", strerror(errno));
+  }
+  piped = 0;
+#endif /* not POPEN_MISSING */
+  fp = stdout;
+}
+
+real_output_file::~real_output_file()
+{
+  if (!fp)
+    return;
+  // To avoid looping, set fp to 0 before calling fatal().
+  if (ferror(fp) || fflush(fp) < 0) {
+    fp = 0;
+    fatal("error writing output file");
+  }
+#ifndef POPEN_MISSING
+  if (piped) {
+    int result = pclose(fp);
+    fp = 0;
+    if (result < 0)
+      fatal("pclose failed");
+    if (!WIFEXITED(result))
+      error("output process `%1' got fatal signal %2",
+	    pipe_command,
+	    WIFSIGNALED(result) ? WTERMSIG(result) : WSTOPSIG(result));
+    else {
+      int exit_status = WEXITSTATUS(result);
+      if (exit_status != 0)
+	error("output process `%1' exited with status %2",
+	      pipe_command, exit_status);
+    }
+  }
+  else
+#endif /* not POPEN MISSING */
+  if (fclose(fp) < 0) {
+    fp = 0;
+    fatal("error closing output file");
+  }
+}
+
+void real_output_file::flush()
+{
+  if (fflush(fp) < 0)
+    fatal("error writing output file");
+}
+
+int real_output_file::is_printing()
+{
+  return printing;
+}
+
+void real_output_file::begin_page(int pageno, vunits page_length)
+{
+  printing = in_output_page_list(pageno);
+  if (printing)
+    really_begin_page(pageno, page_length);
+}
+
+void real_output_file::copy_file(hunits x, vunits y, const char *filename)
+{
+  if (printing && output_on)
+    really_copy_file(x, y, filename);
+  check_output_limits(x.to_units(), y.to_units());
+}
+
+void real_output_file::transparent_char(unsigned char c)
+{
+  if (printing && output_on)
+    really_transparent_char(c);
+}
+
+void real_output_file::print_line(hunits x, vunits y, node *n,
+			     vunits before, vunits after, hunits width)
+{
+  if (printing)
+    really_print_line(x, y, n, before, after, width);
+  delete_node_list(n);
+}
+
+void real_output_file::really_copy_file(hunits, vunits, const char *)
+{
+  // do nothing
+}
+
+void real_output_file::put_filename(const char *filename)
+{
+  really_put_filename(filename);
+}
+
+void real_output_file::really_put_filename(const char *)
+{
+}
+
+void real_output_file::on()
+{
+  really_on();
+  if (output_on == 0)
+    output_on = 1;
+}
+
+void real_output_file::off()
+{
+  really_off();
+  output_on = 0;
+}
+
+int real_output_file::is_on()
+{
+  return output_on;
+}
+
+void real_output_file::really_on()
+{
+}
+
+void real_output_file::really_off()
+{
+}
+
+/* ascii_output_file */
+
+void ascii_output_file::really_transparent_char(unsigned char c)
+{
+  putc(c, fp);
+}
+
+void ascii_output_file::really_print_line(hunits, vunits, node *n,
+					  vunits, vunits, hunits)
+{
+  while (n != 0) {
+    n->ascii_print(this);
+    n = n->next;
+  }
+  fputc('\n', fp);
+}
+
+void ascii_output_file::really_begin_page(int /*pageno*/, vunits /*page_length*/)
+{
+  fputs("<beginning of page>\n", fp);
+}
+
+ascii_output_file::ascii_output_file()
+{
+}
+
+/* suppress_output_file */
+
+suppress_output_file::suppress_output_file()
+{
+}
+
+void suppress_output_file::really_print_line(hunits, vunits, node *, vunits, vunits, hunits)
+{
+}
+
+void suppress_output_file::really_begin_page(int, vunits)
+{
+}
+
+void suppress_output_file::really_transparent_char(unsigned char)
+{
+}
+
+/* glyphs, ligatures, kerns, discretionary breaks */
+
+class charinfo_node : public node {
+protected:
+  charinfo *ci;
+public:
+  charinfo_node(charinfo *, node * = 0);
+  int ends_sentence();
+  int overlaps_vertically();
+  int overlaps_horizontally();
+};
+
+charinfo_node::charinfo_node(charinfo *c, node *x)
+: node(x), ci(c)
+{
+}
+
+int charinfo_node::ends_sentence()
+{
+  if (ci->ends_sentence())
+    return 1;
+  else if (ci->transparent())
+    return 2;
+  else
+    return 0;
+}
+
+int charinfo_node::overlaps_horizontally()
+{
+  return ci->overlaps_horizontally();
+}
+
+int charinfo_node::overlaps_vertically()
+{
+  return ci->overlaps_vertically();
+}
+
+class glyph_node : public charinfo_node {
+  static glyph_node *free_list;
+protected:
+  tfont *tf;
+  color *gcol;
+  color *fcol;		/* this is needed for grotty */
+#ifdef STORE_WIDTH
+  hunits wid;
+  glyph_node(charinfo *, tfont *, color *, color *, hunits, node * = 0);
+#endif
+public:
+  void *operator new(size_t);
+  void operator delete(void *);
+  glyph_node(charinfo *, tfont *, color *, color *, node * = 0);
+  ~glyph_node() {}
+  node *copy();
+  node *merge_glyph_node(glyph_node *);
+  node *merge_self(node *);
+  hunits width();
+  node *last_char_node();
+  units size();
+  void vertical_extent(vunits *, vunits *);
+  hunits subscript_correction();
+  hunits italic_correction();
+  hunits left_italic_correction();
+  hunits skew();
+  hyphenation_type get_hyphenation_type();
+  tfont *get_tfont();
+  color *get_glyph_color();
+  color *get_fill_color();
+  void tprint(troff_output_file *);
+  void zero_width_tprint(troff_output_file *);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  node *add_self(node *, hyphen_list **);
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  int character_type();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+glyph_node *glyph_node::free_list = 0;
+
+class ligature_node : public glyph_node {
+  node *n1;
+  node *n2;
+#ifdef STORE_WIDTH
+  ligature_node(charinfo *, tfont *, color *, color *, hunits,
+		node *, node *, node * = 0);
+#endif
+public:
+  void *operator new(size_t);
+  void operator delete(void *);
+  ligature_node(charinfo *, tfont *, color *, color *,
+		node *, node *, node * = 0);
+  ~ligature_node();
+  node *copy();
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+class kern_pair_node : public node {
+  hunits amount;
+  node *n1;
+  node *n2;
+public:
+  kern_pair_node(hunits n, node *first, node *second, node *x = 0);
+  ~kern_pair_node();
+  node *copy();
+  node *merge_glyph_node(glyph_node *);
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  node *add_discretionary_hyphen();
+  hunits width();
+  node *last_char_node();
+  hunits italic_correction();
+  hunits subscript_correction();
+  void tprint(troff_output_file *);
+  hyphenation_type get_hyphenation_type();
+  int ends_sentence();
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  int same(node *);
+  const char *type();
+  int force_tprint();
+  void vertical_extent(vunits *, vunits *);
+};
+
+class dbreak_node : public node {
+  node *none;
+  node *pre;
+  node *post;
+public:
+  dbreak_node(node *n, node *p, node *x = 0);
+  ~dbreak_node();
+  node *copy();
+  node *merge_glyph_node(glyph_node *);
+  node *add_discretionary_hyphen();
+  hunits width();
+  node *last_char_node();
+  hunits italic_correction();
+  hunits subscript_correction();
+  void tprint(troff_output_file *);
+  breakpoint *get_breakpoints(hunits width, int ns, breakpoint *rest = 0,
+			      int is_inner = 0);
+  int nbreaks();
+  int ends_sentence();
+  void split(int, node **, node **);
+  hyphenation_type get_hyphenation_type();
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+void *glyph_node::operator new(size_t n)
+{
+  assert(n == sizeof(glyph_node));
+  if (!free_list) {
+    const int BLOCK = 1024;
+    free_list = (glyph_node *)new char[sizeof(glyph_node)*BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK-1].next = 0;
+  }
+  glyph_node *p = free_list;
+  free_list = (glyph_node *)(free_list->next);
+  p->next = 0;
+  return p;
+}
+
+void *ligature_node::operator new(size_t n)
+{
+  return new char[n];
+}
+
+void glyph_node::operator delete(void *p)
+{
+  if (p) {
+    ((glyph_node *)p)->next = free_list;
+    free_list = (glyph_node *)p;
+  }
+}
+
+void ligature_node::operator delete(void *p)
+{
+  delete[] (char *)p;
+}
+
+glyph_node::glyph_node(charinfo *c, tfont *t, color *gc, color *fc, node *x)
+: charinfo_node(c, x), tf(t), gcol(gc), fcol(fc)
+{
+#ifdef STORE_WIDTH
+  wid = tf->get_width(ci);
+#endif
+}
+
+#ifdef STORE_WIDTH
+glyph_node::glyph_node(charinfo *c, tfont *t,
+		       color *gc, color *fc, hunits w, node *x)
+: charinfo_node(c, x), tf(t), gcol(gc), fcol(fc), wid(w)
+{
+}
+#endif
+
+node *glyph_node::copy()
+{
+#ifdef STORE_WIDTH
+  return new glyph_node(ci, tf, gcol, fcol, wid);
+#else
+  return new glyph_node(ci, tf, gcol, fcol);
+#endif
+}
+
+node *glyph_node::merge_self(node *nd)
+{
+  return nd->merge_glyph_node(this);
+}
+
+int glyph_node::character_type()
+{
+  return tf->get_character_type(ci);
+}
+
+node *glyph_node::add_self(node *n, hyphen_list **p)
+{
+  assert(ci->get_hyphenation_code() == (*p)->hyphenation_code);
+  next = 0;
+  node *nn;
+  if (n == 0 || (nn = n->merge_glyph_node(this)) == 0) {
+    next = n;
+    nn = this;
+  }
+  if ((*p)->hyphen)
+    nn = nn->add_discretionary_hyphen();
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return nn;
+}
+
+units glyph_node::size()
+{
+  return tf->get_size().to_units();
+}
+
+hyphen_list *glyph_node::get_hyphen_list(hyphen_list *tail, int *count)
+{
+  (*count)++;
+  return new hyphen_list(ci->get_hyphenation_code(), tail);
+}
+
+tfont *node::get_tfont()
+{
+  return 0;
+}
+
+tfont *glyph_node::get_tfont()
+{
+  return tf;
+}
+
+color *node::get_glyph_color()
+{
+  return 0;
+}
+
+color *glyph_node::get_glyph_color()
+{
+  return gcol;
+}
+
+color *node::get_fill_color()
+{
+  return 0;
+}
+
+color *glyph_node::get_fill_color()
+{
+  return fcol;
+}
+
+node *node::merge_glyph_node(glyph_node *)
+{
+  return 0;
+}
+
+node *glyph_node::merge_glyph_node(glyph_node *gn)
+{
+  if (tf == gn->tf && gcol == gn->gcol && fcol == gn->fcol) {
+    charinfo *lig;
+    if ((lig = tf->get_lig(ci, gn->ci)) != 0) {
+      node *next1 = next;
+      next = 0;
+      return new ligature_node(lig, tf, gcol, fcol, this, gn, next1);
+    }
+    hunits kern;
+    if (tf->get_kern(ci, gn->ci, &kern)) {
+      node *next1 = next;
+      next = 0;
+      return new kern_pair_node(kern, this, gn, next1);
+    }
+  }
+  return 0;
+}
+
+#ifdef STORE_WIDTH
+inline
+#endif
+hunits glyph_node::width()
+{
+#ifdef STORE_WIDTH
+  return wid;
+#else
+  return tf->get_width(ci);
+#endif
+}
+
+node *glyph_node::last_char_node()
+{
+  return this;
+}
+
+void glyph_node::vertical_extent(vunits *min, vunits *max)
+{
+  *min = -tf->get_char_height(ci);
+  *max = tf->get_char_depth(ci);
+}
+
+hunits glyph_node::skew()
+{
+  return tf->get_char_skew(ci);
+}
+
+hunits glyph_node::subscript_correction()
+{
+  return tf->get_subscript_correction(ci);
+}
+
+hunits glyph_node::italic_correction()
+{
+  return tf->get_italic_correction(ci);
+}
+
+hunits glyph_node::left_italic_correction()
+{
+  return tf->get_left_italic_correction(ci);
+}
+
+hyphenation_type glyph_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+void glyph_node::ascii_print(ascii_output_file *ascii)
+{
+  unsigned char c = ci->get_ascii_code();
+  if (c != 0)
+    ascii->outc(c);
+  else
+    ascii->outs(ci->nm.contents());
+}
+
+ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc,
+			     node *gn1, node *gn2, node *x)
+: glyph_node(c, t, gc, fc, x), n1(gn1), n2(gn2)
+{
+}
+
+#ifdef STORE_WIDTH
+ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc,
+			     hunits w, node *gn1, node *gn2, node *x)
+: glyph_node(c, t, gc, fc, w, x), n1(gn1), n2(gn2)
+{
+}
+#endif
+
+ligature_node::~ligature_node()
+{
+  delete n1;
+  delete n2;
+}
+
+node *ligature_node::copy()
+{
+#ifdef STORE_WIDTH
+  return new ligature_node(ci, tf, gcol, fcol, wid, n1->copy(), n2->copy());
+#else
+  return new ligature_node(ci, tf, gcol, fcol, n1->copy(), n2->copy());
+#endif
+}
+
+void ligature_node::ascii_print(ascii_output_file *ascii)
+{
+  n1->ascii_print(ascii);
+  n2->ascii_print(ascii);
+}
+
+hyphen_list *ligature_node::get_hyphen_list(hyphen_list *tail, int *count)
+{
+  hyphen_list *hl = n2->get_hyphen_list(tail, count);
+  return n1->get_hyphen_list(hl, count);
+}
+
+node *ligature_node::add_self(node *n, hyphen_list **p)
+{
+  n = n1->add_self(n, p);
+  n = n2->add_self(n, p);
+  n1 = n2 = 0;
+  delete this;
+  return n;
+}
+
+kern_pair_node::kern_pair_node(hunits n, node *first, node *second, node *x)
+: node(x), amount(n), n1(first), n2(second)
+{
+}
+
+dbreak_node::dbreak_node(node *n, node *p, node *x)
+: node(x), none(n), pre(p), post(0)
+{
+}
+
+node *dbreak_node::merge_glyph_node(glyph_node *gn)
+{
+  glyph_node *gn2 = (glyph_node *)gn->copy();
+  node *new_none = none ? none->merge_glyph_node(gn) : 0;
+  node *new_post = post ? post->merge_glyph_node(gn2) : 0;
+  if (new_none == 0 && new_post == 0) {
+    delete gn2;
+    return 0;
+  }
+  if (new_none != 0)
+    none = new_none;
+  else {
+    gn->next = none;
+    none = gn;
+  }
+  if (new_post != 0)
+    post = new_post;
+  else {
+    gn2->next = post;
+    post = gn2;
+  }
+  return this;
+}
+
+node *kern_pair_node::merge_glyph_node(glyph_node *gn)
+{
+  node *nd = n2->merge_glyph_node(gn);
+  if (nd == 0)
+    return 0;
+  n2 = nd;
+  nd = n2->merge_self(n1);
+  if (nd) {
+    nd->next = next;
+    n1 = 0;
+    n2 = 0;
+    delete this;
+    return nd;
+  }
+  return this;
+}
+
+hunits kern_pair_node::italic_correction()
+{
+  return n2->italic_correction();
+}
+
+hunits kern_pair_node::subscript_correction()
+{
+  return n2->subscript_correction();
+}
+
+void kern_pair_node::vertical_extent(vunits *min, vunits *max)
+{
+  n1->vertical_extent(min, max);
+  vunits min2, max2;
+  n2->vertical_extent(&min2, &max2);
+  if (min2 < *min)
+    *min = min2;
+  if (max2 > *max)
+    *max = max2;
+}
+
+node *kern_pair_node::add_discretionary_hyphen()
+{
+  tfont *tf = n2->get_tfont();
+  if (tf) {
+    if (tf->contains(soft_hyphen_char)) {
+      color *gcol = n2->get_glyph_color();
+      color *fcol = n2->get_fill_color();
+      node *next1 = next;
+      next = 0;
+      node *n = copy();
+      glyph_node *gn = new glyph_node(soft_hyphen_char, tf, gcol, fcol);
+      node *nn = n->merge_glyph_node(gn);
+      if (nn == 0) {
+	gn->next = n;
+	nn = gn;
+      }
+      return new dbreak_node(this, nn, next1);
+    }
+  }
+  return this;
+}
+
+kern_pair_node::~kern_pair_node()
+{
+  if (n1 != 0)
+    delete n1;
+  if (n2 != 0)
+    delete n2;
+}
+
+dbreak_node::~dbreak_node()
+{
+  delete_node_list(pre);
+  delete_node_list(post);
+  delete_node_list(none);
+}
+
+node *kern_pair_node::copy()
+{
+  return new kern_pair_node(amount, n1->copy(), n2->copy());
+}
+
+node *copy_node_list(node *n)
+{
+  node *p = 0;
+  while (n != 0) {
+    node *nn = n->copy();
+    nn->next = p;
+    p = nn;
+    n = n->next;
+  }
+  while (p != 0) {
+    node *pp = p->next;
+    p->next = n;
+    n = p;
+    p = pp;
+  }
+  return n;
+}
+
+void delete_node_list(node *n)
+{
+  while (n != 0) {
+    node *tem = n;
+    n = n->next;
+    delete tem;
+  }
+}
+
+node *dbreak_node::copy()
+{
+  dbreak_node *p = new dbreak_node(copy_node_list(none), copy_node_list(pre));
+  p->post = copy_node_list(post);
+  return p;
+}
+
+hyphen_list *node::get_hyphen_list(hyphen_list *tail, int *)
+{
+  return tail;
+}
+
+hyphen_list *kern_pair_node::get_hyphen_list(hyphen_list *tail, int *count)
+{
+  hyphen_list *hl = n2->get_hyphen_list(tail, count);
+  return n1->get_hyphen_list(hl, count);
+}
+
+class hyphen_inhibitor_node : public node {
+public:
+  hyphen_inhibitor_node(node *nd = 0);
+  node *copy();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+  hyphenation_type get_hyphenation_type();
+};
+
+hyphen_inhibitor_node::hyphen_inhibitor_node(node *nd) : node(nd)
+{
+}
+
+node *hyphen_inhibitor_node::copy()
+{
+  return new hyphen_inhibitor_node;
+}
+
+int hyphen_inhibitor_node::same(node *)
+{
+  return 1;
+}
+
+const char *hyphen_inhibitor_node::type()
+{
+  return "hyphen_inhibitor_node";
+}
+
+int hyphen_inhibitor_node::force_tprint()
+{
+  return 0;
+}
+
+hyphenation_type hyphen_inhibitor_node::get_hyphenation_type()
+{
+  return HYPHEN_INHIBIT;
+}
+
+/* add_discretionary_hyphen methods */
+
+node *dbreak_node::add_discretionary_hyphen()
+{
+  if (post)
+    post = post->add_discretionary_hyphen();
+  if (none)
+    none = none->add_discretionary_hyphen();
+  return this;
+}
+
+node *node::add_discretionary_hyphen()
+{
+  tfont *tf = get_tfont();
+  if (!tf)
+    return new hyphen_inhibitor_node(this);
+  if (tf->contains(soft_hyphen_char)) {
+    color *gcol = get_glyph_color();
+    color *fcol = get_fill_color();
+    node *next1 = next;
+    next = 0;
+    node *n = copy();
+    glyph_node *gn = new glyph_node(soft_hyphen_char, tf, gcol, fcol);
+    node *n1 = n->merge_glyph_node(gn);
+    if (n1 == 0) {
+      gn->next = n;
+      n1 = gn;
+    }
+    return new dbreak_node(this, n1, next1);
+  }
+  return this;
+}
+
+node *node::merge_self(node *)
+{
+  return 0;
+}
+
+node *node::add_self(node *n, hyphen_list ** /*p*/)
+{
+  next = n;
+  return this;
+}
+
+node *kern_pair_node::add_self(node *n, hyphen_list **p)
+{
+  n = n1->add_self(n, p);
+  n = n2->add_self(n, p);
+  n1 = n2 = 0;
+  delete this;
+  return n;
+}
+
+hunits node::width()
+{
+  return H0;
+}
+
+node *node::last_char_node()
+{
+  return 0;
+}
+
+int node::force_tprint()
+{
+  return 0;
+}
+
+hunits hmotion_node::width()
+{
+  return n;
+}
+
+units node::size()
+{
+  return points_to_units(10);
+}
+
+hunits kern_pair_node::width()
+{
+  return n1->width() + n2->width() + amount;
+}
+
+node *kern_pair_node::last_char_node()
+{
+  node *nd = n2->last_char_node();
+  if (nd)
+    return nd;
+  return n1->last_char_node();
+}
+
+hunits dbreak_node::width()
+{
+  hunits x = H0;
+  for (node *n = none; n != 0; n = n->next)
+    x += n->width();
+  return x;
+}
+
+node *dbreak_node::last_char_node()
+{
+  for (node *n = none; n; n = n->next) {
+    node *last = n->last_char_node();
+    if (last)
+      return last;
+  }
+  return 0;
+}
+
+hunits dbreak_node::italic_correction()
+{
+  return none ? none->italic_correction() : H0;
+}
+
+hunits dbreak_node::subscript_correction()
+{
+  return none ? none->subscript_correction() : H0;
+}
+
+class italic_corrected_node : public node {
+  node *n;
+  hunits x;
+public:
+  italic_corrected_node(node *, hunits, node * = 0);
+  ~italic_corrected_node();
+  node *copy();
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  hunits width();
+  node *last_char_node();
+  void vertical_extent(vunits *, vunits *);
+  int ends_sentence();
+  int overlaps_horizontally();
+  int overlaps_vertically();
+  int same(node *);
+  hyphenation_type get_hyphenation_type();
+  tfont *get_tfont();
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  int character_type();
+  void tprint(troff_output_file *);
+  hunits subscript_correction();
+  hunits skew();
+  node *add_self(node *, hyphen_list **);
+  const char *type();
+  int force_tprint();
+};
+
+node *node::add_italic_correction(hunits *width)
+{
+  hunits ic = italic_correction();
+  if (ic.is_zero())
+    return this;
+  else {
+    node *next1 = next;
+    next = 0;
+    *width += ic;
+    return new italic_corrected_node(this, ic, next1);
+  }
+}
+
+italic_corrected_node::italic_corrected_node(node *nn, hunits xx, node *p)
+: node(p), n(nn), x(xx)
+{
+  assert(n != 0);
+}
+
+italic_corrected_node::~italic_corrected_node()
+{
+  delete n;
+}
+
+node *italic_corrected_node::copy()
+{
+  return new italic_corrected_node(n->copy(), x);
+}
+
+hunits italic_corrected_node::width()
+{
+  return n->width() + x;
+}
+
+void italic_corrected_node::vertical_extent(vunits *min, vunits *max)
+{
+  n->vertical_extent(min, max);
+}
+
+void italic_corrected_node::tprint(troff_output_file *out)
+{
+  n->tprint(out);
+  out->right(x);
+}
+
+hunits italic_corrected_node::skew()
+{
+  return n->skew() - x/2;
+}
+
+hunits italic_corrected_node::subscript_correction()
+{
+  return n->subscript_correction() - x;
+}
+
+void italic_corrected_node::ascii_print(ascii_output_file *out)
+{
+  n->ascii_print(out);
+}
+
+int italic_corrected_node::ends_sentence()
+{
+  return n->ends_sentence();
+}
+
+int italic_corrected_node::overlaps_horizontally()
+{
+  return n->overlaps_horizontally();
+}
+
+int italic_corrected_node::overlaps_vertically()
+{
+  return n->overlaps_vertically();
+}
+
+node *italic_corrected_node::last_char_node()
+{
+  return n->last_char_node();
+}
+
+tfont *italic_corrected_node::get_tfont()
+{
+  return n->get_tfont();
+}
+
+hyphenation_type italic_corrected_node::get_hyphenation_type()
+{
+  return n->get_hyphenation_type();
+}
+
+node *italic_corrected_node::add_self(node *nd, hyphen_list **p)
+{
+  nd = n->add_self(nd, p);
+  hunits not_interested;
+  nd = nd->add_italic_correction(&not_interested);
+  n = 0;
+  delete this;
+  return nd;
+}
+
+hyphen_list *italic_corrected_node::get_hyphen_list(hyphen_list *tail,
+						    int *count)
+{
+  return n->get_hyphen_list(tail, count);
+}
+
+int italic_corrected_node::character_type()
+{
+  return n->character_type();
+}
+
+class break_char_node : public node {
+  node *ch;
+  char break_code;
+  color *col;
+public:
+  break_char_node(node *, int, color *, node * = 0);
+  ~break_char_node();
+  node *copy();
+  hunits width();
+  vunits vertical_width();
+  node *last_char_node();
+  int character_type();
+  int ends_sentence();
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  void tprint(troff_output_file *);
+  void zero_width_tprint(troff_output_file *);
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  hyphenation_type get_hyphenation_type();
+  int overlaps_vertically();
+  int overlaps_horizontally();
+  units size();
+  tfont *get_tfont();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+};
+
+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()
+{
+  delete ch;
+}
+
+node *break_char_node::copy()
+{
+  return new break_char_node(ch->copy(), break_code, col);
+}
+
+hunits break_char_node::width()
+{
+  return ch->width();
+}
+
+vunits break_char_node::vertical_width()
+{
+  return ch->vertical_width();
+}
+
+node *break_char_node::last_char_node()
+{
+  return ch->last_char_node();
+}
+
+int break_char_node::character_type()
+{
+  return ch->character_type();
+}
+
+int break_char_node::ends_sentence()
+{
+  return ch->ends_sentence();
+}
+
+node *break_char_node::add_self(node *n, hyphen_list **p)
+{
+  assert((*p)->hyphenation_code == 0);
+  if ((*p)->breakable && (break_code & 1)) {
+    n = new space_node(H0, col, n);
+    n->freeze_space();
+  }
+  next = n;
+  n = this;
+  if ((*p)->breakable && (break_code & 2)) {
+    n = new space_node(H0, col, n);
+    n->freeze_space();
+  }
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return n;
+}
+
+hyphen_list *break_char_node::get_hyphen_list(hyphen_list *tail, int *)
+{
+  return new hyphen_list(0, tail);
+}
+
+hyphenation_type break_char_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+void break_char_node::ascii_print(ascii_output_file *ascii)
+{
+  ch->ascii_print(ascii);
+}
+
+int break_char_node::overlaps_vertically()
+{
+  return ch->overlaps_vertically();
+}
+
+int break_char_node::overlaps_horizontally()
+{
+  return ch->overlaps_horizontally();
+}
+
+units break_char_node::size()
+{
+  return ch->size();
+}
+
+tfont *break_char_node::get_tfont()
+{
+  return ch->get_tfont();
+}
+
+node *extra_size_node::copy()
+{
+  return new extra_size_node(n);
+}
+
+node *vertical_size_node::copy()
+{
+  return new vertical_size_node(n);
+}
+
+node *hmotion_node::copy()
+{
+  return new hmotion_node(n, was_tab, unformat, col);
+}
+
+node *space_char_hmotion_node::copy()
+{
+  return new space_char_hmotion_node(n, col);
+}
+
+node *vmotion_node::copy()
+{
+  return new vmotion_node(n, col);
+}
+
+node *dummy_node::copy()
+{
+  return new dummy_node;
+}
+
+node *transparent_dummy_node::copy()
+{
+  return new transparent_dummy_node;
+}
+
+hline_node::~hline_node()
+{
+  if (n)
+    delete n;
+}
+
+node *hline_node::copy()
+{
+  return new hline_node(x, n ? n->copy() : 0);
+}
+
+hunits hline_node::width()
+{
+  return x < H0 ? H0 : x;
+}
+
+vline_node::~vline_node()
+{
+  if (n)
+    delete n;
+}
+
+node *vline_node::copy()
+{
+  return new vline_node(x, n ? n->copy() : 0);
+}
+
+hunits vline_node::width()
+{
+  return n == 0 ? H0 : n->width();
+}
+
+zero_width_node::zero_width_node(node *nd) : n(nd)
+{
+}
+
+zero_width_node::~zero_width_node()
+{
+  delete_node_list(n);
+}
+
+node *zero_width_node::copy()
+{
+  return new zero_width_node(copy_node_list(n));
+}
+
+int node_list_character_type(node *p)
+{
+  int t = 0;
+  for (; p; p = p->next)
+    t |= p->character_type();
+  return t;
+}
+
+int zero_width_node::character_type()
+{
+  return node_list_character_type(n);
+}
+
+void node_list_vertical_extent(node *p, vunits *min, vunits *max)
+{
+  *min = V0;
+  *max = V0;
+  vunits cur_vpos = V0;
+  vunits v1, v2;
+  for (; p; p = p->next) {
+    p->vertical_extent(&v1, &v2);
+    v1 += cur_vpos;
+    if (v1 < *min)
+      *min = v1;
+    v2 += cur_vpos;
+    if (v2 > *max)
+      *max = v2;
+    cur_vpos += p->vertical_width();
+  }
+}
+
+void zero_width_node::vertical_extent(vunits *min, vunits *max)
+{
+  node_list_vertical_extent(n, min, max);
+}
+
+overstrike_node::overstrike_node() : list(0), max_width(H0)
+{
+}
+
+overstrike_node::~overstrike_node()
+{
+  delete_node_list(list);
+}
+
+node *overstrike_node::copy()
+{
+  overstrike_node *on = new overstrike_node;
+  for (node *tem = list; tem; tem = tem->next)
+    on->overstrike(tem->copy());
+  return on;
+}
+
+void overstrike_node::overstrike(node *n)
+{
+  if (n == 0)
+    return;
+  hunits w = n->width();
+  if (w > max_width)
+    max_width = w;
+  node **p;
+  for (p = &list; *p; p = &(*p)->next)
+    ;
+  n->next = 0;
+  *p = n;
+}
+
+hunits overstrike_node::width()
+{
+  return max_width;
+}
+
+bracket_node::bracket_node() : list(0), max_width(H0)
+{
+}
+
+bracket_node::~bracket_node()
+{
+  delete_node_list(list);
+}
+
+node *bracket_node::copy()
+{
+  bracket_node *on = new bracket_node;
+  node *last = 0;
+  node *tem;
+  if (list)
+    list->last = 0;
+  for (tem = list; tem; tem = tem->next) {
+    if (tem->next)
+      tem->next->last = tem;
+    last = tem;
+  }
+  for (tem = last; tem; tem = tem->last)
+    on->bracket(tem->copy());
+  return on;
+}
+
+void bracket_node::bracket(node *n)
+{
+  if (n == 0)
+    return;
+  hunits w = n->width();
+  if (w > max_width)
+    max_width = w;
+  n->next = list;
+  list = n;
+}
+
+hunits bracket_node::width()
+{
+  return max_width;
+}
+
+int node::nspaces()
+{
+  return 0;
+}
+
+int node::merge_space(hunits, hunits, hunits)
+{
+  return 0;
+}
+
+#if 0
+space_node *space_node::free_list = 0;
+
+void *space_node::operator new(size_t n)
+{
+  assert(n == sizeof(space_node));
+  if (!free_list) {
+    free_list = (space_node *)new char[sizeof(space_node)*BLOCK];
+    for (int i = 0; i < BLOCK - 1; i++)
+      free_list[i].next = free_list + i + 1;
+    free_list[BLOCK-1].next = 0;
+  }
+  space_node *p = free_list;
+  free_list = (space_node *)(free_list->next);
+  p->next = 0;
+  return p;
+}
+
+inline void space_node::operator delete(void *p)
+{
+  if (p) {
+    ((space_node *)p)->next = free_list;
+    free_list = (space_node *)p;
+  }
+}
+#endif
+
+space_node::space_node(hunits nn, color *c, node *p)
+: node(p), n(nn), set(0), was_escape_colon(0), col(c)
+{
+}
+
+space_node::space_node(hunits nn, int s, int flag, color *c, node *p)
+: node(p), n(nn), set(s), was_escape_colon(flag), col(c)
+{
+}
+
+#if 0
+space_node::~space_node()
+{
+}
+#endif
+
+node *space_node::copy()
+{
+  return new space_node(n, set, was_escape_colon, col);
+}
+
+int space_node::force_tprint()
+{
+  return 0;
+}
+
+int space_node::nspaces()
+{
+  return set ? 0 : 1;
+}
+
+int space_node::merge_space(hunits h, hunits, hunits)
+{
+  n += h;
+  return 1;
+}
+
+hunits space_node::width()
+{
+  return n;
+}
+
+void node::spread_space(int*, hunits*)
+{
+}
+
+void space_node::spread_space(int *nspaces, hunits *desired_space)
+{
+  if (!set) {
+    assert(*nspaces > 0);
+    if (*nspaces == 1) {
+      n += *desired_space;
+      *desired_space = H0;
+    }
+    else {
+      hunits extra = *desired_space / *nspaces;
+      *desired_space -= extra;
+      n += extra;
+    }
+    *nspaces -= 1;
+    set = 1;
+  }
+}
+
+void node::freeze_space()
+{
+}
+
+void space_node::freeze_space()
+{
+  set = 1;
+}
+
+void node::is_escape_colon()
+{
+}
+
+void space_node::is_escape_colon()
+{
+  was_escape_colon = 1;
+}
+
+diverted_space_node::diverted_space_node(vunits d, node *p)
+: node(p), n(d)
+{
+}
+
+node *diverted_space_node::copy()
+{
+  return new diverted_space_node(n);
+}
+
+diverted_copy_file_node::diverted_copy_file_node(symbol s, node *p)
+: node(p), filename(s)
+{
+}
+
+node *diverted_copy_file_node::copy()
+{
+  return new diverted_copy_file_node(filename);
+}
+
+int node::ends_sentence()
+{
+  return 0;
+}
+
+int kern_pair_node::ends_sentence()
+{
+  switch (n2->ends_sentence()) {
+  case 0:
+    return 0;
+  case 1:
+    return 1;
+  case 2:
+    break;
+  default:
+    assert(0);
+  }
+  return n1->ends_sentence();
+}
+
+int node_list_ends_sentence(node *n)
+{
+  for (; n != 0; n = n->next)
+    switch (n->ends_sentence()) {
+    case 0:
+      return 0;
+    case 1:
+      return 1;
+    case 2:
+      break;
+    default:
+      assert(0);
+    }
+  return 2;
+}
+
+int dbreak_node::ends_sentence()
+{
+  return node_list_ends_sentence(none);
+}
+
+int node::overlaps_horizontally()
+{
+  return 0;
+}
+
+int node::overlaps_vertically()
+{
+  return 0;
+}
+
+int node::discardable()
+{
+  return 0;
+}
+
+int space_node::discardable()
+{
+  return set ? 0 : 1;
+}
+
+vunits node::vertical_width()
+{
+  return V0;
+}
+
+vunits vline_node::vertical_width()
+{
+  return x;
+}
+
+vunits vmotion_node::vertical_width()
+{
+  return n;
+}
+
+int node::set_unformat_flag()
+{
+  return 1;
+}
+
+int node::character_type()
+{
+  return 0;
+}
+
+hunits node::subscript_correction()
+{
+  return H0;
+}
+
+hunits node::italic_correction()
+{
+  return H0;
+}
+
+hunits node::left_italic_correction()
+{
+  return H0;
+}
+
+hunits node::skew()
+{
+  return H0;
+}
+
+/* vertical_extent methods */
+
+void node::vertical_extent(vunits *min, vunits *max)
+{
+  vunits v = vertical_width();
+  if (v < V0) {
+    *min = v;
+    *max = V0;
+  }
+  else {
+    *max = v;
+    *min = V0;
+  }
+}
+
+void vline_node::vertical_extent(vunits *min, vunits *max)
+{
+  if (n == 0)
+    node::vertical_extent(min, max);
+  else {
+    vunits cmin, cmax;
+    n->vertical_extent(&cmin, &cmax);
+    vunits h = n->size();
+    if (x < V0) {
+      if (-x < h) {
+	*min = x;
+	*max = V0;
+      }
+      else {
+	// we print the first character and then move up, so
+	*max = cmax;
+	// we print the last character and then move up h
+	*min = cmin + h;
+	if (*min > V0)
+	  *min = V0;
+	*min += x;
+      }
+    }
+    else {
+      if (x < h) {
+	*max = x;
+	*min = V0;
+      }
+      else {
+	// we move down by h and then print the first character, so
+	*min = cmin + h;
+	if (*min > V0)
+	  *min = V0;
+	*max = x + cmax;
+      }
+    }
+  }
+}
+
+/* ascii_print methods */
+
+static void ascii_print_reverse_node_list(ascii_output_file *ascii, node *n)
+{
+  if (n == 0)
+    return;
+  ascii_print_reverse_node_list(ascii, n->next);
+  n->ascii_print(ascii);
+}
+
+void dbreak_node::ascii_print(ascii_output_file *ascii)
+{
+  ascii_print_reverse_node_list(ascii, none);
+}
+
+void kern_pair_node::ascii_print(ascii_output_file *ascii)
+{
+  n1->ascii_print(ascii);
+  n2->ascii_print(ascii);
+}
+
+void node::ascii_print(ascii_output_file *)
+{
+}
+
+void space_node::ascii_print(ascii_output_file *ascii)
+{
+  if (!n.is_zero())
+    ascii->outc(' ');
+}
+
+void hmotion_node::ascii_print(ascii_output_file *ascii)
+{
+  // this is pretty arbitrary
+  if (n >= points_to_units(2))
+    ascii->outc(' ');
+}
+
+void space_char_hmotion_node::ascii_print(ascii_output_file *ascii)
+{
+  ascii->outc(' ');
+}
+
+/* asciify methods */
+
+void node::asciify(macro *m)
+{
+  m->append(this);
+}
+
+void glyph_node::asciify(macro *m)
+{
+  unsigned char c = ci->get_asciify_code();
+  if (c == 0)
+    c = ci->get_ascii_code();
+  if (c != 0) {
+    m->append(c);
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
+void kern_pair_node::asciify(macro *m)
+{
+  n1->asciify(m);
+  n2->asciify(m);
+  n1 = n2 = 0;
+  delete this;
+}
+
+static void asciify_reverse_node_list(macro *m, node *n)
+{
+  if (n == 0)
+    return;
+  asciify_reverse_node_list(m, n->next);
+  n->asciify(m);
+}
+
+void dbreak_node::asciify(macro *m)
+{
+  asciify_reverse_node_list(m, none);
+  none = 0;
+  delete this;
+}
+
+void ligature_node::asciify(macro *m)
+{
+  n1->asciify(m);
+  n2->asciify(m);
+  n1 = n2 = 0;
+  delete this;
+}
+
+void break_char_node::asciify(macro *m)
+{
+  ch->asciify(m);
+  ch = 0;
+  delete this;
+}
+
+void italic_corrected_node::asciify(macro *m)
+{
+  n->asciify(m);
+  n = 0;
+  delete this;
+}
+
+void left_italic_corrected_node::asciify(macro *m)
+{
+  if (n) {
+    n->asciify(m);
+    n = 0;
+  }
+  delete this;
+}
+
+void hmotion_node::asciify(macro *m)
+{
+  if (was_tab) {
+    m->append('\t');
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
+space_char_hmotion_node::space_char_hmotion_node(hunits i, color *c,
+						 node *next)
+: hmotion_node(i, c, next)
+{
+}
+
+void space_char_hmotion_node::asciify(macro *m)
+{
+  m->append(ESCAPE_SPACE);
+  delete this;
+}
+
+void space_node::asciify(macro *m)
+{
+  if (was_escape_colon) {
+    m->append(ESCAPE_COLON);
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
+void word_space_node::asciify(macro *m)
+{
+  for (width_list *w = orig_width; w; w = w->next)
+    m->append(' ');
+  delete this;
+}
+
+void unbreakable_space_node::asciify(macro *m)
+{
+  m->append(ESCAPE_TILDE);
+  delete this;
+}
+
+void line_start_node::asciify(macro *)
+{
+  delete this;
+}
+
+void vertical_size_node::asciify(macro *)
+{
+  delete this;
+}
+
+breakpoint *node::get_breakpoints(hunits /*width*/, int /*nspaces*/,
+				  breakpoint *rest, int /*is_inner*/)
+{
+  return rest;
+}
+
+int node::nbreaks()
+{
+  return 0;
+}
+
+breakpoint *space_node::get_breakpoints(hunits width, int ns,
+					breakpoint *rest, int is_inner)
+{
+  if (next->discardable())
+    return rest;
+  breakpoint *bp = new breakpoint;
+  bp->next = rest;
+  bp->width = width;
+  bp->nspaces = ns;
+  bp->hyphenated = 0;
+  if (is_inner) {
+    assert(rest != 0);
+    bp->index = rest->index + 1;
+    bp->nd = rest->nd;
+  }
+  else {
+    bp->nd = this;
+    bp->index = 0;
+  }
+  return bp;
+}
+
+int space_node::nbreaks()
+{
+  if (next->discardable())
+    return 0;
+  else
+    return 1;
+}
+
+static breakpoint *node_list_get_breakpoints(node *p, hunits *widthp,
+					     int ns, breakpoint *rest)
+{
+  if (p != 0) {
+    rest = p->get_breakpoints(*widthp,
+			      ns,
+			      node_list_get_breakpoints(p->next, widthp, ns,
+							rest),
+			      1);
+    *widthp += p->width();
+  }
+  return rest;
+}
+
+breakpoint *dbreak_node::get_breakpoints(hunits width, int ns,
+					 breakpoint *rest, int is_inner)
+{
+  breakpoint *bp = new breakpoint;
+  bp->next = rest;
+  bp->width = width;
+  for (node *tem = pre; tem != 0; tem = tem->next)
+    bp->width += tem->width();
+  bp->nspaces = ns;
+  bp->hyphenated = 1;
+  if (is_inner) {
+    assert(rest != 0);
+    bp->index = rest->index + 1;
+    bp->nd = rest->nd;
+  }
+  else {
+    bp->nd = this;
+    bp->index = 0;
+  }
+  return node_list_get_breakpoints(none, &width, ns, bp);
+}
+
+int dbreak_node::nbreaks()
+{
+  int i = 1;
+  for (node *tem = none; tem != 0; tem = tem->next)
+    i += tem->nbreaks();
+  return i;
+}
+
+void node::split(int /*where*/, node ** /*prep*/, node ** /*postp*/)
+{
+  assert(0);
+}
+
+void space_node::split(int where, node **pre, node **post)
+{
+  assert(where == 0);
+  *pre = next;
+  *post = 0;
+  delete this;
+}
+
+static void node_list_split(node *p, int *wherep, node **prep, node **postp)
+{
+  if (p == 0)
+    return;
+  int nb = p->nbreaks();
+  node_list_split(p->next, wherep, prep, postp);
+  if (*wherep < 0) {
+    p->next = *postp;
+    *postp = p;
+  }
+  else if (*wherep < nb) {
+    p->next = *prep;
+    p->split(*wherep, prep, postp);
+  }
+  else {
+    p->next = *prep;
+    *prep = p;
+  }
+  *wherep -= nb;
+}
+
+void dbreak_node::split(int where, node **prep, node **postp)
+{
+  assert(where >= 0);
+  if (where == 0) {
+    *postp = post;
+    post = 0;
+    if (pre == 0)
+      *prep = next;
+    else {
+      node *tem;
+      for (tem = pre; tem->next != 0; tem = tem->next)
+	;
+      tem->next = next;
+      *prep = pre;
+    }
+    pre = 0;
+    delete this;
+  }
+  else {
+    *prep = next;
+    where -= 1;
+    node_list_split(none, &where, prep, postp);
+    none = 0;
+    delete this;
+  }
+}
+
+hyphenation_type node::get_hyphenation_type()
+{
+  return HYPHEN_BOUNDARY;
+}
+
+hyphenation_type dbreak_node::get_hyphenation_type()
+{
+  return HYPHEN_INHIBIT;
+}
+
+hyphenation_type kern_pair_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type dummy_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type transparent_dummy_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type hmotion_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type space_char_hmotion_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type overstrike_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type space_node::get_hyphenation_type()
+{
+  if (was_escape_colon)
+    return HYPHEN_MIDDLE;
+  return HYPHEN_BOUNDARY;
+}
+
+hyphenation_type unbreakable_space_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+int node::interpret(macro *)
+{
+  return 0;
+}
+
+special_node::special_node(const macro &m, int n)
+: mac(m), no_init_string(n)
+{
+  font_size fs = curenv->get_font_size();
+  int char_height = curenv->get_char_height();
+  int char_slant = curenv->get_char_slant();
+  int fontno = env_definite_font(curenv);
+  tf = font_table[fontno]->get_tfont(fs, char_height, char_slant, fontno);
+  if (curenv->is_composite())
+    tf = tf->get_plain();
+  gcol = curenv->get_glyph_color();
+  fcol = curenv->get_fill_color();
+}
+
+special_node::special_node(const macro &m, tfont *t,
+			   color *gc, color *fc, int n)
+: mac(m), tf(t), gcol(gc), fcol(fc), no_init_string(n)
+{
+}
+
+int special_node::same(node *n)
+{
+  return mac == ((special_node *)n)->mac
+	 && tf == ((special_node *)n)->tf
+	 && gcol == ((special_node *)n)->gcol
+	 && fcol == ((special_node *)n)->fcol
+	 && no_init_string == ((special_node *)n)->no_init_string;
+}
+
+const char *special_node::type()
+{
+  return "special_node";
+}
+
+int special_node::ends_sentence()
+{
+  return 2;
+}
+
+int special_node::force_tprint()
+{
+  return 0;
+}
+
+node *special_node::copy()
+{
+  return new special_node(mac, tf, gcol, fcol, no_init_string);
+}
+
+void special_node::tprint_start(troff_output_file *out)
+{
+  out->start_special(tf, gcol, fcol, no_init_string);
+}
+
+void special_node::tprint_char(troff_output_file *out, unsigned char c)
+{
+  out->special_char(c);
+}
+
+void special_node::tprint_end(troff_output_file *out)
+{
+  out->end_special();
+}
+
+tfont *special_node::get_tfont()
+{
+  return tf;
+}
+
+/* suppress_node */
+
+suppress_node::suppress_node(int on_or_off, int issue_limits)
+: is_on(on_or_off), emit_limits(issue_limits),
+  filename(0), position(0), image_id(0)
+{
+}
+
+suppress_node::suppress_node(symbol f, char p, int id)
+: is_on(2), emit_limits(0), filename(f), position(p), image_id(id)
+{
+}
+
+suppress_node::suppress_node(int issue_limits, int on_or_off,
+			     symbol f, char p, int id)
+: is_on(on_or_off), emit_limits(issue_limits),
+  filename(f), position(p), image_id(id)
+{
+}
+
+int suppress_node::same(node *n)
+{
+  return ((is_on == ((suppress_node *)n)->is_on)
+	  && (emit_limits == ((suppress_node *)n)->emit_limits)
+	  && (filename == ((suppress_node *)n)->filename)
+	  && (position == ((suppress_node *)n)->position)
+	  && (image_id == ((suppress_node *)n)->image_id));
+}
+
+const char *suppress_node::type()
+{
+  return "suppress_node";
+}
+
+node *suppress_node::copy()
+{
+  return new suppress_node(emit_limits, is_on, filename, position, image_id);
+}
+
+int get_reg_int(const char *p)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(p);
+  units prev_value;
+  if (r && (r->get_value(&prev_value)))
+    return (int)prev_value;
+  else
+    warning(WARN_REG, "number register `%1' not defined", p);
+  return 0;
+}
+
+const char *get_reg_str(const char *p)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(p);
+  if (r)
+    return r->get_string();
+  else
+    warning(WARN_REG, "register `%1' not defined", p);
+  return 0;
+}
+
+void suppress_node::put(troff_output_file *out, const char *s)
+{
+  int i = 0;
+  while (s[i] != (char)0) {
+    out->special_char(s[i]);
+    i++;
+  }
+}
+
+/*
+ *  We need to remember the start of the image and its name.
+ */
+
+static char last_position = 0;
+static const char *last_image_filename = 0;
+static int last_image_id = 0;
+
+inline int min(int a, int b)
+{
+  return a < b ? a : b;
+}
+
+/*
+ *  tprint - if (is_on == 2)
+ *               remember current position (l, r, c, i) and filename
+ *           else
+ *               if (emit_limits)
+ *                   if (html)
+ *                      emit image tag
+ *                   else
+ *                      emit postscript bounds for image
+ *               else
+ *                  if (suppress boolean differs from current state)
+ *                      alter state
+ *                  reset registers
+ *                  record current page
+ *                  set low water mark.
+ */
+
+void suppress_node::tprint(troff_output_file *out)
+{
+  int current_page = topdiv->get_page_number();
+  // firstly check to see whether this suppress node contains
+  // an image filename & position.
+  if (is_on == 2) {
+    // remember position and filename
+    last_position = position;
+    const char *tem = last_image_filename;
+    last_image_filename = strsave(filename.contents());
+    if (tem)
+      a_delete(tem);
+    last_image_id = image_id;
+    // printf("start of image and page = %d\n", current_page);
+  }
+  else {
+    // now check whether the suppress node requires us to issue limits.
+    if (emit_limits) {
+      char name[8192];
+      // remember that the filename will contain a %d in which the
+      // last_image_id is placed
+      sprintf(name, last_image_filename, last_image_id);
+      if (is_html) {
+	switch (last_position) {
+	case 'c':
+	  out->start_special();
+	  put(out, "html-tag:.centered-image");
+	  break;
+	case 'r':
+	  out->start_special();
+	  put(out, "html-tag:.right-image");
+	  break;
+	case 'l':
+	  out->start_special();
+	  put(out, "html-tag:.left-image");
+	  break;
+	case 'i':
+	  ;
+	default:
+	  ;
+	}
+	out->end_special();
+	out->start_special();
+	put(out, "html-tag:.auto-image ");
+	put(out, name);
+	out->end_special();
+      }
+      else {
+	// postscript (or other device)
+	if (suppress_start_page > 0 && current_page != suppress_start_page)
+	  error("suppression limit registers span more than one page;\n"
+	        "image description %1 will be wrong", image_no);
+	// if (topdiv->get_page_number() != suppress_start_page)
+	//  fprintf(stderr, "end of image and topdiv page = %d   and  suppress_start_page = %d\n",
+	//	  topdiv->get_page_number(), suppress_start_page);
+
+	// remember that the filename will contain a %d in which the
+	// image_no is placed
+	fprintf(stderr,
+		"grohtml-info:page %d  %d  %d  %d  %d  %d  %s  %d  %d  %s\n",
+		topdiv->get_page_number(),
+		get_reg_int("opminx"), get_reg_int("opminy"),
+		get_reg_int("opmaxx"), get_reg_int("opmaxy"),
+		// page offset + line length
+		get_reg_int(".o") + get_reg_int(".l"),
+		name, hresolution, vresolution, get_reg_str(".F"));
+	fflush(stderr);
+      }
+    }
+    else {
+      if (is_on) {
+	out->on();
+	// lastly we reset the output registers
+	reset_output_registers();
+      }
+      else
+	out->off();
+      suppress_start_page = current_page;
+    }
+  }
+}
+
+int suppress_node::force_tprint()
+{
+  return is_on;
+}
+
+hunits suppress_node::width()
+{
+  return H0;
+}
+
+/* composite_node */
+
+class composite_node : public charinfo_node {
+  node *n;
+  tfont *tf;
+public:
+  composite_node(node *, charinfo *, tfont *, node * = 0);
+  ~composite_node();
+  node *copy();
+  hunits width();
+  node *last_char_node();
+  units size();
+  void tprint(troff_output_file *);
+  hyphenation_type get_hyphenation_type();
+  void ascii_print(ascii_output_file *);
+  void asciify(macro *);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
+  node *add_self(node *, hyphen_list **);
+  tfont *get_tfont();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+  void vertical_extent(vunits *, vunits *);
+  vunits vertical_width();
+};
+
+composite_node::composite_node(node *p, charinfo *c, tfont *t, node *x)
+: charinfo_node(c, x), n(p), tf(t)
+{
+}
+
+composite_node::~composite_node()
+{
+  delete_node_list(n);
+}
+
+node *composite_node::copy()
+{
+  return new composite_node(copy_node_list(n), ci, tf);
+}
+
+hunits composite_node::width()
+{
+  hunits x;
+  if (tf->get_constant_space(&x))
+    return x;
+  x = H0;
+  for (node *tem = n; tem; tem = tem->next)
+    x += tem->width();
+  hunits offset;
+  if (tf->get_bold(&offset))
+    x += offset;
+  x += tf->get_track_kern();
+  return x;
+}
+
+node *composite_node::last_char_node()
+{
+  return this;
+}
+
+vunits composite_node::vertical_width()
+{
+  vunits v = V0;
+  for (node *tem = n; tem; tem = tem->next)
+    v += tem->vertical_width();
+  return v;
+}
+
+units composite_node::size()
+{
+  return tf->get_size().to_units();
+}
+
+hyphenation_type composite_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+void composite_node::asciify(macro *m)
+{
+  unsigned char c = ci->get_asciify_code();
+  if (c == 0)
+    c = ci->get_ascii_code();
+  if (c != 0) {
+    m->append(c);
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
+void composite_node::ascii_print(ascii_output_file *ascii)
+{
+  unsigned char c = ci->get_ascii_code();
+  if (c != 0)
+    ascii->outc(c);
+  else
+    ascii->outs(ci->nm.contents());
+
+}
+
+hyphen_list *composite_node::get_hyphen_list(hyphen_list *tail, int *count)
+{
+  (*count)++;
+  return new hyphen_list(ci->get_hyphenation_code(), tail);
+}
+
+node *composite_node::add_self(node *nn, hyphen_list **p)
+{
+  assert(ci->get_hyphenation_code() == (*p)->hyphenation_code);
+  next = nn;
+  nn = this;
+  if ((*p)->hyphen)
+    nn = nn->add_discretionary_hyphen();
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return nn;
+}
+
+tfont *composite_node::get_tfont()
+{
+  return tf;
+}
+
+node *reverse_node_list(node *n)
+{
+  node *r = 0;
+  while (n) {
+    node *tem = n;
+    n = n->next;
+    tem->next = r;
+    r = tem;
+  }
+  return r;
+}
+
+void composite_node::vertical_extent(vunits *min, vunits *max)
+{
+  n = reverse_node_list(n);
+  node_list_vertical_extent(n, min, max);
+  n = reverse_node_list(n);
+}
+
+width_list::width_list(hunits w, hunits s)
+: width(w), sentence_width(s), next(0)
+{
+}
+
+width_list::width_list(width_list *w)
+: width(w->width), sentence_width(w->sentence_width), next(0)
+{
+}
+
+word_space_node::word_space_node(hunits d, color *c, width_list *w, node *x)
+: space_node(d, c, x), orig_width(w), unformat(0)
+{
+}
+
+word_space_node::word_space_node(hunits d, int s, color *c, width_list *w,
+				 int flag, node *x)
+: space_node(d, s, 0, c, x), orig_width(w), unformat(flag)
+{
+}
+
+word_space_node::~word_space_node()
+{
+  width_list *w = orig_width;
+  while (w != 0) {
+    width_list *tmp = w;
+    w = w->next;
+    delete tmp;
+  }
+}
+
+node *word_space_node::copy()
+{
+  assert(orig_width != 0);
+  width_list *w_old_curr = orig_width;
+  width_list *w_new_curr = new width_list(w_old_curr);
+  width_list *w_new = w_new_curr;
+  w_old_curr = w_old_curr->next;
+  while (w_old_curr != 0) {
+    w_new_curr->next = new width_list(w_old_curr);
+    w_new_curr = w_new_curr->next;
+    w_old_curr = w_old_curr->next;
+  }
+  return new word_space_node(n, set, col, w_new, unformat);
+}
+
+int word_space_node::set_unformat_flag()
+{
+  unformat = 1;
+  return 1;
+}
+
+void word_space_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  out->word_marker();
+  out->right(n);
+}
+
+int word_space_node::merge_space(hunits h, hunits sw, hunits ssw)
+{
+  n += h;
+  assert(orig_width != 0);
+  width_list *w = orig_width; 
+  for (; w->next; w = w->next)
+    ;
+  w->next = new width_list(sw, ssw);
+  return 1;
+}
+
+unbreakable_space_node::unbreakable_space_node(hunits d, color *c, node *x)
+: word_space_node(d, c, 0, x)
+{
+}
+
+unbreakable_space_node::unbreakable_space_node(hunits d, int s,
+					       color *c, node *x)
+: word_space_node(d, s, c, 0, 0, x)
+{
+}
+
+node *unbreakable_space_node::copy()
+{
+  return new unbreakable_space_node(n, set, col);
+}
+
+int unbreakable_space_node::force_tprint()
+{
+  return 0;
+}
+
+breakpoint *unbreakable_space_node::get_breakpoints(hunits, int,
+						    breakpoint *rest, int)
+{
+  return rest;
+}
+
+int unbreakable_space_node::nbreaks()
+{
+  return 0;
+}
+
+void unbreakable_space_node::split(int, node **, node **)
+{
+  assert(0);
+}
+
+int unbreakable_space_node::merge_space(hunits, hunits, hunits)
+{
+  return 0;
+}
+
+hvpair::hvpair()
+{
+}
+
+draw_node::draw_node(char c, hvpair *p, int np, font_size s,
+		     color *gc, color *fc)
+: npoints(np), sz(s), gcol(gc), fcol(fc), code(c)
+{
+  point = new hvpair[npoints];
+  for (int i = 0; i < npoints; i++)
+    point[i] = p[i];
+}
+
+int draw_node::same(node *n)
+{
+  draw_node *nd = (draw_node *)n;
+  if (code != nd->code || npoints != nd->npoints || sz != nd->sz
+      || gcol != nd->gcol || fcol != nd->fcol)
+    return 0;
+  for (int i = 0; i < npoints; i++)
+    if (point[i].h != nd->point[i].h || point[i].v != nd->point[i].v)
+      return 0;
+  return 1;
+}
+
+const char *draw_node::type()
+{
+  return "draw_node";
+}
+
+int draw_node::force_tprint()
+{
+  return 0;
+}
+
+draw_node::~draw_node()
+{
+  if (point)
+    a_delete point;
+}
+
+hunits draw_node::width()
+{
+  hunits x = H0;
+  for (int i = 0; i < npoints; i++)
+    x += point[i].h;
+  return x;
+}
+
+vunits draw_node::vertical_width()
+{
+  if (code == 'e')
+    return V0;
+  vunits x = V0;
+  for (int i = 0; i < npoints; i++)
+    x += point[i].v;
+  return x;
+}
+
+node *draw_node::copy()
+{
+  return new draw_node(code, point, npoints, sz, gcol, fcol);
+}
+
+void draw_node::tprint(troff_output_file *out)
+{
+  out->draw(code, point, npoints, sz, gcol, fcol);
+}
+
+/* tprint methods */
+
+void glyph_node::tprint(troff_output_file *out)
+{
+  tfont *ptf = tf->get_plain();
+  if (ptf == tf)
+    out->put_char_width(ci, ptf, gcol, fcol, width(), H0);
+  else {
+    hunits offset;
+    int bold = tf->get_bold(&offset);
+    hunits w = ptf->get_width(ci);
+    hunits k = H0;
+    hunits x;
+    int cs = tf->get_constant_space(&x);
+    if (cs) {
+      x -= w;
+      if (bold)
+	x -= offset;
+      hunits x2 = x/2;
+      out->right(x2);
+      k = x - x2;
+    }
+    else
+      k = tf->get_track_kern();
+    if (bold) {
+      out->put_char(ci, ptf, gcol, fcol);
+      out->right(offset);
+    }
+    out->put_char_width(ci, ptf, gcol, fcol, w, k);
+  }
+}
+
+void glyph_node::zero_width_tprint(troff_output_file *out)
+{
+  tfont *ptf = tf->get_plain();
+  hunits offset;
+  int bold = tf->get_bold(&offset);
+  hunits x;
+  int cs = tf->get_constant_space(&x);
+  if (cs) {
+    x -= ptf->get_width(ci);
+    if (bold)
+      x -= offset;
+    x = x/2;
+    out->right(x);
+  }
+  out->put_char(ci, ptf, gcol, fcol);
+  if (bold) {
+    out->right(offset);
+    out->put_char(ci, ptf, gcol, fcol);
+    out->right(-offset);
+  }
+  if (cs)
+    out->right(-x);
+}
+
+void break_char_node::tprint(troff_output_file *t)
+{
+  ch->tprint(t);
+}
+
+void break_char_node::zero_width_tprint(troff_output_file *t)
+{
+  ch->zero_width_tprint(t);
+}
+
+void hline_node::tprint(troff_output_file *out)
+{
+  if (x < H0) {
+    out->right(x);
+    x = -x;
+  }
+  if (n == 0) {
+    out->right(x);
+    return;
+  }
+  hunits w = n->width();
+  if (w <= H0) {
+    error("horizontal line drawing character must have positive width");
+    out->right(x);
+    return;
+  }
+  int i = int(x/w);
+  if (i == 0) {
+    hunits xx = x - w;
+    hunits xx2 = xx/2;
+    out->right(xx2);
+    if (out->is_on())
+      n->tprint(out);
+    out->right(xx - xx2);
+  }
+  else {
+    hunits rem = x - w*i;
+    if (rem > H0)
+      if (n->overlaps_horizontally()) {
+	if (out->is_on())
+	  n->tprint(out);
+	out->right(rem - w);
+      }
+      else
+	out->right(rem);
+    while (--i >= 0)
+      if (out->is_on())
+	n->tprint(out);
+  }
+}
+
+void vline_node::tprint(troff_output_file *out)
+{
+  if (n == 0) {
+    out->down(x);
+    return;
+  }
+  vunits h = n->size();
+  int overlaps = n->overlaps_vertically();
+  vunits y = x;
+  if (y < V0) {
+    y = -y;
+    int i = y / h;
+    vunits rem = y - i*h;
+    if (i == 0) {
+      out->right(n->width());
+      out->down(-rem);
+    }
+    else {
+      while (--i > 0) {
+	n->zero_width_tprint(out);
+	out->down(-h);
+      }
+      if (overlaps) {
+	n->zero_width_tprint(out);
+	out->down(-rem);
+	if (out->is_on())
+	  n->tprint(out);
+	out->down(-h);
+      }
+      else {
+	if (out->is_on())
+	  n->tprint(out);
+	out->down(-h - rem);
+      }
+    }
+  }
+  else {
+    int i = y / h;
+    vunits rem = y - i*h;
+    if (i == 0) {
+      out->down(rem);
+      out->right(n->width());
+    }
+    else {
+      out->down(h);
+      if (overlaps)
+	n->zero_width_tprint(out);
+      out->down(rem);
+      while (--i > 0) {
+	n->zero_width_tprint(out);
+	out->down(h);
+      }
+      if (out->is_on())
+	n->tprint(out);
+    }
+  }
+}
+
+void zero_width_node::tprint(troff_output_file *out)
+{
+  if (!n)
+    return;
+  if (!n->next) {
+    n->zero_width_tprint(out);
+    return;
+  }
+  int hpos = out->get_hpos();
+  int vpos = out->get_vpos();
+  node *tem = n;
+  while (tem) {
+    tem->tprint(out);
+    tem = tem->next;
+  }
+  out->moveto(hpos, vpos);
+}
+
+void overstrike_node::tprint(troff_output_file *out)
+{
+  hunits pos = H0;
+  for (node *tem = list; tem; tem = tem->next) {
+    hunits x = (max_width - tem->width())/2;
+    out->right(x - pos);
+    pos = x;
+    tem->zero_width_tprint(out);
+  }
+  out->right(max_width - pos);
+}
+
+void bracket_node::tprint(troff_output_file *out)
+{
+  if (list == 0)
+    return;
+  int npieces = 0;
+  node *tem;
+  for (tem = list; tem; tem = tem->next)
+    ++npieces;
+  vunits h = list->size();
+  vunits totalh = h*npieces;
+  vunits y = (totalh - h)/2;
+  out->down(y);
+  for (tem = list; tem; tem = tem->next) {
+    tem->zero_width_tprint(out);
+    out->down(-h);
+  }
+  out->right(max_width);
+  out->down(totalh - y);
+}
+
+void node::tprint(troff_output_file *)
+{
+}
+
+void node::zero_width_tprint(troff_output_file *out)
+{
+  int hpos = out->get_hpos();
+  int vpos = out->get_vpos();
+  tprint(out);
+  out->moveto(hpos, vpos);
+}
+
+void space_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  out->right(n);
+}
+
+void hmotion_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  out->right(n);
+}
+
+void space_char_hmotion_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  if (is_html) {
+    // we emit the space width as a negative glyph index
+    out->flush_tbuf();
+    out->do_motion();
+    out->put('N');
+    out->put(-n.to_units());
+    out->put('\n');
+  }
+  out->right(n);
+}
+
+void vmotion_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  out->down(n);
+}
+
+void kern_pair_node::tprint(troff_output_file *out)
+{
+  n1->tprint(out);
+  out->right(amount);
+  n2->tprint(out);
+}
+
+static void tprint_reverse_node_list(troff_output_file *out, node *n)
+{
+  if (n == 0)
+    return;
+  tprint_reverse_node_list(out, n->next);
+  n->tprint(out);
+}
+
+void dbreak_node::tprint(troff_output_file *out)
+{
+  tprint_reverse_node_list(out, none);
+}
+
+void composite_node::tprint(troff_output_file *out)
+{
+  hunits bold_offset;
+  int is_bold = tf->get_bold(&bold_offset);
+  hunits track_kern = tf->get_track_kern();
+  hunits constant_space;
+  int is_constant_spaced = tf->get_constant_space(&constant_space);
+  hunits x = H0;
+  if (is_constant_spaced) {
+    x = constant_space;
+    for (node *tem = n; tem; tem = tem->next)
+      x -= tem->width();
+    if (is_bold)
+      x -= bold_offset;
+    hunits x2 = x/2;
+    out->right(x2);
+    x -= x2;
+  }
+  if (is_bold) {
+    int hpos = out->get_hpos();
+    int vpos = out->get_vpos();
+    tprint_reverse_node_list(out, n);
+    out->moveto(hpos, vpos);
+    out->right(bold_offset);
+  }
+  tprint_reverse_node_list(out, n);
+  if (is_constant_spaced)
+    out->right(x);
+  else
+    out->right(track_kern);
+}
+
+node *make_composite_node(charinfo *s, environment *env)
+{
+  int fontno = env_definite_font(env);
+  if (fontno < 0) {
+    error("no current font");
+    return 0;
+  }
+  assert(fontno < font_table_size && font_table[fontno] != 0);
+  node *n = charinfo_to_node_list(s, env);
+  font_size fs = env->get_font_size();
+  int char_height = env->get_char_height();
+  int char_slant = env->get_char_slant();
+  tfont *tf = font_table[fontno]->get_tfont(fs, char_height, char_slant,
+					    fontno);
+  if (env->is_composite())
+    tf = tf->get_plain();
+  return new composite_node(n, s, tf);
+}
+
+node *make_glyph_node(charinfo *s, environment *env, int no_error_message = 0)
+{
+  int fontno = env_definite_font(env);
+  if (fontno < 0) {
+    error("no current font");
+    return 0;
+  }
+  assert(fontno < font_table_size && font_table[fontno] != 0);
+  int fn = fontno;
+  int found = font_table[fontno]->contains(s);
+  if (!found) {
+    macro *mac = s->get_macro();
+    if (mac && s->is_fallback())
+      return make_composite_node(s, env);
+    if (s->numbered()) {
+      if (!no_error_message)
+	warning(WARN_CHAR, "can't find numbered character %1",
+		s->get_number());
+      return 0;
+    }
+    special_font_list *sf = font_table[fontno]->sf;
+    while (sf != 0 && !found) {
+      fn = sf->n;
+      if (font_table[fn])
+	found = font_table[fn]->contains(s);
+      sf = sf->next;
+    }
+    if (!found) {
+      symbol f = font_table[fontno]->get_name();
+      string gl(f.contents());
+      gl += ' ';
+      gl += s->nm.contents();
+      gl += '\0';
+      charinfo *ci = get_charinfo(symbol(gl.contents()));
+      if (ci && ci->get_macro())
+	return make_composite_node(ci, env);
+    }
+    if (!found) {
+      sf = global_special_fonts;
+      while (sf != 0 && !found) {
+	fn = sf->n;
+	if (font_table[fn])
+	  found = font_table[fn]->contains(s);
+	sf = sf->next;
+      }
+    }
+    if (!found)
+      if (mac && s->is_special())
+	return make_composite_node(s, env);
+    if (!found) {
+      for (fn = 0; fn < font_table_size; fn++)
+	if (font_table[fn]
+	    && font_table[fn]->is_special()
+	    && font_table[fn]->contains(s)) {
+	  found = 1;
+	  break;
+	}
+    }
+    if (!found) {
+      if (!no_error_message && s->first_time_not_found()) {
+	unsigned char input_code = s->get_ascii_code();
+	if (input_code != 0) {
+	  if (csgraph(input_code))
+	    warning(WARN_CHAR, "can't find character `%1'", input_code);
+	  else
+	    warning(WARN_CHAR, "can't find character with input code %1",
+		    int(input_code));
+	}
+	else if (s->nm.contents())
+	  warning(WARN_CHAR, "can't find special character `%1'",
+		  s->nm.contents());
+      }
+      return 0;
+    }
+  }
+  font_size fs = env->get_font_size();
+  int char_height = env->get_char_height();
+  int char_slant = env->get_char_slant();
+  tfont *tf = font_table[fontno]->get_tfont(fs, char_height, char_slant, fn);
+  if (env->is_composite())
+    tf = tf->get_plain();
+  color *gcol = env->get_glyph_color();
+  color *fcol = env->get_fill_color();
+  return new glyph_node(s, tf, gcol, fcol);
+}
+
+node *make_node(charinfo *ci, environment *env)
+{
+  switch (ci->get_special_translation()) {
+  case charinfo::TRANSLATE_SPACE:
+    return new space_char_hmotion_node(env->get_space_width(),
+				       env->get_fill_color());
+  case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+    return new unbreakable_space_node(env->get_space_width(),
+				      env->get_fill_color());
+  case charinfo::TRANSLATE_DUMMY:
+    return new dummy_node;
+  case charinfo::TRANSLATE_HYPHEN_INDICATOR:
+    error("translation to \\% ignored in this context");
+    break;
+  }
+  charinfo *tem = ci->get_translation();
+  if (tem)
+    ci = tem;
+  macro *mac = ci->get_macro();
+  if (mac && ci->is_normal())
+    return make_composite_node(ci, env);
+  else
+    return make_glyph_node(ci, env);
+}
+
+int character_exists(charinfo *ci, environment *env)
+{
+  if (ci->get_special_translation() != charinfo::TRANSLATE_NONE)
+    return 1;
+  charinfo *tem = ci->get_translation();
+  if (tem)
+    ci = tem;
+  if (ci->get_macro())
+    return 1;
+  node *nd = make_glyph_node(ci, env, 1);
+  if (nd) {
+    delete nd;
+    return 1;
+  }
+  return 0;
+}
+
+node *node::add_char(charinfo *ci, environment *env,
+		     hunits *widthp, int *spacep)
+{
+  node *res;
+  switch (ci->get_special_translation()) {
+  case charinfo::TRANSLATE_SPACE:
+    res = new space_char_hmotion_node(env->get_space_width(),
+				      env->get_fill_color(), this);
+    *widthp += res->width();
+    return res;
+  case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+    res = new unbreakable_space_node(env->get_space_width(),
+				     env->get_fill_color(), this);
+    res->freeze_space();
+    *widthp += res->width();
+    *spacep += res->nspaces();
+    return res;
+  case charinfo::TRANSLATE_DUMMY:
+    return new dummy_node(this);
+  case charinfo::TRANSLATE_HYPHEN_INDICATOR:
+    return add_discretionary_hyphen();
+  }
+  charinfo *tem = ci->get_translation();
+  if (tem)
+    ci = tem;
+  macro *mac = ci->get_macro();
+  if (mac && ci->is_normal()) {
+    res = make_composite_node(ci, env);
+    if (res) {
+      res->next = this;
+      *widthp += res->width();
+    }
+    else
+      return this;
+  }
+  else {
+    node *gn = make_glyph_node(ci, env);
+    if (gn == 0)
+      return this;
+    else {
+      hunits old_width = width();
+      node *p = gn->merge_self(this);
+      if (p == 0) {
+	*widthp += gn->width();
+	gn->next = this;
+	res = gn;
+      }
+      else {
+	*widthp += p->width() - old_width;
+	res = p;
+      }
+    }
+  }
+  int break_code = 0;
+  if (ci->can_break_before())
+    break_code = 1;
+  if (ci->can_break_after())
+    break_code |= 2;
+  if (break_code) {
+    node *next1 = res->next;
+    res->next = 0;
+    res = new break_char_node(res, break_code, env->get_fill_color(), next1);
+  }
+  return res;
+}
+
+#ifdef __GNUG__
+inline
+#endif
+int same_node(node *n1, node *n2)
+{
+  if (n1 != 0) {
+    if (n2 != 0)
+      return n1->type() == n2->type() && n1->same(n2);
+    else
+      return 0;
+  }
+  else
+    return n2 == 0;
+}
+
+int same_node_list(node *n1, node *n2)
+{
+  while (n1 && n2) {
+    if (n1->type() != n2->type() || !n1->same(n2))
+      return 0;
+    n1 = n1->next;
+    n2 = n2->next;
+  }
+  return !n1 && !n2;
+}
+
+int extra_size_node::same(node *nd)
+{
+  return n == ((extra_size_node *)nd)->n;
+}
+
+const char *extra_size_node::type()
+{
+  return "extra_size_node";
+}
+
+int extra_size_node::force_tprint()
+{
+  return 0;
+}
+
+int vertical_size_node::same(node *nd)
+{
+  return n == ((vertical_size_node *)nd)->n;
+}
+
+const char *vertical_size_node::type()
+{
+  return "vertical_size_node";
+}
+
+int vertical_size_node::set_unformat_flag()
+{
+  return 0;
+}
+
+int vertical_size_node::force_tprint()
+{
+  return 0;
+}
+
+int hmotion_node::same(node *nd)
+{
+  return n == ((hmotion_node *)nd)->n
+	 && col == ((hmotion_node *)nd)->col;
+}
+
+const char *hmotion_node::type()
+{
+  return "hmotion_node";
+}
+
+int hmotion_node::set_unformat_flag()
+{
+  unformat = 1;
+  return 1;
+}
+
+int hmotion_node::force_tprint()
+{
+  return 0;
+}
+
+node *hmotion_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *hmotion_node::get_hyphen_list(hyphen_list *tail, int *)
+{
+  return new hyphen_list(0, tail);
+}
+
+int space_char_hmotion_node::same(node *nd)
+{
+  return n == ((space_char_hmotion_node *)nd)->n
+	 && col == ((space_char_hmotion_node *)nd)->col;
+}
+
+const char *space_char_hmotion_node::type()
+{
+  return "space_char_hmotion_node";
+}
+
+int space_char_hmotion_node::force_tprint()
+{
+  return 0;
+}
+
+node *space_char_hmotion_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *space_char_hmotion_node::get_hyphen_list(hyphen_list *tail,
+						      int *)
+{
+  return new hyphen_list(0, tail);
+}
+
+int vmotion_node::same(node *nd)
+{
+  return n == ((vmotion_node *)nd)->n
+	 && col == ((vmotion_node *)nd)->col;
+}
+
+const char *vmotion_node::type()
+{
+  return "vmotion_node";
+}
+
+int vmotion_node::force_tprint()
+{
+  return 0;
+}
+
+int hline_node::same(node *nd)
+{
+  return x == ((hline_node *)nd)->x && same_node(n, ((hline_node *)nd)->n);
+}
+
+const char *hline_node::type()
+{
+  return "hline_node";
+}
+
+int hline_node::force_tprint()
+{
+  return 0;
+}
+
+int vline_node::same(node *nd)
+{
+  return x == ((vline_node *)nd)->x && same_node(n, ((vline_node *)nd)->n);
+}
+
+const char *vline_node::type()
+{
+  return "vline_node";
+}
+
+int vline_node::force_tprint()
+{
+  return 0;
+}
+
+int dummy_node::same(node * /*nd*/)
+{
+  return 1;
+}
+
+const char *dummy_node::type()
+{
+  return "dummy_node";
+}
+
+int dummy_node::force_tprint()
+{
+  return 0;
+}
+
+int transparent_dummy_node::same(node * /*nd*/)
+{
+  return 1;
+}
+
+const char *transparent_dummy_node::type()
+{
+  return "transparent_dummy_node";
+}
+
+int transparent_dummy_node::force_tprint()
+{
+  return 0;
+}
+
+int transparent_dummy_node::ends_sentence()
+{
+  return 2;
+}
+
+int zero_width_node::same(node *nd)
+{
+  return same_node_list(n, ((zero_width_node *)nd)->n);
+}
+
+const char *zero_width_node::type()
+{
+  return "zero_width_node";
+}
+
+int zero_width_node::force_tprint()
+{
+  return 0;
+}
+
+int italic_corrected_node::same(node *nd)
+{
+  return (x == ((italic_corrected_node *)nd)->x
+	  && same_node(n, ((italic_corrected_node *)nd)->n));
+}
+
+const char *italic_corrected_node::type()
+{
+  return "italic_corrected_node";
+}
+
+int italic_corrected_node::force_tprint()
+{
+  return 0;
+}
+
+left_italic_corrected_node::left_italic_corrected_node(node *x)
+: node(x), n(0)
+{
+}
+
+left_italic_corrected_node::~left_italic_corrected_node()
+{
+  delete n;
+}
+
+node *left_italic_corrected_node::merge_glyph_node(glyph_node *gn)
+{
+  if (n == 0) {
+    hunits lic = gn->left_italic_correction();
+    if (!lic.is_zero()) {
+      x = lic;
+      n = gn;
+      return this;
+    }
+  }
+  else {
+    node *nd = n->merge_glyph_node(gn);
+    if (nd) {
+      n = nd;
+      x = n->left_italic_correction();
+      return this;
+    }
+  }
+  return 0;
+}
+
+node *left_italic_corrected_node::copy()
+{
+  left_italic_corrected_node *nd = new left_italic_corrected_node;
+  if (n) {
+    nd->n = n->copy();
+    nd->x = x;
+  }
+  return nd;
+}
+
+void left_italic_corrected_node::tprint(troff_output_file *out)
+{
+  if (n) {
+    out->right(x);
+    n->tprint(out);
+  }
+}
+
+const char *left_italic_corrected_node::type()
+{
+  return "left_italic_corrected_node";
+}
+
+int left_italic_corrected_node::force_tprint()
+{
+  return 0;
+}
+
+int left_italic_corrected_node::same(node *nd)
+{
+  return (x == ((left_italic_corrected_node *)nd)->x
+	  && same_node(n, ((left_italic_corrected_node *)nd)->n));
+}
+
+void left_italic_corrected_node::ascii_print(ascii_output_file *out)
+{
+  if (n)
+    n->ascii_print(out);
+}
+
+hunits left_italic_corrected_node::width()
+{
+  return n ? n->width() + x : H0;
+}
+
+void left_italic_corrected_node::vertical_extent(vunits *min, vunits *max)
+{
+  if (n)
+    n->vertical_extent(min, max);
+  else
+    node::vertical_extent(min, max);
+}
+
+hunits left_italic_corrected_node::skew()
+{
+  return n ? n->skew() + x/2 : H0;
+}
+
+hunits left_italic_corrected_node::subscript_correction()
+{
+  return n ? n->subscript_correction() : H0;
+}
+
+hunits left_italic_corrected_node::italic_correction()
+{
+  return n ? n->italic_correction() : H0;
+}
+
+int left_italic_corrected_node::ends_sentence()
+{
+  return n ? n->ends_sentence() : 0;
+}
+
+int left_italic_corrected_node::overlaps_horizontally()
+{
+  return n ? n->overlaps_horizontally() : 0;
+}
+
+int left_italic_corrected_node::overlaps_vertically()
+{
+  return n ? n->overlaps_vertically() : 0;
+}
+
+node *left_italic_corrected_node::last_char_node()
+{
+  return n ? n->last_char_node() : 0;
+}
+
+tfont *left_italic_corrected_node::get_tfont()
+{
+  return n ? n->get_tfont() : 0;
+}
+
+hyphenation_type left_italic_corrected_node::get_hyphenation_type()
+{
+  if (n)
+    return n->get_hyphenation_type();
+  else
+    return HYPHEN_MIDDLE;
+}
+
+hyphen_list *left_italic_corrected_node::get_hyphen_list(hyphen_list *tail,
+							 int *count)
+{
+  return n ? n->get_hyphen_list(tail, count) : tail;
+}
+
+node *left_italic_corrected_node::add_self(node *nd, hyphen_list **p)
+{
+  if (n) {
+    nd = new left_italic_corrected_node(nd);
+    nd = n->add_self(nd, p);
+    n = 0;
+    delete this;
+  }
+  return nd;
+}
+
+int left_italic_corrected_node::character_type()
+{
+  return n ? n->character_type() : 0;
+}
+
+int overstrike_node::same(node *nd)
+{
+  return same_node_list(list, ((overstrike_node *)nd)->list);
+}
+
+const char *overstrike_node::type()
+{
+  return "overstrike_node";
+}
+
+int overstrike_node::force_tprint()
+{
+  return 0;
+}
+
+node *overstrike_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *overstrike_node::get_hyphen_list(hyphen_list *tail, int *)
+{
+  return new hyphen_list(0, tail);
+}
+
+int bracket_node::same(node *nd)
+{
+  return same_node_list(list, ((bracket_node *)nd)->list);
+}
+
+const char *bracket_node::type()
+{
+  return "bracket_node";
+}
+
+int bracket_node::force_tprint()
+{
+  return 0;
+}
+
+int composite_node::same(node *nd)
+{
+  return ci == ((composite_node *)nd)->ci
+    && same_node_list(n, ((composite_node *)nd)->n);
+}
+
+const char *composite_node::type()
+{
+  return "composite_node";
+}
+
+int composite_node::force_tprint()
+{
+  return 0;
+}
+
+int glyph_node::same(node *nd)
+{
+  return ci == ((glyph_node *)nd)->ci
+	 && tf == ((glyph_node *)nd)->tf
+	 && gcol == ((glyph_node *)nd)->gcol
+	 && fcol == ((glyph_node *)nd)->fcol;
+}
+
+const char *glyph_node::type()
+{
+  return "glyph_node";
+}
+
+int glyph_node::force_tprint()
+{
+  return 0;
+}
+
+int ligature_node::same(node *nd)
+{
+  return (same_node(n1, ((ligature_node *)nd)->n1)
+	  && same_node(n2, ((ligature_node *)nd)->n2)
+	  && glyph_node::same(nd));
+}
+
+const char *ligature_node::type()
+{
+  return "ligature_node";
+}
+
+int ligature_node::force_tprint()
+{
+  return 0;
+}
+
+int kern_pair_node::same(node *nd)
+{
+  return (amount == ((kern_pair_node *)nd)->amount
+	  && same_node(n1, ((kern_pair_node *)nd)->n1)
+	  && same_node(n2, ((kern_pair_node *)nd)->n2));
+}
+
+const char *kern_pair_node::type()
+{
+  return "kern_pair_node";
+}
+
+int kern_pair_node::force_tprint()
+{
+  return 0;
+}
+
+int dbreak_node::same(node *nd)
+{
+  return (same_node_list(none, ((dbreak_node *)nd)->none)
+	  && same_node_list(pre, ((dbreak_node *)nd)->pre)
+	  && same_node_list(post, ((dbreak_node *)nd)->post));
+}
+
+const char *dbreak_node::type()
+{
+  return "dbreak_node";
+}
+
+int dbreak_node::force_tprint()
+{
+  return 0;
+}
+
+int break_char_node::same(node *nd)
+{
+  return break_code == ((break_char_node *)nd)->break_code
+	 && col == ((break_char_node *)nd)->col
+	 && same_node(ch, ((break_char_node *)nd)->ch);
+}
+
+const char *break_char_node::type()
+{
+  return "break_char_node";
+}
+
+int break_char_node::force_tprint()
+{
+  return 0;
+}
+
+int line_start_node::same(node * /*nd*/)
+{
+  return 1;
+}
+
+const char *line_start_node::type()
+{
+  return "line_start_node";
+}
+
+int line_start_node::force_tprint()
+{
+  return 0;
+}
+
+int space_node::same(node *nd)
+{
+  return n == ((space_node *)nd)->n
+	      && set == ((space_node *)nd)->set
+	      && col == ((space_node *)nd)->col;
+}
+
+const char *space_node::type()
+{
+  return "space_node";
+}
+
+int word_space_node::same(node *nd)
+{
+  return n == ((word_space_node *)nd)->n
+	 && set == ((word_space_node *)nd)->set
+	 && col == ((word_space_node *)nd)->col;
+}
+
+const char *word_space_node::type()
+{
+  return "word_space_node";
+}
+
+int word_space_node::force_tprint()
+{
+  return 0;
+}
+
+void unbreakable_space_node::tprint(troff_output_file *out)
+{
+  out->fill_color(col);
+  if (is_html) {
+    // we emit the space width as a negative glyph index
+    out->flush_tbuf();
+    out->do_motion();
+    out->put('N');
+    out->put(-n.to_units());
+    out->put('\n');
+  }
+  out->right(n);
+}
+
+int unbreakable_space_node::same(node *nd)
+{
+  return n == ((unbreakable_space_node *)nd)->n
+	 && set == ((unbreakable_space_node *)nd)->set
+	 && col == ((unbreakable_space_node *)nd)->col;
+}
+
+const char *unbreakable_space_node::type()
+{
+  return "unbreakable_space_node";
+}
+
+node *unbreakable_space_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *unbreakable_space_node::get_hyphen_list(hyphen_list *tail, int *)
+{
+  return new hyphen_list(0, tail);
+}
+
+int diverted_space_node::same(node *nd)
+{
+  return n == ((diverted_space_node *)nd)->n;
+}
+
+const char *diverted_space_node::type()
+{
+  return "diverted_space_node";
+}
+
+int diverted_space_node::force_tprint()
+{
+  return 0;
+}
+
+int diverted_copy_file_node::same(node *nd)
+{
+  return filename == ((diverted_copy_file_node *)nd)->filename;
+}
+
+const char *diverted_copy_file_node::type()
+{
+  return "diverted_copy_file_node";
+}
+
+int diverted_copy_file_node::force_tprint()
+{
+  return 0;
+}
+
+// Grow the font_table so that its size is > n.
+
+static void grow_font_table(int n)
+{
+  assert(n >= font_table_size);
+  font_info **old_font_table = font_table;
+  int old_font_table_size = font_table_size;
+  font_table_size = font_table_size ? (font_table_size*3)/2 : 10;
+  if (font_table_size <= n)
+    font_table_size = n + 10;
+  font_table = new font_info *[font_table_size];
+  if (old_font_table_size)
+    memcpy(font_table, old_font_table,
+	   old_font_table_size*sizeof(font_info *));
+  a_delete old_font_table;
+  for (int i = old_font_table_size; i < font_table_size; i++)
+    font_table[i] = 0;
+}
+
+dictionary font_translation_dictionary(17);
+
+static symbol get_font_translation(symbol nm)
+{
+  void *p = font_translation_dictionary.lookup(nm);
+  return p ? symbol((char *)p) : nm;
+}
+
+dictionary font_dictionary(50);
+
+static int mount_font_no_translate(int n, symbol name, symbol external_name)
+{
+  assert(n >= 0);
+  // We store the address of this char in font_dictionary to indicate
+  // that we've previously tried to mount the font and failed.
+  static char a_char;
+  font *fm = 0;
+  void *p = font_dictionary.lookup(external_name);
+  if (p == 0) {
+    int not_found;
+    fm = font::load_font(external_name.contents(), &not_found);
+    if (!fm) {
+      if (not_found)
+	warning(WARN_FONT, "can't find font `%1'", external_name.contents());
+      (void)font_dictionary.lookup(external_name, &a_char);
+      return 0;
+    }
+    (void)font_dictionary.lookup(name, fm);
+  }
+  else if (p == &a_char) {
+#if 0
+    error("invalid font `%1'", external_name.contents());
+#endif
+    return 0;
+  }
+  else
+    fm = (font*)p;
+  if (n >= font_table_size) {
+    if (n - font_table_size > 1000) {
+      error("font position too much larger than first unused position");
+      return 0;
+    }
+    grow_font_table(n);
+  }
+  else if (font_table[n] != 0)
+    delete font_table[n];
+  font_table[n] = new font_info(name, n, external_name, fm);
+  font_family::invalidate_fontno(n);
+  return 1;
+}
+
+int mount_font(int n, symbol name, symbol external_name)
+{
+  assert(n >= 0);
+  name = get_font_translation(name);
+  if (external_name.is_null())
+    external_name = name;
+  else
+    external_name = get_font_translation(external_name);
+  return mount_font_no_translate(n, name, external_name);
+}
+
+void mount_style(int n, symbol name)
+{
+  assert(n >= 0);
+  if (n >= font_table_size) {
+    if (n - font_table_size > 1000) {
+      error("font position too much larger than first unused position");
+      return;
+    }
+    grow_font_table(n);
+  }
+  else if (font_table[n] != 0)
+    delete font_table[n];
+  font_table[n] = new font_info(get_font_translation(name), n, NULL_SYMBOL, 0);
+  font_family::invalidate_fontno(n);
+}
+
+/* global functions */
+
+void font_translate()
+{
+  symbol from = get_name(1);
+  if (!from.is_null()) {
+    symbol to = get_name();
+    if (to.is_null() || from == to)
+      font_translation_dictionary.remove(from);
+    else
+      (void)font_translation_dictionary.lookup(from, (void *)to.contents());
+  }
+  skip_line();
+}
+
+void font_position()
+{
+  int n;
+  if (get_integer(&n)) {
+    if (n < 0)
+      error("negative font position");
+    else {
+      symbol internal_name = get_name(1);
+      if (!internal_name.is_null()) {
+	symbol external_name = get_long_name();
+	mount_font(n, internal_name, external_name); // ignore error
+      }
+    }
+  }
+  skip_line();
+}
+
+font_family::font_family(symbol s)
+: map_size(10), nm(s)
+{
+  map = new int[map_size];
+  for (int i = 0; i < map_size; i++)
+    map[i] = -1;
+}
+
+font_family::~font_family()
+{
+  a_delete map;
+}
+
+int font_family::make_definite(int i)
+{
+  if (i >= 0) {
+    if (i < map_size && map[i] >= 0)
+      return map[i];
+    else {
+      if (i < font_table_size && font_table[i] != 0) {
+	if (i >= map_size) {
+	  int old_map_size = map_size;
+	  int *old_map = map;
+	  map_size *= 3;
+	  map_size /= 2;
+	  if (i >= map_size)
+	    map_size = i + 10;
+	  map = new int[map_size];
+	  memcpy(map, old_map, old_map_size*sizeof(int));
+	  a_delete old_map;
+	  for (int j = old_map_size; j < map_size; j++)
+	    map[j] = -1;
+	}
+	if (font_table[i]->is_style()) {
+	  symbol sty = font_table[i]->get_name();
+	  symbol f = concat(nm, sty);
+	  int n;
+	  // don't use symbol_fontno, because that might return a style
+	  // and because we don't want to translate the name
+	  for (n = 0; n < font_table_size; n++)
+	    if (font_table[n] != 0 && font_table[n]->is_named(f)
+		&& !font_table[n]->is_style())
+	      break;
+	  if (n >= font_table_size) {
+	    n = next_available_font_position();
+	    if (!mount_font_no_translate(n, f, f))
+	      return -1;
+	  }
+	  return map[i] = n;
+	}
+	else
+	  return map[i] = i;
+      }
+      else
+	return -1;
+    }
+  }
+  else
+    return -1;
+}
+
+dictionary family_dictionary(5);
+
+font_family *lookup_family(symbol nm)
+{
+  font_family *f = (font_family *)family_dictionary.lookup(nm);
+  if (!f) {
+    f = new font_family(nm);
+    (void)family_dictionary.lookup(nm, f);
+  }
+  return f;
+}
+
+void font_family::invalidate_fontno(int n)
+{
+  assert(n >= 0 && n < font_table_size);
+  dictionary_iterator iter(family_dictionary);
+  symbol nm;
+  font_family *fam;
+  while (iter.get(&nm, (void **)&fam)) {
+    int map_size = fam->map_size;
+    if (n < map_size)
+      fam->map[n] = -1;
+    for (int i = 0; i < map_size; i++)
+      if (fam->map[i] == n)
+	fam->map[i] = -1;
+  }
+}
+
+void style()
+{
+  int n;
+  if (get_integer(&n)) {
+    if (n < 0)
+      error("negative font position");
+    else {
+      symbol internal_name = get_name(1);
+      if (!internal_name.is_null())
+	mount_style(n, internal_name);
+    }
+  }
+  skip_line();
+}
+
+static int get_fontno()
+{
+  int n;
+  tok.skip();
+  if (tok.delimiter()) {
+    symbol s = get_name(1);
+    if (!s.is_null()) {
+      n = symbol_fontno(s);
+      if (n < 0) {
+	n = next_available_font_position();
+	if (!mount_font(n, s))
+	  return -1;
+      }
+      return curenv->get_family()->make_definite(n);
+    }
+  }
+  else if (get_integer(&n)) {
+    if (n < 0 || n >= font_table_size || font_table[n] == 0)
+      error("bad font number");
+    else
+      return curenv->get_family()->make_definite(n);
+  }
+  return -1;
+}
+
+static int underline_fontno = 2;
+
+void underline_font()
+{
+  int n = get_fontno();
+  if (n >= 0)
+    underline_fontno = n;
+  skip_line();
+}
+
+int get_underline_fontno()
+{
+  return underline_fontno;
+}
+
+void define_font_special_character()
+{
+  int n = get_fontno();
+  if (n < 0) {
+    skip_line();
+    return;
+  }
+  symbol f = font_table[n]->get_name();
+  do_define_character(CHAR_FONT_SPECIAL, f.contents());
+}
+
+void remove_font_special_character()
+{
+  int n = get_fontno();
+  if (n < 0) {
+    skip_line();
+    return;
+  }
+  symbol f = font_table[n]->get_name();
+  while (!tok.newline() && !tok.eof()) {
+    if (!tok.space() && !tok.tab()) {
+      charinfo *s = tok.get_char(1);
+      string gl(f.contents());
+      gl += ' ';
+      gl += s->nm.contents();
+      gl += '\0';
+      charinfo *ci = get_charinfo(symbol(gl.contents()));
+      if (!ci)
+	break;
+      macro *m = ci->set_macro(0);
+      if (m)
+	delete m;
+    }
+    tok.next();
+  }
+  skip_line();
+}
+
+static void read_special_fonts(special_font_list **sp)
+{
+  special_font_list *s = *sp;
+  *sp = 0;
+  while (s != 0) {
+    special_font_list *tem = s;
+    s = s->next;
+    delete tem;
+  }
+  special_font_list **p = sp;
+  while (has_arg()) {
+    int i = get_fontno();
+    if (i >= 0) {
+      special_font_list *tem = new special_font_list;
+      tem->n = i;
+      tem->next = 0;
+      *p = tem;
+      p = &(tem->next);
+    }
+  }
+}
+
+void font_special_request()
+{
+  int n = get_fontno();
+  if (n >= 0)
+    read_special_fonts(&font_table[n]->sf);
+  skip_line();
+}
+
+void special_request()
+{
+  read_special_fonts(&global_special_fonts);
+  skip_line();
+}
+
+int next_available_font_position()
+{
+  int i;
+  for (i = 1; i < font_table_size && font_table[i] != 0; i++)
+    ;
+  return i;
+}
+
+int symbol_fontno(symbol s)
+{
+  s = get_font_translation(s);
+  for (int i = 0; i < font_table_size; i++)
+    if (font_table[i] != 0 && font_table[i]->is_named(s))
+      return i;
+  return -1;
+}
+
+int is_good_fontno(int n)
+{
+  return n >= 0 && n < font_table_size && font_table[n] != 0;
+}
+
+int get_bold_fontno(int n)
+{
+  if (n >= 0 && n < font_table_size && font_table[n] != 0) {
+    hunits offset;
+    if (font_table[n]->get_bold(&offset))
+      return offset.to_units() + 1;
+    else
+      return 0;
+  }
+  else
+    return 0;
+}
+
+hunits env_digit_width(environment *env)
+{
+  node *n = make_glyph_node(charset_table['0'], env);
+  if (n) {
+    hunits x = n->width();
+    delete n;
+    return x;
+  }
+  else
+    return H0;
+}
+
+hunits env_space_width(environment *env)
+{
+  int fn = env_definite_font(env);
+  font_size fs = env->get_font_size();
+  if (fn < 0 || fn >= font_table_size || font_table[fn] == 0)
+    return scale(fs.to_units()/3, env->get_space_size(), 12);
+  else
+    return font_table[fn]->get_space_width(fs, env->get_space_size());
+}
+
+hunits env_sentence_space_width(environment *env)
+{
+  int fn = env_definite_font(env);
+  font_size fs = env->get_font_size();
+  if (fn < 0 || fn >= font_table_size || font_table[fn] == 0)
+    return scale(fs.to_units()/3, env->get_sentence_space_size(), 12);
+  else
+    return font_table[fn]->get_space_width(fs, env->get_sentence_space_size());
+}
+
+hunits env_half_narrow_space_width(environment *env)
+{
+  int fn = env_definite_font(env);
+  font_size fs = env->get_font_size();
+  if (fn < 0 || fn >= font_table_size || font_table[fn] == 0)
+    return 0;
+  else
+    return font_table[fn]->get_half_narrow_space_width(fs);
+}
+
+hunits env_narrow_space_width(environment *env)
+{
+  int fn = env_definite_font(env);
+  font_size fs = env->get_font_size();
+  if (fn < 0 || fn >= font_table_size || font_table[fn] == 0)
+    return 0;
+  else
+    return font_table[fn]->get_narrow_space_width(fs);
+}
+
+void bold_font()
+{
+  int n = get_fontno();
+  if (n >= 0) {
+    if (has_arg()) {
+      if (tok.delimiter()) {
+	int f = get_fontno();
+	if (f >= 0) {
+	  units offset;
+	  if (has_arg() && get_number(&offset, 'u') && offset >= 1)
+	    font_table[f]->set_conditional_bold(n, hunits(offset - 1));
+	  else
+	    font_table[f]->conditional_unbold(n);
+	}
+      }
+      else {
+	units offset;
+	if (get_number(&offset, 'u') && offset >= 1)
+	  font_table[n]->set_bold(hunits(offset - 1));
+	else
+	  font_table[n]->unbold();
+      }
+    }
+    else
+      font_table[n]->unbold();
+  }
+  skip_line();
+}
+
+track_kerning_function::track_kerning_function() : non_zero(0)
+{
+}
+
+track_kerning_function::track_kerning_function(int min_s, hunits min_a,
+					       int max_s, hunits max_a)
+: non_zero(1), min_size(min_s), min_amount(min_a), max_size(max_s),
+  max_amount(max_a)
+{
+}
+
+int track_kerning_function::operator==(const track_kerning_function &tk)
+{
+  if (non_zero)
+    return (tk.non_zero
+	    && min_size == tk.min_size
+	    && min_amount == tk.min_amount
+	    && max_size == tk.max_size
+	    && max_amount == tk.max_amount);
+  else
+    return !tk.non_zero;
+}
+
+int track_kerning_function::operator!=(const track_kerning_function &tk)
+{
+  if (non_zero)
+    return (!tk.non_zero
+	    || min_size != tk.min_size
+	    || min_amount != tk.min_amount
+	    || max_size != tk.max_size
+	    || max_amount != tk.max_amount);
+  else
+    return tk.non_zero;
+}
+
+hunits track_kerning_function::compute(int size)
+{
+  if (non_zero) {
+    if (max_size <= min_size)
+      return min_amount;
+    else if (size <= min_size)
+      return min_amount;
+    else if (size >= max_size)
+      return max_amount;
+    else
+      return (scale(max_amount, size - min_size, max_size - min_size)
+	      + scale(min_amount, max_size - size, max_size - min_size));
+  }
+  else
+    return H0;
+}
+
+void track_kern()
+{
+  int n = get_fontno();
+  if (n >= 0) {
+    int min_s, max_s;
+    hunits min_a, max_a;
+    if (has_arg()
+	&& get_number(&min_s, 'z')
+	&& get_hunits(&min_a, 'p')
+	&& get_number(&max_s, 'z')
+	&& get_hunits(&max_a, 'p')) {
+      track_kerning_function tk(min_s, min_a, max_s, max_a);
+      font_table[n]->set_track_kern(tk);
+    }
+    else {
+      track_kerning_function tk;
+      font_table[n]->set_track_kern(tk);
+    }
+  }
+  skip_line();
+}
+
+void constant_space()
+{
+  int n = get_fontno();
+  if (n >= 0) {
+    int x, y;
+    if (!has_arg() || !get_integer(&x))
+      font_table[n]->set_constant_space(CONSTANT_SPACE_NONE);
+    else {
+      if (!has_arg() || !get_number(&y, 'z'))
+	font_table[n]->set_constant_space(CONSTANT_SPACE_RELATIVE, x);
+      else
+	font_table[n]->set_constant_space(CONSTANT_SPACE_ABSOLUTE,
+					  scale(y*x,
+						units_per_inch,
+						36*72*sizescale));
+    }
+  }
+  skip_line();
+}
+
+void ligature()
+{
+  int lig;
+  if (has_arg() && get_integer(&lig) && lig >= 0 && lig <= 2)
+    global_ligature_mode = lig;
+  else
+    global_ligature_mode = 1;
+  skip_line();
+}
+
+void kern_request()
+{
+  int k;
+  if (has_arg() && get_integer(&k))
+    global_kern_mode = k != 0;
+  else
+    global_kern_mode = 1;
+  skip_line();
+}
+
+void set_soft_hyphen_char()
+{
+  soft_hyphen_char = get_optional_char();
+  if (!soft_hyphen_char)
+    soft_hyphen_char = get_charinfo(HYPHEN_SYMBOL);
+  skip_line();
+}
+
+void init_output()
+{
+  if (suppress_output_flag)
+    the_output = new suppress_output_file;
+  else if (ascii_output_flag)
+    the_output = new ascii_output_file;
+  else
+    the_output = new troff_output_file;
+}
+
+class next_available_font_position_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *next_available_font_position_reg::get_string()
+{
+  return i_to_a(next_available_font_position());
+}
+
+class printing_reg : public reg {
+public:
+  const char *get_string();
+};
+
+const char *printing_reg::get_string()
+{
+  if (the_output)
+    return the_output->is_printing() ? "1" : "0";
+  else
+    return "0";
+}
+
+void init_node_requests()
+{
+  init_request("bd", bold_font);
+  init_request("cs", constant_space);
+  init_request("fp", font_position);
+  init_request("fschar", define_font_special_character);
+  init_request("fspecial", font_special_request);
+  init_request("ftr", font_translate);
+  init_request("kern", kern_request);
+  init_request("lg", ligature);
+  init_request("rfschar", remove_font_special_character);
+  init_request("shc", set_soft_hyphen_char);
+  init_request("special", special_request);
+  init_request("sty", style);
+  init_request("tkf", track_kern);
+  init_request("uf", underline_font);
+  number_reg_dictionary.define(".fp", new next_available_font_position_reg);
+  number_reg_dictionary.define(".kern",
+			       new constant_int_reg(&global_kern_mode));
+  number_reg_dictionary.define(".lg",
+			       new constant_int_reg(&global_ligature_mode));
+  number_reg_dictionary.define(".P", new printing_reg);
+  soft_hyphen_char = get_charinfo(HYPHEN_SYMBOL);
+}
diff --git a/contrib/groff/src/roff/troff/node.h b/contrib/groff/src/roff/troff/node.h
index 13295f4..54f8822 100644
--- a/contrib/groff/src/roff/troff/node.h
+++ b/contrib/groff/src/roff/troff/node.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -75,7 +75,7 @@ struct node {
   virtual node *merge_self(node *);
   virtual node *add_discretionary_hyphen();
   virtual node *add_self(node *, hyphen_list **);
-  virtual hyphen_list *get_hyphen_list(hyphen_list *s = 0);
+  virtual hyphen_list *get_hyphen_list(hyphen_list *, int *);
   virtual void ascii_print(ascii_output_file *);
   virtual void asciify(macro *);
   virtual int discardable();
@@ -218,6 +218,7 @@ public:
   unbreakable_space_node(hunits, color *, node * = 0);
   node *copy();
   int reread(int *);
+  void tprint(troff_output_file *);
   int same(node *);
   void asciify(macro *);
   const char *type();
@@ -228,7 +229,7 @@ public:
   void split(int, node **, node **);
   int merge_space(hunits, hunits, hunits);
   node *add_self(node *, hyphen_list **);
-  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
   hyphenation_type get_hyphenation_type();
 };
 
@@ -301,7 +302,7 @@ public:
   const char *type();
   int force_tprint();
   node *add_self(node *, hyphen_list **);
-  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
   hyphenation_type get_hyphenation_type();
 };
 
@@ -311,11 +312,12 @@ public:
   node *copy();
   void ascii_print(ascii_output_file *);
   void asciify(macro *);
+  void tprint(troff_output_file *);
   int same(node *);
   const char *type();
   int force_tprint();
   node *add_self(node *, hyphen_list **);
-  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
   hyphenation_type get_hyphenation_type();
 };
 
@@ -424,7 +426,7 @@ public:
   hunits skew();
   hunits italic_correction();
   hunits subscript_correction();
-  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
   node *add_self(node *, hyphen_list **);
   node *merge_glyph_node(glyph_node *);
 };
@@ -443,7 +445,7 @@ public:
   const char *type();
   int force_tprint();
   node *add_self(node *, hyphen_list **);
-  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphen_list *get_hyphen_list(hyphen_list *, int *);
   hyphenation_type get_hyphenation_type();
 };
 
diff --git a/contrib/groff/src/roff/troff/number.cpp b/contrib/groff/src/roff/troff/number.cpp
new file mode 100644
index 0000000..8fed342
--- /dev/null
+++ b/contrib/groff/src/roff/troff/number.cpp
@@ -0,0 +1,697 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+#include "troff.h"
+#include "symbol.h"
+#include "hvunits.h"
+#include "env.h"
+#include "token.h"
+#include "div.h"
+
+vunits V0;
+hunits H0;
+
+int hresolution = 1;
+int vresolution = 1;
+int units_per_inch;
+int sizescale;
+
+static int parse_expr(units *v, int scale_indicator,
+		      int parenthesised, int rigid = 0);
+static int start_number();
+
+int get_vunits(vunits *res, unsigned char si)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, si, 0)) {
+    *res = vunits(x);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+int get_hunits(hunits *res, unsigned char si)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, si, 0)) {
+    *res = hunits(x);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+// for \B
+
+int get_number_rigidly(units *res, unsigned char si)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, si, 0, 1)) {
+    *res = x;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+int get_number(units *res, unsigned char si)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, si, 0)) {
+    *res = x;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+int get_integer(int *res)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, 0, 0)) {
+    *res = x;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+enum incr_number_result { BAD, ABSOLUTE, INCREMENT, DECREMENT };
+
+static incr_number_result get_incr_number(units *res, unsigned char);
+
+int get_vunits(vunits *res, unsigned char si, vunits prev_value)
+{
+  units v;
+  switch (get_incr_number(&v, si)) {
+  case BAD:
+    return 0;
+  case ABSOLUTE:
+    *res = v;
+    break;
+  case INCREMENT:
+    *res = prev_value + v;
+    break;
+  case DECREMENT:
+    *res = prev_value - v;
+    break;
+  default:
+    assert(0);
+  }
+  return 1;
+}
+
+int get_hunits(hunits *res, unsigned char si, hunits prev_value)
+{
+  units v;
+  switch (get_incr_number(&v, si)) {
+  case BAD:
+    return 0;
+  case ABSOLUTE:
+    *res = v;
+    break;
+  case INCREMENT:
+    *res = prev_value + v;
+    break;
+  case DECREMENT:
+    *res = prev_value - v;
+    break;
+  default:
+    assert(0);
+  }
+  return 1;
+}
+
+int get_number(units *res, unsigned char si, units prev_value)
+{
+  units v;
+  switch (get_incr_number(&v, si)) {
+  case BAD:
+    return 0;
+  case ABSOLUTE:
+    *res = v;
+    break;
+  case INCREMENT:
+    *res = prev_value + v;
+    break;
+  case DECREMENT:
+    *res = prev_value - v;
+    break;
+  default:
+    assert(0);
+  }
+  return 1;
+}
+
+int get_integer(int *res, int prev_value)
+{
+  units v;
+  switch (get_incr_number(&v, 0)) {
+  case BAD:
+    return 0;
+  case ABSOLUTE:
+    *res = v;
+    break;
+  case INCREMENT:
+    *res = prev_value + int(v);
+    break;
+  case DECREMENT:
+    *res = prev_value - int(v);
+    break;
+  default:
+    assert(0);
+  }
+  return 1;
+}
+
+
+static incr_number_result get_incr_number(units *res, unsigned char si)
+{
+  if (!start_number())
+    return BAD;
+  incr_number_result result = ABSOLUTE;
+  if (tok.ch() == '+') {
+    tok.next();
+    result = INCREMENT;
+  }
+  else if (tok.ch() == '-') {
+    tok.next();
+    result = DECREMENT;
+  }
+  if (parse_expr(res, si, 0))
+    return result;
+  else
+    return BAD;
+}
+
+static int start_number()
+{
+  while (tok.space())
+    tok.next();
+  if (tok.newline()) {
+    warning(WARN_MISSING, "missing number");
+    return 0;
+  }
+  if (tok.tab()) {
+    warning(WARN_TAB, "tab character where number expected");
+    return 0;
+  }
+  if (tok.right_brace()) {
+    warning(WARN_RIGHT_BRACE, "`\\}' where number expected");
+    return 0;
+  }
+  return 1;
+}
+
+enum { OP_LEQ = 'L', OP_GEQ = 'G', OP_MAX = 'X', OP_MIN = 'N' };
+
+#define SCALE_INDICATOR_CHARS "icfPmnpuvMsz"
+
+static int parse_term(units *v, int scale_indicator,
+		      int parenthesised, int rigid);
+
+static int parse_expr(units *v, int scale_indicator,
+		      int parenthesised, int rigid)
+{
+  int result = parse_term(v, scale_indicator, parenthesised, rigid);
+  while (result) {
+    if (parenthesised)
+      tok.skip();
+    int op = tok.ch();
+    switch (op) {
+    case '+':
+    case '-':
+    case '/':
+    case '*':
+    case '%':
+    case ':':
+    case '&':
+      tok.next();
+      break;
+    case '>':
+      tok.next();
+      if (tok.ch() == '=') {
+	tok.next();
+	op = OP_GEQ;
+      }
+      else if (tok.ch() == '?') {
+	tok.next();
+	op = OP_MAX;
+      }
+      break;
+    case '<':
+      tok.next();
+      if (tok.ch() == '=') {
+	tok.next();
+	op = OP_LEQ;
+      }
+      else if (tok.ch() == '?') {
+	tok.next();
+	op = OP_MIN;
+      }
+      break;
+    case '=':
+      tok.next();
+      if (tok.ch() == '=')
+	tok.next();
+      break;
+    default:
+      return result;
+    }
+    units v2;
+    if (!parse_term(&v2, scale_indicator, parenthesised, rigid))
+      return 0;
+    int overflow = 0;
+    switch (op) {
+    case '<':
+      *v = *v < v2;
+      break;
+    case '>':
+      *v = *v > v2;
+      break;
+    case OP_LEQ:
+      *v = *v <= v2;
+      break;
+    case OP_GEQ:
+      *v = *v >= v2;
+      break;
+    case OP_MIN:
+      if (*v > v2)
+	*v = v2;
+      break;
+    case OP_MAX:
+      if (*v < v2)
+	*v = v2;
+      break;
+    case '=':
+      *v = *v == v2;
+      break;
+    case '&':
+      *v = *v > 0 && v2 > 0;
+      break;
+    case ':':
+      *v = *v > 0 || v2 > 0;
+      break;
+    case '+':
+      if (v2 < 0) {
+	if (*v < INT_MIN - v2)
+	  overflow = 1;
+      }
+      else if (v2 > 0) {
+	if (*v > INT_MAX - v2)
+	  overflow = 1;
+      }
+      if (overflow) {
+	error("addition overflow");
+	return 0;
+      }
+      *v += v2;
+      break;
+    case '-':
+      if (v2 < 0) {
+	if (*v > INT_MAX + v2)
+	  overflow = 1;
+      }
+      else if (v2 > 0) {
+	if (*v < INT_MIN + v2)
+	  overflow = 1;
+      }
+      if (overflow) {
+	error("subtraction overflow");
+	return 0;
+      }
+      *v -= v2;
+      break;
+    case '*':
+      if (v2 < 0) {
+	if (*v > 0) {
+	  if (*v > -(unsigned)INT_MIN / -(unsigned)v2)
+	    overflow = 1;
+	}
+	else if (-(unsigned)*v > INT_MAX / -(unsigned)v2)
+	  overflow = 1;
+      }
+      else if (v2 > 0) {
+	if (*v > 0) {
+	  if (*v > INT_MAX / v2)
+	    overflow = 1;
+	}
+	else if (-(unsigned)*v > -(unsigned)INT_MIN / v2)
+	  overflow = 1;
+      }
+      if (overflow) {
+	error("multiplication overflow");
+	return 0;
+      }
+      *v *= v2;
+      break;
+    case '/':
+      if (v2 == 0) {
+	error("division by zero");
+	return 0;
+      }
+      *v /= v2;
+      break;
+    case '%':
+      if (v2 == 0) {
+	error("modulus by zero");
+	return 0;
+      }
+      *v %= v2;
+      break;
+    default:
+      assert(0);
+    }
+  }
+  return result;
+}
+
+static int parse_term(units *v, int scale_indicator,
+		      int parenthesised, int rigid)
+{
+  int negative = 0;
+  for (;;)
+    if (parenthesised && tok.space())
+      tok.next();
+    else if (tok.ch() == '+')
+      tok.next();
+    else if (tok.ch() == '-') {
+      tok.next();
+      negative = !negative;
+    }
+    else
+      break;
+  unsigned char c = tok.ch();
+  switch (c) {
+  case '|':
+    // | is not restricted to the outermost level
+    // tbl uses this
+    tok.next();
+    if (!parse_term(v, scale_indicator, parenthesised, rigid))
+      return 0;
+    int tem;
+    tem = (scale_indicator == 'v'
+	   ? curdiv->get_vertical_position().to_units()
+	   : curenv->get_input_line_position().to_units());
+    if (tem >= 0) {
+      if (*v < INT_MIN + tem) {
+	error("numeric overflow");
+	return 0;
+      }
+    }
+    else {
+      if (*v > INT_MAX + tem) {
+	error("numeric overflow");
+	return 0;
+      }
+    }
+    *v -= tem;
+    if (negative) {
+      if (*v == INT_MIN) {
+	error("numeric overflow");
+	return 0;
+      }
+      *v = -*v;
+    }
+    return 1;
+  case '(':
+    tok.next();
+    c = tok.ch();
+    if (c == ')') {
+      if (rigid)
+	return 0;
+      warning(WARN_SYNTAX, "empty parentheses");
+      tok.next();
+      *v = 0;
+      return 1;
+    }
+    else if (c != 0 && strchr(SCALE_INDICATOR_CHARS, c) != 0) {
+      tok.next();
+      if (tok.ch() == ';') {
+	tok.next();
+	scale_indicator = c;
+      }
+      else {
+	error("expected `;' after scale-indicator (got %1)",
+	      tok.description());
+	return 0;
+      }
+    }
+    else if (c == ';') {
+      scale_indicator = 0;
+      tok.next();
+    }
+    if (!parse_expr(v, scale_indicator, 1, rigid))
+      return 0;
+    tok.skip();
+    if (tok.ch() != ')') {
+      if (rigid)
+	return 0;
+      warning(WARN_SYNTAX, "missing `)' (got %1)", tok.description());
+    }
+    else
+      tok.next();
+    if (negative) {
+      if (*v == INT_MIN) {
+	error("numeric overflow");
+	return 0;
+      }
+      *v = -*v;
+    }
+    return 1;
+  case '.':
+    *v = 0;
+    break;
+  case '0':
+  case '1':
+  case '2':
+  case '3':
+  case '4':
+  case '5':
+  case '6':
+  case '7':
+  case '8':
+  case '9':
+    *v = 0;
+    do {
+      if (*v > INT_MAX/10) {
+	error("numeric overflow");
+	return 0;
+      }
+      *v *= 10;
+      if (*v > INT_MAX - (int(c) - '0')) {
+	error("numeric overflow");
+	return 0;
+      }
+      *v += c - '0';
+      tok.next();
+      c = tok.ch();
+    } while (csdigit(c));
+    break;
+  case '/':
+  case '*':
+  case '%':
+  case ':':
+  case '&':
+  case '>':
+  case '<':
+  case '=':
+    warning(WARN_SYNTAX, "empty left operand");
+    *v = 0;
+    return rigid ? 0 : 1;
+  default:
+    warning(WARN_NUMBER, "numeric expression expected (got %1)",
+	    tok.description());
+    return 0;
+  }
+  int divisor = 1;
+  if (tok.ch() == '.') {
+    tok.next();
+    for (;;) {
+      c = tok.ch();
+      if (!csdigit(c))
+	break;
+      // we may multiply the divisor by 254 later on
+      if (divisor <= INT_MAX/2540 && *v <= (INT_MAX - 9)/10) {
+	*v *= 10;
+	*v += c - '0';
+	divisor *= 10;
+      }
+      tok.next();
+    }
+  }
+  int si = scale_indicator;
+  int do_next = 0;
+  if ((c = tok.ch()) != 0 && strchr(SCALE_INDICATOR_CHARS, c) != 0) {
+    switch (scale_indicator) {
+    case 'z':
+      if (c != 'u' && c != 'z') {
+	warning(WARN_SCALE,
+		"only `z' and `u' scale indicators valid in this context");
+	break;
+      }
+      si = c;
+      break;
+    case 0:
+      warning(WARN_SCALE, "scale indicator invalid in this context");
+      break;
+    case 'u':
+      si = c;
+      break;
+    default:
+      if (c == 'z') {
+	warning(WARN_SCALE, "`z' scale indicator invalid in this context");
+	break;
+      }
+      si = c;
+      break;
+    }
+    // Don't do tok.next() here because the next token might be \s, which
+    // would affect the interpretation of m.
+    do_next = 1;
+  }
+  switch (si) {
+  case 'i':
+    *v = scale(*v, units_per_inch, divisor);
+    break;
+  case 'c':
+    *v = scale(*v, units_per_inch*100, divisor*254);
+    break;
+  case 0:
+  case 'u':
+    if (divisor != 1)
+      *v /= divisor;
+    break;
+  case 'f':
+    *v = scale(*v, 65536, divisor);
+    break;
+  case 'p':
+    *v = scale(*v, units_per_inch, divisor*72);
+    break;
+  case 'P':
+    *v = scale(*v, units_per_inch, divisor*6);
+    break;
+  case 'm':
+    {
+      // Convert to hunits so that with -Tascii `m' behaves as in nroff.
+      hunits em = curenv->get_size();
+      *v = scale(*v, em.is_zero() ? hresolution : em.to_units(), divisor);
+    }
+    break;
+  case 'M':
+    {
+      hunits em = curenv->get_size();
+      *v = scale(*v, em.is_zero() ? hresolution : em.to_units(), divisor*100);
+    }
+    break;
+  case 'n':
+    {
+      // Convert to hunits so that with -Tascii `n' behaves as in nroff.
+      hunits en = curenv->get_size()/2;
+      *v = scale(*v, en.is_zero() ? hresolution : en.to_units(), divisor);
+    }
+    break;
+  case 'v':
+    *v = scale(*v, curenv->get_vertical_spacing().to_units(), divisor);
+    break;
+  case 's':
+    while (divisor > INT_MAX/(sizescale*72)) {
+      divisor /= 10;
+      *v /= 10;
+    }
+    *v = scale(*v, units_per_inch, divisor*sizescale*72);
+    break;
+  case 'z':
+    *v = scale(*v, sizescale, divisor);
+    break;
+  default:
+    assert(0);
+  }
+  if (do_next)
+    tok.next();
+  if (negative) {
+    if (*v == INT_MIN) {
+      error("numeric overflow");
+      return 0;
+    }
+    *v = -*v;
+  }
+  return 1;
+}
+
+units scale(units n, units x, units y)
+{
+  assert(x >= 0 && y > 0);
+  if (x == 0)
+    return 0;
+  if (n >= 0) {
+    if (n <= INT_MAX/x)
+      return (n*x)/y;
+  }
+  else {
+    if (-(unsigned)n <= -(unsigned)INT_MIN/x)
+      return (n*x)/y;
+  }
+  double res = n*double(x)/double(y);
+  if (res > INT_MAX) {
+    error("numeric overflow");
+    return INT_MAX;
+  }
+  else if (res < INT_MIN) {
+    error("numeric overflow");
+    return INT_MIN;
+  }
+  return int(res);
+}
+
+vunits::vunits(units x)
+{
+  // don't depend on the rounding direction for division of negative integers
+  if (vresolution == 1)
+    n = x;
+  else
+    n = (x < 0
+	 ? -((-x + vresolution/2 - 1)/vresolution)
+	 : (x + vresolution/2 - 1)/vresolution);
+}
+
+hunits::hunits(units x)
+{
+  // don't depend on the rounding direction for division of negative integers
+  if (hresolution == 1)
+    n = x;
+  else
+    n = (x < 0
+	 ? -((-x + hresolution/2 - 1)/hresolution)
+	 : (x + hresolution/2 - 1)/hresolution);
+}
diff --git a/contrib/groff/src/roff/troff/reg.cpp b/contrib/groff/src/roff/troff/reg.cpp
new file mode 100644
index 0000000..8ac20c9
--- /dev/null
+++ b/contrib/groff/src/roff/troff/reg.cpp
@@ -0,0 +1,474 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "troff.h"
+#include "symbol.h"
+#include "dictionary.h"
+#include "token.h"
+#include "request.h"
+#include "reg.h"
+
+object_dictionary number_reg_dictionary(101);
+
+int reg::get_value(units * /*d*/)
+{
+  return 0;
+}
+
+void reg::increment()
+{
+  error("can't increment read-only register");
+}
+
+void reg::decrement()
+{
+  error("can't decrement read-only register");
+}
+
+void reg::set_increment(units /*n*/)
+{
+  error("can't auto increment read-only register");
+}
+
+void reg::alter_format(char /*f*/, int /*w*/)
+{
+  error("can't alter format of read-only register");
+}
+
+const char *reg::get_format()
+{
+  return "0";
+}
+
+void reg::set_value(units /*n*/)
+{
+  error("can't write read-only register");
+}
+
+general_reg::general_reg() : format('1'), width(0), inc(0)
+{
+}
+
+static char uppercase_array[] = {
+  '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',
+};
+
+static char lowercase_array[] = {
+  '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',
+};
+
+static const char *number_value_to_ascii(int value, char format, int width)
+{
+  static char buf[128];		// must be at least 21
+  switch(format) {
+  case '1':
+    if (width <= 0)
+      return i_to_a(value);
+    else if (width > int(sizeof(buf) - 2))
+      sprintf(buf, "%.*d", int(sizeof(buf) - 2), int(value));
+    else
+      sprintf(buf, "%.*d", width, int(value));
+    break;
+  case 'i':
+  case 'I':
+    {
+      char *p = buf;
+      // troff uses z and w to represent 10000 and 5000 in Roman
+      // numerals; I can find no historical basis for this usage
+      const char *s = format == 'i' ? "zwmdclxvi" : "ZWMDCLXVI";
+      int n = int(value);
+      if (n >= 40000 || n <= -40000) {
+	error("magnitude of `%1' too big for i or I format", n);
+	return i_to_a(n);
+      }
+      if (n == 0) {
+	*p++ = '0';
+	*p = 0;
+	break;
+      }
+      if (n < 0) {
+	*p++ = '-';
+	n = -n;
+      }
+      while (n >= 10000) {
+	*p++ = s[0];
+	n -= 10000;
+      }
+      for (int i = 1000; i > 0; i /= 10, s += 2) {
+	int m = n/i;
+	n -= m*i;
+	switch (m) {
+	case 3:
+	  *p++ = s[2];
+	  /* falls through */
+	case 2:
+	  *p++ = s[2];
+	  /* falls through */
+	case 1:
+	  *p++ = s[2];
+	  break;
+	case 4:
+	  *p++ = s[2];
+	  *p++ = s[1];
+	  break;
+	case 8:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  break;
+	case 7:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  *p++ = s[2];
+	  break;
+	case 6:
+	  *p++ = s[1];
+	  *p++ = s[2];
+	  break;
+	case 5:
+	  *p++ = s[1];
+	  break;
+	case 9:
+	  *p++ = s[2];
+	  *p++ = s[0];
+	}
+      }
+      *p = 0;
+      break;
+    }
+  case 'a':
+  case 'A':
+    {
+      int n = value;
+      char *p = buf;
+      if (n == 0) {
+	*p++ = '0';
+	*p = 0;
+      }
+      else {
+	if (n < 0) {
+	  n = -n;
+	  *p++ = '-';
+	}
+	// this is a bit tricky
+	while (n > 0) {
+	  int d = n % 26;
+	  if (d == 0)
+	    d = 26;
+	  n -= d;
+	  n /= 26;
+	  *p++ = format == 'a' ? lowercase_array[d - 1] :
+				 uppercase_array[d - 1];
+	}
+	*p-- = 0;
+	char *q = buf[0] == '-' ? buf + 1 : buf;
+	while (q < p) {
+	  char temp = *q;
+	  *q = *p;
+	  *p = temp;
+	  --p;
+	  ++q;
+	}
+      }
+      break;
+    }
+  default:
+    assert(0);
+    break;
+  }
+  return buf;
+}
+
+const char *general_reg::get_string()
+{
+  units n;
+  if (!get_value(&n))
+    return "";
+  return number_value_to_ascii(n, format, width);
+}
+
+
+void general_reg::increment()
+{
+  int n;
+  if (get_value(&n))
+    set_value(n + inc);
+}
+
+void general_reg::decrement()
+{
+  int n;
+  if (get_value(&n))
+    set_value(n - inc);
+}
+
+void general_reg::set_increment(units n)
+{
+  inc = n;
+}
+
+void general_reg::alter_format(char f, int w)
+{
+  format = f;
+  width = w;
+}
+
+static const char *number_format_to_ascii(char format, int width)
+{
+  static char buf[24];
+  if (format == '1') {
+    if (width > 0) {
+      int n = width;
+      if (n > int(sizeof(buf)) - 1)
+	n = int(sizeof(buf)) - 1;
+      sprintf(buf, "%.*d", n, 0);
+      return buf;
+    }
+    else
+      return "0";
+  }
+  else {
+    buf[0] = format;
+    buf[1] = '\0';
+    return buf;
+  }
+}
+
+const char *general_reg::get_format()
+{
+  return number_format_to_ascii(format, width);
+}
+
+class number_reg : public general_reg {
+  units value;
+public:
+  number_reg();
+  int get_value(units *);
+  void set_value(units);
+};
+
+number_reg::number_reg() : value(0)
+{
+}
+
+int number_reg::get_value(units *res)
+{
+  *res = value;
+  return 1;
+}
+
+void number_reg::set_value(units n)
+{
+  value = n;
+}
+
+variable_reg::variable_reg(units *p) : ptr(p)
+{
+}
+
+void variable_reg::set_value(units n)
+{
+  *ptr = n;
+}
+
+int variable_reg::get_value(units *res)
+{
+  *res = *ptr;
+  return 1;
+}
+
+void define_number_reg()
+{
+  symbol nm = get_name(1);
+  if (nm.is_null()) {
+    skip_line();
+    return;
+  }
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  units v;
+  units prev_value;
+  if (!r || !r->get_value(&prev_value))
+    prev_value = 0;
+  if (get_number(&v, 'u', prev_value)) {
+    if (r == 0) {
+      r = new number_reg;
+      number_reg_dictionary.define(nm, r);
+    }
+    r->set_value(v);
+    if (tok.space() && has_arg() && get_number(&v, 'u'))
+      r->set_increment(v);
+  }
+  skip_line();
+}
+
+#if 0
+void inline_define_reg()
+{
+  token start;
+  start.next();
+  if (!start.delimiter(1))
+    return;
+  tok.next();
+  symbol nm = get_name(1);
+  if (nm.is_null())
+    return;
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  if (r == 0) {
+    r = new number_reg;
+    number_reg_dictionary.define(nm, r);
+  }
+  units v;
+  units prev_value;
+  if (!r->get_value(&prev_value))
+    prev_value = 0;
+  if (get_number(&v, 'u', prev_value)) {
+    r->set_value(v);
+    if (start != tok) {
+      if (get_number(&v, 'u')) {
+	r->set_increment(v);
+	if (start != tok)
+	  warning(WARN_DELIM, "closing delimiter does not match");
+      }
+    }
+  }
+}
+#endif
+
+void set_number_reg(symbol nm, units n)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  if (r == 0) {
+    r = new number_reg;
+    number_reg_dictionary.define(nm, r);
+  }
+  r->set_value(n);
+}
+
+reg *lookup_number_reg(symbol nm)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  if (r == 0) {
+    warning(WARN_REG, "number register `%1' not defined", nm.contents());
+    r = new number_reg;
+    number_reg_dictionary.define(nm, r);
+  }
+  return r;
+}
+
+void alter_format()
+{
+  symbol nm = get_name(1);
+  if (nm.is_null()) {
+    skip_line();
+    return;
+  }
+  reg *r = (reg *)number_reg_dictionary.lookup(nm);
+  if (r == 0) {
+    r = new number_reg;
+    number_reg_dictionary.define(nm, r);
+  }
+  tok.skip();
+  char c = tok.ch();
+  if (csdigit(c)) {
+    int n = 0;
+    do {
+      ++n;
+      tok.next();
+    } while (csdigit(tok.ch()));
+    r->alter_format('1', n);
+  }
+  else if (c == 'i' || c == 'I' || c == 'a' || c == 'A')
+    r->alter_format(c);
+  else if (tok.newline() || tok.eof())
+    warning(WARN_MISSING, "missing number register format");
+  else
+    error("bad number register format (got %1)", tok.description());
+  skip_line();
+}
+
+void remove_reg()
+{
+  for (;;) {
+    symbol s = get_name();
+    if (s.is_null())
+      break;
+    number_reg_dictionary.remove(s);
+  }
+  skip_line();
+}
+
+void alias_reg()
+{
+  symbol s1 = get_name(1);
+  if (!s1.is_null()) {
+    symbol s2 = get_name(1);
+    if (!s2.is_null()) {
+      if (!number_reg_dictionary.alias(s1, s2))
+	warning(WARN_REG, "number register `%1' not defined", s2.contents());
+    }
+  }
+  skip_line();
+}
+
+void rename_reg()
+{
+  symbol s1 = get_name(1);
+  if (!s1.is_null()) {
+    symbol s2 = get_name(1);
+    if (!s2.is_null())
+      number_reg_dictionary.rename(s1, s2);
+  }
+  skip_line();
+}
+
+void print_number_regs()
+{
+  object_dictionary_iterator iter(number_reg_dictionary);
+  reg *r;
+  symbol s;
+  while (iter.get(&s, (object **)&r)) {
+    assert(!s.is_null());
+    errprint("%1\t", s.contents());
+    const char *p = r->get_string();
+    if (p)
+      errprint(p);
+    errprint("\n");
+  }
+  fflush(stderr);
+  skip_line();
+}
+
+void init_reg_requests()
+{
+  init_request("rr", remove_reg);
+  init_request("nr", define_number_reg);
+  init_request("af", alter_format);
+  init_request("aln", alias_reg);
+  init_request("rnn", rename_reg);
+  init_request("pnr", print_number_regs);
+}
diff --git a/contrib/groff/src/roff/troff/reg.h b/contrib/groff/src/roff/troff/reg.h
index 8d403d4..950be4f 100644
--- a/contrib/groff/src/roff/troff/reg.h
+++ b/contrib/groff/src/roff/troff/reg.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -68,7 +68,7 @@ public:
 extern object_dictionary number_reg_dictionary;
 extern void set_number_reg(symbol nm, units n);
 extern void check_output_limits(int x, int y);
-extern void reset_output_registers (int miny);
+extern void reset_output_registers();
 
 reg *lookup_number_reg(symbol);
 #if 0
diff --git a/contrib/groff/src/roff/troff/symbol.cpp b/contrib/groff/src/roff/troff/symbol.cpp
new file mode 100644
index 0000000..09f4c98
--- /dev/null
+++ b/contrib/groff/src/roff/troff/symbol.cpp
@@ -0,0 +1,154 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+#include "troff.h"
+#include "symbol.h"
+
+const char **symbol::table = 0;
+int symbol::table_used = 0;
+int symbol::table_size = 0;
+char *symbol::block = 0;
+int symbol::block_size = 0;
+
+const symbol NULL_SYMBOL;
+const symbol EMPTY_SYMBOL("");
+
+#ifdef BLOCK_SIZE
+#undef BLOCK_SIZE
+#endif
+
+const int BLOCK_SIZE = 1024;
+// the table will increase in size as necessary
+// the size will be chosen from the following array
+// add some more if you want
+static const unsigned int table_sizes[] = { 
+  101, 503, 1009, 2003, 3001, 4001, 5003, 10007, 20011, 40009, 80021,
+  160001, 500009, 1000003, 1500007, 2000003, 0 
+};
+const double FULL_MAX = 0.3;	// don't let the table get more than this full
+
+static unsigned int hash_string(const char *p)
+{
+  // compute a hash code; this assumes 32-bit unsigned ints
+  // see p436 of  Compilers by Aho, Sethi & Ullman
+  // give special treatment to two-character names
+  unsigned int hc = 0, g;
+  if (*p != 0) {
+    hc = *p++;
+    if (*p != 0) {
+      hc <<= 7;
+      hc += *p++;
+      for (; *p != 0; p++) {
+	hc <<= 4;
+	hc += *p;
+	if ((g = (hc & 0xf0000000)) == 0) {
+	  hc ^= g >> 24;
+	  hc ^= g;
+	}
+      }
+    }
+  }
+  return hc;
+}
+
+// Tell compiler that a variable is intentionally unused.
+inline void unused(void *) { }
+
+symbol::symbol(const char *p, int how)
+{
+  if (p == 0) {
+    s = 0;
+    return;
+  }
+  if (*p == 0) {
+    s = "";
+    return;
+  }
+  if (table == 0) {
+    table_size = table_sizes[0];
+    table = (const char **)new char*[table_size];
+    for (int i = 0; i < table_size; i++)
+      table[i] = 0;
+    table_used = 0;
+  }
+  unsigned int hc = hash_string(p);
+  const char **pp;
+  for (pp = table + hc % table_size; 
+       *pp != 0; 
+       (pp == table ? pp = table + table_size - 1 : --pp))
+    if (strcmp(p, *pp) == 0) {
+      s = *pp;
+      return;
+    }
+  if (how == MUST_ALREADY_EXIST) {
+    s = 0;
+    return;
+  }
+  if (table_used  >= table_size - 1 || table_used >= table_size*FULL_MAX) {
+    const char **old_table = table;
+    unsigned int old_table_size = table_size;
+    int i;
+    for (i = 1; table_sizes[i] <= old_table_size; i++)
+      if (table_sizes[i] == 0)
+	fatal("too many symbols");
+    table_size = table_sizes[i];
+    table_used = 0;
+    table = (const char **)new char*[table_size];
+    for (i = 0; i < table_size; i++)
+      table[i] = 0;
+    for (pp = old_table + old_table_size - 1; 
+	 pp >= old_table;
+	 --pp) {
+	   symbol temp(*pp, 1); /* insert it into the new table */
+	   unused(&temp);
+	 }
+    a_delete old_table;
+    for (pp = table + hc % table_size;
+	 *pp != 0; 
+	 (pp == table ? pp = table + table_size - 1 : --pp))
+      ;
+  }
+  ++table_used;
+  if (how == DONT_STORE) {
+    s = *pp = p;
+  }
+  else {
+    int len = strlen(p)+1;
+    if (block == 0 || block_size < len) {
+      block_size = len > BLOCK_SIZE ? len : BLOCK_SIZE;
+      block = new char [block_size];
+    }
+    (void)strcpy(block, p);
+    s = *pp = block;
+    block += len;
+    block_size -= len;
+  }
+}
+
+symbol concat(symbol s1, symbol s2)
+{
+  char *buf = new char [strlen(s1.contents()) + strlen(s2.contents()) + 1];
+  strcpy(buf, s1.contents());
+  strcat(buf, s2.contents());
+  symbol res(buf);
+  a_delete buf;
+  return res;
+}
diff --git a/contrib/groff/src/roff/troff/token.h b/contrib/groff/src/roff/troff/token.h
index 59f2aa2..9f5b069 100644
--- a/contrib/groff/src/roff/troff/token.h
+++ b/contrib/groff/src/roff/troff/token.h
@@ -112,6 +112,15 @@ extern void check_missing_character();
 extern void skip_line();
 extern void handle_initial_title();
 
+enum char_mode {
+  CHAR_NORMAL,
+  CHAR_FALLBACK,
+  CHAR_FONT_SPECIAL,
+  CHAR_SPECIAL
+};
+
+extern void do_define_character(char_mode, const char * = 0);
+
 struct hunits;
 extern void read_title_parts(node **part, hunits *part_width);
 
diff --git a/contrib/groff/src/roff/troff/troff.man b/contrib/groff/src/roff/troff/troff.man
index 19bb624..dce81dd 100644
--- a/contrib/groff/src/roff/troff/troff.man
+++ b/contrib/groff/src/roff/troff/troff.man
@@ -2,7 +2,7 @@
 .ig
 troff.man
 
-Last update : 9 Jan 2002
+Last update : 09 Dec 2002
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -272,7 +272,10 @@ and
 Prepare output for device
 .IR name ,
 rather than the default
-.BR @DEVICE@ .
+.BR @DEVICE@ ;
+see
+.BR groff (@MAN1EXT@)
+for a more detailed description.
 .
 .TP
 .B \-U
diff --git a/contrib/groff/src/roff/troff/unicode.cpp b/contrib/groff/src/roff/troff/unicode.cpp
new file mode 100644
index 0000000..2117463
--- /dev/null
+++ b/contrib/groff/src/roff/troff/unicode.cpp
@@ -0,0 +1,67 @@
+// -*- C++ -*-
+/* Copyright (C) 2002
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg <wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+#include "cset.h"
+#include "stringclass.h"
+
+#include "unicode.h"
+
+const char *check_unicode_name(const char *u)
+{
+  if (*u != 'u')
+    return 0;
+  const char *p = ++u;
+  for (;;) {
+    int val = 0;
+    const char *start = p;
+    for (;;) {
+      // only uppercase hex digits allowed
+      if (!csxdigit(*p))
+	return 0;
+      if (csdigit(*p))
+	val = val*0x10 + (*p-'0');
+      else if (csupper(*p))
+	val = val*0x10 + (*p-'A'+10);
+      else
+	return 0;
+      // biggest Unicode value is U+10FFFF
+      if (val > 0x10FFFF)
+	return 0;
+      p++;
+      if (*p == '\0' || *p == '_')
+	break;
+    }
+    // surrogates not allowed
+    if ((val >= 0xD800 && val <= 0xDBFF) || (val >= 0xDC00 && val <= 0xDFFF))
+      return 0;
+    if (val > 0xFFFF) {
+      if (*start == '0')	// no leading zeros allowed if > 0xFFFF
+	return 0;
+    }
+    else if (p - start != 4)	// otherwise, check for exactly 4 hex digits
+      return 0;
+    if (*p == '\0')
+      break;
+    p++;
+  }
+  return u;
+}
diff --git a/contrib/groff/src/roff/troff/unicode.h b/contrib/groff/src/roff/troff/unicode.h
new file mode 100644
index 0000000..846a70e
--- /dev/null
+++ b/contrib/groff/src/roff/troff/unicode.h
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+/* Copyright (C) 2002
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg <wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+extern const char *glyph_name_to_unicode(const char *);
+extern const char *unicode_to_glyph_name(const char *);
+extern const char *decompose_unicode(const char *);
+
+extern const char *check_unicode_name(const char *);
diff --git a/contrib/groff/src/roff/troff/uniglyph.cpp b/contrib/groff/src/roff/troff/uniglyph.cpp
new file mode 100644
index 0000000..3428605
--- /dev/null
+++ b/contrib/groff/src/roff/troff/uniglyph.cpp
@@ -0,0 +1,503 @@
+// -*- C++ -*-
+/* Copyright (C) 2002, 2003
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg <wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+#include "stringclass.h"
+#include "ptable.h"
+
+#include "unicode.h"
+
+struct unicode_to_glyph {
+  char *value;
+};
+
+declare_ptable(unicode_to_glyph)
+implement_ptable(unicode_to_glyph)
+
+PTABLE(unicode_to_glyph) unicode_to_glyph_table;
+
+struct {
+  const char *key;
+  const char *value;
+} unicode_to_glyph_list[] = {
+  { "0021", "!" },
+//{ "0022", "\"" },
+  { "0022", "dq" },
+//{ "0023", "#" },
+  { "0023", "sh" },
+//{ "0024", "$" },
+  { "0024", "Do" },
+  { "0025", "%" },
+  { "0026", "&" },
+  { "0027", "aq" },
+  { "0028", "(" },
+  { "0029", ")" },
+  { "002A", "*" },
+//{ "002B", "+" },
+  { "002B", "pl" },
+  { "002C", "," },
+  { "002E", "." },
+//{ "002F", "/" },
+  { "002F", "sl" },
+  { "0030", "0" },
+  { "0031", "1" },
+  { "0032", "2" },
+  { "0033", "3" },
+  { "0034", "4" },
+  { "0035", "5" },
+  { "0036", "6" },
+  { "0037", "7" },
+  { "0038", "8" },
+  { "0039", "9" },
+  { "003A", ":" },
+  { "003B", ";" },
+  { "003C", "<" },
+//{ "003D", "=" },
+  { "003D", "eq" },
+  { "003D_0338", "!=" },
+  { "003E", ">" },
+  { "003F", "?" },
+//{ "0040", "@" },
+  { "0040", "at" },
+  { "0041", "A" },
+  { "0041_0300", "`A" },
+  { "0041_0301", "'A" },
+  { "0041_0302", "^A" },
+  { "0041_0303", "~A" },
+  { "0041_0308", ":A" },
+  { "0041_030A", "oA" },
+  { "0042", "B" },
+  { "0043", "C" },
+  { "0043_0301", "'C" },
+  { "0043_0327", ",C" },
+  { "0044", "D" },
+  { "0045", "E" },
+  { "0045_0300", "`E" },
+  { "0045_0301", "'E" },
+  { "0045_0302", "^E" },
+  { "0045_0308", ":E" },
+  { "0046", "F" },
+  { "0047", "G" },
+  { "0048", "H" },
+  { "0049", "I" },
+  { "0049_0300", "`I" },
+  { "0049_0301", "'I" },
+  { "0049_0302", "^I" },
+  { "0049_0308", ":I" },
+  { "004A", "J" },
+  { "004B", "K" },
+  { "004C", "L" },
+  { "004D", "M" },
+  { "004E", "N" },
+  { "004E_0303", "~N" },
+  { "004F", "O" },
+  { "004F_0300", "`O" },
+  { "004F_0301", "'O" },
+  { "004F_0302", "^O" },
+  { "004F_0303", "~O" },
+  { "004F_0308", ":O" },
+  { "0050", "P" },
+  { "0051", "Q" },
+  { "0052", "R" },
+  { "0053", "S" },
+  { "0053_030C", "vS" },
+  { "0054", "T" },
+  { "0055", "U" },
+  { "0055_0300", "`U" },
+  { "0055_0301", "'U" },
+  { "0055_0302", "^U" },
+  { "0055_0308", ":U" },
+  { "0056", "V" },
+  { "0057", "W" },
+  { "0058", "X" },
+  { "0059", "Y" },
+  { "0059_0301", "'Y" },
+  { "0059_0308", ":Y" },
+  { "005A", "Z" },
+  { "005A_030C", "vZ" },
+  { "005B", "lB" },
+//{ "005B", "[" },
+  { "005C", "rs" },
+//{ "005C", "\\" },
+  { "005D", "rB" },
+//{ "005D", "]" },
+//{ "005E", "^" },
+//{ "005E", "a^" },
+  { "005E", "ha" },
+//{ "005F", "_" },
+//{ "005F", "ru" },
+  { "005F", "ul" },
+  { "0060", "ga" },
+//{ "0060", "\\`" },
+  { "0061", "a" },
+  { "0061_0300", "`a" },
+  { "0061_0301", "'a" },
+  { "0061_0302", "^a" },
+  { "0061_0303", "~a" },
+  { "0061_0308", ":a" },
+  { "0061_030A", "oa" },
+  { "0062", "b" },
+  { "0063", "c" },
+  { "0063_0301", "'c" },
+  { "0063_0327", ",c" },
+  { "0064", "d" },
+  { "0065", "e" },
+  { "0065_0300", "`e" },
+  { "0065_0301", "'e" },
+  { "0065_0302", "^e" },
+  { "0065_0308", ":e" },
+  { "0066", "f" },
+  { "0066_0066", "ff" },
+  { "0066_0066_0069", "Fi" },
+  { "0066_0066_006C", "Fl" },
+  { "0066_0069", "fi" },
+  { "0066_006C", "fl" },
+  { "0067", "g" },
+  { "0068", "h" },
+  { "0069", "i" },
+  { "0069_0300", "`i" },
+  { "0069_0301", "'i" },
+  { "0069_0302", "^i" },
+  { "0069_0308", ":i" },
+  { "006A", "j" },
+  { "006B", "k" },
+  { "006C", "l" },
+  { "006D", "m" },
+  { "006E", "n" },
+  { "006E_0303", "~n" },
+  { "006F", "o" },
+  { "006F_0300", "`o" },
+  { "006F_0301", "'o" },
+  { "006F_0302", "^o" },
+  { "006F_0303", "~o" },
+  { "006F_0308", ":o" },
+  { "0070", "p" },
+  { "0071", "q" },
+  { "0072", "r" },
+  { "0073", "s" },
+  { "0073_030C", "vs" },
+  { "0074", "t" },
+  { "0075", "u" },
+  { "0075_0300", "`u" },
+  { "0075_0301", "'u" },
+  { "0075_0302", "^u" },
+  { "0075_0308", ":u" },
+  { "0076", "v" },
+  { "0077", "w" },
+  { "0078", "x" },
+  { "0079", "y" },
+  { "0079_0301", "'y" },
+  { "0079_0308", ":y" },
+  { "007A", "z" },
+  { "007A_030C", "vz" },
+  { "007B", "lC" },
+//{ "007B", "{" },
+  { "007C", "ba" },
+//{ "007C", "or" },
+//{ "007C", "|" },
+  { "007D", "rC" },
+//{ "007D", "}" },
+//{ "007E", "a~" },
+  { "007E", "ti" },
+//{ "007E", "~" },
+  { "00A1", "r!" },
+  { "00A2", "ct" },
+  { "00A3", "Po" },
+  { "00A4", "Cs" },
+  { "00A5", "Ye" },
+  { "00A6", "bb" },
+  { "00A7", "sc" },
+  { "00A8", "ad" },
+  { "00A9", "co" },
+  { "00AA", "Of" },
+  { "00AB", "Fo" },
+  { "00AC", "no" },
+//{ "00AC", "tno" },
+  { "00AD", "shc" },
+  { "00AE", "rg" },
+  { "00AF", "a-" },
+  { "00B0", "de" },
+  { "00B1", "+-" },
+//{ "00B1", "t+-" },
+  { "00B2", "S2" },
+  { "00B3", "S3" },
+  { "00B4", "aa" },
+//{ "00B4", "\\'" },
+  { "00B5", "mc" },
+  { "00B6", "ps" },
+  { "00B7", "pc" },
+  { "00B8", "ac" },
+  { "00B9", "S1" },
+  { "00BA", "Om" },
+  { "00BB", "Fc" },
+  { "00BC", "14" },
+  { "00BD", "12" },
+  { "00BE", "34" },
+  { "00BF", "r?" },
+  { "00C6", "AE" },
+  { "00D0", "-D" },
+  { "00D7", "mu" },
+//{ "00D7", "tmu" },
+  { "00D8", "/O" },
+  { "00DE", "TP" },
+  { "00DF", "ss" },
+  { "00E6", "ae" },
+  { "00F0", "Sd" },
+  { "00F7", "di" },
+//{ "00F7", "tdi" },
+  { "00F8", "/o" },
+  { "00FE", "Tp" },
+  { "0131", ".i" },
+  { "0132", "IJ" },
+  { "0133", "ij" },
+  { "0141", "/L" },
+  { "0142", "/l" },
+  { "0152", "OE" },
+  { "0153", "oe" },
+  { "0192", "Fn" },
+  { "02C7", "ah" },
+  { "02D8", "ab" },
+  { "02D9", "a." },
+  { "02DA", "ao" },
+  { "02DB", "ho" },
+  { "02DD", "a\"" },
+  { "0391", "*A" },
+  { "0392", "*B" },
+  { "0393", "*G" },
+  { "0394", "*D" },
+  { "0395", "*E" },
+  { "0396", "*Z" },
+  { "0397", "*Y" },
+  { "0398", "*H" },
+  { "0399", "*I" },
+  { "039A", "*K" },
+  { "039B", "*L" },
+  { "039C", "*M" },
+  { "039D", "*N" },
+  { "039E", "*C" },
+  { "039F", "*O" },
+  { "03A0", "*P" },
+  { "03A1", "*R" },
+  { "03A3", "*S" },
+  { "03A4", "*T" },
+  { "03A5", "*U" },
+  { "03A6", "*F" },
+  { "03A7", "*X" },
+  { "03A8", "*Q" },
+  { "03A9", "*W" },
+  { "03B1", "*a" },
+  { "03B2", "*b" },
+  { "03B3", "*g" },
+  { "03B4", "*d" },
+  { "03B5", "*e" },
+  { "03B6", "*z" },
+  { "03B7", "*y" },
+  { "03B8", "*h" },
+  { "03B9", "*i" },
+  { "03BA", "*k" },
+  { "03BB", "*l" },
+  { "03BC", "*m" },
+  { "03BD", "*n" },
+  { "03BE", "*c" },
+  { "03BF", "*o" },
+  { "03C0", "*p" },
+  { "03C1", "*r" },
+  { "03C2", "ts" },
+  { "03C3", "*s" },
+  { "03C4", "*t" },
+  { "03C5", "*u" },
+  { "03C6", "*f" },
+  { "03C7", "*x" },
+  { "03C8", "*q" },
+  { "03C9", "*w" },
+  { "03D1", "+h" },
+  { "03D5", "+f" },
+  { "03D6", "+p" },
+  { "03F5", "+e" },
+//{ "2010", "-" },
+  { "2010", "hy" },
+  { "2013", "en" },
+  { "2014", "em" },
+//{ "2018", "`" },
+  { "2018", "oq" },
+//{ "2019", "'" },
+  { "2019", "cq" },
+  { "201A", "bq" },
+  { "201C", "lq" },
+  { "201D", "rq" },
+  { "201E", "Bq" },
+  { "2020", "dg" },
+  { "2021", "dd" },
+  { "2022", "bu" },
+  { "2030", "%0" },
+  { "2032", "fm" },
+  { "2033", "sd" },
+  { "2039", "fo" },
+  { "203A", "fc" },
+  { "203E", "rn" },
+  { "2044", "f/" },
+  { "20AC", "Eu" },
+//{ "20AC", "eu" },
+  { "210F", "-h" },
+//{ "210F", "hbar" },
+  { "2111", "Im" },
+  { "2118", "wp" },
+  { "211C", "Re" },
+  { "2122", "tm" },
+  { "2135", "Ah" },
+  { "215B", "18" },
+  { "215C", "38" },
+  { "215D", "58" },
+  { "215E", "78" },
+  { "2190", "<-" },
+  { "2191", "ua" },
+  { "2192", "->" },
+  { "2193", "da" },
+  { "2194", "<>" },
+  { "2195", "va" },
+  { "21B5", "CR" },
+  { "21D0", "lA" },
+  { "21D1", "uA" },
+  { "21D2", "rA" },
+  { "21D3", "dA" },
+  { "21D4", "hA" },
+  { "21D5", "vA" },
+  { "2200", "fa" },
+  { "2202", "pd" },
+  { "2203", "te" },
+  { "2205", "es" },
+  { "2207", "gr" },
+  { "2208", "mo" },
+  { "2208_0338", "nm" },
+  { "220B", "st" },
+  { "220F", "product" },
+  { "2211", "sum" },
+  { "2212", "mi" },
+//{ "2212", "\\-" },
+  { "2213", "-+" },
+  { "2217", "**" },
+  { "221A", "sr" },
+  { "221D", "pt" },
+  { "221E", "if" },
+  { "2220", "/_" },
+  { "2227", "AN" },
+  { "2228", "OR" },
+  { "2229", "ca" },
+  { "222A", "cu" },
+  { "222B", "is" },
+//{ "222B", "integral" },
+//{ "2234", "3d" },
+  { "2234", "tf" },
+  { "223C", "ap" },
+  { "2243", "|=" },
+  { "2245", "=~" },
+//{ "2248", "~=" },
+  { "2248", "~~" },
+  { "2261", "==" },
+  { "2261_0338", "ne" },
+  { "2264", "<=" },
+  { "2265", ">=" },
+  { "226A", ">>" },
+  { "226B", "<<" },
+  { "2282", "sb" },
+  { "2282_0338", "nb" },
+  { "2283", "sp" },
+  { "2283_0338", "nc" },
+  { "2286", "ib" },
+  { "2287", "ip" },
+  { "2295", "c+" },
+  { "2297", "c*" },
+  { "22A5", "pp" },
+  { "22C5", "md" },
+  { "2308", "lc" },
+  { "2309", "rc" },
+  { "230A", "lf" },
+  { "230B", "rf" },
+  { "239B", "parenlefttp" },
+  { "239C", "parenleftex" },
+  { "239D", "parenleftbt" },
+  { "239E", "parenrighttp" },
+  { "239F", "parenrightex" },
+  { "23A0", "parenrightbt" },
+//{ "23A1", "bracketlefttp" },
+  { "23A2", "bracketleftex" },
+//{ "23A3", "bracketleftbt" },
+//{ "23A4", "bracketrighttp" },
+  { "23A5", "bracketrightex" },
+//{ "23A6", "bracketrightbt" },
+  { "23A7", "lt" },
+//{ "23A7", "bracelefttp" },
+  { "23A8", "lk" },
+//{ "23A8", "braceleftmid" },
+  { "23A9", "lb" },
+//{ "23A9", "braceleftbt" },
+  { "23AA", "bv" },
+//{ "23AA", "braceex" },
+//{ "23AA", "braceleftex" },
+//{ "23AA", "bracerightex" },
+  { "23AB", "rt" },
+//{ "23AB", "bracerighttp" },
+  { "23AC", "rk" },
+//{ "23AC", "bracerightmid" },
+  { "23AD", "rb" },
+//{ "23AD", "bracerightbt" },
+  { "23AF", "an" },
+  { "2502", "br" },
+  { "251D", "rk" },
+  { "2525", "lk" },
+  { "256D", "lt" },
+  { "256E", "rt" },
+  { "256F", "rb" },
+  { "2570", "lb" },
+  { "25A1", "sq" },
+  { "25CA", "lz" },
+  { "25CB", "ci" },
+  { "261C", "lh" },
+  { "261E", "rh" },
+  { "2660", "SP" },
+  { "2663", "CL" },
+  { "2665", "HE" },
+  { "2666", "DI" },
+  { "2713", "OK" },
+  { "27E8", "la" },
+  { "27E9", "ra" },
+};
+
+// global constructor
+static struct unicode_to_glyph_init {
+  unicode_to_glyph_init();
+} _unicode_to_glyph_init;
+
+unicode_to_glyph_init::unicode_to_glyph_init() {
+  for (unsigned int i = 0;
+       i < sizeof(unicode_to_glyph_list)/sizeof(unicode_to_glyph_list[0]);
+       i++) {
+    unicode_to_glyph *utg = new unicode_to_glyph[1];
+    utg->value = (char *)unicode_to_glyph_list[i].value;
+    unicode_to_glyph_table.define(unicode_to_glyph_list[i].key, utg);
+  }
+}
+
+const char *unicode_to_glyph_name(const char *s)
+{
+  unicode_to_glyph *result = unicode_to_glyph_table.lookup(s);
+  return result ? result->value : 0;
+}
diff --git a/contrib/groff/src/roff/troff/uniuni.cpp b/contrib/groff/src/roff/troff/uniuni.cpp
new file mode 100644
index 0000000..3f4baa4
--- /dev/null
+++ b/contrib/groff/src/roff/troff/uniuni.cpp
@@ -0,0 +1,1994 @@
+// -*- C++ -*-
+/* Copyright (C) 2002, 2003
+   Free Software Foundation, Inc.
+     Written by Werner Lemberg <wl@gnu.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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+// This code has been algorithmically derived from the file
+// UnicodeData-3.2.0.txt, available from unicode.org.
+
+#include "lib.h"
+#include "stringclass.h"
+#include "ptable.h"
+
+#include "unicode.h"
+
+struct unicode_decompose {
+  char *value;
+};
+
+declare_ptable(unicode_decompose)
+implement_ptable(unicode_decompose)
+
+PTABLE(unicode_decompose) unicode_decompose_table;
+
+// the first digit in the composite string gives the number of composites
+
+struct {
+  const char *key;
+  const char *value;
+} unicode_decompose_list[] = {
+  { "00C0", "20041_0300" },
+  { "00C1", "20041_0301" },
+  { "00C2", "20041_0302" },
+  { "00C3", "20041_0303" },
+  { "00C4", "20041_0308" },
+  { "00C5", "20041_030A" },
+  { "00C7", "20043_0327" },
+  { "00C8", "20045_0300" },
+  { "00C9", "20045_0301" },
+  { "00CA", "20045_0302" },
+  { "00CB", "20045_0308" },
+  { "00CC", "20049_0300" },
+  { "00CD", "20049_0301" },
+  { "00CE", "20049_0302" },
+  { "00CF", "20049_0308" },
+  { "00D1", "2004E_0303" },
+  { "00D2", "2004F_0300" },
+  { "00D3", "2004F_0301" },
+  { "00D4", "2004F_0302" },
+  { "00D5", "2004F_0303" },
+  { "00D6", "2004F_0308" },
+  { "00D9", "20055_0300" },
+  { "00DA", "20055_0301" },
+  { "00DB", "20055_0302" },
+  { "00DC", "20055_0308" },
+  { "00DD", "20059_0301" },
+  { "00E0", "20061_0300" },
+  { "00E1", "20061_0301" },
+  { "00E2", "20061_0302" },
+  { "00E3", "20061_0303" },
+  { "00E4", "20061_0308" },
+  { "00E5", "20061_030A" },
+  { "00E7", "20063_0327" },
+  { "00E8", "20065_0300" },
+  { "00E9", "20065_0301" },
+  { "00EA", "20065_0302" },
+  { "00EB", "20065_0308" },
+  { "00EC", "20069_0300" },
+  { "00ED", "20069_0301" },
+  { "00EE", "20069_0302" },
+  { "00EF", "20069_0308" },
+  { "00F1", "2006E_0303" },
+  { "00F2", "2006F_0300" },
+  { "00F3", "2006F_0301" },
+  { "00F4", "2006F_0302" },
+  { "00F5", "2006F_0303" },
+  { "00F6", "2006F_0308" },
+  { "00F9", "20075_0300" },
+  { "00FA", "20075_0301" },
+  { "00FB", "20075_0302" },
+  { "00FC", "20075_0308" },
+  { "00FD", "20079_0301" },
+  { "00FF", "20079_0308" },
+  { "0100", "20041_0304" },
+  { "0101", "20061_0304" },
+  { "0102", "20041_0306" },
+  { "0103", "20061_0306" },
+  { "0104", "20041_0328" },
+  { "0105", "20061_0328" },
+  { "0106", "20043_0301" },
+  { "0107", "20063_0301" },
+  { "0108", "20043_0302" },
+  { "0109", "20063_0302" },
+  { "010A", "20043_0307" },
+  { "010B", "20063_0307" },
+  { "010C", "20043_030C" },
+  { "010D", "20063_030C" },
+  { "010E", "20044_030C" },
+  { "010F", "20064_030C" },
+  { "0112", "20045_0304" },
+  { "0113", "20065_0304" },
+  { "0114", "20045_0306" },
+  { "0115", "20065_0306" },
+  { "0116", "20045_0307" },
+  { "0117", "20065_0307" },
+  { "0118", "20045_0328" },
+  { "0119", "20065_0328" },
+  { "011A", "20045_030C" },
+  { "011B", "20065_030C" },
+  { "011C", "20047_0302" },
+  { "011D", "20067_0302" },
+  { "011E", "20047_0306" },
+  { "011F", "20067_0306" },
+  { "0120", "20047_0307" },
+  { "0121", "20067_0307" },
+  { "0122", "20047_0327" },
+  { "0123", "20067_0327" },
+  { "0124", "20048_0302" },
+  { "0125", "20068_0302" },
+  { "0128", "20049_0303" },
+  { "0129", "20069_0303" },
+  { "012A", "20049_0304" },
+  { "012B", "20069_0304" },
+  { "012C", "20049_0306" },
+  { "012D", "20069_0306" },
+  { "012E", "20049_0328" },
+  { "012F", "20069_0328" },
+  { "0130", "20049_0307" },
+  { "0134", "2004A_0302" },
+  { "0135", "2006A_0302" },
+  { "0136", "2004B_0327" },
+  { "0137", "2006B_0327" },
+  { "0139", "2004C_0301" },
+  { "013A", "2006C_0301" },
+  { "013B", "2004C_0327" },
+  { "013C", "2006C_0327" },
+  { "013D", "2004C_030C" },
+  { "013E", "2006C_030C" },
+  { "0143", "2004E_0301" },
+  { "0144", "2006E_0301" },
+  { "0145", "2004E_0327" },
+  { "0146", "2006E_0327" },
+  { "0147", "2004E_030C" },
+  { "0148", "2006E_030C" },
+  { "014C", "2004F_0304" },
+  { "014D", "2006F_0304" },
+  { "014E", "2004F_0306" },
+  { "014F", "2006F_0306" },
+  { "0150", "2004F_030B" },
+  { "0151", "2006F_030B" },
+  { "0154", "20052_0301" },
+  { "0155", "20072_0301" },
+  { "0156", "20052_0327" },
+  { "0157", "20072_0327" },
+  { "0158", "20052_030C" },
+  { "0159", "20072_030C" },
+  { "015A", "20053_0301" },
+  { "015B", "20073_0301" },
+  { "015C", "20053_0302" },
+  { "015D", "20073_0302" },
+  { "015E", "20053_0327" },
+  { "015F", "20073_0327" },
+  { "0160", "20053_030C" },
+  { "0161", "20073_030C" },
+  { "0162", "20054_0327" },
+  { "0163", "20074_0327" },
+  { "0164", "20054_030C" },
+  { "0165", "20074_030C" },
+  { "0168", "20055_0303" },
+  { "0169", "20075_0303" },
+  { "016A", "20055_0304" },
+  { "016B", "20075_0304" },
+  { "016C", "20055_0306" },
+  { "016D", "20075_0306" },
+  { "016E", "20055_030A" },
+  { "016F", "20075_030A" },
+  { "0170", "20055_030B" },
+  { "0171", "20075_030B" },
+  { "0172", "20055_0328" },
+  { "0173", "20075_0328" },
+  { "0174", "20057_0302" },
+  { "0175", "20077_0302" },
+  { "0176", "20059_0302" },
+  { "0177", "20079_0302" },
+  { "0178", "20059_0308" },
+  { "0179", "2005A_0301" },
+  { "017A", "2007A_0301" },
+  { "017B", "2005A_0307" },
+  { "017C", "2007A_0307" },
+  { "017D", "2005A_030C" },
+  { "017E", "2007A_030C" },
+  { "01A0", "2004F_031B" },
+  { "01A1", "2006F_031B" },
+  { "01AF", "20055_031B" },
+  { "01B0", "20075_031B" },
+  { "01CD", "20041_030C" },
+  { "01CE", "20061_030C" },
+  { "01CF", "20049_030C" },
+  { "01D0", "20069_030C" },
+  { "01D1", "2004F_030C" },
+  { "01D2", "2006F_030C" },
+  { "01D3", "20055_030C" },
+  { "01D4", "20075_030C" },
+  { "01D5", "30055_0308_0304" },
+  { "01D6", "30075_0308_0304" },
+  { "01D7", "30055_0308_0301" },
+  { "01D8", "30075_0308_0301" },
+  { "01D9", "30055_0308_030C" },
+  { "01DA", "30075_0308_030C" },
+  { "01DB", "30055_0308_0300" },
+  { "01DC", "30075_0308_0300" },
+  { "01DE", "30041_0308_0304" },
+  { "01DF", "30061_0308_0304" },
+  { "01E0", "30041_0307_0304" },
+  { "01E1", "30061_0307_0304" },
+  { "01E2", "200C6_0304" },
+  { "01E3", "200E6_0304" },
+  { "01E6", "20047_030C" },
+  { "01E7", "20067_030C" },
+  { "01E8", "2004B_030C" },
+  { "01E9", "2006B_030C" },
+  { "01EA", "2004F_0328" },
+  { "01EB", "2006F_0328" },
+  { "01EC", "3004F_0328_0304" },
+  { "01ED", "3006F_0328_0304" },
+  { "01EE", "201B7_030C" },
+  { "01EF", "20292_030C" },
+  { "01F0", "2006A_030C" },
+  { "01F4", "20047_0301" },
+  { "01F5", "20067_0301" },
+  { "01F8", "2004E_0300" },
+  { "01F9", "2006E_0300" },
+  { "01FA", "30041_030A_0301" },
+  { "01FB", "30061_030A_0301" },
+  { "01FC", "200C6_0301" },
+  { "01FD", "200E6_0301" },
+  { "01FE", "200D8_0301" },
+  { "01FF", "200F8_0301" },
+  { "0200", "20041_030F" },
+  { "0201", "20061_030F" },
+  { "0202", "20041_0311" },
+  { "0203", "20061_0311" },
+  { "0204", "20045_030F" },
+  { "0205", "20065_030F" },
+  { "0206", "20045_0311" },
+  { "0207", "20065_0311" },
+  { "0208", "20049_030F" },
+  { "0209", "20069_030F" },
+  { "020A", "20049_0311" },
+  { "020B", "20069_0311" },
+  { "020C", "2004F_030F" },
+  { "020D", "2006F_030F" },
+  { "020E", "2004F_0311" },
+  { "020F", "2006F_0311" },
+  { "0210", "20052_030F" },
+  { "0211", "20072_030F" },
+  { "0212", "20052_0311" },
+  { "0213", "20072_0311" },
+  { "0214", "20055_030F" },
+  { "0215", "20075_030F" },
+  { "0216", "20055_0311" },
+  { "0217", "20075_0311" },
+  { "0218", "20053_0326" },
+  { "0219", "20073_0326" },
+  { "021A", "20054_0326" },
+  { "021B", "20074_0326" },
+  { "021E", "20048_030C" },
+  { "021F", "20068_030C" },
+  { "0226", "20041_0307" },
+  { "0227", "20061_0307" },
+  { "0228", "20045_0327" },
+  { "0229", "20065_0327" },
+  { "022A", "3004F_0308_0304" },
+  { "022B", "3006F_0308_0304" },
+  { "022C", "3004F_0303_0304" },
+  { "022D", "3006F_0303_0304" },
+  { "022E", "2004F_0307" },
+  { "022F", "2006F_0307" },
+  { "0230", "3004F_0307_0304" },
+  { "0231", "3006F_0307_0304" },
+  { "0232", "20059_0304" },
+  { "0233", "20079_0304" },
+  { "0340", "10300" },
+  { "0341", "10301" },
+  { "0343", "10313" },
+  { "0344", "20308_0301" },
+  { "0374", "102B9" },
+  { "037E", "1003B" },
+  { "0385", "200A8_0301" },
+  { "0386", "20391_0301" },
+  { "0387", "100B7" },
+  { "0388", "20395_0301" },
+  { "0389", "20397_0301" },
+  { "038A", "20399_0301" },
+  { "038C", "2039F_0301" },
+  { "038E", "203A5_0301" },
+  { "038F", "203A9_0301" },
+  { "0390", "303B9_0308_0301" },
+  { "03AA", "20399_0308" },
+  { "03AB", "203A5_0308" },
+  { "03AC", "203B1_0301" },
+  { "03AD", "203B5_0301" },
+  { "03AE", "203B7_0301" },
+  { "03AF", "203B9_0301" },
+  { "03B0", "303C5_0308_0301" },
+  { "03CA", "203B9_0308" },
+  { "03CB", "203C5_0308" },
+  { "03CC", "203BF_0301" },
+  { "03CD", "203C5_0301" },
+  { "03CE", "203C9_0301" },
+  { "03D3", "203D2_0301" },
+  { "03D4", "203D2_0308" },
+  { "0400", "20415_0300" },
+  { "0401", "20415_0308" },
+  { "0403", "20413_0301" },
+  { "0407", "20406_0308" },
+  { "040C", "2041A_0301" },
+  { "040D", "20418_0300" },
+  { "040E", "20423_0306" },
+  { "0419", "20418_0306" },
+  { "0439", "20438_0306" },
+  { "0450", "20435_0300" },
+  { "0451", "20435_0308" },
+  { "0453", "20433_0301" },
+  { "0457", "20456_0308" },
+  { "045C", "2043A_0301" },
+  { "045D", "20438_0300" },
+  { "045E", "20443_0306" },
+  { "0476", "20474_030F" },
+  { "0477", "20475_030F" },
+  { "04C1", "20416_0306" },
+  { "04C2", "20436_0306" },
+  { "04D0", "20410_0306" },
+  { "04D1", "20430_0306" },
+  { "04D2", "20410_0308" },
+  { "04D3", "20430_0308" },
+  { "04D6", "20415_0306" },
+  { "04D7", "20435_0306" },
+  { "04DA", "204D8_0308" },
+  { "04DB", "204D9_0308" },
+  { "04DC", "20416_0308" },
+  { "04DD", "20436_0308" },
+  { "04DE", "20417_0308" },
+  { "04DF", "20437_0308" },
+  { "04E2", "20418_0304" },
+  { "04E3", "20438_0304" },
+  { "04E4", "20418_0308" },
+  { "04E5", "20438_0308" },
+  { "04E6", "2041E_0308" },
+  { "04E7", "2043E_0308" },
+  { "04EA", "204E8_0308" },
+  { "04EB", "204E9_0308" },
+  { "04EC", "2042D_0308" },
+  { "04ED", "2044D_0308" },
+  { "04EE", "20423_0304" },
+  { "04EF", "20443_0304" },
+  { "04F0", "20423_0308" },
+  { "04F1", "20443_0308" },
+  { "04F2", "20423_030B" },
+  { "04F3", "20443_030B" },
+  { "04F4", "20427_0308" },
+  { "04F5", "20447_0308" },
+  { "04F8", "2042B_0308" },
+  { "04F9", "2044B_0308" },
+  { "0622", "20627_0653" },
+  { "0623", "20627_0654" },
+  { "0624", "20648_0654" },
+  { "0625", "20627_0655" },
+  { "0626", "2064A_0654" },
+  { "06C0", "206D5_0654" },
+  { "06C2", "206C1_0654" },
+  { "06D3", "206D2_0654" },
+  { "0929", "20928_093C" },
+  { "0931", "20930_093C" },
+  { "0934", "20933_093C" },
+  { "0958", "20915_093C" },
+  { "0959", "20916_093C" },
+  { "095A", "20917_093C" },
+  { "095B", "2091C_093C" },
+  { "095C", "20921_093C" },
+  { "095D", "20922_093C" },
+  { "095E", "2092B_093C" },
+  { "095F", "2092F_093C" },
+  { "09CB", "209C7_09BE" },
+  { "09CC", "209C7_09D7" },
+  { "09DC", "209A1_09BC" },
+  { "09DD", "209A2_09BC" },
+  { "09DF", "209AF_09BC" },
+  { "0A33", "20A32_0A3C" },
+  { "0A36", "20A38_0A3C" },
+  { "0A59", "20A16_0A3C" },
+  { "0A5A", "20A17_0A3C" },
+  { "0A5B", "20A1C_0A3C" },
+  { "0A5E", "20A2B_0A3C" },
+  { "0B48", "20B47_0B56" },
+  { "0B4B", "20B47_0B3E" },
+  { "0B4C", "20B47_0B57" },
+  { "0B5C", "20B21_0B3C" },
+  { "0B5D", "20B22_0B3C" },
+  { "0B94", "20B92_0BD7" },
+  { "0BCA", "20BC6_0BBE" },
+  { "0BCB", "20BC7_0BBE" },
+  { "0BCC", "20BC6_0BD7" },
+  { "0C48", "20C46_0C56" },
+  { "0CC0", "20CBF_0CD5" },
+  { "0CC7", "20CC6_0CD5" },
+  { "0CC8", "20CC6_0CD6" },
+  { "0CCA", "20CC6_0CC2" },
+  { "0CCB", "30CC6_0CC2_0CD5" },
+  { "0D4A", "20D46_0D3E" },
+  { "0D4B", "20D47_0D3E" },
+  { "0D4C", "20D46_0D57" },
+  { "0DDA", "20DD9_0DCA" },
+  { "0DDC", "20DD9_0DCF" },
+  { "0DDD", "30DD9_0DCF_0DCA" },
+  { "0DDE", "20DD9_0DDF" },
+  { "0F43", "20F42_0FB7" },
+  { "0F4D", "20F4C_0FB7" },
+  { "0F52", "20F51_0FB7" },
+  { "0F57", "20F56_0FB7" },
+  { "0F5C", "20F5B_0FB7" },
+  { "0F69", "20F40_0FB5" },
+  { "0F73", "20F71_0F72" },
+  { "0F75", "20F71_0F74" },
+  { "0F76", "20FB2_0F80" },
+  { "0F78", "20FB3_0F80" },
+  { "0F81", "20F71_0F80" },
+  { "0F93", "20F92_0FB7" },
+  { "0F9D", "20F9C_0FB7" },
+  { "0FA2", "20FA1_0FB7" },
+  { "0FA7", "20FA6_0FB7" },
+  { "0FAC", "20FAB_0FB7" },
+  { "0FB9", "20F90_0FB5" },
+  { "1026", "21025_102E" },
+  { "1E00", "20041_0325" },
+  { "1E01", "20061_0325" },
+  { "1E02", "20042_0307" },
+  { "1E03", "20062_0307" },
+  { "1E04", "20042_0323" },
+  { "1E05", "20062_0323" },
+  { "1E06", "20042_0331" },
+  { "1E07", "20062_0331" },
+  { "1E08", "30043_0327_0301" },
+  { "1E09", "30063_0327_0301" },
+  { "1E0A", "20044_0307" },
+  { "1E0B", "20064_0307" },
+  { "1E0C", "20044_0323" },
+  { "1E0D", "20064_0323" },
+  { "1E0E", "20044_0331" },
+  { "1E0F", "20064_0331" },
+  { "1E10", "20044_0327" },
+  { "1E11", "20064_0327" },
+  { "1E12", "20044_032D" },
+  { "1E13", "20064_032D" },
+  { "1E14", "30045_0304_0300" },
+  { "1E15", "30065_0304_0300" },
+  { "1E16", "30045_0304_0301" },
+  { "1E17", "30065_0304_0301" },
+  { "1E18", "20045_032D" },
+  { "1E19", "20065_032D" },
+  { "1E1A", "20045_0330" },
+  { "1E1B", "20065_0330" },
+  { "1E1C", "30045_0327_0306" },
+  { "1E1D", "30065_0327_0306" },
+  { "1E1E", "20046_0307" },
+  { "1E1F", "20066_0307" },
+  { "1E20", "20047_0304" },
+  { "1E21", "20067_0304" },
+  { "1E22", "20048_0307" },
+  { "1E23", "20068_0307" },
+  { "1E24", "20048_0323" },
+  { "1E25", "20068_0323" },
+  { "1E26", "20048_0308" },
+  { "1E27", "20068_0308" },
+  { "1E28", "20048_0327" },
+  { "1E29", "20068_0327" },
+  { "1E2A", "20048_032E" },
+  { "1E2B", "20068_032E" },
+  { "1E2C", "20049_0330" },
+  { "1E2D", "20069_0330" },
+  { "1E2E", "30049_0308_0301" },
+  { "1E2F", "30069_0308_0301" },
+  { "1E30", "2004B_0301" },
+  { "1E31", "2006B_0301" },
+  { "1E32", "2004B_0323" },
+  { "1E33", "2006B_0323" },
+  { "1E34", "2004B_0331" },
+  { "1E35", "2006B_0331" },
+  { "1E36", "2004C_0323" },
+  { "1E37", "2006C_0323" },
+  { "1E38", "3004C_0323_0304" },
+  { "1E39", "3006C_0323_0304" },
+  { "1E3A", "2004C_0331" },
+  { "1E3B", "2006C_0331" },
+  { "1E3C", "2004C_032D" },
+  { "1E3D", "2006C_032D" },
+  { "1E3E", "2004D_0301" },
+  { "1E3F", "2006D_0301" },
+  { "1E40", "2004D_0307" },
+  { "1E41", "2006D_0307" },
+  { "1E42", "2004D_0323" },
+  { "1E43", "2006D_0323" },
+  { "1E44", "2004E_0307" },
+  { "1E45", "2006E_0307" },
+  { "1E46", "2004E_0323" },
+  { "1E47", "2006E_0323" },
+  { "1E48", "2004E_0331" },
+  { "1E49", "2006E_0331" },
+  { "1E4A", "2004E_032D" },
+  { "1E4B", "2006E_032D" },
+  { "1E4C", "3004F_0303_0301" },
+  { "1E4D", "3006F_0303_0301" },
+  { "1E4E", "3004F_0303_0308" },
+  { "1E4F", "3006F_0303_0308" },
+  { "1E50", "3004F_0304_0300" },
+  { "1E51", "3006F_0304_0300" },
+  { "1E52", "3004F_0304_0301" },
+  { "1E53", "3006F_0304_0301" },
+  { "1E54", "20050_0301" },
+  { "1E55", "20070_0301" },
+  { "1E56", "20050_0307" },
+  { "1E57", "20070_0307" },
+  { "1E58", "20052_0307" },
+  { "1E59", "20072_0307" },
+  { "1E5A", "20052_0323" },
+  { "1E5B", "20072_0323" },
+  { "1E5C", "30052_0323_0304" },
+  { "1E5D", "30072_0323_0304" },
+  { "1E5E", "20052_0331" },
+  { "1E5F", "20072_0331" },
+  { "1E60", "20053_0307" },
+  { "1E61", "20073_0307" },
+  { "1E62", "20053_0323" },
+  { "1E63", "20073_0323" },
+  { "1E64", "30053_0301_0307" },
+  { "1E65", "30073_0301_0307" },
+  { "1E66", "30053_030C_0307" },
+  { "1E67", "30073_030C_0307" },
+  { "1E68", "30053_0323_0307" },
+  { "1E69", "30073_0323_0307" },
+  { "1E6A", "20054_0307" },
+  { "1E6B", "20074_0307" },
+  { "1E6C", "20054_0323" },
+  { "1E6D", "20074_0323" },
+  { "1E6E", "20054_0331" },
+  { "1E6F", "20074_0331" },
+  { "1E70", "20054_032D" },
+  { "1E71", "20074_032D" },
+  { "1E72", "20055_0324" },
+  { "1E73", "20075_0324" },
+  { "1E74", "20055_0330" },
+  { "1E75", "20075_0330" },
+  { "1E76", "20055_032D" },
+  { "1E77", "20075_032D" },
+  { "1E78", "30055_0303_0301" },
+  { "1E79", "30075_0303_0301" },
+  { "1E7A", "30055_0304_0308" },
+  { "1E7B", "30075_0304_0308" },
+  { "1E7C", "20056_0303" },
+  { "1E7D", "20076_0303" },
+  { "1E7E", "20056_0323" },
+  { "1E7F", "20076_0323" },
+  { "1E80", "20057_0300" },
+  { "1E81", "20077_0300" },
+  { "1E82", "20057_0301" },
+  { "1E83", "20077_0301" },
+  { "1E84", "20057_0308" },
+  { "1E85", "20077_0308" },
+  { "1E86", "20057_0307" },
+  { "1E87", "20077_0307" },
+  { "1E88", "20057_0323" },
+  { "1E89", "20077_0323" },
+  { "1E8A", "20058_0307" },
+  { "1E8B", "20078_0307" },
+  { "1E8C", "20058_0308" },
+  { "1E8D", "20078_0308" },
+  { "1E8E", "20059_0307" },
+  { "1E8F", "20079_0307" },
+  { "1E90", "2005A_0302" },
+  { "1E91", "2007A_0302" },
+  { "1E92", "2005A_0323" },
+  { "1E93", "2007A_0323" },
+  { "1E94", "2005A_0331" },
+  { "1E95", "2007A_0331" },
+  { "1E96", "20068_0331" },
+  { "1E97", "20074_0308" },
+  { "1E98", "20077_030A" },
+  { "1E99", "20079_030A" },
+  { "1E9B", "2017F_0307" },
+  { "1EA0", "20041_0323" },
+  { "1EA1", "20061_0323" },
+  { "1EA2", "20041_0309" },
+  { "1EA3", "20061_0309" },
+  { "1EA4", "30041_0302_0301" },
+  { "1EA5", "30061_0302_0301" },
+  { "1EA6", "30041_0302_0300" },
+  { "1EA7", "30061_0302_0300" },
+  { "1EA8", "30041_0302_0309" },
+  { "1EA9", "30061_0302_0309" },
+  { "1EAA", "30041_0302_0303" },
+  { "1EAB", "30061_0302_0303" },
+  { "1EAC", "30041_0323_0302" },
+  { "1EAD", "30061_0323_0302" },
+  { "1EAE", "30041_0306_0301" },
+  { "1EAF", "30061_0306_0301" },
+  { "1EB0", "30041_0306_0300" },
+  { "1EB1", "30061_0306_0300" },
+  { "1EB2", "30041_0306_0309" },
+  { "1EB3", "30061_0306_0309" },
+  { "1EB4", "30041_0306_0303" },
+  { "1EB5", "30061_0306_0303" },
+  { "1EB6", "30041_0323_0306" },
+  { "1EB7", "30061_0323_0306" },
+  { "1EB8", "20045_0323" },
+  { "1EB9", "20065_0323" },
+  { "1EBA", "20045_0309" },
+  { "1EBB", "20065_0309" },
+  { "1EBC", "20045_0303" },
+  { "1EBD", "20065_0303" },
+  { "1EBE", "30045_0302_0301" },
+  { "1EBF", "30065_0302_0301" },
+  { "1EC0", "30045_0302_0300" },
+  { "1EC1", "30065_0302_0300" },
+  { "1EC2", "30045_0302_0309" },
+  { "1EC3", "30065_0302_0309" },
+  { "1EC4", "30045_0302_0303" },
+  { "1EC5", "30065_0302_0303" },
+  { "1EC6", "30045_0323_0302" },
+  { "1EC7", "30065_0323_0302" },
+  { "1EC8", "20049_0309" },
+  { "1EC9", "20069_0309" },
+  { "1ECA", "20049_0323" },
+  { "1ECB", "20069_0323" },
+  { "1ECC", "2004F_0323" },
+  { "1ECD", "2006F_0323" },
+  { "1ECE", "2004F_0309" },
+  { "1ECF", "2006F_0309" },
+  { "1ED0", "3004F_0302_0301" },
+  { "1ED1", "3006F_0302_0301" },
+  { "1ED2", "3004F_0302_0300" },
+  { "1ED3", "3006F_0302_0300" },
+  { "1ED4", "3004F_0302_0309" },
+  { "1ED5", "3006F_0302_0309" },
+  { "1ED6", "3004F_0302_0303" },
+  { "1ED7", "3006F_0302_0303" },
+  { "1ED8", "3004F_0323_0302" },
+  { "1ED9", "3006F_0323_0302" },
+  { "1EDA", "3004F_031B_0301" },
+  { "1EDB", "3006F_031B_0301" },
+  { "1EDC", "3004F_031B_0300" },
+  { "1EDD", "3006F_031B_0300" },
+  { "1EDE", "3004F_031B_0309" },
+  { "1EDF", "3006F_031B_0309" },
+  { "1EE0", "3004F_031B_0303" },
+  { "1EE1", "3006F_031B_0303" },
+  { "1EE2", "3004F_031B_0323" },
+  { "1EE3", "3006F_031B_0323" },
+  { "1EE4", "20055_0323" },
+  { "1EE5", "20075_0323" },
+  { "1EE6", "20055_0309" },
+  { "1EE7", "20075_0309" },
+  { "1EE8", "30055_031B_0301" },
+  { "1EE9", "30075_031B_0301" },
+  { "1EEA", "30055_031B_0300" },
+  { "1EEB", "30075_031B_0300" },
+  { "1EEC", "30055_031B_0309" },
+  { "1EED", "30075_031B_0309" },
+  { "1EEE", "30055_031B_0303" },
+  { "1EEF", "30075_031B_0303" },
+  { "1EF0", "30055_031B_0323" },
+  { "1EF1", "30075_031B_0323" },
+  { "1EF2", "20059_0300" },
+  { "1EF3", "20079_0300" },
+  { "1EF4", "20059_0323" },
+  { "1EF5", "20079_0323" },
+  { "1EF6", "20059_0309" },
+  { "1EF7", "20079_0309" },
+  { "1EF8", "20059_0303" },
+  { "1EF9", "20079_0303" },
+  { "1F00", "203B1_0313" },
+  { "1F01", "203B1_0314" },
+  { "1F02", "303B1_0313_0300" },
+  { "1F03", "303B1_0314_0300" },
+  { "1F04", "303B1_0313_0301" },
+  { "1F05", "303B1_0314_0301" },
+  { "1F06", "303B1_0313_0342" },
+  { "1F07", "303B1_0314_0342" },
+  { "1F08", "20391_0313" },
+  { "1F09", "20391_0314" },
+  { "1F0A", "30391_0313_0300" },
+  { "1F0B", "30391_0314_0300" },
+  { "1F0C", "30391_0313_0301" },
+  { "1F0D", "30391_0314_0301" },
+  { "1F0E", "30391_0313_0342" },
+  { "1F0F", "30391_0314_0342" },
+  { "1F10", "203B5_0313" },
+  { "1F11", "203B5_0314" },
+  { "1F12", "303B5_0313_0300" },
+  { "1F13", "303B5_0314_0300" },
+  { "1F14", "303B5_0313_0301" },
+  { "1F15", "303B5_0314_0301" },
+  { "1F18", "20395_0313" },
+  { "1F19", "20395_0314" },
+  { "1F1A", "30395_0313_0300" },
+  { "1F1B", "30395_0314_0300" },
+  { "1F1C", "30395_0313_0301" },
+  { "1F1D", "30395_0314_0301" },
+  { "1F20", "203B7_0313" },
+  { "1F21", "203B7_0314" },
+  { "1F22", "303B7_0313_0300" },
+  { "1F23", "303B7_0314_0300" },
+  { "1F24", "303B7_0313_0301" },
+  { "1F25", "303B7_0314_0301" },
+  { "1F26", "303B7_0313_0342" },
+  { "1F27", "303B7_0314_0342" },
+  { "1F28", "20397_0313" },
+  { "1F29", "20397_0314" },
+  { "1F2A", "30397_0313_0300" },
+  { "1F2B", "30397_0314_0300" },
+  { "1F2C", "30397_0313_0301" },
+  { "1F2D", "30397_0314_0301" },
+  { "1F2E", "30397_0313_0342" },
+  { "1F2F", "30397_0314_0342" },
+  { "1F30", "203B9_0313" },
+  { "1F31", "203B9_0314" },
+  { "1F32", "303B9_0313_0300" },
+  { "1F33", "303B9_0314_0300" },
+  { "1F34", "303B9_0313_0301" },
+  { "1F35", "303B9_0314_0301" },
+  { "1F36", "303B9_0313_0342" },
+  { "1F37", "303B9_0314_0342" },
+  { "1F38", "20399_0313" },
+  { "1F39", "20399_0314" },
+  { "1F3A", "30399_0313_0300" },
+  { "1F3B", "30399_0314_0300" },
+  { "1F3C", "30399_0313_0301" },
+  { "1F3D", "30399_0314_0301" },
+  { "1F3E", "30399_0313_0342" },
+  { "1F3F", "30399_0314_0342" },
+  { "1F40", "203BF_0313" },
+  { "1F41", "203BF_0314" },
+  { "1F42", "303BF_0313_0300" },
+  { "1F43", "303BF_0314_0300" },
+  { "1F44", "303BF_0313_0301" },
+  { "1F45", "303BF_0314_0301" },
+  { "1F48", "2039F_0313" },
+  { "1F49", "2039F_0314" },
+  { "1F4A", "3039F_0313_0300" },
+  { "1F4B", "3039F_0314_0300" },
+  { "1F4C", "3039F_0313_0301" },
+  { "1F4D", "3039F_0314_0301" },
+  { "1F50", "203C5_0313" },
+  { "1F51", "203C5_0314" },
+  { "1F52", "303C5_0313_0300" },
+  { "1F53", "303C5_0314_0300" },
+  { "1F54", "303C5_0313_0301" },
+  { "1F55", "303C5_0314_0301" },
+  { "1F56", "303C5_0313_0342" },
+  { "1F57", "303C5_0314_0342" },
+  { "1F59", "203A5_0314" },
+  { "1F5B", "303A5_0314_0300" },
+  { "1F5D", "303A5_0314_0301" },
+  { "1F5F", "303A5_0314_0342" },
+  { "1F60", "203C9_0313" },
+  { "1F61", "203C9_0314" },
+  { "1F62", "303C9_0313_0300" },
+  { "1F63", "303C9_0314_0300" },
+  { "1F64", "303C9_0313_0301" },
+  { "1F65", "303C9_0314_0301" },
+  { "1F66", "303C9_0313_0342" },
+  { "1F67", "303C9_0314_0342" },
+  { "1F68", "203A9_0313" },
+  { "1F69", "203A9_0314" },
+  { "1F6A", "303A9_0313_0300" },
+  { "1F6B", "303A9_0314_0300" },
+  { "1F6C", "303A9_0313_0301" },
+  { "1F6D", "303A9_0314_0301" },
+  { "1F6E", "303A9_0313_0342" },
+  { "1F6F", "303A9_0314_0342" },
+  { "1F70", "203B1_0300" },
+  { "1F71", "203B1_0301" },
+  { "1F72", "203B5_0300" },
+  { "1F73", "203B5_0301" },
+  { "1F74", "203B7_0300" },
+  { "1F75", "203B7_0301" },
+  { "1F76", "203B9_0300" },
+  { "1F77", "203B9_0301" },
+  { "1F78", "203BF_0300" },
+  { "1F79", "203BF_0301" },
+  { "1F7A", "203C5_0300" },
+  { "1F7B", "203C5_0301" },
+  { "1F7C", "203C9_0300" },
+  { "1F7D", "203C9_0301" },
+  { "1F80", "303B1_0313_0345" },
+  { "1F81", "303B1_0314_0345" },
+  { "1F82", "403B1_0313_0300_0345" },
+  { "1F83", "403B1_0314_0300_0345" },
+  { "1F84", "403B1_0313_0301_0345" },
+  { "1F85", "403B1_0314_0301_0345" },
+  { "1F86", "403B1_0313_0342_0345" },
+  { "1F87", "403B1_0314_0342_0345" },
+  { "1F88", "30391_0313_0345" },
+  { "1F89", "30391_0314_0345" },
+  { "1F8A", "40391_0313_0300_0345" },
+  { "1F8B", "40391_0314_0300_0345" },
+  { "1F8C", "40391_0313_0301_0345" },
+  { "1F8D", "40391_0314_0301_0345" },
+  { "1F8E", "40391_0313_0342_0345" },
+  { "1F8F", "40391_0314_0342_0345" },
+  { "1F90", "303B7_0313_0345" },
+  { "1F91", "303B7_0314_0345" },
+  { "1F92", "403B7_0313_0300_0345" },
+  { "1F93", "403B7_0314_0300_0345" },
+  { "1F94", "403B7_0313_0301_0345" },
+  { "1F95", "403B7_0314_0301_0345" },
+  { "1F96", "403B7_0313_0342_0345" },
+  { "1F97", "403B7_0314_0342_0345" },
+  { "1F98", "30397_0313_0345" },
+  { "1F99", "30397_0314_0345" },
+  { "1F9A", "40397_0313_0300_0345" },
+  { "1F9B", "40397_0314_0300_0345" },
+  { "1F9C", "40397_0313_0301_0345" },
+  { "1F9D", "40397_0314_0301_0345" },
+  { "1F9E", "40397_0313_0342_0345" },
+  { "1F9F", "40397_0314_0342_0345" },
+  { "1FA0", "303C9_0313_0345" },
+  { "1FA1", "303C9_0314_0345" },
+  { "1FA2", "403C9_0313_0300_0345" },
+  { "1FA3", "403C9_0314_0300_0345" },
+  { "1FA4", "403C9_0313_0301_0345" },
+  { "1FA5", "403C9_0314_0301_0345" },
+  { "1FA6", "403C9_0313_0342_0345" },
+  { "1FA7", "403C9_0314_0342_0345" },
+  { "1FA8", "303A9_0313_0345" },
+  { "1FA9", "303A9_0314_0345" },
+  { "1FAA", "403A9_0313_0300_0345" },
+  { "1FAB", "403A9_0314_0300_0345" },
+  { "1FAC", "403A9_0313_0301_0345" },
+  { "1FAD", "403A9_0314_0301_0345" },
+  { "1FAE", "403A9_0313_0342_0345" },
+  { "1FAF", "403A9_0314_0342_0345" },
+  { "1FB0", "203B1_0306" },
+  { "1FB1", "203B1_0304" },
+  { "1FB2", "303B1_0300_0345" },
+  { "1FB3", "203B1_0345" },
+  { "1FB4", "303B1_0301_0345" },
+  { "1FB6", "203B1_0342" },
+  { "1FB7", "303B1_0342_0345" },
+  { "1FB8", "20391_0306" },
+  { "1FB9", "20391_0304" },
+  { "1FBA", "20391_0300" },
+  { "1FBB", "20391_0301" },
+  { "1FBC", "20391_0345" },
+  { "1FBE", "103B9" },
+  { "1FC1", "200A8_0342" },
+  { "1FC2", "303B7_0300_0345" },
+  { "1FC3", "203B7_0345" },
+  { "1FC4", "303B7_0301_0345" },
+  { "1FC6", "203B7_0342" },
+  { "1FC7", "303B7_0342_0345" },
+  { "1FC8", "20395_0300" },
+  { "1FC9", "20395_0301" },
+  { "1FCA", "20397_0300" },
+  { "1FCB", "20397_0301" },
+  { "1FCC", "20397_0345" },
+  { "1FCD", "21FBF_0300" },
+  { "1FCE", "21FBF_0301" },
+  { "1FCF", "21FBF_0342" },
+  { "1FD0", "203B9_0306" },
+  { "1FD1", "203B9_0304" },
+  { "1FD2", "303B9_0308_0300" },
+  { "1FD3", "303B9_0308_0301" },
+  { "1FD6", "203B9_0342" },
+  { "1FD7", "303B9_0308_0342" },
+  { "1FD8", "20399_0306" },
+  { "1FD9", "20399_0304" },
+  { "1FDA", "20399_0300" },
+  { "1FDB", "20399_0301" },
+  { "1FDD", "21FFE_0300" },
+  { "1FDE", "21FFE_0301" },
+  { "1FDF", "21FFE_0342" },
+  { "1FE0", "203C5_0306" },
+  { "1FE1", "203C5_0304" },
+  { "1FE2", "303C5_0308_0300" },
+  { "1FE3", "303C5_0308_0301" },
+  { "1FE4", "203C1_0313" },
+  { "1FE5", "203C1_0314" },
+  { "1FE6", "203C5_0342" },
+  { "1FE7", "303C5_0308_0342" },
+  { "1FE8", "203A5_0306" },
+  { "1FE9", "203A5_0304" },
+  { "1FEA", "203A5_0300" },
+  { "1FEB", "203A5_0301" },
+  { "1FEC", "203A1_0314" },
+  { "1FED", "200A8_0300" },
+  { "1FEE", "200A8_0301" },
+  { "1FEF", "10060" },
+  { "1FF2", "303C9_0300_0345" },
+  { "1FF3", "203C9_0345" },
+  { "1FF4", "303C9_0301_0345" },
+  { "1FF6", "203C9_0342" },
+  { "1FF7", "303C9_0342_0345" },
+  { "1FF8", "2039F_0300" },
+  { "1FF9", "2039F_0301" },
+  { "1FFA", "203A9_0300" },
+  { "1FFB", "203A9_0301" },
+  { "1FFC", "203A9_0345" },
+  { "1FFD", "100B4" },
+  { "2000", "12002" },
+  { "2001", "12003" },
+  { "2126", "103A9" },
+  { "212A", "1004B" },
+  { "212B", "20041_030A" },
+  { "219A", "22190_0338" },
+  { "219B", "22192_0338" },
+  { "21AE", "22194_0338" },
+  { "21CD", "221D0_0338" },
+  { "21CE", "221D4_0338" },
+  { "21CF", "221D2_0338" },
+  { "2204", "22203_0338" },
+  { "2209", "22208_0338" },
+  { "220C", "2220B_0338" },
+  { "2224", "22223_0338" },
+  { "2226", "22225_0338" },
+  { "2241", "2223C_0338" },
+  { "2244", "22243_0338" },
+  { "2247", "22245_0338" },
+  { "2249", "22248_0338" },
+  { "2260", "2003D_0338" },
+  { "2262", "22261_0338" },
+  { "226D", "2224D_0338" },
+  { "226E", "2003C_0338" },
+  { "226F", "2003E_0338" },
+  { "2270", "22264_0338" },
+  { "2271", "22265_0338" },
+  { "2274", "22272_0338" },
+  { "2275", "22273_0338" },
+  { "2278", "22276_0338" },
+  { "2279", "22277_0338" },
+  { "2280", "2227A_0338" },
+  { "2281", "2227B_0338" },
+  { "2284", "22282_0338" },
+  { "2285", "22283_0338" },
+  { "2288", "22286_0338" },
+  { "2289", "22287_0338" },
+  { "22AC", "222A2_0338" },
+  { "22AD", "222A8_0338" },
+  { "22AE", "222A9_0338" },
+  { "22AF", "222AB_0338" },
+  { "22E0", "2227C_0338" },
+  { "22E1", "2227D_0338" },
+  { "22E2", "22291_0338" },
+  { "22E3", "22292_0338" },
+  { "22EA", "222B2_0338" },
+  { "22EB", "222B3_0338" },
+  { "22EC", "222B4_0338" },
+  { "22ED", "222B5_0338" },
+  { "2329", "13008" },
+  { "232A", "13009" },
+  { "2ADC", "22ADD_0338" },
+  { "304C", "2304B_3099" },
+  { "304E", "2304D_3099" },
+  { "3050", "2304F_3099" },
+  { "3052", "23051_3099" },
+  { "3054", "23053_3099" },
+  { "3056", "23055_3099" },
+  { "3058", "23057_3099" },
+  { "305A", "23059_3099" },
+  { "305C", "2305B_3099" },
+  { "305E", "2305D_3099" },
+  { "3060", "2305F_3099" },
+  { "3062", "23061_3099" },
+  { "3065", "23064_3099" },
+  { "3067", "23066_3099" },
+  { "3069", "23068_3099" },
+  { "3070", "2306F_3099" },
+  { "3071", "2306F_309A" },
+  { "3073", "23072_3099" },
+  { "3074", "23072_309A" },
+  { "3076", "23075_3099" },
+  { "3077", "23075_309A" },
+  { "3079", "23078_3099" },
+  { "307A", "23078_309A" },
+  { "307C", "2307B_3099" },
+  { "307D", "2307B_309A" },
+  { "3094", "23046_3099" },
+  { "309E", "2309D_3099" },
+  { "30AC", "230AB_3099" },
+  { "30AE", "230AD_3099" },
+  { "30B0", "230AF_3099" },
+  { "30B2", "230B1_3099" },
+  { "30B4", "230B3_3099" },
+  { "30B6", "230B5_3099" },
+  { "30B8", "230B7_3099" },
+  { "30BA", "230B9_3099" },
+  { "30BC", "230BB_3099" },
+  { "30BE", "230BD_3099" },
+  { "30C0", "230BF_3099" },
+  { "30C2", "230C1_3099" },
+  { "30C5", "230C4_3099" },
+  { "30C7", "230C6_3099" },
+  { "30C9", "230C8_3099" },
+  { "30D0", "230CF_3099" },
+  { "30D1", "230CF_309A" },
+  { "30D3", "230D2_3099" },
+  { "30D4", "230D2_309A" },
+  { "30D6", "230D5_3099" },
+  { "30D7", "230D5_309A" },
+  { "30D9", "230D8_3099" },
+  { "30DA", "230D8_309A" },
+  { "30DC", "230DB_3099" },
+  { "30DD", "230DB_309A" },
+  { "30F4", "230A6_3099" },
+  { "30F7", "230EF_3099" },
+  { "30F8", "230F0_3099" },
+  { "30F9", "230F1_3099" },
+  { "30FA", "230F2_3099" },
+  { "30FE", "230FD_3099" },
+  { "F900", "18C48" },
+  { "F901", "166F4" },
+  { "F902", "18ECA" },
+  { "F903", "18CC8" },
+  { "F904", "16ED1" },
+  { "F905", "14E32" },
+  { "F906", "153E5" },
+  { "F907", "19F9C" },
+  { "F908", "19F9C" },
+  { "F909", "15951" },
+  { "F90A", "191D1" },
+  { "F90B", "15587" },
+  { "F90C", "15948" },
+  { "F90D", "161F6" },
+  { "F90E", "17669" },
+  { "F90F", "17F85" },
+  { "F910", "1863F" },
+  { "F911", "187BA" },
+  { "F912", "188F8" },
+  { "F913", "1908F" },
+  { "F914", "16A02" },
+  { "F915", "16D1B" },
+  { "F916", "170D9" },
+  { "F917", "173DE" },
+  { "F918", "1843D" },
+  { "F919", "1916A" },
+  { "F91A", "199F1" },
+  { "F91B", "14E82" },
+  { "F91C", "15375" },
+  { "F91D", "16B04" },
+  { "F91E", "1721B" },
+  { "F91F", "1862D" },
+  { "F920", "19E1E" },
+  { "F921", "15D50" },
+  { "F922", "16FEB" },
+  { "F923", "185CD" },
+  { "F924", "18964" },
+  { "F925", "162C9" },
+  { "F926", "181D8" },
+  { "F927", "1881F" },
+  { "F928", "15ECA" },
+  { "F929", "16717" },
+  { "F92A", "16D6A" },
+  { "F92B", "172FC" },
+  { "F92C", "190CE" },
+  { "F92D", "14F86" },
+  { "F92E", "151B7" },
+  { "F92F", "152DE" },
+  { "F930", "164C4" },
+  { "F931", "16AD3" },
+  { "F932", "17210" },
+  { "F933", "176E7" },
+  { "F934", "18001" },
+  { "F935", "18606" },
+  { "F936", "1865C" },
+  { "F937", "18DEF" },
+  { "F938", "19732" },
+  { "F939", "19B6F" },
+  { "F93A", "19DFA" },
+  { "F93B", "1788C" },
+  { "F93C", "1797F" },
+  { "F93D", "17DA0" },
+  { "F93E", "183C9" },
+  { "F93F", "19304" },
+  { "F940", "19E7F" },
+  { "F941", "18AD6" },
+  { "F942", "158DF" },
+  { "F943", "15F04" },
+  { "F944", "17C60" },
+  { "F945", "1807E" },
+  { "F946", "17262" },
+  { "F947", "178CA" },
+  { "F948", "18CC2" },
+  { "F949", "196F7" },
+  { "F94A", "158D8" },
+  { "F94B", "15C62" },
+  { "F94C", "16A13" },
+  { "F94D", "16DDA" },
+  { "F94E", "16F0F" },
+  { "F94F", "17D2F" },
+  { "F950", "17E37" },
+  { "F951", "1964B" },
+  { "F952", "152D2" },
+  { "F953", "1808B" },
+  { "F954", "151DC" },
+  { "F955", "151CC" },
+  { "F956", "17A1C" },
+  { "F957", "17DBE" },
+  { "F958", "183F1" },
+  { "F959", "19675" },
+  { "F95A", "18B80" },
+  { "F95B", "162CF" },
+  { "F95C", "16A02" },
+  { "F95D", "18AFE" },
+  { "F95E", "14E39" },
+  { "F95F", "15BE7" },
+  { "F960", "16012" },
+  { "F961", "17387" },
+  { "F962", "17570" },
+  { "F963", "15317" },
+  { "F964", "178FB" },
+  { "F965", "14FBF" },
+  { "F966", "15FA9" },
+  { "F967", "14E0D" },
+  { "F968", "16CCC" },
+  { "F969", "16578" },
+  { "F96A", "17D22" },
+  { "F96B", "153C3" },
+  { "F96C", "1585E" },
+  { "F96D", "17701" },
+  { "F96E", "18449" },
+  { "F96F", "18AAA" },
+  { "F970", "16BBA" },
+  { "F971", "18FB0" },
+  { "F972", "16C88" },
+  { "F973", "162FE" },
+  { "F974", "182E5" },
+  { "F975", "163A0" },
+  { "F976", "17565" },
+  { "F977", "14EAE" },
+  { "F978", "15169" },
+  { "F979", "151C9" },
+  { "F97A", "16881" },
+  { "F97B", "17CE7" },
+  { "F97C", "1826F" },
+  { "F97D", "18AD2" },
+  { "F97E", "191CF" },
+  { "F97F", "152F5" },
+  { "F980", "15442" },
+  { "F981", "15973" },
+  { "F982", "15EEC" },
+  { "F983", "165C5" },
+  { "F984", "16FFE" },
+  { "F985", "1792A" },
+  { "F986", "195AD" },
+  { "F987", "19A6A" },
+  { "F988", "19E97" },
+  { "F989", "19ECE" },
+  { "F98A", "1529B" },
+  { "F98B", "166C6" },
+  { "F98C", "16B77" },
+  { "F98D", "18F62" },
+  { "F98E", "15E74" },
+  { "F98F", "16190" },
+  { "F990", "16200" },
+  { "F991", "1649A" },
+  { "F992", "16F23" },
+  { "F993", "17149" },
+  { "F994", "17489" },
+  { "F995", "179CA" },
+  { "F996", "17DF4" },
+  { "F997", "1806F" },
+  { "F998", "18F26" },
+  { "F999", "184EE" },
+  { "F99A", "19023" },
+  { "F99B", "1934A" },
+  { "F99C", "15217" },
+  { "F99D", "152A3" },
+  { "F99E", "154BD" },
+  { "F99F", "170C8" },
+  { "F9A0", "188C2" },
+  { "F9A1", "18AAA" },
+  { "F9A2", "15EC9" },
+  { "F9A3", "15FF5" },
+  { "F9A4", "1637B" },
+  { "F9A5", "16BAE" },
+  { "F9A6", "17C3E" },
+  { "F9A7", "17375" },
+  { "F9A8", "14EE4" },
+  { "F9A9", "156F9" },
+  { "F9AA", "15BE7" },
+  { "F9AB", "15DBA" },
+  { "F9AC", "1601C" },
+  { "F9AD", "173B2" },
+  { "F9AE", "17469" },
+  { "F9AF", "17F9A" },
+  { "F9B0", "18046" },
+  { "F9B1", "19234" },
+  { "F9B2", "196F6" },
+  { "F9B3", "19748" },
+  { "F9B4", "19818" },
+  { "F9B5", "14F8B" },
+  { "F9B6", "179AE" },
+  { "F9B7", "191B4" },
+  { "F9B8", "196B8" },
+  { "F9B9", "160E1" },
+  { "F9BA", "14E86" },
+  { "F9BB", "150DA" },
+  { "F9BC", "15BEE" },
+  { "F9BD", "15C3F" },
+  { "F9BE", "16599" },
+  { "F9BF", "16A02" },
+  { "F9C0", "171CE" },
+  { "F9C1", "17642" },
+  { "F9C2", "184FC" },
+  { "F9C3", "1907C" },
+  { "F9C4", "19F8D" },
+  { "F9C5", "16688" },
+  { "F9C6", "1962E" },
+  { "F9C7", "15289" },
+  { "F9C8", "1677B" },
+  { "F9C9", "167F3" },
+  { "F9CA", "16D41" },
+  { "F9CB", "16E9C" },
+  { "F9CC", "17409" },
+  { "F9CD", "17559" },
+  { "F9CE", "1786B" },
+  { "F9CF", "17D10" },
+  { "F9D0", "1985E" },
+  { "F9D1", "1516D" },
+  { "F9D2", "1622E" },
+  { "F9D3", "19678" },
+  { "F9D4", "1502B" },
+  { "F9D5", "15D19" },
+  { "F9D6", "16DEA" },
+  { "F9D7", "18F2A" },
+  { "F9D8", "15F8B" },
+  { "F9D9", "16144" },
+  { "F9DA", "16817" },
+  { "F9DB", "17387" },
+  { "F9DC", "19686" },
+  { "F9DD", "15229" },
+  { "F9DE", "1540F" },
+  { "F9DF", "15C65" },
+  { "F9E0", "16613" },
+  { "F9E1", "1674E" },
+  { "F9E2", "168A8" },
+  { "F9E3", "16CE5" },
+  { "F9E4", "17406" },
+  { "F9E5", "175E2" },
+  { "F9E6", "17F79" },
+  { "F9E7", "188CF" },
+  { "F9E8", "188E1" },
+  { "F9E9", "191CC" },
+  { "F9EA", "196E2" },
+  { "F9EB", "1533F" },
+  { "F9EC", "16EBA" },
+  { "F9ED", "1541D" },
+  { "F9EE", "171D0" },
+  { "F9EF", "17498" },
+  { "F9F0", "185FA" },
+  { "F9F1", "196A3" },
+  { "F9F2", "19C57" },
+  { "F9F3", "19E9F" },
+  { "F9F4", "16797" },
+  { "F9F5", "16DCB" },
+  { "F9F6", "181E8" },
+  { "F9F7", "17ACB" },
+  { "F9F8", "17B20" },
+  { "F9F9", "17C92" },
+  { "F9FA", "172C0" },
+  { "F9FB", "17099" },
+  { "F9FC", "18B58" },
+  { "F9FD", "14EC0" },
+  { "F9FE", "18336" },
+  { "F9FF", "1523A" },
+  { "FA00", "15207" },
+  { "FA01", "15EA6" },
+  { "FA02", "162D3" },
+  { "FA03", "17CD6" },
+  { "FA04", "15B85" },
+  { "FA05", "16D1E" },
+  { "FA06", "166B4" },
+  { "FA07", "18F3B" },
+  { "FA08", "1884C" },
+  { "FA09", "1964D" },
+  { "FA0A", "1898B" },
+  { "FA0B", "15ED3" },
+  { "FA0C", "15140" },
+  { "FA0D", "155C0" },
+  { "FA10", "1585A" },
+  { "FA12", "16674" },
+  { "FA15", "151DE" },
+  { "FA16", "1732A" },
+  { "FA17", "176CA" },
+  { "FA18", "1793C" },
+  { "FA19", "1795E" },
+  { "FA1A", "17965" },
+  { "FA1B", "1798F" },
+  { "FA1C", "19756" },
+  { "FA1D", "17CBE" },
+  { "FA1E", "17FBD" },
+  { "FA20", "18612" },
+  { "FA22", "18AF8" },
+  { "FA25", "19038" },
+  { "FA26", "190FD" },
+  { "FA2A", "198EF" },
+  { "FA2B", "198FC" },
+  { "FA2C", "19928" },
+  { "FA2D", "19DB4" },
+  { "FA30", "14FAE" },
+  { "FA31", "150E7" },
+  { "FA32", "1514D" },
+  { "FA33", "152C9" },
+  { "FA34", "152E4" },
+  { "FA35", "15351" },
+  { "FA36", "1559D" },
+  { "FA37", "15606" },
+  { "FA38", "15668" },
+  { "FA39", "15840" },
+  { "FA3A", "158A8" },
+  { "FA3B", "15C64" },
+  { "FA3C", "15C6E" },
+  { "FA3D", "16094" },
+  { "FA3E", "16168" },
+  { "FA3F", "1618E" },
+  { "FA40", "161F2" },
+  { "FA41", "1654F" },
+  { "FA42", "165E2" },
+  { "FA43", "16691" },
+  { "FA44", "16885" },
+  { "FA45", "16D77" },
+  { "FA46", "16E1A" },
+  { "FA47", "16F22" },
+  { "FA48", "1716E" },
+  { "FA49", "1722B" },
+  { "FA4A", "17422" },
+  { "FA4B", "17891" },
+  { "FA4C", "1793E" },
+  { "FA4D", "17949" },
+  { "FA4E", "17948" },
+  { "FA4F", "17950" },
+  { "FA50", "17956" },
+  { "FA51", "1795D" },
+  { "FA52", "1798D" },
+  { "FA53", "1798E" },
+  { "FA54", "17A40" },
+  { "FA55", "17A81" },
+  { "FA56", "17BC0" },
+  { "FA57", "17DF4" },
+  { "FA58", "17E09" },
+  { "FA59", "17E41" },
+  { "FA5A", "17F72" },
+  { "FA5B", "18005" },
+  { "FA5C", "181ED" },
+  { "FA5D", "18279" },
+  { "FA5E", "18279" },
+  { "FA5F", "18457" },
+  { "FA60", "18910" },
+  { "FA61", "18996" },
+  { "FA62", "18B01" },
+  { "FA63", "18B39" },
+  { "FA64", "18CD3" },
+  { "FA65", "18D08" },
+  { "FA66", "18FB6" },
+  { "FA67", "19038" },
+  { "FA68", "196E3" },
+  { "FA69", "197FF" },
+  { "FA6A", "1983B" },
+  { "FB1D", "205D9_05B4" },
+  { "FB1F", "205F2_05B7" },
+  { "FB2A", "205E9_05C1" },
+  { "FB2B", "205E9_05C2" },
+  { "FB2C", "305E9_05BC_05C1" },
+  { "FB2D", "305E9_05BC_05C2" },
+  { "FB2E", "205D0_05B7" },
+  { "FB2F", "205D0_05B8" },
+  { "FB30", "205D0_05BC" },
+  { "FB31", "205D1_05BC" },
+  { "FB32", "205D2_05BC" },
+  { "FB33", "205D3_05BC" },
+  { "FB34", "205D4_05BC" },
+  { "FB35", "205D5_05BC" },
+  { "FB36", "205D6_05BC" },
+  { "FB38", "205D8_05BC" },
+  { "FB39", "205D9_05BC" },
+  { "FB3A", "205DA_05BC" },
+  { "FB3B", "205DB_05BC" },
+  { "FB3C", "205DC_05BC" },
+  { "FB3E", "205DE_05BC" },
+  { "FB40", "205E0_05BC" },
+  { "FB41", "205E1_05BC" },
+  { "FB43", "205E3_05BC" },
+  { "FB44", "205E4_05BC" },
+  { "FB46", "205E6_05BC" },
+  { "FB47", "205E7_05BC" },
+  { "FB48", "205E8_05BC" },
+  { "FB49", "205E9_05BC" },
+  { "FB4A", "205EA_05BC" },
+  { "FB4B", "205D5_05B9" },
+  { "FB4C", "205D1_05BF" },
+  { "FB4D", "205DB_05BF" },
+  { "FB4E", "205E4_05BF" },
+  { "1D15E", "21D157_1D165" },
+  { "1D15F", "21D158_1D165" },
+  { "1D160", "31D158_1D165_1D16E" },
+  { "1D161", "31D158_1D165_1D16F" },
+  { "1D162", "31D158_1D165_1D170" },
+  { "1D163", "31D158_1D165_1D171" },
+  { "1D164", "31D158_1D165_1D172" },
+  { "1D1BB", "21D1B9_1D165" },
+  { "1D1BC", "21D1BA_1D165" },
+  { "1D1BD", "31D1B9_1D165_1D16E" },
+  { "1D1BE", "31D1BA_1D165_1D16E" },
+  { "1D1BF", "31D1B9_1D165_1D16F" },
+  { "1D1C0", "31D1BA_1D165_1D16F" },
+  { "2F800", "14E3D" },
+  { "2F801", "14E38" },
+  { "2F802", "14E41" },
+  { "2F803", "120122" },
+  { "2F804", "14F60" },
+  { "2F805", "14FAE" },
+  { "2F806", "14FBB" },
+  { "2F807", "15002" },
+  { "2F808", "1507A" },
+  { "2F809", "15099" },
+  { "2F80A", "150E7" },
+  { "2F80B", "150CF" },
+  { "2F80C", "1349E" },
+  { "2F80D", "12063A" },
+  { "2F80E", "1514D" },
+  { "2F80F", "15154" },
+  { "2F810", "15164" },
+  { "2F811", "15177" },
+  { "2F812", "12051C" },
+  { "2F813", "134B9" },
+  { "2F814", "15167" },
+  { "2F815", "1518D" },
+  { "2F816", "12054B" },
+  { "2F817", "15197" },
+  { "2F818", "151A4" },
+  { "2F819", "14ECC" },
+  { "2F81A", "151AC" },
+  { "2F81B", "151B5" },
+  { "2F81C", "1291DF" },
+  { "2F81D", "151F5" },
+  { "2F81E", "15203" },
+  { "2F81F", "134DF" },
+  { "2F820", "1523B" },
+  { "2F821", "15246" },
+  { "2F822", "15272" },
+  { "2F823", "15277" },
+  { "2F824", "13515" },
+  { "2F825", "152C7" },
+  { "2F826", "152C9" },
+  { "2F827", "152E4" },
+  { "2F828", "152FA" },
+  { "2F829", "15305" },
+  { "2F82A", "15306" },
+  { "2F82B", "15317" },
+  { "2F82C", "15349" },
+  { "2F82D", "15351" },
+  { "2F82E", "1535A" },
+  { "2F82F", "15373" },
+  { "2F830", "1537D" },
+  { "2F831", "1537F" },
+  { "2F832", "1537F" },
+  { "2F833", "1537F" },
+  { "2F834", "120A2C" },
+  { "2F835", "17070" },
+  { "2F836", "153CA" },
+  { "2F837", "153DF" },
+  { "2F838", "120B63" },
+  { "2F839", "153EB" },
+  { "2F83A", "153F1" },
+  { "2F83B", "15406" },
+  { "2F83C", "1549E" },
+  { "2F83D", "15438" },
+  { "2F83E", "15448" },
+  { "2F83F", "15468" },
+  { "2F840", "154A2" },
+  { "2F841", "154F6" },
+  { "2F842", "15510" },
+  { "2F843", "15553" },
+  { "2F844", "15563" },
+  { "2F845", "15584" },
+  { "2F846", "15584" },
+  { "2F847", "15599" },
+  { "2F848", "155AB" },
+  { "2F849", "155B3" },
+  { "2F84A", "155C2" },
+  { "2F84B", "15716" },
+  { "2F84C", "15606" },
+  { "2F84D", "15717" },
+  { "2F84E", "15651" },
+  { "2F84F", "15674" },
+  { "2F850", "15207" },
+  { "2F851", "158EE" },
+  { "2F852", "157CE" },
+  { "2F853", "157F4" },
+  { "2F854", "1580D" },
+  { "2F855", "1578B" },
+  { "2F856", "15832" },
+  { "2F857", "15831" },
+  { "2F858", "158AC" },
+  { "2F859", "1214E4" },
+  { "2F85A", "158F2" },
+  { "2F85B", "158F7" },
+  { "2F85C", "15906" },
+  { "2F85D", "1591A" },
+  { "2F85E", "15922" },
+  { "2F85F", "15962" },
+  { "2F860", "1216A8" },
+  { "2F861", "1216EA" },
+  { "2F862", "159EC" },
+  { "2F863", "15A1B" },
+  { "2F864", "15A27" },
+  { "2F865", "159D8" },
+  { "2F866", "15A66" },
+  { "2F867", "136EE" },
+  { "2F868", "12136A" },
+  { "2F869", "15B08" },
+  { "2F86A", "15B3E" },
+  { "2F86B", "15B3E" },
+  { "2F86C", "1219C8" },
+  { "2F86D", "15BC3" },
+  { "2F86E", "15BD8" },
+  { "2F86F", "15BE7" },
+  { "2F870", "15BF3" },
+  { "2F871", "121B18" },
+  { "2F872", "15BFF" },
+  { "2F873", "15C06" },
+  { "2F874", "15F33" },
+  { "2F875", "15C22" },
+  { "2F876", "13781" },
+  { "2F877", "15C60" },
+  { "2F878", "15C6E" },
+  { "2F879", "15CC0" },
+  { "2F87A", "15C8D" },
+  { "2F87B", "121DE4" },
+  { "2F87C", "15D43" },
+  { "2F87D", "121DE6" },
+  { "2F87E", "15D6E" },
+  { "2F87F", "15D6B" },
+  { "2F880", "15D7C" },
+  { "2F881", "15DE1" },
+  { "2F882", "15DE2" },
+  { "2F883", "1382F" },
+  { "2F884", "15DFD" },
+  { "2F885", "15E28" },
+  { "2F886", "15E3D" },
+  { "2F887", "15E69" },
+  { "2F888", "13862" },
+  { "2F889", "122183" },
+  { "2F88A", "1387C" },
+  { "2F88B", "15EB0" },
+  { "2F88C", "15EB3" },
+  { "2F88D", "15EB6" },
+  { "2F88E", "15ECA" },
+  { "2F88F", "12A392" },
+  { "2F890", "15EFE" },
+  { "2F891", "122331" },
+  { "2F892", "122331" },
+  { "2F893", "18201" },
+  { "2F894", "15F22" },
+  { "2F895", "15F22" },
+  { "2F896", "138C7" },
+  { "2F897", "1232B8" },
+  { "2F898", "1261DA" },
+  { "2F899", "15F62" },
+  { "2F89A", "15F6B" },
+  { "2F89B", "138E3" },
+  { "2F89C", "15F9A" },
+  { "2F89D", "15FCD" },
+  { "2F89E", "15FD7" },
+  { "2F89F", "15FF9" },
+  { "2F8A0", "16081" },
+  { "2F8A1", "1393A" },
+  { "2F8A2", "1391C" },
+  { "2F8A3", "16094" },
+  { "2F8A4", "1226D4" },
+  { "2F8A5", "160C7" },
+  { "2F8A6", "16148" },
+  { "2F8A7", "1614C" },
+  { "2F8A8", "1614E" },
+  { "2F8A9", "1614C" },
+  { "2F8AA", "1617A" },
+  { "2F8AB", "1618E" },
+  { "2F8AC", "161B2" },
+  { "2F8AD", "161A4" },
+  { "2F8AE", "161AF" },
+  { "2F8AF", "161DE" },
+  { "2F8B0", "161F2" },
+  { "2F8B1", "161F6" },
+  { "2F8B2", "16210" },
+  { "2F8B3", "1621B" },
+  { "2F8B4", "1625D" },
+  { "2F8B5", "162B1" },
+  { "2F8B6", "162D4" },
+  { "2F8B7", "16350" },
+  { "2F8B8", "122B0C" },
+  { "2F8B9", "1633D" },
+  { "2F8BA", "162FC" },
+  { "2F8BB", "16368" },
+  { "2F8BC", "16383" },
+  { "2F8BD", "163E4" },
+  { "2F8BE", "122BF1" },
+  { "2F8BF", "16422" },
+  { "2F8C0", "163C5" },
+  { "2F8C1", "163A9" },
+  { "2F8C2", "13A2E" },
+  { "2F8C3", "16469" },
+  { "2F8C4", "1647E" },
+  { "2F8C5", "1649D" },
+  { "2F8C6", "16477" },
+  { "2F8C7", "13A6C" },
+  { "2F8C8", "1654F" },
+  { "2F8C9", "1656C" },
+  { "2F8CA", "12300A" },
+  { "2F8CB", "165E3" },
+  { "2F8CC", "166F8" },
+  { "2F8CD", "16649" },
+  { "2F8CE", "13B19" },
+  { "2F8CF", "16691" },
+  { "2F8D0", "13B08" },
+  { "2F8D1", "13AE4" },
+  { "2F8D2", "15192" },
+  { "2F8D3", "15195" },
+  { "2F8D4", "16700" },
+  { "2F8D5", "1669C" },
+  { "2F8D6", "180AD" },
+  { "2F8D7", "143D9" },
+  { "2F8D8", "16717" },
+  { "2F8D9", "1671B" },
+  { "2F8DA", "16721" },
+  { "2F8DB", "1675E" },
+  { "2F8DC", "16753" },
+  { "2F8DD", "1233C3" },
+  { "2F8DE", "13B49" },
+  { "2F8DF", "167FA" },
+  { "2F8E0", "16785" },
+  { "2F8E1", "16852" },
+  { "2F8E2", "16885" },
+  { "2F8E3", "12346D" },
+  { "2F8E4", "1688E" },
+  { "2F8E5", "1681F" },
+  { "2F8E6", "16914" },
+  { "2F8E7", "13B9D" },
+  { "2F8E8", "16942" },
+  { "2F8E9", "169A3" },
+  { "2F8EA", "169EA" },
+  { "2F8EB", "16AA8" },
+  { "2F8EC", "1236A3" },
+  { "2F8ED", "16ADB" },
+  { "2F8EE", "13C18" },
+  { "2F8EF", "16B21" },
+  { "2F8F0", "1238A7" },
+  { "2F8F1", "16B54" },
+  { "2F8F2", "13C4E" },
+  { "2F8F3", "16B72" },
+  { "2F8F4", "16B9F" },
+  { "2F8F5", "16BBA" },
+  { "2F8F6", "16BBB" },
+  { "2F8F7", "123A8D" },
+  { "2F8F8", "121D0B" },
+  { "2F8F9", "123AFA" },
+  { "2F8FA", "16C4E" },
+  { "2F8FB", "123CBC" },
+  { "2F8FC", "16CBF" },
+  { "2F8FD", "16CCD" },
+  { "2F8FE", "16C67" },
+  { "2F8FF", "16D16" },
+  { "2F900", "16D3E" },
+  { "2F901", "16D77" },
+  { "2F902", "16D41" },
+  { "2F903", "16D69" },
+  { "2F904", "16D78" },
+  { "2F905", "16D85" },
+  { "2F906", "123D1E" },
+  { "2F907", "16D34" },
+  { "2F908", "16E2F" },
+  { "2F909", "16E6E" },
+  { "2F90A", "13D33" },
+  { "2F90B", "16ECB" },
+  { "2F90C", "16EC7" },
+  { "2F90D", "123ED1" },
+  { "2F90E", "16DF9" },
+  { "2F90F", "16F6E" },
+  { "2F910", "123F5E" },
+  { "2F911", "123F8E" },
+  { "2F912", "16FC6" },
+  { "2F913", "17039" },
+  { "2F914", "1701E" },
+  { "2F915", "1701B" },
+  { "2F916", "13D96" },
+  { "2F917", "1704A" },
+  { "2F918", "1707D" },
+  { "2F919", "17077" },
+  { "2F91A", "170AD" },
+  { "2F91B", "120525" },
+  { "2F91C", "17145" },
+  { "2F91D", "124263" },
+  { "2F91E", "1719C" },
+  { "2F91F", "143AB" },
+  { "2F920", "17228" },
+  { "2F921", "17235" },
+  { "2F922", "17250" },
+  { "2F923", "124608" },
+  { "2F924", "17280" },
+  { "2F925", "17295" },
+  { "2F926", "124735" },
+  { "2F927", "124814" },
+  { "2F928", "1737A" },
+  { "2F929", "1738B" },
+  { "2F92A", "13EAC" },
+  { "2F92B", "173A5" },
+  { "2F92C", "13EB8" },
+  { "2F92D", "13EB8" },
+  { "2F92E", "17447" },
+  { "2F92F", "1745C" },
+  { "2F930", "17471" },
+  { "2F931", "17485" },
+  { "2F932", "174CA" },
+  { "2F933", "13F1B" },
+  { "2F934", "17524" },
+  { "2F935", "124C36" },
+  { "2F936", "1753E" },
+  { "2F937", "124C92" },
+  { "2F938", "17570" },
+  { "2F939", "12219F" },
+  { "2F93A", "17610" },
+  { "2F93B", "124FA1" },
+  { "2F93C", "124FB8" },
+  { "2F93D", "125044" },
+  { "2F93E", "13FFC" },
+  { "2F93F", "14008" },
+  { "2F940", "176F4" },
+  { "2F941", "1250F3" },
+  { "2F942", "1250F2" },
+  { "2F943", "125119" },
+  { "2F944", "125133" },
+  { "2F945", "1771E" },
+  { "2F946", "1771F" },
+  { "2F947", "1771F" },
+  { "2F948", "1774A" },
+  { "2F949", "14039" },
+  { "2F94A", "1778B" },
+  { "2F94B", "14046" },
+  { "2F94C", "14096" },
+  { "2F94D", "12541D" },
+  { "2F94E", "1784E" },
+  { "2F94F", "1788C" },
+  { "2F950", "178CC" },
+  { "2F951", "140E3" },
+  { "2F952", "125626" },
+  { "2F953", "17956" },
+  { "2F954", "12569A" },
+  { "2F955", "1256C5" },
+  { "2F956", "1798F" },
+  { "2F957", "179EB" },
+  { "2F958", "1412F" },
+  { "2F959", "17A40" },
+  { "2F95A", "17A4A" },
+  { "2F95B", "17A4F" },
+  { "2F95C", "12597C" },
+  { "2F95D", "125AA7" },
+  { "2F95E", "125AA7" },
+  { "2F95F", "17AAE" },
+  { "2F960", "14202" },
+  { "2F961", "125BAB" },
+  { "2F962", "17BC6" },
+  { "2F963", "17BC9" },
+  { "2F964", "14227" },
+  { "2F965", "125C80" },
+  { "2F966", "17CD2" },
+  { "2F967", "142A0" },
+  { "2F968", "17CE8" },
+  { "2F969", "17CE3" },
+  { "2F96A", "17D00" },
+  { "2F96B", "125F86" },
+  { "2F96C", "17D63" },
+  { "2F96D", "14301" },
+  { "2F96E", "17DC7" },
+  { "2F96F", "17E02" },
+  { "2F970", "17E45" },
+  { "2F971", "14334" },
+  { "2F972", "126228" },
+  { "2F973", "126247" },
+  { "2F974", "14359" },
+  { "2F975", "1262D9" },
+  { "2F976", "17F7A" },
+  { "2F977", "12633E" },
+  { "2F978", "17F95" },
+  { "2F979", "17FFA" },
+  { "2F97A", "18005" },
+  { "2F97B", "1264DA" },
+  { "2F97C", "126523" },
+  { "2F97D", "18060" },
+  { "2F97E", "1265A8" },
+  { "2F97F", "18070" },
+  { "2F980", "12335F" },
+  { "2F981", "143D5" },
+  { "2F982", "180B2" },
+  { "2F983", "18103" },
+  { "2F984", "1440B" },
+  { "2F985", "1813E" },
+  { "2F986", "15AB5" },
+  { "2F987", "1267A7" },
+  { "2F988", "1267B5" },
+  { "2F989", "123393" },
+  { "2F98A", "12339C" },
+  { "2F98B", "18201" },
+  { "2F98C", "18204" },
+  { "2F98D", "18F9E" },
+  { "2F98E", "1446B" },
+  { "2F98F", "18291" },
+  { "2F990", "1828B" },
+  { "2F991", "1829D" },
+  { "2F992", "152B3" },
+  { "2F993", "182B1" },
+  { "2F994", "182B3" },
+  { "2F995", "182BD" },
+  { "2F996", "182E6" },
+  { "2F997", "126B3C" },
+  { "2F998", "182E5" },
+  { "2F999", "1831D" },
+  { "2F99A", "18363" },
+  { "2F99B", "183AD" },
+  { "2F99C", "18323" },
+  { "2F99D", "183BD" },
+  { "2F99E", "183E7" },
+  { "2F99F", "18457" },
+  { "2F9A0", "18353" },
+  { "2F9A1", "183CA" },
+  { "2F9A2", "183CC" },
+  { "2F9A3", "183DC" },
+  { "2F9A4", "126C36" },
+  { "2F9A5", "126D6B" },
+  { "2F9A6", "126CD5" },
+  { "2F9A7", "1452B" },
+  { "2F9A8", "184F1" },
+  { "2F9A9", "184F3" },
+  { "2F9AA", "18516" },
+  { "2F9AB", "1273CA" },
+  { "2F9AC", "18564" },
+  { "2F9AD", "126F2C" },
+  { "2F9AE", "1455D" },
+  { "2F9AF", "14561" },
+  { "2F9B0", "126FB1" },
+  { "2F9B1", "1270D2" },
+  { "2F9B2", "1456B" },
+  { "2F9B3", "18650" },
+  { "2F9B4", "1865C" },
+  { "2F9B5", "18667" },
+  { "2F9B6", "18669" },
+  { "2F9B7", "186A9" },
+  { "2F9B8", "18688" },
+  { "2F9B9", "1870E" },
+  { "2F9BA", "186E2" },
+  { "2F9BB", "18779" },
+  { "2F9BC", "18728" },
+  { "2F9BD", "1876B" },
+  { "2F9BE", "18786" },
+  { "2F9BF", "14D57" },
+  { "2F9C0", "187E1" },
+  { "2F9C1", "18801" },
+  { "2F9C2", "145F9" },
+  { "2F9C3", "18860" },
+  { "2F9C4", "18863" },
+  { "2F9C5", "127667" },
+  { "2F9C6", "188D7" },
+  { "2F9C7", "188DE" },
+  { "2F9C8", "14635" },
+  { "2F9C9", "188FA" },
+  { "2F9CA", "134BB" },
+  { "2F9CB", "1278AE" },
+  { "2F9CC", "127966" },
+  { "2F9CD", "146BE" },
+  { "2F9CE", "146C7" },
+  { "2F9CF", "18AA0" },
+  { "2F9D0", "18AED" },
+  { "2F9D1", "18B8A" },
+  { "2F9D2", "18C55" },
+  { "2F9D3", "127CA8" },
+  { "2F9D4", "18CAB" },
+  { "2F9D5", "18CC1" },
+  { "2F9D6", "18D1B" },
+  { "2F9D7", "18D77" },
+  { "2F9D8", "127F2F" },
+  { "2F9D9", "120804" },
+  { "2F9DA", "18DCB" },
+  { "2F9DB", "18DBC" },
+  { "2F9DC", "18DF0" },
+  { "2F9DD", "1208DE" },
+  { "2F9DE", "18ED4" },
+  { "2F9DF", "18F38" },
+  { "2F9E0", "1285D2" },
+  { "2F9E1", "1285ED" },
+  { "2F9E2", "19094" },
+  { "2F9E3", "190F1" },
+  { "2F9E4", "19111" },
+  { "2F9E5", "12872E" },
+  { "2F9E6", "1911B" },
+  { "2F9E7", "19238" },
+  { "2F9E8", "192D7" },
+  { "2F9E9", "192D8" },
+  { "2F9EA", "1927C" },
+  { "2F9EB", "193F9" },
+  { "2F9EC", "19415" },
+  { "2F9ED", "128BFA" },
+  { "2F9EE", "1958B" },
+  { "2F9EF", "14995" },
+  { "2F9F0", "195B7" },
+  { "2F9F1", "128D77" },
+  { "2F9F2", "149E6" },
+  { "2F9F3", "196C3" },
+  { "2F9F4", "15DB2" },
+  { "2F9F5", "19723" },
+  { "2F9F6", "129145" },
+  { "2F9F7", "12921A" },
+  { "2F9F8", "14A6E" },
+  { "2F9F9", "14A76" },
+  { "2F9FA", "197E0" },
+  { "2F9FB", "12940A" },
+  { "2F9FC", "14AB2" },
+  { "2F9FD", "129496" },
+  { "2F9FE", "1980B" },
+  { "2F9FF", "1980B" },
+  { "2FA00", "19829" },
+  { "2FA01", "1295B6" },
+  { "2FA02", "198E2" },
+  { "2FA03", "14B33" },
+  { "2FA04", "19929" },
+  { "2FA05", "199A7" },
+  { "2FA06", "199C2" },
+  { "2FA07", "199FE" },
+  { "2FA08", "14BCE" },
+  { "2FA09", "129B30" },
+  { "2FA0A", "19B12" },
+  { "2FA0B", "19C40" },
+  { "2FA0C", "19CFD" },
+  { "2FA0D", "14CCE" },
+  { "2FA0E", "14CED" },
+  { "2FA0F", "19D67" },
+  { "2FA10", "12A0CE" },
+  { "2FA11", "14CF8" },
+  { "2FA12", "12A105" },
+  { "2FA13", "12A20E" },
+  { "2FA14", "12A291" },
+  { "2FA15", "19EBB" },
+  { "2FA16", "14D56" },
+  { "2FA17", "19EF9" },
+  { "2FA18", "19EFE" },
+  { "2FA19", "19F05" },
+  { "2FA1A", "19F0F" },
+  { "2FA1B", "19F16" },
+  { "2FA1C", "19F3B" },
+  { "2FA1D", "12A600" },
+};
+
+// global constructor
+
+static struct unicode_decompose_init {
+  unicode_decompose_init();
+} _unicode_decompose_init;
+
+unicode_decompose_init::unicode_decompose_init() {
+  for (unsigned int i = 0;
+       i < sizeof(unicode_decompose_list)/sizeof(unicode_decompose_list[0]);
+       i++) {
+    unicode_decompose *dec = new unicode_decompose[1];
+    dec->value = (char *)unicode_decompose_list[i].value;
+    unicode_decompose_table.define(unicode_decompose_list[i].key, dec);
+  }
+}
+
+const char *decompose_unicode(const char *s)
+{
+  unicode_decompose *result = unicode_decompose_table.lookup(s);
+  return result ? result->value : 0;
+}
diff --git a/contrib/groff/src/utils/addftinfo/Makefile.sub b/contrib/groff/src/utils/addftinfo/Makefile.sub
index af5bf70..096af0d 100644
--- a/contrib/groff/src/utils/addftinfo/Makefile.sub
+++ b/contrib/groff/src/utils/addftinfo/Makefile.sub
@@ -5,7 +5,7 @@ OBJS=\
   addftinfo.$(OBJEXT) \
   guess.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/addftinfo.cc \
-  $(srcdir)/guess.cc
+  $(srcdir)/addftinfo.cpp \
+  $(srcdir)/guess.cpp
 HDRS=\
   $(srcdir)/guess.h
diff --git a/contrib/groff/src/utils/addftinfo/addftinfo.cpp b/contrib/groff/src/utils/addftinfo/addftinfo.cpp
new file mode 100644
index 0000000..931d836
--- /dev/null
+++ b/contrib/groff/src/utils/addftinfo/addftinfo.cpp
@@ -0,0 +1,218 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <ctype.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "guess.h"
+
+extern "C" const char *Version_string;
+
+static void usage(FILE *stream);
+static void usage();
+static void version();
+static void convert_font(const font_params &, FILE *, FILE *);
+
+typedef int font_params::*param_t;
+
+static struct {
+  const char *name;
+  param_t par;
+} param_table[] = {
+  { "x-height", &font_params::x_height },
+  { "fig-height", &font_params::fig_height },
+  { "asc-height", &font_params::asc_height },
+  { "body-height", &font_params::body_height },
+  { "cap-height", &font_params::cap_height },
+  { "comma-depth", &font_params::comma_depth },
+  { "desc-depth", &font_params::desc_depth },
+  { "body-depth", &font_params::body_depth },
+};
+
+// These are all in thousandths of an em.
+// These values are correct for PostScript Times Roman.
+
+#define DEFAULT_X_HEIGHT 448
+#define DEFAULT_FIG_HEIGHT 676
+#define DEFAULT_ASC_HEIGHT 682
+#define DEFAULT_BODY_HEIGHT 676
+#define DEFAULT_CAP_HEIGHT 662
+#define DEFAULT_COMMA_DEPTH 143
+#define DEFAULT_DESC_DEPTH 217
+#define DEFAULT_BODY_DEPTH 177
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  int i;
+  for (i = 1; i < argc; i++) {
+    if (!strcmp(argv[i], "-v") || !strcmp(argv[i],"--version"))
+      version();
+    if (!strcmp(argv[i],"--help")) {
+      usage(stdout);
+      exit(0);
+    }
+  }
+  if (argc < 4)
+    usage();
+  int resolution;
+  if (sscanf(argv[argc-3], "%d", &resolution) != 1)
+    usage();
+  if (resolution <= 0)
+    fatal("resolution must be > 0");
+  int unitwidth;
+  if (sscanf(argv[argc-2], "%d", &unitwidth) != 1)
+    usage();
+  if (unitwidth <= 0)
+    fatal("unitwidth must be > 0");
+  font_params param;
+  const char *font = argv[argc-1];
+  param.italic = (font[0] != '\0' && strchr(font, '\0')[-1] == 'I');
+  param.em = (resolution*unitwidth)/72;
+  param.x_height = DEFAULT_X_HEIGHT;
+  param.fig_height = DEFAULT_FIG_HEIGHT;
+  param.asc_height = DEFAULT_ASC_HEIGHT;
+  param.body_height = DEFAULT_BODY_HEIGHT;
+  param.cap_height = DEFAULT_CAP_HEIGHT;
+  param.comma_depth = DEFAULT_COMMA_DEPTH;
+  param.desc_depth = DEFAULT_DESC_DEPTH;
+  param.body_depth = DEFAULT_BODY_DEPTH;
+  for (i = 1; i < argc && argv[i][0] == '-'; i++) {
+    if (argv[i][1] == '-' && argv[i][2] == '\0') {
+      i++;
+      break;
+    }
+    if (i + 1 >= argc)
+      usage();
+    size_t j;
+    for (j = 0;; j++) {
+      if (j >= sizeof(param_table)/sizeof(param_table[0]))
+	fatal("parameter `%1' not recognized", argv[i] + 1);
+      if (strcmp(param_table[j].name, argv[i] + 1) == 0)
+	break;
+    }
+    if (sscanf(argv[i+1], "%d", &(param.*(param_table[j].par))) != 1)
+      fatal("invalid argument `%1'", argv[i+1]);
+    i++;
+  }    
+  if (argc - i != 3)
+    usage();
+  errno = 0;
+  FILE *infp = fopen(font, "r");
+  if (infp == 0)
+    fatal("can't open `%1': %2", font, strerror(errno));
+  convert_font(param, infp, stdout);
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-v] [-param value] ... "
+		  "resolution unitwidth font\n",
+	  program_name);
+}
+static void usage()
+{
+  usage(stderr);
+  exit(1);
+}
+
+static void version()
+{
+  printf("GNU addftinfo (groff) version %s\n", Version_string);
+  exit(0);
+}
+
+static int get_line(FILE *fp, string *p)
+{
+  int c;
+  p->clear();
+  while ((c = getc(fp)) != EOF) {
+    *p += char(c);
+    if (c == '\n')
+      break;
+  }
+  return p->length() > 0;
+}
+  
+static void convert_font(const font_params &param, FILE *infp, FILE *outfp)
+{
+  string s;
+  while (get_line(infp, &s)) {
+    put_string(s, outfp);
+    if (s.length() >= 8
+	&& strncmp(&s[0], "charset", 7))
+      break;
+  }
+  while (get_line(infp, &s)) {
+    s += '\0';
+    string name;
+    const char *p = s.contents();
+    while (csspace(*p))
+      p++;
+    while (*p != '\0' && !csspace(*p))
+      name += *p++;
+    while (csspace(*p))
+      p++;
+    for (const char *q = s.contents(); q < p; q++)
+      putc(*q, outfp);
+    char *next;
+    char_metric metric;
+    metric.width = (int)strtol(p, &next, 10);
+    if (next != p) {
+      printf("%d", metric.width);
+      p = next;
+      metric.type = (int)strtol(p, &next, 10);
+      if (next != p) {
+	name += '\0';
+	guess(name.contents(), param, &metric);
+	if (metric.sk == 0) {
+	  if (metric.left_ic == 0) {
+	    if (metric.ic == 0) {
+	      if (metric.depth == 0) {
+		if (metric.height != 0)
+		  printf(",%d", metric.height);
+	      }
+	      else
+		printf(",%d,%d", metric.height, metric.depth);
+	    }
+	    else
+	      printf(",%d,%d,%d", metric.height, metric.depth, metric.ic);
+	  }
+	  else
+	    printf(",%d,%d,%d,%d", metric.height, metric.depth, metric.ic,
+		   metric.left_ic);
+	}
+	else
+	  printf(",%d,%d,%d,%d,%d", metric.height, metric.depth, metric.ic,
+		 metric.left_ic, metric.sk);
+      }
+    }
+    fputs(p, outfp);
+  }
+}
+
diff --git a/contrib/groff/src/utils/addftinfo/guess.cpp b/contrib/groff/src/utils/addftinfo/guess.cpp
new file mode 100644
index 0000000..dcfd4c9
--- /dev/null
+++ b/contrib/groff/src/utils/addftinfo/guess.cpp
@@ -0,0 +1,490 @@
+// -*- C++ -*-
+/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "guess.h"
+
+void guess(const char *s, const font_params &param, char_metric *metric)
+{
+  int &height = metric->height;
+  int &depth = metric->depth;
+
+  metric->ic = 0;
+  metric->left_ic = 0;
+  metric->sk = 0;
+  height = 0;
+  depth = 0;
+  if (s[0] == '\0' || (s[1] != '\0' && s[2] != '\0'))
+    goto do_default;
+#define HASH(c1, c2) (((unsigned char)(c1) << 8) | (unsigned char)(c2))
+  switch (HASH(s[0], s[1])) {
+  default:
+  do_default:
+    if (metric->type & 01)
+      depth = param.desc_depth;
+    if (metric->type & 02)
+      height = param.asc_height;
+    else
+      height = param.x_height;
+    break;
+  case HASH('\\', '|'):
+  case HASH('\\', '^'):
+  case HASH('\\', '&'):
+    // these have zero height and depth
+    break;
+  case HASH('f', 0):
+    height = param.asc_height;
+    if (param.italic)
+      depth = param.desc_depth;
+    break;
+  case HASH('a', 0):
+  case HASH('c', 0):
+  case HASH('e', 0):
+  case HASH('m', 0):
+  case HASH('n', 0):
+  case HASH('o', 0):
+  case HASH('r', 0):
+  case HASH('s', 0):
+  case HASH('u', 0):
+  case HASH('v', 0):
+  case HASH('w', 0):
+  case HASH('x', 0):
+  case HASH('z', 0):
+    height = param.x_height;
+    break;
+  case HASH('i', 0):
+    height = param.x_height;
+    break;
+  case HASH('b', 0):
+  case HASH('d', 0):
+  case HASH('h', 0):
+  case HASH('k', 0):
+  case HASH('l', 0):
+  case HASH('F', 'i'):
+  case HASH('F', 'l'):
+  case HASH('f', 'f'):
+  case HASH('f', 'i'):
+  case HASH('f', 'l'):
+    height = param.asc_height;
+    break;
+  case HASH('t', 0):
+    height = param.asc_height;
+    break;
+  case HASH('g', 0):
+  case HASH('p', 0):
+  case HASH('q', 0):
+  case HASH('y', 0):
+    height = param.x_height;
+    depth = param.desc_depth;
+    break;
+  case HASH('j', 0):
+    height = param.x_height;
+    depth = param.desc_depth;
+    break;
+  case HASH('A', 0):
+  case HASH('B', 0):
+  case HASH('C', 0):
+  case HASH('D', 0):
+  case HASH('E', 0):
+  case HASH('F', 0):
+  case HASH('G', 0):
+  case HASH('H', 0):
+  case HASH('I', 0):
+  case HASH('J', 0):
+  case HASH('K', 0):
+  case HASH('L', 0):
+  case HASH('M', 0):
+  case HASH('N', 0):
+  case HASH('O', 0):
+  case HASH('P', 0):
+  case HASH('Q', 0):
+  case HASH('R', 0):
+  case HASH('S', 0):
+  case HASH('T', 0):
+  case HASH('U', 0):
+  case HASH('V', 0):
+  case HASH('W', 0):
+  case HASH('X', 0):
+  case HASH('Y', 0):
+  case HASH('Z', 0):
+    height = param.cap_height;
+    break;
+  case HASH('*', 'A'):
+  case HASH('*', 'B'):
+  case HASH('*', 'C'):
+  case HASH('*', 'D'):
+  case HASH('*', 'E'):
+  case HASH('*', 'F'):
+  case HASH('*', 'G'):
+  case HASH('*', 'H'):
+  case HASH('*', 'I'):
+  case HASH('*', 'K'):
+  case HASH('*', 'L'):
+  case HASH('*', 'M'):
+  case HASH('*', 'N'):
+  case HASH('*', 'O'):
+  case HASH('*', 'P'):
+  case HASH('*', 'Q'):
+  case HASH('*', 'R'):
+  case HASH('*', 'S'):
+  case HASH('*', 'T'):
+  case HASH('*', 'U'):
+  case HASH('*', 'W'):
+  case HASH('*', 'X'):
+  case HASH('*', 'Y'):
+  case HASH('*', 'Z'):
+    height = param.cap_height;
+    break;
+  case HASH('0', 0):
+  case HASH('1', 0):
+  case HASH('2', 0):
+  case HASH('3', 0):
+  case HASH('4', 0):
+  case HASH('5', 0):
+  case HASH('6', 0):
+  case HASH('7', 0):
+  case HASH('8', 0):
+  case HASH('9', 0):
+  case HASH('1', '2'):
+  case HASH('1', '4'):
+  case HASH('3', '4'):
+    height = param.fig_height;
+    break;
+  case HASH('(', 0):
+  case HASH(')', 0):
+  case HASH('[', 0):
+  case HASH(']', 0):
+  case HASH('{', 0):
+  case HASH('}', 0):
+    height = param.body_height;
+    depth = param.body_depth;
+    break;
+  case HASH('i', 's'):
+    height = (param.em*3)/4;
+    depth = param.em/4;
+    break;
+  case HASH('*', 'a'):
+  case HASH('*', 'e'):
+  case HASH('*', 'i'):
+  case HASH('*', 'k'):
+  case HASH('*', 'n'):
+  case HASH('*', 'o'):
+  case HASH('*', 'p'):
+  case HASH('*', 's'):
+  case HASH('*', 't'):
+  case HASH('*', 'u'):
+  case HASH('*', 'w'):
+    height = param.x_height;
+    break;
+  case HASH('*', 'd'):
+  case HASH('*', 'l'):
+    height = param.asc_height;
+    break;
+  case HASH('*', 'g'):
+  case HASH('*', 'h'):
+  case HASH('*', 'm'):
+  case HASH('*', 'r'):
+  case HASH('*', 'x'):
+  case HASH('*', 'y'):
+    height = param.x_height;
+    depth = param.desc_depth;
+    break;
+  case HASH('*', 'b'):
+  case HASH('*', 'c'):
+  case HASH('*', 'f'):
+  case HASH('*', 'q'):
+  case HASH('*', 'z'):
+    height = param.asc_height;
+    depth = param.desc_depth;
+    break;
+  case HASH('t', 's'):
+    height = param.x_height;
+    depth = param.desc_depth;
+    break;
+  case HASH('!', 0):
+  case HASH('?', 0):
+  case HASH('"', 0):
+  case HASH('#', 0):
+  case HASH('$', 0):
+  case HASH('%', 0):
+  case HASH('&', 0):
+  case HASH('*', 0):
+  case HASH('+', 0):
+    height = param.asc_height;
+    break;
+  case HASH('`', 0):
+  case HASH('\'', 0):
+    height = param.asc_height;
+    break;
+  case HASH('~', 0):
+  case HASH('^', 0):
+  case HASH('a', 'a'):
+  case HASH('g', 'a'):
+    height = param.asc_height;
+    break;
+  case HASH('r', 'u'):
+  case HASH('.', 0):
+    break;
+  case HASH(',', 0):
+    depth = param.comma_depth;
+    break;
+  case HASH('m', 'i'):
+  case HASH('-', 0):
+  case HASH('h', 'y'):
+  case HASH('e', 'm'):
+    height = param.x_height;
+    break;
+  case HASH(':', 0):
+    height = param.x_height;
+    break;
+  case HASH(';', 0):
+    height = param.x_height;
+    depth = param.comma_depth;
+    break;
+  case HASH('=', 0):
+  case HASH('e', 'q'):
+    height = param.x_height;
+    break;
+  case HASH('<', 0):
+  case HASH('>', 0):
+  case HASH('>', '='):
+  case HASH('<', '='):
+  case HASH('@', 0):
+  case HASH('/', 0):
+  case HASH('|', 0):
+  case HASH('\\', 0):
+    height = param.asc_height;
+    break;
+  case HASH('_', 0):
+  case HASH('u', 'l'):
+  case HASH('\\', '_'):
+    depth = param.em/4;
+    break;
+  case HASH('r', 'n'):
+    height = (param.em*3)/4;
+    break;
+  case HASH('s', 'r'):
+    height = (param.em*3)/4;
+    depth = param.em/4;
+    break;
+  case HASH('b', 'u'):
+  case HASH('s', 'q'):
+  case HASH('d', 'e'):
+  case HASH('d', 'g'):
+  case HASH('f', 'm'):
+  case HASH('c', 't'):
+  case HASH('r', 'g'):
+  case HASH('c', 'o'):
+  case HASH('p', 'l'):
+  case HASH('*', '*'):
+  case HASH('s', 'c'):
+  case HASH('s', 'l'):
+  case HASH('=', '='):
+  case HASH('~', '='):
+  case HASH('a', 'p'):
+  case HASH('!', '='):
+  case HASH('-', '>'):
+  case HASH('<', '-'):
+  case HASH('u', 'a'):
+  case HASH('d', 'a'):
+  case HASH('m', 'u'):
+  case HASH('d', 'i'):
+  case HASH('+', '-'):
+  case HASH('c', 'u'):
+  case HASH('c', 'a'):
+  case HASH('s', 'b'):
+  case HASH('s', 'p'):
+  case HASH('i', 'b'):
+  case HASH('i', 'p'):
+  case HASH('i', 'f'):
+  case HASH('p', 'd'):
+  case HASH('g', 'r'):
+  case HASH('n', 'o'):
+  case HASH('p', 't'):
+  case HASH('e', 's'):
+  case HASH('m', 'o'):
+  case HASH('b', 'r'):
+  case HASH('d', 'd'):
+  case HASH('r', 'h'):
+  case HASH('l', 'h'):
+  case HASH('o', 'r'):
+  case HASH('c', 'i'):
+    height = param.asc_height;
+    break;
+  case HASH('l', 't'):
+  case HASH('l', 'b'):
+  case HASH('r', 't'):
+  case HASH('r', 'b'):
+  case HASH('l', 'k'):
+  case HASH('r', 'k'):
+  case HASH('b', 'v'):
+  case HASH('l', 'f'):
+  case HASH('r', 'f'):
+  case HASH('l', 'c'):
+  case HASH('r', 'c'):
+    height = (param.em*3)/4;
+    depth = param.em/4;
+    break;
+#if 0
+  case HASH('%', '0'):
+  case HASH('-', '+'):
+  case HASH('-', 'D'):
+  case HASH('-', 'd'):
+  case HASH('-', 'd'):
+  case HASH('-', 'h'):
+  case HASH('.', 'i'):
+  case HASH('.', 'j'):
+  case HASH('/', 'L'):
+  case HASH('/', 'O'):
+  case HASH('/', 'l'):
+  case HASH('/', 'o'):
+  case HASH('=', '~'):
+  case HASH('A', 'E'):
+  case HASH('A', 'h'):
+  case HASH('A', 'N'):
+  case HASH('C', 's'):
+  case HASH('D', 'o'):
+  case HASH('F', 'c'):
+  case HASH('F', 'o'):
+  case HASH('I', 'J'):
+  case HASH('I', 'm'):
+  case HASH('O', 'E'):
+  case HASH('O', 'f'):
+  case HASH('O', 'K'):
+  case HASH('O', 'm'):
+  case HASH('O', 'R'):
+  case HASH('P', 'o'):
+  case HASH('R', 'e'):
+  case HASH('S', '1'):
+  case HASH('S', '2'):
+  case HASH('S', '3'):
+  case HASH('T', 'P'):
+  case HASH('T', 'p'):
+  case HASH('Y', 'e'):
+  case HASH('\\', '-'):
+  case HASH('a', '"'):
+  case HASH('a', '-'):
+  case HASH('a', '.'):
+  case HASH('a', '^'):
+  case HASH('a', 'b'):
+  case HASH('a', 'c'):
+  case HASH('a', 'd'):
+  case HASH('a', 'e'):
+  case HASH('a', 'h'):
+  case HASH('a', 'o'):
+  case HASH('a', 't'):
+  case HASH('a', '~'):
+  case HASH('b', 'a'):
+  case HASH('b', 'b'):
+  case HASH('b', 's'):
+  case HASH('c', '*'):
+  case HASH('c', '+'):
+  case HASH('f', '/'):
+  case HASH('f', 'a'):
+  case HASH('f', 'c'):
+  case HASH('f', 'o'):
+  case HASH('h', 'a'):
+  case HASH('h', 'o'):
+  case HASH('i', 'j'):
+  case HASH('l', 'A'):
+  case HASH('l', 'B'):
+  case HASH('l', 'C'):
+  case HASH('m', 'd'):
+  case HASH('n', 'c'):
+  case HASH('n', 'e'):
+  case HASH('n', 'm'):
+  case HASH('o', 'A'):
+  case HASH('o', 'a'):
+  case HASH('o', 'e'):
+  case HASH('o', 'q'):
+  case HASH('p', 'l'):
+  case HASH('p', 'p'):
+  case HASH('p', 's'):
+  case HASH('r', '!'):
+  case HASH('r', '?'):
+  case HASH('r', 'A'):
+  case HASH('r', 'B'):
+  case HASH('r', 'C'):
+  case HASH('r', 's'):
+  case HASH('s', 'h'):
+  case HASH('s', 's'):
+  case HASH('t', 'e'):
+  case HASH('t', 'f'):
+  case HASH('t', 'i'):
+  case HASH('t', 'm'):
+  case HASH('~', '~'):
+  case HASH('v', 'S'):
+  case HASH('v', 'Z'):
+  case HASH('v', 's'):
+  case HASH('v', 'z'):
+  case HASH('^', 'A'):
+  case HASH('^', 'E'):
+  case HASH('^', 'I'):
+  case HASH('^', 'O'):
+  case HASH('^', 'U'):
+  case HASH('^', 'a'):
+  case HASH('^', 'e'):
+  case HASH('^', 'i'):
+  case HASH('^', 'o'):
+  case HASH('^', 'u'):
+  case HASH('`', 'A'):
+  case HASH('`', 'E'):
+  case HASH('`', 'I'):
+  case HASH('`', 'O'):
+  case HASH('`', 'U'):
+  case HASH('`', 'a'):
+  case HASH('`', 'e'):
+  case HASH('`', 'i'):
+  case HASH('`', 'o'):
+  case HASH('`', 'u'):
+  case HASH('~', 'A'):
+  case HASH('~', 'N'):
+  case HASH('~', 'O'):
+  case HASH('~', 'a'):
+  case HASH('~', 'n'):
+  case HASH('~', 'o'):
+  case HASH('\'', 'A'):
+  case HASH('\'', 'C'):
+  case HASH('\'', 'E'):
+  case HASH('\'', 'I'):
+  case HASH('\'', 'O'):
+  case HASH('\'', 'U'):
+  case HASH('\'', 'a'):
+  case HASH('\'', 'c'):
+  case HASH('\'', 'e'):
+  case HASH('\'', 'i'):
+  case HASH('\'', 'o'):
+  case HASH('\'', 'u')
+  case HASH(':', 'A'):
+  case HASH(':', 'E'):
+  case HASH(':', 'I'):
+  case HASH(':', 'O'):
+  case HASH(':', 'U'):
+  case HASH(':', 'Y'):
+  case HASH(':', 'a'):
+  case HASH(':', 'e'):
+  case HASH(':', 'i'):
+  case HASH(':', 'o'):
+  case HASH(':', 'u'):
+  case HASH(':', 'y'):
+  case HASH(',', 'C'):
+  case HASH(',', 'c'):
+#endif
+  }
+}
diff --git a/contrib/groff/src/utils/afmtodit/Makefile.sub b/contrib/groff/src/utils/afmtodit/Makefile.sub
index 9176924..c1de91b 100644
--- a/contrib/groff/src/utils/afmtodit/Makefile.sub
+++ b/contrib/groff/src/utils/afmtodit/Makefile.sub
@@ -7,9 +7,11 @@ afmtodit: afmtodit.pl
 	if test -n "$(PERLPATH)"; then \
 	  sed -e "s|/usr/bin/perl|$(PERLPATH)|" \
               -e "s|@VERSION@|$(version)$(revision)|" \
+              -e "s|@FONTDIR@|$(fontdir)|" \
               $(srcdir)/afmtodit.pl >afmtodit; \
 	else \
 	  sed -e "s|@VERSION@|$(version)$(revision)|" \
+              -e "s|@FONTDIR@|$(fontdir)|" \
               $(srcdir)/afmtodit.pl afmtodit; \
 	fi
 	chmod +x afmtodit
diff --git a/contrib/groff/src/utils/afmtodit/afmtodit.man b/contrib/groff/src/utils/afmtodit/afmtodit.man
index 2d4c866..88198c9 100644
--- a/contrib/groff/src/utils/afmtodit/afmtodit.man
+++ b/contrib/groff/src/utils/afmtodit/afmtodit.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -41,21 +41,23 @@ afmtodit \- create font files for use with groff \-Tps
 .ti \niu
 .B afmtodit
 .de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
+.ie \\n(.$-1 .RI "[\ \fB\\$1\fP\ " "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
 .
-.OP \-nsv
+.OP \-mnsv
+.OP \-a n
 .OP \-d desc_file
 .OP \-e enc_file
 .OP \-i n
-.OP \-a n
 .I afm_file
 .I map_file
 .I font
 .br
 .ad \na
 .
+.LP
+The whitespace between an command line option and its argument is optional.
 .
 .SH DESCRIPTION
 .B afmtodit
@@ -67,9 +69,11 @@ is written in perl;
 you must have perl version 3 or newer installed in order to run
 .BR afmtodit .
 .
+.LP
 .I afm_file
 is the AFM (Adobe Font Metric) file for the font.
 .
+.LP
 .I map_file
 is a file that says which groff character names map onto
 each PostScript character name;
@@ -96,12 +100,16 @@ Lines starting with
 .B #
 and blank lines are ignored.
 .
-.I font
-is the groff name of the font.
+If the file isn't found in the current directory, it is searched in
+the `devps/generate' subdirectory of the default font directory.
 .
+.LP
 If a PostScript character is in the encoding to be used for the font
 but is not mentioned in
-.I map_file
+.IR map_file ,
+or if a generic groff glyph name can't be deduced using the Adobe Glyph
+List (built into
+.BR afmtodit )
 then
 .B afmtodit
 will put it in the groff font file as an unnamed character,
@@ -110,6 +118,25 @@ which can be accessed by the
 escape sequence in
 .BR troff .
 .
+If option
+.B \-e
+is not specified, the encoding defined in the AFM file (i.e., entries with
+non-negative character codes) is used.
+.
+Please refer to section `Using Symbols' in the groff info file which
+describes how groff glyph names are constructed.
+.
+.LP
+Characters not encoded in the AFM file (i.e., entries which have \-1 as
+the character code) are still available in groff; they get glyph index
+values greater than 255 (or greater than the biggest character code used
+in the AFM file in the unlikely case that it is greater than 255) in the
+groff font file.
+.
+Glyph indices of unencoded characters don't have a specific order; it
+is best to access them with glyph names only.
+.
+.LP
 The groff font file will be output to a file called
 .IR font .
 .
@@ -153,24 +180,23 @@ These parameters are normally needed only for italic (or oblique) fonts.
 .
 .SH OPTIONS
 .TP
-.B \-v
-Print version.
-.
-.TP
-.B \-n
-Don't output a
-.B ligatures
-command for this font.
-.
-Use this with constant-width fonts.
+.BI \-a n
+Use
+.I n
+as the slant parameter in the font file;
+this is used by groff in the positioning of accents.
 .
-.TP
-.B \-s
-The font is special.
+By default
+.B afmtodit
+uses the negative of the ItalicAngle specified in the afm file;
+with true italic fonts it is sometimes desirable to use
+a slant that is less than this.
 .
-The effect of this option is to add the
-.B special
-command to the font file.
+If you find that characters from an italic font have accents
+placed too far to the right over them,
+then use the
+.B \-a
+option to give the font a smaller slant.
 .
 .TP
 .BI \-d desc_file
@@ -179,6 +205,11 @@ The device description file is
 rather than the default
 .BR DESC .
 .
+If not found in the current directory, the `devps' subdirectory of the
+default font directory is searched (this is true for both the default
+device description file and a file given with option
+.BR \-d ).
+.
 .TP
 .BI \-e enc_file
 The PostScript font should be reencoded to use the encoding described
@@ -189,24 +220,8 @@ The format of
 is described in
 .BR grops (@MAN1EXT@).
 .
-.TP
-.BI \-a n
-Use
-.I n
-as the slant parameter in the font file;
-this is used by groff in the positioning of accents.
-.
-By default
-.B afmtodit
-uses the negative of the ItalicAngle specified in the afm file;
-with true italic fonts it is sometimes desirable to use
-a slant that is less than this.
-.
-If you find that characters from an italic font have accents
-placed too far to the right over them,
-then use the
-.B \-a
-option to give the font a smaller slant.
+If not found in the current directory, the `devps' subdirectory of the
+default font directory is searched.
 .
 .TP
 .BI \-i n
@@ -215,7 +230,7 @@ the character's width plus the character's italic correction
 is equal to
 .I n
 thousandths of an em
-plus the amount by which the right edge of the character's bounding
+plus the amount by which the right edge of the character's bounding box
 is to the right of the character's origin.
 .
 If this would result in a negative italic correction, use a zero
@@ -238,7 +253,9 @@ thousandths of an em
 plus the amount by which the left edge of the character's bounding box
 is to the left of the character's origin.
 .
-The left italic correction may be negative.
+The left italic correction may be negative unless option
+.B \-m
+is given.
 .
 .IP
 This option is normally needed only with italic (or oblique) fonts.
@@ -247,6 +264,35 @@ The font files distributed with groff were created using an option of
 .B \-i50
 for italic fonts.
 .
+.TP
+.B \-m
+Prevent negative left italic correction values.
+.
+Roman font files distributed with groff were created with
+.B \-i0\ \-m
+to improve spacing with
+.BR @g@eqn (@MAN1EXT@).
+.
+.TP
+.B \-n
+Don't output a
+.B ligatures
+command for this font.
+.
+Use this with constant-width fonts.
+.
+.TP
+.B \-s
+The font is special.
+.
+The effect of this option is to add the
+.B special
+command to the font file.
+.
+.TP
+.B \-v
+Print version.
+.
 .
 .SH FILES
 .Tp \w'\fB@FONTDIR@/devps/download'u+2n
@@ -277,6 +323,9 @@ Standard mapping.
 .BR groff_font (@MAN5EXT@),
 .BR perl (1)
 .
+.LP
+The groff info file, section `Using Symbols'.
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/contrib/groff/src/utils/afmtodit/afmtodit.pl b/contrib/groff/src/utils/afmtodit/afmtodit.pl
index 67c0f682..72a486b 100644
--- a/contrib/groff/src/utils/afmtodit/afmtodit.pl
+++ b/contrib/groff/src/utils/afmtodit/afmtodit.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # -*- Perl -*-
-# Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
 # This file is part of groff.
@@ -19,11 +19,6034 @@
 # with groff; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+%unicode_decomposed = (
+  "u00C0", "u0041_0300",
+  "u00C1", "u0041_0301",
+  "u00C2", "u0041_0302",
+  "u00C3", "u0041_0303",
+  "u00C4", "u0041_0308",
+  "u00C5", "u0041_030A",
+  "u00C7", "u0043_0327",
+  "u00C8", "u0045_0300",
+  "u00C9", "u0045_0301",
+  "u00CA", "u0045_0302",
+  "u00CB", "u0045_0308",
+  "u00CC", "u0049_0300",
+  "u00CD", "u0049_0301",
+  "u00CE", "u0049_0302",
+  "u00CF", "u0049_0308",
+  "u00D1", "u004E_0303",
+  "u00D2", "u004F_0300",
+  "u00D3", "u004F_0301",
+  "u00D4", "u004F_0302",
+  "u00D5", "u004F_0303",
+  "u00D6", "u004F_0308",
+  "u00D9", "u0055_0300",
+  "u00DA", "u0055_0301",
+  "u00DB", "u0055_0302",
+  "u00DC", "u0055_0308",
+  "u00DD", "u0059_0301",
+  "u00E0", "u0061_0300",
+  "u00E1", "u0061_0301",
+  "u00E2", "u0061_0302",
+  "u00E3", "u0061_0303",
+  "u00E4", "u0061_0308",
+  "u00E5", "u0061_030A",
+  "u00E7", "u0063_0327",
+  "u00E8", "u0065_0300",
+  "u00E9", "u0065_0301",
+  "u00EA", "u0065_0302",
+  "u00EB", "u0065_0308",
+  "u00EC", "u0069_0300",
+  "u00ED", "u0069_0301",
+  "u00EE", "u0069_0302",
+  "u00EF", "u0069_0308",
+  "u00F1", "u006E_0303",
+  "u00F2", "u006F_0300",
+  "u00F3", "u006F_0301",
+  "u00F4", "u006F_0302",
+  "u00F5", "u006F_0303",
+  "u00F6", "u006F_0308",
+  "u00F9", "u0075_0300",
+  "u00FA", "u0075_0301",
+  "u00FB", "u0075_0302",
+  "u00FC", "u0075_0308",
+  "u00FD", "u0079_0301",
+  "u00FF", "u0079_0308",
+  "u0100", "u0041_0304",
+  "u0101", "u0061_0304",
+  "u0102", "u0041_0306",
+  "u0103", "u0061_0306",
+  "u0104", "u0041_0328",
+  "u0105", "u0061_0328",
+  "u0106", "u0043_0301",
+  "u0107", "u0063_0301",
+  "u0108", "u0043_0302",
+  "u0109", "u0063_0302",
+  "u010A", "u0043_0307",
+  "u010B", "u0063_0307",
+  "u010C", "u0043_030C",
+  "u010D", "u0063_030C",
+  "u010E", "u0044_030C",
+  "u010F", "u0064_030C",
+  "u0112", "u0045_0304",
+  "u0113", "u0065_0304",
+  "u0114", "u0045_0306",
+  "u0115", "u0065_0306",
+  "u0116", "u0045_0307",
+  "u0117", "u0065_0307",
+  "u0118", "u0045_0328",
+  "u0119", "u0065_0328",
+  "u011A", "u0045_030C",
+  "u011B", "u0065_030C",
+  "u011C", "u0047_0302",
+  "u011D", "u0067_0302",
+  "u011E", "u0047_0306",
+  "u011F", "u0067_0306",
+  "u0120", "u0047_0307",
+  "u0121", "u0067_0307",
+  "u0122", "u0047_0327",
+  "u0123", "u0067_0327",
+  "u0124", "u0048_0302",
+  "u0125", "u0068_0302",
+  "u0128", "u0049_0303",
+  "u0129", "u0069_0303",
+  "u012A", "u0049_0304",
+  "u012B", "u0069_0304",
+  "u012C", "u0049_0306",
+  "u012D", "u0069_0306",
+  "u012E", "u0049_0328",
+  "u012F", "u0069_0328",
+  "u0130", "u0049_0307",
+  "u0134", "u004A_0302",
+  "u0135", "u006A_0302",
+  "u0136", "u004B_0327",
+  "u0137", "u006B_0327",
+  "u0139", "u004C_0301",
+  "u013A", "u006C_0301",
+  "u013B", "u004C_0327",
+  "u013C", "u006C_0327",
+  "u013D", "u004C_030C",
+  "u013E", "u006C_030C",
+  "u0143", "u004E_0301",
+  "u0144", "u006E_0301",
+  "u0145", "u004E_0327",
+  "u0146", "u006E_0327",
+  "u0147", "u004E_030C",
+  "u0148", "u006E_030C",
+  "u014C", "u004F_0304",
+  "u014D", "u006F_0304",
+  "u014E", "u004F_0306",
+  "u014F", "u006F_0306",
+  "u0150", "u004F_030B",
+  "u0151", "u006F_030B",
+  "u0154", "u0052_0301",
+  "u0155", "u0072_0301",
+  "u0156", "u0052_0327",
+  "u0157", "u0072_0327",
+  "u0158", "u0052_030C",
+  "u0159", "u0072_030C",
+  "u015A", "u0053_0301",
+  "u015B", "u0073_0301",
+  "u015C", "u0053_0302",
+  "u015D", "u0073_0302",
+  "u015E", "u0053_0327",
+  "u015F", "u0073_0327",
+  "u0160", "u0053_030C",
+  "u0161", "u0073_030C",
+  "u0162", "u0054_0327",
+  "u0163", "u0074_0327",
+  "u0164", "u0054_030C",
+  "u0165", "u0074_030C",
+  "u0168", "u0055_0303",
+  "u0169", "u0075_0303",
+  "u016A", "u0055_0304",
+  "u016B", "u0075_0304",
+  "u016C", "u0055_0306",
+  "u016D", "u0075_0306",
+  "u016E", "u0055_030A",
+  "u016F", "u0075_030A",
+  "u0170", "u0055_030B",
+  "u0171", "u0075_030B",
+  "u0172", "u0055_0328",
+  "u0173", "u0075_0328",
+  "u0174", "u0057_0302",
+  "u0175", "u0077_0302",
+  "u0176", "u0059_0302",
+  "u0177", "u0079_0302",
+  "u0178", "u0059_0308",
+  "u0179", "u005A_0301",
+  "u017A", "u007A_0301",
+  "u017B", "u005A_0307",
+  "u017C", "u007A_0307",
+  "u017D", "u005A_030C",
+  "u017E", "u007A_030C",
+  "u01A0", "u004F_031B",
+  "u01A1", "u006F_031B",
+  "u01AF", "u0055_031B",
+  "u01B0", "u0075_031B",
+  "u01CD", "u0041_030C",
+  "u01CE", "u0061_030C",
+  "u01CF", "u0049_030C",
+  "u01D0", "u0069_030C",
+  "u01D1", "u004F_030C",
+  "u01D2", "u006F_030C",
+  "u01D3", "u0055_030C",
+  "u01D4", "u0075_030C",
+  "u01D5", "u0055_0308_0304",
+  "u01D6", "u0075_0308_0304",
+  "u01D7", "u0055_0308_0301",
+  "u01D8", "u0075_0308_0301",
+  "u01D9", "u0055_0308_030C",
+  "u01DA", "u0075_0308_030C",
+  "u01DB", "u0055_0308_0300",
+  "u01DC", "u0075_0308_0300",
+  "u01DE", "u0041_0308_0304",
+  "u01DF", "u0061_0308_0304",
+  "u01E0", "u0041_0307_0304",
+  "u01E1", "u0061_0307_0304",
+  "u01E2", "u00C6_0304",
+  "u01E3", "u00E6_0304",
+  "u01E6", "u0047_030C",
+  "u01E7", "u0067_030C",
+  "u01E8", "u004B_030C",
+  "u01E9", "u006B_030C",
+  "u01EA", "u004F_0328",
+  "u01EB", "u006F_0328",
+  "u01EC", "u004F_0328_0304",
+  "u01ED", "u006F_0328_0304",
+  "u01EE", "u01B7_030C",
+  "u01EF", "u0292_030C",
+  "u01F0", "u006A_030C",
+  "u01F4", "u0047_0301",
+  "u01F5", "u0067_0301",
+  "u01F8", "u004E_0300",
+  "u01F9", "u006E_0300",
+  "u01FA", "u0041_030A_0301",
+  "u01FB", "u0061_030A_0301",
+  "u01FC", "u00C6_0301",
+  "u01FD", "u00E6_0301",
+  "u01FE", "u00D8_0301",
+  "u01FF", "u00F8_0301",
+  "u0200", "u0041_030F",
+  "u0201", "u0061_030F",
+  "u0202", "u0041_0311",
+  "u0203", "u0061_0311",
+  "u0204", "u0045_030F",
+  "u0205", "u0065_030F",
+  "u0206", "u0045_0311",
+  "u0207", "u0065_0311",
+  "u0208", "u0049_030F",
+  "u0209", "u0069_030F",
+  "u020A", "u0049_0311",
+  "u020B", "u0069_0311",
+  "u020C", "u004F_030F",
+  "u020D", "u006F_030F",
+  "u020E", "u004F_0311",
+  "u020F", "u006F_0311",
+  "u0210", "u0052_030F",
+  "u0211", "u0072_030F",
+  "u0212", "u0052_0311",
+  "u0213", "u0072_0311",
+  "u0214", "u0055_030F",
+  "u0215", "u0075_030F",
+  "u0216", "u0055_0311",
+  "u0217", "u0075_0311",
+  "u0218", "u0053_0326",
+  "u0219", "u0073_0326",
+  "u021A", "u0054_0326",
+  "u021B", "u0074_0326",
+  "u021E", "u0048_030C",
+  "u021F", "u0068_030C",
+  "u0226", "u0041_0307",
+  "u0227", "u0061_0307",
+  "u0228", "u0045_0327",
+  "u0229", "u0065_0327",
+  "u022A", "u004F_0308_0304",
+  "u022B", "u006F_0308_0304",
+  "u022C", "u004F_0303_0304",
+  "u022D", "u006F_0303_0304",
+  "u022E", "u004F_0307",
+  "u022F", "u006F_0307",
+  "u0230", "u004F_0307_0304",
+  "u0231", "u006F_0307_0304",
+  "u0232", "u0059_0304",
+  "u0233", "u0079_0304",
+  "u0340", "u0300",
+  "u0341", "u0301",
+  "u0343", "u0313",
+  "u0344", "u0308_0301",
+  "u0374", "u02B9",
+  "u037E", "u003B",
+  "u0385", "u00A8_0301",
+  "u0386", "u0391_0301",
+  "u0387", "u00B7",
+  "u0388", "u0395_0301",
+  "u0389", "u0397_0301",
+  "u038A", "u0399_0301",
+  "u038C", "u039F_0301",
+  "u038E", "u03A5_0301",
+  "u038F", "u03A9_0301",
+  "u0390", "u03B9_0308_0301",
+  "u03AA", "u0399_0308",
+  "u03AB", "u03A5_0308",
+  "u03AC", "u03B1_0301",
+  "u03AD", "u03B5_0301",
+  "u03AE", "u03B7_0301",
+  "u03AF", "u03B9_0301",
+  "u03B0", "u03C5_0308_0301",
+  "u03CA", "u03B9_0308",
+  "u03CB", "u03C5_0308",
+  "u03CC", "u03BF_0301",
+  "u03CD", "u03C5_0301",
+  "u03CE", "u03C9_0301",
+  "u03D3", "u03D2_0301",
+  "u03D4", "u03D2_0308",
+  "u0400", "u0415_0300",
+  "u0401", "u0415_0308",
+  "u0403", "u0413_0301",
+  "u0407", "u0406_0308",
+  "u040C", "u041A_0301",
+  "u040D", "u0418_0300",
+  "u040E", "u0423_0306",
+  "u0419", "u0418_0306",
+  "u0439", "u0438_0306",
+  "u0450", "u0435_0300",
+  "u0451", "u0435_0308",
+  "u0453", "u0433_0301",
+  "u0457", "u0456_0308",
+  "u045C", "u043A_0301",
+  "u045D", "u0438_0300",
+  "u045E", "u0443_0306",
+  "u0476", "u0474_030F",
+  "u0477", "u0475_030F",
+  "u04C1", "u0416_0306",
+  "u04C2", "u0436_0306",
+  "u04D0", "u0410_0306",
+  "u04D1", "u0430_0306",
+  "u04D2", "u0410_0308",
+  "u04D3", "u0430_0308",
+  "u04D6", "u0415_0306",
+  "u04D7", "u0435_0306",
+  "u04DA", "u04D8_0308",
+  "u04DB", "u04D9_0308",
+  "u04DC", "u0416_0308",
+  "u04DD", "u0436_0308",
+  "u04DE", "u0417_0308",
+  "u04DF", "u0437_0308",
+  "u04E2", "u0418_0304",
+  "u04E3", "u0438_0304",
+  "u04E4", "u0418_0308",
+  "u04E5", "u0438_0308",
+  "u04E6", "u041E_0308",
+  "u04E7", "u043E_0308",
+  "u04EA", "u04E8_0308",
+  "u04EB", "u04E9_0308",
+  "u04EC", "u042D_0308",
+  "u04ED", "u044D_0308",
+  "u04EE", "u0423_0304",
+  "u04EF", "u0443_0304",
+  "u04F0", "u0423_0308",
+  "u04F1", "u0443_0308",
+  "u04F2", "u0423_030B",
+  "u04F3", "u0443_030B",
+  "u04F4", "u0427_0308",
+  "u04F5", "u0447_0308",
+  "u04F8", "u042B_0308",
+  "u04F9", "u044B_0308",
+  "u0622", "u0627_0653",
+  "u0623", "u0627_0654",
+  "u0624", "u0648_0654",
+  "u0625", "u0627_0655",
+  "u0626", "u064A_0654",
+  "u06C0", "u06D5_0654",
+  "u06C2", "u06C1_0654",
+  "u06D3", "u06D2_0654",
+  "u0929", "u0928_093C",
+  "u0931", "u0930_093C",
+  "u0934", "u0933_093C",
+  "u0958", "u0915_093C",
+  "u0959", "u0916_093C",
+  "u095A", "u0917_093C",
+  "u095B", "u091C_093C",
+  "u095C", "u0921_093C",
+  "u095D", "u0922_093C",
+  "u095E", "u092B_093C",
+  "u095F", "u092F_093C",
+  "u09CB", "u09C7_09BE",
+  "u09CC", "u09C7_09D7",
+  "u09DC", "u09A1_09BC",
+  "u09DD", "u09A2_09BC",
+  "u09DF", "u09AF_09BC",
+  "u0A33", "u0A32_0A3C",
+  "u0A36", "u0A38_0A3C",
+  "u0A59", "u0A16_0A3C",
+  "u0A5A", "u0A17_0A3C",
+  "u0A5B", "u0A1C_0A3C",
+  "u0A5E", "u0A2B_0A3C",
+  "u0B48", "u0B47_0B56",
+  "u0B4B", "u0B47_0B3E",
+  "u0B4C", "u0B47_0B57",
+  "u0B5C", "u0B21_0B3C",
+  "u0B5D", "u0B22_0B3C",
+  "u0B94", "u0B92_0BD7",
+  "u0BCA", "u0BC6_0BBE",
+  "u0BCB", "u0BC7_0BBE",
+  "u0BCC", "u0BC6_0BD7",
+  "u0C48", "u0C46_0C56",
+  "u0CC0", "u0CBF_0CD5",
+  "u0CC7", "u0CC6_0CD5",
+  "u0CC8", "u0CC6_0CD6",
+  "u0CCA", "u0CC6_0CC2",
+  "u0CCB", "u0CC6_0CC2_0CD5",
+  "u0D4A", "u0D46_0D3E",
+  "u0D4B", "u0D47_0D3E",
+  "u0D4C", "u0D46_0D57",
+  "u0DDA", "u0DD9_0DCA",
+  "u0DDC", "u0DD9_0DCF",
+  "u0DDD", "u0DD9_0DCF_0DCA",
+  "u0DDE", "u0DD9_0DDF",
+  "u0F43", "u0F42_0FB7",
+  "u0F4D", "u0F4C_0FB7",
+  "u0F52", "u0F51_0FB7",
+  "u0F57", "u0F56_0FB7",
+  "u0F5C", "u0F5B_0FB7",
+  "u0F69", "u0F40_0FB5",
+  "u0F73", "u0F71_0F72",
+  "u0F75", "u0F71_0F74",
+  "u0F76", "u0FB2_0F80",
+  "u0F78", "u0FB3_0F80",
+  "u0F81", "u0F71_0F80",
+  "u0F93", "u0F92_0FB7",
+  "u0F9D", "u0F9C_0FB7",
+  "u0FA2", "u0FA1_0FB7",
+  "u0FA7", "u0FA6_0FB7",
+  "u0FAC", "u0FAB_0FB7",
+  "u0FB9", "u0F90_0FB5",
+  "u1026", "u1025_102E",
+  "u1E00", "u0041_0325",
+  "u1E01", "u0061_0325",
+  "u1E02", "u0042_0307",
+  "u1E03", "u0062_0307",
+  "u1E04", "u0042_0323",
+  "u1E05", "u0062_0323",
+  "u1E06", "u0042_0331",
+  "u1E07", "u0062_0331",
+  "u1E08", "u0043_0327_0301",
+  "u1E09", "u0063_0327_0301",
+  "u1E0A", "u0044_0307",
+  "u1E0B", "u0064_0307",
+  "u1E0C", "u0044_0323",
+  "u1E0D", "u0064_0323",
+  "u1E0E", "u0044_0331",
+  "u1E0F", "u0064_0331",
+  "u1E10", "u0044_0327",
+  "u1E11", "u0064_0327",
+  "u1E12", "u0044_032D",
+  "u1E13", "u0064_032D",
+  "u1E14", "u0045_0304_0300",
+  "u1E15", "u0065_0304_0300",
+  "u1E16", "u0045_0304_0301",
+  "u1E17", "u0065_0304_0301",
+  "u1E18", "u0045_032D",
+  "u1E19", "u0065_032D",
+  "u1E1A", "u0045_0330",
+  "u1E1B", "u0065_0330",
+  "u1E1C", "u0045_0327_0306",
+  "u1E1D", "u0065_0327_0306",
+  "u1E1E", "u0046_0307",
+  "u1E1F", "u0066_0307",
+  "u1E20", "u0047_0304",
+  "u1E21", "u0067_0304",
+  "u1E22", "u0048_0307",
+  "u1E23", "u0068_0307",
+  "u1E24", "u0048_0323",
+  "u1E25", "u0068_0323",
+  "u1E26", "u0048_0308",
+  "u1E27", "u0068_0308",
+  "u1E28", "u0048_0327",
+  "u1E29", "u0068_0327",
+  "u1E2A", "u0048_032E",
+  "u1E2B", "u0068_032E",
+  "u1E2C", "u0049_0330",
+  "u1E2D", "u0069_0330",
+  "u1E2E", "u0049_0308_0301",
+  "u1E2F", "u0069_0308_0301",
+  "u1E30", "u004B_0301",
+  "u1E31", "u006B_0301",
+  "u1E32", "u004B_0323",
+  "u1E33", "u006B_0323",
+  "u1E34", "u004B_0331",
+  "u1E35", "u006B_0331",
+  "u1E36", "u004C_0323",
+  "u1E37", "u006C_0323",
+  "u1E38", "u004C_0323_0304",
+  "u1E39", "u006C_0323_0304",
+  "u1E3A", "u004C_0331",
+  "u1E3B", "u006C_0331",
+  "u1E3C", "u004C_032D",
+  "u1E3D", "u006C_032D",
+  "u1E3E", "u004D_0301",
+  "u1E3F", "u006D_0301",
+  "u1E40", "u004D_0307",
+  "u1E41", "u006D_0307",
+  "u1E42", "u004D_0323",
+  "u1E43", "u006D_0323",
+  "u1E44", "u004E_0307",
+  "u1E45", "u006E_0307",
+  "u1E46", "u004E_0323",
+  "u1E47", "u006E_0323",
+  "u1E48", "u004E_0331",
+  "u1E49", "u006E_0331",
+  "u1E4A", "u004E_032D",
+  "u1E4B", "u006E_032D",
+  "u1E4C", "u004F_0303_0301",
+  "u1E4D", "u006F_0303_0301",
+  "u1E4E", "u004F_0303_0308",
+  "u1E4F", "u006F_0303_0308",
+  "u1E50", "u004F_0304_0300",
+  "u1E51", "u006F_0304_0300",
+  "u1E52", "u004F_0304_0301",
+  "u1E53", "u006F_0304_0301",
+  "u1E54", "u0050_0301",
+  "u1E55", "u0070_0301",
+  "u1E56", "u0050_0307",
+  "u1E57", "u0070_0307",
+  "u1E58", "u0052_0307",
+  "u1E59", "u0072_0307",
+  "u1E5A", "u0052_0323",
+  "u1E5B", "u0072_0323",
+  "u1E5C", "u0052_0323_0304",
+  "u1E5D", "u0072_0323_0304",
+  "u1E5E", "u0052_0331",
+  "u1E5F", "u0072_0331",
+  "u1E60", "u0053_0307",
+  "u1E61", "u0073_0307",
+  "u1E62", "u0053_0323",
+  "u1E63", "u0073_0323",
+  "u1E64", "u0053_0301_0307",
+  "u1E65", "u0073_0301_0307",
+  "u1E66", "u0053_030C_0307",
+  "u1E67", "u0073_030C_0307",
+  "u1E68", "u0053_0323_0307",
+  "u1E69", "u0073_0323_0307",
+  "u1E6A", "u0054_0307",
+  "u1E6B", "u0074_0307",
+  "u1E6C", "u0054_0323",
+  "u1E6D", "u0074_0323",
+  "u1E6E", "u0054_0331",
+  "u1E6F", "u0074_0331",
+  "u1E70", "u0054_032D",
+  "u1E71", "u0074_032D",
+  "u1E72", "u0055_0324",
+  "u1E73", "u0075_0324",
+  "u1E74", "u0055_0330",
+  "u1E75", "u0075_0330",
+  "u1E76", "u0055_032D",
+  "u1E77", "u0075_032D",
+  "u1E78", "u0055_0303_0301",
+  "u1E79", "u0075_0303_0301",
+  "u1E7A", "u0055_0304_0308",
+  "u1E7B", "u0075_0304_0308",
+  "u1E7C", "u0056_0303",
+  "u1E7D", "u0076_0303",
+  "u1E7E", "u0056_0323",
+  "u1E7F", "u0076_0323",
+  "u1E80", "u0057_0300",
+  "u1E81", "u0077_0300",
+  "u1E82", "u0057_0301",
+  "u1E83", "u0077_0301",
+  "u1E84", "u0057_0308",
+  "u1E85", "u0077_0308",
+  "u1E86", "u0057_0307",
+  "u1E87", "u0077_0307",
+  "u1E88", "u0057_0323",
+  "u1E89", "u0077_0323",
+  "u1E8A", "u0058_0307",
+  "u1E8B", "u0078_0307",
+  "u1E8C", "u0058_0308",
+  "u1E8D", "u0078_0308",
+  "u1E8E", "u0059_0307",
+  "u1E8F", "u0079_0307",
+  "u1E90", "u005A_0302",
+  "u1E91", "u007A_0302",
+  "u1E92", "u005A_0323",
+  "u1E93", "u007A_0323",
+  "u1E94", "u005A_0331",
+  "u1E95", "u007A_0331",
+  "u1E96", "u0068_0331",
+  "u1E97", "u0074_0308",
+  "u1E98", "u0077_030A",
+  "u1E99", "u0079_030A",
+  "u1E9B", "u017F_0307",
+  "u1EA0", "u0041_0323",
+  "u1EA1", "u0061_0323",
+  "u1EA2", "u0041_0309",
+  "u1EA3", "u0061_0309",
+  "u1EA4", "u0041_0302_0301",
+  "u1EA5", "u0061_0302_0301",
+  "u1EA6", "u0041_0302_0300",
+  "u1EA7", "u0061_0302_0300",
+  "u1EA8", "u0041_0302_0309",
+  "u1EA9", "u0061_0302_0309",
+  "u1EAA", "u0041_0302_0303",
+  "u1EAB", "u0061_0302_0303",
+  "u1EAC", "u0041_0323_0302",
+  "u1EAD", "u0061_0323_0302",
+  "u1EAE", "u0041_0306_0301",
+  "u1EAF", "u0061_0306_0301",
+  "u1EB0", "u0041_0306_0300",
+  "u1EB1", "u0061_0306_0300",
+  "u1EB2", "u0041_0306_0309",
+  "u1EB3", "u0061_0306_0309",
+  "u1EB4", "u0041_0306_0303",
+  "u1EB5", "u0061_0306_0303",
+  "u1EB6", "u0041_0323_0306",
+  "u1EB7", "u0061_0323_0306",
+  "u1EB8", "u0045_0323",
+  "u1EB9", "u0065_0323",
+  "u1EBA", "u0045_0309",
+  "u1EBB", "u0065_0309",
+  "u1EBC", "u0045_0303",
+  "u1EBD", "u0065_0303",
+  "u1EBE", "u0045_0302_0301",
+  "u1EBF", "u0065_0302_0301",
+  "u1EC0", "u0045_0302_0300",
+  "u1EC1", "u0065_0302_0300",
+  "u1EC2", "u0045_0302_0309",
+  "u1EC3", "u0065_0302_0309",
+  "u1EC4", "u0045_0302_0303",
+  "u1EC5", "u0065_0302_0303",
+  "u1EC6", "u0045_0323_0302",
+  "u1EC7", "u0065_0323_0302",
+  "u1EC8", "u0049_0309",
+  "u1EC9", "u0069_0309",
+  "u1ECA", "u0049_0323",
+  "u1ECB", "u0069_0323",
+  "u1ECC", "u004F_0323",
+  "u1ECD", "u006F_0323",
+  "u1ECE", "u004F_0309",
+  "u1ECF", "u006F_0309",
+  "u1ED0", "u004F_0302_0301",
+  "u1ED1", "u006F_0302_0301",
+  "u1ED2", "u004F_0302_0300",
+  "u1ED3", "u006F_0302_0300",
+  "u1ED4", "u004F_0302_0309",
+  "u1ED5", "u006F_0302_0309",
+  "u1ED6", "u004F_0302_0303",
+  "u1ED7", "u006F_0302_0303",
+  "u1ED8", "u004F_0323_0302",
+  "u1ED9", "u006F_0323_0302",
+  "u1EDA", "u004F_031B_0301",
+  "u1EDB", "u006F_031B_0301",
+  "u1EDC", "u004F_031B_0300",
+  "u1EDD", "u006F_031B_0300",
+  "u1EDE", "u004F_031B_0309",
+  "u1EDF", "u006F_031B_0309",
+  "u1EE0", "u004F_031B_0303",
+  "u1EE1", "u006F_031B_0303",
+  "u1EE2", "u004F_031B_0323",
+  "u1EE3", "u006F_031B_0323",
+  "u1EE4", "u0055_0323",
+  "u1EE5", "u0075_0323",
+  "u1EE6", "u0055_0309",
+  "u1EE7", "u0075_0309",
+  "u1EE8", "u0055_031B_0301",
+  "u1EE9", "u0075_031B_0301",
+  "u1EEA", "u0055_031B_0300",
+  "u1EEB", "u0075_031B_0300",
+  "u1EEC", "u0055_031B_0309",
+  "u1EED", "u0075_031B_0309",
+  "u1EEE", "u0055_031B_0303",
+  "u1EEF", "u0075_031B_0303",
+  "u1EF0", "u0055_031B_0323",
+  "u1EF1", "u0075_031B_0323",
+  "u1EF2", "u0059_0300",
+  "u1EF3", "u0079_0300",
+  "u1EF4", "u0059_0323",
+  "u1EF5", "u0079_0323",
+  "u1EF6", "u0059_0309",
+  "u1EF7", "u0079_0309",
+  "u1EF8", "u0059_0303",
+  "u1EF9", "u0079_0303",
+  "u1F00", "u03B1_0313",
+  "u1F01", "u03B1_0314",
+  "u1F02", "u03B1_0313_0300",
+  "u1F03", "u03B1_0314_0300",
+  "u1F04", "u03B1_0313_0301",
+  "u1F05", "u03B1_0314_0301",
+  "u1F06", "u03B1_0313_0342",
+  "u1F07", "u03B1_0314_0342",
+  "u1F08", "u0391_0313",
+  "u1F09", "u0391_0314",
+  "u1F0A", "u0391_0313_0300",
+  "u1F0B", "u0391_0314_0300",
+  "u1F0C", "u0391_0313_0301",
+  "u1F0D", "u0391_0314_0301",
+  "u1F0E", "u0391_0313_0342",
+  "u1F0F", "u0391_0314_0342",
+  "u1F10", "u03B5_0313",
+  "u1F11", "u03B5_0314",
+  "u1F12", "u03B5_0313_0300",
+  "u1F13", "u03B5_0314_0300",
+  "u1F14", "u03B5_0313_0301",
+  "u1F15", "u03B5_0314_0301",
+  "u1F18", "u0395_0313",
+  "u1F19", "u0395_0314",
+  "u1F1A", "u0395_0313_0300",
+  "u1F1B", "u0395_0314_0300",
+  "u1F1C", "u0395_0313_0301",
+  "u1F1D", "u0395_0314_0301",
+  "u1F20", "u03B7_0313",
+  "u1F21", "u03B7_0314",
+  "u1F22", "u03B7_0313_0300",
+  "u1F23", "u03B7_0314_0300",
+  "u1F24", "u03B7_0313_0301",
+  "u1F25", "u03B7_0314_0301",
+  "u1F26", "u03B7_0313_0342",
+  "u1F27", "u03B7_0314_0342",
+  "u1F28", "u0397_0313",
+  "u1F29", "u0397_0314",
+  "u1F2A", "u0397_0313_0300",
+  "u1F2B", "u0397_0314_0300",
+  "u1F2C", "u0397_0313_0301",
+  "u1F2D", "u0397_0314_0301",
+  "u1F2E", "u0397_0313_0342",
+  "u1F2F", "u0397_0314_0342",
+  "u1F30", "u03B9_0313",
+  "u1F31", "u03B9_0314",
+  "u1F32", "u03B9_0313_0300",
+  "u1F33", "u03B9_0314_0300",
+  "u1F34", "u03B9_0313_0301",
+  "u1F35", "u03B9_0314_0301",
+  "u1F36", "u03B9_0313_0342",
+  "u1F37", "u03B9_0314_0342",
+  "u1F38", "u0399_0313",
+  "u1F39", "u0399_0314",
+  "u1F3A", "u0399_0313_0300",
+  "u1F3B", "u0399_0314_0300",
+  "u1F3C", "u0399_0313_0301",
+  "u1F3D", "u0399_0314_0301",
+  "u1F3E", "u0399_0313_0342",
+  "u1F3F", "u0399_0314_0342",
+  "u1F40", "u03BF_0313",
+  "u1F41", "u03BF_0314",
+  "u1F42", "u03BF_0313_0300",
+  "u1F43", "u03BF_0314_0300",
+  "u1F44", "u03BF_0313_0301",
+  "u1F45", "u03BF_0314_0301",
+  "u1F48", "u039F_0313",
+  "u1F49", "u039F_0314",
+  "u1F4A", "u039F_0313_0300",
+  "u1F4B", "u039F_0314_0300",
+  "u1F4C", "u039F_0313_0301",
+  "u1F4D", "u039F_0314_0301",
+  "u1F50", "u03C5_0313",
+  "u1F51", "u03C5_0314",
+  "u1F52", "u03C5_0313_0300",
+  "u1F53", "u03C5_0314_0300",
+  "u1F54", "u03C5_0313_0301",
+  "u1F55", "u03C5_0314_0301",
+  "u1F56", "u03C5_0313_0342",
+  "u1F57", "u03C5_0314_0342",
+  "u1F59", "u03A5_0314",
+  "u1F5B", "u03A5_0314_0300",
+  "u1F5D", "u03A5_0314_0301",
+  "u1F5F", "u03A5_0314_0342",
+  "u1F60", "u03C9_0313",
+  "u1F61", "u03C9_0314",
+  "u1F62", "u03C9_0313_0300",
+  "u1F63", "u03C9_0314_0300",
+  "u1F64", "u03C9_0313_0301",
+  "u1F65", "u03C9_0314_0301",
+  "u1F66", "u03C9_0313_0342",
+  "u1F67", "u03C9_0314_0342",
+  "u1F68", "u03A9_0313",
+  "u1F69", "u03A9_0314",
+  "u1F6A", "u03A9_0313_0300",
+  "u1F6B", "u03A9_0314_0300",
+  "u1F6C", "u03A9_0313_0301",
+  "u1F6D", "u03A9_0314_0301",
+  "u1F6E", "u03A9_0313_0342",
+  "u1F6F", "u03A9_0314_0342",
+  "u1F70", "u03B1_0300",
+  "u1F71", "u03B1_0301",
+  "u1F72", "u03B5_0300",
+  "u1F73", "u03B5_0301",
+  "u1F74", "u03B7_0300",
+  "u1F75", "u03B7_0301",
+  "u1F76", "u03B9_0300",
+  "u1F77", "u03B9_0301",
+  "u1F78", "u03BF_0300",
+  "u1F79", "u03BF_0301",
+  "u1F7A", "u03C5_0300",
+  "u1F7B", "u03C5_0301",
+  "u1F7C", "u03C9_0300",
+  "u1F7D", "u03C9_0301",
+  "u1F80", "u03B1_0313_0345",
+  "u1F81", "u03B1_0314_0345",
+  "u1F82", "u03B1_0313_0300_0345",
+  "u1F83", "u03B1_0314_0300_0345",
+  "u1F84", "u03B1_0313_0301_0345",
+  "u1F85", "u03B1_0314_0301_0345",
+  "u1F86", "u03B1_0313_0342_0345",
+  "u1F87", "u03B1_0314_0342_0345",
+  "u1F88", "u0391_0313_0345",
+  "u1F89", "u0391_0314_0345",
+  "u1F8A", "u0391_0313_0300_0345",
+  "u1F8B", "u0391_0314_0300_0345",
+  "u1F8C", "u0391_0313_0301_0345",
+  "u1F8D", "u0391_0314_0301_0345",
+  "u1F8E", "u0391_0313_0342_0345",
+  "u1F8F", "u0391_0314_0342_0345",
+  "u1F90", "u03B7_0313_0345",
+  "u1F91", "u03B7_0314_0345",
+  "u1F92", "u03B7_0313_0300_0345",
+  "u1F93", "u03B7_0314_0300_0345",
+  "u1F94", "u03B7_0313_0301_0345",
+  "u1F95", "u03B7_0314_0301_0345",
+  "u1F96", "u03B7_0313_0342_0345",
+  "u1F97", "u03B7_0314_0342_0345",
+  "u1F98", "u0397_0313_0345",
+  "u1F99", "u0397_0314_0345",
+  "u1F9A", "u0397_0313_0300_0345",
+  "u1F9B", "u0397_0314_0300_0345",
+  "u1F9C", "u0397_0313_0301_0345",
+  "u1F9D", "u0397_0314_0301_0345",
+  "u1F9E", "u0397_0313_0342_0345",
+  "u1F9F", "u0397_0314_0342_0345",
+  "u1FA0", "u03C9_0313_0345",
+  "u1FA1", "u03C9_0314_0345",
+  "u1FA2", "u03C9_0313_0300_0345",
+  "u1FA3", "u03C9_0314_0300_0345",
+  "u1FA4", "u03C9_0313_0301_0345",
+  "u1FA5", "u03C9_0314_0301_0345",
+  "u1FA6", "u03C9_0313_0342_0345",
+  "u1FA7", "u03C9_0314_0342_0345",
+  "u1FA8", "u03A9_0313_0345",
+  "u1FA9", "u03A9_0314_0345",
+  "u1FAA", "u03A9_0313_0300_0345",
+  "u1FAB", "u03A9_0314_0300_0345",
+  "u1FAC", "u03A9_0313_0301_0345",
+  "u1FAD", "u03A9_0314_0301_0345",
+  "u1FAE", "u03A9_0313_0342_0345",
+  "u1FAF", "u03A9_0314_0342_0345",
+  "u1FB0", "u03B1_0306",
+  "u1FB1", "u03B1_0304",
+  "u1FB2", "u03B1_0300_0345",
+  "u1FB3", "u03B1_0345",
+  "u1FB4", "u03B1_0301_0345",
+  "u1FB6", "u03B1_0342",
+  "u1FB7", "u03B1_0342_0345",
+  "u1FB8", "u0391_0306",
+  "u1FB9", "u0391_0304",
+  "u1FBA", "u0391_0300",
+  "u1FBB", "u0391_0301",
+  "u1FBC", "u0391_0345",
+  "u1FBE", "u03B9",
+  "u1FC1", "u00A8_0342",
+  "u1FC2", "u03B7_0300_0345",
+  "u1FC3", "u03B7_0345",
+  "u1FC4", "u03B7_0301_0345",
+  "u1FC6", "u03B7_0342",
+  "u1FC7", "u03B7_0342_0345",
+  "u1FC8", "u0395_0300",
+  "u1FC9", "u0395_0301",
+  "u1FCA", "u0397_0300",
+  "u1FCB", "u0397_0301",
+  "u1FCC", "u0397_0345",
+  "u1FCD", "u1FBF_0300",
+  "u1FCE", "u1FBF_0301",
+  "u1FCF", "u1FBF_0342",
+  "u1FD0", "u03B9_0306",
+  "u1FD1", "u03B9_0304",
+  "u1FD2", "u03B9_0308_0300",
+  "u1FD3", "u03B9_0308_0301",
+  "u1FD6", "u03B9_0342",
+  "u1FD7", "u03B9_0308_0342",
+  "u1FD8", "u0399_0306",
+  "u1FD9", "u0399_0304",
+  "u1FDA", "u0399_0300",
+  "u1FDB", "u0399_0301",
+  "u1FDD", "u1FFE_0300",
+  "u1FDE", "u1FFE_0301",
+  "u1FDF", "u1FFE_0342",
+  "u1FE0", "u03C5_0306",
+  "u1FE1", "u03C5_0304",
+  "u1FE2", "u03C5_0308_0300",
+  "u1FE3", "u03C5_0308_0301",
+  "u1FE4", "u03C1_0313",
+  "u1FE5", "u03C1_0314",
+  "u1FE6", "u03C5_0342",
+  "u1FE7", "u03C5_0308_0342",
+  "u1FE8", "u03A5_0306",
+  "u1FE9", "u03A5_0304",
+  "u1FEA", "u03A5_0300",
+  "u1FEB", "u03A5_0301",
+  "u1FEC", "u03A1_0314",
+  "u1FED", "u00A8_0300",
+  "u1FEE", "u00A8_0301",
+  "u1FEF", "u0060",
+  "u1FF2", "u03C9_0300_0345",
+  "u1FF3", "u03C9_0345",
+  "u1FF4", "u03C9_0301_0345",
+  "u1FF6", "u03C9_0342",
+  "u1FF7", "u03C9_0342_0345",
+  "u1FF8", "u039F_0300",
+  "u1FF9", "u039F_0301",
+  "u1FFA", "u03A9_0300",
+  "u1FFB", "u03A9_0301",
+  "u1FFC", "u03A9_0345",
+  "u1FFD", "u00B4",
+  "u2000", "u2002",
+  "u2001", "u2003",
+  "u2126", "u03A9",
+  "u212A", "u004B",
+  "u212B", "u0041_030A",
+  "u219A", "u2190_0338",
+  "u219B", "u2192_0338",
+  "u21AE", "u2194_0338",
+  "u21CD", "u21D0_0338",
+  "u21CE", "u21D4_0338",
+  "u21CF", "u21D2_0338",
+  "u2204", "u2203_0338",
+  "u2209", "u2208_0338",
+  "u220C", "u220B_0338",
+  "u2224", "u2223_0338",
+  "u2226", "u2225_0338",
+  "u2241", "u223C_0338",
+  "u2244", "u2243_0338",
+  "u2247", "u2245_0338",
+  "u2249", "u2248_0338",
+  "u2260", "u003D_0338",
+  "u2262", "u2261_0338",
+  "u226D", "u224D_0338",
+  "u226E", "u003C_0338",
+  "u226F", "u003E_0338",
+  "u2270", "u2264_0338",
+  "u2271", "u2265_0338",
+  "u2274", "u2272_0338",
+  "u2275", "u2273_0338",
+  "u2278", "u2276_0338",
+  "u2279", "u2277_0338",
+  "u2280", "u227A_0338",
+  "u2281", "u227B_0338",
+  "u2284", "u2282_0338",
+  "u2285", "u2283_0338",
+  "u2288", "u2286_0338",
+  "u2289", "u2287_0338",
+  "u22AC", "u22A2_0338",
+  "u22AD", "u22A8_0338",
+  "u22AE", "u22A9_0338",
+  "u22AF", "u22AB_0338",
+  "u22E0", "u227C_0338",
+  "u22E1", "u227D_0338",
+  "u22E2", "u2291_0338",
+  "u22E3", "u2292_0338",
+  "u22EA", "u22B2_0338",
+  "u22EB", "u22B3_0338",
+  "u22EC", "u22B4_0338",
+  "u22ED", "u22B5_0338",
+  "u2329", "u3008",
+  "u232A", "u3009",
+  "u2ADC", "u2ADD_0338",
+  "u304C", "u304B_3099",
+  "u304E", "u304D_3099",
+  "u3050", "u304F_3099",
+  "u3052", "u3051_3099",
+  "u3054", "u3053_3099",
+  "u3056", "u3055_3099",
+  "u3058", "u3057_3099",
+  "u305A", "u3059_3099",
+  "u305C", "u305B_3099",
+  "u305E", "u305D_3099",
+  "u3060", "u305F_3099",
+  "u3062", "u3061_3099",
+  "u3065", "u3064_3099",
+  "u3067", "u3066_3099",
+  "u3069", "u3068_3099",
+  "u3070", "u306F_3099",
+  "u3071", "u306F_309A",
+  "u3073", "u3072_3099",
+  "u3074", "u3072_309A",
+  "u3076", "u3075_3099",
+  "u3077", "u3075_309A",
+  "u3079", "u3078_3099",
+  "u307A", "u3078_309A",
+  "u307C", "u307B_3099",
+  "u307D", "u307B_309A",
+  "u3094", "u3046_3099",
+  "u309E", "u309D_3099",
+  "u30AC", "u30AB_3099",
+  "u30AE", "u30AD_3099",
+  "u30B0", "u30AF_3099",
+  "u30B2", "u30B1_3099",
+  "u30B4", "u30B3_3099",
+  "u30B6", "u30B5_3099",
+  "u30B8", "u30B7_3099",
+  "u30BA", "u30B9_3099",
+  "u30BC", "u30BB_3099",
+  "u30BE", "u30BD_3099",
+  "u30C0", "u30BF_3099",
+  "u30C2", "u30C1_3099",
+  "u30C5", "u30C4_3099",
+  "u30C7", "u30C6_3099",
+  "u30C9", "u30C8_3099",
+  "u30D0", "u30CF_3099",
+  "u30D1", "u30CF_309A",
+  "u30D3", "u30D2_3099",
+  "u30D4", "u30D2_309A",
+  "u30D6", "u30D5_3099",
+  "u30D7", "u30D5_309A",
+  "u30D9", "u30D8_3099",
+  "u30DA", "u30D8_309A",
+  "u30DC", "u30DB_3099",
+  "u30DD", "u30DB_309A",
+  "u30F4", "u30A6_3099",
+  "u30F7", "u30EF_3099",
+  "u30F8", "u30F0_3099",
+  "u30F9", "u30F1_3099",
+  "u30FA", "u30F2_3099",
+  "u30FE", "u30FD_3099",
+  "uF900", "u8C48",
+  "uF901", "u66F4",
+  "uF902", "u8ECA",
+  "uF903", "u8CC8",
+  "uF904", "u6ED1",
+  "uF905", "u4E32",
+  "uF906", "u53E5",
+  "uF907", "u9F9C",
+  "uF908", "u9F9C",
+  "uF909", "u5951",
+  "uF90A", "u91D1",
+  "uF90B", "u5587",
+  "uF90C", "u5948",
+  "uF90D", "u61F6",
+  "uF90E", "u7669",
+  "uF90F", "u7F85",
+  "uF910", "u863F",
+  "uF911", "u87BA",
+  "uF912", "u88F8",
+  "uF913", "u908F",
+  "uF914", "u6A02",
+  "uF915", "u6D1B",
+  "uF916", "u70D9",
+  "uF917", "u73DE",
+  "uF918", "u843D",
+  "uF919", "u916A",
+  "uF91A", "u99F1",
+  "uF91B", "u4E82",
+  "uF91C", "u5375",
+  "uF91D", "u6B04",
+  "uF91E", "u721B",
+  "uF91F", "u862D",
+  "uF920", "u9E1E",
+  "uF921", "u5D50",
+  "uF922", "u6FEB",
+  "uF923", "u85CD",
+  "uF924", "u8964",
+  "uF925", "u62C9",
+  "uF926", "u81D8",
+  "uF927", "u881F",
+  "uF928", "u5ECA",
+  "uF929", "u6717",
+  "uF92A", "u6D6A",
+  "uF92B", "u72FC",
+  "uF92C", "u90CE",
+  "uF92D", "u4F86",
+  "uF92E", "u51B7",
+  "uF92F", "u52DE",
+  "uF930", "u64C4",
+  "uF931", "u6AD3",
+  "uF932", "u7210",
+  "uF933", "u76E7",
+  "uF934", "u8001",
+  "uF935", "u8606",
+  "uF936", "u865C",
+  "uF937", "u8DEF",
+  "uF938", "u9732",
+  "uF939", "u9B6F",
+  "uF93A", "u9DFA",
+  "uF93B", "u788C",
+  "uF93C", "u797F",
+  "uF93D", "u7DA0",
+  "uF93E", "u83C9",
+  "uF93F", "u9304",
+  "uF940", "u9E7F",
+  "uF941", "u8AD6",
+  "uF942", "u58DF",
+  "uF943", "u5F04",
+  "uF944", "u7C60",
+  "uF945", "u807E",
+  "uF946", "u7262",
+  "uF947", "u78CA",
+  "uF948", "u8CC2",
+  "uF949", "u96F7",
+  "uF94A", "u58D8",
+  "uF94B", "u5C62",
+  "uF94C", "u6A13",
+  "uF94D", "u6DDA",
+  "uF94E", "u6F0F",
+  "uF94F", "u7D2F",
+  "uF950", "u7E37",
+  "uF951", "u964B",
+  "uF952", "u52D2",
+  "uF953", "u808B",
+  "uF954", "u51DC",
+  "uF955", "u51CC",
+  "uF956", "u7A1C",
+  "uF957", "u7DBE",
+  "uF958", "u83F1",
+  "uF959", "u9675",
+  "uF95A", "u8B80",
+  "uF95B", "u62CF",
+  "uF95C", "u6A02",
+  "uF95D", "u8AFE",
+  "uF95E", "u4E39",
+  "uF95F", "u5BE7",
+  "uF960", "u6012",
+  "uF961", "u7387",
+  "uF962", "u7570",
+  "uF963", "u5317",
+  "uF964", "u78FB",
+  "uF965", "u4FBF",
+  "uF966", "u5FA9",
+  "uF967", "u4E0D",
+  "uF968", "u6CCC",
+  "uF969", "u6578",
+  "uF96A", "u7D22",
+  "uF96B", "u53C3",
+  "uF96C", "u585E",
+  "uF96D", "u7701",
+  "uF96E", "u8449",
+  "uF96F", "u8AAA",
+  "uF970", "u6BBA",
+  "uF971", "u8FB0",
+  "uF972", "u6C88",
+  "uF973", "u62FE",
+  "uF974", "u82E5",
+  "uF975", "u63A0",
+  "uF976", "u7565",
+  "uF977", "u4EAE",
+  "uF978", "u5169",
+  "uF979", "u51C9",
+  "uF97A", "u6881",
+  "uF97B", "u7CE7",
+  "uF97C", "u826F",
+  "uF97D", "u8AD2",
+  "uF97E", "u91CF",
+  "uF97F", "u52F5",
+  "uF980", "u5442",
+  "uF981", "u5973",
+  "uF982", "u5EEC",
+  "uF983", "u65C5",
+  "uF984", "u6FFE",
+  "uF985", "u792A",
+  "uF986", "u95AD",
+  "uF987", "u9A6A",
+  "uF988", "u9E97",
+  "uF989", "u9ECE",
+  "uF98A", "u529B",
+  "uF98B", "u66C6",
+  "uF98C", "u6B77",
+  "uF98D", "u8F62",
+  "uF98E", "u5E74",
+  "uF98F", "u6190",
+  "uF990", "u6200",
+  "uF991", "u649A",
+  "uF992", "u6F23",
+  "uF993", "u7149",
+  "uF994", "u7489",
+  "uF995", "u79CA",
+  "uF996", "u7DF4",
+  "uF997", "u806F",
+  "uF998", "u8F26",
+  "uF999", "u84EE",
+  "uF99A", "u9023",
+  "uF99B", "u934A",
+  "uF99C", "u5217",
+  "uF99D", "u52A3",
+  "uF99E", "u54BD",
+  "uF99F", "u70C8",
+  "uF9A0", "u88C2",
+  "uF9A1", "u8AAA",
+  "uF9A2", "u5EC9",
+  "uF9A3", "u5FF5",
+  "uF9A4", "u637B",
+  "uF9A5", "u6BAE",
+  "uF9A6", "u7C3E",
+  "uF9A7", "u7375",
+  "uF9A8", "u4EE4",
+  "uF9A9", "u56F9",
+  "uF9AA", "u5BE7",
+  "uF9AB", "u5DBA",
+  "uF9AC", "u601C",
+  "uF9AD", "u73B2",
+  "uF9AE", "u7469",
+  "uF9AF", "u7F9A",
+  "uF9B0", "u8046",
+  "uF9B1", "u9234",
+  "uF9B2", "u96F6",
+  "uF9B3", "u9748",
+  "uF9B4", "u9818",
+  "uF9B5", "u4F8B",
+  "uF9B6", "u79AE",
+  "uF9B7", "u91B4",
+  "uF9B8", "u96B8",
+  "uF9B9", "u60E1",
+  "uF9BA", "u4E86",
+  "uF9BB", "u50DA",
+  "uF9BC", "u5BEE",
+  "uF9BD", "u5C3F",
+  "uF9BE", "u6599",
+  "uF9BF", "u6A02",
+  "uF9C0", "u71CE",
+  "uF9C1", "u7642",
+  "uF9C2", "u84FC",
+  "uF9C3", "u907C",
+  "uF9C4", "u9F8D",
+  "uF9C5", "u6688",
+  "uF9C6", "u962E",
+  "uF9C7", "u5289",
+  "uF9C8", "u677B",
+  "uF9C9", "u67F3",
+  "uF9CA", "u6D41",
+  "uF9CB", "u6E9C",
+  "uF9CC", "u7409",
+  "uF9CD", "u7559",
+  "uF9CE", "u786B",
+  "uF9CF", "u7D10",
+  "uF9D0", "u985E",
+  "uF9D1", "u516D",
+  "uF9D2", "u622E",
+  "uF9D3", "u9678",
+  "uF9D4", "u502B",
+  "uF9D5", "u5D19",
+  "uF9D6", "u6DEA",
+  "uF9D7", "u8F2A",
+  "uF9D8", "u5F8B",
+  "uF9D9", "u6144",
+  "uF9DA", "u6817",
+  "uF9DB", "u7387",
+  "uF9DC", "u9686",
+  "uF9DD", "u5229",
+  "uF9DE", "u540F",
+  "uF9DF", "u5C65",
+  "uF9E0", "u6613",
+  "uF9E1", "u674E",
+  "uF9E2", "u68A8",
+  "uF9E3", "u6CE5",
+  "uF9E4", "u7406",
+  "uF9E5", "u75E2",
+  "uF9E6", "u7F79",
+  "uF9E7", "u88CF",
+  "uF9E8", "u88E1",
+  "uF9E9", "u91CC",
+  "uF9EA", "u96E2",
+  "uF9EB", "u533F",
+  "uF9EC", "u6EBA",
+  "uF9ED", "u541D",
+  "uF9EE", "u71D0",
+  "uF9EF", "u7498",
+  "uF9F0", "u85FA",
+  "uF9F1", "u96A3",
+  "uF9F2", "u9C57",
+  "uF9F3", "u9E9F",
+  "uF9F4", "u6797",
+  "uF9F5", "u6DCB",
+  "uF9F6", "u81E8",
+  "uF9F7", "u7ACB",
+  "uF9F8", "u7B20",
+  "uF9F9", "u7C92",
+  "uF9FA", "u72C0",
+  "uF9FB", "u7099",
+  "uF9FC", "u8B58",
+  "uF9FD", "u4EC0",
+  "uF9FE", "u8336",
+  "uF9FF", "u523A",
+  "uFA00", "u5207",
+  "uFA01", "u5EA6",
+  "uFA02", "u62D3",
+  "uFA03", "u7CD6",
+  "uFA04", "u5B85",
+  "uFA05", "u6D1E",
+  "uFA06", "u66B4",
+  "uFA07", "u8F3B",
+  "uFA08", "u884C",
+  "uFA09", "u964D",
+  "uFA0A", "u898B",
+  "uFA0B", "u5ED3",
+  "uFA0C", "u5140",
+  "uFA0D", "u55C0",
+  "uFA10", "u585A",
+  "uFA12", "u6674",
+  "uFA15", "u51DE",
+  "uFA16", "u732A",
+  "uFA17", "u76CA",
+  "uFA18", "u793C",
+  "uFA19", "u795E",
+  "uFA1A", "u7965",
+  "uFA1B", "u798F",
+  "uFA1C", "u9756",
+  "uFA1D", "u7CBE",
+  "uFA1E", "u7FBD",
+  "uFA20", "u8612",
+  "uFA22", "u8AF8",
+  "uFA25", "u9038",
+  "uFA26", "u90FD",
+  "uFA2A", "u98EF",
+  "uFA2B", "u98FC",
+  "uFA2C", "u9928",
+  "uFA2D", "u9DB4",
+  "uFA30", "u4FAE",
+  "uFA31", "u50E7",
+  "uFA32", "u514D",
+  "uFA33", "u52C9",
+  "uFA34", "u52E4",
+  "uFA35", "u5351",
+  "uFA36", "u559D",
+  "uFA37", "u5606",
+  "uFA38", "u5668",
+  "uFA39", "u5840",
+  "uFA3A", "u58A8",
+  "uFA3B", "u5C64",
+  "uFA3C", "u5C6E",
+  "uFA3D", "u6094",
+  "uFA3E", "u6168",
+  "uFA3F", "u618E",
+  "uFA40", "u61F2",
+  "uFA41", "u654F",
+  "uFA42", "u65E2",
+  "uFA43", "u6691",
+  "uFA44", "u6885",
+  "uFA45", "u6D77",
+  "uFA46", "u6E1A",
+  "uFA47", "u6F22",
+  "uFA48", "u716E",
+  "uFA49", "u722B",
+  "uFA4A", "u7422",
+  "uFA4B", "u7891",
+  "uFA4C", "u793E",
+  "uFA4D", "u7949",
+  "uFA4E", "u7948",
+  "uFA4F", "u7950",
+  "uFA50", "u7956",
+  "uFA51", "u795D",
+  "uFA52", "u798D",
+  "uFA53", "u798E",
+  "uFA54", "u7A40",
+  "uFA55", "u7A81",
+  "uFA56", "u7BC0",
+  "uFA57", "u7DF4",
+  "uFA58", "u7E09",
+  "uFA59", "u7E41",
+  "uFA5A", "u7F72",
+  "uFA5B", "u8005",
+  "uFA5C", "u81ED",
+  "uFA5D", "u8279",
+  "uFA5E", "u8279",
+  "uFA5F", "u8457",
+  "uFA60", "u8910",
+  "uFA61", "u8996",
+  "uFA62", "u8B01",
+  "uFA63", "u8B39",
+  "uFA64", "u8CD3",
+  "uFA65", "u8D08",
+  "uFA66", "u8FB6",
+  "uFA67", "u9038",
+  "uFA68", "u96E3",
+  "uFA69", "u97FF",
+  "uFA6A", "u983B",
+  "uFB1D", "u05D9_05B4",
+  "uFB1F", "u05F2_05B7",
+  "uFB2A", "u05E9_05C1",
+  "uFB2B", "u05E9_05C2",
+  "uFB2C", "u05E9_05BC_05C1",
+  "uFB2D", "u05E9_05BC_05C2",
+  "uFB2E", "u05D0_05B7",
+  "uFB2F", "u05D0_05B8",
+  "uFB30", "u05D0_05BC",
+  "uFB31", "u05D1_05BC",
+  "uFB32", "u05D2_05BC",
+  "uFB33", "u05D3_05BC",
+  "uFB34", "u05D4_05BC",
+  "uFB35", "u05D5_05BC",
+  "uFB36", "u05D6_05BC",
+  "uFB38", "u05D8_05BC",
+  "uFB39", "u05D9_05BC",
+  "uFB3A", "u05DA_05BC",
+  "uFB3B", "u05DB_05BC",
+  "uFB3C", "u05DC_05BC",
+  "uFB3E", "u05DE_05BC",
+  "uFB40", "u05E0_05BC",
+  "uFB41", "u05E1_05BC",
+  "uFB43", "u05E3_05BC",
+  "uFB44", "u05E4_05BC",
+  "uFB46", "u05E6_05BC",
+  "uFB47", "u05E7_05BC",
+  "uFB48", "u05E8_05BC",
+  "uFB49", "u05E9_05BC",
+  "uFB4A", "u05EA_05BC",
+  "uFB4B", "u05D5_05B9",
+  "uFB4C", "u05D1_05BF",
+  "uFB4D", "u05DB_05BF",
+  "uFB4E", "u05E4_05BF",
+  "u1D15E", "u1D157_1D165",
+  "u1D15F", "u1D158_1D165",
+  "u1D160", "u1D158_1D165_1D16E",
+  "u1D161", "u1D158_1D165_1D16F",
+  "u1D162", "u1D158_1D165_1D170",
+  "u1D163", "u1D158_1D165_1D171",
+  "u1D164", "u1D158_1D165_1D172",
+  "u1D1BB", "u1D1B9_1D165",
+  "u1D1BC", "u1D1BA_1D165",
+  "u1D1BD", "u1D1B9_1D165_1D16E",
+  "u1D1BE", "u1D1BA_1D165_1D16E",
+  "u1D1BF", "u1D1B9_1D165_1D16F",
+  "u1D1C0", "u1D1BA_1D165_1D16F",
+  "u2F800", "u4E3D",
+  "u2F801", "u4E38",
+  "u2F802", "u4E41",
+  "u2F803", "u20122",
+  "u2F804", "u4F60",
+  "u2F805", "u4FAE",
+  "u2F806", "u4FBB",
+  "u2F807", "u5002",
+  "u2F808", "u507A",
+  "u2F809", "u5099",
+  "u2F80A", "u50E7",
+  "u2F80B", "u50CF",
+  "u2F80C", "u349E",
+  "u2F80D", "u2063A",
+  "u2F80E", "u514D",
+  "u2F80F", "u5154",
+  "u2F810", "u5164",
+  "u2F811", "u5177",
+  "u2F812", "u2051C",
+  "u2F813", "u34B9",
+  "u2F814", "u5167",
+  "u2F815", "u518D",
+  "u2F816", "u2054B",
+  "u2F817", "u5197",
+  "u2F818", "u51A4",
+  "u2F819", "u4ECC",
+  "u2F81A", "u51AC",
+  "u2F81B", "u51B5",
+  "u2F81C", "u291DF",
+  "u2F81D", "u51F5",
+  "u2F81E", "u5203",
+  "u2F81F", "u34DF",
+  "u2F820", "u523B",
+  "u2F821", "u5246",
+  "u2F822", "u5272",
+  "u2F823", "u5277",
+  "u2F824", "u3515",
+  "u2F825", "u52C7",
+  "u2F826", "u52C9",
+  "u2F827", "u52E4",
+  "u2F828", "u52FA",
+  "u2F829", "u5305",
+  "u2F82A", "u5306",
+  "u2F82B", "u5317",
+  "u2F82C", "u5349",
+  "u2F82D", "u5351",
+  "u2F82E", "u535A",
+  "u2F82F", "u5373",
+  "u2F830", "u537D",
+  "u2F831", "u537F",
+  "u2F832", "u537F",
+  "u2F833", "u537F",
+  "u2F834", "u20A2C",
+  "u2F835", "u7070",
+  "u2F836", "u53CA",
+  "u2F837", "u53DF",
+  "u2F838", "u20B63",
+  "u2F839", "u53EB",
+  "u2F83A", "u53F1",
+  "u2F83B", "u5406",
+  "u2F83C", "u549E",
+  "u2F83D", "u5438",
+  "u2F83E", "u5448",
+  "u2F83F", "u5468",
+  "u2F840", "u54A2",
+  "u2F841", "u54F6",
+  "u2F842", "u5510",
+  "u2F843", "u5553",
+  "u2F844", "u5563",
+  "u2F845", "u5584",
+  "u2F846", "u5584",
+  "u2F847", "u5599",
+  "u2F848", "u55AB",
+  "u2F849", "u55B3",
+  "u2F84A", "u55C2",
+  "u2F84B", "u5716",
+  "u2F84C", "u5606",
+  "u2F84D", "u5717",
+  "u2F84E", "u5651",
+  "u2F84F", "u5674",
+  "u2F850", "u5207",
+  "u2F851", "u58EE",
+  "u2F852", "u57CE",
+  "u2F853", "u57F4",
+  "u2F854", "u580D",
+  "u2F855", "u578B",
+  "u2F856", "u5832",
+  "u2F857", "u5831",
+  "u2F858", "u58AC",
+  "u2F859", "u214E4",
+  "u2F85A", "u58F2",
+  "u2F85B", "u58F7",
+  "u2F85C", "u5906",
+  "u2F85D", "u591A",
+  "u2F85E", "u5922",
+  "u2F85F", "u5962",
+  "u2F860", "u216A8",
+  "u2F861", "u216EA",
+  "u2F862", "u59EC",
+  "u2F863", "u5A1B",
+  "u2F864", "u5A27",
+  "u2F865", "u59D8",
+  "u2F866", "u5A66",
+  "u2F867", "u36EE",
+  "u2F868", "u2136A",
+  "u2F869", "u5B08",
+  "u2F86A", "u5B3E",
+  "u2F86B", "u5B3E",
+  "u2F86C", "u219C8",
+  "u2F86D", "u5BC3",
+  "u2F86E", "u5BD8",
+  "u2F86F", "u5BE7",
+  "u2F870", "u5BF3",
+  "u2F871", "u21B18",
+  "u2F872", "u5BFF",
+  "u2F873", "u5C06",
+  "u2F874", "u5F33",
+  "u2F875", "u5C22",
+  "u2F876", "u3781",
+  "u2F877", "u5C60",
+  "u2F878", "u5C6E",
+  "u2F879", "u5CC0",
+  "u2F87A", "u5C8D",
+  "u2F87B", "u21DE4",
+  "u2F87C", "u5D43",
+  "u2F87D", "u21DE6",
+  "u2F87E", "u5D6E",
+  "u2F87F", "u5D6B",
+  "u2F880", "u5D7C",
+  "u2F881", "u5DE1",
+  "u2F882", "u5DE2",
+  "u2F883", "u382F",
+  "u2F884", "u5DFD",
+  "u2F885", "u5E28",
+  "u2F886", "u5E3D",
+  "u2F887", "u5E69",
+  "u2F888", "u3862",
+  "u2F889", "u22183",
+  "u2F88A", "u387C",
+  "u2F88B", "u5EB0",
+  "u2F88C", "u5EB3",
+  "u2F88D", "u5EB6",
+  "u2F88E", "u5ECA",
+  "u2F88F", "u2A392",
+  "u2F890", "u5EFE",
+  "u2F891", "u22331",
+  "u2F892", "u22331",
+  "u2F893", "u8201",
+  "u2F894", "u5F22",
+  "u2F895", "u5F22",
+  "u2F896", "u38C7",
+  "u2F897", "u232B8",
+  "u2F898", "u261DA",
+  "u2F899", "u5F62",
+  "u2F89A", "u5F6B",
+  "u2F89B", "u38E3",
+  "u2F89C", "u5F9A",
+  "u2F89D", "u5FCD",
+  "u2F89E", "u5FD7",
+  "u2F89F", "u5FF9",
+  "u2F8A0", "u6081",
+  "u2F8A1", "u393A",
+  "u2F8A2", "u391C",
+  "u2F8A3", "u6094",
+  "u2F8A4", "u226D4",
+  "u2F8A5", "u60C7",
+  "u2F8A6", "u6148",
+  "u2F8A7", "u614C",
+  "u2F8A8", "u614E",
+  "u2F8A9", "u614C",
+  "u2F8AA", "u617A",
+  "u2F8AB", "u618E",
+  "u2F8AC", "u61B2",
+  "u2F8AD", "u61A4",
+  "u2F8AE", "u61AF",
+  "u2F8AF", "u61DE",
+  "u2F8B0", "u61F2",
+  "u2F8B1", "u61F6",
+  "u2F8B2", "u6210",
+  "u2F8B3", "u621B",
+  "u2F8B4", "u625D",
+  "u2F8B5", "u62B1",
+  "u2F8B6", "u62D4",
+  "u2F8B7", "u6350",
+  "u2F8B8", "u22B0C",
+  "u2F8B9", "u633D",
+  "u2F8BA", "u62FC",
+  "u2F8BB", "u6368",
+  "u2F8BC", "u6383",
+  "u2F8BD", "u63E4",
+  "u2F8BE", "u22BF1",
+  "u2F8BF", "u6422",
+  "u2F8C0", "u63C5",
+  "u2F8C1", "u63A9",
+  "u2F8C2", "u3A2E",
+  "u2F8C3", "u6469",
+  "u2F8C4", "u647E",
+  "u2F8C5", "u649D",
+  "u2F8C6", "u6477",
+  "u2F8C7", "u3A6C",
+  "u2F8C8", "u654F",
+  "u2F8C9", "u656C",
+  "u2F8CA", "u2300A",
+  "u2F8CB", "u65E3",
+  "u2F8CC", "u66F8",
+  "u2F8CD", "u6649",
+  "u2F8CE", "u3B19",
+  "u2F8CF", "u6691",
+  "u2F8D0", "u3B08",
+  "u2F8D1", "u3AE4",
+  "u2F8D2", "u5192",
+  "u2F8D3", "u5195",
+  "u2F8D4", "u6700",
+  "u2F8D5", "u669C",
+  "u2F8D6", "u80AD",
+  "u2F8D7", "u43D9",
+  "u2F8D8", "u6717",
+  "u2F8D9", "u671B",
+  "u2F8DA", "u6721",
+  "u2F8DB", "u675E",
+  "u2F8DC", "u6753",
+  "u2F8DD", "u233C3",
+  "u2F8DE", "u3B49",
+  "u2F8DF", "u67FA",
+  "u2F8E0", "u6785",
+  "u2F8E1", "u6852",
+  "u2F8E2", "u6885",
+  "u2F8E3", "u2346D",
+  "u2F8E4", "u688E",
+  "u2F8E5", "u681F",
+  "u2F8E6", "u6914",
+  "u2F8E7", "u3B9D",
+  "u2F8E8", "u6942",
+  "u2F8E9", "u69A3",
+  "u2F8EA", "u69EA",
+  "u2F8EB", "u6AA8",
+  "u2F8EC", "u236A3",
+  "u2F8ED", "u6ADB",
+  "u2F8EE", "u3C18",
+  "u2F8EF", "u6B21",
+  "u2F8F0", "u238A7",
+  "u2F8F1", "u6B54",
+  "u2F8F2", "u3C4E",
+  "u2F8F3", "u6B72",
+  "u2F8F4", "u6B9F",
+  "u2F8F5", "u6BBA",
+  "u2F8F6", "u6BBB",
+  "u2F8F7", "u23A8D",
+  "u2F8F8", "u21D0B",
+  "u2F8F9", "u23AFA",
+  "u2F8FA", "u6C4E",
+  "u2F8FB", "u23CBC",
+  "u2F8FC", "u6CBF",
+  "u2F8FD", "u6CCD",
+  "u2F8FE", "u6C67",
+  "u2F8FF", "u6D16",
+  "u2F900", "u6D3E",
+  "u2F901", "u6D77",
+  "u2F902", "u6D41",
+  "u2F903", "u6D69",
+  "u2F904", "u6D78",
+  "u2F905", "u6D85",
+  "u2F906", "u23D1E",
+  "u2F907", "u6D34",
+  "u2F908", "u6E2F",
+  "u2F909", "u6E6E",
+  "u2F90A", "u3D33",
+  "u2F90B", "u6ECB",
+  "u2F90C", "u6EC7",
+  "u2F90D", "u23ED1",
+  "u2F90E", "u6DF9",
+  "u2F90F", "u6F6E",
+  "u2F910", "u23F5E",
+  "u2F911", "u23F8E",
+  "u2F912", "u6FC6",
+  "u2F913", "u7039",
+  "u2F914", "u701E",
+  "u2F915", "u701B",
+  "u2F916", "u3D96",
+  "u2F917", "u704A",
+  "u2F918", "u707D",
+  "u2F919", "u7077",
+  "u2F91A", "u70AD",
+  "u2F91B", "u20525",
+  "u2F91C", "u7145",
+  "u2F91D", "u24263",
+  "u2F91E", "u719C",
+  "u2F91F", "u43AB",
+  "u2F920", "u7228",
+  "u2F921", "u7235",
+  "u2F922", "u7250",
+  "u2F923", "u24608",
+  "u2F924", "u7280",
+  "u2F925", "u7295",
+  "u2F926", "u24735",
+  "u2F927", "u24814",
+  "u2F928", "u737A",
+  "u2F929", "u738B",
+  "u2F92A", "u3EAC",
+  "u2F92B", "u73A5",
+  "u2F92C", "u3EB8",
+  "u2F92D", "u3EB8",
+  "u2F92E", "u7447",
+  "u2F92F", "u745C",
+  "u2F930", "u7471",
+  "u2F931", "u7485",
+  "u2F932", "u74CA",
+  "u2F933", "u3F1B",
+  "u2F934", "u7524",
+  "u2F935", "u24C36",
+  "u2F936", "u753E",
+  "u2F937", "u24C92",
+  "u2F938", "u7570",
+  "u2F939", "u2219F",
+  "u2F93A", "u7610",
+  "u2F93B", "u24FA1",
+  "u2F93C", "u24FB8",
+  "u2F93D", "u25044",
+  "u2F93E", "u3FFC",
+  "u2F93F", "u4008",
+  "u2F940", "u76F4",
+  "u2F941", "u250F3",
+  "u2F942", "u250F2",
+  "u2F943", "u25119",
+  "u2F944", "u25133",
+  "u2F945", "u771E",
+  "u2F946", "u771F",
+  "u2F947", "u771F",
+  "u2F948", "u774A",
+  "u2F949", "u4039",
+  "u2F94A", "u778B",
+  "u2F94B", "u4046",
+  "u2F94C", "u4096",
+  "u2F94D", "u2541D",
+  "u2F94E", "u784E",
+  "u2F94F", "u788C",
+  "u2F950", "u78CC",
+  "u2F951", "u40E3",
+  "u2F952", "u25626",
+  "u2F953", "u7956",
+  "u2F954", "u2569A",
+  "u2F955", "u256C5",
+  "u2F956", "u798F",
+  "u2F957", "u79EB",
+  "u2F958", "u412F",
+  "u2F959", "u7A40",
+  "u2F95A", "u7A4A",
+  "u2F95B", "u7A4F",
+  "u2F95C", "u2597C",
+  "u2F95D", "u25AA7",
+  "u2F95E", "u25AA7",
+  "u2F95F", "u7AAE",
+  "u2F960", "u4202",
+  "u2F961", "u25BAB",
+  "u2F962", "u7BC6",
+  "u2F963", "u7BC9",
+  "u2F964", "u4227",
+  "u2F965", "u25C80",
+  "u2F966", "u7CD2",
+  "u2F967", "u42A0",
+  "u2F968", "u7CE8",
+  "u2F969", "u7CE3",
+  "u2F96A", "u7D00",
+  "u2F96B", "u25F86",
+  "u2F96C", "u7D63",
+  "u2F96D", "u4301",
+  "u2F96E", "u7DC7",
+  "u2F96F", "u7E02",
+  "u2F970", "u7E45",
+  "u2F971", "u4334",
+  "u2F972", "u26228",
+  "u2F973", "u26247",
+  "u2F974", "u4359",
+  "u2F975", "u262D9",
+  "u2F976", "u7F7A",
+  "u2F977", "u2633E",
+  "u2F978", "u7F95",
+  "u2F979", "u7FFA",
+  "u2F97A", "u8005",
+  "u2F97B", "u264DA",
+  "u2F97C", "u26523",
+  "u2F97D", "u8060",
+  "u2F97E", "u265A8",
+  "u2F97F", "u8070",
+  "u2F980", "u2335F",
+  "u2F981", "u43D5",
+  "u2F982", "u80B2",
+  "u2F983", "u8103",
+  "u2F984", "u440B",
+  "u2F985", "u813E",
+  "u2F986", "u5AB5",
+  "u2F987", "u267A7",
+  "u2F988", "u267B5",
+  "u2F989", "u23393",
+  "u2F98A", "u2339C",
+  "u2F98B", "u8201",
+  "u2F98C", "u8204",
+  "u2F98D", "u8F9E",
+  "u2F98E", "u446B",
+  "u2F98F", "u8291",
+  "u2F990", "u828B",
+  "u2F991", "u829D",
+  "u2F992", "u52B3",
+  "u2F993", "u82B1",
+  "u2F994", "u82B3",
+  "u2F995", "u82BD",
+  "u2F996", "u82E6",
+  "u2F997", "u26B3C",
+  "u2F998", "u82E5",
+  "u2F999", "u831D",
+  "u2F99A", "u8363",
+  "u2F99B", "u83AD",
+  "u2F99C", "u8323",
+  "u2F99D", "u83BD",
+  "u2F99E", "u83E7",
+  "u2F99F", "u8457",
+  "u2F9A0", "u8353",
+  "u2F9A1", "u83CA",
+  "u2F9A2", "u83CC",
+  "u2F9A3", "u83DC",
+  "u2F9A4", "u26C36",
+  "u2F9A5", "u26D6B",
+  "u2F9A6", "u26CD5",
+  "u2F9A7", "u452B",
+  "u2F9A8", "u84F1",
+  "u2F9A9", "u84F3",
+  "u2F9AA", "u8516",
+  "u2F9AB", "u273CA",
+  "u2F9AC", "u8564",
+  "u2F9AD", "u26F2C",
+  "u2F9AE", "u455D",
+  "u2F9AF", "u4561",
+  "u2F9B0", "u26FB1",
+  "u2F9B1", "u270D2",
+  "u2F9B2", "u456B",
+  "u2F9B3", "u8650",
+  "u2F9B4", "u865C",
+  "u2F9B5", "u8667",
+  "u2F9B6", "u8669",
+  "u2F9B7", "u86A9",
+  "u2F9B8", "u8688",
+  "u2F9B9", "u870E",
+  "u2F9BA", "u86E2",
+  "u2F9BB", "u8779",
+  "u2F9BC", "u8728",
+  "u2F9BD", "u876B",
+  "u2F9BE", "u8786",
+  "u2F9BF", "u4D57",
+  "u2F9C0", "u87E1",
+  "u2F9C1", "u8801",
+  "u2F9C2", "u45F9",
+  "u2F9C3", "u8860",
+  "u2F9C4", "u8863",
+  "u2F9C5", "u27667",
+  "u2F9C6", "u88D7",
+  "u2F9C7", "u88DE",
+  "u2F9C8", "u4635",
+  "u2F9C9", "u88FA",
+  "u2F9CA", "u34BB",
+  "u2F9CB", "u278AE",
+  "u2F9CC", "u27966",
+  "u2F9CD", "u46BE",
+  "u2F9CE", "u46C7",
+  "u2F9CF", "u8AA0",
+  "u2F9D0", "u8AED",
+  "u2F9D1", "u8B8A",
+  "u2F9D2", "u8C55",
+  "u2F9D3", "u27CA8",
+  "u2F9D4", "u8CAB",
+  "u2F9D5", "u8CC1",
+  "u2F9D6", "u8D1B",
+  "u2F9D7", "u8D77",
+  "u2F9D8", "u27F2F",
+  "u2F9D9", "u20804",
+  "u2F9DA", "u8DCB",
+  "u2F9DB", "u8DBC",
+  "u2F9DC", "u8DF0",
+  "u2F9DD", "u208DE",
+  "u2F9DE", "u8ED4",
+  "u2F9DF", "u8F38",
+  "u2F9E0", "u285D2",
+  "u2F9E1", "u285ED",
+  "u2F9E2", "u9094",
+  "u2F9E3", "u90F1",
+  "u2F9E4", "u9111",
+  "u2F9E5", "u2872E",
+  "u2F9E6", "u911B",
+  "u2F9E7", "u9238",
+  "u2F9E8", "u92D7",
+  "u2F9E9", "u92D8",
+  "u2F9EA", "u927C",
+  "u2F9EB", "u93F9",
+  "u2F9EC", "u9415",
+  "u2F9ED", "u28BFA",
+  "u2F9EE", "u958B",
+  "u2F9EF", "u4995",
+  "u2F9F0", "u95B7",
+  "u2F9F1", "u28D77",
+  "u2F9F2", "u49E6",
+  "u2F9F3", "u96C3",
+  "u2F9F4", "u5DB2",
+  "u2F9F5", "u9723",
+  "u2F9F6", "u29145",
+  "u2F9F7", "u2921A",
+  "u2F9F8", "u4A6E",
+  "u2F9F9", "u4A76",
+  "u2F9FA", "u97E0",
+  "u2F9FB", "u2940A",
+  "u2F9FC", "u4AB2",
+  "u2F9FD", "u29496",
+  "u2F9FE", "u980B",
+  "u2F9FF", "u980B",
+  "u2FA00", "u9829",
+  "u2FA01", "u295B6",
+  "u2FA02", "u98E2",
+  "u2FA03", "u4B33",
+  "u2FA04", "u9929",
+  "u2FA05", "u99A7",
+  "u2FA06", "u99C2",
+  "u2FA07", "u99FE",
+  "u2FA08", "u4BCE",
+  "u2FA09", "u29B30",
+  "u2FA0A", "u9B12",
+  "u2FA0B", "u9C40",
+  "u2FA0C", "u9CFD",
+  "u2FA0D", "u4CCE",
+  "u2FA0E", "u4CED",
+  "u2FA0F", "u9D67",
+  "u2FA10", "u2A0CE",
+  "u2FA11", "u4CF8",
+  "u2FA12", "u2A105",
+  "u2FA13", "u2A20E",
+  "u2FA14", "u2A291",
+  "u2FA15", "u9EBB",
+  "u2FA16", "u4D56",
+  "u2FA17", "u9EF9",
+  "u2FA18", "u9EFE",
+  "u2FA19", "u9F05",
+  "u2FA1A", "u9F0F",
+  "u2FA1B", "u9F16",
+  "u2FA1C", "u9F3B",
+  "u2FA1D", "u2A600",
+);
+
+%AGL_to_unicode = (
+  "A", "u0041",
+  "AE", "u00C6",
+  "AEacute", "u01FC",
+  "AEmacron", "u01E2",
+  "Aacute", "u00C1",
+  "Abreve", "u0102",
+  "Abreveacute", "u1EAE",
+  "Abrevecyrillic", "u04D0",
+  "Abrevedotbelow", "u1EB6",
+  "Abrevegrave", "u1EB0",
+  "Abrevehookabove", "u1EB2",
+  "Abrevetilde", "u1EB4",
+  "Acaron", "u01CD",
+  "Acircle", "u24B6",
+  "Acircumflex", "u00C2",
+  "Acircumflexacute", "u1EA4",
+  "Acircumflexdotbelow", "u1EAC",
+  "Acircumflexgrave", "u1EA6",
+  "Acircumflexhookabove", "u1EA8",
+  "Acircumflextilde", "u1EAA",
+  "Acyrillic", "u0410",
+  "Adblgrave", "u0200",
+  "Adieresis", "u00C4",
+  "Adieresiscyrillic", "u04D2",
+  "Adieresismacron", "u01DE",
+  "Adotbelow", "u1EA0",
+  "Adotmacron", "u01E0",
+  "Agrave", "u00C0",
+  "Ahookabove", "u1EA2",
+  "Aiecyrillic", "u04D4",
+  "Ainvertedbreve", "u0202",
+  "Alpha", "u0391",
+  "Alphatonos", "u0386",
+  "Amacron", "u0100",
+  "Amonospace", "uFF21",
+  "Aogonek", "u0104",
+  "Aring", "u00C5",
+  "Aringacute", "u01FA",
+  "Aringbelow", "u1E00",
+  "Atilde", "u00C3",
+  "Aybarmenian", "u0531",
+  "B", "u0042",
+  "Bcircle", "u24B7",
+  "Bdotaccent", "u1E02",
+  "Bdotbelow", "u1E04",
+  "Becyrillic", "u0411",
+  "Benarmenian", "u0532",
+  "Beta", "u0392",
+  "Bhook", "u0181",
+  "Blinebelow", "u1E06",
+  "Bmonospace", "uFF22",
+  "Btopbar", "u0182",
+  "C", "u0043",
+  "Caarmenian", "u053E",
+  "Cacute", "u0106",
+  "Ccaron", "u010C",
+  "Ccedilla", "u00C7",
+  "Ccedillaacute", "u1E08",
+  "Ccircle", "u24B8",
+  "Ccircumflex", "u0108",
+  "Cdot", "u010A",
+  "Cdotaccent", "u010A",
+  "Chaarmenian", "u0549",
+  "Cheabkhasiancyrillic", "u04BC",
+  "Checyrillic", "u0427",
+  "Chedescenderabkhasiancyrillic", "u04BE",
+  "Chedescendercyrillic", "u04B6",
+  "Chedieresiscyrillic", "u04F4",
+  "Cheharmenian", "u0543",
+  "Chekhakassiancyrillic", "u04CB",
+  "Cheverticalstrokecyrillic", "u04B8",
+  "Chi", "u03A7",
+  "Chook", "u0187",
+  "Cmonospace", "uFF23",
+  "Coarmenian", "u0551",
+  "D", "u0044",
+  "DZ", "u01F1",
+  "DZcaron", "u01C4",
+  "Daarmenian", "u0534",
+  "Dafrican", "u0189",
+  "Dcaron", "u010E",
+  "Dcedilla", "u1E10",
+  "Dcircle", "u24B9",
+  "Dcircumflexbelow", "u1E12",
+  "Dcroat", "u0110",
+  "Ddotaccent", "u1E0A",
+  "Ddotbelow", "u1E0C",
+  "Decyrillic", "u0414",
+  "Deicoptic", "u03EE",
+  "Delta", "u2206",
+  "Deltagreek", "u0394",
+  "Dhook", "u018A",
+  "Digammagreek", "u03DC",
+  "Djecyrillic", "u0402",
+  "Dlinebelow", "u1E0E",
+  "Dmonospace", "uFF24",
+  "Dslash", "u0110",
+  "Dtopbar", "u018B",
+  "Dz", "u01F2",
+  "Dzcaron", "u01C5",
+  "Dzeabkhasiancyrillic", "u04E0",
+  "Dzecyrillic", "u0405",
+  "Dzhecyrillic", "u040F",
+  "E", "u0045",
+  "Eacute", "u00C9",
+  "Ebreve", "u0114",
+  "Ecaron", "u011A",
+  "Ecedillabreve", "u1E1C",
+  "Echarmenian", "u0535",
+  "Ecircle", "u24BA",
+  "Ecircumflex", "u00CA",
+  "Ecircumflexacute", "u1EBE",
+  "Ecircumflexbelow", "u1E18",
+  "Ecircumflexdotbelow", "u1EC6",
+  "Ecircumflexgrave", "u1EC0",
+  "Ecircumflexhookabove", "u1EC2",
+  "Ecircumflextilde", "u1EC4",
+  "Ecyrillic", "u0404",
+  "Edblgrave", "u0204",
+  "Edieresis", "u00CB",
+  "Edot", "u0116",
+  "Edotaccent", "u0116",
+  "Edotbelow", "u1EB8",
+  "Efcyrillic", "u0424",
+  "Egrave", "u00C8",
+  "Eharmenian", "u0537",
+  "Ehookabove", "u1EBA",
+  "Eightroman", "u2167",
+  "Einvertedbreve", "u0206",
+  "Eiotifiedcyrillic", "u0464",
+  "Elcyrillic", "u041B",
+  "Elevenroman", "u216A",
+  "Emacron", "u0112",
+  "Emacronacute", "u1E16",
+  "Emacrongrave", "u1E14",
+  "Emcyrillic", "u041C",
+  "Emonospace", "uFF25",
+  "Encyrillic", "u041D",
+  "Endescendercyrillic", "u04A2",
+  "Eng", "u014A",
+  "Enghecyrillic", "u04A4",
+  "Enhookcyrillic", "u04C7",
+  "Eogonek", "u0118",
+  "Eopen", "u0190",
+  "Epsilon", "u0395",
+  "Epsilontonos", "u0388",
+  "Ercyrillic", "u0420",
+  "Ereversed", "u018E",
+  "Ereversedcyrillic", "u042D",
+  "Escyrillic", "u0421",
+  "Esdescendercyrillic", "u04AA",
+  "Esh", "u01A9",
+  "Eta", "u0397",
+  "Etarmenian", "u0538",
+  "Etatonos", "u0389",
+  "Eth", "u00D0",
+  "Etilde", "u1EBC",
+  "Etildebelow", "u1E1A",
+  "Euro", "u20AC",
+  "Ezh", "u01B7",
+  "Ezhcaron", "u01EE",
+  "Ezhreversed", "u01B8",
+  "F", "u0046",
+  "Fcircle", "u24BB",
+  "Fdotaccent", "u1E1E",
+  "Feharmenian", "u0556",
+  "Feicoptic", "u03E4",
+  "Fhook", "u0191",
+  "Fitacyrillic", "u0472",
+  "Fiveroman", "u2164",
+  "Fmonospace", "uFF26",
+  "Fourroman", "u2163",
+  "G", "u0047",
+  "GBsquare", "u3387",
+  "Gacute", "u01F4",
+  "Gamma", "u0393",
+  "Gammaafrican", "u0194",
+  "Gangiacoptic", "u03EA",
+  "Gbreve", "u011E",
+  "Gcaron", "u01E6",
+  "Gcedilla", "u0122",
+  "Gcircle", "u24BC",
+  "Gcircumflex", "u011C",
+  "Gcommaaccent", "u0122",
+  "Gdot", "u0120",
+  "Gdotaccent", "u0120",
+  "Gecyrillic", "u0413",
+  "Ghadarmenian", "u0542",
+  "Ghemiddlehookcyrillic", "u0494",
+  "Ghestrokecyrillic", "u0492",
+  "Gheupturncyrillic", "u0490",
+  "Ghook", "u0193",
+  "Gimarmenian", "u0533",
+  "Gjecyrillic", "u0403",
+  "Gmacron", "u1E20",
+  "Gmonospace", "uFF27",
+  "Gsmallhook", "u029B",
+  "Gstroke", "u01E4",
+  "H", "u0048",
+  "H18533", "u25CF",
+  "H18543", "u25AA",
+  "H18551", "u25AB",
+  "H22073", "u25A1",
+  "HPsquare", "u33CB",
+  "Haabkhasiancyrillic", "u04A8",
+  "Hadescendercyrillic", "u04B2",
+  "Hardsigncyrillic", "u042A",
+  "Hbar", "u0126",
+  "Hbrevebelow", "u1E2A",
+  "Hcedilla", "u1E28",
+  "Hcircle", "u24BD",
+  "Hcircumflex", "u0124",
+  "Hdieresis", "u1E26",
+  "Hdotaccent", "u1E22",
+  "Hdotbelow", "u1E24",
+  "Hmonospace", "uFF28",
+  "Hoarmenian", "u0540",
+  "Horicoptic", "u03E8",
+  "Hzsquare", "u3390",
+  "I", "u0049",
+  "IAcyrillic", "u042F",
+  "IJ", "u0132",
+  "IUcyrillic", "u042E",
+  "Iacute", "u00CD",
+  "Ibreve", "u012C",
+  "Icaron", "u01CF",
+  "Icircle", "u24BE",
+  "Icircumflex", "u00CE",
+  "Icyrillic", "u0406",
+  "Idblgrave", "u0208",
+  "Idieresis", "u00CF",
+  "Idieresisacute", "u1E2E",
+  "Idieresiscyrillic", "u04E4",
+  "Idot", "u0130",
+  "Idotaccent", "u0130",
+  "Idotbelow", "u1ECA",
+  "Iebrevecyrillic", "u04D6",
+  "Iecyrillic", "u0415",
+  "Ifraktur", "u2111",
+  "Igrave", "u00CC",
+  "Ihookabove", "u1EC8",
+  "Iicyrillic", "u0418",
+  "Iinvertedbreve", "u020A",
+  "Iishortcyrillic", "u0419",
+  "Imacron", "u012A",
+  "Imacroncyrillic", "u04E2",
+  "Imonospace", "uFF29",
+  "Iniarmenian", "u053B",
+  "Iocyrillic", "u0401",
+  "Iogonek", "u012E",
+  "Iota", "u0399",
+  "Iotaafrican", "u0196",
+  "Iotadieresis", "u03AA",
+  "Iotatonos", "u038A",
+  "Istroke", "u0197",
+  "Itilde", "u0128",
+  "Itildebelow", "u1E2C",
+  "Izhitsacyrillic", "u0474",
+  "Izhitsadblgravecyrillic", "u0476",
+  "J", "u004A",
+  "Jaarmenian", "u0541",
+  "Jcircle", "u24BF",
+  "Jcircumflex", "u0134",
+  "Jecyrillic", "u0408",
+  "Jheharmenian", "u054B",
+  "Jmonospace", "uFF2A",
+  "K", "u004B",
+  "KBsquare", "u3385",
+  "KKsquare", "u33CD",
+  "Kabashkircyrillic", "u04A0",
+  "Kacute", "u1E30",
+  "Kacyrillic", "u041A",
+  "Kadescendercyrillic", "u049A",
+  "Kahookcyrillic", "u04C3",
+  "Kappa", "u039A",
+  "Kastrokecyrillic", "u049E",
+  "Kaverticalstrokecyrillic", "u049C",
+  "Kcaron", "u01E8",
+  "Kcedilla", "u0136",
+  "Kcircle", "u24C0",
+  "Kcommaaccent", "u0136",
+  "Kdotbelow", "u1E32",
+  "Keharmenian", "u0554",
+  "Kenarmenian", "u053F",
+  "Khacyrillic", "u0425",
+  "Kheicoptic", "u03E6",
+  "Khook", "u0198",
+  "Kjecyrillic", "u040C",
+  "Klinebelow", "u1E34",
+  "Kmonospace", "uFF2B",
+  "Koppacyrillic", "u0480",
+  "Koppagreek", "u03DE",
+  "Ksicyrillic", "u046E",
+  "L", "u004C",
+  "LJ", "u01C7",
+  "Lacute", "u0139",
+  "Lambda", "u039B",
+  "Lcaron", "u013D",
+  "Lcedilla", "u013B",
+  "Lcircle", "u24C1",
+  "Lcircumflexbelow", "u1E3C",
+  "Lcommaaccent", "u013B",
+  "Ldot", "u013F",
+  "Ldotaccent", "u013F",
+  "Ldotbelow", "u1E36",
+  "Ldotbelowmacron", "u1E38",
+  "Liwnarmenian", "u053C",
+  "Lj", "u01C8",
+  "Ljecyrillic", "u0409",
+  "Llinebelow", "u1E3A",
+  "Lmonospace", "uFF2C",
+  "Lslash", "u0141",
+  "M", "u004D",
+  "MBsquare", "u3386",
+  "Macute", "u1E3E",
+  "Mcircle", "u24C2",
+  "Mdotaccent", "u1E40",
+  "Mdotbelow", "u1E42",
+  "Menarmenian", "u0544",
+  "Mmonospace", "uFF2D",
+  "Mturned", "u019C",
+  "Mu", "u039C",
+  "N", "u004E",
+  "NJ", "u01CA",
+  "Nacute", "u0143",
+  "Ncaron", "u0147",
+  "Ncedilla", "u0145",
+  "Ncircle", "u24C3",
+  "Ncircumflexbelow", "u1E4A",
+  "Ncommaaccent", "u0145",
+  "Ndotaccent", "u1E44",
+  "Ndotbelow", "u1E46",
+  "Nhookleft", "u019D",
+  "Nineroman", "u2168",
+  "Nj", "u01CB",
+  "Njecyrillic", "u040A",
+  "Nlinebelow", "u1E48",
+  "Nmonospace", "uFF2E",
+  "Nowarmenian", "u0546",
+  "Ntilde", "u00D1",
+  "Nu", "u039D",
+  "O", "u004F",
+  "OE", "u0152",
+  "Oacute", "u00D3",
+  "Obarredcyrillic", "u04E8",
+  "Obarreddieresiscyrillic", "u04EA",
+  "Obreve", "u014E",
+  "Ocaron", "u01D1",
+  "Ocenteredtilde", "u019F",
+  "Ocircle", "u24C4",
+  "Ocircumflex", "u00D4",
+  "Ocircumflexacute", "u1ED0",
+  "Ocircumflexdotbelow", "u1ED8",
+  "Ocircumflexgrave", "u1ED2",
+  "Ocircumflexhookabove", "u1ED4",
+  "Ocircumflextilde", "u1ED6",
+  "Ocyrillic", "u041E",
+  "Odblacute", "u0150",
+  "Odblgrave", "u020C",
+  "Odieresis", "u00D6",
+  "Odieresiscyrillic", "u04E6",
+  "Odotbelow", "u1ECC",
+  "Ograve", "u00D2",
+  "Oharmenian", "u0555",
+  "Ohm", "u2126",
+  "Ohookabove", "u1ECE",
+  "Ohorn", "u01A0",
+  "Ohornacute", "u1EDA",
+  "Ohorndotbelow", "u1EE2",
+  "Ohorngrave", "u1EDC",
+  "Ohornhookabove", "u1EDE",
+  "Ohorntilde", "u1EE0",
+  "Ohungarumlaut", "u0150",
+  "Oi", "u01A2",
+  "Oinvertedbreve", "u020E",
+  "Omacron", "u014C",
+  "Omacronacute", "u1E52",
+  "Omacrongrave", "u1E50",
+  "Omega", "u2126",
+  "Omegacyrillic", "u0460",
+  "Omegagreek", "u03A9",
+  "Omegaroundcyrillic", "u047A",
+  "Omegatitlocyrillic", "u047C",
+  "Omegatonos", "u038F",
+  "Omicron", "u039F",
+  "Omicrontonos", "u038C",
+  "Omonospace", "uFF2F",
+  "Oneroman", "u2160",
+  "Oogonek", "u01EA",
+  "Oogonekmacron", "u01EC",
+  "Oopen", "u0186",
+  "Oslash", "u00D8",
+  "Oslashacute", "u01FE",
+  "Ostrokeacute", "u01FE",
+  "Otcyrillic", "u047E",
+  "Otilde", "u00D5",
+  "Otildeacute", "u1E4C",
+  "Otildedieresis", "u1E4E",
+  "P", "u0050",
+  "Pacute", "u1E54",
+  "Pcircle", "u24C5",
+  "Pdotaccent", "u1E56",
+  "Pecyrillic", "u041F",
+  "Peharmenian", "u054A",
+  "Pemiddlehookcyrillic", "u04A6",
+  "Phi", "u03A6",
+  "Phook", "u01A4",
+  "Pi", "u03A0",
+  "Piwrarmenian", "u0553",
+  "Pmonospace", "uFF30",
+  "Psi", "u03A8",
+  "Psicyrillic", "u0470",
+  "Q", "u0051",
+  "Qcircle", "u24C6",
+  "Qmonospace", "uFF31",
+  "R", "u0052",
+  "Raarmenian", "u054C",
+  "Racute", "u0154",
+  "Rcaron", "u0158",
+  "Rcedilla", "u0156",
+  "Rcircle", "u24C7",
+  "Rcommaaccent", "u0156",
+  "Rdblgrave", "u0210",
+  "Rdotaccent", "u1E58",
+  "Rdotbelow", "u1E5A",
+  "Rdotbelowmacron", "u1E5C",
+  "Reharmenian", "u0550",
+  "Rfraktur", "u211C",
+  "Rho", "u03A1",
+  "Rinvertedbreve", "u0212",
+  "Rlinebelow", "u1E5E",
+  "Rmonospace", "uFF32",
+  "Rsmallinverted", "u0281",
+  "Rsmallinvertedsuperior", "u02B6",
+  "S", "u0053",
+  "SF010000", "u250C",
+  "SF020000", "u2514",
+  "SF030000", "u2510",
+  "SF040000", "u2518",
+  "SF050000", "u253C",
+  "SF060000", "u252C",
+  "SF070000", "u2534",
+  "SF080000", "u251C",
+  "SF090000", "u2524",
+  "SF100000", "u2500",
+  "SF110000", "u2502",
+  "SF190000", "u2561",
+  "SF200000", "u2562",
+  "SF210000", "u2556",
+  "SF220000", "u2555",
+  "SF230000", "u2563",
+  "SF240000", "u2551",
+  "SF250000", "u2557",
+  "SF260000", "u255D",
+  "SF270000", "u255C",
+  "SF280000", "u255B",
+  "SF360000", "u255E",
+  "SF370000", "u255F",
+  "SF380000", "u255A",
+  "SF390000", "u2554",
+  "SF400000", "u2569",
+  "SF410000", "u2566",
+  "SF420000", "u2560",
+  "SF430000", "u2550",
+  "SF440000", "u256C",
+  "SF450000", "u2567",
+  "SF460000", "u2568",
+  "SF470000", "u2564",
+  "SF480000", "u2565",
+  "SF490000", "u2559",
+  "SF500000", "u2558",
+  "SF510000", "u2552",
+  "SF520000", "u2553",
+  "SF530000", "u256B",
+  "SF540000", "u256A",
+  "Sacute", "u015A",
+  "Sacutedotaccent", "u1E64",
+  "Sampigreek", "u03E0",
+  "Scaron", "u0160",
+  "Scarondotaccent", "u1E66",
+  "Scedilla", "u015E",
+  "Schwa", "u018F",
+  "Schwacyrillic", "u04D8",
+  "Schwadieresiscyrillic", "u04DA",
+  "Scircle", "u24C8",
+  "Scircumflex", "u015C",
+  "Scommaaccent", "u0218",
+  "Sdotaccent", "u1E60",
+  "Sdotbelow", "u1E62",
+  "Sdotbelowdotaccent", "u1E68",
+  "Seharmenian", "u054D",
+  "Sevenroman", "u2166",
+  "Shaarmenian", "u0547",
+  "Shacyrillic", "u0428",
+  "Shchacyrillic", "u0429",
+  "Sheicoptic", "u03E2",
+  "Shhacyrillic", "u04BA",
+  "Shimacoptic", "u03EC",
+  "Sigma", "u03A3",
+  "Sixroman", "u2165",
+  "Smonospace", "uFF33",
+  "Softsigncyrillic", "u042C",
+  "Stigmagreek", "u03DA",
+  "T", "u0054",
+  "Tau", "u03A4",
+  "Tbar", "u0166",
+  "Tcaron", "u0164",
+  "Tcedilla", "u0162",
+  "Tcircle", "u24C9",
+  "Tcircumflexbelow", "u1E70",
+  "Tcommaaccent", "u0162",
+  "Tdotaccent", "u1E6A",
+  "Tdotbelow", "u1E6C",
+  "Tecyrillic", "u0422",
+  "Tedescendercyrillic", "u04AC",
+  "Tenroman", "u2169",
+  "Tetsecyrillic", "u04B4",
+  "Theta", "u0398",
+  "Thook", "u01AC",
+  "Thorn", "u00DE",
+  "Threeroman", "u2162",
+  "Tiwnarmenian", "u054F",
+  "Tlinebelow", "u1E6E",
+  "Tmonospace", "uFF34",
+  "Toarmenian", "u0539",
+  "Tonefive", "u01BC",
+  "Tonesix", "u0184",
+  "Tonetwo", "u01A7",
+  "Tretroflexhook", "u01AE",
+  "Tsecyrillic", "u0426",
+  "Tshecyrillic", "u040B",
+  "Twelveroman", "u216B",
+  "Tworoman", "u2161",
+  "U", "u0055",
+  "Uacute", "u00DA",
+  "Ubreve", "u016C",
+  "Ucaron", "u01D3",
+  "Ucircle", "u24CA",
+  "Ucircumflex", "u00DB",
+  "Ucircumflexbelow", "u1E76",
+  "Ucyrillic", "u0423",
+  "Udblacute", "u0170",
+  "Udblgrave", "u0214",
+  "Udieresis", "u00DC",
+  "Udieresisacute", "u01D7",
+  "Udieresisbelow", "u1E72",
+  "Udieresiscaron", "u01D9",
+  "Udieresiscyrillic", "u04F0",
+  "Udieresisgrave", "u01DB",
+  "Udieresismacron", "u01D5",
+  "Udotbelow", "u1EE4",
+  "Ugrave", "u00D9",
+  "Uhookabove", "u1EE6",
+  "Uhorn", "u01AF",
+  "Uhornacute", "u1EE8",
+  "Uhorndotbelow", "u1EF0",
+  "Uhorngrave", "u1EEA",
+  "Uhornhookabove", "u1EEC",
+  "Uhorntilde", "u1EEE",
+  "Uhungarumlaut", "u0170",
+  "Uhungarumlautcyrillic", "u04F2",
+  "Uinvertedbreve", "u0216",
+  "Ukcyrillic", "u0478",
+  "Umacron", "u016A",
+  "Umacroncyrillic", "u04EE",
+  "Umacrondieresis", "u1E7A",
+  "Umonospace", "uFF35",
+  "Uogonek", "u0172",
+  "Upsilon", "u03A5",
+  "Upsilon1", "u03D2",
+  "Upsilonacutehooksymbolgreek", "u03D3",
+  "Upsilonafrican", "u01B1",
+  "Upsilondieresis", "u03AB",
+  "Upsilondieresishooksymbolgreek", "u03D4",
+  "Upsilonhooksymbol", "u03D2",
+  "Upsilontonos", "u038E",
+  "Uring", "u016E",
+  "Ushortcyrillic", "u040E",
+  "Ustraightcyrillic", "u04AE",
+  "Ustraightstrokecyrillic", "u04B0",
+  "Utilde", "u0168",
+  "Utildeacute", "u1E78",
+  "Utildebelow", "u1E74",
+  "V", "u0056",
+  "Vcircle", "u24CB",
+  "Vdotbelow", "u1E7E",
+  "Vecyrillic", "u0412",
+  "Vewarmenian", "u054E",
+  "Vhook", "u01B2",
+  "Vmonospace", "uFF36",
+  "Voarmenian", "u0548",
+  "Vtilde", "u1E7C",
+  "W", "u0057",
+  "Wacute", "u1E82",
+  "Wcircle", "u24CC",
+  "Wcircumflex", "u0174",
+  "Wdieresis", "u1E84",
+  "Wdotaccent", "u1E86",
+  "Wdotbelow", "u1E88",
+  "Wgrave", "u1E80",
+  "Wmonospace", "uFF37",
+  "X", "u0058",
+  "Xcircle", "u24CD",
+  "Xdieresis", "u1E8C",
+  "Xdotaccent", "u1E8A",
+  "Xeharmenian", "u053D",
+  "Xi", "u039E",
+  "Xmonospace", "uFF38",
+  "Y", "u0059",
+  "Yacute", "u00DD",
+  "Yatcyrillic", "u0462",
+  "Ycircle", "u24CE",
+  "Ycircumflex", "u0176",
+  "Ydieresis", "u0178",
+  "Ydotaccent", "u1E8E",
+  "Ydotbelow", "u1EF4",
+  "Yericyrillic", "u042B",
+  "Yerudieresiscyrillic", "u04F8",
+  "Ygrave", "u1EF2",
+  "Yhook", "u01B3",
+  "Yhookabove", "u1EF6",
+  "Yiarmenian", "u0545",
+  "Yicyrillic", "u0407",
+  "Yiwnarmenian", "u0552",
+  "Ymonospace", "uFF39",
+  "Ytilde", "u1EF8",
+  "Yusbigcyrillic", "u046A",
+  "Yusbigiotifiedcyrillic", "u046C",
+  "Yuslittlecyrillic", "u0466",
+  "Yuslittleiotifiedcyrillic", "u0468",
+  "Z", "u005A",
+  "Zaarmenian", "u0536",
+  "Zacute", "u0179",
+  "Zcaron", "u017D",
+  "Zcircle", "u24CF",
+  "Zcircumflex", "u1E90",
+  "Zdot", "u017B",
+  "Zdotaccent", "u017B",
+  "Zdotbelow", "u1E92",
+  "Zecyrillic", "u0417",
+  "Zedescendercyrillic", "u0498",
+  "Zedieresiscyrillic", "u04DE",
+  "Zeta", "u0396",
+  "Zhearmenian", "u053A",
+  "Zhebrevecyrillic", "u04C1",
+  "Zhecyrillic", "u0416",
+  "Zhedescendercyrillic", "u0496",
+  "Zhedieresiscyrillic", "u04DC",
+  "Zlinebelow", "u1E94",
+  "Zmonospace", "uFF3A",
+  "Zstroke", "u01B5",
+  "a", "u0061",
+  "aabengali", "u0986",
+  "aacute", "u00E1",
+  "aadeva", "u0906",
+  "aagujarati", "u0A86",
+  "aagurmukhi", "u0A06",
+  "aamatragurmukhi", "u0A3E",
+  "aarusquare", "u3303",
+  "aavowelsignbengali", "u09BE",
+  "aavowelsigndeva", "u093E",
+  "aavowelsigngujarati", "u0ABE",
+  "abbreviationmarkarmenian", "u055F",
+  "abbreviationsigndeva", "u0970",
+  "abengali", "u0985",
+  "abopomofo", "u311A",
+  "abreve", "u0103",
+  "abreveacute", "u1EAF",
+  "abrevecyrillic", "u04D1",
+  "abrevedotbelow", "u1EB7",
+  "abrevegrave", "u1EB1",
+  "abrevehookabove", "u1EB3",
+  "abrevetilde", "u1EB5",
+  "acaron", "u01CE",
+  "acircle", "u24D0",
+  "acircumflex", "u00E2",
+  "acircumflexacute", "u1EA5",
+  "acircumflexdotbelow", "u1EAD",
+  "acircumflexgrave", "u1EA7",
+  "acircumflexhookabove", "u1EA9",
+  "acircumflextilde", "u1EAB",
+  "acute", "u00B4",
+  "acutebelowcmb", "u0317",
+  "acutecmb", "u0301",
+  "acutecomb", "u0301",
+  "acutedeva", "u0954",
+  "acutelowmod", "u02CF",
+  "acutetonecmb", "u0341",
+  "acyrillic", "u0430",
+  "adblgrave", "u0201",
+  "addakgurmukhi", "u0A71",
+  "adeva", "u0905",
+  "adieresis", "u00E4",
+  "adieresiscyrillic", "u04D3",
+  "adieresismacron", "u01DF",
+  "adotbelow", "u1EA1",
+  "adotmacron", "u01E1",
+  "ae", "u00E6",
+  "aeacute", "u01FD",
+  "aekorean", "u3150",
+  "aemacron", "u01E3",
+  "afii00208", "u2015",
+  "afii08941", "u20A4",
+  "afii10017", "u0410",
+  "afii10018", "u0411",
+  "afii10019", "u0412",
+  "afii10020", "u0413",
+  "afii10021", "u0414",
+  "afii10022", "u0415",
+  "afii10023", "u0401",
+  "afii10024", "u0416",
+  "afii10025", "u0417",
+  "afii10026", "u0418",
+  "afii10027", "u0419",
+  "afii10028", "u041A",
+  "afii10029", "u041B",
+  "afii10030", "u041C",
+  "afii10031", "u041D",
+  "afii10032", "u041E",
+  "afii10033", "u041F",
+  "afii10034", "u0420",
+  "afii10035", "u0421",
+  "afii10036", "u0422",
+  "afii10037", "u0423",
+  "afii10038", "u0424",
+  "afii10039", "u0425",
+  "afii10040", "u0426",
+  "afii10041", "u0427",
+  "afii10042", "u0428",
+  "afii10043", "u0429",
+  "afii10044", "u042A",
+  "afii10045", "u042B",
+  "afii10046", "u042C",
+  "afii10047", "u042D",
+  "afii10048", "u042E",
+  "afii10049", "u042F",
+  "afii10050", "u0490",
+  "afii10051", "u0402",
+  "afii10052", "u0403",
+  "afii10053", "u0404",
+  "afii10054", "u0405",
+  "afii10055", "u0406",
+  "afii10056", "u0407",
+  "afii10057", "u0408",
+  "afii10058", "u0409",
+  "afii10059", "u040A",
+  "afii10060", "u040B",
+  "afii10061", "u040C",
+  "afii10062", "u040E",
+  "afii10065", "u0430",
+  "afii10066", "u0431",
+  "afii10067", "u0432",
+  "afii10068", "u0433",
+  "afii10069", "u0434",
+  "afii10070", "u0435",
+  "afii10071", "u0451",
+  "afii10072", "u0436",
+  "afii10073", "u0437",
+  "afii10074", "u0438",
+  "afii10075", "u0439",
+  "afii10076", "u043A",
+  "afii10077", "u043B",
+  "afii10078", "u043C",
+  "afii10079", "u043D",
+  "afii10080", "u043E",
+  "afii10081", "u043F",
+  "afii10082", "u0440",
+  "afii10083", "u0441",
+  "afii10084", "u0442",
+  "afii10085", "u0443",
+  "afii10086", "u0444",
+  "afii10087", "u0445",
+  "afii10088", "u0446",
+  "afii10089", "u0447",
+  "afii10090", "u0448",
+  "afii10091", "u0449",
+  "afii10092", "u044A",
+  "afii10093", "u044B",
+  "afii10094", "u044C",
+  "afii10095", "u044D",
+  "afii10096", "u044E",
+  "afii10097", "u044F",
+  "afii10098", "u0491",
+  "afii10099", "u0452",
+  "afii10100", "u0453",
+  "afii10101", "u0454",
+  "afii10102", "u0455",
+  "afii10103", "u0456",
+  "afii10104", "u0457",
+  "afii10105", "u0458",
+  "afii10106", "u0459",
+  "afii10107", "u045A",
+  "afii10108", "u045B",
+  "afii10109", "u045C",
+  "afii10110", "u045E",
+  "afii10145", "u040F",
+  "afii10146", "u0462",
+  "afii10147", "u0472",
+  "afii10148", "u0474",
+  "afii10193", "u045F",
+  "afii10194", "u0463",
+  "afii10195", "u0473",
+  "afii10196", "u0475",
+  "afii10846", "u04D9",
+  "afii299", "u200E",
+  "afii300", "u200F",
+  "afii301", "u200D",
+  "afii57381", "u066A",
+  "afii57388", "u060C",
+  "afii57392", "u0660",
+  "afii57393", "u0661",
+  "afii57394", "u0662",
+  "afii57395", "u0663",
+  "afii57396", "u0664",
+  "afii57397", "u0665",
+  "afii57398", "u0666",
+  "afii57399", "u0667",
+  "afii57400", "u0668",
+  "afii57401", "u0669",
+  "afii57403", "u061B",
+  "afii57407", "u061F",
+  "afii57409", "u0621",
+  "afii57410", "u0622",
+  "afii57411", "u0623",
+  "afii57412", "u0624",
+  "afii57413", "u0625",
+  "afii57414", "u0626",
+  "afii57415", "u0627",
+  "afii57416", "u0628",
+  "afii57417", "u0629",
+  "afii57418", "u062A",
+  "afii57419", "u062B",
+  "afii57420", "u062C",
+  "afii57421", "u062D",
+  "afii57422", "u062E",
+  "afii57423", "u062F",
+  "afii57424", "u0630",
+  "afii57425", "u0631",
+  "afii57426", "u0632",
+  "afii57427", "u0633",
+  "afii57428", "u0634",
+  "afii57429", "u0635",
+  "afii57430", "u0636",
+  "afii57431", "u0637",
+  "afii57432", "u0638",
+  "afii57433", "u0639",
+  "afii57434", "u063A",
+  "afii57440", "u0640",
+  "afii57441", "u0641",
+  "afii57442", "u0642",
+  "afii57443", "u0643",
+  "afii57444", "u0644",
+  "afii57445", "u0645",
+  "afii57446", "u0646",
+  "afii57448", "u0648",
+  "afii57449", "u0649",
+  "afii57450", "u064A",
+  "afii57451", "u064B",
+  "afii57452", "u064C",
+  "afii57453", "u064D",
+  "afii57454", "u064E",
+  "afii57455", "u064F",
+  "afii57456", "u0650",
+  "afii57457", "u0651",
+  "afii57458", "u0652",
+  "afii57470", "u0647",
+  "afii57505", "u06A4",
+  "afii57506", "u067E",
+  "afii57507", "u0686",
+  "afii57508", "u0698",
+  "afii57509", "u06AF",
+  "afii57511", "u0679",
+  "afii57512", "u0688",
+  "afii57513", "u0691",
+  "afii57514", "u06BA",
+  "afii57519", "u06D2",
+  "afii57534", "u06D5",
+  "afii57636", "u20AA",
+  "afii57645", "u05BE",
+  "afii57658", "u05C3",
+  "afii57664", "u05D0",
+  "afii57665", "u05D1",
+  "afii57666", "u05D2",
+  "afii57667", "u05D3",
+  "afii57668", "u05D4",
+  "afii57669", "u05D5",
+  "afii57670", "u05D6",
+  "afii57671", "u05D7",
+  "afii57672", "u05D8",
+  "afii57673", "u05D9",
+  "afii57674", "u05DA",
+  "afii57675", "u05DB",
+  "afii57676", "u05DC",
+  "afii57677", "u05DD",
+  "afii57678", "u05DE",
+  "afii57679", "u05DF",
+  "afii57680", "u05E0",
+  "afii57681", "u05E1",
+  "afii57682", "u05E2",
+  "afii57683", "u05E3",
+  "afii57684", "u05E4",
+  "afii57685", "u05E5",
+  "afii57686", "u05E6",
+  "afii57687", "u05E7",
+  "afii57688", "u05E8",
+  "afii57689", "u05E9",
+  "afii57690", "u05EA",
+  "afii57694", "uFB2A",
+  "afii57695", "uFB2B",
+  "afii57700", "uFB4B",
+  "afii57705", "uFB1F",
+  "afii57716", "u05F0",
+  "afii57717", "u05F1",
+  "afii57718", "u05F2",
+  "afii57723", "uFB35",
+  "afii57793", "u05B4",
+  "afii57794", "u05B5",
+  "afii57795", "u05B6",
+  "afii57796", "u05BB",
+  "afii57797", "u05B8",
+  "afii57798", "u05B7",
+  "afii57799", "u05B0",
+  "afii57800", "u05B2",
+  "afii57801", "u05B1",
+  "afii57802", "u05B3",
+  "afii57803", "u05C2",
+  "afii57804", "u05C1",
+  "afii57806", "u05B9",
+  "afii57807", "u05BC",
+  "afii57839", "u05BD",
+  "afii57841", "u05BF",
+  "afii57842", "u05C0",
+  "afii57929", "u02BC",
+  "afii61248", "u2105",
+  "afii61289", "u2113",
+  "afii61352", "u2116",
+  "afii61573", "u202C",
+  "afii61574", "u202D",
+  "afii61575", "u202E",
+  "afii61664", "u200C",
+  "afii63167", "u066D",
+  "afii64937", "u02BD",
+  "agrave", "u00E0",
+  "agujarati", "u0A85",
+  "agurmukhi", "u0A05",
+  "ahiragana", "u3042",
+  "ahookabove", "u1EA3",
+  "aibengali", "u0990",
+  "aibopomofo", "u311E",
+  "aideva", "u0910",
+  "aiecyrillic", "u04D5",
+  "aigujarati", "u0A90",
+  "aigurmukhi", "u0A10",
+  "aimatragurmukhi", "u0A48",
+  "ainarabic", "u0639",
+  "ainfinalarabic", "uFECA",
+  "aininitialarabic", "uFECB",
+  "ainmedialarabic", "uFECC",
+  "ainvertedbreve", "u0203",
+  "aivowelsignbengali", "u09C8",
+  "aivowelsigndeva", "u0948",
+  "aivowelsigngujarati", "u0AC8",
+  "akatakana", "u30A2",
+  "akatakanahalfwidth", "uFF71",
+  "akorean", "u314F",
+  "alef", "u05D0",
+  "alefarabic", "u0627",
+  "alefdageshhebrew", "uFB30",
+  "aleffinalarabic", "uFE8E",
+  "alefhamzaabovearabic", "u0623",
+  "alefhamzaabovefinalarabic", "uFE84",
+  "alefhamzabelowarabic", "u0625",
+  "alefhamzabelowfinalarabic", "uFE88",
+  "alefhebrew", "u05D0",
+  "aleflamedhebrew", "uFB4F",
+  "alefmaddaabovearabic", "u0622",
+  "alefmaddaabovefinalarabic", "uFE82",
+  "alefmaksuraarabic", "u0649",
+  "alefmaksurafinalarabic", "uFEF0",
+  "alefmaksurainitialarabic", "uFEF3",
+  "alefmaksuramedialarabic", "uFEF4",
+  "alefpatahhebrew", "uFB2E",
+  "alefqamatshebrew", "uFB2F",
+  "aleph", "u2135",
+  "allequal", "u224C",
+  "alpha", "u03B1",
+  "alphatonos", "u03AC",
+  "amacron", "u0101",
+  "amonospace", "uFF41",
+  "ampersand", "u0026",
+  "ampersandmonospace", "uFF06",
+  "amsquare", "u33C2",
+  "anbopomofo", "u3122",
+  "angbopomofo", "u3124",
+  "angkhankhuthai", "u0E5A",
+  "angle", "u2220",
+  "anglebracketleft", "u3008",
+  "anglebracketleftvertical", "uFE3F",
+  "anglebracketright", "u3009",
+  "anglebracketrightvertical", "uFE40",
+  "angleleft", "u2329",
+  "angleright", "u232A",
+  "angstrom", "u212B",
+  "anoteleia", "u0387",
+  "anudattadeva", "u0952",
+  "anusvarabengali", "u0982",
+  "anusvaradeva", "u0902",
+  "anusvaragujarati", "u0A82",
+  "aogonek", "u0105",
+  "apaatosquare", "u3300",
+  "aparen", "u249C",
+  "apostrophearmenian", "u055A",
+  "apostrophemod", "u02BC",
+  "approaches", "u2250",
+  "approxequal", "u2248",
+  "approxequalorimage", "u2252",
+  "approximatelyequal", "u2245",
+  "araeaekorean", "u318E",
+  "araeakorean", "u318D",
+  "arc", "u2312",
+  "arighthalfring", "u1E9A",
+  "aring", "u00E5",
+  "aringacute", "u01FB",
+  "aringbelow", "u1E01",
+  "arrowboth", "u2194",
+  "arrowdashdown", "u21E3",
+  "arrowdashleft", "u21E0",
+  "arrowdashright", "u21E2",
+  "arrowdashup", "u21E1",
+  "arrowdblboth", "u21D4",
+  "arrowdbldown", "u21D3",
+  "arrowdblleft", "u21D0",
+  "arrowdblright", "u21D2",
+  "arrowdblup", "u21D1",
+  "arrowdown", "u2193",
+  "arrowdownleft", "u2199",
+  "arrowdownright", "u2198",
+  "arrowdownwhite", "u21E9",
+  "arrowheaddownmod", "u02C5",
+  "arrowheadleftmod", "u02C2",
+  "arrowheadrightmod", "u02C3",
+  "arrowheadupmod", "u02C4",
+  "arrowleft", "u2190",
+  "arrowleftdbl", "u21D0",
+  "arrowleftdblstroke", "u21CD",
+  "arrowleftoverright", "u21C6",
+  "arrowleftwhite", "u21E6",
+  "arrowright", "u2192",
+  "arrowrightdblstroke", "u21CF",
+  "arrowrightheavy", "u279E",
+  "arrowrightoverleft", "u21C4",
+  "arrowrightwhite", "u21E8",
+  "arrowtableft", "u21E4",
+  "arrowtabright", "u21E5",
+  "arrowup", "u2191",
+  "arrowupdn", "u2195",
+  "arrowupdnbse", "u21A8",
+  "arrowupdownbase", "u21A8",
+  "arrowupleft", "u2196",
+  "arrowupleftofdown", "u21C5",
+  "arrowupright", "u2197",
+  "arrowupwhite", "u21E7",
+  "asciicircum", "u005E",
+  "asciicircummonospace", "uFF3E",
+  "asciitilde", "u007E",
+  "asciitildemonospace", "uFF5E",
+  "ascript", "u0251",
+  "ascriptturned", "u0252",
+  "asmallhiragana", "u3041",
+  "asmallkatakana", "u30A1",
+  "asmallkatakanahalfwidth", "uFF67",
+  "asterisk", "u002A",
+  "asteriskaltonearabic", "u066D",
+  "asteriskarabic", "u066D",
+  "asteriskmath", "u2217",
+  "asteriskmonospace", "uFF0A",
+  "asterisksmall", "uFE61",
+  "asterism", "u2042",
+  "asymptoticallyequal", "u2243",
+  "at", "u0040",
+  "atilde", "u00E3",
+  "atmonospace", "uFF20",
+  "atsmall", "uFE6B",
+  "aturned", "u0250",
+  "aubengali", "u0994",
+  "aubopomofo", "u3120",
+  "audeva", "u0914",
+  "augujarati", "u0A94",
+  "augurmukhi", "u0A14",
+  "aulengthmarkbengali", "u09D7",
+  "aumatragurmukhi", "u0A4C",
+  "auvowelsignbengali", "u09CC",
+  "auvowelsigndeva", "u094C",
+  "auvowelsigngujarati", "u0ACC",
+  "avagrahadeva", "u093D",
+  "aybarmenian", "u0561",
+  "ayin", "u05E2",
+  "ayinaltonehebrew", "uFB20",
+  "ayinhebrew", "u05E2",
+  "b", "u0062",
+  "babengali", "u09AC",
+  "backslash", "u005C",
+  "backslashmonospace", "uFF3C",
+  "badeva", "u092C",
+  "bagujarati", "u0AAC",
+  "bagurmukhi", "u0A2C",
+  "bahiragana", "u3070",
+  "bahtthai", "u0E3F",
+  "bakatakana", "u30D0",
+  "bar", "u007C",
+  "barmonospace", "uFF5C",
+  "bbopomofo", "u3105",
+  "bcircle", "u24D1",
+  "bdotaccent", "u1E03",
+  "bdotbelow", "u1E05",
+  "beamedsixteenthnotes", "u266C",
+  "because", "u2235",
+  "becyrillic", "u0431",
+  "beharabic", "u0628",
+  "behfinalarabic", "uFE90",
+  "behinitialarabic", "uFE91",
+  "behiragana", "u3079",
+  "behmedialarabic", "uFE92",
+  "behmeeminitialarabic", "uFC9F",
+  "behmeemisolatedarabic", "uFC08",
+  "behnoonfinalarabic", "uFC6D",
+  "bekatakana", "u30D9",
+  "benarmenian", "u0562",
+  "bet", "u05D1",
+  "beta", "u03B2",
+  "betasymbolgreek", "u03D0",
+  "betdagesh", "uFB31",
+  "betdageshhebrew", "uFB31",
+  "bethebrew", "u05D1",
+  "betrafehebrew", "uFB4C",
+  "bhabengali", "u09AD",
+  "bhadeva", "u092D",
+  "bhagujarati", "u0AAD",
+  "bhagurmukhi", "u0A2D",
+  "bhook", "u0253",
+  "bihiragana", "u3073",
+  "bikatakana", "u30D3",
+  "bilabialclick", "u0298",
+  "bindigurmukhi", "u0A02",
+  "birusquare", "u3331",
+  "blackcircle", "u25CF",
+  "blackdiamond", "u25C6",
+  "blackdownpointingtriangle", "u25BC",
+  "blackleftpointingpointer", "u25C4",
+  "blackleftpointingtriangle", "u25C0",
+  "blacklenticularbracketleft", "u3010",
+  "blacklenticularbracketleftvertical", "uFE3B",
+  "blacklenticularbracketright", "u3011",
+  "blacklenticularbracketrightvertical", "uFE3C",
+  "blacklowerlefttriangle", "u25E3",
+  "blacklowerrighttriangle", "u25E2",
+  "blackrectangle", "u25AC",
+  "blackrightpointingpointer", "u25BA",
+  "blackrightpointingtriangle", "u25B6",
+  "blacksmallsquare", "u25AA",
+  "blacksmilingface", "u263B",
+  "blacksquare", "u25A0",
+  "blackstar", "u2605",
+  "blackupperlefttriangle", "u25E4",
+  "blackupperrighttriangle", "u25E5",
+  "blackuppointingsmalltriangle", "u25B4",
+  "blackuppointingtriangle", "u25B2",
+  "blank", "u2423",
+  "blinebelow", "u1E07",
+  "block", "u2588",
+  "bmonospace", "uFF42",
+  "bobaimaithai", "u0E1A",
+  "bohiragana", "u307C",
+  "bokatakana", "u30DC",
+  "bparen", "u249D",
+  "bqsquare", "u33C3",
+  "braceleft", "u007B",
+  "braceleftmonospace", "uFF5B",
+  "braceleftsmall", "uFE5B",
+  "braceleftvertical", "uFE37",
+  "braceright", "u007D",
+  "bracerightmonospace", "uFF5D",
+  "bracerightsmall", "uFE5C",
+  "bracerightvertical", "uFE38",
+  "bracketleft", "u005B",
+  "bracketleftmonospace", "uFF3B",
+  "bracketright", "u005D",
+  "bracketrightmonospace", "uFF3D",
+  "breve", "u02D8",
+  "brevebelowcmb", "u032E",
+  "brevecmb", "u0306",
+  "breveinvertedbelowcmb", "u032F",
+  "breveinvertedcmb", "u0311",
+  "breveinverteddoublecmb", "u0361",
+  "bridgebelowcmb", "u032A",
+  "bridgeinvertedbelowcmb", "u033A",
+  "brokenbar", "u00A6",
+  "bstroke", "u0180",
+  "btopbar", "u0183",
+  "buhiragana", "u3076",
+  "bukatakana", "u30D6",
+  "bullet", "u2022",
+  "bulletinverse", "u25D8",
+  "bulletoperator", "u2219",
+  "bullseye", "u25CE",
+  "c", "u0063",
+  "caarmenian", "u056E",
+  "cabengali", "u099A",
+  "cacute", "u0107",
+  "cadeva", "u091A",
+  "cagujarati", "u0A9A",
+  "cagurmukhi", "u0A1A",
+  "calsquare", "u3388",
+  "candrabindubengali", "u0981",
+  "candrabinducmb", "u0310",
+  "candrabindudeva", "u0901",
+  "candrabindugujarati", "u0A81",
+  "capslock", "u21EA",
+  "careof", "u2105",
+  "caron", "u02C7",
+  "caronbelowcmb", "u032C",
+  "caroncmb", "u030C",
+  "carriagereturn", "u21B5",
+  "cbopomofo", "u3118",
+  "ccaron", "u010D",
+  "ccedilla", "u00E7",
+  "ccedillaacute", "u1E09",
+  "ccircle", "u24D2",
+  "ccircumflex", "u0109",
+  "ccurl", "u0255",
+  "cdot", "u010B",
+  "cdotaccent", "u010B",
+  "cdsquare", "u33C5",
+  "cedilla", "u00B8",
+  "cedillacmb", "u0327",
+  "cent", "u00A2",
+  "centigrade", "u2103",
+  "centmonospace", "uFFE0",
+  "chaarmenian", "u0579",
+  "chabengali", "u099B",
+  "chadeva", "u091B",
+  "chagujarati", "u0A9B",
+  "chagurmukhi", "u0A1B",
+  "chbopomofo", "u3114",
+  "cheabkhasiancyrillic", "u04BD",
+  "checkmark", "u2713",
+  "checyrillic", "u0447",
+  "chedescenderabkhasiancyrillic", "u04BF",
+  "chedescendercyrillic", "u04B7",
+  "chedieresiscyrillic", "u04F5",
+  "cheharmenian", "u0573",
+  "chekhakassiancyrillic", "u04CC",
+  "cheverticalstrokecyrillic", "u04B9",
+  "chi", "u03C7",
+  "chieuchacirclekorean", "u3277",
+  "chieuchaparenkorean", "u3217",
+  "chieuchcirclekorean", "u3269",
+  "chieuchkorean", "u314A",
+  "chieuchparenkorean", "u3209",
+  "chochangthai", "u0E0A",
+  "chochanthai", "u0E08",
+  "chochingthai", "u0E09",
+  "chochoethai", "u0E0C",
+  "chook", "u0188",
+  "cieucacirclekorean", "u3276",
+  "cieucaparenkorean", "u3216",
+  "cieuccirclekorean", "u3268",
+  "cieuckorean", "u3148",
+  "cieucparenkorean", "u3208",
+  "cieucuparenkorean", "u321C",
+  "circle", "u25CB",
+  "circlemultiply", "u2297",
+  "circleot", "u2299",
+  "circleplus", "u2295",
+  "circlepostalmark", "u3036",
+  "circlewithlefthalfblack", "u25D0",
+  "circlewithrighthalfblack", "u25D1",
+  "circumflex", "u02C6",
+  "circumflexbelowcmb", "u032D",
+  "circumflexcmb", "u0302",
+  "clear", "u2327",
+  "clickalveolar", "u01C2",
+  "clickdental", "u01C0",
+  "clicklateral", "u01C1",
+  "clickretroflex", "u01C3",
+  "club", "u2663",
+  "clubsuitblack", "u2663",
+  "clubsuitwhite", "u2667",
+  "cmcubedsquare", "u33A4",
+  "cmonospace", "uFF43",
+  "cmsquaredsquare", "u33A0",
+  "coarmenian", "u0581",
+  "colon", "u003A",
+  "colonmonetary", "u20A1",
+  "colonmonospace", "uFF1A",
+  "colonsign", "u20A1",
+  "colonsmall", "uFE55",
+  "colontriangularhalfmod", "u02D1",
+  "colontriangularmod", "u02D0",
+  "comma", "u002C",
+  "commaabovecmb", "u0313",
+  "commaaboverightcmb", "u0315",
+  "commaarabic", "u060C",
+  "commaarmenian", "u055D",
+  "commamonospace", "uFF0C",
+  "commareversedabovecmb", "u0314",
+  "commareversedmod", "u02BD",
+  "commasmall", "uFE50",
+  "commaturnedabovecmb", "u0312",
+  "commaturnedmod", "u02BB",
+  "compass", "u263C",
+  "congruent", "u2245",
+  "contourintegral", "u222E",
+  "control", "u2303",
+  "controlACK", "u0006",
+  "controlBEL", "u0007",
+  "controlBS", "u0008",
+  "controlCAN", "u0018",
+  "controlCR", "u000D",
+  "controlDC1", "u0011",
+  "controlDC2", "u0012",
+  "controlDC3", "u0013",
+  "controlDC4", "u0014",
+  "controlDEL", "u007F",
+  "controlDLE", "u0010",
+  "controlEM", "u0019",
+  "controlENQ", "u0005",
+  "controlEOT", "u0004",
+  "controlESC", "u001B",
+  "controlETB", "u0017",
+  "controlETX", "u0003",
+  "controlFF", "u000C",
+  "controlFS", "u001C",
+  "controlGS", "u001D",
+  "controlHT", "u0009",
+  "controlLF", "u000A",
+  "controlNAK", "u0015",
+  "controlRS", "u001E",
+  "controlSI", "u000F",
+  "controlSO", "u000E",
+  "controlSOT", "u0002",
+  "controlSTX", "u0001",
+  "controlSUB", "u001A",
+  "controlSYN", "u0016",
+  "controlUS", "u001F",
+  "controlVT", "u000B",
+  "copyright", "u00A9",
+  "cornerbracketleft", "u300C",
+  "cornerbracketlefthalfwidth", "uFF62",
+  "cornerbracketleftvertical", "uFE41",
+  "cornerbracketright", "u300D",
+  "cornerbracketrighthalfwidth", "uFF63",
+  "cornerbracketrightvertical", "uFE42",
+  "corporationsquare", "u337F",
+  "cosquare", "u33C7",
+  "coverkgsquare", "u33C6",
+  "cparen", "u249E",
+  "cruzeiro", "u20A2",
+  "cstretched", "u0297",
+  "curlyand", "u22CF",
+  "curlyor", "u22CE",
+  "currency", "u00A4",
+  "d", "u0064",
+  "daarmenian", "u0564",
+  "dabengali", "u09A6",
+  "dadarabic", "u0636",
+  "dadeva", "u0926",
+  "dadfinalarabic", "uFEBE",
+  "dadinitialarabic", "uFEBF",
+  "dadmedialarabic", "uFEC0",
+  "dagesh", "u05BC",
+  "dageshhebrew", "u05BC",
+  "dagger", "u2020",
+  "daggerdbl", "u2021",
+  "dagujarati", "u0AA6",
+  "dagurmukhi", "u0A26",
+  "dahiragana", "u3060",
+  "dakatakana", "u30C0",
+  "dalarabic", "u062F",
+  "dalet", "u05D3",
+  "daletdagesh", "uFB33",
+  "daletdageshhebrew", "uFB33",
+  "dalethatafpatah", "u05D3_05B2",
+  "dalethatafpatahhebrew", "u05D3_05B2",
+  "dalethatafsegol", "u05D3_05B1",
+  "dalethatafsegolhebrew", "u05D3_05B1",
+  "dalethebrew", "u05D3",
+  "dalethiriq", "u05D3_05B4",
+  "dalethiriqhebrew", "u05D3_05B4",
+  "daletholam", "u05D3_05B9",
+  "daletholamhebrew", "u05D3_05B9",
+  "daletpatah", "u05D3_05B7",
+  "daletpatahhebrew", "u05D3_05B7",
+  "daletqamats", "u05D3_05B8",
+  "daletqamatshebrew", "u05D3_05B8",
+  "daletqubuts", "u05D3_05BB",
+  "daletqubutshebrew", "u05D3_05BB",
+  "daletsegol", "u05D3_05B6",
+  "daletsegolhebrew", "u05D3_05B6",
+  "daletsheva", "u05D3_05B0",
+  "daletshevahebrew", "u05D3_05B0",
+  "dalettsere", "u05D3_05B5",
+  "dalettserehebrew", "u05D3_05B5",
+  "dalfinalarabic", "uFEAA",
+  "dammaarabic", "u064F",
+  "dammalowarabic", "u064F",
+  "dammatanaltonearabic", "u064C",
+  "dammatanarabic", "u064C",
+  "danda", "u0964",
+  "dargahebrew", "u05A7",
+  "dargalefthebrew", "u05A7",
+  "dasiapneumatacyrilliccmb", "u0485",
+  "dblanglebracketleft", "u300A",
+  "dblanglebracketleftvertical", "uFE3D",
+  "dblanglebracketright", "u300B",
+  "dblanglebracketrightvertical", "uFE3E",
+  "dblarchinvertedbelowcmb", "u032B",
+  "dblarrowleft", "u21D4",
+  "dblarrowright", "u21D2",
+  "dbldanda", "u0965",
+  "dblgravecmb", "u030F",
+  "dblintegral", "u222C",
+  "dbllowline", "u2017",
+  "dbllowlinecmb", "u0333",
+  "dbloverlinecmb", "u033F",
+  "dblprimemod", "u02BA",
+  "dblverticalbar", "u2016",
+  "dblverticallineabovecmb", "u030E",
+  "dbopomofo", "u3109",
+  "dbsquare", "u33C8",
+  "dcaron", "u010F",
+  "dcedilla", "u1E11",
+  "dcircle", "u24D3",
+  "dcircumflexbelow", "u1E13",
+  "dcroat", "u0111",
+  "ddabengali", "u09A1",
+  "ddadeva", "u0921",
+  "ddagujarati", "u0AA1",
+  "ddagurmukhi", "u0A21",
+  "ddalarabic", "u0688",
+  "ddalfinalarabic", "uFB89",
+  "dddhadeva", "u095C",
+  "ddhabengali", "u09A2",
+  "ddhadeva", "u0922",
+  "ddhagujarati", "u0AA2",
+  "ddhagurmukhi", "u0A22",
+  "ddotaccent", "u1E0B",
+  "ddotbelow", "u1E0D",
+  "decimalseparatorarabic", "u066B",
+  "decimalseparatorpersian", "u066B",
+  "decyrillic", "u0434",
+  "degree", "u00B0",
+  "dehihebrew", "u05AD",
+  "dehiragana", "u3067",
+  "deicoptic", "u03EF",
+  "dekatakana", "u30C7",
+  "deleteleft", "u232B",
+  "deleteright", "u2326",
+  "delta", "u03B4",
+  "deltaturned", "u018D",
+  "denominatorminusonenumeratorbengali", "u09F8",
+  "dezh", "u02A4",
+  "dhabengali", "u09A7",
+  "dhadeva", "u0927",
+  "dhagujarati", "u0AA7",
+  "dhagurmukhi", "u0A27",
+  "dhook", "u0257",
+  "dialytikatonos", "u0385",
+  "dialytikatonoscmb", "u0344",
+  "diamond", "u2666",
+  "diamondsuitwhite", "u2662",
+  "dieresis", "u00A8",
+  "dieresisbelowcmb", "u0324",
+  "dieresiscmb", "u0308",
+  "dieresistonos", "u0385",
+  "dihiragana", "u3062",
+  "dikatakana", "u30C2",
+  "dittomark", "u3003",
+  "divide", "u00F7",
+  "divides", "u2223",
+  "divisionslash", "u2215",
+  "djecyrillic", "u0452",
+  "dkshade", "u2593",
+  "dlinebelow", "u1E0F",
+  "dlsquare", "u3397",
+  "dmacron", "u0111",
+  "dmonospace", "uFF44",
+  "dnblock", "u2584",
+  "dochadathai", "u0E0E",
+  "dodekthai", "u0E14",
+  "dohiragana", "u3069",
+  "dokatakana", "u30C9",
+  "dollar", "u0024",
+  "dollarmonospace", "uFF04",
+  "dollarsmall", "uFE69",
+  "dong", "u20AB",
+  "dorusquare", "u3326",
+  "dotaccent", "u02D9",
+  "dotaccentcmb", "u0307",
+  "dotbelowcmb", "u0323",
+  "dotbelowcomb", "u0323",
+  "dotkatakana", "u30FB",
+  "dotlessi", "u0131",
+  "dotlessjstrokehook", "u0284",
+  "dotmath", "u22C5",
+  "dottedcircle", "u25CC",
+  "doubleyodpatah", "uFB1F",
+  "doubleyodpatahhebrew", "uFB1F",
+  "downtackbelowcmb", "u031E",
+  "downtackmod", "u02D5",
+  "dparen", "u249F",
+  "dtail", "u0256",
+  "dtopbar", "u018C",
+  "duhiragana", "u3065",
+  "dukatakana", "u30C5",
+  "dz", "u01F3",
+  "dzaltone", "u02A3",
+  "dzcaron", "u01C6",
+  "dzcurl", "u02A5",
+  "dzeabkhasiancyrillic", "u04E1",
+  "dzecyrillic", "u0455",
+  "dzhecyrillic", "u045F",
+  "e", "u0065",
+  "eacute", "u00E9",
+  "earth", "u2641",
+  "ebengali", "u098F",
+  "ebopomofo", "u311C",
+  "ebreve", "u0115",
+  "ecandradeva", "u090D",
+  "ecandragujarati", "u0A8D",
+  "ecandravowelsigndeva", "u0945",
+  "ecandravowelsigngujarati", "u0AC5",
+  "ecaron", "u011B",
+  "ecedillabreve", "u1E1D",
+  "echarmenian", "u0565",
+  "echyiwnarmenian", "u0587",
+  "ecircle", "u24D4",
+  "ecircumflex", "u00EA",
+  "ecircumflexacute", "u1EBF",
+  "ecircumflexbelow", "u1E19",
+  "ecircumflexdotbelow", "u1EC7",
+  "ecircumflexgrave", "u1EC1",
+  "ecircumflexhookabove", "u1EC3",
+  "ecircumflextilde", "u1EC5",
+  "ecyrillic", "u0454",
+  "edblgrave", "u0205",
+  "edeva", "u090F",
+  "edieresis", "u00EB",
+  "edot", "u0117",
+  "edotaccent", "u0117",
+  "edotbelow", "u1EB9",
+  "eegurmukhi", "u0A0F",
+  "eematragurmukhi", "u0A47",
+  "efcyrillic", "u0444",
+  "egrave", "u00E8",
+  "egujarati", "u0A8F",
+  "eharmenian", "u0567",
+  "ehbopomofo", "u311D",
+  "ehiragana", "u3048",
+  "ehookabove", "u1EBB",
+  "eibopomofo", "u311F",
+  "eight", "u0038",
+  "eightarabic", "u0668",
+  "eightbengali", "u09EE",
+  "eightcircle", "u2467",
+  "eightcircleinversesansserif", "u2791",
+  "eightdeva", "u096E",
+  "eighteencircle", "u2471",
+  "eighteenparen", "u2485",
+  "eighteenperiod", "u2499",
+  "eightgujarati", "u0AEE",
+  "eightgurmukhi", "u0A6E",
+  "eighthackarabic", "u0668",
+  "eighthangzhou", "u3028",
+  "eighthnotebeamed", "u266B",
+  "eightideographicparen", "u3227",
+  "eightinferior", "u2088",
+  "eightmonospace", "uFF18",
+  "eightparen", "u247B",
+  "eightperiod", "u248F",
+  "eightpersian", "u06F8",
+  "eightroman", "u2177",
+  "eightsuperior", "u2078",
+  "eightthai", "u0E58",
+  "einvertedbreve", "u0207",
+  "eiotifiedcyrillic", "u0465",
+  "ekatakana", "u30A8",
+  "ekatakanahalfwidth", "uFF74",
+  "ekonkargurmukhi", "u0A74",
+  "ekorean", "u3154",
+  "elcyrillic", "u043B",
+  "element", "u2208",
+  "elevencircle", "u246A",
+  "elevenparen", "u247E",
+  "elevenperiod", "u2492",
+  "elevenroman", "u217A",
+  "ellipsis", "u2026",
+  "ellipsisvertical", "u22EE",
+  "emacron", "u0113",
+  "emacronacute", "u1E17",
+  "emacrongrave", "u1E15",
+  "emcyrillic", "u043C",
+  "emdash", "u2014",
+  "emdashvertical", "uFE31",
+  "emonospace", "uFF45",
+  "emphasismarkarmenian", "u055B",
+  "emptyset", "u2205",
+  "enbopomofo", "u3123",
+  "encyrillic", "u043D",
+  "endash", "u2013",
+  "endashvertical", "uFE32",
+  "endescendercyrillic", "u04A3",
+  "eng", "u014B",
+  "engbopomofo", "u3125",
+  "enghecyrillic", "u04A5",
+  "enhookcyrillic", "u04C8",
+  "enspace", "u2002",
+  "eogonek", "u0119",
+  "eokorean", "u3153",
+  "eopen", "u025B",
+  "eopenclosed", "u029A",
+  "eopenreversed", "u025C",
+  "eopenreversedclosed", "u025E",
+  "eopenreversedhook", "u025D",
+  "eparen", "u24A0",
+  "epsilon", "u03B5",
+  "epsilontonos", "u03AD",
+  "equal", "u003D",
+  "equalmonospace", "uFF1D",
+  "equalsmall", "uFE66",
+  "equalsuperior", "u207C",
+  "equivalence", "u2261",
+  "erbopomofo", "u3126",
+  "ercyrillic", "u0440",
+  "ereversed", "u0258",
+  "ereversedcyrillic", "u044D",
+  "escyrillic", "u0441",
+  "esdescendercyrillic", "u04AB",
+  "esh", "u0283",
+  "eshcurl", "u0286",
+  "eshortdeva", "u090E",
+  "eshortvowelsigndeva", "u0946",
+  "eshreversedloop", "u01AA",
+  "eshsquatreversed", "u0285",
+  "esmallhiragana", "u3047",
+  "esmallkatakana", "u30A7",
+  "esmallkatakanahalfwidth", "uFF6A",
+  "estimated", "u212E",
+  "eta", "u03B7",
+  "etarmenian", "u0568",
+  "etatonos", "u03AE",
+  "eth", "u00F0",
+  "etilde", "u1EBD",
+  "etildebelow", "u1E1B",
+  "etnahtafoukhhebrew", "u0591",
+  "etnahtafoukhlefthebrew", "u0591",
+  "etnahtahebrew", "u0591",
+  "etnahtalefthebrew", "u0591",
+  "eturned", "u01DD",
+  "eukorean", "u3161",
+  "euro", "u20AC",
+  "evowelsignbengali", "u09C7",
+  "evowelsigndeva", "u0947",
+  "evowelsigngujarati", "u0AC7",
+  "exclam", "u0021",
+  "exclamarmenian", "u055C",
+  "exclamdbl", "u203C",
+  "exclamdown", "u00A1",
+  "exclammonospace", "uFF01",
+  "existential", "u2203",
+  "ezh", "u0292",
+  "ezhcaron", "u01EF",
+  "ezhcurl", "u0293",
+  "ezhreversed", "u01B9",
+  "ezhtail", "u01BA",
+  "f", "u0066",
+  "fadeva", "u095E",
+  "fagurmukhi", "u0A5E",
+  "fahrenheit", "u2109",
+  "fathaarabic", "u064E",
+  "fathalowarabic", "u064E",
+  "fathatanarabic", "u064B",
+  "fbopomofo", "u3108",
+  "fcircle", "u24D5",
+  "fdotaccent", "u1E1F",
+  "feharabic", "u0641",
+  "feharmenian", "u0586",
+  "fehfinalarabic", "uFED2",
+  "fehinitialarabic", "uFED3",
+  "fehmedialarabic", "uFED4",
+  "feicoptic", "u03E5",
+  "female", "u2640",
+  "ff", "uFB00",
+  "ffi", "uFB03",
+  "ffl", "uFB04",
+  "fi", "uFB01",
+  "fifteencircle", "u246E",
+  "fifteenparen", "u2482",
+  "fifteenperiod", "u2496",
+  "figuredash", "u2012",
+  "filledbox", "u25A0",
+  "filledrect", "u25AC",
+  "finalkaf", "u05DA",
+  "finalkafdagesh", "uFB3A",
+  "finalkafdageshhebrew", "uFB3A",
+  "finalkafhebrew", "u05DA",
+  "finalkafqamats", "u05DA_05B8",
+  "finalkafqamatshebrew", "u05DA_05B8",
+  "finalkafsheva", "u05DA_05B0",
+  "finalkafshevahebrew", "u05DA_05B0",
+  "finalmem", "u05DD",
+  "finalmemhebrew", "u05DD",
+  "finalnun", "u05DF",
+  "finalnunhebrew", "u05DF",
+  "finalpe", "u05E3",
+  "finalpehebrew", "u05E3",
+  "finaltsadi", "u05E5",
+  "finaltsadihebrew", "u05E5",
+  "firsttonechinese", "u02C9",
+  "fisheye", "u25C9",
+  "fitacyrillic", "u0473",
+  "five", "u0035",
+  "fivearabic", "u0665",
+  "fivebengali", "u09EB",
+  "fivecircle", "u2464",
+  "fivecircleinversesansserif", "u278E",
+  "fivedeva", "u096B",
+  "fiveeighths", "u215D",
+  "fivegujarati", "u0AEB",
+  "fivegurmukhi", "u0A6B",
+  "fivehackarabic", "u0665",
+  "fivehangzhou", "u3025",
+  "fiveideographicparen", "u3224",
+  "fiveinferior", "u2085",
+  "fivemonospace", "uFF15",
+  "fiveparen", "u2478",
+  "fiveperiod", "u248C",
+  "fivepersian", "u06F5",
+  "fiveroman", "u2174",
+  "fivesuperior", "u2075",
+  "fivethai", "u0E55",
+  "fl", "uFB02",
+  "florin", "u0192",
+  "fmonospace", "uFF46",
+  "fmsquare", "u3399",
+  "fofanthai", "u0E1F",
+  "fofathai", "u0E1D",
+  "fongmanthai", "u0E4F",
+  "forall", "u2200",
+  "four", "u0034",
+  "fourarabic", "u0664",
+  "fourbengali", "u09EA",
+  "fourcircle", "u2463",
+  "fourcircleinversesansserif", "u278D",
+  "fourdeva", "u096A",
+  "fourgujarati", "u0AEA",
+  "fourgurmukhi", "u0A6A",
+  "fourhackarabic", "u0664",
+  "fourhangzhou", "u3024",
+  "fourideographicparen", "u3223",
+  "fourinferior", "u2084",
+  "fourmonospace", "uFF14",
+  "fournumeratorbengali", "u09F7",
+  "fourparen", "u2477",
+  "fourperiod", "u248B",
+  "fourpersian", "u06F4",
+  "fourroman", "u2173",
+  "foursuperior", "u2074",
+  "fourteencircle", "u246D",
+  "fourteenparen", "u2481",
+  "fourteenperiod", "u2495",
+  "fourthai", "u0E54",
+  "fourthtonechinese", "u02CB",
+  "fparen", "u24A1",
+  "fraction", "u2044",
+  "franc", "u20A3",
+  "g", "u0067",
+  "gabengali", "u0997",
+  "gacute", "u01F5",
+  "gadeva", "u0917",
+  "gafarabic", "u06AF",
+  "gaffinalarabic", "uFB93",
+  "gafinitialarabic", "uFB94",
+  "gafmedialarabic", "uFB95",
+  "gagujarati", "u0A97",
+  "gagurmukhi", "u0A17",
+  "gahiragana", "u304C",
+  "gakatakana", "u30AC",
+  "gamma", "u03B3",
+  "gammalatinsmall", "u0263",
+  "gammasuperior", "u02E0",
+  "gangiacoptic", "u03EB",
+  "gbopomofo", "u310D",
+  "gbreve", "u011F",
+  "gcaron", "u01E7",
+  "gcedilla", "u0123",
+  "gcircle", "u24D6",
+  "gcircumflex", "u011D",
+  "gcommaaccent", "u0123",
+  "gdot", "u0121",
+  "gdotaccent", "u0121",
+  "gecyrillic", "u0433",
+  "gehiragana", "u3052",
+  "gekatakana", "u30B2",
+  "geometricallyequal", "u2251",
+  "gereshaccenthebrew", "u059C",
+  "gereshhebrew", "u05F3",
+  "gereshmuqdamhebrew", "u059D",
+  "germandbls", "u00DF",
+  "gershayimaccenthebrew", "u059E",
+  "gershayimhebrew", "u05F4",
+  "getamark", "u3013",
+  "ghabengali", "u0998",
+  "ghadarmenian", "u0572",
+  "ghadeva", "u0918",
+  "ghagujarati", "u0A98",
+  "ghagurmukhi", "u0A18",
+  "ghainarabic", "u063A",
+  "ghainfinalarabic", "uFECE",
+  "ghaininitialarabic", "uFECF",
+  "ghainmedialarabic", "uFED0",
+  "ghemiddlehookcyrillic", "u0495",
+  "ghestrokecyrillic", "u0493",
+  "gheupturncyrillic", "u0491",
+  "ghhadeva", "u095A",
+  "ghhagurmukhi", "u0A5A",
+  "ghook", "u0260",
+  "ghzsquare", "u3393",
+  "gihiragana", "u304E",
+  "gikatakana", "u30AE",
+  "gimarmenian", "u0563",
+  "gimel", "u05D2",
+  "gimeldagesh", "uFB32",
+  "gimeldageshhebrew", "uFB32",
+  "gimelhebrew", "u05D2",
+  "gjecyrillic", "u0453",
+  "glottalinvertedstroke", "u01BE",
+  "glottalstop", "u0294",
+  "glottalstopinverted", "u0296",
+  "glottalstopmod", "u02C0",
+  "glottalstopreversed", "u0295",
+  "glottalstopreversedmod", "u02C1",
+  "glottalstopreversedsuperior", "u02E4",
+  "glottalstopstroke", "u02A1",
+  "glottalstopstrokereversed", "u02A2",
+  "gmacron", "u1E21",
+  "gmonospace", "uFF47",
+  "gohiragana", "u3054",
+  "gokatakana", "u30B4",
+  "gparen", "u24A2",
+  "gpasquare", "u33AC",
+  "gradient", "u2207",
+  "grave", "u0060",
+  "gravebelowcmb", "u0316",
+  "gravecmb", "u0300",
+  "gravecomb", "u0300",
+  "gravedeva", "u0953",
+  "gravelowmod", "u02CE",
+  "gravemonospace", "uFF40",
+  "gravetonecmb", "u0340",
+  "greater", "u003E",
+  "greaterequal", "u2265",
+  "greaterequalorless", "u22DB",
+  "greatermonospace", "uFF1E",
+  "greaterorequivalent", "u2273",
+  "greaterorless", "u2277",
+  "greateroverequal", "u2267",
+  "greatersmall", "uFE65",
+  "gscript", "u0261",
+  "gstroke", "u01E5",
+  "guhiragana", "u3050",
+  "guillemotleft", "u00AB",
+  "guillemotright", "u00BB",
+  "guilsinglleft", "u2039",
+  "guilsinglright", "u203A",
+  "gukatakana", "u30B0",
+  "guramusquare", "u3318",
+  "gysquare", "u33C9",
+  "h", "u0068",
+  "haabkhasiancyrillic", "u04A9",
+  "haaltonearabic", "u06C1",
+  "habengali", "u09B9",
+  "hadescendercyrillic", "u04B3",
+  "hadeva", "u0939",
+  "hagujarati", "u0AB9",
+  "hagurmukhi", "u0A39",
+  "haharabic", "u062D",
+  "hahfinalarabic", "uFEA2",
+  "hahinitialarabic", "uFEA3",
+  "hahiragana", "u306F",
+  "hahmedialarabic", "uFEA4",
+  "haitusquare", "u332A",
+  "hakatakana", "u30CF",
+  "hakatakanahalfwidth", "uFF8A",
+  "halantgurmukhi", "u0A4D",
+  "hamzaarabic", "u0621",
+  "hamzadammaarabic", "u0621_064F",
+  "hamzadammatanarabic", "u0621_064C",
+  "hamzafathaarabic", "u0621_064E",
+  "hamzafathatanarabic", "u0621_064B",
+  "hamzalowarabic", "u0621",
+  "hamzalowkasraarabic", "u0621_0650",
+  "hamzalowkasratanarabic", "u0621_064D",
+  "hamzasukunarabic", "u0621_0652",
+  "hangulfiller", "u3164",
+  "hardsigncyrillic", "u044A",
+  "harpoonleftbarbup", "u21BC",
+  "harpoonrightbarbup", "u21C0",
+  "hasquare", "u33CA",
+  "hatafpatah", "u05B2",
+  "hatafpatah16", "u05B2",
+  "hatafpatah23", "u05B2",
+  "hatafpatah2f", "u05B2",
+  "hatafpatahhebrew", "u05B2",
+  "hatafpatahnarrowhebrew", "u05B2",
+  "hatafpatahquarterhebrew", "u05B2",
+  "hatafpatahwidehebrew", "u05B2",
+  "hatafqamats", "u05B3",
+  "hatafqamats1b", "u05B3",
+  "hatafqamats28", "u05B3",
+  "hatafqamats34", "u05B3",
+  "hatafqamatshebrew", "u05B3",
+  "hatafqamatsnarrowhebrew", "u05B3",
+  "hatafqamatsquarterhebrew", "u05B3",
+  "hatafqamatswidehebrew", "u05B3",
+  "hatafsegol", "u05B1",
+  "hatafsegol17", "u05B1",
+  "hatafsegol24", "u05B1",
+  "hatafsegol30", "u05B1",
+  "hatafsegolhebrew", "u05B1",
+  "hatafsegolnarrowhebrew", "u05B1",
+  "hatafsegolquarterhebrew", "u05B1",
+  "hatafsegolwidehebrew", "u05B1",
+  "hbar", "u0127",
+  "hbopomofo", "u310F",
+  "hbrevebelow", "u1E2B",
+  "hcedilla", "u1E29",
+  "hcircle", "u24D7",
+  "hcircumflex", "u0125",
+  "hdieresis", "u1E27",
+  "hdotaccent", "u1E23",
+  "hdotbelow", "u1E25",
+  "he", "u05D4",
+  "heart", "u2665",
+  "heartsuitblack", "u2665",
+  "heartsuitwhite", "u2661",
+  "hedagesh", "uFB34",
+  "hedageshhebrew", "uFB34",
+  "hehaltonearabic", "u06C1",
+  "heharabic", "u0647",
+  "hehebrew", "u05D4",
+  "hehfinalaltonearabic", "uFBA7",
+  "hehfinalalttwoarabic", "uFEEA",
+  "hehfinalarabic", "uFEEA",
+  "hehhamzaabovefinalarabic", "uFBA5",
+  "hehhamzaaboveisolatedarabic", "uFBA4",
+  "hehinitialaltonearabic", "uFBA8",
+  "hehinitialarabic", "uFEEB",
+  "hehiragana", "u3078",
+  "hehmedialaltonearabic", "uFBA9",
+  "hehmedialarabic", "uFEEC",
+  "heiseierasquare", "u337B",
+  "hekatakana", "u30D8",
+  "hekatakanahalfwidth", "uFF8D",
+  "hekutaarusquare", "u3336",
+  "henghook", "u0267",
+  "herutusquare", "u3339",
+  "het", "u05D7",
+  "hethebrew", "u05D7",
+  "hhook", "u0266",
+  "hhooksuperior", "u02B1",
+  "hieuhacirclekorean", "u327B",
+  "hieuhaparenkorean", "u321B",
+  "hieuhcirclekorean", "u326D",
+  "hieuhkorean", "u314E",
+  "hieuhparenkorean", "u320D",
+  "hihiragana", "u3072",
+  "hikatakana", "u30D2",
+  "hikatakanahalfwidth", "uFF8B",
+  "hiriq", "u05B4",
+  "hiriq14", "u05B4",
+  "hiriq21", "u05B4",
+  "hiriq2d", "u05B4",
+  "hiriqhebrew", "u05B4",
+  "hiriqnarrowhebrew", "u05B4",
+  "hiriqquarterhebrew", "u05B4",
+  "hiriqwidehebrew", "u05B4",
+  "hlinebelow", "u1E96",
+  "hmonospace", "uFF48",
+  "hoarmenian", "u0570",
+  "hohipthai", "u0E2B",
+  "hohiragana", "u307B",
+  "hokatakana", "u30DB",
+  "hokatakanahalfwidth", "uFF8E",
+  "holam", "u05B9",
+  "holam19", "u05B9",
+  "holam26", "u05B9",
+  "holam32", "u05B9",
+  "holamhebrew", "u05B9",
+  "holamnarrowhebrew", "u05B9",
+  "holamquarterhebrew", "u05B9",
+  "holamwidehebrew", "u05B9",
+  "honokhukthai", "u0E2E",
+  "hookabovecomb", "u0309",
+  "hookcmb", "u0309",
+  "hookpalatalizedbelowcmb", "u0321",
+  "hookretroflexbelowcmb", "u0322",
+  "hoonsquare", "u3342",
+  "horicoptic", "u03E9",
+  "horizontalbar", "u2015",
+  "horncmb", "u031B",
+  "hotsprings", "u2668",
+  "house", "u2302",
+  "hparen", "u24A3",
+  "hsuperior", "u02B0",
+  "hturned", "u0265",
+  "huhiragana", "u3075",
+  "huiitosquare", "u3333",
+  "hukatakana", "u30D5",
+  "hukatakanahalfwidth", "uFF8C",
+  "hungarumlaut", "u02DD",
+  "hungarumlautcmb", "u030B",
+  "hv", "u0195",
+  "hyphen", "u002D",
+  "hyphenmonospace", "uFF0D",
+  "hyphensmall", "uFE63",
+  "hyphentwo", "u2010",
+  "i", "u0069",
+  "iacute", "u00ED",
+  "iacyrillic", "u044F",
+  "ibengali", "u0987",
+  "ibopomofo", "u3127",
+  "ibreve", "u012D",
+  "icaron", "u01D0",
+  "icircle", "u24D8",
+  "icircumflex", "u00EE",
+  "icyrillic", "u0456",
+  "idblgrave", "u0209",
+  "ideographearthcircle", "u328F",
+  "ideographfirecircle", "u328B",
+  "ideographicallianceparen", "u323F",
+  "ideographiccallparen", "u323A",
+  "ideographiccentrecircle", "u32A5",
+  "ideographicclose", "u3006",
+  "ideographiccomma", "u3001",
+  "ideographiccommaleft", "uFF64",
+  "ideographiccongratulationparen", "u3237",
+  "ideographiccorrectcircle", "u32A3",
+  "ideographicearthparen", "u322F",
+  "ideographicenterpriseparen", "u323D",
+  "ideographicexcellentcircle", "u329D",
+  "ideographicfestivalparen", "u3240",
+  "ideographicfinancialcircle", "u3296",
+  "ideographicfinancialparen", "u3236",
+  "ideographicfireparen", "u322B",
+  "ideographichaveparen", "u3232",
+  "ideographichighcircle", "u32A4",
+  "ideographiciterationmark", "u3005",
+  "ideographiclaborcircle", "u3298",
+  "ideographiclaborparen", "u3238",
+  "ideographicleftcircle", "u32A7",
+  "ideographiclowcircle", "u32A6",
+  "ideographicmedicinecircle", "u32A9",
+  "ideographicmetalparen", "u322E",
+  "ideographicmoonparen", "u322A",
+  "ideographicnameparen", "u3234",
+  "ideographicperiod", "u3002",
+  "ideographicprintcircle", "u329E",
+  "ideographicreachparen", "u3243",
+  "ideographicrepresentparen", "u3239",
+  "ideographicresourceparen", "u323E",
+  "ideographicrightcircle", "u32A8",
+  "ideographicsecretcircle", "u3299",
+  "ideographicselfparen", "u3242",
+  "ideographicsocietyparen", "u3233",
+  "ideographicspace", "u3000",
+  "ideographicspecialparen", "u3235",
+  "ideographicstockparen", "u3231",
+  "ideographicstudyparen", "u323B",
+  "ideographicsunparen", "u3230",
+  "ideographicsuperviseparen", "u323C",
+  "ideographicwaterparen", "u322C",
+  "ideographicwoodparen", "u322D",
+  "ideographiczero", "u3007",
+  "ideographmetalcircle", "u328E",
+  "ideographmooncircle", "u328A",
+  "ideographnamecircle", "u3294",
+  "ideographsuncircle", "u3290",
+  "ideographwatercircle", "u328C",
+  "ideographwoodcircle", "u328D",
+  "ideva", "u0907",
+  "idieresis", "u00EF",
+  "idieresisacute", "u1E2F",
+  "idieresiscyrillic", "u04E5",
+  "idotbelow", "u1ECB",
+  "iebrevecyrillic", "u04D7",
+  "iecyrillic", "u0435",
+  "ieungacirclekorean", "u3275",
+  "ieungaparenkorean", "u3215",
+  "ieungcirclekorean", "u3267",
+  "ieungkorean", "u3147",
+  "ieungparenkorean", "u3207",
+  "igrave", "u00EC",
+  "igujarati", "u0A87",
+  "igurmukhi", "u0A07",
+  "ihiragana", "u3044",
+  "ihookabove", "u1EC9",
+  "iibengali", "u0988",
+  "iicyrillic", "u0438",
+  "iideva", "u0908",
+  "iigujarati", "u0A88",
+  "iigurmukhi", "u0A08",
+  "iimatragurmukhi", "u0A40",
+  "iinvertedbreve", "u020B",
+  "iishortcyrillic", "u0439",
+  "iivowelsignbengali", "u09C0",
+  "iivowelsigndeva", "u0940",
+  "iivowelsigngujarati", "u0AC0",
+  "ij", "u0133",
+  "ikatakana", "u30A4",
+  "ikatakanahalfwidth", "uFF72",
+  "ikorean", "u3163",
+  "ilde", "u02DC",
+  "iluyhebrew", "u05AC",
+  "imacron", "u012B",
+  "imacroncyrillic", "u04E3",
+  "imageorapproximatelyequal", "u2253",
+  "imatragurmukhi", "u0A3F",
+  "imonospace", "uFF49",
+  "increment", "u2206",
+  "infinity", "u221E",
+  "iniarmenian", "u056B",
+  "integral", "u222B",
+  "integralbottom", "u2321",
+  "integralbt", "u2321",
+  "integraltop", "u2320",
+  "integraltp", "u2320",
+  "intersection", "u2229",
+  "intisquare", "u3305",
+  "invbullet", "u25D8",
+  "invcircle", "u25D9",
+  "invsmileface", "u263B",
+  "iocyrillic", "u0451",
+  "iogonek", "u012F",
+  "iota", "u03B9",
+  "iotadieresis", "u03CA",
+  "iotadieresistonos", "u0390",
+  "iotalatin", "u0269",
+  "iotatonos", "u03AF",
+  "iparen", "u24A4",
+  "irigurmukhi", "u0A72",
+  "ismallhiragana", "u3043",
+  "ismallkatakana", "u30A3",
+  "ismallkatakanahalfwidth", "uFF68",
+  "issharbengali", "u09FA",
+  "istroke", "u0268",
+  "iterationhiragana", "u309D",
+  "iterationkatakana", "u30FD",
+  "itilde", "u0129",
+  "itildebelow", "u1E2D",
+  "iubopomofo", "u3129",
+  "iucyrillic", "u044E",
+  "ivowelsignbengali", "u09BF",
+  "ivowelsigndeva", "u093F",
+  "ivowelsigngujarati", "u0ABF",
+  "izhitsacyrillic", "u0475",
+  "izhitsadblgravecyrillic", "u0477",
+  "j", "u006A",
+  "jaarmenian", "u0571",
+  "jabengali", "u099C",
+  "jadeva", "u091C",
+  "jagujarati", "u0A9C",
+  "jagurmukhi", "u0A1C",
+  "jbopomofo", "u3110",
+  "jcaron", "u01F0",
+  "jcircle", "u24D9",
+  "jcircumflex", "u0135",
+  "jcrossedtail", "u029D",
+  "jdotlessstroke", "u025F",
+  "jecyrillic", "u0458",
+  "jeemarabic", "u062C",
+  "jeemfinalarabic", "uFE9E",
+  "jeeminitialarabic", "uFE9F",
+  "jeemmedialarabic", "uFEA0",
+  "jeharabic", "u0698",
+  "jehfinalarabic", "uFB8B",
+  "jhabengali", "u099D",
+  "jhadeva", "u091D",
+  "jhagujarati", "u0A9D",
+  "jhagurmukhi", "u0A1D",
+  "jheharmenian", "u057B",
+  "jis", "u3004",
+  "jmonospace", "uFF4A",
+  "jparen", "u24A5",
+  "jsuperior", "u02B2",
+  "k", "u006B",
+  "kabashkircyrillic", "u04A1",
+  "kabengali", "u0995",
+  "kacute", "u1E31",
+  "kacyrillic", "u043A",
+  "kadescendercyrillic", "u049B",
+  "kadeva", "u0915",
+  "kaf", "u05DB",
+  "kafarabic", "u0643",
+  "kafdagesh", "uFB3B",
+  "kafdageshhebrew", "uFB3B",
+  "kaffinalarabic", "uFEDA",
+  "kafhebrew", "u05DB",
+  "kafinitialarabic", "uFEDB",
+  "kafmedialarabic", "uFEDC",
+  "kafrafehebrew", "uFB4D",
+  "kagujarati", "u0A95",
+  "kagurmukhi", "u0A15",
+  "kahiragana", "u304B",
+  "kahookcyrillic", "u04C4",
+  "kakatakana", "u30AB",
+  "kakatakanahalfwidth", "uFF76",
+  "kappa", "u03BA",
+  "kappasymbolgreek", "u03F0",
+  "kapyeounmieumkorean", "u3171",
+  "kapyeounphieuphkorean", "u3184",
+  "kapyeounpieupkorean", "u3178",
+  "kapyeounssangpieupkorean", "u3179",
+  "karoriisquare", "u330D",
+  "kashidaautoarabic", "u0640",
+  "kashidaautonosidebearingarabic", "u0640",
+  "kasmallkatakana", "u30F5",
+  "kasquare", "u3384",
+  "kasraarabic", "u0650",
+  "kasratanarabic", "u064D",
+  "kastrokecyrillic", "u049F",
+  "katahiraprolongmarkhalfwidth", "uFF70",
+  "kaverticalstrokecyrillic", "u049D",
+  "kbopomofo", "u310E",
+  "kcalsquare", "u3389",
+  "kcaron", "u01E9",
+  "kcedilla", "u0137",
+  "kcircle", "u24DA",
+  "kcommaaccent", "u0137",
+  "kdotbelow", "u1E33",
+  "keharmenian", "u0584",
+  "kehiragana", "u3051",
+  "kekatakana", "u30B1",
+  "kekatakanahalfwidth", "uFF79",
+  "kenarmenian", "u056F",
+  "kesmallkatakana", "u30F6",
+  "kgreenlandic", "u0138",
+  "khabengali", "u0996",
+  "khacyrillic", "u0445",
+  "khadeva", "u0916",
+  "khagujarati", "u0A96",
+  "khagurmukhi", "u0A16",
+  "khaharabic", "u062E",
+  "khahfinalarabic", "uFEA6",
+  "khahinitialarabic", "uFEA7",
+  "khahmedialarabic", "uFEA8",
+  "kheicoptic", "u03E7",
+  "khhadeva", "u0959",
+  "khhagurmukhi", "u0A59",
+  "khieukhacirclekorean", "u3278",
+  "khieukhaparenkorean", "u3218",
+  "khieukhcirclekorean", "u326A",
+  "khieukhkorean", "u314B",
+  "khieukhparenkorean", "u320A",
+  "khokhaithai", "u0E02",
+  "khokhonthai", "u0E05",
+  "khokhuatthai", "u0E03",
+  "khokhwaithai", "u0E04",
+  "khomutthai", "u0E5B",
+  "khook", "u0199",
+  "khorakhangthai", "u0E06",
+  "khzsquare", "u3391",
+  "kihiragana", "u304D",
+  "kikatakana", "u30AD",
+  "kikatakanahalfwidth", "uFF77",
+  "kiroguramusquare", "u3315",
+  "kiromeetorusquare", "u3316",
+  "kirosquare", "u3314",
+  "kiyeokacirclekorean", "u326E",
+  "kiyeokaparenkorean", "u320E",
+  "kiyeokcirclekorean", "u3260",
+  "kiyeokkorean", "u3131",
+  "kiyeokparenkorean", "u3200",
+  "kiyeoksioskorean", "u3133",
+  "kjecyrillic", "u045C",
+  "klinebelow", "u1E35",
+  "klsquare", "u3398",
+  "kmcubedsquare", "u33A6",
+  "kmonospace", "uFF4B",
+  "kmsquaredsquare", "u33A2",
+  "kohiragana", "u3053",
+  "kohmsquare", "u33C0",
+  "kokaithai", "u0E01",
+  "kokatakana", "u30B3",
+  "kokatakanahalfwidth", "uFF7A",
+  "kooposquare", "u331E",
+  "koppacyrillic", "u0481",
+  "koreanstandardsymbol", "u327F",
+  "koroniscmb", "u0343",
+  "kparen", "u24A6",
+  "kpasquare", "u33AA",
+  "ksicyrillic", "u046F",
+  "ktsquare", "u33CF",
+  "kturned", "u029E",
+  "kuhiragana", "u304F",
+  "kukatakana", "u30AF",
+  "kukatakanahalfwidth", "uFF78",
+  "kvsquare", "u33B8",
+  "kwsquare", "u33BE",
+  "l", "u006C",
+  "labengali", "u09B2",
+  "lacute", "u013A",
+  "ladeva", "u0932",
+  "lagujarati", "u0AB2",
+  "lagurmukhi", "u0A32",
+  "lakkhangyaothai", "u0E45",
+  "lamaleffinalarabic", "uFEFC",
+  "lamalefhamzaabovefinalarabic", "uFEF8",
+  "lamalefhamzaaboveisolatedarabic", "uFEF7",
+  "lamalefhamzabelowfinalarabic", "uFEFA",
+  "lamalefhamzabelowisolatedarabic", "uFEF9",
+  "lamalefisolatedarabic", "uFEFB",
+  "lamalefmaddaabovefinalarabic", "uFEF6",
+  "lamalefmaddaaboveisolatedarabic", "uFEF5",
+  "lamarabic", "u0644",
+  "lambda", "u03BB",
+  "lambdastroke", "u019B",
+  "lamed", "u05DC",
+  "lameddagesh", "uFB3C",
+  "lameddageshhebrew", "uFB3C",
+  "lamedhebrew", "u05DC",
+  "lamedholam", "u05DC_05B9",
+  "lamedholamdagesh", "u05DC_05B9_05BC",
+  "lamedholamdageshhebrew", "u05DC_05B9_05BC",
+  "lamedholamhebrew", "u05DC_05B9",
+  "lamfinalarabic", "uFEDE",
+  "lamhahinitialarabic", "uFCCA",
+  "laminitialarabic", "uFEDF",
+  "lamjeeminitialarabic", "uFCC9",
+  "lamkhahinitialarabic", "uFCCB",
+  "lamlamhehisolatedarabic", "uFDF2",
+  "lammedialarabic", "uFEE0",
+  "lammeemhahinitialarabic", "uFD88",
+  "lammeeminitialarabic", "uFCCC",
+  "lammeemjeeminitialarabic", "uFEDF_FEE4_FEA0",
+  "lammeemkhahinitialarabic", "uFEDF_FEE4_FEA8",
+  "largecircle", "u25EF",
+  "lbar", "u019A",
+  "lbelt", "u026C",
+  "lbopomofo", "u310C",
+  "lcaron", "u013E",
+  "lcedilla", "u013C",
+  "lcircle", "u24DB",
+  "lcircumflexbelow", "u1E3D",
+  "lcommaaccent", "u013C",
+  "ldot", "u0140",
+  "ldotaccent", "u0140",
+  "ldotbelow", "u1E37",
+  "ldotbelowmacron", "u1E39",
+  "leftangleabovecmb", "u031A",
+  "lefttackbelowcmb", "u0318",
+  "less", "u003C",
+  "lessequal", "u2264",
+  "lessequalorgreater", "u22DA",
+  "lessmonospace", "uFF1C",
+  "lessorequivalent", "u2272",
+  "lessorgreater", "u2276",
+  "lessoverequal", "u2266",
+  "lesssmall", "uFE64",
+  "lezh", "u026E",
+  "lfblock", "u258C",
+  "lhookretroflex", "u026D",
+  "lira", "u20A4",
+  "liwnarmenian", "u056C",
+  "lj", "u01C9",
+  "ljecyrillic", "u0459",
+  "lladeva", "u0933",
+  "llagujarati", "u0AB3",
+  "llinebelow", "u1E3B",
+  "llladeva", "u0934",
+  "llvocalicbengali", "u09E1",
+  "llvocalicdeva", "u0961",
+  "llvocalicvowelsignbengali", "u09E3",
+  "llvocalicvowelsigndeva", "u0963",
+  "lmiddletilde", "u026B",
+  "lmonospace", "uFF4C",
+  "lmsquare", "u33D0",
+  "lochulathai", "u0E2C",
+  "logicaland", "u2227",
+  "logicalnot", "u00AC",
+  "logicalnotreversed", "u2310",
+  "logicalor", "u2228",
+  "lolingthai", "u0E25",
+  "longs", "u017F",
+  "lowlinecenterline", "uFE4E",
+  "lowlinecmb", "u0332",
+  "lowlinedashed", "uFE4D",
+  "lozenge", "u25CA",
+  "lparen", "u24A7",
+  "lslash", "u0142",
+  "lsquare", "u2113",
+  "ltshade", "u2591",
+  "luthai", "u0E26",
+  "lvocalicbengali", "u098C",
+  "lvocalicdeva", "u090C",
+  "lvocalicvowelsignbengali", "u09E2",
+  "lvocalicvowelsigndeva", "u0962",
+  "lxsquare", "u33D3",
+  "m", "u006D",
+  "mabengali", "u09AE",
+  "macron", "u00AF",
+  "macronbelowcmb", "u0331",
+  "macroncmb", "u0304",
+  "macronlowmod", "u02CD",
+  "macronmonospace", "uFFE3",
+  "macute", "u1E3F",
+  "madeva", "u092E",
+  "magujarati", "u0AAE",
+  "magurmukhi", "u0A2E",
+  "mahapakhhebrew", "u05A4",
+  "mahapakhlefthebrew", "u05A4",
+  "mahiragana", "u307E",
+  "maichattawathai", "u0E4B",
+  "maiekthai", "u0E48",
+  "maihanakatthai", "u0E31",
+  "maitaikhuthai", "u0E47",
+  "maithothai", "u0E49",
+  "maitrithai", "u0E4A",
+  "maiyamokthai", "u0E46",
+  "makatakana", "u30DE",
+  "makatakanahalfwidth", "uFF8F",
+  "male", "u2642",
+  "mansyonsquare", "u3347",
+  "maqafhebrew", "u05BE",
+  "mars", "u2642",
+  "masoracirclehebrew", "u05AF",
+  "masquare", "u3383",
+  "mbopomofo", "u3107",
+  "mbsquare", "u33D4",
+  "mcircle", "u24DC",
+  "mcubedsquare", "u33A5",
+  "mdotaccent", "u1E41",
+  "mdotbelow", "u1E43",
+  "meemarabic", "u0645",
+  "meemfinalarabic", "uFEE2",
+  "meeminitialarabic", "uFEE3",
+  "meemmedialarabic", "uFEE4",
+  "meemmeeminitialarabic", "uFCD1",
+  "meemmeemisolatedarabic", "uFC48",
+  "meetorusquare", "u334D",
+  "mehiragana", "u3081",
+  "meizierasquare", "u337E",
+  "mekatakana", "u30E1",
+  "mekatakanahalfwidth", "uFF92",
+  "mem", "u05DE",
+  "memdagesh", "uFB3E",
+  "memdageshhebrew", "uFB3E",
+  "memhebrew", "u05DE",
+  "menarmenian", "u0574",
+  "merkhahebrew", "u05A5",
+  "merkhakefulahebrew", "u05A6",
+  "merkhakefulalefthebrew", "u05A6",
+  "merkhalefthebrew", "u05A5",
+  "mhook", "u0271",
+  "mhzsquare", "u3392",
+  "middledotkatakanahalfwidth", "uFF65",
+  "middot", "u00B7",
+  "mieumacirclekorean", "u3272",
+  "mieumaparenkorean", "u3212",
+  "mieumcirclekorean", "u3264",
+  "mieumkorean", "u3141",
+  "mieumpansioskorean", "u3170",
+  "mieumparenkorean", "u3204",
+  "mieumpieupkorean", "u316E",
+  "mieumsioskorean", "u316F",
+  "mihiragana", "u307F",
+  "mikatakana", "u30DF",
+  "mikatakanahalfwidth", "uFF90",
+  "minus", "u2212",
+  "minusbelowcmb", "u0320",
+  "minuscircle", "u2296",
+  "minusmod", "u02D7",
+  "minusplus", "u2213",
+  "minute", "u2032",
+  "miribaarusquare", "u334A",
+  "mirisquare", "u3349",
+  "mlonglegturned", "u0270",
+  "mlsquare", "u3396",
+  "mmcubedsquare", "u33A3",
+  "mmonospace", "uFF4D",
+  "mmsquaredsquare", "u339F",
+  "mohiragana", "u3082",
+  "mohmsquare", "u33C1",
+  "mokatakana", "u30E2",
+  "mokatakanahalfwidth", "uFF93",
+  "molsquare", "u33D6",
+  "momathai", "u0E21",
+  "moverssquare", "u33A7",
+  "moverssquaredsquare", "u33A8",
+  "mparen", "u24A8",
+  "mpasquare", "u33AB",
+  "mssquare", "u33B3",
+  "mturned", "u026F",
+  "mu", "u00B5",
+  "mu1", "u00B5",
+  "muasquare", "u3382",
+  "muchgreater", "u226B",
+  "muchless", "u226A",
+  "mufsquare", "u338C",
+  "mugreek", "u03BC",
+  "mugsquare", "u338D",
+  "muhiragana", "u3080",
+  "mukatakana", "u30E0",
+  "mukatakanahalfwidth", "uFF91",
+  "mulsquare", "u3395",
+  "multiply", "u00D7",
+  "mumsquare", "u339B",
+  "munahhebrew", "u05A3",
+  "munahlefthebrew", "u05A3",
+  "musicalnote", "u266A",
+  "musicalnotedbl", "u266B",
+  "musicflatsign", "u266D",
+  "musicsharpsign", "u266F",
+  "mussquare", "u33B2",
+  "muvsquare", "u33B6",
+  "muwsquare", "u33BC",
+  "mvmegasquare", "u33B9",
+  "mvsquare", "u33B7",
+  "mwmegasquare", "u33BF",
+  "mwsquare", "u33BD",
+  "n", "u006E",
+  "nabengali", "u09A8",
+  "nabla", "u2207",
+  "nacute", "u0144",
+  "nadeva", "u0928",
+  "nagujarati", "u0AA8",
+  "nagurmukhi", "u0A28",
+  "nahiragana", "u306A",
+  "nakatakana", "u30CA",
+  "nakatakanahalfwidth", "uFF85",
+  "napostrophe", "u0149",
+  "nasquare", "u3381",
+  "nbopomofo", "u310B",
+  "nbspace", "u00A0",
+  "ncaron", "u0148",
+  "ncedilla", "u0146",
+  "ncircle", "u24DD",
+  "ncircumflexbelow", "u1E4B",
+  "ncommaaccent", "u0146",
+  "ndotaccent", "u1E45",
+  "ndotbelow", "u1E47",
+  "nehiragana", "u306D",
+  "nekatakana", "u30CD",
+  "nekatakanahalfwidth", "uFF88",
+  "newsheqelsign", "u20AA",
+  "nfsquare", "u338B",
+  "ngabengali", "u0999",
+  "ngadeva", "u0919",
+  "ngagujarati", "u0A99",
+  "ngagurmukhi", "u0A19",
+  "ngonguthai", "u0E07",
+  "nhiragana", "u3093",
+  "nhookleft", "u0272",
+  "nhookretroflex", "u0273",
+  "nieunacirclekorean", "u326F",
+  "nieunaparenkorean", "u320F",
+  "nieuncieuckorean", "u3135",
+  "nieuncirclekorean", "u3261",
+  "nieunhieuhkorean", "u3136",
+  "nieunkorean", "u3134",
+  "nieunpansioskorean", "u3168",
+  "nieunparenkorean", "u3201",
+  "nieunsioskorean", "u3167",
+  "nieuntikeutkorean", "u3166",
+  "nihiragana", "u306B",
+  "nikatakana", "u30CB",
+  "nikatakanahalfwidth", "uFF86",
+  "nikhahitthai", "u0E4D",
+  "nine", "u0039",
+  "ninearabic", "u0669",
+  "ninebengali", "u09EF",
+  "ninecircle", "u2468",
+  "ninecircleinversesansserif", "u2792",
+  "ninedeva", "u096F",
+  "ninegujarati", "u0AEF",
+  "ninegurmukhi", "u0A6F",
+  "ninehackarabic", "u0669",
+  "ninehangzhou", "u3029",
+  "nineideographicparen", "u3228",
+  "nineinferior", "u2089",
+  "ninemonospace", "uFF19",
+  "nineparen", "u247C",
+  "nineperiod", "u2490",
+  "ninepersian", "u06F9",
+  "nineroman", "u2178",
+  "ninesuperior", "u2079",
+  "nineteencircle", "u2472",
+  "nineteenparen", "u2486",
+  "nineteenperiod", "u249A",
+  "ninethai", "u0E59",
+  "nj", "u01CC",
+  "njecyrillic", "u045A",
+  "nkatakana", "u30F3",
+  "nkatakanahalfwidth", "uFF9D",
+  "nlegrightlong", "u019E",
+  "nlinebelow", "u1E49",
+  "nmonospace", "uFF4E",
+  "nmsquare", "u339A",
+  "nnabengali", "u09A3",
+  "nnadeva", "u0923",
+  "nnagujarati", "u0AA3",
+  "nnagurmukhi", "u0A23",
+  "nnnadeva", "u0929",
+  "nohiragana", "u306E",
+  "nokatakana", "u30CE",
+  "nokatakanahalfwidth", "uFF89",
+  "nonbreakingspace", "u00A0",
+  "nonenthai", "u0E13",
+  "nonuthai", "u0E19",
+  "noonarabic", "u0646",
+  "noonfinalarabic", "uFEE6",
+  "noonghunnaarabic", "u06BA",
+  "noonghunnafinalarabic", "uFB9F",
+  "noonhehinitialarabic", "uFEE7_FEEC",
+  "nooninitialarabic", "uFEE7",
+  "noonjeeminitialarabic", "uFCD2",
+  "noonjeemisolatedarabic", "uFC4B",
+  "noonmedialarabic", "uFEE8",
+  "noonmeeminitialarabic", "uFCD5",
+  "noonmeemisolatedarabic", "uFC4E",
+  "noonnoonfinalarabic", "uFC8D",
+  "notcontains", "u220C",
+  "notelement", "u2209",
+  "notelementof", "u2209",
+  "notequal", "u2260",
+  "notgreater", "u226F",
+  "notgreaternorequal", "u2271",
+  "notgreaternorless", "u2279",
+  "notidentical", "u2262",
+  "notless", "u226E",
+  "notlessnorequal", "u2270",
+  "notparallel", "u2226",
+  "notprecedes", "u2280",
+  "notsubset", "u2284",
+  "notsucceeds", "u2281",
+  "notsuperset", "u2285",
+  "nowarmenian", "u0576",
+  "nparen", "u24A9",
+  "nssquare", "u33B1",
+  "nsuperior", "u207F",
+  "ntilde", "u00F1",
+  "nu", "u03BD",
+  "nuhiragana", "u306C",
+  "nukatakana", "u30CC",
+  "nukatakanahalfwidth", "uFF87",
+  "nuktabengali", "u09BC",
+  "nuktadeva", "u093C",
+  "nuktagujarati", "u0ABC",
+  "nuktagurmukhi", "u0A3C",
+  "numbersign", "u0023",
+  "numbersignmonospace", "uFF03",
+  "numbersignsmall", "uFE5F",
+  "numeralsigngreek", "u0374",
+  "numeralsignlowergreek", "u0375",
+  "numero", "u2116",
+  "nun", "u05E0",
+  "nundagesh", "uFB40",
+  "nundageshhebrew", "uFB40",
+  "nunhebrew", "u05E0",
+  "nvsquare", "u33B5",
+  "nwsquare", "u33BB",
+  "nyabengali", "u099E",
+  "nyadeva", "u091E",
+  "nyagujarati", "u0A9E",
+  "nyagurmukhi", "u0A1E",
+  "o", "u006F",
+  "oacute", "u00F3",
+  "oangthai", "u0E2D",
+  "obarred", "u0275",
+  "obarredcyrillic", "u04E9",
+  "obarreddieresiscyrillic", "u04EB",
+  "obengali", "u0993",
+  "obopomofo", "u311B",
+  "obreve", "u014F",
+  "ocandradeva", "u0911",
+  "ocandragujarati", "u0A91",
+  "ocandravowelsigndeva", "u0949",
+  "ocandravowelsigngujarati", "u0AC9",
+  "ocaron", "u01D2",
+  "ocircle", "u24DE",
+  "ocircumflex", "u00F4",
+  "ocircumflexacute", "u1ED1",
+  "ocircumflexdotbelow", "u1ED9",
+  "ocircumflexgrave", "u1ED3",
+  "ocircumflexhookabove", "u1ED5",
+  "ocircumflextilde", "u1ED7",
+  "ocyrillic", "u043E",
+  "odblacute", "u0151",
+  "odblgrave", "u020D",
+  "odeva", "u0913",
+  "odieresis", "u00F6",
+  "odieresiscyrillic", "u04E7",
+  "odotbelow", "u1ECD",
+  "oe", "u0153",
+  "oekorean", "u315A",
+  "ogonek", "u02DB",
+  "ogonekcmb", "u0328",
+  "ograve", "u00F2",
+  "ogujarati", "u0A93",
+  "oharmenian", "u0585",
+  "ohiragana", "u304A",
+  "ohookabove", "u1ECF",
+  "ohorn", "u01A1",
+  "ohornacute", "u1EDB",
+  "ohorndotbelow", "u1EE3",
+  "ohorngrave", "u1EDD",
+  "ohornhookabove", "u1EDF",
+  "ohorntilde", "u1EE1",
+  "ohungarumlaut", "u0151",
+  "oi", "u01A3",
+  "oinvertedbreve", "u020F",
+  "okatakana", "u30AA",
+  "okatakanahalfwidth", "uFF75",
+  "okorean", "u3157",
+  "olehebrew", "u05AB",
+  "omacron", "u014D",
+  "omacronacute", "u1E53",
+  "omacrongrave", "u1E51",
+  "omdeva", "u0950",
+  "omega", "u03C9",
+  "omega1", "u03D6",
+  "omegacyrillic", "u0461",
+  "omegalatinclosed", "u0277",
+  "omegaroundcyrillic", "u047B",
+  "omegatitlocyrillic", "u047D",
+  "omegatonos", "u03CE",
+  "omgujarati", "u0AD0",
+  "omicron", "u03BF",
+  "omicrontonos", "u03CC",
+  "omonospace", "uFF4F",
+  "one", "u0031",
+  "onearabic", "u0661",
+  "onebengali", "u09E7",
+  "onecircle", "u2460",
+  "onecircleinversesansserif", "u278A",
+  "onedeva", "u0967",
+  "onedotenleader", "u2024",
+  "oneeighth", "u215B",
+  "onegujarati", "u0AE7",
+  "onegurmukhi", "u0A67",
+  "onehackarabic", "u0661",
+  "onehalf", "u00BD",
+  "onehangzhou", "u3021",
+  "oneideographicparen", "u3220",
+  "oneinferior", "u2081",
+  "onemonospace", "uFF11",
+  "onenumeratorbengali", "u09F4",
+  "oneparen", "u2474",
+  "oneperiod", "u2488",
+  "onepersian", "u06F1",
+  "onequarter", "u00BC",
+  "oneroman", "u2170",
+  "onesuperior", "u00B9",
+  "onethai", "u0E51",
+  "onethird", "u2153",
+  "oogonek", "u01EB",
+  "oogonekmacron", "u01ED",
+  "oogurmukhi", "u0A13",
+  "oomatragurmukhi", "u0A4B",
+  "oopen", "u0254",
+  "oparen", "u24AA",
+  "openbullet", "u25E6",
+  "option", "u2325",
+  "ordfeminine", "u00AA",
+  "ordmasculine", "u00BA",
+  "orthogonal", "u221F",
+  "oshortdeva", "u0912",
+  "oshortvowelsigndeva", "u094A",
+  "oslash", "u00F8",
+  "oslashacute", "u01FF",
+  "osmallhiragana", "u3049",
+  "osmallkatakana", "u30A9",
+  "osmallkatakanahalfwidth", "uFF6B",
+  "ostrokeacute", "u01FF",
+  "otcyrillic", "u047F",
+  "otilde", "u00F5",
+  "otildeacute", "u1E4D",
+  "otildedieresis", "u1E4F",
+  "oubopomofo", "u3121",
+  "overline", "u203E",
+  "overlinecenterline", "uFE4A",
+  "overlinecmb", "u0305",
+  "overlinedashed", "uFE49",
+  "overlinedblwavy", "uFE4C",
+  "overlinewavy", "uFE4B",
+  "overscore", "u00AF",
+  "ovowelsignbengali", "u09CB",
+  "ovowelsigndeva", "u094B",
+  "ovowelsigngujarati", "u0ACB",
+  "p", "u0070",
+  "paampssquare", "u3380",
+  "paasentosquare", "u332B",
+  "pabengali", "u09AA",
+  "pacute", "u1E55",
+  "padeva", "u092A",
+  "pagedown", "u21DF",
+  "pageup", "u21DE",
+  "pagujarati", "u0AAA",
+  "pagurmukhi", "u0A2A",
+  "pahiragana", "u3071",
+  "paiyannoithai", "u0E2F",
+  "pakatakana", "u30D1",
+  "palatalizationcyrilliccmb", "u0484",
+  "palochkacyrillic", "u04C0",
+  "pansioskorean", "u317F",
+  "paragraph", "u00B6",
+  "parallel", "u2225",
+  "parenleft", "u0028",
+  "parenleftaltonearabic", "uFD3E",
+  "parenleftinferior", "u208D",
+  "parenleftmonospace", "uFF08",
+  "parenleftsmall", "uFE59",
+  "parenleftsuperior", "u207D",
+  "parenleftvertical", "uFE35",
+  "parenright", "u0029",
+  "parenrightaltonearabic", "uFD3F",
+  "parenrightinferior", "u208E",
+  "parenrightmonospace", "uFF09",
+  "parenrightsmall", "uFE5A",
+  "parenrightsuperior", "u207E",
+  "parenrightvertical", "uFE36",
+  "partialdiff", "u2202",
+  "paseqhebrew", "u05C0",
+  "pashtahebrew", "u0599",
+  "pasquare", "u33A9",
+  "patah", "u05B7",
+  "patah11", "u05B7",
+  "patah1d", "u05B7",
+  "patah2a", "u05B7",
+  "patahhebrew", "u05B7",
+  "patahnarrowhebrew", "u05B7",
+  "patahquarterhebrew", "u05B7",
+  "patahwidehebrew", "u05B7",
+  "pazerhebrew", "u05A1",
+  "pbopomofo", "u3106",
+  "pcircle", "u24DF",
+  "pdotaccent", "u1E57",
+  "pe", "u05E4",
+  "pecyrillic", "u043F",
+  "pedagesh", "uFB44",
+  "pedageshhebrew", "uFB44",
+  "peezisquare", "u333B",
+  "pefinaldageshhebrew", "uFB43",
+  "peharabic", "u067E",
+  "peharmenian", "u057A",
+  "pehebrew", "u05E4",
+  "pehfinalarabic", "uFB57",
+  "pehinitialarabic", "uFB58",
+  "pehiragana", "u307A",
+  "pehmedialarabic", "uFB59",
+  "pekatakana", "u30DA",
+  "pemiddlehookcyrillic", "u04A7",
+  "perafehebrew", "uFB4E",
+  "percent", "u0025",
+  "percentarabic", "u066A",
+  "percentmonospace", "uFF05",
+  "percentsmall", "uFE6A",
+  "period", "u002E",
+  "periodarmenian", "u0589",
+  "periodcentered", "u00B7",
+  "periodhalfwidth", "uFF61",
+  "periodmonospace", "uFF0E",
+  "periodsmall", "uFE52",
+  "perispomenigreekcmb", "u0342",
+  "perpendicular", "u22A5",
+  "perthousand", "u2030",
+  "peseta", "u20A7",
+  "pfsquare", "u338A",
+  "phabengali", "u09AB",
+  "phadeva", "u092B",
+  "phagujarati", "u0AAB",
+  "phagurmukhi", "u0A2B",
+  "phi", "u03C6",
+  "phi1", "u03D5",
+  "phieuphacirclekorean", "u327A",
+  "phieuphaparenkorean", "u321A",
+  "phieuphcirclekorean", "u326C",
+  "phieuphkorean", "u314D",
+  "phieuphparenkorean", "u320C",
+  "philatin", "u0278",
+  "phinthuthai", "u0E3A",
+  "phisymbolgreek", "u03D5",
+  "phook", "u01A5",
+  "phophanthai", "u0E1E",
+  "phophungthai", "u0E1C",
+  "phosamphaothai", "u0E20",
+  "pi", "u03C0",
+  "pieupacirclekorean", "u3273",
+  "pieupaparenkorean", "u3213",
+  "pieupcieuckorean", "u3176",
+  "pieupcirclekorean", "u3265",
+  "pieupkiyeokkorean", "u3172",
+  "pieupkorean", "u3142",
+  "pieupparenkorean", "u3205",
+  "pieupsioskiyeokkorean", "u3174",
+  "pieupsioskorean", "u3144",
+  "pieupsiostikeutkorean", "u3175",
+  "pieupthieuthkorean", "u3177",
+  "pieuptikeutkorean", "u3173",
+  "pihiragana", "u3074",
+  "pikatakana", "u30D4",
+  "pisymbolgreek", "u03D6",
+  "piwrarmenian", "u0583",
+  "plus", "u002B",
+  "plusbelowcmb", "u031F",
+  "pluscircle", "u2295",
+  "plusminus", "u00B1",
+  "plusmod", "u02D6",
+  "plusmonospace", "uFF0B",
+  "plussmall", "uFE62",
+  "plussuperior", "u207A",
+  "pmonospace", "uFF50",
+  "pmsquare", "u33D8",
+  "pohiragana", "u307D",
+  "pointingindexdownwhite", "u261F",
+  "pointingindexleftwhite", "u261C",
+  "pointingindexrightwhite", "u261E",
+  "pointingindexupwhite", "u261D",
+  "pokatakana", "u30DD",
+  "poplathai", "u0E1B",
+  "postalmark", "u3012",
+  "postalmarkface", "u3020",
+  "pparen", "u24AB",
+  "precedes", "u227A",
+  "prescription", "u211E",
+  "primemod", "u02B9",
+  "primereversed", "u2035",
+  "product", "u220F",
+  "projective", "u2305",
+  "prolongedkana", "u30FC",
+  "propellor", "u2318",
+  "propersubset", "u2282",
+  "propersuperset", "u2283",
+  "proportion", "u2237",
+  "proportional", "u221D",
+  "psi", "u03C8",
+  "psicyrillic", "u0471",
+  "psilipneumatacyrilliccmb", "u0486",
+  "pssquare", "u33B0",
+  "puhiragana", "u3077",
+  "pukatakana", "u30D7",
+  "pvsquare", "u33B4",
+  "pwsquare", "u33BA",
+  "q", "u0071",
+  "qadeva", "u0958",
+  "qadmahebrew", "u05A8",
+  "qafarabic", "u0642",
+  "qaffinalarabic", "uFED6",
+  "qafinitialarabic", "uFED7",
+  "qafmedialarabic", "uFED8",
+  "qamats", "u05B8",
+  "qamats10", "u05B8",
+  "qamats1a", "u05B8",
+  "qamats1c", "u05B8",
+  "qamats27", "u05B8",
+  "qamats29", "u05B8",
+  "qamats33", "u05B8",
+  "qamatsde", "u05B8",
+  "qamatshebrew", "u05B8",
+  "qamatsnarrowhebrew", "u05B8",
+  "qamatsqatanhebrew", "u05B8",
+  "qamatsqatannarrowhebrew", "u05B8",
+  "qamatsqatanquarterhebrew", "u05B8",
+  "qamatsqatanwidehebrew", "u05B8",
+  "qamatsquarterhebrew", "u05B8",
+  "qamatswidehebrew", "u05B8",
+  "qarneyparahebrew", "u059F",
+  "qbopomofo", "u3111",
+  "qcircle", "u24E0",
+  "qhook", "u02A0",
+  "qmonospace", "uFF51",
+  "qof", "u05E7",
+  "qofdagesh", "uFB47",
+  "qofdageshhebrew", "uFB47",
+  "qofhatafpatah", "u05E7_05B2",
+  "qofhatafpatahhebrew", "u05E7_05B2",
+  "qofhatafsegol", "u05E7_05B1",
+  "qofhatafsegolhebrew", "u05E7_05B1",
+  "qofhebrew", "u05E7",
+  "qofhiriq", "u05E7_05B4",
+  "qofhiriqhebrew", "u05E7_05B4",
+  "qofholam", "u05E7_05B9",
+  "qofholamhebrew", "u05E7_05B9",
+  "qofpatah", "u05E7_05B7",
+  "qofpatahhebrew", "u05E7_05B7",
+  "qofqamats", "u05E7_05B8",
+  "qofqamatshebrew", "u05E7_05B8",
+  "qofqubuts", "u05E7_05BB",
+  "qofqubutshebrew", "u05E7_05BB",
+  "qofsegol", "u05E7_05B6",
+  "qofsegolhebrew", "u05E7_05B6",
+  "qofsheva", "u05E7_05B0",
+  "qofshevahebrew", "u05E7_05B0",
+  "qoftsere", "u05E7_05B5",
+  "qoftserehebrew", "u05E7_05B5",
+  "qparen", "u24AC",
+  "quarternote", "u2669",
+  "qubuts", "u05BB",
+  "qubuts18", "u05BB",
+  "qubuts25", "u05BB",
+  "qubuts31", "u05BB",
+  "qubutshebrew", "u05BB",
+  "qubutsnarrowhebrew", "u05BB",
+  "qubutsquarterhebrew", "u05BB",
+  "qubutswidehebrew", "u05BB",
+  "question", "u003F",
+  "questionarabic", "u061F",
+  "questionarmenian", "u055E",
+  "questiondown", "u00BF",
+  "questiongreek", "u037E",
+  "questionmonospace", "uFF1F",
+  "quotedbl", "u0022",
+  "quotedblbase", "u201E",
+  "quotedblleft", "u201C",
+  "quotedblmonospace", "uFF02",
+  "quotedblprime", "u301E",
+  "quotedblprimereversed", "u301D",
+  "quotedblright", "u201D",
+  "quoteleft", "u2018",
+  "quoteleftreversed", "u201B",
+  "quotereversed", "u201B",
+  "quoteright", "u2019",
+  "quoterightn", "u0149",
+  "quotesinglbase", "u201A",
+  "quotesingle", "u0027",
+  "quotesinglemonospace", "uFF07",
+  "r", "u0072",
+  "raarmenian", "u057C",
+  "rabengali", "u09B0",
+  "racute", "u0155",
+  "radeva", "u0930",
+  "radical", "u221A",
+  "radoverssquare", "u33AE",
+  "radoverssquaredsquare", "u33AF",
+  "radsquare", "u33AD",
+  "rafe", "u05BF",
+  "rafehebrew", "u05BF",
+  "ragujarati", "u0AB0",
+  "ragurmukhi", "u0A30",
+  "rahiragana", "u3089",
+  "rakatakana", "u30E9",
+  "rakatakanahalfwidth", "uFF97",
+  "ralowerdiagonalbengali", "u09F1",
+  "ramiddlediagonalbengali", "u09F0",
+  "ramshorn", "u0264",
+  "ratio", "u2236",
+  "rbopomofo", "u3116",
+  "rcaron", "u0159",
+  "rcedilla", "u0157",
+  "rcircle", "u24E1",
+  "rcommaaccent", "u0157",
+  "rdblgrave", "u0211",
+  "rdotaccent", "u1E59",
+  "rdotbelow", "u1E5B",
+  "rdotbelowmacron", "u1E5D",
+  "referencemark", "u203B",
+  "reflexsubset", "u2286",
+  "reflexsuperset", "u2287",
+  "registered", "u00AE",
+  "reharabic", "u0631",
+  "reharmenian", "u0580",
+  "rehfinalarabic", "uFEAE",
+  "rehiragana", "u308C",
+  "rehyehaleflamarabic", "u0631_FEF3_FE8E_0644",
+  "rekatakana", "u30EC",
+  "rekatakanahalfwidth", "uFF9A",
+  "resh", "u05E8",
+  "reshdageshhebrew", "uFB48",
+  "reshhatafpatah", "u05E8_05B2",
+  "reshhatafpatahhebrew", "u05E8_05B2",
+  "reshhatafsegol", "u05E8_05B1",
+  "reshhatafsegolhebrew", "u05E8_05B1",
+  "reshhebrew", "u05E8",
+  "reshhiriq", "u05E8_05B4",
+  "reshhiriqhebrew", "u05E8_05B4",
+  "reshholam", "u05E8_05B9",
+  "reshholamhebrew", "u05E8_05B9",
+  "reshpatah", "u05E8_05B7",
+  "reshpatahhebrew", "u05E8_05B7",
+  "reshqamats", "u05E8_05B8",
+  "reshqamatshebrew", "u05E8_05B8",
+  "reshqubuts", "u05E8_05BB",
+  "reshqubutshebrew", "u05E8_05BB",
+  "reshsegol", "u05E8_05B6",
+  "reshsegolhebrew", "u05E8_05B6",
+  "reshsheva", "u05E8_05B0",
+  "reshshevahebrew", "u05E8_05B0",
+  "reshtsere", "u05E8_05B5",
+  "reshtserehebrew", "u05E8_05B5",
+  "reversedtilde", "u223D",
+  "reviahebrew", "u0597",
+  "reviamugrashhebrew", "u0597",
+  "revlogicalnot", "u2310",
+  "rfishhook", "u027E",
+  "rfishhookreversed", "u027F",
+  "rhabengali", "u09DD",
+  "rhadeva", "u095D",
+  "rho", "u03C1",
+  "rhook", "u027D",
+  "rhookturned", "u027B",
+  "rhookturnedsuperior", "u02B5",
+  "rhosymbolgreek", "u03F1",
+  "rhotichookmod", "u02DE",
+  "rieulacirclekorean", "u3271",
+  "rieulaparenkorean", "u3211",
+  "rieulcirclekorean", "u3263",
+  "rieulhieuhkorean", "u3140",
+  "rieulkiyeokkorean", "u313A",
+  "rieulkiyeoksioskorean", "u3169",
+  "rieulkorean", "u3139",
+  "rieulmieumkorean", "u313B",
+  "rieulpansioskorean", "u316C",
+  "rieulparenkorean", "u3203",
+  "rieulphieuphkorean", "u313F",
+  "rieulpieupkorean", "u313C",
+  "rieulpieupsioskorean", "u316B",
+  "rieulsioskorean", "u313D",
+  "rieulthieuthkorean", "u313E",
+  "rieultikeutkorean", "u316A",
+  "rieulyeorinhieuhkorean", "u316D",
+  "rightangle", "u221F",
+  "righttackbelowcmb", "u0319",
+  "righttriangle", "u22BF",
+  "rihiragana", "u308A",
+  "rikatakana", "u30EA",
+  "rikatakanahalfwidth", "uFF98",
+  "ring", "u02DA",
+  "ringbelowcmb", "u0325",
+  "ringcmb", "u030A",
+  "ringhalfleft", "u02BF",
+  "ringhalfleftarmenian", "u0559",
+  "ringhalfleftbelowcmb", "u031C",
+  "ringhalfleftcentered", "u02D3",
+  "ringhalfright", "u02BE",
+  "ringhalfrightbelowcmb", "u0339",
+  "ringhalfrightcentered", "u02D2",
+  "rinvertedbreve", "u0213",
+  "rittorusquare", "u3351",
+  "rlinebelow", "u1E5F",
+  "rlongleg", "u027C",
+  "rlonglegturned", "u027A",
+  "rmonospace", "uFF52",
+  "rohiragana", "u308D",
+  "rokatakana", "u30ED",
+  "rokatakanahalfwidth", "uFF9B",
+  "roruathai", "u0E23",
+  "rparen", "u24AD",
+  "rrabengali", "u09DC",
+  "rradeva", "u0931",
+  "rragurmukhi", "u0A5C",
+  "rreharabic", "u0691",
+  "rrehfinalarabic", "uFB8D",
+  "rrvocalicbengali", "u09E0",
+  "rrvocalicdeva", "u0960",
+  "rrvocalicgujarati", "u0AE0",
+  "rrvocalicvowelsignbengali", "u09C4",
+  "rrvocalicvowelsigndeva", "u0944",
+  "rrvocalicvowelsigngujarati", "u0AC4",
+  "rtblock", "u2590",
+  "rturned", "u0279",
+  "rturnedsuperior", "u02B4",
+  "ruhiragana", "u308B",
+  "rukatakana", "u30EB",
+  "rukatakanahalfwidth", "uFF99",
+  "rupeemarkbengali", "u09F2",
+  "rupeesignbengali", "u09F3",
+  "ruthai", "u0E24",
+  "rvocalicbengali", "u098B",
+  "rvocalicdeva", "u090B",
+  "rvocalicgujarati", "u0A8B",
+  "rvocalicvowelsignbengali", "u09C3",
+  "rvocalicvowelsigndeva", "u0943",
+  "rvocalicvowelsigngujarati", "u0AC3",
+  "s", "u0073",
+  "sabengali", "u09B8",
+  "sacute", "u015B",
+  "sacutedotaccent", "u1E65",
+  "sadarabic", "u0635",
+  "sadeva", "u0938",
+  "sadfinalarabic", "uFEBA",
+  "sadinitialarabic", "uFEBB",
+  "sadmedialarabic", "uFEBC",
+  "sagujarati", "u0AB8",
+  "sagurmukhi", "u0A38",
+  "sahiragana", "u3055",
+  "sakatakana", "u30B5",
+  "sakatakanahalfwidth", "uFF7B",
+  "sallallahoualayhewasallamarabic", "uFDFA",
+  "samekh", "u05E1",
+  "samekhdagesh", "uFB41",
+  "samekhdageshhebrew", "uFB41",
+  "samekhhebrew", "u05E1",
+  "saraaathai", "u0E32",
+  "saraaethai", "u0E41",
+  "saraaimaimalaithai", "u0E44",
+  "saraaimaimuanthai", "u0E43",
+  "saraamthai", "u0E33",
+  "saraathai", "u0E30",
+  "saraethai", "u0E40",
+  "saraiithai", "u0E35",
+  "saraithai", "u0E34",
+  "saraothai", "u0E42",
+  "saraueethai", "u0E37",
+  "sarauethai", "u0E36",
+  "sarauthai", "u0E38",
+  "sarauuthai", "u0E39",
+  "sbopomofo", "u3119",
+  "scaron", "u0161",
+  "scarondotaccent", "u1E67",
+  "scedilla", "u015F",
+  "schwa", "u0259",
+  "schwacyrillic", "u04D9",
+  "schwadieresiscyrillic", "u04DB",
+  "schwahook", "u025A",
+  "scircle", "u24E2",
+  "scircumflex", "u015D",
+  "scommaaccent", "u0219",
+  "sdotaccent", "u1E61",
+  "sdotbelow", "u1E63",
+  "sdotbelowdotaccent", "u1E69",
+  "seagullbelowcmb", "u033C",
+  "second", "u2033",
+  "secondtonechinese", "u02CA",
+  "section", "u00A7",
+  "seenarabic", "u0633",
+  "seenfinalarabic", "uFEB2",
+  "seeninitialarabic", "uFEB3",
+  "seenmedialarabic", "uFEB4",
+  "segol", "u05B6",
+  "segol13", "u05B6",
+  "segol1f", "u05B6",
+  "segol2c", "u05B6",
+  "segolhebrew", "u05B6",
+  "segolnarrowhebrew", "u05B6",
+  "segolquarterhebrew", "u05B6",
+  "segoltahebrew", "u0592",
+  "segolwidehebrew", "u05B6",
+  "seharmenian", "u057D",
+  "sehiragana", "u305B",
+  "sekatakana", "u30BB",
+  "sekatakanahalfwidth", "uFF7E",
+  "semicolon", "u003B",
+  "semicolonarabic", "u061B",
+  "semicolonmonospace", "uFF1B",
+  "semicolonsmall", "uFE54",
+  "semivoicedmarkkana", "u309C",
+  "semivoicedmarkkanahalfwidth", "uFF9F",
+  "sentisquare", "u3322",
+  "sentosquare", "u3323",
+  "seven", "u0037",
+  "sevenarabic", "u0667",
+  "sevenbengali", "u09ED",
+  "sevencircle", "u2466",
+  "sevencircleinversesansserif", "u2790",
+  "sevendeva", "u096D",
+  "seveneighths", "u215E",
+  "sevengujarati", "u0AED",
+  "sevengurmukhi", "u0A6D",
+  "sevenhackarabic", "u0667",
+  "sevenhangzhou", "u3027",
+  "sevenideographicparen", "u3226",
+  "seveninferior", "u2087",
+  "sevenmonospace", "uFF17",
+  "sevenparen", "u247A",
+  "sevenperiod", "u248E",
+  "sevenpersian", "u06F7",
+  "sevenroman", "u2176",
+  "sevensuperior", "u2077",
+  "seventeencircle", "u2470",
+  "seventeenparen", "u2484",
+  "seventeenperiod", "u2498",
+  "seventhai", "u0E57",
+  "sfthyphen", "u00AD",
+  "shaarmenian", "u0577",
+  "shabengali", "u09B6",
+  "shacyrillic", "u0448",
+  "shaddaarabic", "u0651",
+  "shaddadammaarabic", "uFC61",
+  "shaddadammatanarabic", "uFC5E",
+  "shaddafathaarabic", "uFC60",
+  "shaddafathatanarabic", "u0651_064B",
+  "shaddakasraarabic", "uFC62",
+  "shaddakasratanarabic", "uFC5F",
+  "shade", "u2592",
+  "shadedark", "u2593",
+  "shadelight", "u2591",
+  "shademedium", "u2592",
+  "shadeva", "u0936",
+  "shagujarati", "u0AB6",
+  "shagurmukhi", "u0A36",
+  "shalshelethebrew", "u0593",
+  "shbopomofo", "u3115",
+  "shchacyrillic", "u0449",
+  "sheenarabic", "u0634",
+  "sheenfinalarabic", "uFEB6",
+  "sheeninitialarabic", "uFEB7",
+  "sheenmedialarabic", "uFEB8",
+  "sheicoptic", "u03E3",
+  "sheqel", "u20AA",
+  "sheqelhebrew", "u20AA",
+  "sheva", "u05B0",
+  "sheva115", "u05B0",
+  "sheva15", "u05B0",
+  "sheva22", "u05B0",
+  "sheva2e", "u05B0",
+  "shevahebrew", "u05B0",
+  "shevanarrowhebrew", "u05B0",
+  "shevaquarterhebrew", "u05B0",
+  "shevawidehebrew", "u05B0",
+  "shhacyrillic", "u04BB",
+  "shimacoptic", "u03ED",
+  "shin", "u05E9",
+  "shindagesh", "uFB49",
+  "shindageshhebrew", "uFB49",
+  "shindageshshindot", "uFB2C",
+  "shindageshshindothebrew", "uFB2C",
+  "shindageshsindot", "uFB2D",
+  "shindageshsindothebrew", "uFB2D",
+  "shindothebrew", "u05C1",
+  "shinhebrew", "u05E9",
+  "shinshindot", "uFB2A",
+  "shinshindothebrew", "uFB2A",
+  "shinsindot", "uFB2B",
+  "shinsindothebrew", "uFB2B",
+  "shook", "u0282",
+  "sigma", "u03C3",
+  "sigma1", "u03C2",
+  "sigmafinal", "u03C2",
+  "sigmalunatesymbolgreek", "u03F2",
+  "sihiragana", "u3057",
+  "sikatakana", "u30B7",
+  "sikatakanahalfwidth", "uFF7C",
+  "siluqhebrew", "u05BD",
+  "siluqlefthebrew", "u05BD",
+  "similar", "u223C",
+  "sindothebrew", "u05C2",
+  "siosacirclekorean", "u3274",
+  "siosaparenkorean", "u3214",
+  "sioscieuckorean", "u317E",
+  "sioscirclekorean", "u3266",
+  "sioskiyeokkorean", "u317A",
+  "sioskorean", "u3145",
+  "siosnieunkorean", "u317B",
+  "siosparenkorean", "u3206",
+  "siospieupkorean", "u317D",
+  "siostikeutkorean", "u317C",
+  "six", "u0036",
+  "sixarabic", "u0666",
+  "sixbengali", "u09EC",
+  "sixcircle", "u2465",
+  "sixcircleinversesansserif", "u278F",
+  "sixdeva", "u096C",
+  "sixgujarati", "u0AEC",
+  "sixgurmukhi", "u0A6C",
+  "sixhackarabic", "u0666",
+  "sixhangzhou", "u3026",
+  "sixideographicparen", "u3225",
+  "sixinferior", "u2086",
+  "sixmonospace", "uFF16",
+  "sixparen", "u2479",
+  "sixperiod", "u248D",
+  "sixpersian", "u06F6",
+  "sixroman", "u2175",
+  "sixsuperior", "u2076",
+  "sixteencircle", "u246F",
+  "sixteencurrencydenominatorbengali", "u09F9",
+  "sixteenparen", "u2483",
+  "sixteenperiod", "u2497",
+  "sixthai", "u0E56",
+  "slash", "u002F",
+  "slashmonospace", "uFF0F",
+  "slong", "u017F",
+  "slongdotaccent", "u1E9B",
+  "smileface", "u263A",
+  "smonospace", "uFF53",
+  "sofpasuqhebrew", "u05C3",
+  "softhyphen", "u00AD",
+  "softsigncyrillic", "u044C",
+  "sohiragana", "u305D",
+  "sokatakana", "u30BD",
+  "sokatakanahalfwidth", "uFF7F",
+  "soliduslongoverlaycmb", "u0338",
+  "solidusshortoverlaycmb", "u0337",
+  "sorusithai", "u0E29",
+  "sosalathai", "u0E28",
+  "sosothai", "u0E0B",
+  "sosuathai", "u0E2A",
+  "space", "u0020",
+  "spacehackarabic", "u0020",
+  "spade", "u2660",
+  "spadesuitblack", "u2660",
+  "spadesuitwhite", "u2664",
+  "sparen", "u24AE",
+  "squarebelowcmb", "u033B",
+  "squarecc", "u33C4",
+  "squarecm", "u339D",
+  "squarediagonalcrosshatchfill", "u25A9",
+  "squarehorizontalfill", "u25A4",
+  "squarekg", "u338F",
+  "squarekm", "u339E",
+  "squarekmcapital", "u33CE",
+  "squareln", "u33D1",
+  "squarelog", "u33D2",
+  "squaremg", "u338E",
+  "squaremil", "u33D5",
+  "squaremm", "u339C",
+  "squaremsquared", "u33A1",
+  "squareorthogonalcrosshatchfill", "u25A6",
+  "squareupperlefttolowerrightfill", "u25A7",
+  "squareupperrighttolowerleftfill", "u25A8",
+  "squareverticalfill", "u25A5",
+  "squarewhitewithsmallblack", "u25A3",
+  "srsquare", "u33DB",
+  "ssabengali", "u09B7",
+  "ssadeva", "u0937",
+  "ssagujarati", "u0AB7",
+  "ssangcieuckorean", "u3149",
+  "ssanghieuhkorean", "u3185",
+  "ssangieungkorean", "u3180",
+  "ssangkiyeokkorean", "u3132",
+  "ssangnieunkorean", "u3165",
+  "ssangpieupkorean", "u3143",
+  "ssangsioskorean", "u3146",
+  "ssangtikeutkorean", "u3138",
+  "sterling", "u00A3",
+  "sterlingmonospace", "uFFE1",
+  "strokelongoverlaycmb", "u0336",
+  "strokeshortoverlaycmb", "u0335",
+  "subset", "u2282",
+  "subsetnotequal", "u228A",
+  "subsetorequal", "u2286",
+  "succeeds", "u227B",
+  "suchthat", "u220B",
+  "suhiragana", "u3059",
+  "sukatakana", "u30B9",
+  "sukatakanahalfwidth", "uFF7D",
+  "sukunarabic", "u0652",
+  "summation", "u2211",
+  "sun", "u263C",
+  "superset", "u2283",
+  "supersetnotequal", "u228B",
+  "supersetorequal", "u2287",
+  "svsquare", "u33DC",
+  "syouwaerasquare", "u337C",
+  "t", "u0074",
+  "tabengali", "u09A4",
+  "tackdown", "u22A4",
+  "tackleft", "u22A3",
+  "tadeva", "u0924",
+  "tagujarati", "u0AA4",
+  "tagurmukhi", "u0A24",
+  "taharabic", "u0637",
+  "tahfinalarabic", "uFEC2",
+  "tahinitialarabic", "uFEC3",
+  "tahiragana", "u305F",
+  "tahmedialarabic", "uFEC4",
+  "taisyouerasquare", "u337D",
+  "takatakana", "u30BF",
+  "takatakanahalfwidth", "uFF80",
+  "tatweelarabic", "u0640",
+  "tau", "u03C4",
+  "tav", "u05EA",
+  "tavdages", "uFB4A",
+  "tavdagesh", "uFB4A",
+  "tavdageshhebrew", "uFB4A",
+  "tavhebrew", "u05EA",
+  "tbar", "u0167",
+  "tbopomofo", "u310A",
+  "tcaron", "u0165",
+  "tccurl", "u02A8",
+  "tcedilla", "u0163",
+  "tcheharabic", "u0686",
+  "tchehfinalarabic", "uFB7B",
+  "tchehinitialarabic", "uFB7C",
+  "tchehmedialarabic", "uFB7D",
+  "tchehmeeminitialarabic", "uFB7C_FEE4",
+  "tcircle", "u24E3",
+  "tcircumflexbelow", "u1E71",
+  "tcommaaccent", "u0163",
+  "tdieresis", "u1E97",
+  "tdotaccent", "u1E6B",
+  "tdotbelow", "u1E6D",
+  "tecyrillic", "u0442",
+  "tedescendercyrillic", "u04AD",
+  "teharabic", "u062A",
+  "tehfinalarabic", "uFE96",
+  "tehhahinitialarabic", "uFCA2",
+  "tehhahisolatedarabic", "uFC0C",
+  "tehinitialarabic", "uFE97",
+  "tehiragana", "u3066",
+  "tehjeeminitialarabic", "uFCA1",
+  "tehjeemisolatedarabic", "uFC0B",
+  "tehmarbutaarabic", "u0629",
+  "tehmarbutafinalarabic", "uFE94",
+  "tehmedialarabic", "uFE98",
+  "tehmeeminitialarabic", "uFCA4",
+  "tehmeemisolatedarabic", "uFC0E",
+  "tehnoonfinalarabic", "uFC73",
+  "tekatakana", "u30C6",
+  "tekatakanahalfwidth", "uFF83",
+  "telephone", "u2121",
+  "telephoneblack", "u260E",
+  "telishagedolahebrew", "u05A0",
+  "telishaqetanahebrew", "u05A9",
+  "tencircle", "u2469",
+  "tenideographicparen", "u3229",
+  "tenparen", "u247D",
+  "tenperiod", "u2491",
+  "tenroman", "u2179",
+  "tesh", "u02A7",
+  "tet", "u05D8",
+  "tetdagesh", "uFB38",
+  "tetdageshhebrew", "uFB38",
+  "tethebrew", "u05D8",
+  "tetsecyrillic", "u04B5",
+  "tevirhebrew", "u059B",
+  "tevirlefthebrew", "u059B",
+  "thabengali", "u09A5",
+  "thadeva", "u0925",
+  "thagujarati", "u0AA5",
+  "thagurmukhi", "u0A25",
+  "thalarabic", "u0630",
+  "thalfinalarabic", "uFEAC",
+  "thanthakhatthai", "u0E4C",
+  "theharabic", "u062B",
+  "thehfinalarabic", "uFE9A",
+  "thehinitialarabic", "uFE9B",
+  "thehmedialarabic", "uFE9C",
+  "thereexists", "u2203",
+  "therefore", "u2234",
+  "theta", "u03B8",
+  "theta1", "u03D1",
+  "thetasymbolgreek", "u03D1",
+  "thieuthacirclekorean", "u3279",
+  "thieuthaparenkorean", "u3219",
+  "thieuthcirclekorean", "u326B",
+  "thieuthkorean", "u314C",
+  "thieuthparenkorean", "u320B",
+  "thirteencircle", "u246C",
+  "thirteenparen", "u2480",
+  "thirteenperiod", "u2494",
+  "thonangmonthothai", "u0E11",
+  "thook", "u01AD",
+  "thophuthaothai", "u0E12",
+  "thorn", "u00FE",
+  "thothahanthai", "u0E17",
+  "thothanthai", "u0E10",
+  "thothongthai", "u0E18",
+  "thothungthai", "u0E16",
+  "thousandcyrillic", "u0482",
+  "thousandsseparatorarabic", "u066C",
+  "thousandsseparatorpersian", "u066C",
+  "three", "u0033",
+  "threearabic", "u0663",
+  "threebengali", "u09E9",
+  "threecircle", "u2462",
+  "threecircleinversesansserif", "u278C",
+  "threedeva", "u0969",
+  "threeeighths", "u215C",
+  "threegujarati", "u0AE9",
+  "threegurmukhi", "u0A69",
+  "threehackarabic", "u0663",
+  "threehangzhou", "u3023",
+  "threeideographicparen", "u3222",
+  "threeinferior", "u2083",
+  "threemonospace", "uFF13",
+  "threenumeratorbengali", "u09F6",
+  "threeparen", "u2476",
+  "threeperiod", "u248A",
+  "threepersian", "u06F3",
+  "threequarters", "u00BE",
+  "threeroman", "u2172",
+  "threesuperior", "u00B3",
+  "threethai", "u0E53",
+  "thzsquare", "u3394",
+  "tihiragana", "u3061",
+  "tikatakana", "u30C1",
+  "tikatakanahalfwidth", "uFF81",
+  "tikeutacirclekorean", "u3270",
+  "tikeutaparenkorean", "u3210",
+  "tikeutcirclekorean", "u3262",
+  "tikeutkorean", "u3137",
+  "tikeutparenkorean", "u3202",
+  "tilde", "u02DC",
+  "tildebelowcmb", "u0330",
+  "tildecmb", "u0303",
+  "tildecomb", "u0303",
+  "tildedoublecmb", "u0360",
+  "tildeoperator", "u223C",
+  "tildeoverlaycmb", "u0334",
+  "tildeverticalcmb", "u033E",
+  "timescircle", "u2297",
+  "tipehahebrew", "u0596",
+  "tipehalefthebrew", "u0596",
+  "tippigurmukhi", "u0A70",
+  "titlocyrilliccmb", "u0483",
+  "tiwnarmenian", "u057F",
+  "tlinebelow", "u1E6F",
+  "tmonospace", "uFF54",
+  "toarmenian", "u0569",
+  "tohiragana", "u3068",
+  "tokatakana", "u30C8",
+  "tokatakanahalfwidth", "uFF84",
+  "tonebarextrahighmod", "u02E5",
+  "tonebarextralowmod", "u02E9",
+  "tonebarhighmod", "u02E6",
+  "tonebarlowmod", "u02E8",
+  "tonebarmidmod", "u02E7",
+  "tonefive", "u01BD",
+  "tonesix", "u0185",
+  "tonetwo", "u01A8",
+  "tonos", "u0384",
+  "tonsquare", "u3327",
+  "topatakthai", "u0E0F",
+  "tortoiseshellbracketleft", "u3014",
+  "tortoiseshellbracketleftsmall", "uFE5D",
+  "tortoiseshellbracketleftvertical", "uFE39",
+  "tortoiseshellbracketright", "u3015",
+  "tortoiseshellbracketrightsmall", "uFE5E",
+  "tortoiseshellbracketrightvertical", "uFE3A",
+  "totaothai", "u0E15",
+  "tpalatalhook", "u01AB",
+  "tparen", "u24AF",
+  "trademark", "u2122",
+  "tretroflexhook", "u0288",
+  "triagdn", "u25BC",
+  "triaglf", "u25C4",
+  "triagrt", "u25BA",
+  "triagup", "u25B2",
+  "ts", "u02A6",
+  "tsadi", "u05E6",
+  "tsadidagesh", "uFB46",
+  "tsadidageshhebrew", "uFB46",
+  "tsadihebrew", "u05E6",
+  "tsecyrillic", "u0446",
+  "tsere", "u05B5",
+  "tsere12", "u05B5",
+  "tsere1e", "u05B5",
+  "tsere2b", "u05B5",
+  "tserehebrew", "u05B5",
+  "tserenarrowhebrew", "u05B5",
+  "tserequarterhebrew", "u05B5",
+  "tserewidehebrew", "u05B5",
+  "tshecyrillic", "u045B",
+  "ttabengali", "u099F",
+  "ttadeva", "u091F",
+  "ttagujarati", "u0A9F",
+  "ttagurmukhi", "u0A1F",
+  "tteharabic", "u0679",
+  "ttehfinalarabic", "uFB67",
+  "ttehinitialarabic", "uFB68",
+  "ttehmedialarabic", "uFB69",
+  "tthabengali", "u09A0",
+  "tthadeva", "u0920",
+  "tthagujarati", "u0AA0",
+  "tthagurmukhi", "u0A20",
+  "tturned", "u0287",
+  "tuhiragana", "u3064",
+  "tukatakana", "u30C4",
+  "tukatakanahalfwidth", "uFF82",
+  "tusmallhiragana", "u3063",
+  "tusmallkatakana", "u30C3",
+  "tusmallkatakanahalfwidth", "uFF6F",
+  "twelvecircle", "u246B",
+  "twelveparen", "u247F",
+  "twelveperiod", "u2493",
+  "twelveroman", "u217B",
+  "twentycircle", "u2473",
+  "twentyhangzhou", "u5344",
+  "twentyparen", "u2487",
+  "twentyperiod", "u249B",
+  "two", "u0032",
+  "twoarabic", "u0662",
+  "twobengali", "u09E8",
+  "twocircle", "u2461",
+  "twocircleinversesansserif", "u278B",
+  "twodeva", "u0968",
+  "twodotenleader", "u2025",
+  "twodotleader", "u2025",
+  "twodotleadervertical", "uFE30",
+  "twogujarati", "u0AE8",
+  "twogurmukhi", "u0A68",
+  "twohackarabic", "u0662",
+  "twohangzhou", "u3022",
+  "twoideographicparen", "u3221",
+  "twoinferior", "u2082",
+  "twomonospace", "uFF12",
+  "twonumeratorbengali", "u09F5",
+  "twoparen", "u2475",
+  "twoperiod", "u2489",
+  "twopersian", "u06F2",
+  "tworoman", "u2171",
+  "twostroke", "u01BB",
+  "twosuperior", "u00B2",
+  "twothai", "u0E52",
+  "twothirds", "u2154",
+  "u", "u0075",
+  "uacute", "u00FA",
+  "ubar", "u0289",
+  "ubengali", "u0989",
+  "ubopomofo", "u3128",
+  "ubreve", "u016D",
+  "ucaron", "u01D4",
+  "ucircle", "u24E4",
+  "ucircumflex", "u00FB",
+  "ucircumflexbelow", "u1E77",
+  "ucyrillic", "u0443",
+  "udattadeva", "u0951",
+  "udblacute", "u0171",
+  "udblgrave", "u0215",
+  "udeva", "u0909",
+  "udieresis", "u00FC",
+  "udieresisacute", "u01D8",
+  "udieresisbelow", "u1E73",
+  "udieresiscaron", "u01DA",
+  "udieresiscyrillic", "u04F1",
+  "udieresisgrave", "u01DC",
+  "udieresismacron", "u01D6",
+  "udotbelow", "u1EE5",
+  "ugrave", "u00F9",
+  "ugujarati", "u0A89",
+  "ugurmukhi", "u0A09",
+  "uhiragana", "u3046",
+  "uhookabove", "u1EE7",
+  "uhorn", "u01B0",
+  "uhornacute", "u1EE9",
+  "uhorndotbelow", "u1EF1",
+  "uhorngrave", "u1EEB",
+  "uhornhookabove", "u1EED",
+  "uhorntilde", "u1EEF",
+  "uhungarumlaut", "u0171",
+  "uhungarumlautcyrillic", "u04F3",
+  "uinvertedbreve", "u0217",
+  "ukatakana", "u30A6",
+  "ukatakanahalfwidth", "uFF73",
+  "ukcyrillic", "u0479",
+  "ukorean", "u315C",
+  "umacron", "u016B",
+  "umacroncyrillic", "u04EF",
+  "umacrondieresis", "u1E7B",
+  "umatragurmukhi", "u0A41",
+  "umonospace", "uFF55",
+  "underscore", "u005F",
+  "underscoredbl", "u2017",
+  "underscoremonospace", "uFF3F",
+  "underscorevertical", "uFE33",
+  "underscorewavy", "uFE4F",
+  "union", "u222A",
+  "universal", "u2200",
+  "uogonek", "u0173",
+  "uparen", "u24B0",
+  "upblock", "u2580",
+  "upperdothebrew", "u05C4",
+  "upsilon", "u03C5",
+  "upsilondieresis", "u03CB",
+  "upsilondieresistonos", "u03B0",
+  "upsilonlatin", "u028A",
+  "upsilontonos", "u03CD",
+  "uptackbelowcmb", "u031D",
+  "uptackmod", "u02D4",
+  "uragurmukhi", "u0A73",
+  "uring", "u016F",
+  "ushortcyrillic", "u045E",
+  "usmallhiragana", "u3045",
+  "usmallkatakana", "u30A5",
+  "usmallkatakanahalfwidth", "uFF69",
+  "ustraightcyrillic", "u04AF",
+  "ustraightstrokecyrillic", "u04B1",
+  "utilde", "u0169",
+  "utildeacute", "u1E79",
+  "utildebelow", "u1E75",
+  "uubengali", "u098A",
+  "uudeva", "u090A",
+  "uugujarati", "u0A8A",
+  "uugurmukhi", "u0A0A",
+  "uumatragurmukhi", "u0A42",
+  "uuvowelsignbengali", "u09C2",
+  "uuvowelsigndeva", "u0942",
+  "uuvowelsigngujarati", "u0AC2",
+  "uvowelsignbengali", "u09C1",
+  "uvowelsigndeva", "u0941",
+  "uvowelsigngujarati", "u0AC1",
+  "v", "u0076",
+  "vadeva", "u0935",
+  "vagujarati", "u0AB5",
+  "vagurmukhi", "u0A35",
+  "vakatakana", "u30F7",
+  "vav", "u05D5",
+  "vavdagesh", "uFB35",
+  "vavdagesh65", "uFB35",
+  "vavdageshhebrew", "uFB35",
+  "vavhebrew", "u05D5",
+  "vavholam", "uFB4B",
+  "vavholamhebrew", "uFB4B",
+  "vavvavhebrew", "u05F0",
+  "vavyodhebrew", "u05F1",
+  "vcircle", "u24E5",
+  "vdotbelow", "u1E7F",
+  "vecyrillic", "u0432",
+  "veharabic", "u06A4",
+  "vehfinalarabic", "uFB6B",
+  "vehinitialarabic", "uFB6C",
+  "vehmedialarabic", "uFB6D",
+  "vekatakana", "u30F9",
+  "venus", "u2640",
+  "verticalbar", "u007C",
+  "verticallineabovecmb", "u030D",
+  "verticallinebelowcmb", "u0329",
+  "verticallinelowmod", "u02CC",
+  "verticallinemod", "u02C8",
+  "vewarmenian", "u057E",
+  "vhook", "u028B",
+  "vikatakana", "u30F8",
+  "viramabengali", "u09CD",
+  "viramadeva", "u094D",
+  "viramagujarati", "u0ACD",
+  "visargabengali", "u0983",
+  "visargadeva", "u0903",
+  "visargagujarati", "u0A83",
+  "vmonospace", "uFF56",
+  "voarmenian", "u0578",
+  "voicediterationhiragana", "u309E",
+  "voicediterationkatakana", "u30FE",
+  "voicedmarkkana", "u309B",
+  "voicedmarkkanahalfwidth", "uFF9E",
+  "vokatakana", "u30FA",
+  "vparen", "u24B1",
+  "vtilde", "u1E7D",
+  "vturned", "u028C",
+  "vuhiragana", "u3094",
+  "vukatakana", "u30F4",
+  "w", "u0077",
+  "wacute", "u1E83",
+  "waekorean", "u3159",
+  "wahiragana", "u308F",
+  "wakatakana", "u30EF",
+  "wakatakanahalfwidth", "uFF9C",
+  "wakorean", "u3158",
+  "wasmallhiragana", "u308E",
+  "wasmallkatakana", "u30EE",
+  "wattosquare", "u3357",
+  "wavedash", "u301C",
+  "wavyunderscorevertical", "uFE34",
+  "wawarabic", "u0648",
+  "wawfinalarabic", "uFEEE",
+  "wawhamzaabovearabic", "u0624",
+  "wawhamzaabovefinalarabic", "uFE86",
+  "wbsquare", "u33DD",
+  "wcircle", "u24E6",
+  "wcircumflex", "u0175",
+  "wdieresis", "u1E85",
+  "wdotaccent", "u1E87",
+  "wdotbelow", "u1E89",
+  "wehiragana", "u3091",
+  "weierstrass", "u2118",
+  "wekatakana", "u30F1",
+  "wekorean", "u315E",
+  "weokorean", "u315D",
+  "wgrave", "u1E81",
+  "whitebullet", "u25E6",
+  "whitecircle", "u25CB",
+  "whitecircleinverse", "u25D9",
+  "whitecornerbracketleft", "u300E",
+  "whitecornerbracketleftvertical", "uFE43",
+  "whitecornerbracketright", "u300F",
+  "whitecornerbracketrightvertical", "uFE44",
+  "whitediamond", "u25C7",
+  "whitediamondcontainingblacksmalldiamond", "u25C8",
+  "whitedownpointingsmalltriangle", "u25BF",
+  "whitedownpointingtriangle", "u25BD",
+  "whiteleftpointingsmalltriangle", "u25C3",
+  "whiteleftpointingtriangle", "u25C1",
+  "whitelenticularbracketleft", "u3016",
+  "whitelenticularbracketright", "u3017",
+  "whiterightpointingsmalltriangle", "u25B9",
+  "whiterightpointingtriangle", "u25B7",
+  "whitesmallsquare", "u25AB",
+  "whitesmilingface", "u263A",
+  "whitesquare", "u25A1",
+  "whitestar", "u2606",
+  "whitetelephone", "u260F",
+  "whitetortoiseshellbracketleft", "u3018",
+  "whitetortoiseshellbracketright", "u3019",
+  "whiteuppointingsmalltriangle", "u25B5",
+  "whiteuppointingtriangle", "u25B3",
+  "wihiragana", "u3090",
+  "wikatakana", "u30F0",
+  "wikorean", "u315F",
+  "wmonospace", "uFF57",
+  "wohiragana", "u3092",
+  "wokatakana", "u30F2",
+  "wokatakanahalfwidth", "uFF66",
+  "won", "u20A9",
+  "wonmonospace", "uFFE6",
+  "wowaenthai", "u0E27",
+  "wparen", "u24B2",
+  "wring", "u1E98",
+  "wsuperior", "u02B7",
+  "wturned", "u028D",
+  "wynn", "u01BF",
+  "x", "u0078",
+  "xabovecmb", "u033D",
+  "xbopomofo", "u3112",
+  "xcircle", "u24E7",
+  "xdieresis", "u1E8D",
+  "xdotaccent", "u1E8B",
+  "xeharmenian", "u056D",
+  "xi", "u03BE",
+  "xmonospace", "uFF58",
+  "xparen", "u24B3",
+  "xsuperior", "u02E3",
+  "y", "u0079",
+  "yaadosquare", "u334E",
+  "yabengali", "u09AF",
+  "yacute", "u00FD",
+  "yadeva", "u092F",
+  "yaekorean", "u3152",
+  "yagujarati", "u0AAF",
+  "yagurmukhi", "u0A2F",
+  "yahiragana", "u3084",
+  "yakatakana", "u30E4",
+  "yakatakanahalfwidth", "uFF94",
+  "yakorean", "u3151",
+  "yamakkanthai", "u0E4E",
+  "yasmallhiragana", "u3083",
+  "yasmallkatakana", "u30E3",
+  "yasmallkatakanahalfwidth", "uFF6C",
+  "yatcyrillic", "u0463",
+  "ycircle", "u24E8",
+  "ycircumflex", "u0177",
+  "ydieresis", "u00FF",
+  "ydotaccent", "u1E8F",
+  "ydotbelow", "u1EF5",
+  "yeharabic", "u064A",
+  "yehbarreearabic", "u06D2",
+  "yehbarreefinalarabic", "uFBAF",
+  "yehfinalarabic", "uFEF2",
+  "yehhamzaabovearabic", "u0626",
+  "yehhamzaabovefinalarabic", "uFE8A",
+  "yehhamzaaboveinitialarabic", "uFE8B",
+  "yehhamzaabovemedialarabic", "uFE8C",
+  "yehinitialarabic", "uFEF3",
+  "yehmedialarabic", "uFEF4",
+  "yehmeeminitialarabic", "uFCDD",
+  "yehmeemisolatedarabic", "uFC58",
+  "yehnoonfinalarabic", "uFC94",
+  "yehthreedotsbelowarabic", "u06D1",
+  "yekorean", "u3156",
+  "yen", "u00A5",
+  "yenmonospace", "uFFE5",
+  "yeokorean", "u3155",
+  "yeorinhieuhkorean", "u3186",
+  "yerahbenyomohebrew", "u05AA",
+  "yerahbenyomolefthebrew", "u05AA",
+  "yericyrillic", "u044B",
+  "yerudieresiscyrillic", "u04F9",
+  "yesieungkorean", "u3181",
+  "yesieungpansioskorean", "u3183",
+  "yesieungsioskorean", "u3182",
+  "yetivhebrew", "u059A",
+  "ygrave", "u1EF3",
+  "yhook", "u01B4",
+  "yhookabove", "u1EF7",
+  "yiarmenian", "u0575",
+  "yicyrillic", "u0457",
+  "yikorean", "u3162",
+  "yinyang", "u262F",
+  "yiwnarmenian", "u0582",
+  "ymonospace", "uFF59",
+  "yod", "u05D9",
+  "yoddagesh", "uFB39",
+  "yoddageshhebrew", "uFB39",
+  "yodhebrew", "u05D9",
+  "yodyodhebrew", "u05F2",
+  "yodyodpatahhebrew", "uFB1F",
+  "yohiragana", "u3088",
+  "yoikorean", "u3189",
+  "yokatakana", "u30E8",
+  "yokatakanahalfwidth", "uFF96",
+  "yokorean", "u315B",
+  "yosmallhiragana", "u3087",
+  "yosmallkatakana", "u30E7",
+  "yosmallkatakanahalfwidth", "uFF6E",
+  "yotgreek", "u03F3",
+  "yoyaekorean", "u3188",
+  "yoyakorean", "u3187",
+  "yoyakthai", "u0E22",
+  "yoyingthai", "u0E0D",
+  "yparen", "u24B4",
+  "ypogegrammeni", "u037A",
+  "ypogegrammenigreekcmb", "u0345",
+  "yr", "u01A6",
+  "yring", "u1E99",
+  "ysuperior", "u02B8",
+  "ytilde", "u1EF9",
+  "yturned", "u028E",
+  "yuhiragana", "u3086",
+  "yuikorean", "u318C",
+  "yukatakana", "u30E6",
+  "yukatakanahalfwidth", "uFF95",
+  "yukorean", "u3160",
+  "yusbigcyrillic", "u046B",
+  "yusbigiotifiedcyrillic", "u046D",
+  "yuslittlecyrillic", "u0467",
+  "yuslittleiotifiedcyrillic", "u0469",
+  "yusmallhiragana", "u3085",
+  "yusmallkatakana", "u30E5",
+  "yusmallkatakanahalfwidth", "uFF6D",
+  "yuyekorean", "u318B",
+  "yuyeokorean", "u318A",
+  "yyabengali", "u09DF",
+  "yyadeva", "u095F",
+  "z", "u007A",
+  "zaarmenian", "u0566",
+  "zacute", "u017A",
+  "zadeva", "u095B",
+  "zagurmukhi", "u0A5B",
+  "zaharabic", "u0638",
+  "zahfinalarabic", "uFEC6",
+  "zahinitialarabic", "uFEC7",
+  "zahiragana", "u3056",
+  "zahmedialarabic", "uFEC8",
+  "zainarabic", "u0632",
+  "zainfinalarabic", "uFEB0",
+  "zakatakana", "u30B6",
+  "zaqefgadolhebrew", "u0595",
+  "zaqefqatanhebrew", "u0594",
+  "zarqahebrew", "u0598",
+  "zayin", "u05D6",
+  "zayindagesh", "uFB36",
+  "zayindageshhebrew", "uFB36",
+  "zayinhebrew", "u05D6",
+  "zbopomofo", "u3117",
+  "zcaron", "u017E",
+  "zcircle", "u24E9",
+  "zcircumflex", "u1E91",
+  "zcurl", "u0291",
+  "zdot", "u017C",
+  "zdotaccent", "u017C",
+  "zdotbelow", "u1E93",
+  "zecyrillic", "u0437",
+  "zedescendercyrillic", "u0499",
+  "zedieresiscyrillic", "u04DF",
+  "zehiragana", "u305C",
+  "zekatakana", "u30BC",
+  "zero", "u0030",
+  "zeroarabic", "u0660",
+  "zerobengali", "u09E6",
+  "zerodeva", "u0966",
+  "zerogujarati", "u0AE6",
+  "zerogurmukhi", "u0A66",
+  "zerohackarabic", "u0660",
+  "zeroinferior", "u2080",
+  "zeromonospace", "uFF10",
+  "zeropersian", "u06F0",
+  "zerosuperior", "u2070",
+  "zerothai", "u0E50",
+  "zerowidthjoiner", "uFEFF",
+  "zerowidthnonjoiner", "u200C",
+  "zerowidthspace", "u200B",
+  "zeta", "u03B6",
+  "zhbopomofo", "u3113",
+  "zhearmenian", "u056A",
+  "zhebrevecyrillic", "u04C2",
+  "zhecyrillic", "u0436",
+  "zhedescendercyrillic", "u0497",
+  "zhedieresiscyrillic", "u04DD",
+  "zihiragana", "u3058",
+  "zikatakana", "u30B8",
+  "zinorhebrew", "u05AE",
+  "zlinebelow", "u1E95",
+  "zmonospace", "uFF5A",
+  "zohiragana", "u305E",
+  "zokatakana", "u30BE",
+  "zparen", "u24B5",
+  "zretroflexhook", "u0290",
+  "zstroke", "u01B6",
+  "zuhiragana", "u305A",
+  "zukatakana", "u30BA",
+);
+
 $prog = $0;
 $prog =~ s@.*/@@;
 
+$groff_sys_fontdir = "@FONTDIR@";
+
 do 'getopts.pl';
-do Getopts('ve:sd:i:a:n');
+do Getopts('a:d:e:i:mnsv');
 
 if ($opt_v) {
     print "GNU afmtodit (groff) version @VERSION@\n";
@@ -31,13 +6054,16 @@ if ($opt_v) {
 }
 
 if ($#ARGV != 2) {
-    die "Usage: $prog [-nsv] [-d DESC] [-e encoding] [-i n] [-a angle] afmfile mapfile font\n";
+    die "usage: $prog [-mnsv] [-a angle] [-d DESC] [-e encoding]\n" .
+	"       [-i n] afmfile mapfile font\n";
 }
 
 $afm = $ARGV[0];
 $map = $ARGV[1];
 $font = $ARGV[2];
 $desc = $opt_d || "DESC";
+$sys_map = $groff_sys_fontdir . "/devps/generate/" . $map;
+$sys_desc = $groff_sys_fontdir . "/devps/" . $desc;
 
 # read the afm file
 
@@ -76,6 +6102,7 @@ while (<AFM>) {
 		$c = -1;
 		$wx = 0;
 		$n = "";
+		%ligs = ();
 		$lly = 0;
 		$ury = 0;
 		$llx = 0;
@@ -99,7 +6126,7 @@ while (<AFM>) {
 			$i += 5;
 		    }
 		    elsif ($field[$i] eq "L") {
-			push(ligatures, $field[$i + 2]);
+			$ligs{$field[$i + 2]} = $field[$i + 1];
 			$i += 3;
 		    }
 		    else {
@@ -118,6 +6145,9 @@ while (<AFM>) {
 		$depth{$n} = -$lly;
 		$left_side_bearing{$n} = -$llx;
 		$right_side_bearing{$n} = $urx - $w;
+		while (($lig, $glyph2) = each %ligs) {
+		    $ligatures{$lig} = $n . " " . $glyph2;
+		}
 	    }
 	}
     }
@@ -128,7 +6158,8 @@ close(AFM);
 
 $sizescale = 1;
 
-open(DESC, $desc) || die "$prog: can't open \`$desc': $!\n";
+open(DESC, $desc) || open(DESC, $sys_desc) ||
+    die "$prog: can't open \`$desc' or \`$sys_desc': $!\n";
 while (<DESC>) {
     next if /^#/;
     chop;
@@ -142,8 +6173,10 @@ close(DESC);
 
 if ($opt_e) {
     # read the encoding file
-    
-    open(ENCODING, $opt_e) || die "$prog: can't open \`$opt_e': $!\n";
+
+    $sys_opt_e = $groff_sys_fontdir . "/devps/" . $opt_e;
+    open(ENCODING, $opt_e) || open(ENCODING, $sys_opt_e) ||
+	die "$prog: can't open \`$opt_e' or \`$sys_opt_e': $!\n";
     while (<ENCODING>) {
 	next if /^#/;
 	chop;
@@ -160,12 +6193,13 @@ if ($opt_e) {
 
 # read the map file
 
-open(MAP, $map) || die "$prog: can't open \`$map': $!\n";
+open(MAP, $map) || open(MAP, $sys_map) ||
+    die "$prog: can't open \`$map' or \`$sys_map': $!\n";
 while (<MAP>) {
     next if /^#/;
     chop;
     @field = split(' ');
-    if ($#field == 1 && $in_encoding{$field[0]}) {
+    if ($#field == 1) {
 	if (defined $mapped{$field[1]}) {
 	    warn "Both $mapped{$field[1]} and $field[0] map to $field[1]";
 	}
@@ -189,6 +6223,45 @@ close(MAP);
 
 $italic_angle = $opt_a if $opt_a;
 
+# add unencoded characters
+
+$i = ($#encoding > 256) ? ($#encoding + 1) : 256;
+while ($ch = each %width) {
+    if (!$in_encoding{$ch}) {
+	$encoding[$i] = $ch;
+	$i++;
+	if (!$nmap{$ch}) {
+	    $nmap{$ch} += 1;
+	    $u1 = $AGL_to_unicode{$ch};
+	    if ($u1) {
+		$u2 = $unicode_decomposed{$u1};
+		$u = $u2 ? $u2 : $u1;
+	    }
+	    else {
+		$u = "---";
+	    }
+	    $map{$ch,"0"} = $u;
+	}
+    }
+}
+
+# check explicitly for groff's standard ligatures -- many afm files don't
+# have proper `L' entries
+
+%default_ligatures = (
+  "fi", "f i",
+  "fl", "f l",
+  "ff", "f f",
+  "ffi", "ff i",
+  "ffl", "ff l",
+);
+
+while (($lig, $components) = each %default_ligatures) {
+    if (defined $width{$lig} && !defined $ligatures{$lig}) {
+	$ligatures{$lig} = $components;
+    }
+}
+
 # print it all out
 
 open(FONT, ">$font") || die "$prog: can't open \`$font' for output: $!\n";
@@ -206,9 +6279,9 @@ if ($opt_e) {
     print("encoding $e\n");
 }
 
-if (!$opt_n && $#ligatures >= 0) {
+if (!$opt_n && %ligatures) {
     print("ligatures");
-    foreach $lig (@ligatures) {
+    while ($lig = each %ligatures) {
 	print(" $lig");
     }
     print(" 0\n");
@@ -216,12 +6289,11 @@ if (!$opt_n && $#ligatures >= 0) {
 
 if ($#kern1 >= 0) {
     print("kernpairs\n");
-    
+
     for ($i = 0; $i <= $#kern1; $i++) {
 	$c1 = $kern1[$i];
 	$c2 = $kern2[$i];
-	if ($in_encoding{$c1} == 1 && $nmap{$c1} != 0
-	    && $in_encoding{$c2} == 1 && $nmap{$c2} != 0) {
+	if ($nmap{$c1} != 0 && $nmap{$c2} != 0) {
 	    for ($j = 0; $j < $nmap{$c1}; $j++) {
 		for ($k = 0; $k < $nmap{$c2}; $k++) {
 		    if ($kernx[$i] != 0) {
@@ -237,9 +6309,11 @@ if ($#kern1 >= 0) {
 }
 
 # characters not shorter than asc_boundary are considered to have ascenders
+
 $asc_boundary = $height{"t"} - 1;
 
 # likewise for descenders
+
 $desc_boundary = $depth{"g"};
 $desc_boundary = $depth{"j"} if $depth{"j"} < $desc_boundary;
 $desc_boundary = $depth{"p"} if $depth{"p"} < $desc_boundary;
@@ -262,7 +6336,7 @@ $slant = sin($italic_angle)/cos($italic_angle);
 $slant = 0 if $slant < 0;
 
 print("charset\n");
-for ($i = 0; $i < 256; $i++) {
+for ($i = 0; $i <= $#encoding; $i++) {
     $ch = $encoding[$i];
     if ($ch ne "" && $ch ne "space") {
 	$map{$ch,"0"} = "---" if $nmap{$ch} == 0;
@@ -284,6 +6358,9 @@ for ($i = 0; $i < 256; $i++) {
 	    $subscript_correction = $italic_correction if
 		$subscript_correction > $italic_correction;
 	    $left_math_fit = $left_side_bearing{$ch} + $opt_i;
+	    if (defined $opt_m) {
+		$left_math_fit = 0 if $left_math_fit < 0;
+	    }
 	}
 	if (defined $italic_correction{$ch}) {
 	    $italic_correction = $italic_correction{$ch};
@@ -317,13 +6394,13 @@ for ($i = 0; $i < 256; $i++) {
 	    printf(",%d", do conv($h));
 	}
 	printf("\t%d", $type);
-	printf("\t0%03o\t-- %s\n", $i, $ch);
+	printf("\t%d\t%s\n", $i, $ch);
 	for ($j = 1; $j < $nmap{$ch}; $j++) {
 	    printf("%s\t\"\n", $map{$ch,$j});
 	}
     }
     if ($ch eq "space" && defined $width{"space"}) {
-	printf("space\t%d\t0\t0%03o\n", do conv($width{"space"}), $i);
+	printf("space\t%d\t0\t%d\tspace\n", do conv($width{"space"}), $i);
     }
 }
 
diff --git a/contrib/groff/src/utils/hpftodit/Makefile.sub b/contrib/groff/src/utils/hpftodit/Makefile.sub
index 7a16531..d83188c 100644
--- a/contrib/groff/src/utils/hpftodit/Makefile.sub
+++ b/contrib/groff/src/utils/hpftodit/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=hpftodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=hpftodit.$(OBJEXT)
-CCSRCS=$(srcdir)/hpftodit.cc
+CCSRCS=$(srcdir)/hpftodit.cpp
diff --git a/contrib/groff/src/utils/hpftodit/hpftodit.cpp b/contrib/groff/src/utils/hpftodit/hpftodit.cpp
new file mode 100644
index 0000000..fe512b6
--- /dev/null
+++ b/contrib/groff/src/utils/hpftodit/hpftodit.cpp
@@ -0,0 +1,811 @@
+// -*- C++ -*-
+/* Copyright (C) 1994, 2000, 2001, 2003 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/*
+TODO
+put human readable font name in device file
+devise new names for useful characters
+use --- for unnamed characters
+option to specify symbol sets to look in
+make it work with TrueType fonts
+put filename in error messages (or fix lib)
+*/
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <math.h>
+#include <errno.h>
+#include "assert.h"
+#include "posix.h"
+#include "errarg.h"
+#include "error.h"
+#include "cset.h"
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+#define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
+
+const int MULTIPLIER = 3;
+
+inline
+int scale(int n)
+{
+  return n * MULTIPLIER;
+}
+
+// tags in TFM file
+
+enum tag_type {
+  min_tag = 400,
+  type_tag = 400,
+  symbol_set_tag = 404,
+  msl_tag = 403,
+  inches_per_point_tag = 406,
+  design_units_per_em_tag = 408,
+  posture_tag = 409,
+  stroke_weight_tag = 411,
+  spacing_tag = 412,
+  slant_tag = 413,
+  appearance_width_tag = 414,
+  word_spacing_tag = 421,
+  x_height_tag = 424,
+  lower_ascent_tag = 427,
+  lower_descent_tag = 428,
+  width_tag = 433,
+  left_extent_tag = 435,
+  right_extent_tag = 436,
+  ascent_tag = 437,
+  descent_tag = 438,
+  pair_kern_tag = 439,
+  typeface_tag = 442,
+  max_tag = 443
+  };
+
+// types in TFM file
+
+enum {
+  ENUM_TYPE = 1,
+  BYTE_TYPE = 2,
+  USHORT_TYPE = 3,
+  FLOAT_TYPE = 5,
+  SIGNED_SHORT_TYPE = 17
+  };
+
+
+typedef unsigned char byte;
+typedef unsigned short uint16;
+typedef short int16;
+typedef unsigned int uint32;
+
+class File {
+public:
+  File(const char *);
+  void skip(int n);
+  byte get_byte();
+  uint16 get_uint16();
+  uint32 get_uint32();
+  void seek(uint32 n);
+private:
+  unsigned char *buf_;
+  const unsigned char *ptr_;
+  const unsigned char *end_;
+};
+
+struct entry {
+  char present;
+  uint16 type;
+  uint32 count;
+  uint32 value;
+  entry() : present(0) { }
+};
+
+struct char_info {
+  uint16 msl;
+  uint16 width;
+  int16 ascent;
+  int16 descent;
+  int16 left_extent;
+  uint16 right_extent;
+  uint16 symbol_set;
+  unsigned char code;
+};
+
+const uint16 NO_SYMBOL_SET = 0;
+
+struct name_list {
+  char *name;
+  name_list *next;
+  name_list(const char *s, name_list *p) : name(strsave(s)), next(p) { }
+  ~name_list() { a_delete name; }
+};
+
+struct symbol_set {
+  uint16 select;
+  uint16 index[256];
+};
+
+#define SYMBOL_SET(n, c) ((n) * 32 + ((c) - 64))
+
+uint16 text_symbol_sets[] = {
+  SYMBOL_SET(0, 'N'),		// Latin 1
+  SYMBOL_SET(6, 'J'),		// Microsoft Publishing
+  SYMBOL_SET(2, 'N'),		// Latin 2
+  0
+  };
+
+uint16 special_symbol_sets[] = {
+  SYMBOL_SET(8, 'M'),
+  SYMBOL_SET(5, 'M'),
+  SYMBOL_SET(15, 'U'),
+  0
+  };
+
+entry tags[max_tag + 1 - min_tag];
+
+char_info *char_table;
+uint32 nchars;
+
+unsigned int msl_name_table_size = 0;
+name_list **msl_name_table = 0;
+
+unsigned int n_symbol_sets;
+symbol_set *symbol_set_table;
+
+static int special_flag = 0;
+static int italic_flag = 0;
+static int italic_sep;
+
+static void usage(FILE *stream);
+static void usage();
+static const char *xbasename(const char *);
+static void read_tags(File &);
+static void check_type();
+static void check_units(File &);
+static int read_map(const char *);
+static void require_tag(tag_type);
+static void dump_tags(File &f);
+static void output_spacewidth();
+static void output_pclweight();
+static void output_pclproportional();
+static void read_and_output_pcltypeface(File &);
+static void output_pclstyle();
+static void output_slant();
+static void output_ligatures();
+static void read_symbol_sets(File &);
+static void read_and_output_kernpairs(File &);
+static void output_charset();
+static void read_char_table(File &f);
+
+inline
+entry &tag_info(tag_type t)
+{
+  return tags[t - min_tag];
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+
+  int opt;
+  int debug_flag = 0;
+
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "dsvi:", long_options, NULL)) != EOF) {
+    switch (opt) {
+    case 'd':
+      debug_flag = 1;
+      break;
+    case 's':
+      special_flag = 1;
+      break;
+    case 'i':
+      italic_flag = 1;
+      italic_sep = atoi(optarg);
+      break;
+    case 'v':
+      {
+	printf("GNU hpftodit (groff) version %s\n", Version_string);
+	exit(0);
+      }
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage();
+      break;
+    default:
+      assert(0);
+    }
+  }
+  if (argc - optind != 3)
+    usage();
+  File f(argv[optind]);
+  if (!read_map(argv[optind + 1]))
+    exit(1);
+  current_filename = 0;
+  current_lineno = -1;		// no line numbers
+  if (freopen(argv[optind + 2], "w", stdout) == 0)
+    fatal("cannot open `%1': %2", argv[optind + 2], strerror(errno));
+  current_filename = argv[optind];
+  printf("name %s\n", xbasename(argv[optind + 2]));
+  if (special_flag)
+    printf("special\n");
+  read_tags(f);
+  check_type();
+  check_units(f);
+  if (debug_flag)
+    dump_tags(f);
+  read_char_table(f);
+  output_spacewidth();
+  output_slant();
+  read_and_output_pcltypeface(f);
+  output_pclproportional();
+  output_pclweight();
+  output_pclstyle();
+  read_symbol_sets(f);
+  output_ligatures();
+  read_and_output_kernpairs(f);
+  output_charset();
+  return 0;
+}
+
+static
+void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-s] [-i n] tfm_file map_file output_font\n",
+	  program_name);
+}
+static
+void usage()
+{
+  usage(stderr);
+  exit(1);
+}
+
+File::File(const char *s)
+{
+  // We need to read the file in binary mode because hpftodit relies
+  // on byte counts.
+  int fd = open(s, O_RDONLY | O_BINARY);
+  if (fd < 0)
+    fatal("cannot open `%1': %2", s, strerror(errno));
+  current_filename = s;
+  struct stat sb;
+  if (fstat(fd, &sb) < 0)
+    fatal("cannot stat: %1", strerror(errno));
+  if (!S_ISREG(sb.st_mode))
+    fatal("not a regular file");
+  buf_ = new unsigned char[sb.st_size];
+  long nread = read(fd, buf_, sb.st_size);
+  if (nread < 0)
+    fatal("read error: %1", strerror(errno));
+  if (nread != sb.st_size)
+    fatal("read unexpected number of bytes");
+  ptr_ = buf_;
+  end_ = buf_ + sb.st_size;
+}
+
+void File::skip(int n)
+{
+  if (end_ - ptr_ < n)
+    fatal("unexpected end of file");
+  ptr_ += n;
+}
+
+void File::seek(uint32 n)
+{
+  if ((uint32)(end_ - buf_) < n)
+    fatal("unexpected end of file");
+  ptr_ = buf_ + n;
+}
+
+byte File::get_byte()
+{
+  if (ptr_ >= end_)
+    fatal("unexpected end of file");
+  return *ptr_++;
+}
+
+uint16 File::get_uint16()
+{
+  if (end_ - ptr_ < 2)
+    fatal("unexpected end of file");
+  uint16 n = *ptr_++;
+  return n + (*ptr_++ << 8);
+}
+
+uint32 File::get_uint32()
+{
+  if (end_ - ptr_ < 4)
+    fatal("unexpected end of file");
+  uint32 n = *ptr_++;
+  for (int i = 0; i < 3; i++)
+    n += *ptr_++ << (i + 1)*8;
+  return n;
+}
+
+static
+void read_tags(File &f)
+{
+  if (f.get_byte() != 'I' || f.get_byte() != 'I')
+    fatal("not an Intel format TFM file");
+  f.skip(6);
+  uint16 ntags = f.get_uint16();
+  entry dummy;
+  for (uint16 i = 0; i < ntags; i++) {
+    uint16 tag = f.get_uint16();
+    entry *p;
+    if (min_tag <= tag && tag <= max_tag)
+      p = tags + (tag - min_tag);
+    else
+      p = &dummy;
+    p->present = 1;
+    p->type = f.get_uint16();
+    p->count = f.get_uint32();
+    p->value = f.get_uint32();
+  }
+}
+
+static
+void check_type()
+{
+  require_tag(type_tag);
+  if (tag_info(type_tag).value != 0) {
+    if (tag_info(type_tag).value == 2)
+      fatal("cannot handle TrueType tfm files");
+    fatal("unknown type tag %1", int(tag_info(type_tag).value));
+  }
+}
+
+static
+void check_units(File &f)
+{
+  require_tag(design_units_per_em_tag);
+  f.seek(tag_info(design_units_per_em_tag).value);
+  uint32 num = f.get_uint32();
+  uint32 den = f.get_uint32();
+  if (num != 8782 || den != 1)
+    fatal("design units per em != 8782/1");
+  require_tag(inches_per_point_tag);
+  f.seek(tag_info(inches_per_point_tag).value);
+  num = f.get_uint32();
+  den = f.get_uint32();
+  if (num != 100 || den != 7231)
+    fatal("inches per point not 100/7231");
+}
+
+static
+void require_tag(tag_type t)
+{
+  if (!tag_info(t).present)
+    fatal("tag %1 missing", int(t));
+}
+
+static
+void output_spacewidth()
+{
+  require_tag(word_spacing_tag);
+  printf("spacewidth %d\n", scale(tag_info(word_spacing_tag).value));
+}
+
+static
+void read_symbol_sets(File &f)
+{
+  uint32 symbol_set_dir_length = tag_info(symbol_set_tag).count;
+  n_symbol_sets = symbol_set_dir_length/14;
+  symbol_set_table = new symbol_set[n_symbol_sets];
+  unsigned int i;
+  for (i = 0; i < n_symbol_sets; i++) {
+    f.seek(tag_info(symbol_set_tag).value + i*14);
+    (void)f.get_uint32();
+    uint32 off1 = f.get_uint32();
+    uint32 off2 = f.get_uint32();
+    (void)f.get_uint16();		// what's this for?
+    f.seek(off1);
+    unsigned int j;
+    uint16 kind = 0;
+    for (j = 0; j < off2 - off1; j++) {
+      unsigned char c = f.get_byte();
+      if ('0' <= c && c <= '9')
+	kind = kind*10 + (c - '0');
+      else if ('A' <= c && c <= 'Z')
+	kind = kind*32 + (c - 64);
+    }
+    symbol_set_table[i].select = kind;
+    for (j = 0; j < 256; j++)
+      symbol_set_table[i].index[j] = f.get_uint16();
+  }
+  for (i = 0; i < nchars; i++)
+    char_table[i].symbol_set = NO_SYMBOL_SET;
+
+  uint16 *symbol_set_selectors = (special_flag
+				  ? special_symbol_sets
+				  : text_symbol_sets);
+  for (i = 0; symbol_set_selectors[i] != 0; i++) {
+    unsigned int j;
+    for (j = 0; j < n_symbol_sets; j++)
+      if (symbol_set_table[j].select == symbol_set_selectors[i])
+	break;
+    if (j < n_symbol_sets) {
+      for (int k = 0; k < 256; k++) {
+	uint16 index = symbol_set_table[j].index[k];
+	if (index != 0xffff
+	    && char_table[index].symbol_set == NO_SYMBOL_SET) {
+	  char_table[index].symbol_set = symbol_set_table[j].select;
+	  char_table[index].code = k;
+	}
+      }
+    }
+  }
+}
+
+static
+void read_char_table(File &f)
+{
+  require_tag(msl_tag);
+  nchars = tag_info(msl_tag).count;
+  char_table = new char_info[nchars];
+
+  f.seek(tag_info(msl_tag).value);
+  uint32 i;
+  for (i = 0; i < nchars; i++)
+    char_table[i].msl = f.get_uint16();
+  
+  require_tag(width_tag);
+  f.seek(tag_info(width_tag).value);
+  for (i = 0; i < nchars; i++)
+    char_table[i].width = f.get_uint16();
+
+  require_tag(ascent_tag);
+  f.seek(tag_info(ascent_tag).value);
+  for (i = 0; i < nchars; i++) {
+    char_table[i].ascent = f.get_uint16();
+    if (char_table[i].ascent < 0)
+      char_table[i].ascent = 0;
+  }
+
+  require_tag(descent_tag);
+  f.seek(tag_info(descent_tag).value);
+  for (i = 0; i < nchars; i++) {
+    char_table[i].descent = f.get_uint16();
+    if (char_table[i].descent > 0)
+      char_table[i].descent = 0;
+  }
+
+  require_tag(left_extent_tag);
+  f.seek(tag_info(left_extent_tag).value);
+  for (i = 0; i < nchars; i++)
+    char_table[i].left_extent = int16(f.get_uint16());
+
+  require_tag(right_extent_tag);
+  f.seek(tag_info(right_extent_tag).value);
+  for (i = 0; i < nchars; i++)
+    char_table[i].right_extent = f.get_uint16();
+}
+
+static
+void output_pclweight()
+{
+  require_tag(stroke_weight_tag);
+  int stroke_weight = tag_info(stroke_weight_tag).value;
+  int pcl_stroke_weight;
+  if (stroke_weight < 128)
+    pcl_stroke_weight = -3;
+  else if (stroke_weight == 128)
+    pcl_stroke_weight = 0;
+  else if (stroke_weight <= 145)
+    pcl_stroke_weight = 1;
+  else if (stroke_weight <= 179)
+    pcl_stroke_weight = 3;
+  else
+    pcl_stroke_weight = 4;
+  printf("pclweight %d\n", pcl_stroke_weight);
+}
+
+static
+void output_pclproportional()
+{
+  require_tag(spacing_tag);
+  printf("pclproportional %d\n", tag_info(spacing_tag).value == 0);
+}
+
+static
+void read_and_output_pcltypeface(File &f)
+{
+  printf("pcltypeface ");
+  require_tag(typeface_tag);
+  f.seek(tag_info(typeface_tag).value);
+  for (uint32 i = 0; i < tag_info(typeface_tag).count; i++) {
+    unsigned char c = f.get_byte();
+    if (c == '\0')
+      break;
+    putchar(c);
+  }
+  printf("\n");
+}
+
+static
+void output_pclstyle()
+{
+  unsigned pcl_style = 0;
+  // older tfms don't have the posture tag
+  if (tag_info(posture_tag).present) {
+    if (tag_info(posture_tag).value)
+      pcl_style |= 1;
+  }
+  else {
+    require_tag(slant_tag);
+    if (tag_info(slant_tag).value != 0)
+      pcl_style |= 1;
+  }
+  require_tag(appearance_width_tag);
+  if (tag_info(appearance_width_tag).value < 100) // guess
+    pcl_style |= 4;
+  printf("pclstyle %d\n", pcl_style);
+}
+
+static
+void output_slant()
+{
+  require_tag(slant_tag);
+  int slant = int16(tag_info(slant_tag).value);
+  if (slant != 0)
+    printf("slant %f\n", slant/100.0);
+}
+
+static
+void output_ligatures()
+{
+  // don't use ligatures for fixed space font
+  require_tag(spacing_tag);
+  if (tag_info(spacing_tag).value != 0)
+    return;
+  static const char *ligature_names[] = {
+    "fi", "fl", "ff", "ffi", "ffl"
+    };
+
+  static const char *ligature_chars[] = {
+    "fi", "fl", "ff", "Fi", "Fl"
+    };
+  
+  unsigned ligature_mask = 0;
+  unsigned int i;
+  for (i = 0; i < nchars; i++) {
+    uint16 msl = char_table[i].msl;
+    if (msl < msl_name_table_size
+	&& char_table[i].symbol_set != NO_SYMBOL_SET) {
+      for (name_list *p = msl_name_table[msl]; p; p = p->next)
+	for (unsigned int j = 0; j < SIZEOF(ligature_chars); j++)
+	  if (strcmp(p->name, ligature_chars[j]) == 0) {
+	    ligature_mask |= 1 << j;
+	    break;
+	  }
+      }
+    }
+  if (ligature_mask) {
+    printf("ligatures");
+    for (i = 0; i < SIZEOF(ligature_names); i++)
+      if (ligature_mask & (1 << i))
+	printf(" %s", ligature_names[i]);
+    printf(" 0\n");
+  }
+}
+
+static
+void read_and_output_kernpairs(File &f)
+{
+  if (tag_info(pair_kern_tag).present) {
+    printf("kernpairs\n");
+    f.seek(tag_info(pair_kern_tag).value);
+    uint16 n_pairs = f.get_uint16();
+    for (int i = 0; i < n_pairs; i++) {
+      uint16 i1 = f.get_uint16();
+      uint16 i2 = f.get_uint16();
+      int16 val = int16(f.get_uint16());
+      if (char_table[i1].symbol_set != NO_SYMBOL_SET
+	  && char_table[i2].symbol_set != NO_SYMBOL_SET
+	  && char_table[i1].msl < msl_name_table_size
+	  && char_table[i2].msl < msl_name_table_size) {
+	for (name_list *p = msl_name_table[char_table[i1].msl];
+	     p;
+	     p = p->next)
+	  for (name_list *q = msl_name_table[char_table[i2].msl];
+	       q;
+	       q = q->next)
+	    printf("%s %s %d\n", p->name, q->name, scale(val));
+      }
+    }
+  }
+}
+
+static 
+void output_charset()
+{
+  require_tag(slant_tag);
+  double slant_angle = int16(tag_info(slant_tag).value)*PI/18000.0;
+  double slant = sin(slant_angle)/cos(slant_angle);
+
+  require_tag(x_height_tag);
+  require_tag(lower_ascent_tag);
+  require_tag(lower_descent_tag);
+
+  printf("charset\n");
+  unsigned int i;
+  for (i = 0; i < nchars; i++) {
+    uint16 msl = char_table[i].msl;
+    if (msl < msl_name_table_size
+	&& msl_name_table[msl]) {
+      if (char_table[i].symbol_set != NO_SYMBOL_SET) {
+	printf("%s\t%d,%d",
+	       msl_name_table[msl]->name,
+	       scale(char_table[i].width),
+	       scale(char_table[i].ascent));
+	int depth = scale(- char_table[i].descent);
+	if (depth < 0)
+	  depth = 0;
+	int italic_correction = 0;
+	int left_italic_correction = 0;
+	int subscript_correction = 0;
+	if (italic_flag) {
+	  italic_correction = scale(char_table[i].right_extent 
+				    - char_table[i].width
+				    + italic_sep);
+	  if (italic_correction < 0)
+	    italic_correction = 0;
+	  subscript_correction = int((tag_info(x_height_tag).value
+				      * slant * .8) + .5);
+	  if (subscript_correction > italic_correction)
+	    subscript_correction = italic_correction;
+	  left_italic_correction = scale(italic_sep
+					 - char_table[i].left_extent);
+	}
+	if (subscript_correction != 0)
+	  printf(",%d,%d,%d,%d",
+		 depth, italic_correction, left_italic_correction,
+		 subscript_correction);
+	else if (left_italic_correction != 0)
+	  printf(",%d,%d,%d", depth, italic_correction, left_italic_correction);
+	else if (italic_correction != 0)
+	  printf(",%d,%d", depth, italic_correction);
+	else if (depth != 0)
+	  printf(",%d", depth);
+	// This is fairly arbitrary.  Fortunately it doesn't much matter.
+	unsigned type = 0;
+	if (char_table[i].ascent > (int16(tag_info(lower_ascent_tag).value)*9)/10)
+	  type |= 2;
+	if (char_table[i].descent < (int16(tag_info(lower_descent_tag).value)*9)/10)
+	  type |= 1;
+	printf("\t%d\t%d\n",
+	       type,
+	       char_table[i].symbol_set*256 + char_table[i].code);
+	for (name_list *p = msl_name_table[msl]->next; p; p = p->next)
+	  printf("%s\t\"\n", p->name);
+      }
+      else
+	warning("MSL %1 not in any of the searched symbol sets", msl);
+    }
+  }
+}
+
+static
+void dump_tags(File &f)
+{
+  int i;
+  for (i = min_tag; i <= max_tag; i++) {
+    enum tag_type t = tag_type(i);
+    if (tag_info(t).present) {
+      fprintf(stderr,
+	      "%d %d %d %d\n", i, tag_info(t).type, tag_info(t).count,
+	      tag_info(t).value);
+      if (tag_info(t).type == FLOAT_TYPE
+	  && tag_info(t).count == 1) {
+	f.seek(tag_info(t).value);
+	uint32 num = f.get_uint32();
+	uint32 den = f.get_uint32();
+	fprintf(stderr, "(%u/%u = %g)\n", num, den, (double)num/den);
+      }
+    }
+  }
+}
+
+static
+int read_map(const char *file)
+{
+  errno = 0;
+  FILE *fp = fopen(file, "r");
+  if (!fp) {
+    error("can't open `%1': %2", file, strerror(errno));
+    return 0;
+  }
+  current_filename = file;
+  char buf[512];
+  current_lineno = 0;
+  while (fgets(buf, int(sizeof(buf)), fp)) {
+    current_lineno++;
+    char *ptr = buf;
+    while (csspace(*ptr))
+      ptr++;
+    if (*ptr == '\0' || *ptr == '#')
+      continue;
+    ptr = strtok(ptr, " \n\t");
+    if (!ptr)
+      continue;
+    int n;
+    if (sscanf(ptr, "%d", &n) != 1) {
+      error("bad map file");
+      fclose(fp);
+      return 0;
+    }
+    if (n < 0) {
+      error("negative code");
+      fclose(fp);
+      return 0;
+    }
+    if ((size_t)n >= msl_name_table_size) {
+      size_t old_size = msl_name_table_size;
+      name_list **old_table = msl_name_table;
+      msl_name_table_size = n + 256;
+      msl_name_table = new name_list *[msl_name_table_size];
+      if (old_table) {
+	memcpy(msl_name_table, old_table, old_size*sizeof(name_list *));
+	a_delete old_table;
+      }
+      for (size_t i = old_size; i < msl_name_table_size; i++)
+	msl_name_table[i] = 0;
+    }
+    ptr = strtok(0, " \n\t");
+    if (!ptr) {
+      error("missing names");
+      fclose(fp);
+      return 0;
+    }
+    for (; ptr; ptr = strtok(0, " \n\t"))
+      msl_name_table[n] = new name_list(ptr, msl_name_table[n]);
+  }
+  fclose(fp);
+  return 1;
+}
+
+static
+const char *xbasename(const char *s)
+{
+  // DIR_SEPS[] are possible directory separator characters, see
+  // nonposix.h.  We want the rightmost separator of all possible
+  // ones.  Example: d:/foo\\bar.
+  const char *b = strrchr(s, DIR_SEPS[0]), *b1;
+  const char *sep = &DIR_SEPS[1];
+
+  while (*sep)
+    {
+      b1 = strrchr(s, *sep);
+      if (b1 && (!b || b1 > b))
+	b = b1;
+      sep++;
+    }
+  return b ? b + 1 : s;
+}
diff --git a/contrib/groff/src/utils/hpftodit/hpftodit.man b/contrib/groff/src/utils/hpftodit/hpftodit.man
index b9ea522..c069752 100644
--- a/contrib/groff/src/utils/hpftodit/hpftodit.man
+++ b/contrib/groff/src/utils/hpftodit/hpftodit.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1994-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1994-2000, 2001, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -146,7 +146,7 @@ This program was written without the benefit of complete, official
 documentation on the tagged font metric format.
 It is therefore likely that it will fail to work on tfm files that are
 dissimilar to those for the internal fonts on the Laserjet 4,
-with which it was tested:
+with which it was tested.
 .LP
 TrueType tfm files are not supported.
 .SH "SEE ALSO"
diff --git a/contrib/groff/src/utils/indxbib/Makefile.sub b/contrib/groff/src/utils/indxbib/Makefile.sub
index 01e43b2..7736e48 100644
--- a/contrib/groff/src/utils/indxbib/Makefile.sub
+++ b/contrib/groff/src/utils/indxbib/Makefile.sub
@@ -6,7 +6,7 @@ OBJS=\
   indxbib.$(OBJEXT) \
   signal.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/indxbib.cc
+  $(srcdir)/indxbib.cpp
 CSRCS=\
   $(srcdir)/signal.c
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/utils/indxbib/indxbib.cpp b/contrib/groff/src/utils/indxbib/indxbib.cpp
new file mode 100644
index 0000000..2a60c15
--- /dev/null
+++ b/contrib/groff/src/utils/indxbib/indxbib.cpp
@@ -0,0 +1,790 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "posix.h"
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "cmap.h"
+
+#include "defs.h"
+#include "index.h"
+
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+#define DEFAULT_HASH_TABLE_SIZE 997
+#define TEMP_INDEX_TEMPLATE "indxbibXXXXXX"
+
+// (2^n - MALLOC_OVERHEAD) should be a good argument for malloc().
+
+#define MALLOC_OVERHEAD 16
+
+#ifdef BLOCK_SIZE
+#undef BLOCK_SIZE
+#endif
+
+const int BLOCK_SIZE = ((1024 - MALLOC_OVERHEAD - sizeof(struct block *)
+			 - sizeof(int)) / sizeof(int));
+struct block {
+  block *next;
+  int used;
+  int v[BLOCK_SIZE];
+  
+  block(block *p = 0) : next(p), used(0) { }
+};
+
+struct block;
+
+union table_entry {
+  block *ptr;
+  int count;
+};
+
+struct word_list {
+  word_list *next;
+  char *str;
+  int len;
+  word_list(const char *, int, word_list *);
+};
+
+table_entry *hash_table;
+int hash_table_size = DEFAULT_HASH_TABLE_SIZE;
+// We make this the same size as hash_table so we only have to do one
+// mod per key.
+static word_list **common_words_table = 0;
+char *key_buffer;
+
+FILE *indxfp;
+int ntags = 0;
+string filenames;
+char *temp_index_file = 0;
+
+const char *ignore_fields = "XYZ";
+const char *common_words_file = COMMON_WORDS_FILE;
+int n_ignore_words = 100;
+int truncate_len = 6;
+int shortest_len = 3;
+int max_keys_per_item = 100;
+
+static void usage(FILE *stream);
+static void write_hash_table();
+static void init_hash_table();
+static void read_common_words_file();
+static int store_key(char *s, int len);
+static void possibly_store_key(char *s, int len);
+static int do_whole_file(const char *filename);
+static int do_file(const char *filename);
+static void store_reference(int filename_index, int pos, int len);
+static void check_integer_arg(char opt, const char *arg, int min, int *res);
+static void store_filename(const char *);
+static void fwrite_or_die(const void *ptr, int size, int nitems, FILE *fp);
+static char *get_cwd();
+
+extern "C" {
+  void cleanup();
+  void catch_fatal_signals();
+  void ignore_fatal_signals();
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  
+  const char *basename = 0;
+  typedef int (*parser_t)(const char *);
+  parser_t parser = do_file;
+  const char *directory = 0;
+  const char *foption = 0;
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "c:o:h:i:k:l:t:n:c:d:f:vw",
+			    long_options, NULL))
+	 != EOF)
+    switch (opt) {
+    case 'c':
+      common_words_file = optarg;
+      break;
+    case 'd':
+      directory = optarg;
+      break;
+    case 'f':
+      foption = optarg;
+      break;
+    case 'h':
+      check_integer_arg('h', optarg, 1, &hash_table_size);
+      if (!is_prime(hash_table_size)) {
+	while (!is_prime(++hash_table_size))
+	  ;
+	warning("%1 not prime: using %2 instead", optarg, hash_table_size);
+      }
+      break;
+    case 'i':
+      ignore_fields = optarg;
+      break;
+    case 'k':
+      check_integer_arg('k', optarg, 1, &max_keys_per_item);
+      break;
+    case 'l':
+      check_integer_arg('l', optarg, 0, &shortest_len);
+      break;
+    case 'n':
+      check_integer_arg('n', optarg, 0, &n_ignore_words);
+      break;
+    case 'o':
+      basename = optarg;
+      break;
+    case 't':
+      check_integer_arg('t', optarg, 1, &truncate_len);
+      break;
+    case 'w':
+      parser = do_whole_file;
+      break;
+    case 'v':
+      printf("GNU indxbib (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+      break;
+    }
+  if (optind >= argc && foption == 0)
+    fatal("no files and no -f option");
+  if (!directory) {
+    char *path = get_cwd();
+    store_filename(path);
+    a_delete path;
+  }
+  else
+    store_filename(directory);
+  init_hash_table();
+  store_filename(common_words_file);
+  store_filename(ignore_fields);
+  key_buffer = new char[truncate_len];
+  read_common_words_file();
+  if (!basename)
+    basename = optind < argc ? argv[optind] : DEFAULT_INDEX_NAME;
+  const char *p = strrchr(basename, DIR_SEPS[0]), *p1;
+  const char *sep = &DIR_SEPS[1];
+  while (*sep) {
+    p1 = strrchr(basename, *sep);
+    if (p1 && (!p || p1 > p))
+      p = p1;
+    sep++;
+  }
+  size_t name_max;
+  if (p) {
+    char *dir = strsave(basename);
+    dir[p - basename] = '\0';
+    name_max = file_name_max(dir);
+    a_delete dir;
+  }
+  else
+    name_max = file_name_max(".");
+  const char *filename = p ? p + 1 : basename;
+  if (strlen(filename) + sizeof(INDEX_SUFFIX) - 1 > name_max)
+    fatal("`%1.%2' is too long for a filename", filename, INDEX_SUFFIX);
+  if (p) {
+    p++;
+    temp_index_file = new char[p - basename + sizeof(TEMP_INDEX_TEMPLATE)];
+    memcpy(temp_index_file, basename, p - basename);
+    strcpy(temp_index_file + (p - basename), TEMP_INDEX_TEMPLATE);
+  }
+  else {
+    temp_index_file = strsave(TEMP_INDEX_TEMPLATE);
+  }
+  catch_fatal_signals();
+  int fd = mkstemp(temp_index_file);
+  if (fd < 0)
+    fatal("can't create temporary index file: %1", strerror(errno));
+  indxfp = fdopen(fd, FOPEN_WB);
+  if (indxfp == 0)
+    fatal("fdopen failed");
+  if (fseek(indxfp, sizeof(index_header), 0) < 0)
+    fatal("can't seek past index header: %1", strerror(errno));
+  int failed = 0;
+  if (foption) {
+    FILE *fp = stdin;
+    if (strcmp(foption, "-") != 0) {
+      errno = 0;
+      fp = fopen(foption, "r");
+      if (!fp)
+	fatal("can't open `%1': %2", foption, strerror(errno));
+    }
+    string path;
+    int lineno = 1;
+    for (;;) {
+      int c;
+      for (c = getc(fp); c != '\n' && c != EOF; c = getc(fp)) {
+	if (c == '\0')
+	  error_with_file_and_line(foption, lineno,
+				   "nul character in pathname ignored");
+	else
+	  path += c;
+      }
+      if (path.length() > 0) {
+	path += '\0';
+	if (!(*parser)(path.contents()))
+	  failed = 1;
+	path.clear();
+      }
+      if (c == EOF)
+	break;
+      lineno++;
+    }
+    if (fp != stdin)
+      fclose(fp);
+  }
+  for (int i = optind; i < argc; i++)
+    if (!(*parser)(argv[i]))
+      failed = 1;
+  write_hash_table();
+  if (fclose(indxfp) < 0)
+    fatal("error closing temporary index file: %1", strerror(errno));
+  char *index_file = new char[strlen(basename) + sizeof(INDEX_SUFFIX)];    
+  strcpy(index_file, basename);
+  strcat(index_file, INDEX_SUFFIX);
+#ifdef HAVE_RENAME
+#ifdef __EMX__
+  if (access(index_file, R_OK) == 0)
+    unlink(index_file);
+#endif /* __EMX__ */
+  if (rename(temp_index_file, index_file) < 0) {
+#ifdef __MSDOS__
+    // RENAME could fail on plain MSDOS filesystems because
+    // INDEX_FILE is an invalid filename, e.g. it has multiple dots.
+    char *fname = p ? index_file + (p - basename) : 0;
+    char *dot = 0;
+
+    // Replace the dot with an underscore and try again.
+    if (fname
+        && (dot = strchr(fname, '.')) != 0
+        && strcmp(dot, INDEX_SUFFIX) != 0)
+      *dot = '_';
+    if (rename(temp_index_file, index_file) < 0)
+#endif
+    fatal("can't rename temporary index file: %1", strerror(errno));
+  }
+#else /* not HAVE_RENAME */
+  ignore_fatal_signals();
+  if (unlink(index_file) < 0) {
+    if (errno != ENOENT)
+      fatal("can't unlink `%1': %2", index_file, strerror(errno));
+  }
+  if (link(temp_index_file, index_file) < 0)
+    fatal("can't link temporary index file: %1", strerror(errno));
+  if (unlink(temp_index_file) < 0)
+    fatal("can't unlink temporary index file: %1", strerror(errno));
+#endif /* not HAVE_RENAME */
+  temp_index_file = 0;
+  return failed;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream,
+"usage: %s [-vw] [-c file] [-d dir] [-f file] [-h n] [-i XYZ] [-k n]\n"
+"       [-l n] [-n n] [-o base] [-t n] [files...]\n",
+	  program_name);
+}
+
+static void check_integer_arg(char opt, const char *arg, int min, int *res)
+{
+  char *ptr;
+  long n = strtol(arg, &ptr, 10);
+  if (n == 0 && ptr == arg)
+    error("argument to -%1 not an integer", opt);
+  else if (n < min)
+    error("argument to -%1 must not be less than %2", opt, min);
+  else {
+    if (n > INT_MAX)
+      error("argument to -%1 greater than maximum integer", opt);
+    else if (*ptr != '\0')
+      error("junk after integer argument to -%1", opt);
+    *res = int(n);
+  }
+}
+
+static char *get_cwd()
+{
+  char *buf;
+  int size = 12;
+
+  for (;;) {
+    buf = new char[size];
+    if (getcwd(buf, size))
+      break;
+    if (errno != ERANGE)
+      fatal("cannot get current working directory: %1", strerror(errno));
+    a_delete buf;
+    if (size == INT_MAX)
+      fatal("current working directory longer than INT_MAX");
+    if (size > INT_MAX/2)
+      size = INT_MAX;
+    else
+      size *= 2;
+  }
+  return buf;
+}
+
+word_list::word_list(const char *s, int n, word_list *p)
+: next(p), len(n)
+{
+  str = new char[n];
+  memcpy(str, s, n);
+}
+
+static void read_common_words_file()
+{
+  if (n_ignore_words <= 0)
+    return;
+  errno = 0;
+  FILE *fp = fopen(common_words_file, "r");
+  if (!fp)
+    fatal("can't open `%1': %2", common_words_file, strerror(errno));
+  common_words_table = new word_list * [hash_table_size];
+  for (int i = 0; i < hash_table_size; i++)
+    common_words_table[i] = 0;
+  int count = 0;
+  int key_len = 0;
+  for (;;) {
+    int c = getc(fp);
+    while (c != EOF && !csalnum(c))
+      c = getc(fp);
+    if (c == EOF)
+      break;
+    do {
+      if (key_len < truncate_len)
+	key_buffer[key_len++] = cmlower(c);
+      c = getc(fp);
+    } while (c != EOF && csalnum(c));
+    if (key_len >= shortest_len) {
+      int h = hash(key_buffer, key_len) % hash_table_size;
+      common_words_table[h] = new word_list(key_buffer, key_len,
+					    common_words_table[h]);
+    }
+    if (++count >= n_ignore_words)
+      break;
+    key_len = 0;
+    if (c == EOF)
+      break;
+  }
+  n_ignore_words = count;
+  fclose(fp);
+}
+
+static int do_whole_file(const char *filename)
+{
+  errno = 0;
+  FILE *fp = fopen(filename, "r");
+  if (!fp) {
+    error("can't open `%1': %2", filename, strerror(errno));
+    return 0;
+  }
+  int count = 0;
+  int key_len = 0;
+  int c;
+  while ((c = getc(fp)) != EOF) {
+    if (csalnum(c)) {
+      key_len = 1;
+      key_buffer[0] = c;
+      while ((c = getc(fp)) != EOF) {
+	if (!csalnum(c))
+	  break;
+	if (key_len < truncate_len)
+	  key_buffer[key_len++] = c;
+      }
+      if (store_key(key_buffer, key_len)) {
+	if (++count >= max_keys_per_item)
+	  break;
+      }
+      if (c == EOF)
+	break;
+    }
+  }
+  store_reference(filenames.length(), 0, 0);
+  store_filename(filename);
+  fclose(fp);
+  return 1;
+}
+
+static int do_file(const char *filename)
+{
+  errno = 0;
+  // Need binary I/O for MS-DOS/MS-Windows, because indxbib relies on
+  // byte counts to be consistent with fseek.
+  FILE *fp = fopen(filename, FOPEN_RB);
+  if (fp == 0) {
+    error("can't open `%1': %2", filename, strerror(errno));
+    return 0;
+  }
+  int filename_index = filenames.length();
+  store_filename(filename);
+
+  enum {
+    START,	// at the start of the file; also in between references
+    BOL,	// in the middle of a reference, at the beginning of the line
+    PERCENT,	// seen a percent at the beginning of the line
+    IGNORE,	// ignoring a field
+    IGNORE_BOL,	// at the beginning of a line ignoring a field
+    KEY,	// in the middle of a key
+    DISCARD,	// after truncate_len bytes of a key
+    MIDDLE	// in between keys
+  } state = START;
+  
+  // In states START, BOL, IGNORE_BOL, space_count how many spaces at
+  // the beginning have been seen.  In states PERCENT, IGNORE, KEY,
+  // MIDDLE space_count must be 0.
+  int space_count = 0;
+  int byte_count = 0;		// bytes read
+  int key_len = 0;
+  int ref_start = -1;		// position of start of current reference
+  for (;;) {
+    int c = getc(fp);
+    if (c == EOF)
+      break;
+    // We opened the file in binary mode, so we need to skip
+    // every CR character before a Newline.
+    if (c == '\r') {
+      int peek = getc(fp);
+      if (peek == '\n') {
+	byte_count++;
+	c = peek;
+      }
+      else
+	ungetc(peek, fp);
+    }
+#if defined(__MSDOS__) || defined(_MSC_VER) || defined(__EMX__)
+    else if (c == 0x1a)	// ^Z means EOF in text files
+      break;
+#endif
+    byte_count++;
+    switch (state) {
+    case START:
+      if (c == ' ' || c == '\t') {
+	space_count++;
+	break;
+      }
+      if (c == '\n') {
+	space_count = 0;
+	break;
+      }
+      ref_start = byte_count - space_count - 1;
+      space_count = 0;
+      if (c == '%')
+	state = PERCENT;
+      else if (csalnum(c)) {
+	state = KEY;
+	key_buffer[0] = c;
+	key_len = 1;
+      }
+      else
+	state = MIDDLE;
+      break;
+    case BOL:
+      switch (c) {
+      case '%':
+	if (space_count > 0) {
+	  space_count = 0;
+	  state = MIDDLE;
+	}
+	else
+	  state = PERCENT;
+	break;
+      case ' ':
+      case '\t':
+	space_count++;
+	break;
+      case '\n':
+	store_reference(filename_index, ref_start,
+			byte_count - 1 - space_count - ref_start);
+	state = START;
+	space_count = 0;
+	break;
+      default:
+	space_count = 0;
+	if (csalnum(c)) {
+	  state = KEY;
+	  key_buffer[0] = c;
+	  key_len = 1;
+	}
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case PERCENT:
+      if (strchr(ignore_fields, c) != 0)
+	state = IGNORE;
+      else if (c == '\n')
+	state = BOL;
+      else
+	state = MIDDLE;
+      break;
+    case IGNORE:
+      if (c == '\n')
+	state = IGNORE_BOL;
+      break;
+    case IGNORE_BOL:
+      switch (c) {
+      case '%':
+	if (space_count > 0) {
+	  state = IGNORE;
+	  space_count = 0;
+	}
+	else
+	  state = PERCENT;
+	break;
+      case ' ':
+      case '\t':
+	space_count++;
+	break;
+      case '\n':
+	store_reference(filename_index, ref_start,
+			byte_count - 1 - space_count - ref_start);
+	state = START;
+	space_count = 0;
+	break;
+      default:
+	space_count = 0;
+	state = IGNORE;
+      }
+      break;
+    case KEY:
+      if (csalnum(c)) {
+	if (key_len < truncate_len)
+	  key_buffer[key_len++] = c;
+	else
+	  state = DISCARD;
+      }
+      else {
+	possibly_store_key(key_buffer, key_len);
+	key_len = 0;
+	if (c == '\n')
+	  state = BOL;
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case DISCARD:
+      if (!csalnum(c)) {
+	possibly_store_key(key_buffer, key_len);
+	key_len = 0;
+	if (c == '\n')
+	  state = BOL;
+	else
+	  state = MIDDLE;
+      }
+      break;
+    case MIDDLE:
+      if (csalnum(c)) {
+	state = KEY;
+	key_buffer[0] = c;
+	key_len = 1;
+      }
+      else if (c == '\n')
+	state = BOL;
+      break;
+    default:
+      assert(0);
+    }
+  }
+  switch (state) {
+  case START:
+    break;
+  case DISCARD:
+  case KEY:
+    possibly_store_key(key_buffer, key_len);
+    // fall through
+  case BOL:
+  case PERCENT:
+  case IGNORE_BOL:
+  case IGNORE:
+  case MIDDLE:
+    store_reference(filename_index, ref_start,
+		    byte_count - ref_start - space_count);
+    break;
+  default:
+    assert(0);
+  }
+  fclose(fp);
+  return 1;
+}
+
+static void store_reference(int filename_index, int pos, int len)
+{
+  tag t;
+  t.filename_index = filename_index;
+  t.start = pos;
+  t.length = len;
+  fwrite_or_die(&t, sizeof(t), 1, indxfp);
+  ntags++;
+}
+
+static void store_filename(const char *fn)
+{
+  filenames += fn;
+  filenames += '\0';
+}
+
+static void init_hash_table()
+{
+  hash_table = new table_entry[hash_table_size];
+  for (int i = 0; i < hash_table_size; i++)
+    hash_table[i].ptr = 0;
+}
+
+static void possibly_store_key(char *s, int len)
+{
+  static int last_tagno = -1;
+  static int key_count;
+  if (last_tagno != ntags) {
+    last_tagno = ntags;
+    key_count = 0;
+  }
+  if (key_count < max_keys_per_item) {
+    if (store_key(s, len))
+      key_count++;
+  }
+}
+
+static int store_key(char *s, int len)
+{
+  if (len < shortest_len)
+    return 0;
+  int is_number = 1;
+  for (int i = 0; i < len; i++)
+    if (!csdigit(s[i])) {
+      is_number = 0;
+      s[i] = cmlower(s[i]);
+    }
+  if (is_number && !(len == 4 && s[0] == '1' && s[1] == '9'))
+    return 0;
+  int h = hash(s, len) % hash_table_size;
+  if (common_words_table) {
+    for (word_list *ptr = common_words_table[h]; ptr; ptr = ptr->next)
+      if (len == ptr->len && memcmp(s, ptr->str, len) == 0)
+	return 0;
+  }
+  table_entry *pp =  hash_table + h;
+  if (!pp->ptr)
+    pp->ptr = new block;
+  else if (pp->ptr->v[pp->ptr->used - 1] == ntags)
+    return 1;
+  else if (pp->ptr->used >= BLOCK_SIZE)
+    pp->ptr = new block(pp->ptr);
+  pp->ptr->v[(pp->ptr->used)++] = ntags;
+  return 1;
+}
+
+static void write_hash_table()
+{
+  const int minus_one = -1;
+  int li = 0;
+  for (int i = 0; i < hash_table_size; i++) {
+    block *ptr = hash_table[i].ptr;
+    if (!ptr)
+      hash_table[i].count = -1;
+    else {
+      hash_table[i].count = li;
+      block *rev = 0;
+      while (ptr) {
+	block *tem = ptr;
+	ptr = ptr->next;
+	tem->next = rev;
+	rev = tem;
+      }
+      while (rev) {
+	fwrite_or_die(rev->v, sizeof(int), rev->used, indxfp);
+	li += rev->used;
+	block *tem = rev;
+	rev = rev->next;
+	delete tem;
+      }
+      fwrite_or_die(&minus_one, sizeof(int), 1, indxfp);
+      li += 1;
+    }
+  }
+  if (sizeof(table_entry) == sizeof(int))
+    fwrite_or_die(hash_table, sizeof(int), hash_table_size, indxfp);
+  else {
+    // write it out word by word
+    for (int i = 0; i < hash_table_size; i++)
+      fwrite_or_die(&hash_table[i].count, sizeof(int), 1, indxfp);
+  }
+  fwrite_or_die(filenames.contents(), 1, filenames.length(), indxfp);
+  if (fseek(indxfp, 0, 0) < 0)
+    fatal("error seeking on index file: %1", strerror(errno));
+  index_header h;
+  h.magic = INDEX_MAGIC;
+  h.version = INDEX_VERSION;
+  h.tags_size = ntags;
+  h.lists_size = li;
+  h.table_size = hash_table_size;
+  h.strings_size = filenames.length();
+  h.truncate = truncate_len;
+  h.shortest = shortest_len;
+  h.common = n_ignore_words;
+  fwrite_or_die(&h, sizeof(h), 1, indxfp);
+}
+
+static void fwrite_or_die(const void *ptr, int size, int nitems, FILE *fp)
+{
+  if (fwrite(ptr, size, nitems, fp) != (size_t)nitems)
+    fatal("fwrite failed: %1", strerror(errno));
+}
+
+void fatal_error_exit()
+{
+  cleanup();
+  exit(3);
+}
+
+extern "C" {
+
+void cleanup()
+{
+  if (temp_index_file)
+    unlink(temp_index_file);
+}
+
+}
diff --git a/contrib/groff/src/utils/lkbib/Makefile.sub b/contrib/groff/src/utils/lkbib/Makefile.sub
index 899236a..4964ee0 100644
--- a/contrib/groff/src/utils/lkbib/Makefile.sub
+++ b/contrib/groff/src/utils/lkbib/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=lkbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lkbib.$(OBJEXT)
-CCSRCS=$(srcdir)/lkbib.cc
+CCSRCS=$(srcdir)/lkbib.cpp
diff --git a/contrib/groff/src/utils/lkbib/lkbib.cpp b/contrib/groff/src/utils/lkbib/lkbib.cpp
new file mode 100644
index 0000000..42156ea
--- /dev/null
+++ b/contrib/groff/src/utils/lkbib/lkbib.cpp
@@ -0,0 +1,137 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "errarg.h"
+#include "error.h"
+
+#include "defs.h"
+#include "refid.h"
+#include "search.h"
+
+extern "C" const char *Version_string;
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-nv] [-p database] [-i XYZ] [-t N] keys ...\n",
+	  program_name);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int search_default = 1;
+  search_list list;
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "nvVi:t:p:", long_options, NULL))
+	 != EOF)
+    switch (opt) {
+    case 'V':
+      verify_flag = 1;
+      break;
+    case 'n':
+      search_default = 0;
+      break;
+    case 'i':
+      linear_ignore_fields = optarg;
+      break;
+    case 't':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if (n == 0 && ptr == optarg) {
+	  error("bad integer `%1' in `t' option", optarg);
+	  break;
+	}
+	if (n < 1)
+	  n = 1;
+	linear_truncate_len = int(n);
+	break;
+      }
+    case 'v':
+      {
+	printf("GNU lkbib (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'p':
+      list.add_file(optarg);
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  if (optind >= argc) {
+    usage(stderr);
+    exit(1);
+  }
+  char *filename = getenv("REFER");
+  if (filename)
+    list.add_file(filename);
+  else if (search_default)
+    list.add_file(DEFAULT_INDEX, 1);
+  if (list.nfiles() == 0)
+    fatal("no databases");
+  int total_len = 0;
+  int i;
+  for (i = optind; i < argc; i++)
+    total_len += strlen(argv[i]);
+  total_len += argc - optind - 1 + 1; // for spaces and '\0'
+  char *buffer = new char[total_len];
+  char *ptr = buffer;
+  for (i = optind; i < argc; i++) {
+    if (i > optind)
+      *ptr++ = ' ';
+    strcpy(ptr, argv[i]);
+    ptr = strchr(ptr, '\0');
+  }
+  search_list_iterator iter(&list, buffer);
+  const char *start;
+  int len;
+  int count;
+  for (count = 0; iter.next(&start, &len); count++) {
+    if (fwrite(start, 1, len, stdout) != (size_t)len)
+      fatal("write error on stdout: %1", strerror(errno));
+    // Can happen for last reference in file.
+    if (start[len - 1] != '\n')
+      putchar('\n');
+    putchar('\n');
+  }
+  return !count;
+}
diff --git a/contrib/groff/src/utils/lookbib/Makefile.sub b/contrib/groff/src/utils/lookbib/Makefile.sub
index 7a08f0a..9ca2d88 100644
--- a/contrib/groff/src/utils/lookbib/Makefile.sub
+++ b/contrib/groff/src/utils/lookbib/Makefile.sub
@@ -3,5 +3,5 @@ MAN1=lookbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lookbib.$(OBJEXT)
-CCSRCS=$(srcdir)/lookbib.cc
+CCSRCS=$(srcdir)/lookbib.cpp
 NAMEPREFIX=$(g)
diff --git a/contrib/groff/src/utils/lookbib/lookbib.cpp b/contrib/groff/src/utils/lookbib/lookbib.cpp
new file mode 100644
index 0000000..65e89bc
--- /dev/null
+++ b/contrib/groff/src/utils/lookbib/lookbib.cpp
@@ -0,0 +1,141 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "errarg.h"
+#include "error.h"
+#include "cset.h"
+
+#include "refid.h"
+#include "search.h"
+
+/* for isatty() */
+#include "posix.h"
+
+extern "C" {
+  const char *Version_string;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-v] [-i XYZ] [-t N] database ...\n",
+	  program_name);
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "vVi:t:", long_options, NULL)) != EOF)
+    switch (opt) {
+    case 'V':
+      verify_flag = 1;
+      break;
+    case 'i':
+      linear_ignore_fields = optarg;
+      break;
+    case 't':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 10);
+	if (n == 0 && ptr == optarg) {
+	  error("bad integer `%1' in `t' option", optarg);
+	  break;
+	}
+	if (n < 1)
+	  n = 1;
+	linear_truncate_len = int(n);
+	break;
+      }
+    case 'v':
+      {
+	printf("GNU lookbib (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  if (optind >= argc) {
+    usage(stderr);
+    exit(1);
+  }
+  search_list list;
+  for (int i = optind; i < argc; i++)
+    list.add_file(argv[i]);
+  if (list.nfiles() == 0)
+    fatal("no databases");
+  char line[1024];
+  int interactive = isatty(fileno(stdin));
+  for (;;) {
+    if (interactive) {
+      fputs("> ", stderr);
+      fflush(stderr);
+    }
+    if (!fgets(line, sizeof(line), stdin))
+      break;
+    char *ptr = line;
+    while (csspace(*ptr))
+      ptr++;
+    if (*ptr == '\0')
+      continue;
+    search_list_iterator iter(&list, line);
+    const char *start;
+    int len;
+    int count;
+    for (count = 0; iter.next(&start, &len); count++) {
+      if (fwrite(start, 1, len, stdout) != (size_t)len)
+	fatal("write error on stdout: %1", strerror(errno));
+      // Can happen for last reference in file.
+      if (start[len - 1] != '\n')
+	putchar('\n');
+      putchar('\n');
+    }
+    fflush(stdout);
+    if (interactive) {
+      fprintf(stderr, "%d found\n", count);
+      fflush(stderr);
+    }
+  }
+  if (interactive)
+    putc('\n', stderr);
+  return 0;
+}
+
diff --git a/contrib/groff/src/utils/pfbtops/pfbtops.c b/contrib/groff/src/utils/pfbtops/pfbtops.c
index 3417dcb..821d901 100644
--- a/contrib/groff/src/utils/pfbtops/pfbtops.c
+++ b/contrib/groff/src/utils/pfbtops/pfbtops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 2001, 2003 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -32,6 +32,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /* Binary bytes per output line. */
 #define BYTES_PER_LINE (64/2)
+#define MAX_LINE_LENGTH 78
 #define HEX_DIGITS "0123456789abcdef"
 
 static char *program_name;
@@ -48,6 +49,103 @@ static void usage(FILE *stream)
   fprintf(stream, "usage: %s [-v] [pfb_file]\n", program_name);
 }
 
+static void get_text(int n)
+{
+  int c, c1;
+  int in_string = 0;
+  int is_comment = 0;
+  int count = 0;
+
+  while (--n >= 0) {
+    c = getchar();
+    if (c == '(' && !is_comment)
+      in_string++;
+    else if (c == ')' && !is_comment)
+      in_string--;
+    else if (c == '%' && !in_string)
+      is_comment = 1;
+    else if (c == '\\' && in_string) {
+      count++;
+      putchar(c);
+      c = getchar();
+      /* don't split octal character representations */
+      if (c >= '0' && c <= '7') {
+	count++;
+	putchar(c);
+	c = getchar();
+	if (c >= '0' && c <= '7') {
+	  count++;
+	  putchar(c);
+	  c = getchar();
+	  if (c >= '0' && c <= '7') {
+	    count++;
+	    putchar(c);
+	    c = getchar();
+	  }
+	}
+      }
+    }
+    if (c == EOF)
+      error("end of file in text packet");
+    else if (c == '\r') {
+      c1 = getchar();
+      if (c1 != '\n')
+	ungetc(c1, stdin);
+      c = '\n';
+    }
+    if (c == '\n') {
+      count = 0;
+      is_comment = 0;
+    }
+    else if (count >= MAX_LINE_LENGTH) {
+      if (in_string > 0) {
+	count = 1;
+	putchar('\\');
+	putchar('\n');
+      }
+      else if (is_comment) {
+	count = 2;
+	putchar('\n');
+	putchar('%');
+      }
+      else {
+	/* split at the next whitespace character */
+	while (c != ' ' && c != '\t' && c != '\f') {
+	  putchar(c);
+	  c = getchar();
+	}
+	count = 0;
+	putchar('\n');
+	continue;
+      }
+    }
+    count++;
+    putchar(c);
+  }
+  if (c != '\n')
+    putchar('\n');
+}
+
+static void get_binary(int n)
+{
+  int c;
+  int count = 0;
+
+  while (--n >= 0) {
+    c = getchar();
+    if (c == EOF)
+      error("end of file in binary packet");
+    if (count >= BYTES_PER_LINE) {
+      putchar('\n');
+      count = 0;
+    }
+    count++;
+    putchar(HEX_DIGITS[(c >> 4) & 0xf]);
+    putchar(HEX_DIGITS[c & 0xf]);
+  }
+  putchar('\n');
+}
+
 int main(argc, argv)
      int argc;
      char **argv;
@@ -86,70 +184,36 @@ int main(argc, argv)
     usage(stderr);
     exit(1);
   }
-  if (argc > optind && !freopen(argv[optind], "r", stdin))
-    {
-      perror(argv[optind]);
-      exit(1);
-    }
-#ifdef SET_BINARY
+  if (argc > optind && !freopen(argv[optind], "r", stdin)) {
+    perror(argv[optind]);
+    exit(1);
+  }
   SET_BINARY(fileno(stdin));
-#endif
-  for (;;)
-    {
-      int type, c, i;
-      long n;
-
+  for (;;) {
+    int type, c, i;
+    long n;
+
+    c = getchar();
+    if (c != 0x80)
+      error("first byte of packet not 0x80");
+    type = getchar();
+    if (type == 3)
+      break;
+    if (type != 1 && type != 2)
+      error("bad packet type");
+    n = 0;
+    for (i = 0; i < 4; i++) {
       c = getchar();
-      if (c != 0x80)
-	error("first byte of packet not 0x80");
-      type = getchar();
-      if (type == 3)
-	break;
-      if (type != 1 && type != 2)
-	error("bad packet type");
-      n = 0;
-      for (i = 0; i < 4; i++)
-	{
-	  c = getchar();
-	  if (c == EOF)
-	    error("end of file in packet header");
-	  n |= (long)c << (i << 3);
-	}
-      if (n < 0)
-	error("negative packet length");
-      if (type == 1)
-	{
-	  while (--n >= 0)
-	    {
-	      c = getchar();
-	      if (c == EOF)
-		error("end of file in text packet");
-	      if (c == '\r')
-		c = '\n';
-	      putchar(c);
-	    }
-	  if (c != '\n')
-	    putchar('\n');
-	}
-      else
-	{
-	  int count = 0;
-	  while (--n >= 0)
-	    {
-	      c = getchar();
-	      if (c == EOF)
-		error("end of file in binary packet");
-	      if (count >= BYTES_PER_LINE)
-		{
-		  putchar('\n');
-		  count = 0;
-		}
-	      count++;
-	      putchar(HEX_DIGITS[(c >> 4) & 0xf]);
-	      putchar(HEX_DIGITS[c & 0xf]);
-	    }
-	  putchar('\n');
-	}
+      if (c == EOF)
+	error("end of file in packet header");
+      n |= (long)c << (i << 3);
     }
+    if (n < 0)
+      error("negative packet length");
+    if (type == 1)
+      get_text(n);
+    else
+      get_binary(n);
+  }
   exit(0);
 }
diff --git a/contrib/groff/src/utils/pfbtops/pfbtops.man b/contrib/groff/src/utils/pfbtops/pfbtops.man
index 9c7b2b8..627e5c5 100644
--- a/contrib/groff/src/utils/pfbtops/pfbtops.man
+++ b/contrib/groff/src/utils/pfbtops/pfbtops.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-1995, 2001, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -28,7 +28,8 @@ pfbtops \- translate a PostScript font in .pfb format to ASCII
 .B pfbtops
 translates a PostScript font in
 .B .pfb
-format to ASCII.
+format to ASCII, splitting overlong lines in text packets into smaller
+chunks.
 If
 .I pfb_file
 is omitted the pfb file will be read from the standard input.
diff --git a/contrib/groff/src/utils/tfmtodit/Makefile.sub b/contrib/groff/src/utils/tfmtodit/Makefile.sub
index ee56ce6..1612104 100644
--- a/contrib/groff/src/utils/tfmtodit/Makefile.sub
+++ b/contrib/groff/src/utils/tfmtodit/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=tfmtodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=tfmtodit.$(OBJEXT)
-CCSRCS=$(srcdir)/tfmtodit.cc
+CCSRCS=$(srcdir)/tfmtodit.cpp
diff --git a/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp b/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp
new file mode 100644
index 0000000..9fbbe25
--- /dev/null
+++ b/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp
@@ -0,0 +1,874 @@
+// -*- C++ -*-
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* I have tried to incorporate the changes needed for TeX 3.0 tfm files,
+but I haven't tested them. */
+
+/* Groff requires more font metric information than TeX.  The reason
+for this is that TeX has separate Math Italic fonts, whereas groff
+uses normal italic fonts for math.  The two additional pieces of
+information required by groff correspond to the two arguments to the
+math_fit() macro in the Metafont programs for the CM fonts. In the
+case of a font for which math_fitting is false, these two arguments
+are normally ignored by Metafont. We need to get hold of these two
+parameters and put them in the groff font file.
+
+We do this by loading this definition after cmbase when creating cm.base.
+
+def ignore_math_fit(expr left_adjustment,right_adjustment) =
+ special "adjustment";
+ numspecial left_adjustment*16/designsize;
+ numspecial right_adjustment*16/designsize;
+ enddef;
+
+This puts the two arguments to the math_fit macro into the gf file.
+(They will appear in the gf file immediately before the character to
+which they apply.)  We then create a gf file using this cm.base.  Then
+we run tfmtodit and specify this gf file with the -g option.
+
+This need only be done for a font for which math_fitting is false;
+When it's true, the left_correction and subscript_correction should
+both be zero. */
+
+#include "lib.h"
+
+#include <stdlib.h>
+#include <math.h>
+#include <errno.h>
+#include "errarg.h"
+#include "error.h"
+#include "assert.h"
+#include "cset.h"
+#include "nonposix.h"
+
+extern "C" const char *Version_string;
+
+/* Values in the tfm file should be multiplied by this. */
+
+#define MULTIPLIER 1
+
+struct char_info_word {
+  unsigned char width_index;
+  char height_index;
+  char depth_index;
+  char italic_index;
+  char tag;
+  unsigned char remainder;
+};
+
+struct lig_kern_command {
+  unsigned char skip_byte;
+  unsigned char next_char;
+  unsigned char op_byte;
+  unsigned char remainder;
+};
+
+class tfm {
+  int bc;
+  int ec;
+  int nw;
+  int nh;
+  int nd;
+  int ni;
+  int nl;
+  int nk;
+  int np;
+  int cs;
+  int ds;
+  char_info_word *char_info;
+  int *width;
+  int *height;
+  int *depth;
+  int *italic;
+  lig_kern_command *lig_kern;
+  int *kern;
+  int *param;
+public:
+  tfm();
+  ~tfm();
+  int load(const char *);
+  int contains(int);
+  int get_width(int);
+  int get_height(int);
+  int get_depth(int);
+  int get_italic(int);
+  int get_param(int, int *);
+  int get_checksum();
+  int get_design_size();
+  int get_lig(unsigned char, unsigned char, unsigned char *);
+  friend class kern_iterator;
+};
+
+class kern_iterator {
+  tfm *t;
+  int c;
+  int i;
+public:
+  kern_iterator(tfm *);
+  int next(unsigned char *c1, unsigned char *c2, int *k);
+};
+
+
+kern_iterator::kern_iterator(tfm *p)
+: t(p), c(t->bc), i(-1)
+{
+}
+
+int kern_iterator::next(unsigned char *c1, unsigned char *c2, int *k)
+{
+  for (; c <= t->ec; c++)
+    if (t->char_info[c - t->bc].tag == 1) {
+      if (i < 0) {
+	i = t->char_info[c - t->bc].remainder;
+	if (t->lig_kern[i].skip_byte > 128)
+	  i = (256*t->lig_kern[i].op_byte
+		   + t->lig_kern[i].remainder);
+      }
+      for (;;) {
+	int skip = t->lig_kern[i].skip_byte;
+	if (skip <= 128 && t->lig_kern[i].op_byte >= 128) {
+	  *c1 = c;
+	  *c2 = t->lig_kern[i].next_char;
+	  *k = t->kern[256*(t->lig_kern[i].op_byte - 128)
+		       + t->lig_kern[i].remainder];
+	  if (skip == 128) {
+	    c++;
+	    i = -1;
+	  }
+	  else
+	    i += skip + 1;
+	  return 1;
+	}
+	if (skip >= 128)
+	  break;
+	i += skip + 1;
+      }
+      i = -1;
+    }
+  return 0;
+}
+	  
+tfm::tfm()
+: char_info(0), width(0), height(0), depth(0), italic(0), lig_kern(0),
+  kern(0), param(0)
+{
+}
+
+int tfm::get_lig(unsigned char c1, unsigned char c2, unsigned char *cp)
+{
+  if (contains(c1) && char_info[c1 - bc].tag == 1) {
+    int i = char_info[c1 - bc].remainder;
+    if (lig_kern[i].skip_byte > 128)
+      i = 256*lig_kern[i].op_byte + lig_kern[i].remainder;
+    for (;;) {
+      int skip = lig_kern[i].skip_byte;
+      if (skip > 128)
+	break;
+      // We are only interested in normal ligatures, for which
+      // op_byte == 0.
+      if (lig_kern[i].op_byte == 0
+	  && lig_kern[i].next_char == c2) {
+	*cp = lig_kern[i].remainder;
+	return 1;
+      }
+      if (skip == 128)
+	break;
+      i += skip + 1;
+    }
+  }
+  return 0;
+}
+
+int tfm::contains(int i)
+{
+  return i >= bc && i <= ec && char_info[i - bc].width_index != 0;
+}
+
+int tfm::get_width(int i)
+{
+  return width[char_info[i - bc].width_index];
+}
+
+int tfm::get_height(int i)
+{
+  return height[char_info[i - bc].height_index];
+}
+
+int tfm::get_depth(int i)
+{
+  return depth[char_info[i - bc].depth_index];
+}
+
+int tfm::get_italic(int i)
+{
+  return italic[char_info[i - bc].italic_index];
+}
+
+int tfm::get_param(int i, int *p)
+{
+  if (i <= 0 || i > np)
+    return 0;
+  else {
+    *p = param[i - 1];
+    return 1;
+  }
+}
+
+int tfm::get_checksum()
+{
+  return cs;
+}
+
+int tfm::get_design_size()
+{
+  return ds;
+}
+
+tfm::~tfm()
+{
+  a_delete char_info;
+  a_delete width;
+  a_delete height;
+  a_delete depth;
+  a_delete italic;
+  a_delete lig_kern;
+  a_delete kern;
+  a_delete param;
+}
+  
+int read2(unsigned char *&s)
+{
+  int n;
+  n = *s++ << 8;
+  n |= *s++;
+  return n;
+}
+
+int read4(unsigned char *&s)
+{
+  int n;
+  n = *s++ << 24;
+  n |= *s++ << 16;
+  n |= *s++ << 8;
+  n |= *s++;
+  return n;
+}
+
+
+int tfm::load(const char *file)
+{
+  errno = 0;
+  FILE *fp = fopen(file, FOPEN_RB);
+  if (!fp) {
+    error("can't open `%1': %2", file, strerror(errno));
+    return 0;
+  }
+  int c1 = getc(fp);
+  int c2 = getc(fp);
+  if (c1 == EOF || c2 == EOF) {
+    fclose(fp);
+    error("unexpected end of file on `%1'", file);
+    return 0;
+  }
+  int lf = (c1 << 8) + c2;
+  int toread = lf*4 - 2;
+  unsigned char *buf = new unsigned char[toread];
+  if (fread(buf, 1, toread, fp) != (size_t)toread) {
+    if (feof(fp))
+      error("unexpected end of file on `%1'", file);
+    else
+      error("error on file `%1'", file);
+    a_delete buf;
+    fclose(fp);
+    return 0;
+  }
+  fclose(fp);
+  if (lf < 6) {
+    error("bad tfm file `%1': impossibly short", file);
+    a_delete buf;
+    return 0;
+  }
+  unsigned char *ptr = buf;
+  int lh = read2(ptr);
+  bc = read2(ptr);
+  ec = read2(ptr);
+  nw = read2(ptr);
+  nh = read2(ptr);
+  nd = read2(ptr);
+  ni = read2(ptr);
+  nl = read2(ptr);
+  nk = read2(ptr);
+  int ne = read2(ptr);
+  np = read2(ptr);
+  if (6 + lh + (ec - bc + 1) + nw + nh + nd + ni + nl + nk + ne + np != lf) {
+    error("bad tfm file `%1': lengths do not sum", file);
+    a_delete buf;
+    return 0;
+  }
+  if (lh < 2) {
+    error("bad tfm file `%1': header too short", file);
+    a_delete buf;
+    return 0;
+  }
+  char_info = new char_info_word[ec - bc + 1];
+  width = new int[nw];
+  height = new int[nh];
+  depth = new int[nd];
+  italic = new int[ni];
+  lig_kern = new lig_kern_command[nl];
+  kern = new int[nk];
+  param = new int[np];
+  int i;
+  cs = read4(ptr);
+  ds = read4(ptr);
+  ptr += (lh-2)*4;
+  for (i = 0; i < ec - bc + 1; i++) {
+    char_info[i].width_index = *ptr++;
+    unsigned char tem = *ptr++;
+    char_info[i].depth_index = tem & 0xf;
+    char_info[i].height_index = tem >> 4;
+    tem = *ptr++;
+    char_info[i].italic_index = tem >> 2;
+    char_info[i].tag = tem & 3;
+    char_info[i].remainder = *ptr++;
+  }
+  for (i = 0; i < nw; i++)
+    width[i] = read4(ptr);
+  for (i = 0; i < nh; i++)
+    height[i] = read4(ptr);
+  for (i = 0; i < nd; i++)
+    depth[i] = read4(ptr);
+  for (i = 0; i < ni; i++)
+    italic[i] = read4(ptr);
+  for (i = 0; i < nl; i++) {
+    lig_kern[i].skip_byte = *ptr++;
+    lig_kern[i].next_char = *ptr++;
+    lig_kern[i].op_byte = *ptr++;
+    lig_kern[i].remainder = *ptr++;
+  }
+  for (i = 0; i < nk; i++)
+    kern[i] = read4(ptr);
+  ptr += ne*4;
+  for (i = 0; i < np; i++)
+    param[i] = read4(ptr);
+  assert(ptr == buf + lf*4 - 2);
+  a_delete buf;
+  return 1;
+}
+
+class gf {
+  int left[256];
+  int right[256];
+  static int sread4(int *p, FILE *fp);
+  static int uread3(int *p, FILE *fp);
+  static int uread2(int *p, FILE *fp);
+  static int skip(int n, FILE *fp);
+public:
+  gf();
+  int load(const char *file);
+  int get_left_adjustment(int i) { return left[i]; }
+  int get_right_adjustment(int i) { return right[i]; }
+};
+
+gf::gf()
+{
+  for (int i = 0; i < 256; i++)
+    left[i] = right[i] = 0;
+}
+
+int gf::load(const char *file)
+{
+  enum {
+    paint_0 = 0,
+    paint1 = 64,
+    boc = 67,
+    boc1 = 68,
+    eoc = 69,
+    skip0 = 70,
+    skip1 = 71,
+    new_row_0 = 74,
+    xxx1 = 239,
+    yyy = 243,
+    no_op = 244,
+    pre = 247,
+    post = 248
+  };
+  int got_an_adjustment = 0;
+  int pending_adjustment = 0;
+  int left_adj, right_adj;
+  const int gf_id_byte = 131;
+  errno = 0;
+  FILE *fp = fopen(file, FOPEN_RB);
+  if (!fp) {
+    error("can't open `%1': %2", file, strerror(errno));
+    return 0;
+  }
+  if (getc(fp) != pre || getc(fp) != gf_id_byte) {
+    error("bad gf file");
+    return 0;
+  }
+  int n = getc(fp);
+  if (n == EOF)
+    goto eof;
+  if (!skip(n, fp))
+    goto eof;
+  for (;;) {
+    int op = getc(fp);
+    if (op == EOF)
+      goto eof;
+    if (op == post)
+      break;
+    if ((op >= paint_0 && op <= paint_0 + 63)
+	|| (op >= new_row_0 && op <= new_row_0 + 164))
+      continue;
+    switch (op) {
+    case no_op:
+    case eoc:
+    case skip0:
+      break;
+    case paint1:
+    case skip1:
+      if (!skip(1, fp))
+	goto eof;
+      break;
+    case paint1 + 1:
+    case skip1 + 1:
+      if (!skip(2, fp))
+	goto eof;
+      break;
+    case paint1 + 2:
+    case skip1 + 2:
+      if (!skip(3, fp))
+	goto eof;
+      break;
+    case boc:
+      {
+	int code;
+	if (!sread4(&code, fp))
+	  goto eof;
+	if (pending_adjustment) {
+	  pending_adjustment = 0;
+	  left[code & 0377] = left_adj;
+	  right[code & 0377] = right_adj;
+	}
+	if (!skip(20, fp))
+	  goto eof;
+	break;
+      }
+    case boc1:
+      {
+	int code = getc(fp);
+	if (code == EOF)
+	  goto eof;
+	if (pending_adjustment) {
+	  pending_adjustment = 0;
+	  left[code] = left_adj;
+	  right[code] = right_adj;
+	}
+	if (!skip(4, fp))
+	  goto eof;
+	break;
+      }
+    case xxx1:
+      {
+	int len = getc(fp);
+	if (len == EOF)
+	  goto eof;
+	char buf[256];
+	if (fread(buf, 1, len, fp) != (size_t)len)
+	  goto eof;
+	if (len == 10 /* strlen("adjustment") */
+	    && memcmp(buf, "adjustment", len) == 0) {
+	  int c = getc(fp);
+	  if (c != yyy) {
+	    if (c != EOF)
+	      ungetc(c, fp);
+	    break;
+	  }
+	  if (!sread4(&left_adj, fp))
+	    goto eof;
+	  c = getc(fp);
+	  if (c != yyy) {
+	    if (c != EOF)
+	      ungetc(c, fp);
+	    break;
+	  }
+	  if (!sread4(&right_adj, fp))
+	    goto eof;
+	  got_an_adjustment = 1;
+	  pending_adjustment = 1;
+	}
+	break;
+      }
+    case xxx1 + 1:
+      if (!uread2(&n, fp) || !skip(n, fp))
+	goto eof;
+      break;
+    case xxx1 + 2:
+      if (!uread3(&n, fp) || !skip(n, fp))
+	goto eof;
+      break;
+    case xxx1 + 3:
+      if (!sread4(&n, fp) || !skip(n, fp))
+	goto eof;
+      break;
+    case yyy:
+      if (!skip(4, fp))
+	goto eof;
+      break;
+    default:
+      fatal("unrecognized opcode `%1'", op);
+      break;
+    }
+  }
+  if (!got_an_adjustment)
+    warning("no adjustment specials found in gf file");
+  return 1;
+ eof:
+  error("unexpected end of file");
+  return 0;
+}
+
+int gf::sread4(int *p, FILE *fp)
+{
+  *p = getc(fp);
+  if (*p >= 128)
+    *p -= 256;
+  *p <<= 8;
+  *p |= getc(fp);
+  *p <<= 8;
+  *p |= getc(fp);
+  *p <<= 8;
+  *p |= getc(fp);
+  return !ferror(fp) && !feof(fp);
+}
+
+int gf::uread3(int *p, FILE *fp)
+{
+  *p = getc(fp);
+  *p <<= 8;
+  *p |= getc(fp);
+  *p <<= 8;
+  *p |= getc(fp);
+  return !ferror(fp) && !feof(fp);
+}
+
+int gf::uread2(int *p, FILE *fp)
+{
+  *p = getc(fp);
+  *p <<= 8;
+  *p |= getc(fp);
+  return !ferror(fp) && !feof(fp);
+}
+
+int gf::skip(int n, FILE *fp)
+{
+  while (--n >= 0)
+    if (getc(fp) == EOF)
+      return 0;
+  return 1;
+}
+
+
+struct char_list {
+  char *ch;
+  char_list *next;
+  char_list(const char *, char_list * = 0);
+};
+
+char_list::char_list(const char *s, char_list *p) : ch(strsave(s)), next(p)
+{
+}
+
+
+int read_map(const char *file, char_list **table)
+{
+  errno = 0;
+  FILE *fp = fopen(file, "r");
+  if (!fp) {
+    error("can't open `%1': %2", file, strerror(errno));
+    return 0;
+  }
+  for (int i = 0; i < 256; i++)
+    table[i] = 0;
+  char buf[512];
+  int lineno = 0;
+  while (fgets(buf, int(sizeof(buf)), fp)) {
+    lineno++;
+    char *ptr = buf;
+    while (csspace(*ptr))
+      ptr++;
+    if (*ptr == '\0' || *ptr == '#')
+      continue;
+    ptr = strtok(ptr, " \n\t");
+    if (!ptr)
+      continue;
+    int n;
+    if (sscanf(ptr, "%d", &n) != 1) {
+      error("%1:%2: bad map file", file, lineno);
+      fclose(fp);
+      return 0;
+    }
+    if (n < 0 || n > 255) {
+      error("%1:%2: code out of range", file, lineno);
+      fclose(fp);
+      return 0;
+    }
+    ptr = strtok(0, " \n\t");
+    if (!ptr) {
+      error("%1:%2: missing names", file, lineno);
+      fclose(fp);
+      return 0;
+    }
+    for (; ptr; ptr = strtok(0, " \n\t"))
+      table[n] = new char_list(ptr, table[n]);
+  }
+  fclose(fp);
+  return 1;
+}
+
+
+/* Every character that can participate in a ligature appears in the
+lig_chars table. `ch' gives the full-name of the character, `name'
+gives the groff name of the character, `i' gives its index in
+the encoding, which is filled in later  (-1 if it does not appear). */
+
+struct {
+  const char *ch;
+  int i;
+} lig_chars[] = {
+  { "f", -1 },
+  { "i", -1 },
+  { "l", -1 },
+  { "ff", -1 },
+  { "fi", -1 },
+  { "fl", -1 },
+  { "Fi", -1 },
+  { "Fl", -1 },
+};
+
+// Indices into lig_chars[].
+
+enum { CH_f, CH_i, CH_l, CH_ff, CH_fi, CH_fl, CH_ffi, CH_ffl };
+
+// Each possible ligature appears in this table.
+
+struct {
+  unsigned char c1, c2, res;
+  const char *ch;
+} lig_table[] = {
+  { CH_f, CH_f, CH_ff, "ff" },
+  { CH_f, CH_i, CH_fi, "fi" },
+  { CH_f, CH_l, CH_fl, "fl" },
+  { CH_ff, CH_i, CH_ffi, "ffi" },
+  { CH_ff, CH_l, CH_ffl, "ffl" },
+  };
+
+static void usage(FILE *stream);
+  
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  int special_flag = 0;
+  int skewchar = -1;
+  int opt;
+  const char *gf_file = 0;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "svg:k:", long_options, NULL)) != EOF)
+    switch (opt) {
+    case 'g':
+      gf_file = optarg;
+      break;
+    case 's':
+      special_flag = 1;
+      break;
+    case 'k':
+      {
+	char *ptr;
+	long n = strtol(optarg, &ptr, 0);
+	if ((n == 0 && ptr == optarg)
+	    || *ptr != '\0'
+	    || n < 0
+	    || n > UCHAR_MAX)
+	  error("invalid skewchar");
+	else
+	  skewchar = (int)n;
+	break;
+      }
+    case 'v':
+      {
+	printf("GNU tfmtodit (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    case EOF:
+      assert(0);
+    }
+  if (argc - optind != 3) {
+    usage(stderr);
+    exit(1);
+  }
+  gf g;
+  if (gf_file) {
+    if (!g.load(gf_file))
+      return 1;
+  }
+  const char *tfm_file = argv[optind];
+  const char *map_file = argv[optind + 1];
+  const char *font_file = argv[optind + 2];
+  tfm t;
+  if (!t.load(tfm_file))
+    return 1;
+  char_list *table[256];
+  if (!read_map(map_file, table))
+    return 1;
+  errno = 0;
+  if (!freopen(font_file, "w", stdout)) {
+    error("can't open `%1' for writing: %2", font_file, strerror(errno));
+    return 1;
+  }
+  printf("name %s\n", font_file);
+  if (special_flag)
+    fputs("special\n", stdout);
+  char *internal_name = strsave(argv[optind]);
+  int len = strlen(internal_name);
+  if (len > 4 && strcmp(internal_name + len - 4, ".tfm") == 0)
+    internal_name[len - 4] = '\0';
+  // DIR_SEPS[] are possible directory separator characters, see nonposix.h.
+  // We want the rightmost separator of all possible ones.
+  // Example: d:/foo\\bar.
+  const char *s = strrchr(internal_name, DIR_SEPS[0]), *s1;
+  const char *sep = &DIR_SEPS[1];
+  while (*sep)
+    {
+      s1 = strrchr(internal_name, *sep);
+      if (s1 && (!s || s1 > s))
+	s = s1;
+      sep++;
+    }
+  printf("internalname %s\n", s ? s + 1 : internal_name);
+  int n;
+  if (t.get_param(2, &n)) {
+    if (n > 0)
+      printf("spacewidth %d\n", n*MULTIPLIER);
+  }
+  if (t.get_param(1, &n) && n != 0)
+    printf("slant %f\n", atan2(n/double(1<<20), 1.0)*180.0/PI);
+  int xheight;
+  if (!t.get_param(5, &xheight))
+    xheight = 0;
+  unsigned int i;
+  // Print the list of ligatures.
+  // First find the indices of each character that can participate in
+  // a ligature.
+  for (i = 0; i < 256; i++)
+    for (unsigned int j = 0; j < sizeof(lig_chars)/sizeof(lig_chars[0]); j++)
+      for (char_list *p = table[i]; p; p = p->next)
+	if (strcmp(lig_chars[j].ch, p->ch) == 0)
+	  lig_chars[j].i = i;
+  // For each possible ligature, if its participants all exist,
+  // and it appears as a ligature in the tfm file, include in
+  // the list of ligatures.
+  int started = 0;
+  for (i = 0; i < sizeof(lig_table)/sizeof(lig_table[0]); i++) {
+    int i1 = lig_chars[lig_table[i].c1].i;
+    int i2 = lig_chars[lig_table[i].c2].i;
+    int r = lig_chars[lig_table[i].res].i;
+    if (i1 >= 0 && i2 >= 0 && r >= 0) {
+      unsigned char c;
+      if (t.get_lig(i1, i2, &c) && c == r) {
+	if (!started) {
+	  started = 1;
+	  fputs("ligatures", stdout);
+	}
+	printf(" %s", lig_table[i].ch);
+      }
+    }
+  }
+  if (started)
+    fputs(" 0\n", stdout);
+  printf("checksum %d\n", t.get_checksum());
+  printf("designsize %d\n", t.get_design_size());
+  // Now print out the kerning information.
+  int had_kern = 0;
+  kern_iterator iter(&t);
+  unsigned char c1, c2;
+  int k;
+  while (iter.next(&c1, &c2, &k))
+    if (c2 != skewchar) {
+      k *= MULTIPLIER;
+      char_list *q = table[c2];
+      for (char_list *p1 = table[c1]; p1; p1 = p1->next)
+	for (char_list *p2 = q; p2; p2 = p2->next) {
+	  if (!had_kern) {
+	    printf("kernpairs\n");
+	    had_kern = 1;
+	  }
+	  printf("%s %s %d\n", p1->ch, p2->ch, k);
+	}
+    }
+  printf("charset\n");
+  char_list unnamed("---");
+  for (i = 0; i < 256; i++) 
+    if (t.contains(i)) {
+      char_list *p = table[i] ? table[i] : &unnamed;
+      int m[6];
+      m[0] = t.get_width(i);
+      m[1] = t.get_height(i);
+      m[2] = t.get_depth(i);
+      m[3] = t.get_italic(i);
+      m[4] = g.get_left_adjustment(i);
+      m[5] = g.get_right_adjustment(i);
+      printf("%s\t%d", p->ch, m[0]*MULTIPLIER);
+      int j;
+      for (j = int(sizeof(m)/sizeof(m[0])) - 1; j > 0; j--)
+	if (m[j] != 0)
+	  break;
+      for (k = 1; k <= j; k++)
+	printf(",%d", m[k]*MULTIPLIER);
+      int type = 0;
+      if (m[2] > 0)
+	type = 1;
+      if (m[1] > xheight)
+	type += 2;
+      printf("\t%d\t%04o\n", type, i);
+      for (p = p->next; p; p = p->next)
+	printf("%s\t\"\n", p->ch);
+    }
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-sv] [-g gf_file] [-k skewchar] tfm_file map_file font\n",
+	  program_name);
+}
diff --git a/contrib/groff/src/xditview/ChangeLog b/contrib/groff/src/xditview/ChangeLog
index 9db7cde..a63d984 100644
--- a/contrib/groff/src/xditview/ChangeLog
+++ b/contrib/groff/src/xditview/ChangeLog
@@ -1,3 +1,56 @@
+Version 1.19 released
+=====================
+
+2003-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* Imakefile.in (extraclean): Added gxditview._man.
+
+2003-01-28  Werner LEMBERG  <wl@gnu.org>
+
+	* Imakefile.in (SEP): New variable; set to @PATH_SEPARATOR@.
+	(GROFF_FONTPATH): Use it.
+
+2003-01-07  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (Adobe_Symbol_map): Add `sqrt'.
+
+2003-01-06  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (Adobe_Symbol_map): Add `integral'.
+
+2002-12-29  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (ISO_8859_1_map): Remove `ap' and `eq'.
+
+2002-12-20  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (Adobe_Symbol_map): Don't include `or'.
+	* draw.c (AdjustCharDeltas): Apply correction only if nadj > 1.
+	(DoCharacter): Call FlushCharCache if font size and font number
+	differ.
+	Reset `dw->dvi.cache.adjustable' properly.
+
+2002-12-09  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (ISO_8859_1_map): Use `tno' symbol instead of `no'.
+
+2002-12-01  Werner LEMBERG  <wl@gnu.org>
+
+	* Imakefile.in: Use `InstallAppDefaultsLong' instead of
+	`InstallAppDefaults' to make it work if build directory isn't
+	$srcdir.
+
+2002-11-24  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (Adobe_Symbol_map): Add glyph `braceex'.
+
+2002-11-14  Werner LEMBERG  <wl@gnu.org>
+
+	* DviChar.c (ISO_8859_1_map): Don't include `or'.
+
+Version 1.18.1 released
+=======================
+
 2002-09-16  Werner LEMBERG  <wl@gnu.org>
 
 	* Imakefile.in (GROFF_LOCALFONTDIR): New variable.
@@ -425,11 +478,11 @@ Sun May 26 14:14:01 1991  James Clark  (jjc at jclark)
 	* draw.c: Rewritten so as not to assume device and display
 	resolution is the same.
 	* DviP.h: Include device.h. Add device_font member to DviFontList.
-	Add adjustable arrary to DviCharCache. Add text_x_width,
+	Add adjustable array to DviCharCache. Add text_x_width,
 	text_device_width, word_flag, device_font, device_font_number,
 	device, native, device_resolution, display_resolution,
 	paperlength, paperwidth, scale_factor, sizescale members.
-	* Dvi.c (Initialize): Initialize new variable used by draw.c
+	* Dvi.c (Initialize): Initialize new variable used by draw.c.
 	(Destroy): Call device_destroy.
 	* font.c (MaxFontPosition): New function.
 	(LookupFontSizeBySize): Handle sizescale.
diff --git a/contrib/groff/src/xditview/DviChar.c b/contrib/groff/src/xditview/DviChar.c
index 608fb9e..ac4d7ce 100644
--- a/contrib/groff/src/xditview/DviChar.c
+++ b/contrib/groff/src/xditview/DviChar.c
@@ -193,7 +193,7 @@ static DviCharNameMap ISO8859_1_map = {
 {	":",			/* 58 */},
 {	";",			/* 59 */},
 {	"<",			/* 60 */},
-{	"=", "eq",		/* 61 */},
+{	"=",			/* 61 */},
 {	">",			/* 62 */},
 {	"?",			/* 63 */},
 {	"@", "at",		/* 64 */},
@@ -226,7 +226,7 @@ static DviCharNameMap ISO8859_1_map = {
 {	"[", "lB",		/* 91 */},
 {	"\\", "rs",		/* 92 */},
 {	"]", "rB",		/* 93 */},
-{	"^", "a^", "ha"		/* 94 */},
+{	"^", "a^", "ha",	/* 94 */},
 {	"_",			/* 95 */},
 {	"`", "oq",		/* 96 */},
 {	"a",			/* 97 */},
@@ -256,9 +256,9 @@ static DviCharNameMap ISO8859_1_map = {
 {	"y",			/* 121 */},
 {	"z",			/* 122 */},
 {	"{", "lC",		/* 123 */},
-{	"|", "or", "ba"		/* 124 */},
+{	"|", "ba",		/* 124 */},
 {	"}", "rC",		/* 125 */},
-{	"~", "a~", "ap", "ti"	/* 126 */},
+{	"~", "a~", "ti",	/* 126 */},
 {	0,			/* 127 */},
 {	0,			/* 128 */},
 {	0,			/* 129 */},
@@ -304,7 +304,7 @@ static DviCharNameMap ISO8859_1_map = {
 {	"co",			/* 169 */},
 {	"Of",			/* 170 */},
 {	"Fo",			/* 171 */},
-{	"no",			/* 172 */},
+{	"tno",			/* 172 */},
 {	"-", "hy",		/* 173 */},
 {	"rg",			/* 174 */},
 {	"a-",			/* 175 */},
@@ -394,262 +394,262 @@ static DviCharNameMap Adobe_Symbol_map = {
 	"adobe-fontspecific",
 	1,
 {
-{	0,					/* 0 */},
-{	0,					/* 1 */},
-{	0,					/* 2 */},
-{	0,					/* 3 */},
-{	0,					/* 4 */},
-{	0,					/* 5 */},
-{	0,					/* 6 */},
-{	0,					/* 7 */},
-{	0,					/* 8 */},
-{	0,					/* 9 */},
-{	0,					/* 10 */},
-{	0,					/* 11 */},
-{	0,					/* 12 */},
-{	0,					/* 13 */},
-{	0,					/* 14 */},
-{	0,					/* 15 */},
-{	0,					/* 16 */},
-{	0,					/* 17 */},
-{	0,					/* 18 */},
-{	0,					/* 19 */},
-{	0,					/* 20 */},
-{	0,					/* 21 */},
-{	0,					/* 22 */},
-{	0,					/* 23 */},
-{	0,					/* 24 */},
-{	0,					/* 25 */},
-{	0,					/* 26 */},
-{	0,					/* 27 */},
-{	0,					/* 28 */},
-{	0,					/* 29 */},
-{	0,					/* 30 */},
-{	0,					/* 31 */},
-{	0,					/* 32 */},
-{	"!",					/* 33 */},
-{	"fa",					/* 34 */},
-{	"#", "sh",				/* 35 */},
-{	"te",					/* 36 */},
-{	"%",					/* 37 */},
-{	"&",					/* 38 */},
-{	"st",					/* 39 */},
-{	"(",					/* 40 */},
-{	")",					/* 41 */},
-{	"**",					/* 42 */},
-{	"+", "pl",				/* 43 */},
-{	",",					/* 44 */},
-{	"\\-", "mi",				/* 45 */},
-{	".",					/* 46 */},
-{	"/", "sl",				/* 47 */},
-{	"0",					/* 48 */},
-{	"1",					/* 49 */},
-{	"2",					/* 50 */},
-{	"3",					/* 51 */},
-{	"4",					/* 52 */},
-{	"5",					/* 53 */},
-{	"6",					/* 54 */},
-{	"7",					/* 55 */},
-{	"8",					/* 56 */},
-{	"9",					/* 57 */},
-{	":",					/* 58 */},
-{	";",					/* 59 */},
-{	"<",					/* 60 */},
-{	"=", "eq",				/* 61 */},
-{	">",					/* 62 */},
-{	"?",					/* 63 */},
-{	"=~",					/* 64 */},
-{	"*A",					/* 65 */},
-{	"*B",					/* 66 */},
-{	"*X",					/* 67 */},
-{	"*D",					/* 68 */},
-{	"*E",					/* 69 */},
-{	"*F",					/* 70 */},
-{	"*G",					/* 71 */},
-{	"*Y",					/* 72 */},
-{	"*I",					/* 73 */},
-{	"+h",					/* 74 */},
-{	"*K",					/* 75 */},
-{	"*L",					/* 76 */},
-{	"*M",					/* 77 */},
-{	"*N",					/* 78 */},
-{	"*O",					/* 79 */},
-{	"*P",					/* 80 */},
-{	"*H",					/* 81 */},
-{	"*R",					/* 82 */},
-{	"*S",					/* 83 */},
-{	"*T",					/* 84 */},
-{	0,					/* 85 */},
-{	"ts",					/* 86 */},
-{	"*W",					/* 87 */},
-{	"*C",					/* 88 */},
-{	"*Q",					/* 89 */},
-{	"*Z",					/* 90 */},
-{	"[", "lB",				/* 91 */},
-{	"tf", "3d",				/* 92 */},
-{	"]", "rB",				/* 93 */},
-{	"pp",					/* 94 */},
-{	"_",					/* 95 */},
-{	"radicalex",				/* 96 */},
-{	"*a",					/* 97 */},
-{	"*b",					/* 98 */},
-{	"*x",					/* 99 */},
-{	"*d",					/* 100 */},
-{	"*e",					/* 101 */},
-{	"*f",					/* 102 */},
-{	"*g",					/* 103 */},
-{	"*y",					/* 104 */},
-{	"*i",					/* 105 */},
-{	"+f",					/* 106 */},
-{	"*k",					/* 107 */},
-{	"*l",					/* 108 */},
-{	"*m",					/* 109 */},
-{	"*n",					/* 110 */},
-{	"*o",					/* 111 */},
-{	"*p",					/* 112 */},
-{	"*h",					/* 113 */},
-{	"*r",					/* 114 */},
-{	"*s",					/* 115 */},
-{	"*t",					/* 116 */},
-{	"*u",					/* 117 */},
-{	"+p",					/* 118 */},
-{	"*w",					/* 119 */},
-{	"*c",					/* 120 */},
-{	"*q",					/* 121 */},
-{	"*z",					/* 122 */},
-{	"lC", "{",				/* 123 */},
-{	"ba", "or", "|",			/* 124 */},
-{	"rC", "}",				/* 125 */},
-{	"ap",					/* 126 */},
-{	0,					/* 127 */},
-{	0,					/* 128 */},
-{	0,					/* 129 */},
-{	0,					/* 130 */},
-{	0,					/* 131 */},
-{	0,					/* 132 */},
-{	0,					/* 133 */},
-{	0,					/* 134 */},
-{	0,					/* 135 */},
-{	0,					/* 136 */},
-{	0,					/* 137 */},
-{	0,					/* 138 */},
-{	0,					/* 139 */},
-{	0,					/* 140 */},
-{	0,					/* 141 */},
-{	0,					/* 142 */},
-{	0,					/* 143 */},
-{	0,					/* 144 */},
-{	0,					/* 145 */},
-{	0,					/* 146 */},
-{	0,					/* 147 */},
-{	0,					/* 148 */},
-{	0,					/* 149 */},
-{	0,					/* 150 */},
-{	0,					/* 151 */},
-{	0,					/* 152 */},
-{	0,					/* 153 */},
-{	0,					/* 154 */},
-{	0,					/* 155 */},
-{	0,					/* 156 */},
-{	0,					/* 157 */},
-{	0,					/* 158 */},
-{	0,					/* 159 */},
-{	0,					/* 160 */},
-{	"*U",					/* 161 */},
-{	"fm",					/* 162 */},
-{	"<=",					/* 163 */},
-{	"f/",					/* 164 */},
-{	"if",					/* 165 */},
-{	"Fn",					/* 166 */},
-{	"CL",					/* 167 */},
-{	"DI",					/* 168 */},
-{	"HE",					/* 169 */},
-{	"SP",					/* 170 */},
-{	"<>",					/* 171 */},
-{	"<-",					/* 172 */},
-{	"ua", "arrowverttp",			/* 173 */},
-{	"->",					/* 174 */},
-{	"da", "arrowvertbt",			/* 175 */},
-{	"de",					/* 176 */},
-{	"+-",					/* 177 */},
-{	"sd",					/* 178 */},
-{	">=",					/* 179 */},
-{	"mu",					/* 180 */},
-{	"pt",					/* 181 */},
-{	"pd",					/* 182 */},
-{	"bu",					/* 183 */},
-{	"di",					/* 184 */},
-{	"!=",					/* 185 */},
-{	"==",					/* 186 */},
-{	"~=", "~~",				/* 187 */},
-{	0,					/* 188 */},
-{	"arrowvertex",				/* 189 */},
-{	"an",					/* 190 */},
-{	"CR",					/* 191 */},
-{	"Ah",					/* 192 */},
-{	"Im",					/* 193 */},
-{	"Re",					/* 194 */},
-{	"wp",					/* 195 */},
-{	"c*",					/* 196 */},
-{	"c+",					/* 197 */},
-{	"es",					/* 198 */},
-{	"ca",					/* 199 */},
-{	"cu",					/* 200 */},
-{	"sp",					/* 201 */},
-{	"ip",					/* 202 */},
-{	"nb",					/* 203 */},
-{	"sb",					/* 204 */},
-{	"ib",					/* 205 */},
-{	"mo",					/* 206 */},
-{	"nm",					/* 207 */},
-{	"/_",					/* 208 */},
-{	"gr",					/* 209 */},
-{	"rg",					/* 210 */},
-{	"co",					/* 211 */},
-{	"tm",					/* 212 */},
-{	0,					/* 213 */},
-{	"sr",					/* 214 */},
-{	"md",					/* 215 */},
-{	"no",					/* 216 */},
-{	"AN",					/* 217 */},
-{	"OR",					/* 218 */},
-{	"hA",					/* 219 */},
-{	"lA",					/* 220 */},
-{	"uA",					/* 221 */},
-{	"rA",					/* 222 */},
-{	"dA",					/* 223 */},
-{	"lz",					/* 224 */},
-{	"la",					/* 225 */},
-{	0,					/* 226 */},
-{	0,					/* 227 */},
-{	0,					/* 228 */},
-{	0,					/* 229 */},
-{	"parenlefttp",				/* 230 */},
-{	"parenleftex",				/* 231 */},
-{	"parenleftbt",				/* 232 */},
-{	"bracketlefttp", "lc",			/* 233 */},
-{	"bracketleftex",			/* 234 */},
-{	"bracketleftbt", "lf",			/* 235 */},
-{	"bracelefttp", "lt",			/* 236 */},
-{	"braceleftmid", "lk",			/* 237 */},
-{	"braceleftbt", "lb",			/* 238 */},
-{	"bracerightex", "braceleftex", "bv",	/* 239 */},
-{	0,					/* 240 */},
-{	"ra",					/* 241 */},
-{	"is",					/* 242 */},
-{	0,					/* 243 */},
-{	0,					/* 244 */},
-{	0,					/* 245 */},
-{	"parenrighttp",				/* 246 */},
-{	"parenrightex",				/* 247 */},
-{	"parenrightbt",				/* 248 */},
-{	"bracketrighttp", "rc",			/* 249 */},
-{	"bracketrightex",			/* 250 */},
-{	"bracketrightbt", "rf",			/* 251 */},
-{	"bracerighttp", "rt",			/* 252 */},
-{	"bracerightmid", "rk",			/* 253 */},
-{	"bracerightbt", "rb",			/* 254 */},
-{	0,					/* 255 */},
+{	0,						/* 0 */},
+{	0,						/* 1 */},
+{	0,						/* 2 */},
+{	0,						/* 3 */},
+{	0,						/* 4 */},
+{	0,						/* 5 */},
+{	0,						/* 6 */},
+{	0,						/* 7 */},
+{	0,						/* 8 */},
+{	0,						/* 9 */},
+{	0,						/* 10 */},
+{	0,						/* 11 */},
+{	0,						/* 12 */},
+{	0,						/* 13 */},
+{	0,						/* 14 */},
+{	0,						/* 15 */},
+{	0,						/* 16 */},
+{	0,						/* 17 */},
+{	0,						/* 18 */},
+{	0,						/* 19 */},
+{	0,						/* 20 */},
+{	0,						/* 21 */},
+{	0,						/* 22 */},
+{	0,						/* 23 */},
+{	0,						/* 24 */},
+{	0,						/* 25 */},
+{	0,						/* 26 */},
+{	0,						/* 27 */},
+{	0,						/* 28 */},
+{	0,						/* 29 */},
+{	0,						/* 30 */},
+{	0,						/* 31 */},
+{	0,						/* 32 */},
+{	"!",						/* 33 */},
+{	"fa",						/* 34 */},
+{	"#", "sh",					/* 35 */},
+{	"te",						/* 36 */},
+{	"%",						/* 37 */},
+{	"&",						/* 38 */},
+{	"st",						/* 39 */},
+{	"(",						/* 40 */},
+{	")",						/* 41 */},
+{	"**",						/* 42 */},
+{	"+", "pl",					/* 43 */},
+{	",",						/* 44 */},
+{	"\\-", "mi",					/* 45 */},
+{	".",						/* 46 */},
+{	"/", "sl",					/* 47 */},
+{	"0",						/* 48 */},
+{	"1",						/* 49 */},
+{	"2",						/* 50 */},
+{	"3",						/* 51 */},
+{	"4",						/* 52 */},
+{	"5",						/* 53 */},
+{	"6",						/* 54 */},
+{	"7",						/* 55 */},
+{	"8",						/* 56 */},
+{	"9",						/* 57 */},
+{	":",						/* 58 */},
+{	";",						/* 59 */},
+{	"<",						/* 60 */},
+{	"=", "eq",					/* 61 */},
+{	">",						/* 62 */},
+{	"?",						/* 63 */},
+{	"=~",						/* 64 */},
+{	"*A",						/* 65 */},
+{	"*B",						/* 66 */},
+{	"*X",						/* 67 */},
+{	"*D",						/* 68 */},
+{	"*E",						/* 69 */},
+{	"*F",						/* 70 */},
+{	"*G",						/* 71 */},
+{	"*Y",						/* 72 */},
+{	"*I",						/* 73 */},
+{	"+h",						/* 74 */},
+{	"*K",						/* 75 */},
+{	"*L",						/* 76 */},
+{	"*M",						/* 77 */},
+{	"*N",						/* 78 */},
+{	"*O",						/* 79 */},
+{	"*P",						/* 80 */},
+{	"*H",						/* 81 */},
+{	"*R",						/* 82 */},
+{	"*S",						/* 83 */},
+{	"*T",						/* 84 */},
+{	0,						/* 85 */},
+{	"ts",						/* 86 */},
+{	"*W",						/* 87 */},
+{	"*C",						/* 88 */},
+{	"*Q",						/* 89 */},
+{	"*Z",						/* 90 */},
+{	"[", "lB",					/* 91 */},
+{	"tf", "3d",					/* 92 */},
+{	"]", "rB",					/* 93 */},
+{	"pp",						/* 94 */},
+{	"_",						/* 95 */},
+{	"radicalex",					/* 96 */},
+{	"*a",						/* 97 */},
+{	"*b",						/* 98 */},
+{	"*x",						/* 99 */},
+{	"*d",						/* 100 */},
+{	"*e",						/* 101 */},
+{	"*f",						/* 102 */},
+{	"*g",						/* 103 */},
+{	"*y",						/* 104 */},
+{	"*i",						/* 105 */},
+{	"+f",						/* 106 */},
+{	"*k",						/* 107 */},
+{	"*l",						/* 108 */},
+{	"*m",						/* 109 */},
+{	"*n",						/* 110 */},
+{	"*o",						/* 111 */},
+{	"*p",						/* 112 */},
+{	"*h",						/* 113 */},
+{	"*r",						/* 114 */},
+{	"*s",						/* 115 */},
+{	"*t",						/* 116 */},
+{	"*u",						/* 117 */},
+{	"+p",						/* 118 */},
+{	"*w",						/* 119 */},
+{	"*c",						/* 120 */},
+{	"*q",						/* 121 */},
+{	"*z",						/* 122 */},
+{	"lC", "{",					/* 123 */},
+{	"ba", "|",					/* 124 */},
+{	"rC", "}",					/* 125 */},
+{	"ap",						/* 126 */},
+{	0,						/* 127 */},
+{	0,						/* 128 */},
+{	0,						/* 129 */},
+{	0,						/* 130 */},
+{	0,						/* 131 */},
+{	0,						/* 132 */},
+{	0,						/* 133 */},
+{	0,						/* 134 */},
+{	0,						/* 135 */},
+{	0,						/* 136 */},
+{	0,						/* 137 */},
+{	0,						/* 138 */},
+{	0,						/* 139 */},
+{	0,						/* 140 */},
+{	0,						/* 141 */},
+{	0,						/* 142 */},
+{	0,						/* 143 */},
+{	0,						/* 144 */},
+{	0,						/* 145 */},
+{	0,						/* 146 */},
+{	0,						/* 147 */},
+{	0,						/* 148 */},
+{	0,						/* 149 */},
+{	0,						/* 150 */},
+{	0,						/* 151 */},
+{	0,						/* 152 */},
+{	0,						/* 153 */},
+{	0,						/* 154 */},
+{	0,						/* 155 */},
+{	0,						/* 156 */},
+{	0,						/* 157 */},
+{	0,						/* 158 */},
+{	0,						/* 159 */},
+{	0,						/* 160 */},
+{	"*U",						/* 161 */},
+{	"fm",						/* 162 */},
+{	"<=",						/* 163 */},
+{	"f/",						/* 164 */},
+{	"if",						/* 165 */},
+{	"Fn",						/* 166 */},
+{	"CL",						/* 167 */},
+{	"DI",						/* 168 */},
+{	"HE",						/* 169 */},
+{	"SP",						/* 170 */},
+{	"<>",						/* 171 */},
+{	"<-",						/* 172 */},
+{	"ua", "arrowverttp",				/* 173 */},
+{	"->",						/* 174 */},
+{	"da", "arrowvertbt",				/* 175 */},
+{	"de",						/* 176 */},
+{	"+-",						/* 177 */},
+{	"sd",						/* 178 */},
+{	">=",						/* 179 */},
+{	"mu",						/* 180 */},
+{	"pt",						/* 181 */},
+{	"pd",						/* 182 */},
+{	"bu",						/* 183 */},
+{	"di",						/* 184 */},
+{	"!=",						/* 185 */},
+{	"==",						/* 186 */},
+{	"~=", "~~",					/* 187 */},
+{	0,						/* 188 */},
+{	"arrowvertex",					/* 189 */},
+{	"an",						/* 190 */},
+{	"CR",						/* 191 */},
+{	"Ah",						/* 192 */},
+{	"Im",						/* 193 */},
+{	"Re",						/* 194 */},
+{	"wp",						/* 195 */},
+{	"c*",						/* 196 */},
+{	"c+",						/* 197 */},
+{	"es",						/* 198 */},
+{	"ca",						/* 199 */},
+{	"cu",						/* 200 */},
+{	"sp",						/* 201 */},
+{	"ip",						/* 202 */},
+{	"nb",						/* 203 */},
+{	"sb",						/* 204 */},
+{	"ib",						/* 205 */},
+{	"mo",						/* 206 */},
+{	"nm",						/* 207 */},
+{	"/_",						/* 208 */},
+{	"gr",						/* 209 */},
+{	"rg",						/* 210 */},
+{	"co",						/* 211 */},
+{	"tm",						/* 212 */},
+{	0,						/* 213 */},
+{	"sr", "sqrt",					/* 214 */},
+{	"md",						/* 215 */},
+{	"no",						/* 216 */},
+{	"AN",						/* 217 */},
+{	"OR",						/* 218 */},
+{	"hA",						/* 219 */},
+{	"lA",						/* 220 */},
+{	"uA",						/* 221 */},
+{	"rA",						/* 222 */},
+{	"dA",						/* 223 */},
+{	"lz",						/* 224 */},
+{	"la",						/* 225 */},
+{	0,						/* 226 */},
+{	0,						/* 227 */},
+{	0,						/* 228 */},
+{	0,						/* 229 */},
+{	"parenlefttp",					/* 230 */},
+{	"parenleftex",					/* 231 */},
+{	"parenleftbt",					/* 232 */},
+{	"bracketlefttp", "lc",				/* 233 */},
+{	"bracketleftex",				/* 234 */},
+{	"bracketleftbt", "lf",				/* 235 */},
+{	"bracelefttp", "lt",				/* 236 */},
+{	"braceleftmid", "lk",				/* 237 */},
+{	"braceleftbt", "lb",				/* 238 */},
+{	"bracerightex", "braceleftex", "braceex", "bv",	/* 239 */},
+{	0,						/* 240 */},
+{	"ra",						/* 241 */},
+{	"is", "integral",				/* 242 */},
+{	0,						/* 243 */},
+{	0,						/* 244 */},
+{	0,						/* 245 */},
+{	"parenrighttp",					/* 246 */},
+{	"parenrightex",					/* 247 */},
+{	"parenrightbt",					/* 248 */},
+{	"bracketrighttp", "rc",				/* 249 */},
+{	"bracketrightex",				/* 250 */},
+{	"bracketrightbt", "rf",				/* 251 */},
+{	"bracerighttp", "rt",				/* 252 */},
+{	"bracerightmid", "rk",				/* 253 */},
+{	"bracerightbt", "rb",				/* 254 */},
+{	0,						/* 255 */},
 }};
 
 
diff --git a/contrib/groff/src/xditview/Imakefile.in b/contrib/groff/src/xditview/Imakefile.in
index 32b3505..1f64fe0 100644
--- a/contrib/groff/src/xditview/Imakefile.in
+++ b/contrib/groff/src/xditview/Imakefile.in
@@ -2,6 +2,7 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH=@srcdir@
 top_builddir=@groff_top_builddir@
+SEP=@PATH_SEPARATOR@
 
 version=`cat $(top_srcdir)/VERSION`
 # No additional number if revision is zero
@@ -13,7 +14,7 @@ GROFF_DATAPROGRAMDIR = $(GROFF_DATADIR)/groff
 GROFF_DATASUBDIR = $(GROFF_DATAPROGRAMDIR)/$(version)$(revision)
 GROFF_FONTDIR = $(GROFF_DATASUBDIR)/font
 GROFF_LOCALFONTDIR = $(GROFF_DATAPROGRAMDIR)/site-font
-GROFF_FONTPATH = $(GROFF_FONTDIR):$(GROFF_LOCALFONTDIR):/usr/lib/font
+GROFF_FONTPATH = $(GROFF_FONTDIR)$(SEP)$(GROFF_LOCALFONTDIR)$(SEP)/usr/lib/font
 DPIS = 75 100
 
 PROGRAMS = \
@@ -79,7 +80,7 @@ ComplexProgramTarget_1(gxditview,$(LOCAL_LIBRARIES),$(MATHLIB))
 InstallManPageLong($(srcdir)/gxditview,$(MANDIR),gxditview)
 NormalProgramTarget(xtotroff,$(OBJS2),$(DEPXLIB),$(XLIB), /**/)
 
-InstallAppDefaults(GXditview)
+InstallAppDefaultsLong($(srcdir)/GXditview,GXditview)
 
 fonts: xtotroff $(srcdir)/DESC $(srcdir)/FontMap
 	@dir=`pwd`; \
@@ -114,6 +115,6 @@ GXditview-ad.h: $(srcdir)/GXditview.ad
 	/bin/sh $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
 
 extraclean: clean
-	-rm -f junk tmp grot old Makefile Imakefile
+	-rm -f junk tmp grot old Makefile Imakefile $(srcdir)/gxditview._man
 
 FORCE:
diff --git a/contrib/groff/src/xditview/draw.c b/contrib/groff/src/xditview/draw.c
index 69e86cd..fe7c80f 100644
--- a/contrib/groff/src/xditview/draw.c
+++ b/contrib/groff/src/xditview/draw.c
@@ -68,9 +68,9 @@ AdjustCacheDeltas (dw)
 	for (i = 0; i <= dw->dvi.cache.index; i++)
 		if (dw->dvi.cache.adjustable[i])
 			++nadj;
-	if (nadj == 0)
-		return;
 	dw->dvi.text_x_width += extra;
+	if (nadj <= 1)
+		return;
 	for (i = 0; i <= dw->dvi.cache.index; i++)
 		if (dw->dvi.cache.adjustable[i]) {
 			int x;
@@ -181,6 +181,7 @@ DoCharacter (dw, c, wid)
 	    || dw->dvi.cache.char_index >= DVI_CHAR_CACHE_SIZE) {
 		FlushCharCache (dw);
 		x = dw->dvi.cache.x;
+		dw->dvi.cache.adjustable[dw->dvi.cache.index] = 0;
 	}
 	/*
 	 * load a new font, if the current block is not empty,
@@ -189,6 +190,8 @@ DoCharacter (dw, c, wid)
 	if (dw->dvi.cache.font_size != dw->dvi.state->font_size ||
 	    dw->dvi.cache.font_number != dw->dvi.state->font_number)
 	{
+		FlushCharCache (dw);
+		x = dw->dvi.cache.x;
 		dw->dvi.cache.font_size = dw->dvi.state->font_size;
 		dw->dvi.cache.font_number = dw->dvi.state->font_number;
 		dw->dvi.cache.font = QueryFont (dw,
@@ -208,6 +211,7 @@ DoCharacter (dw, c, wid)
 			if (dw->dvi.cache.index >= dw->dvi.cache.max)
 				FlushCharCache (dw);
 			dw->dvi.cache.cache[dw->dvi.cache.index].nchars = 0;
+			dw->dvi.cache.adjustable[dw->dvi.cache.index] = 0;
 		}
 		dw->dvi.cache.adjustable[dw->dvi.cache.index]
 			= dw->dvi.word_flag;
diff --git a/contrib/groff/tmac/Makefile.sub b/contrib/groff/tmac/Makefile.sub
index 4bdea45..0d9cd60 100644
--- a/contrib/groff/tmac/Makefile.sub
+++ b/contrib/groff/tmac/Makefile.sub
@@ -11,33 +11,36 @@ NORMALFILES=\
   me.tmac \
   mdoc.tmac \
   pic.tmac \
-  a4.tmac \
+  a4.tmac papersize.tmac \
   ec.tmac \
   safer.tmac \
   trace.tmac \
   ps.tmac psold.tmac pspic.tmac psatk.tmac \
   dvi.tmac \
   tty.tmac tty-char.tmac \
-  latin1.tmac cp1047.tmac \
+  latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \
   X.tmac Xps.tmac \
   lj4.tmac \
   lbp.tmac \
-  html.tmac www.tmac \
+  html.tmac html-end.tmac \
+  europs.tmac \
+  composite.tmac \
   eqnrc \
   troffrc troffrc-end \
-  hyphen.us
+  hyphen.us hyphenex.us
 SPECIALFILES=an.tmac man.tmac s.tmac ms.tmac
 STRIPFILES=e.tmac doc.tmac doc-old.tmac
 MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
 mdocdir=$(tmacdir)/mdoc
 CLEANADD=\
-  stamp-wrap stamp-sed *-wrap man.tmac-sed ms.tmac-sed \
+  stamp-wrap stamp-sed *-wrap man.tmac-sed ms.tmac-sed www.tmac-sed \
   stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \
   doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s
 tmac_s_prefix=
 tmac_an_prefix=
 tmac_wrap=
 sys_tmac_prefix=
+pnmtops_nosetpage="pnmtops"
 
 all: stamp-strip stamp-wrap stamp-sed
 
@@ -63,6 +66,8 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
 	$(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
 	-rm -f $(tmacdir)/man.tmac
 	$(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
+	-rm -f $(tmacdir)/www.tmac
+	$(INSTALL_DATA) www.tmac-sed $(tmacdir)/www.tmac
 	for f in $(STRIPFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
@@ -97,11 +102,12 @@ stamp-wrap:
 	fi
 	touch $@
 
-stamp-sed: man.tmac ms.tmac
-	for f in man.tmac ms.tmac; do \
+stamp-sed: man.tmac ms.tmac www.tmac
+	for f in man.tmac ms.tmac www.tmac; do \
 	  rm -f $$f-sed; \
 	  sed -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
 	  -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+	  -e "s;@PNMTOPS_NOSETPAGE@;$(pnmtops_nosetpage);g" \
 	  $(srcdir)/$$f > $$f-sed; \
 	done
 	touch $@
diff --git a/contrib/groff/tmac/README b/contrib/groff/tmac/README
index 9821534..19f938a 100644
--- a/contrib/groff/tmac/README
+++ b/contrib/groff/tmac/README
@@ -6,15 +6,4 @@ system written by Donald E. Knuth; the master file can be found at
 It has been renamed for consistency, i.e., to make patterns available under
 the filenames `hyphen.<language>', e.g. `hyphen.de' or `hyphen.uk'.
 
-From the file ftp://labrea.stanford.edu/tex/README; `hyphen.tex' is also in
-this directory:
-
-  The files in this directory are master files maintained personally by
-  Donald E. Knuth.  Nobody else is authorized to make any changes whatever
-  to them!  If you modify the files for any purpose, you must give your
-  files a different name, so that installations of TeX throughout the
-  world will be 100% compatible when they use the official source files.
-
-  All of the files here are available for anonymous FTP by anyone and may
-  be freely redistributed.  Some are copyrighted; see the files themselves
-  for more details.
+See the file itself for a copyright notice.
diff --git a/contrib/groff/tmac/X.tmac b/contrib/groff/tmac/X.tmac
index 8b9a1ba..d19280e 100644
--- a/contrib/groff/tmac/X.tmac
+++ b/contrib/groff/tmac/X.tmac
@@ -14,16 +14,17 @@
 .char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
 .char \[br] \v'.25m'\D'l 0 -1m'\v'.75m'
 .char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
-.char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m'
-.char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m'
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.char ~ \v'-.55m'\s[\En(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m'
+.char ^ \v'-.55m'\s[\En(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m'
 .fchar \[va] \o'\[ua]\[da]'
-.fchar \[em] --
+.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'
 .fchar \[en] \-
 .fchar \[fi] fi
 .fchar \[fl] fl
 .fchar \[ff] ff
-.fchar \[Fi] ffi
-.fchar \[Fl] ffl
+.fchar \[Fi] f\[fi]
+.fchar \[Fl] f\[fl]
 .fchar \[ci] \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
 .fchar \[sq] \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
 .fchar \[ga] \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
@@ -43,10 +44,79 @@
 .fchar \[rh] \[rA]
 .fchar \[bq] ,
 .fchar \[aq] '
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.fchar \[fo] <
+.fchar \[fc] >
+.fchar \[OK] \s[\En[.s]*6u/10u]\[rs]\s[0]/
+.
+.fchar \[<<] <\h'-.3m'<
+.fchar \[>>] >\h'-.3m'>
+.fchar \[|=] \v'.1m'\Z'\[mi]'\v'-.2m'\[ap]\v'.1m'
+.fchar \[nc] \v'.1m'\Z'\h'.2m'\F[T]\f[R]/'\v'-.1m'\[sp]
+.fchar \[ne] \v'.07m'\Z'\h'.2m'\F[T]\f[R]/'\v'-.07m'\[==]
+.fchar \[-h] \F[T]\f[I]\v'-.58m'\Z'\h'.1m'\D'l .3m 0''\v'.58m'h
+.fchar \[hbar] \[-h]
+.
+.de X-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\En[skw]+(\w'x'*0)-\\En[skw])'\
+\v'(u;\w'x'*0+\\En[rst]+(\w'\\$3'*0)-\\En[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\En[rst]+(\w'\\$3'*0)+\\En[rst])'\
+\h'|\\En[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.X-achar \['C] \'    C c
+.X-achar \['c] \'    c c
+.X-achar \[:Y] \[ad] Y y
+.
+.de X-frac
+.  schar \[\\$1\\$2] \
+\v'-.28m'\s[\\En[.s]*6u/10u]\\$1\s0\v'.28m'\
+\h'-.1m'\[f/]\h'-.1m'\
+\s[\\En[.s]*6u/10u]\\$2
+..
+.
+.de X-frac-mono
+.  fschar \\$1 \[\\$2\\$3] \
+\Z'\v'-.28m'\s[\\En[.s]*5u/10u]\\$2\s0\v'.28m''\
+\Z'\h'0.25m'\[f/]'\
+\Z'\h'.35m'\s[\\En[.s]*5u/10u]\\$3\s0'\
+\h'\w'M'u'
+..
+.
+.X-frac 1 8
+.X-frac 3 8
+.X-frac 5 8
+.X-frac 7 8
+.
+.X-frac-mono CR 1 8
+.X-frac-mono CR 3 8
+.X-frac-mono CR 5 8
+.X-frac-mono CR 7 8
+.X-frac-mono CI 1 8
+.X-frac-mono CI 3 8
+.X-frac-mono CI 5 8
+.X-frac-mono CI 7 8
+.X-frac-mono CB 1 8
+.X-frac-mono CB 3 8
+.X-frac-mono CB 5 8
+.X-frac-mono CB 7 8
+.X-frac-mono CBI 1 8
+.X-frac-mono CBI 3 8
+.X-frac-mono CBI 5 8
+.X-frac-mono CBI 7 8
+.
 .if '\*[.T]'X100' \
 .  char \[radicalex] \h'-\w'\[sr]'u'\[radicalex]\h'\w'\[sr]'u'
-.if !\n[_C] \
-.  mso pspic.tmac
+.fchar \[sqrtex] \[radicalex]
+.
 .cp \n[_C]
 .
 .do ie '\[char97]'a' \
diff --git a/contrib/groff/tmac/Xps.tmac b/contrib/groff/tmac/Xps.tmac
index 1064ba6..ced2a53 100644
--- a/contrib/groff/tmac/Xps.tmac
+++ b/contrib/groff/tmac/Xps.tmac
@@ -9,7 +9,7 @@
 .
 .Xps-char \[bu] \f[S]\[bu]
 .Xps-char \[f/] \f[S]\[f/]
-.Xps-char \[em] "\v'-.25m'\h'.05m'\D'l .9m 0'"
+.Xps-char \[em] "\v'-.25m'\h'.05m'\D'l .9m 0'\h'.05m'"
 .Xps-char \[aq] '
 .Xps-char \[bq] ,
 .Xps-char \[Bq] ,,
@@ -35,7 +35,7 @@
 .Xps-char \[.i] i
 .Xps-char \[fo] <
 .Xps-char \[fc] >
-.Xps-char \[OK] \s[\En[.s]*6u/10u]\e\s[0]/
+.Xps-char \[OK] \s[\En[.s]*6u/10u]\[rs]\s[0]/
 .Xps-char \[tm] \v'-.3m'\s[\En[.s]*6u/10u]TM\s[0]
 .Xps-char \[dd] "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
 \D'l .39m 0'\v'.4m'\D'l -.39m 0''"
@@ -43,8 +43,9 @@
 \D'l .39m 0''"
 .Xps-char \[en] \-
 .Xps-char \[%0] %\s[\En[.s]*6u/10u]\f[I]0
-.Xps-char \[lh] \[->]
-.Xps-char \[rh] \[<-]
+.Xps-char \[lh] \[lA]
+.Xps-char \[rh] \[rA]
+.
 .cp \n[_C]
 .
 .do ie '\[char97]'a' \
diff --git a/contrib/groff/tmac/a4.tmac b/contrib/groff/tmac/a4.tmac
index 5001939..80c944d 100644
--- a/contrib/groff/tmac/a4.tmac
+++ b/contrib/groff/tmac/a4.tmac
@@ -1,12 +1,20 @@
 .\" a4.tmac
 .\"
 .\" Set up groff for A4 paper.  Must be called before any other macro
-.\" package.  For correct PS output, you must also set the
-.\" `paperlength' keyword in devps/DESC to 841890 in case groff hasn't
-.\" guessed it correctly during configuration.
+.\" package.
+.\"
+.\" Some output drivers need an additional command line switch `-p' to
+.\" override the default paper length set in the driver specific DESC
+.\" file.
+.\"
+.\" For example, use the following for PS output:
+.\"
+.\"   groff -Tps -P-pa4 -ma4 -ms foo.ms > foo.ps
 .
 .pl 29.7c
 .ll 21c-2i
 .
-.\" for ms
-.if !rLL .nr LL \n[.l]u
+.\" for ms, mdoc, man
+.do if !r LL .nr LL \n[.l]u
+.
+.\" EOF
diff --git a/contrib/groff/tmac/an-old.tmac b/contrib/groff/tmac/an-old.tmac
index 3cee907..063ebce 100644
--- a/contrib/groff/tmac/an-old.tmac
+++ b/contrib/groff/tmac/an-old.tmac
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
 .\"   Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -62,10 +62,15 @@
 .  ie n .nr LL 78n
 .  el   .nr LL 6.5i
 .\}
-.if !r LT \{\
-.  ie n .nr LT 78n
-.  el   .nr LT 6.5i
-.\}
+.if !r LT \
+.  nr LT \n[LL]
+.
+.nr FT -.5i
+.
+.\" Default heading font
+.ds HF B
+.
+.nr an-first 1
 .
 .nr an-html 0
 .if '\*[.T]'html' .nr an-html 1
@@ -92,7 +97,7 @@
 .\" .TH title section extra1 extra2 extra3
 .de1 TH
 .  if \\n[an-html] \{\
-.    HTML-TAG ".tl"
+.    HTML-TAG-NS ".tl"
 \\$1
 .  \}
 .
@@ -136,9 +141,15 @@
 .  vs \\n[VS]u
 .  ll \\n[LL]u
 .
-.  nr IN 7.2n
+.\" We must select an integer indentation value for nroff;
+.\" see comment in an-do-tag.
+.  if !r IN \{\
+.    ie t .nr IN 7.2n
+.    el   .nr IN 7n
+.  \}
 .  PD
-.  nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
+.  if !r SN \
+.    nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
 .  nr an-level 1
 .  set-an-margin
 .  nr an-prevailing-indent \\n[IN]
@@ -153,7 +164,7 @@
 .  el \{\
 .    wh 0 an-header
 .    wh -1i an-footer
-.    wh -.5i an-p-footer
+.    wh \\n[FT]u an-p-footer
 .
 .    if (\\n[nl] > 0) \{\
 .      ie \\n[C] .bp (\\n[%] + 1)
@@ -192,8 +203,31 @@
 .  el         .nr PD (.4v >? \n[.V])
 ..
 .
+.\" Redefine these to customize the header & footer
+.
+.de1 PT
+.  tl '\\*[an-title](\\*[an-section])'\\*[an-extra3]'\\*[an-title](\\*[an-section])'
+..
+.
+.de1 BT
+.  if r ps4html \
+.    return
+.  ie \\n[D] \{\
+.    if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
+.    if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]'
+.  \}
+.  el \
+.    tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
+..
+.
 .de1 an-header
 .  an-init
+.  if \\n[cR] \{\
+.    ie \\n[an-first] \
+.      nr an-first 0
+.    el \
+.      sp .5i
+.  \}
 .  ev 1
 .  ps \\n[PS]u
 .  vs \\n[VS]u
@@ -203,7 +237,7 @@
 .  el \{\
 .    if !\\n[cR] \
 .      sp .5i
-.    tl '\\*[an-title](\\*[an-section])'\\*[an-extra3]'\\*[an-title](\\*[an-section])'
+.    PT
 .    ie !\\n[cR] \
 .      sp |1i
 .    el \
@@ -243,12 +277,7 @@
 .        ds an-page-string \\n[%]
 .    \}
 .  \}
-.  ie \\n[D] \{\
-.    if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
-.    if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]'
-.  \}
-.  el \
-.    tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
+.  BT
 .  ev
 ..
 .
@@ -271,12 +300,12 @@
 .  fi
 .  in \\n[an-margin]u
 .  ti 0
-.  HTML-TAG ".NH \\n[an-level]"
+.  HTML-TAG-NS ".NH \\n[an-level]"
 .  it 1 an-trap
 .  nr an-no-space-flag 1
 .  nr an-break-flag 1
 .  ps \\n[PS-SH]u
-.  ft B
+.  ft \\*[HF]
 .  ne (2v + 1u)
 .  if \\n[.$] \&\\$*
 ..
@@ -293,7 +322,7 @@
 .  nr an-no-space-flag 1
 .  nr an-break-flag 1
 .  ps \\n[PS-SS]u
-.  ft B
+.  ft \\*[HF]
 .  ne (2v + 1u)
 .  if \\n[.$] \&\\$*
 ..
@@ -349,49 +378,32 @@
 ..
 .
 .de an-do-tag
-.  nr an-div? 0
 .  br
-.  ll
 .  di
+.  nr an-div? 0
+.  ll
 .  ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\
 .    in \\n[an-margin]u
 .    ne (2v + 1u)
 .    an-div
-.    br
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  \}
 .  el \{\
+.    \" In nroff mode, if the indentation value is not an integer multiple
+.    \" of the character cell, it is possible that the following combination
+.    \" of .in and .ti yields a different result as the .in request in
+.    \" the .ie part above.
 .    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .    ti -\\n[an-prevailing-indent]u
 .    chop an-div
 .    ne (1v + 1u)
-\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
-.  \}
-..
-.
-.de an-do-tag-html
-.  nr an-div? 0
-.  br
-.  ll
-.  di
-.  ie ((\\n[dl] + \\n[an-tag-sep]) > \\n[an-prevailing-indent]) \{\
-.    in \\n[an-margin]u
-.    an-div
-.    br
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u + \\n[an-tag-sep]u)
-.  \}
-.  el \{\
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u + \\n[an-tag-sep]u)
-.    ti \\n[an-margin]u
-.    chop an-div
 .    HTML-TAG-NS ".col 1"
-\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\\h'\\n[an-tag-sep]u'\c
+\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
 .    HTML-TAG-NS ".col 2"
 .  \}
 ..
 .
 .de1 LP
-.  br
 .  sp \\n[PD]u
 .  ps \\n[PS]u
 .  vs \\n[VS]u
@@ -509,7 +521,6 @@
 ..
 .
 .de1 RS
-.  br
 .  nr an-saved-margin\\n[an-level] \\n[an-margin]
 .  nr an-saved-prevailing-indent\\n[an-level] \\n[an-prevailing-indent]
 .  ie \\n[.$] .nr an-margin +(n;\\$1)
@@ -520,7 +531,6 @@
 ..
 .
 .de1 RE
-.  br
 .  ie \\n[.$] .nr an-level ((;\\$1) <? \\n[an-level])
 .  el         .nr an-level -1
 .  nr an-level (1 >? \\n[an-level])
@@ -573,11 +583,15 @@
 .ds lq \(lq
 .ds rq \(rq
 .
-.ie \n[an-html] \{\
-.   rm an-do-tag
-.   als an-do-tag an-do-tag-html
+.if !\n[an-html] \{\
+.  if !rHY \{\
+.    ie \n[cR] \
+.      nr HY 12
+.    el \
+.      nr HY 14
+.  \}
+.  hy \n[HY]
 .\}
-.el .hy 14
 .
 .\" Load local modifications.
 .mso man.local
diff --git a/contrib/groff/tmac/composite.tmac b/contrib/groff/tmac/composite.tmac
new file mode 100644
index 0000000..9326933
--- /dev/null
+++ b/contrib/groff/tmac/composite.tmac
@@ -0,0 +1,24 @@
+.\" composite.tmac
+.
+.do composite ga u0300
+.do composite `  u0300
+.do composite aa u0301
+.do composite '  u0301
+.do composite a^ u0302
+.do composite ^  u0302
+.do composite a~ u0303
+.do composite ~  u0303
+.do composite a- u0304
+.do composite -  u0304
+.do composite ab u0306
+.do composite a. u0307
+.do composite .  u0307
+.do composite ad u0308
+.do composite ao u030A
+.do composite a" u030B
+.do composite "  u030B
+.do composite ah u030C
+.do composite ac u0327
+.do composite ho u0328
+.
+.\" EOF
diff --git a/contrib/groff/tmac/cp1047.tmac b/contrib/groff/tmac/cp1047.tmac
index 8b02753..84135f0 100644
--- a/contrib/groff/tmac/cp1047.tmac
+++ b/contrib/groff/tmac/cp1047.tmac
@@ -2,104 +2,100 @@
 .\"
 .nr _C \n(.C
 .cp 0
-.de cp1047-tr
-.  if c\\$2 .if !c\\$1 .trin \\$1\\$2
-..
-.
-.cp1047-tr \[char66] \[^a]
-.cp1047-tr \[char67] \[:a]
-.cp1047-tr \[char68] \[`a]
-.cp1047-tr \[char69] \['a]
-.cp1047-tr \[char70] \[~a]
-.cp1047-tr \[char71] \[oa]
-.cp1047-tr \[char72] \[,c]
-.cp1047-tr \[char73] \[~n]
-.cp1047-tr \[char74] \[ct]
-.cp1047-tr \[char81] \['e]
-.cp1047-tr \[char82] \[^e]
-.cp1047-tr \[char83] \[:e]
-.cp1047-tr \[char84] \[`e]
-.cp1047-tr \[char85] \['i]
-.cp1047-tr \[char86] \[^i]
-.cp1047-tr \[char87] \[:i]
-.cp1047-tr \[char88] \[`i]
-.cp1047-tr \[char89] \[ss]
-.cp1047-tr \[char98] \[^A]
-.cp1047-tr \[char99] \[:A]
-.cp1047-tr \[char100] \[`A]
-.cp1047-tr \[char101] \['A]
-.cp1047-tr \[char102] \[~A]
-.cp1047-tr \[char103] \[oA]
-.cp1047-tr \[char104] \[,C]
-.cp1047-tr \[char105] \[~N]
-.cp1047-tr \[char106] \[bb]
-.cp1047-tr \[char112] \[/o]
-.cp1047-tr \[char113] \['E]
-.cp1047-tr \[char114] \[^E]
-.cp1047-tr \[char115] \[:E]
-.cp1047-tr \[char116] \[`E]
-.cp1047-tr \[char117] \['I]
-.cp1047-tr \[char118] \[^I]
-.cp1047-tr \[char119] \[:I]
-.cp1047-tr \[char120] \[`I]
-.cp1047-tr \[char128] \[/O]
-.cp1047-tr \[char138] \[Fo]
-.cp1047-tr \[char139] \[Fc]
-.cp1047-tr \[char140] \[Sd]
-.cp1047-tr \[char141] \['y]
-.cp1047-tr \[char142] \[Tp]
-.cp1047-tr \[char143] \[t+-]
-.cp1047-tr \[char144] \[de]
-.cp1047-tr \[char154] \[Of]
-.cp1047-tr \[char155] \[Om]
-.cp1047-tr \[char156] \[ae]
-.cp1047-tr \[char157] \[ac]
-.cp1047-tr \[char158] \[AE]
-.cp1047-tr \[char159] \[Cs]
-.cp1047-tr \[char160] \[mc]
-.cp1047-tr \[char170] \[r!]
-.cp1047-tr \[char171] \[r?]
-.cp1047-tr \[char172] \[-D]
-.cp1047-tr \[char174] \[TP]
-.cp1047-tr \[char175] \[rg]
-.cp1047-tr \[char176] \[no]
-.cp1047-tr \[char177] \[Po]
-.cp1047-tr \[char178] \[Ye]
-.cp1047-tr \[char179] \[pc]
-.cp1047-tr \[char180] \[co]
-.cp1047-tr \[char181] \[sc]
-.cp1047-tr \[char182] \[ps]
-.cp1047-tr \[char183] \[14]
-.cp1047-tr \[char184] \[12]
-.cp1047-tr \[char185] \[34]
-.cp1047-tr \[char186] \['Y]
-.cp1047-tr \[char187] \[ad]
-.cp1047-tr \[char188] \[a-]
-.cp1047-tr \[char190] \[aa]
-.cp1047-tr \[char191] \[tmu]
+.trin \[char66]\[^a]
+.trin \[char67]\[:a]
+.trin \[char68]\[`a]
+.trin \[char69]\['a]
+.trin \[char70]\[~a]
+.trin \[char71]\[oa]
+.trin \[char72]\[,c]
+.trin \[char73]\[~n]
+.trin \[char74]\[ct]
+.trin \[char81]\['e]
+.trin \[char82]\[^e]
+.trin \[char83]\[:e]
+.trin \[char84]\[`e]
+.trin \[char85]\['i]
+.trin \[char86]\[^i]
+.trin \[char87]\[:i]
+.trin \[char88]\[`i]
+.trin \[char89]\[ss]
+.trin \[char98]\[^A]
+.trin \[char99]\[:A]
+.trin \[char100]\[`A]
+.trin \[char101]\['A]
+.trin \[char102]\[~A]
+.trin \[char103]\[oA]
+.trin \[char104]\[,C]
+.trin \[char105]\[~N]
+.trin \[char106]\[bb]
+.trin \[char112]\[/o]
+.trin \[char113]\['E]
+.trin \[char114]\[^E]
+.trin \[char115]\[:E]
+.trin \[char116]\[`E]
+.trin \[char117]\['I]
+.trin \[char118]\[^I]
+.trin \[char119]\[:I]
+.trin \[char120]\[`I]
+.trin \[char128]\[/O]
+.trin \[char138]\[Fo]
+.trin \[char139]\[Fc]
+.trin \[char140]\[Sd]
+.trin \[char141]\['y]
+.trin \[char142]\[Tp]
+.trin \[char143]\[t+-]
+.trin \[char144]\[de]
+.trin \[char154]\[Of]
+.trin \[char155]\[Om]
+.trin \[char156]\[ae]
+.trin \[char157]\[ac]
+.trin \[char158]\[AE]
+.trin \[char159]\[Cs]
+.trin \[char160]\[mc]
+.trin \[char170]\[r!]
+.trin \[char171]\[r?]
+.trin \[char172]\[-D]
+.trin \[char174]\[TP]
+.trin \[char175]\[rg]
+.trin \[char176]\[tno]
+.trin \[char177]\[Po]
+.trin \[char178]\[Ye]
+.trin \[char179]\[pc]
+.trin \[char180]\[co]
+.trin \[char181]\[sc]
+.trin \[char182]\[ps]
+.trin \[char183]\[14]
+.trin \[char184]\[12]
+.trin \[char185]\[34]
+.trin \[char186]\['Y]
+.trin \[char187]\[ad]
+.trin \[char188]\[a-]
+.trin \[char190]\[aa]
+.trin \[char191]\[tmu]
 .\" The soft-hyphen character is only an input character
 .tr \[char202]\%
-.cp1047-tr \[char203] \[^o]
-.cp1047-tr \[char204] \[:o]
-.cp1047-tr \[char205] \[`o]
-.cp1047-tr \[char206] \['o]
-.cp1047-tr \[char207] \[~o]
-.cp1047-tr \[char218] \[S1]
-.cp1047-tr \[char219] \[^u]
-.cp1047-tr \[char220] \[:u]
-.cp1047-tr \[char221] \[`u]
-.cp1047-tr \[char222] \['u]
-.cp1047-tr \[char223] \[:y]
-.cp1047-tr \[char225] \[tdi]
-.cp1047-tr \[char234] \[S2]
-.cp1047-tr \[char235] \[^O]
-.cp1047-tr \[char236] \[:O]
-.cp1047-tr \[char237] \[`O]
-.cp1047-tr \[char238] \['O]
-.cp1047-tr \[char239] \[~O]
-.cp1047-tr \[char250] \[S3]
-.cp1047-tr \[char251] \[^U]
-.cp1047-tr \[char252] \[:U]
-.cp1047-tr \[char253] \[`U]
-.cp1047-tr \[char254] \['U]
+.trin \[char203]\[^o]
+.trin \[char204]\[:o]
+.trin \[char205]\[`o]
+.trin \[char206]\['o]
+.trin \[char207]\[~o]
+.trin \[char218]\[S1]
+.trin \[char219]\[^u]
+.trin \[char220]\[:u]
+.trin \[char221]\[`u]
+.trin \[char222]\['u]
+.trin \[char223]\[:y]
+.trin \[char225]\[tdi]
+.trin \[char234]\[S2]
+.trin \[char235]\[^O]
+.trin \[char236]\[:O]
+.trin \[char237]\[`O]
+.trin \[char238]\['O]
+.trin \[char239]\[~O]
+.trin \[char250]\[S3]
+.trin \[char251]\[^U]
+.trin \[char252]\[:U]
+.trin \[char253]\[`U]
+.trin \[char254]\['U]
 .cp \n(_C
diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 7310d19..438a749 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -180,7 +180,7 @@
 .eo
 .
 .
-.\" punctuation values (suffix=3, prefix = 4)
+.\" punctuation values (suffix=3, prefix=4)
 .
 .nr doc-punct. 3
 .nr doc-punct, 3
@@ -321,11 +321,12 @@
 .          as doc-volume " \*[doc-volume-ds-\$2]
 .    \}\}\}
 .    el \{\
-.      ie "\$2"unass" .ds doc-volume DRAFT
-.      el \{ .ie "\$2"draft" .ds doc-volume DRAFT
-.      el \{ .ie "\$2"paper" .ds doc-volume UNTITLED
-.      el \
-.        tm mdoc warning: .Dt: unknown section `\$2' (#\n[.c])
+.      ie "\$2"unass" \
+.        ds doc-volume DRAFT
+.      el \{ .ie "\$2"draft" \
+.        ds doc-volume DRAFT
+.      el .if "\$2"paper" \
+.        ds doc-volume UNTITLED
 .      \}\}
 .      if \A\$3 \{\
 .        if d doc-volume-ds-\$3 \
@@ -542,7 +543,7 @@
 .  ev doc-env-dh
 .  doc-setup-page-layout
 .  if !\n[cR] \
-'    sp \n[doc-header-space]u
+.    sp \n[doc-header-space]u
 .  nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[]'
 .  nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]'
 .  if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
@@ -553,8 +554,9 @@
 .    as doc-header-string "\|.\|.\|.
 .  \}
 .  tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[]
-'  sp \n[doc-header-space]u
+.  sp \n[doc-header-space]u
 .  ev
+.  ns
 ..
 .
 .
@@ -563,11 +565,11 @@
 .
 .de doc-footer
 .  ie \n[cR] \
-'    br
+.    br
 .  el \{\
 .    ev doc-caption-enviroment
 .    doc-setup-page-layout
-'    sp \n[doc-footer-space]u
+.    sp \n[doc-footer-space]u
 .    ie \n[D] \{\
 .      ie o \
 .        tl %\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[]
@@ -576,7 +578,7 @@
 .    \}
 .    el \
 .      tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]%
-'    bp
+.    bp
 .    ev
 .  \}
 ..
@@ -602,7 +604,7 @@
 .    tm mdoc warning: list open at EOF!  A .Bl directive has no matching .El
 .
 .  if \n[cR] \{\
-'    sp
+.    sp
 .    tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[]
 .    \" suppress empty lines after the footer
 .    pl \n[nl]u
@@ -761,14 +763,14 @@
 .    doc-parse-args \$@
 .
 .    if t \
-'      ad
+.      ad
 .
 .    \" this resolves e.g. `.Sh "SEE ALSO"'
 .    doc-first-parameter \$*
 .
 .    ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\
 .      doc-setup-header
-'      in 0
+.      in 0
 .    \}
 .    el \{\
 .      nr doc-in-synopsis-section 0
@@ -805,12 +807,12 @@
 .    \}
 .
 .    doc-setup-page-layout
-'    sp
+.    sp
 .    ns
 .    ta T .5i
 .    if !\n[cR] \
 .      ne 3
-'    fi
+.    fi
 .
 .    if t \{\
 .      nr doc-reg-Sh \n[.ss]
diff --git a/contrib/groff/tmac/doc-ditroff b/contrib/groff/tmac/doc-ditroff
index 94f7e50..6c83009 100644
--- a/contrib/groff/tmac/doc-ditroff
+++ b/contrib/groff/tmac/doc-ditroff
@@ -36,10 +36,6 @@
 .
 .eo
 .
-.\" use -rC=1 to number pages continuously
-.
-.if !r C .nr C 0
-.
 .\" use -rD=1 for double-sided printing
 .
 .if !r D .nr D 0
@@ -212,18 +208,11 @@
 .  wh 0 doc-header
 .  wh -1.25i doc-footer
 .
-.  nr nL \n[nl]
 .  if \n[gX] \
 .    ds doc-command-name
 .
 .  br
 .
-.  \" Don't set the page number if this is the first page,
-.  \" in case the user has used -n.
-.  if \n[nL] \
-.    if !\n[C] \
-.      nr % 1
-.
 .  nr gX 0
 .  e@ doc-end-macro
 ..
diff --git a/contrib/groff/tmac/doc-nroff b/contrib/groff/tmac/doc-nroff
index 9c5f307..0c04381 100644
--- a/contrib/groff/tmac/doc-nroff
+++ b/contrib/groff/tmac/doc-nroff
@@ -44,10 +44,9 @@
 .
 .if !r cR .nr cR 1
 .
-.\" the following switches are ignored in nroff mode
+.\" the following switch is ignored in nroff mode
 .
 .nr S 10
-.nr C 0
 .
 .\" the `doc-xx-font' strings must not be empty!
 .
@@ -122,10 +121,7 @@
 .\" NS   doc-header-space
 .
 .de doc-setup-page-layout
-.  ie \n[cR] \
-.    nr doc-header-space 0
-.  el \
-.    nr doc-header-space .5i
+.  nr doc-header-space .5i
 .  nr doc-footer-space .5i
 .
 .  ie r LL \
@@ -201,7 +197,6 @@
 .\" NS   doc-header-string
 .
 .de doc-setup-header
-.  nr % 1
 .  ds doc-header-string "\*[doc-document-title]
 .  if !"\*[doc-section]"Null" \
 .    as doc-header-string (\*[doc-section])
@@ -213,9 +208,6 @@
 .    wh -1.167i doc-footer
 .  \}
 .
-.  if ((\n[nl] == 0) : (\n[nl] == -1)) \
-'    bp
-.
 .  e@ doc-end-macro
 ..
 .
diff --git a/contrib/groff/tmac/doc.tmac b/contrib/groff/tmac/doc.tmac
index 3667643..290431a 100644
--- a/contrib/groff/tmac/doc.tmac
+++ b/contrib/groff/tmac/doc.tmac
@@ -767,7 +767,7 @@
 .
 .
 .\" NS doc-do-func-decl macro
-.\" NS   do someting special while in SYNOPSIS
+.\" NS   do something special while in SYNOPSIS
 .\" NS
 .\" NS modifies:
 .\" NS   doc-curr-font
@@ -2652,10 +2652,10 @@
 .
 .    ie t \{\
 .      nop \*[doc-Li-font]\c
-'      ta T 9n
+.      ta T 9n
 .    \}
 .    el \
-'      ta T 8n
+.      ta T 8n
 .    nf
 .  \}
 .  el \{ .ie "\$1"-filled" \{\
@@ -2696,14 +2696,10 @@
 .    nr doc-display-indent-stack\n[doc-display-depth] 0
 .
 .  if \n[doc-display-indent-stack\n[doc-display-depth]] \
-'    in +\n[doc-display-indent-stack\n[doc-display-depth]]u
+.    in +\n[doc-display-indent-stack\n[doc-display-depth]]u
 .
-.  if !\n[doc-is-compact] \{\
-.    ie "\*[doc-display-type-stack\n[doc-display-depth]]"ragged" \
-.      sp \n[doc-display-vertical]u
-.    el \
-'      sp \n[doc-display-vertical]u
-.  \}
+.  if !\n[doc-is-compact] \
+.    sp \n[doc-display-vertical]u
 .
 .  if !\n[cR] \
 .    ne 2v
@@ -4317,7 +4313,7 @@
 .    nr doc-list-indent-stack\n[doc-list-depth] \n[doc-column-indent-width]u
 .  if !\n[.u] \{\
 .    fi
-'    in +\n[doc-column-indent-width]u
+.    in +\n[doc-column-indent-width]u
 .  \}
 .  ti -\n[doc-column-indent-width]u
 .
@@ -4363,7 +4359,7 @@
 .\" NS width register `Dl' set in doc-common
 .
 .de Dl
-'  ta T .5i
+.  ta T .5i
 .  in +\n[doc-display-indent]u
 .
 .  ie \n[doc-arg-limit] \{\
@@ -4398,7 +4394,7 @@
 .\" NS width register `D1' set in doc-common
 .
 .de D1
-'  ta T .5i
+.  ta T .5i
 .  in +\n[doc-display-indent]u
 .
 .  ie \n[doc-arg-limit] \{\
diff --git a/contrib/groff/tmac/dvi.tmac b/contrib/groff/tmac/dvi.tmac
index 4eb03b8..27fd5b3 100644
--- a/contrib/groff/tmac/dvi.tmac
+++ b/contrib/groff/tmac/dvi.tmac
@@ -11,27 +11,47 @@
 .ftr TT CW
 .ftr H HR
 .
-.special TR TI
+.special TR TI MI S SA SB CW
 .fspecial TI CWI
 .fspecial TBI CWI
 .fspecial HI CWI
 .fspecial HBI CWI
+.fspecial CW SC
+.fspecial CWI SC
 .
-.\" This uses the dvi-char_1 string in font CW or CWI, dvi-char_0 otherwise.
-.fchar _ \
-\R'dvi-char_ ((\\n[.f] == \f[CW]\\n[.f]\f[]) : \
-              (\\n[.f] == \f[CWI]\\n[.f]\f[]))'\\*[dvi-char_\\n[dvi-char_]]
-.fchar \[ul] \R'dvi-char_ \w'M'==\w'i''\\*[dvi-char_\\n[dvi-char_]]
+.\" This uses the dvi-char-_-1 string in fixed-width fonts, dvi-char-_-0
+.\" otherwise.
+.fchar _ \R'dvi-char (\w'M' == \w'i')'\E*[dvi-char-_-\\n[dvi-char]]
 .\" Normally use a rule.
+.ds dvi-char-_-0 \Z'\v'.08m'\D'R .54m .04m''\h'.5m'
+.\" In fixed-width fonts (CW and CWI) use a real _ character.
+.ds dvi-char-_-1 _
+.
+.fchar \[/l] \
+\R'dvi-char ((\w'M' == \w'i') + \
+             (\En[.f] == \f[CWI]\En[.f]\f[]))'\E*[dvi-char-/l-\\n[dvi-char]]
+.ds dvi-char-/l-0 \[slash@for@l]l
+.ds dvi-char-/l-1 \Z'\v'0.22v'\h'-0.02m'\''l
+.ds dvi-char-/l-2 \Z'\v'0.22v'\h'-0.13m'\''l
+.
+.fchar \[/L] \
+\R'dvi-char ((\w'M' == \w'i') + \
+             (\En[.f] == \f[CWI]\En[.f]\f[]))'\E*[dvi-char-/L-\\n[dvi-char]]
+.ds dvi-char-/L-0 \h'\w'L'u-\w'\[slash@for@l]L'u'\[slash@for@l]L
+.ds dvi-char-/L-1 \Z'\v'0.22v'\h'-0.14m'\''L
+.ds dvi-char-/L-2 \Z'\v'0.22v'\h'-0.21m'\''L
+.
 .\" This is designed so that \(ul, \(rn and \(br form corners.
-.ds dvi-char_0 \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
-.\" In font CW and CWI use a real _ character.
-.ds dvi-char_1 _
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
 .
-.fchar \[radicalex] \D'R .5m -.04m'\v'.04m'
-.fchar \[br] \Z'\v'.25m'\D'R .04m -1m''
-.fchar \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
-.fchar \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.
+.fchar \[sr] \v'-.75m'\[sqrt]\v'.75m'
+.fchar \[sqrtex] \D'R .5m -.04m'\v'.04m'
+.fchar \[radicalex] \v'-.75m'\D'R .5m -.04m'\v'.79m'
 .fchar \[co] \
 \z\s-2\[ci]\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4C\s0'u/2u'\
@@ -42,16 +62,26 @@
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4R\s0'u/2u'\
 \s-4R\s0\
 \h'\w'\s-2\[ci]\s0'u-\w'\s-4R\s0'u/2u'
-.fchar \[fm] \v'-.35m'\s[\\n[.s]*7u/10u]\[prime]\s0\v'.35m'
+.fchar \[fm] \v'-.35m'\s[\En[.s]*7u/10u]\[prime]\s0\v'.35m'
+.fchar \[sd] \v'-.35m'\s[\En[.s]*7u/10u]\[prime]\[prime]\s0\v'.35m'
 .fchar \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
 .fchar \[ct] \o'c/'
 .fchar \[sq] \
 \Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
 \D'R .04m -.4m'\v'.04m'\D'R -.4m -.04m'\D'R .04m .4m''\h'.5m'
 .\"char \[sq] \h'.05m'\D'l .4m 0'\D'l 0 -.4m'\D'l -.4m 0'\D'l 0 .4m'\h'.45m'
-.fchar \[!=] \[slashnot]\[eq]
-.fchar \[tm] \v'-.3m'\s[\\n[.s]/2u]TM\s0\v'.3m'
-.fchar \[aq] '
+.\" SC contains a real \[!=] glyph
+.schar \[!=] \[slashnot]\[eq]
+.schar \[nm] \o'\F[T]\f[R]/\[mo]'
+.fschar CW \[nm] \o'/\[mo]'
+.fschar CWI \[nm] \o'\f[CW]/\[mo]'
+.schar \[ne] \[slashnot]\[==]
+.fschar CW \[ne] \o'/\[==]'
+.fschar CWI \[ne] \o'\f[CW]/\[==]'
+.fchar \[=~] \v'.1m'\Z'\[eq]'\v'-.4m'\[ap]\v'.3m'
+.fchar \[tm] \v'-.3m'\s[\En[.s]/2u]TM\s0\v'.3m'
+.\" TC fonts contain real \[aq] glyphs
+.schar \[aq] '
 .fchar \[bq] ,
 .fchar \[Bq] ,\h'\w'\[rq]'u-(2u*\w"'"u)',
 .fchar \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
@@ -62,14 +92,30 @@ I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'\
 D\v'-.33m'\s0\v'.33m'
 .fchar \[Tp] \zlp
 .fchar \[nb] \[slashnot]\[sb]
+.fchar \[nc] \[slashnot]\[sp]
 .cflags 8 \[an]
-.fchar \[an] \h'-.167m'\[mi]\h'-.167m'
+.schar \[an] \h'-.167m'\[mi]\h'-.167m'
+.fschar CW \[an] -
+.fschar CWI \[an] \f[CW]\[mi]
+.\" we follow the EC ligatures for fixed-width dashes
+.fchar \[em] --
+.fchar \[en] -
+.fchar \[hy] -
+.fschar CW \[va] \o'\[ua]\[da]'
+.fschar CWI \[va] \o'\[ua]\[da]'
+.fschar CW \[<>] \o'\[<-]\[->]'
+.fschar CWI \[<>] \o'\[<-]\[->]'
+.fchar \[lh] \[lA]
+.fchar \[rh] \[rA]
+.
+.fchar \[f/] /
 .
 .\" Define some fractions.
 .de dvi-frac
 .  fchar \[\\$1\\$2] \
-\v'-.25m'\s[\\\\n[.s]*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
-/\h'-.2m'\v'.25m'\s[\\\\n[.s]*7u/10u]\\$2\s0\v'-.25m'
+\v'-.25m'\s[\\En[.s]*7u/10u]\\$1\s0\v'.25m'\
+\h'-.2m'\[f/]\h'-.2m'\
+\v'.25m'\s[\\En[.s]*7u/10u]\\$2\s0\v'-.25m'
 ..
 .
 .dvi-frac 1 2
@@ -86,23 +132,27 @@ D\v'-.33m'\s0\v'.33m'
 .fchar \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
 .fchar \[Of] \v'-.2m'\s'\En[.s]*6u/10u'\o'_a'\s0\v'.2m'
 .fchar \[Om] \v'-.2m'\s'\En[.s]*6u/10u'\o'_o'\s0\v'.2m'
+.fchar \[fo] \v'-.1m'\s-3<\s+3\v'+.1m'
+.fchar \[fc] \v'-.1m'\s-3>\s+3\v'+.1m'
 .fchar \[Fo] \v'-.1m'\s-3<\h'-.3m'<\s+3\v'+.1m'
 .fchar \[Fc] \v'-.1m'\s-3>\h'-.3m'>\s+3\v'+.1m'
 .fchar \[bb] |
-.fchar \[Ye] \o'-Y'
 .fchar \[Cs] \o'\[mu]o'
 .
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.
 .de dvi-achar
 .  \" Note that character definitions are always interpreted with
 .  \" compatibility mode off.
 .  fchar \\$1 \
 \\$3\
 \k[acc]\
-\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
-\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\En[skw]+(\w'x'*0)-\\En[skw])'\
+\v'(u;\w'x'*0+\\En[rst]+(\w'\\$3'*0)-\\En[rst])'\
 \\$2\
-\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
-\h'|\\\\n[acc]u'
+\v'(u;\w'x'*0-\\En[rst]+(\w'\\$3'*0)+\\En[rst])'\
+\h'|\\En[acc]u'
 .  hcode \\$1\\$4
 ..
 .
@@ -112,6 +162,7 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-achar \[~A] ~     A     a
 .dvi-achar \[:A] \[ad] A     a
 .dvi-achar \[oA] \[ao] A     a
+.dvi-achar \['C] \'    C     c
 .dvi-achar \[`E] \`    E     e
 .dvi-achar \['E] \'    E     e
 .dvi-achar \[^E] ^     E     e
@@ -138,6 +189,7 @@ D\v'-.33m'\s0\v'.33m'
 .dvi-achar \[~a] ~     a     a
 .dvi-achar \[:a] \[ad] a     a
 .dvi-achar \[oa] \[ao] a     a
+.dvi-achar \['c] \'    c     c
 .dvi-achar \[`e] \`    e     e
 .dvi-achar \['e] \'    e     e
 .dvi-achar \[^e] ^     e     e
diff --git a/contrib/groff/tmac/ec.tmac b/contrib/groff/tmac/ec.tmac
index d8bff62..045abd3 100644
--- a/contrib/groff/tmac/ec.tmac
+++ b/contrib/groff/tmac/ec.tmac
@@ -29,6 +29,7 @@
 .ftr TT CWEC
 .ftr H HREC
 .
+.special MI S
 .fspecial TREC TRTC
 .fspecial TIEC TITC
 .fspecial TBEC TBTC
@@ -37,18 +38,24 @@
 .fspecial HIEC HITC
 .fspecial HBEC HBTC
 .fspecial HBIEC HBIEC
-.fspecial CWEC CWTC
-.fspecial CWIEC CWITC
+.fspecial CWEC CWTC SC
+.fspecial CWIEC CWITC SC
 .
-.\" remove definitions of glyphs which are TC fonts
+.\" remove definitions of glyphs which are in TC fonts
 .rchar \[co] \[rg]
 .rchar \[ct]
 .rchar \[tm]
-.rchar \[aq]
-.rchar \[12] \[14] \[34]
+.rchar \[f/]
 .rchar \[S1] \[S2] \[S3]
 .rchar \[Of] \[Om]
-.rchar \[Ye] \[Cs]
+.rchar \[Cs]
+.rchar \[de]
+.
+.\" \[pl] and \[eq] must be roman
+.char \[pl] \f[TREC]+
+.char \[eq] \f[TREC]=
+.
+.schar \[nm] \o'\f[TREC]/\[mo]'
 .
 .\" an ID register
 .nr ECFONTS 1
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index cfdbf3f..874d735 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -22,7 +22,7 @@ ifdef html ! define ps|X|html %1% !
 ifdef ps|X|html ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
 
 ifdef dvi !
-sdefine int %{type "operator" vcenter \(is}%
+sdefine int %{type "operator" vcenter \[integral]}%
 sdefine sum %{type "operator" vcenter \[sum]}%
 sdefine prod %{type "operator" vcenter \[product]}%
 sdefine coprod %{type "operator" vcenter \[coproduct]}%
diff --git a/contrib/groff/tmac/europs.tmac b/contrib/groff/tmac/europs.tmac
new file mode 100644
index 0000000..bbb54f6
--- /dev/null
+++ b/contrib/groff/tmac/europs.tmac
@@ -0,0 +1,38 @@
+.\" europs.tmac
+.
+.do char \[eu] \f[EURO]\N'0'
+.
+.do fschar AB   \[Eu] \f[EURO]\N'1'
+.do fschar ABI  \[Eu] \f[EURO]\N'3'
+.do fschar AI   \[Eu] \f[EURO]\N'2'
+.do fschar AR   \[Eu] \f[EURO]\N'0'
+.do fschar BMB  \[Eu] \f[EURO]\N'5'
+.do fschar BMBI \[Eu] \f[EURO]\N'7'
+.do fschar BMI  \[Eu] \f[EURO]\N'6'
+.do fschar BMR  \[Eu] \f[EURO]\N'4'
+.do fschar CB   \[Eu] \f[EURO]\N'13'
+.do fschar CBI  \[Eu] \f[EURO]\N'15'
+.do fschar CI   \[Eu] \f[EURO]\N'14'
+.do fschar CR   \[Eu] \f[EURO]\N'12'
+.do fschar HB   \[Eu] \f[EURO]\N'9'
+.do fschar HBI  \[Eu] \f[EURO]\N'11'
+.do fschar HI   \[Eu] \f[EURO]\N'10'
+.do fschar HR   \[Eu] \f[EURO]\N'8'
+.do fschar HNB  \[Eu] \f[EURO]\N'9'
+.do fschar HNBI \[Eu] \f[EURO]\N'11'
+.do fschar HNI  \[Eu] \f[EURO]\N'10'
+.do fschar HNR  \[Eu] \f[EURO]\N'8'
+.do fschar NB   \[Eu] \f[EURO]\N'5'
+.do fschar NBI  \[Eu] \f[EURO]\N'7'
+.do fschar NI   \[Eu] \f[EURO]\N'6'
+.do fschar NR   \[Eu] \f[EURO]\N'4'
+.do fschar PB   \[Eu] \f[EURO]\N'5'
+.do fschar PBI  \[Eu] \f[EURO]\N'7'
+.do fschar PI   \[Eu] \f[EURO]\N'6'
+.do fschar PR   \[Eu] \f[EURO]\N'4'
+.do fschar TB   \[Eu] \f[EURO]\N'5'
+.do fschar TBI  \[Eu] \f[EURO]\N'7'
+.do fschar TI   \[Eu] \f[EURO]\N'6'
+.do fschar TR   \[Eu] \f[EURO]\N'4'
+.
+.\" EOF
diff --git a/contrib/groff/tmac/groff_man.man b/contrib/groff/tmac/groff_man.man
index 2a1396e..5886e4f 100644
--- a/contrib/groff/tmac/groff_man.man
+++ b/contrib/groff/tmac/groff_man.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1999-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1999-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,17 +16,26 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
 .de TQ
-.br
-.ns
-.TP \\$1
+.  br
+.  ns
+.  TP \\$1
 ..
+.
+.
 .TH GROFF_MAN @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH NAME
 .
 groff_man \- groff `man' macros to support generation of man pages
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH SYNOPSIS
 .
 .B groff
@@ -47,6 +56,9 @@ groff_man \- groff `man' macros to support generation of man pages
 .IR files .\|.\|.\&
 ]
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH DESCRIPTION
 .
 The
@@ -57,22 +69,16 @@ were written by James Clark.
 This document provides a brief summary of the use of each macro in that
 package.
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH OPTIONS
 .
 The
 .B man
 macros understand the following command line options (which define various
 registers).
-.TP
-.BI \-rLL= line-length
-Set line length.
-If this option is not given, the line length defaults to 78n in nroff mode
-and 6.5i in troff mode.
-.TP
-.BI \-rLT= title-length
-Set title length.
-If this option is not given, the title length defaults to 78n in nroff mode
-and 6.5i in troff mode.
+.
 .TP
 .B \-rcR=1
 This option (the default if in nroff mode) will create a single, very long
@@ -80,19 +86,64 @@ page instead of multiple pages.
 Say
 .B \-rcR=0
 to disable it.
+.
 .TP
 .B \-rC1
 If more than one manual page is given on the command line, number the
 pages continuously, rather than starting each at\ 1.
+.
 .TP
 .B \-rD1
 Double-sided printing.
 Footers for even and odd pages are formatted differently.
+.
+.TP
+.BI \-rFT= dist
+Set distance of the footer relative to the bottom of the page if negative
+or relative to the top if positive.
+The default is -0.5i.
+.
+.TP
+.BI \-rHY= flags
+Set hyphenation flags.
+.
+Possible values are 1\ to hyphenate without restrictions, 2\ to not
+hyphenate the last word on a page, 4\ to not hyphenate the last two
+characters of a word, and 8\ to not hyphenate the first two characters
+of a word.
+.
+These values are additive; the default is\ 14.
+.
+.TP
+.BI \-rIN= width
+Set body text indentation to
+.IR width .
+The default is 7n for
+.IR nroff ,
+7.2n for
+.IR troff .
+For
+.IR nroff ,
+this value should always be an integer multiple of unit `n' to get
+consistent indentation.
+.
+.TP
+.BI \-rLL= line-length
+Set line length.
+If this option is not given, the line length defaults to 78n in nroff mode
+and 6.5i in troff mode.
+.
+.TP
+.BI \-rLT= title-length
+Set title length.
+If this option is not given, the title length defaults to the line length.
+.
 .TP
 .BI \-rP nnn
 Enumeration of pages will start with
 .I nnn
 rather than with\ 1.
+.
 .TP
 .BI \-rS xx
 Base document font size is
@@ -100,6 +151,13 @@ Base document font size is
 points
 .RI ( xx
 can be 10, 11, or\ 12) rather than 10\ points.
+.
+.TP
+.BI \-rSN= width
+Set sub-subheading indentation to
+.IR width .
+The default is 3n.
+.
 .TP
 .BI \-rX nnn
 After page\ \c
@@ -112,6 +170,9 @@ etc.
 For example, the option `\-rX2' will produce the following page numbers:
 1, 2, 2a, 2b, 2c, etc.
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH USAGE
 .
 This section describes the available macros for manual pages.
@@ -120,9 +181,10 @@ For further customization, put additional macros and requests into the file
 which will be loaded immediately after the
 .B man
 package.
+.
 .TP
 .BI .TH " title section " [ extra1 "] [" extra2 "] [" extra3 ]
-Sets the title of the man page to
+Set the title of the man page to
 .I title
 and the section to
 .IR section ,
@@ -142,13 +204,15 @@ in parentheses immediately appended to
 .I extra1
 will be positioned in the middle of the footer line.
 .I extra2
-will be positioned at the left in the footer line (resp. at the left on
+will be positioned at the left in the footer line (or at the left on
 even pages and at the right on odd pages if double-sided printing is
 active).
 .I extra3
 is centered in the header line.
+.
 .IP
 For HTML output, headers and footers are completely supressed.
+.
 .IP
 Additionally, this macro starts a new page; the new line number is\ 1 again
 (except if the `-rC1' option is given on the command line) -- this feature
@@ -156,50 +220,69 @@ is intended only for formatting multiple man pages; a single man page should
 contain exactly one
 .B TH
 macro at the beginning of the file.
+.
 .TP
 .BI ".SH [" "text for a heading" ]
-Sets up an unnumbered section heading sticking out to the left.
+Set up an unnumbered section heading sticking out to the left.
 Prints out all the text following
 .B SH
-up to the end of the line (resp. the text in the next input line if there is
+up to the end of the line (or the text in the next input line if there is
 no argument to
 .BR SH )
-in bold face, one size larger than the base document size.
-Additionally, the left margin for the following text is reset to its default
-value.
+in bold face
+(or the font specified by the string
+.BR HF ),
+one size larger than the base document size.
+Additionally, the left margin and the indentation for the following text
+is reset to the default values.
+.
 .TP
 .BI ".SS [" "text for a heading" ]
-Sets up an secondary, unnumbered section heading.
+Set up a secondary, unnumbered section heading.
 Prints out all the text following
 .B SS
-up to the end of the line (resp. the text in the next input line if there is
+up to the end of the line (or the text in the next input line if there is
 no argument to
 .BR SS )
-in bold face, at the same size as the base document size.
-Additionally, the left margin for the following text is reset to its default
-value.
+in bold face
+(or the font specified by the string
+.BR HF ),
+at the same size as the base document size.
+Additionally, the left margin and the indentation for the following text
+is reset to the default values.
+.
 .TP
 .BI ".TP [" nnn ]
-Sets up an indented paragraph with label.
+Set up an indented paragraph with label.
 The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted), otherwise
-it is set to the default indentation value.
+it is set to the previous indentation value specified with
+.BR TP ,
+.BR IP ,
+or
+.B HP
+(or to the default value if none of them have been used yet).
+.
+.IP
 The first input line of text following this macro is interpreted as a string
 to be printed flush-left, as it is appropriate for a label.
 It is not interpreted as part of a paragraph, so there is no attempt to fill
 the first line with text from the following input lines.
-Nevertheless, if the label is not as wide as the indentation, then the
+Nevertheless, if the label is not as wide as the indentation the
 paragraph starts at the same line (but indented), continuing on the
 following lines.
-If the label is wider than the indentation, then the descriptive part of the
+If the label is wider than the indentation the descriptive part of the
 paragraph begins on the line following the label, entirely indented.
 Note that neither font shape nor font size of the label is set to a default
 value; on the other hand, the rest of the text will have default font
 settings.
+.
+.IP
 The
 .B TP
 macro is the macro used for the explanations you are just reading.
+.
 .TP
 .B .LP
 .TQ
@@ -212,23 +295,35 @@ vertical space downwards by the amount specified by the
 .B PD
 macro.
 The font size and shape are reset to the default value (10pt resp. Roman).
-Finally, the current left margin is restored.
+Finally, the current left margin and the indentation are restored.
+.
 .TP
 .BI ".IP [" designator "] [" nnn ]
-Sets up an indented paragraph, using
+Set up an indented paragraph, using
 .I designator
 as a tag to mark its beginning.
 The indentation is set to
 .I nnn
-if that argument is supplied (default unit is `n'), otherwise the default
-indentation value is used.
+if that argument is supplied (the default unit is `n' if omitted), otherwise
+it is set to the previous indentation value specified with
+.BR TP ,
+.BR IP ,
+or
+.B HP
+(or to the default value if none of them have been used yet).
 Font size and face of the paragraph (but not the designator) are reset to
 its default values.
+.
+.IP
 To start an indented paragraph with a particular indentation but without a
 designator, use `""' (two doublequotes) as the second argument.
+.
 .IP
 For example, the following paragraphs were all set up with bullets as the
-designator, using `.IP\ \\(bu\ 4':
+designator, using `.IP\ \\(bu\ 4'.
+The whole block has been enclosed with `.RS' and `.RE' to set the left
+margin temporarily to the current indentation value.
+.
 .RS
 .IP \(bu 4
 .B IP
@@ -244,16 +339,24 @@ This macro produces a paragraph with a left hanging indentation.
 is another.
 This macro produces an unindented label followed by an indented paragraph.
 .RE
+.
 .TP
 .BI ".HP [" nnn ]
-Sets up a paragraph with hanging left indentation.
+Set up a paragraph with hanging left indentation.
 The indentation is set to
 .I nnn
-if that argument is supplied (default unit is `n'), otherwise the default
-indentation value is used.
+if that argument is supplied (the default unit is `n' if omitted), otherwise
+it is set to the previous indentation value specified with
+.BR TP ,
+.BR IP ,
+or
+.B HP
+(or to the default value if none of them have been used yet).
 Font size and face are reset to its default values.
 The following paragraph illustrates the effect of this macro with hanging
-indentation set to\ 4:
+indentation set to\ 4 (enclosed by `.RS' and `.RE' to set the left margin temporarily to
+the current indentation):
+.
 .RS
 .HP 4
 This is a paragraph following an invocation of the
@@ -262,25 +365,37 @@ macro.
 As you can see, it produces a paragraph where all lines but the first are
 indented.
 .RE
+.
 .TP
 .BI ".RS [" nnn ]
 This macro moves the left margin to the right by the value
 .I nnn
-if specified (default unit is `n'); otherwise the default indentation value
-is used.
+if specified (default unit is `n'); otherwise it is set to the previous
+indentation value specified with
+.BR TP ,
+.BR IP ,
+or
+.B HP
+(or to the default value if none of them have been used yet).
+The indentation value is then set to the default.
+.
+.IP
 Calls to the
 .B RS
 macro can be nested.
+.
 .TP
 .BI ".RE [" nnn ]
 This macro moves the left margin back to level
-.IR nnn ;
-if no argument is given, it moves one level back.
+.IR nnn ,
+restoring the previous left margin.
+If no argument is given, it moves one level back.
 The first level (i.e., no call to
 .B RS
 yet) has number\ 1, and each call to
 .B RS
 increases the level by\ 1.
+.
 .PP
 To summarize, the following macros cause a line break with the insertion of
 vertical space (which amount can be changed with the
@@ -300,27 +415,24 @@ The macros
 and
 .B RE
 also cause a break but no insertion of vertical space.
-Finally, the macros
-.BR SH ,
-.BR SS ,
-.B LP
-.RB ( PP ,
-.BR P ),
-and
-.B RS
-reset the indentation to its default value.
+.
+.
+.\" -----------------------------------------------------------------
 .
 .SH "MACROS TO SET FONTS"
 .
 The standard font is Roman; the default text size is 10\ point.
+.
 .TP
 .BI ".SM [" text ]
 Causes the text on the same line or the text on the next input line to
 appear in a font that is one point size smaller than the default font.
+.
 .TP
 .BI ".SB [" text ]
 Causes the text on the same line or the text on the next input line to
 appear in boldface font, one point size smaller than the default font.
+.
 .TP
 .BI ".BI " text
 Causes text on the same line to appear alternately in bold face and italic.
@@ -333,59 +445,71 @@ Thus
 would cause `this' and `that' to appear in bold face, while `word and'
 appears in italics.
 .RE
+.
 .TP
 .BI ".IB " text
 Causes text to appear alternately in italic and bold face.
 The text must be on the same line as the macro call.
+.
 .TP
 .BI ".RI " text
 Causes text on the same line to appear alternately in roman and italic.
 The text must be on the same line as the macro call.
+.
 .TP
 .BI ".IR " text
 Causes text on the same line to appear alternately in italic and roman.
 The text must be on the same line as the macro call.
+.
 .TP
 .BI ".BR " text
 Causes text on the same line to appear alternately in bold face and roman.
 The text must be on the same line as the macro call.
+.
 .TP
 .BI ".RB " text
 Causes text on the same line to appear alternately in roman and bold face.
 The text must be on the same line as the macro call.
+.
 .TP
 .BI ".B [" text ]
 Causes
 .I text
 to appear in bold face.
-If no text is present on the line where the macro is called, then the text
+If no text is present on the line where the macro is called the text
 of the next input line appears in bold face.
+.
 .TP
 .BI ".I [" text ]
 Causes
 .I text
 to appear in italic.
-If no text is present on the line where the macro is called, then the text
+If no text is present on the line where the macro is called the text
 of the next input line appears in italic.
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH "MISCELLANEOUS"
 .
-The default indentation is 7.2n for all output devices except for
+The default indentation is 7.2n in troff mode and 7n in nroff mode except for
 .B grohtml
 which ignores indentation.
+.
 .TP
 .B .DT
-Sets tabs every 0.5 inches.
+Set tabs every 0.5 inches.
 Since this macro is always called during a
 .B TH
 request, it makes sense to call it only if the tab positions have been
 changed.
+.
 .TP
 .BI ".PD [" nnn ]
-Adjusts the empty space before a new paragraph (resp. section).
-The optional argument gives the amount of space (default units are `v');
-without parameter, the value is reset to its default value (1\ line for tty
-devices, 0.4v\ otherwise).
+Adjust the empty space before a new paragraph or section.
+The optional argument gives the amount of space (default unit is `v');
+without parameter, the value is reset to its default value (1\ line in
+nroff mode, 0.4v\ otherwise).
 This affects the macros
 .BR SH ,
 .BR SS ,
@@ -398,23 +522,55 @@ and
 .BR IP ,
 and
 .BR HP .
+.
+.TP
+.BI ".AT [" system " [" release ]]
+Alter the footer for use with AT&T manpages.
+This command exists only for compatibility; don't use it.
+See the groff info manual for more.
+.
+.TP
+.BI ".UC [" version ]
+Alter the footer for use with BSD manpages.
+This command exists only for compatibility; don't use it.
+See the groff info manual for more.
+.
+.TP
+.B ".PT"
+Print the header string.
+Redefine this macro to get control of the header.
+.
+.TP
+.B ".BT"
+Print the footer string.
+Redefine this macro to get control of the footer.
+.
 .PP
 The following strings are defined:
 .TP
 .B \e*S
 Switch back to the default font size.
+.
 .TP
 .B \e*R
 The `registered' sign.
+.
 .TP
 .B \e*(Tm
 The `trademark' sign.
+.
 .TP
 .B \e*(lq
 .TQ
 .B \e*(rq
 Left and right quote.
 This is equal to `\e(lq' and `\e(rq', respectively.
+.
+.TP
+.B \e*(HF
+The typeface used to print headings and subheadings.
+The default is `B'.
+.
 .PP
 If a preprocessor like
 .B @g@tbl
@@ -440,6 +596,9 @@ Modern implementations of the
 program read this first line and automatically call the right
 preprocessor(s).
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH FILES
 .TP
 .B man.tmac
@@ -463,6 +622,9 @@ macros are contained in this file.
 .B man.local
 Local changes and customizations should be put into this file.
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH "SEE ALSO"
 .
 Since the
@@ -474,16 +636,17 @@ requests, one can, in principle, supplement the functionality of the
 macros with individual
 .I groff
 requests where necessary.
-A complete list of these requests is available on the WWW at
-.PP
-.ce 1
-http://www.cs.pdx.edu/~trent/gnu/groff/groff_toc.html
+See the groff info pages for a complete reference of all requests.
+.
 .PP
 .BR @g@tbl (@MAN1EXT@),
 .BR @g@eqn (@MAN1EXT@),
 .BR @g@refer (@MAN1EXT@),
 .BR man (1)
 .
+.
+.\" -----------------------------------------------------------------
+.
 .SH AUTHOR
 .
 This manual page was originally written for the Debian GNU/Linux system by
diff --git a/contrib/groff/tmac/groff_mdoc.man b/contrib/groff/tmac/groff_mdoc.man
index 5033cb5..e39df7a 100644
--- a/contrib/groff/tmac/groff_mdoc.man
+++ b/contrib/groff/tmac/groff_mdoc.man
@@ -46,7 +46,7 @@
 .\" for an already extremely slow package.
 .\"
 .
-.Dd October 07, 2002
+.Dd February 27, 2003
 .Os
 .Dt GROFF_MDOC 7
 .
@@ -778,14 +778,27 @@ By default, the following architecture keywords are defined:
 .Ed
 .Pp
 .
+If the section number is neither a numeric expression in the range 1 to\~9
+nor one of the above described keywords, the third parameter is used
+verbatim as the volume name.
+.Pp
 In the following examples, the left (which is identical to the right) and
 the middle part of the manual page header strings are shown.
+Note how
+.Ql \e&
+prevents the digit\~1 from being a valid numeric expression.
 .
 .Bd -ragged
 .Bl -tag -width ".Li .Dt\ FOO\ 2\ i386" -compact -offset indent
 .It Li ".Dt FOO 7"
 .Ql FOO(7)
 .Ql \*[volume-operating-system] \*[volume-ds-7]
+.It Li ".Dt FOO 7 bar"
+.Ql FOO(7)
+.Ql \*[volume-operating-system] \*[volume-ds-7]
+.It Li ".Dt FOO \e&7 bar"
+.Ql FOO(7)
+.Ql bar
 .It Li ".Dt FOO 2 i386"
 .Ql FOO(2)
 .Ql \*[volume-operating-system]/\*[volume-as-i386] \*[volume-ds-2]
@@ -3064,11 +3077,13 @@ display must be ended with the
 macro.
 It has the following syntax:
 .Pp
+.Bd -ragged -compact
 .Bl -tag -width ".Li .Bd" -offset indent
 .It Li .Bd Xo
 .Bro \-literal | \-filled | \-unfilled | \-ragged | \-centered Brc
 .Oo \-offset Ao string Ac Oc Oo \-file Ao file name Ac Oc Oo \-compact Oc Xc
 .El
+.Ed
 .Pp
 .
 .Bl -tag -width ".Fl file Ao Ar file name Ac " -compact
@@ -3194,6 +3209,7 @@ Most of this document has been formatted with a tag style list
 It has the following syntax forms:
 .
 .Pp
+.Bd -ragged -compact
 .Bl -tag -width ".Li .Bl" -offset indent -compact
 .It Li .Bl Xo
 .Bro \-hang | \-ohang | \-tag | \-diag | \-inset Brc
@@ -3206,6 +3222,7 @@ It has the following syntax forms:
 .Bro \-item | \-enum Oo \-nested Oc | \-bullet | \-hyphen | \-dash Brc
 .Oo \-offset Ao string Ac Oc Oo \-compact Oc Xc
 .El
+.Ed
 .Pp
 .
 And now a detailed description of the list types.
diff --git a/contrib/groff/tmac/html-end.tmac b/contrib/groff/tmac/html-end.tmac
new file mode 100644
index 0000000..0199d201
--- /dev/null
+++ b/contrib/groff/tmac/html-end.tmac
@@ -0,0 +1,25 @@
+.\" html-end.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.
+.\" turn off all headers and footers for ms, me, and mm macro sets
+.if d EF .EF ''''
+.if d EH .EH ''''
+.if d OF .OF ''''
+.if d OH .OH ''''
+.if d ef .ef ''''
+.if d of .of ''''
+.if d oh .oh ''''
+.if d eh .eh ''''
+.tl ''''
+.
+.\" tell grohtml some default parameter values
+.pl 99999i
+.po 0
+.ll \n[.l]u
+.ta \n[.tabs]
+.
+.cp \n(_C
+.
+.\" end of file, make sure this is the last line
diff --git a/contrib/groff/tmac/html.tmac b/contrib/groff/tmac/html.tmac
index cd30c28..7843a3c 100644
--- a/contrib/groff/tmac/html.tmac
+++ b/contrib/groff/tmac/html.tmac
@@ -23,193 +23,25 @@
 .\"
 .\" remove hyphenation
 .\"
+.nh
+.nr HY 0
+.
 .de hy
 ..
 .de nh
 ..
 .
-.\" Now set any characters defined in devps/S but not in devhtml/S to nul --
-.\" these are generated by eqn but not used by grohtml.  grops generated
-.\" images during the alternative pass.
-.if !c\[*y] .tr \[*y]
-.if !c\[fa] .tr \[fa]
-.if !c\[te] .tr \[te]
-.if !c\[st] .tr \[st]
-.if !c\[=~] .tr \[=~]
-.if !c\[*A] .tr \[*A]
-.if !c\[*B] .tr \[*B]
-.if !c\[*X] .tr \[*X]
-.if !c\[*D] .tr \[*D]
-.if !c\[*E] .tr \[*E]
-.if !c\[*F] .tr \[*F]
-.if !c\[*G] .tr \[*G]
-.if !c\[*Y] .tr \[*Y]
-.if !c\[*I] .tr \[*I]
-.if !c\[+h] .tr \[+h]
-.if !c\[*K] .tr \[*K]
-.if !c\[*L] .tr \[*L]
-.if !c\[*M] .tr \[*M]
-.if !c\[*N] .tr \[*N]
-.if !c\[*O] .tr \[*O]
-.if !c\[*P] .tr \[*P]
-.if !c\[*H] .tr \[*H]
-.if !c\[*R] .tr \[*R]
-.if !c\[*S] .tr \[*S]
-.if !c\[*T] .tr \[*T]
-.if !c\[ts] .tr \[ts]
-.if !c\[*W] .tr \[*W]
-.if !c\[*C] .tr \[*C]
-.if !c\[*Q] .tr \[*Q]
-.if !c\[*Z] .tr \[*Z]
-.if !c\[3d] .tr \[3d]
-.if !c\[tf] .tr \[tf]
-.if !c\[pp] .tr \[pp]
-.if !c\[radicalex] .tr \[radicalex]
-.if !c\[*a] .tr \[*a]
-.if !c\[*b] .tr \[*b]
-.if !c\[*x] .tr \[*x]
-.if !c\[*d] .tr \[*d]
-.if !c\[*e] .tr \[*e]
-.if !c\[*f] .tr \[*f]
-.if !c\[*g] .tr \[*g]
-.if !c\[*y] .tr \[*y]
-.if !c\[*i] .tr \[*i]
-.if !c\[+f] .tr \[+f]
-.if !c\[*k] .tr \[*k]
-.if !c\[*l] .tr \[*l]
-.if !c\[*m] .tr \[*m]
-.if !c\[*n] .tr \[*n]
-.if !c\[*o] .tr \[*o]
-.if !c\[*p] .tr \[*p]
-.if !c\[*h] .tr \[*h]
-.if !c\[*r] .tr \[*r]
-.if !c\[*s] .tr \[*s]
-.if !c\[*t] .tr \[*t]
-.if !c\[*u] .tr \[*u]
-.if !c\[+p] .tr \[+p]
-.if !c\[*w] .tr \[*w]
-.if !c\[*c] .tr \[*c]
-.if !c\[*q] .tr \[*q]
-.if !c\[*z] .tr \[*z]
-.if !c\[ap] .tr \[ap]
-.if !c\[*U] .tr \[*U]
-.if !c\[fm] .tr \[fm]
-.if !c\[<=] .tr \[<=]
-.if !c\[f/] .tr \[f/]
-.if !c\[if] .tr \[if]
-.if !c\[Fn] .tr \[Fn]
-.if !c\[CL] .tr \[CL]
-.if !c\[DI] .tr \[DI]
-.if !c\[HE] .tr \[HE]
-.if !c\[SP] .tr \[SP]
-.if !c\[<>] .tr \[<>]
-.if !c\[<-] .tr \[<-]
-.if !c\[ua] .tr \[ua]
-.\" .if !c\[arrowverttp] .tr \[arrowverttp]
-.if !c\[->] .tr \[->]
-.if !c\[da] .tr \[da]
-.\" .if !c\[arrowvertbt] .tr \[arrowvertbt]
-.if !c\[de] .tr \[de]
-.if !c\[sd] .tr \[sd]
-.if !c\[>=] .tr \[>=]
-.if !c\[pt] .tr \[pt]
-.if !c\[pd] .tr \[pd]
-.if !c\[bu] .tr \[bu]
-.if !c\[di] .tr \[di]
-.if !c\[!=] .tr \[!=]
-.if !c\[==] .tr \[==]
-.if !c\[~~] .tr \[~~]
-.if !c\[~=] .tr \[~=]
-.\" .if !c\[arrowvertex] .tr \[arrowvertex]
-.if !c\[an] .tr \[an]
-.if !c\[CR] .tr \[CR]
-.if !c\[Ah] .tr \[Ah]
-.if !c\[Im] .tr \[Im]
-.if !c\[Re] .tr \[Re]
-.if !c\[wp] .tr \[wp]
-.if !c\[c*] .tr \[c*]
-.if !c\[c+] .tr \[c+]
-.if !c\[es] .tr \[es]
-.if !c\[ca] .tr \[ca]
-.if !c\[cu] .tr \[cu]
-.if !c\[sp] .tr \[sp]
-.if !c\[ip] .tr \[ip]
-.if !c\[nb] .tr \[nb]
-.if !c\[sb] .tr \[sb]
-.if !c\[ib] .tr \[ib]
-.if !c\[mo] .tr \[mo]
-.if !c\[nm] .tr \[nm]
-.if !c\[/_] .tr \[/_]
-.if !c\[gr] .tr \[gr]
-.\" .if !c\[product] .tr \[product]
-.if !c\[sr] .tr \[sr]
-.if !c\[md] .tr \[md]
-.if !c\[no] .tr \[no]
-.if !c\[AN] .tr \[AN]
-.if !c\[OR] .tr \[OR]
-.if !c\[hA] .tr \[hA]
-.if !c\[lA] .tr \[lA]
-.if !c\[uA] .tr \[uA]
-.if !c\[rA] .tr \[rA]
-.if !c\[dA] .tr \[dA]
-.if !c\[lz] .tr \[lz]
-.if !c\[la] .tr \[la]
-.if !c\[sum] .tr \[sum]
-.\" .if !c\[parenlefttp] .tr \[parenlefttp]
-.\" .if !c\[parenleftex] .tr \[parenleftex]
-.\" .if !c\[parenleftbt] .tr \[parenleftbt]
-.\" .if !c\[bracketlefttp] .tr \[bracketlefttp]
-.if !c\[lc] .tr \[lc]
-.\" .if !c\[bracketleftex] .tr \[bracketleftex]
-.\" .if !c\[bracketleftbt] .tr \[bracketleftbt]
-.if !c\[lf] .tr \[lf]
-.\" .if !c\[bracelefttp] .tr \[bracelefttp]
-.if !c\[lt] .tr \[lt]
-.\" .if !c\[braceleftmid] .tr \[braceleftmid]
-.if !c\[lk] .tr \[lk]
-.\" .if !c\[braceleftbt] .tr \[braceleftbt]
-.if !c\[lb] .tr \[lb]
-.\" .if !c\[braceex] .tr \[braceex]
-.\" .if !c\[bracerightex] .tr \[bracerightex]
-.\" .if !c\[braceleftex] .tr \[braceleftex]
-.\" .if !c\[barex] .tr \[barex]
-.if !c\[bv] .tr \[bv]
-.if !c\[ra] .tr \[ra]
-.if !c\[is] .tr \[is]
-.\" .if !c\[parenrighttp] .tr \[parenrighttp]
-.\" .if !c\[parenrightex] .tr \[parenrightex]
-.\" .if !c\[parenrightbt] .tr \[parenrightbt]
-.\" .if !c\[bracketrighttp] .tr \[bracketrighttp]
-.if !c\[rc] .tr \[rc]
-.\" .if !c\[bracketrightex] .tr \[bracketrightex]
-.\" .if !c\[bracketrightbt] .tr \[bracketrightbt]
-.if !c\[rf] .tr \[rf]
-.\" .if !c\[bracerighttp] .tr \[bracerighttp]
-.if !c\[rt] .tr \[rt]
-.\" .if !c\[bracerightmid] .tr \[bracerightmid]
-.if !c\[rk] .tr \[rk]
-.\" .if !c\[bracerightbt] .tr \[bracerightbt]
-.if !c\[rb] .tr \[rb]
-.
-.\" now turn off all headers and footers for ms, me and mm macro sets
-.if d EF .EF ''''
-.if d EH .EH ''''
-.if d OF .OF ''''
-.if d OH .OH ''''
-.if d ef .ef ''''
-.if d of .of ''''
-.if d oh .oh ''''
-.if d eh .eh ''''
-.tl ''''
-.
-.\" it doesn't make sense to use hyphenation with html, so we turn it off.
-.hy 0
-.nr HY 0
-.
 .\" avoid line breaks after hyphen-like characters.
 .cflags 0 -\[hy]\[em]\[en]\[shc]
 .
-.pl 99999
+.\" Now set any characters defined in devps/S but not in devhtml to nul --
+.\" these are generated by eqn but not used by grohtml.  grops generated
+.\" images during the alternative pass.
+.if !c\[radicalex] .tr \[radicalex]
+.if !c\[arrowverttp] .tr \[arrowverttp]
+.if !c\[arrowvertbt] .tr \[arrowvertbt]
+.if !c\[arrowvertex] .tr \[arrowvertex]
+.if !c\[barex] .tr \[barex]
 .
 .\" now for the color definitions
 .\"
@@ -700,14 +532,14 @@
 .
 .cp \n(_C
 .
-.if !\n(_C \
+.if !\n(_C \{\
 .  mso pspic.tmac
+.  mso www.tmac
+.\}
 .
 .do ie '\[char97]'a' \
 .  do mso latin1.tmac
 .el \
 .  do mso cp1047.tmac
 .
-.\" tell grohtml the page offset
-.po
 .\" end of file, make sure this is the last line
diff --git a/contrib/groff/tmac/hyphen.us b/contrib/groff/tmac/hyphen.us
index 26a4332..86e113c 100644
--- a/contrib/groff/tmac/hyphen.us
+++ b/contrib/groff/tmac/hyphen.us
@@ -1,4 +1,7 @@
 % The Plain TeX hyphenation tables [NOT TO BE CHANGED IN ANY WAY!]
+% Unlimited copying and redistribution of this file are permitted as long
+% as this file is not modified. Modifications are permitted, but only if
+% the resulting file is not named hyphen.tex.
 \patterns{ % just type <return> if you're not using INITEX
 .ach4
 .ad4der
diff --git a/contrib/groff/tmac/hyphenex.pl b/contrib/groff/tmac/hyphenex.pl
new file mode 100644
index 0000000..310f9b0
--- /dev/null
+++ b/contrib/groff/tmac/hyphenex.pl
@@ -0,0 +1,78 @@
+#! /usr/bin/perl
+#
+#
+# hyphenex.pl
+#
+# This small filter converts a hyphenation exception log article for
+# TUGBoat to a real \hyphenation block.
+#
+# Written by Werner Lemberg <wl@gnu.org>.
+#
+# Version 1.1 (2003/04/17)
+#
+# Public domain.
+#
+#
+# Usage:
+#
+#   [perl] hyphenex.pl < tugboat-article > hyphenation-exceptions
+
+# print header
+print "% Hyphenation exceptions for US English,\n";
+print "% based on the hyphenation exception log article in TUGBoat.\n";
+print "%\n";
+print "% This is an automatically generated file.  Do not edit!\n";
+print "%\n";
+print "% Please contact Barbara Beeton <bnb\@ams.org>\n";
+print "% for corrections and omissions.\n";
+print "\n";
+print "\\hyphenation{\n";
+
+while (<>) {
+  # retain only lines starting with \1 ... \6 or \tabalign
+  next if not (m/^\\[123456]/ || m/^\\tabalign/);
+  # remove final newline
+  chop;
+  # remove all TeX commands except \1 ... \6
+  s/\\[^123456\s{]+//g;
+  # remove all paired { ... }
+  1 while s/{(.*?)}/\1/g;
+  # skip lines which now have only whitespace before `&'
+  next if m/^\s*&/;
+  # remove comments
+  s/%.*//;
+  # remove trailing whitespace
+  s/\s*$//;
+  # remove trailing `*' (used as a marker in the document)
+  s/\*$//;
+  # split at whitespace
+  @field = split(' ');
+  if ($field[0] eq "\\1" || $field[0] eq "\\4") {
+    print "  $field[2]\n";
+  }
+  elsif ($field[0] eq "\\2" || $field[0] eq "\\5") {
+    print "  $field[2]\n";
+    # handle multiple suffixes separated by commata
+    @suffix_list = split(/,/, "$field[3]");
+    foreach $suffix (@suffix_list) {
+      print "  $field[2]$suffix\n";
+    }
+  }
+  elsif ($field[0] eq "\\3" || $field[0] eq "\\6") {
+    # handle multiple suffixes separated by commata
+    @suffix_list = split(/,/, "$field[3],$field[4]");
+    foreach $suffix (@suffix_list) {
+      print "  $field[2]$suffix\n";
+    }
+  }
+  else {
+    # for `&', split at `&' with trailing whitespace
+    @field = split(/&\s*/);
+    print "  $field[1]\n";
+  }
+}
+
+# print trailer
+print "}\n";
+print "\n";
+print "% EOF\n";
diff --git a/contrib/groff/tmac/hyphenex.us b/contrib/groff/tmac/hyphenex.us
new file mode 100644
index 0000000..69ca757
--- /dev/null
+++ b/contrib/groff/tmac/hyphenex.us
@@ -0,0 +1,896 @@
+% Hyphenation exceptions for US English, based on the hyphenation exception
+% log article in TUGBoat.
+%
+% This is an automatically generated file.  Do not edit!
+
+\hyphenation{
+  acad-e-my
+  acad-e-mies
+  ac-cu-sa-tive
+  acryl-amide
+  acryl-alde-hyde
+  add-a-ble
+  add-i-ble
+  adren-a-line
+  aero-space
+  aero-spaces
+  af-ter-thought
+  af-ter-thoughts
+  agron-o-mist
+  agron-o-mists
+  al-ge-bra-i-cal-ly
+  am-phet-a-mine
+  an-a-lyse
+  an-a-lysed
+  analy-ses
+  an-isot-ropy
+  an-isot-ro-pism
+  an-iso-trop-ic
+  an-iso-trop-i-cal-ly
+  anom-aly
+  anom-alies
+  an-ti-deriv-a-tive
+  an-ti-deriv-a-tives
+  an-tin-o-my
+  an-tin-o-mies
+  an-ti-nu-clear
+  an-ti-nu-cle-on
+  an-ti-rev-o-lu-tion-ary
+  apoth-e-o-ses
+  apoth-e-o-sis
+  ap-pen-dix
+  ar-chi-me-dean
+  ar-chi-pel-ago
+  ar-chive
+  ar-chives
+  ar-chiv-ing
+  ar-chiv-ist
+  ar-chiv-ists
+  ar-che-typ-al
+  ar-che-typ-i-cal
+  arc-tan-gent
+  as-sign-a-ble
+  as-sign-or
+  as-sign-ors
+  as-sist-ant-ship
+  as-sist-ant-ships
+  asymp-to-matic
+  as-ymp-tot-ic
+  asyn-chro-nous
+  ath-er-o-scle-ro-sis
+  at-mos-phere
+  at-mos-pheres
+  at-trib-uted
+  at-trib-ut-able
+  au-to-ma-tion
+  au-tom-a-ton
+  au-tom-a-ta
+  av-oir-du-pois
+  band-leader
+  band-leaders
+  bank-rupt
+  bank-rupt-cy
+  bar-onies
+  base-line-skip
+  ba-thym-e-try
+  bathy-scaphe
+  bean-ies
+  be-hav-iour
+  be-hav-iours
+  bevies
+  bib-li-og-ra-phy-style
+  bi-dif-fer-en-tial
+  big-gest
+  bill-able
+  bio-math-e-mat-ics
+  bio-med-i-cine
+  bio-rhythms
+  bit-map
+  bit-maps
+  bland-er
+  bland-est
+  blind-er
+  blondes
+  blue-print
+  blue-prints
+  bo-lom-e-ter
+  bor-no-log-i-cal
+  bot-u-lism
+  brusquer
+  busier
+  busiest
+  bussing
+  butted
+  buzz-word
+  buzz-words
+  ca-coph-o-ny
+  ca-coph-o-nies
+  cam-era-men
+  cart-wheel
+  cart-wheels
+  ca-tarrhs
+  cat-a-stroph-ic
+  cat-a-stroph-i-cally
+  cat-e-noid
+  cat-e-noids
+  cau-li-flow-er
+  cau-li-flow-ers
+  chap-ar-ral
+  chap-ar-rals
+  char-treuse
+  char-treuses
+  chemo-ther-apy
+  chemo-ther-a-pies
+  cho-les-teric
+  cig-a-rette
+  cig-a-rettes
+  cinque-foil
+  co-gnac
+  co-gnacs
+  co-ker-nel
+  co-ker-nels
+  col-lin-ea-tion
+  col-umns
+  com-par-and
+  com-par-ands
+  com-pen-dium
+  com-po-nent-wise
+  comp-trol-ler
+  comp-trol-lers
+  con-form-able
+  con-form-ist
+  con-form-ists
+  con-form-ity
+  con-gress
+  con-gresses
+  con-trib-ute
+  con-trib-utes
+  con-trib-uted
+  co-se-cant
+  co-tan-gent
+  cour-ses
+  crank-shaft
+  croc-o-dile
+  croc-o-diles
+  cross-hatch
+  cross-hatched
+  cryp-to-gram
+  cryp-to-grams
+  cu-nei-form
+  cu-nei-forms
+  dachs-hund
+  dactyl-o-gram
+  dactyl-o-graph
+  data-base
+  data-bases
+  data-path
+  data-paths
+  date-stamp
+  date-stamps
+  de-clar-able
+  de-fin-i-tive
+  de-lec-ta-ble
+  demi-semi-qua-ver
+  demi-semi-qua-vers
+  de-moc-ra-tism
+  demos
+  de-riv-a-tive
+  de-riv-a-tives
+  dia-lec-tic
+  dia-lec-tics
+  dia-lec-ti-cian
+  dia-lec-ti-cians
+  dif-fract
+  direr
+  dire-ness
+  dis-par-and
+  dis-par-ands
+  dis-traught-ly
+  dis-trib-ute
+  dis-trib-uted
+  dou-ble-space
+  dou-ble-spac-ing
+  doll-ish
+  drift-age
+  driv-ers
+  drom-e-dary
+  drom-e-daries
+  du-op-o-list
+  du-op-o-lists
+  du-op-oly
+  dys-lexia
+  dys-lec-tic
+  east-end-ers
+  eco-nom-ics
+  econ-o-mist
+  econ-o-mists
+  ei-gen-class
+  ei-gen-classes
+  ei-gen-val-ue
+  ei-gen-val-ues
+  electro-mechan-i-cal
+  electro-mechano-acoustic
+  elit-ist
+  elit-ists
+  en-tre-pre-neur
+  en-tre-pre-neur-ial
+  ep-i-neph-rine
+  equi-vari-ant
+  equi-vari-ance
+  eth-yl-ene
+  ever-si-ble
+  evert
+  everts
+  evert-ed
+  evert-ing
+  ex-quis-ite
+  ex-tra-or-di-nary
+  fermi-ons
+  fi-nite-ly
+  fla-gel-lum
+  fla-gel-la
+  flam-ma-bles
+  fledg-ling
+  flow-chart
+  flow-charts
+  for-mi-da-ble
+  for-mi-da-bly
+  for-syth-ia
+  forth-right
+  free-loader
+  free-loaders
+  friend-lier
+  fri-vol-ity
+  fri-vol-i-ties
+  friv-o-lous
+  ga-lac-tic
+  gal-axy
+  gal-ax-ies
+  gas-om-e-ter
+  ge-o-des-ic
+  ge-o-det-ic
+  geo-met-ric
+  geo-met-rics
+  ge-ot-ro-pism
+  gno-mon
+  griev-ance
+  griev-ous
+  griev-ous-ly
+  hair-style
+  hair-styles
+  hair-styl-ist
+  half-space
+  half-spaces
+  half-way
+  har-bin-ger
+  har-bin-gers
+  har-le-quin
+  har-le-quins
+  hatch-eries
+  hemi-demi-semi-qua-ver
+  hemi-demi-semi-qua-vers
+  he-mo-glo-bin
+  he-mo-phil-ia
+  hemo-rhe-ol-ogy
+  he-pat-ic
+  her-maph-ro-dite
+  her-maph-ro-dit-ic
+  he-roes
+  hexa-dec-i-mal
+  ho-lo-no-my
+  ho-meo-mor-phic
+  ho-meo-mor-phism
+  ho-mo-thetic
+  horse-rad-ish
+  hy-po-thal-a-mus
+  ideals
+  ideo-graphs
+  idio-syn-crasy
+  idio-syn-cras-ies
+  ig-nit-er
+  ig-nit-ers
+  ig-ni-tor
+  ignore-spaces
+  im-ped-ances
+  in-du-bi-ta-ble
+  in-fin-ite-ly
+  in-fin-i-tes-i-mal
+  in-fra-struc-ture
+  in-fra-struc-tures
+  in-ter-dis-ci-pli-nary
+  in-ter-ga-lac-tic
+  in-utile
+  in-util-i-ty
+  ir-re-duc-ible
+  ir-rev-o-ca-ble
+  isot-ropy
+  iso-trop-ic
+  itin-er-ary
+  itin-er-ar-ies
+  je-re-mi-ads
+  key-stroke
+  key-strokes
+  kiln-ing
+  lac-i-est
+  lam-en-ta-ble
+  land-scap-er
+  land-scap-ers
+  lar-ce-ny
+  lar-ce-n-ist
+  leaf-hop-per
+  leaf-hop-pers
+  let-ter-spac-ing
+  life-span
+  life-spans
+  life-style
+  life-styles
+  light-weight
+  lim-ou-sines
+  line-backer
+  line-spacing
+  li-on-ess
+  lith-o-graphed
+  lith-o-graphs
+  lo-bot-omy
+  lo-bot-om-ize
+  loges
+  long-est
+  lo-quac-ity
+  macro-eco-nomics
+  mal-a-prop-ism
+  man-u-script
+  mar-gin-al
+  math-e-ma-ti-cian
+  math-e-ma-ti-cians
+  mattes
+  med-ic-aid
+  medi-ocre
+  medi-oc-ri-ties
+  mega-lith
+  mega-liths
+  meta-bol-ic
+  me-tab-o-lism
+  me-tab-o-lisms
+  meta-lan-guage
+  meta-lan-guages
+  meta-phor-ic
+  me-trop-o-lis
+  me-trop-o-lis-es
+  met-ro-pol-i-tan
+  met-ro-pol-i-tans
+  micro-eco-nomics
+  mi-cro-fiche
+  mi-cro-fiches
+  micro-organ-ism
+  micro-organ-isms
+  mill-age
+  mil-li-liter
+  mimeo-graphed
+  mimeo-graphs
+  mim-ic-ries
+  min-is
+  mini-sym-po-sium
+  mini-sym-po-sia
+  mi-nut-er
+  mi-nut-est
+  mis-chie-vous-ly
+  mi-sers
+  mi-sog-a-my
+  mod-el-ling
+  mol-e-cule
+  mol-e-cules
+  mon-archs
+  money-len-der
+  money-len-ders
+  mono-chrome
+  mono-en-er-getic
+  mon-oid
+  mono-pole
+  mono-poles
+  mo-nop-oly
+  mono-spline
+  mono-splines
+  mono-strofic
+  mo-not-o-nies
+  mo-not-o-nous
+  mo-ron-ism
+  mo-ron-isms
+  mos-qui-to
+  mos-qui-tos
+  mos-qui-toes
+  mud-room
+  mud-rooms
+  mul-ti-fac-eted
+  mul-ti-plic-able
+  multi-user
+  neo-fields
+  neo-nazi
+  neo-nazis
+  new-est
+  news-let-ter
+  news-let-ters
+  no-name
+  non-ar-ith-met-ic
+  non-emer-gency
+  non-equi-vari-ance
+  none-the-less
+  non-euclid-ean
+  non-iso-mor-phic
+  non-pseudo-com-pact
+  non-smooth
+  non-uni-form
+  non-uni-form-ly
+  nor-ep-i-neph-rine
+  not-with-stand-ing
+  nu-cleo-tide
+  nu-cleo-tides
+  nut-crack-er
+  nut-crack-ers
+  oer-steds
+  oli-gop-o-list
+  oli-gop-o-lists
+  oli-gop-oly
+  oli-gop-ol-ies
+  op-er-and
+  op-er-ands
+  orang-utan
+  orang-utans
+  or-tho-don-tist
+  or-tho-don-tists
+  or-tho-ker-a-tol-ogy
+  ortho-nitro-toluene
+  over-view
+  over-views
+  ox-id-ic
+  pad-ding
+  pain-less-ly
+  palmate
+  par-a-bola
+  par-a-bol-ic
+  pa-rab-o-loid
+  par-a-digm
+  par-a-digms
+  para-chute
+  para-chutes
+  para-di-methyl-benzene
+  para-fluoro-toluene
+  para-graph-er
+  para-le-gal
+  par-al-lel-ism
+  para-mag-net-ism
+  para-medic
+  para-methyl-anisole
+  pa-ram-e-trize
+  para-mil-i-tary
+  para-mount
+  path-o-gen-ic
+  peev-ish
+  peev-ish-ness
+  pen-ta-gon
+  pen-ta-gons
+  pe-tro-le-um
+  phe-nom-e-non
+  phenyl-ala-nine
+  phi-lat-e-list
+  phi-lat-e-lists
+  pho-neme
+  pho-nemes
+  pho-ne-mic
+  phos-phor-ic
+  pho-to-graphs
+  pho-to-off-set
+  pho-to-off-sets
+  pic-a-dor
+  pipe-line
+  pipe-lines
+  pi-ra-nhas
+  placa-ble
+  plant-hop-per
+  plant-hop-pers
+  pleas-ance
+  plug-in
+  plug-ins
+  pol-ter-geist
+  poly-ene
+  poly-eth-yl-ene
+  po-lyg-a-mist
+  po-lyg-a-mists
+  polyg-on-i-za-tion
+  po-lyph-o-nous
+  poly-styrene
+  pome-gran-ate
+  poro-elas-tic
+  por-ous
+  por-ta-ble
+  post-am-ble
+  post-am-bles
+  post-hu-mous
+  post-script
+  post-scripts
+  pos-tur-al
+  pre-am-ble
+  pre-am-bles
+  pre-loaded
+  pre-par-ing
+  pre-print
+  pre-prints
+  pre-proces-sor
+  pre-proces-sors
+  pre-split-ting
+  priest-esses
+  pret-ty-prin-ter
+  pret-ty-prin-ting
+  pro-ce-dur-al
+  process
+  pro-cur-ance
+  prog-e-nies
+  prog-e-ny
+  pro-hib-i-tive
+  pro-hib-i-tive-ly
+  pro-sciut-to
+  pro-test-er
+  pro-test-ers
+  pro-tes-tor
+  pro-tes-tors
+  pro-to-lan-guage
+  pro-to-typ-al
+  prov-ince
+  prov-inces
+  pro-vin-cial
+  pseu-do-dif-fer-en-tial
+  pseu-do-fi-nite
+  pseu-do-fi-nite-ly
+  pseu-do-forces
+  pseu-dog-ra-pher
+  pseu-do-group
+  pseu-do-groups
+  pseu-do-nym
+  pseu-do-nyms
+  pseu-do-word
+  pseu-do-words
+  psy-che-del-ic
+  psychs
+  pu-bes-cence
+  quad-ding
+  qua-drat-ic
+  qua-drat-ics
+  quad-ra-ture
+  quad-ri-pleg-ic
+  quaint-er
+  quaint-est
+  qua-si-equiv-a-lence
+  qua-si-equiv-a-lences
+  qua-si-hy-po-nor-mal
+  qua-si-rad-i-cal
+  qua-si-resid-ual
+  qua-si-smooth
+  qua-si-sta-tion-ary
+  qua-si-topos
+  qua-si-tri-an-gu-lar
+  quin-tes-sence
+  quin-tes-sences
+  quin-tes-sen-tial
+  rab-bit-ry
+  ra-di-og-ra-phy
+  raff-ish
+  raff-ish-ly
+  ram-shackle
+  rav-en-ous
+  re-arrange-ment
+  re-arrange-ments
+  rec-i-proc-i-ties
+  rec-i-proc-i-ty
+  rec-tan-gle
+  rec-tan-gles
+  re-di-rect
+  re-di-rect-ion
+  re-duc-ible
+  re-echo
+  re-po-si-tion
+  re-po-si-tions
+  re-print
+  re-prints
+  re-stor-able
+  retro-fit
+  retro-fit-ted
+  re-us-able
+  re-use
+  re-wire
+  re-write
+  rhi-noc-er-os
+  right-eous
+  right-eous-ness
+  ring-leader
+  ring-leaders
+  ro-bot
+  ro-bots
+  ro-bot-ics
+  round-table
+  round-tables
+  sales-clerk
+  sales-clerks
+  sales-woman
+  sales-women
+  sal-mo-nel-la
+  sal-ta-tion
+  sar-sa-par-il-la
+  sauer-kraut
+  scat-o-log-i-cal
+  sched-ul-ing
+  schiz-o-phrenic
+  schnau-zer
+  school-child
+  school-child-ren
+  school-teacher
+  school-teach-ers
+  scru-ti-ny
+  scyth-ing
+  sec-re-tar-iat
+  sec-re-tar-iats
+  sem-a-phore
+  sem-a-phores
+  se-mes-ter
+  semi-def-i-nite
+  semi-di-rect
+  semi-ho-mo-thet-ic
+  semi-ring
+  semi-rings
+  semi-sim-ple
+  semi-skilled
+  sero-epi-de-mi-o-log-i-cal
+  ser-vo-mech-anism
+  ser-vo-mech-anisms
+  ses-qui-pe-da-lian
+  set-up
+  set-ups
+  se-vere-ly
+  shape-able
+  shoe-string
+  shoe-strings
+  side-step
+  side-steps
+  side-swipe
+  sky-scraper
+  sky-scrapers
+  smoke-stack
+  smoke-stacks
+  snor-kel-ing
+  so-le-noid
+  so-le-noids
+  solute
+  solutes
+  sov-er-eign
+  sov-er-eigns
+  spa-ces
+  spe-cious
+  spe-lunk-er
+  spend-thrift
+  spher-oid
+  spher-oid-al
+  sphin-ges
+  spic-i-ly
+  spin-ors
+  spokes-woman
+  spokes-women
+  sports-cast
+  sports-cast-er
+  spor-tive-ly
+  sports-wear
+  sports-writer
+  sports-writers
+  spright-lier
+  squea-mish
+  stand-alone
+  star-tling
+  star-tling-ly
+  sta-tis-tics
+  stealth-ily
+  steeple-chase
+  stereo-graph-ic
+  sto-chas-tic
+  strange-ness
+  strap-hanger
+  strat-a-gem
+  strat-a-gems
+  stretch-i-er
+  strong-hold
+  strong-est
+  stu-pid-er
+  stu-pid-est
+  sub-dif-fer-en-tial
+  sum-ma-ble
+  super-ego
+  super-egos
+  su-prema-cist
+  su-prema-cists
+  sur-veil-lance
+  swim-ming-ly
+  symp-to-matic
+  syn-chro-mesh
+  syn-chro-nous
+  syn-chro-tron
+  talk-a-tive
+  ta-pes-try
+  ta-pes-tries
+  tar-pau-lin
+  te-leg-ra-pher
+  tele-ki-net-ic
+  tele-ro-bot-ics
+  tem-po-rar-ily
+  ten-ure
+  test-bed
+  text-width
+  text-widths
+  thal-a-mus
+  ther-mo-elas-tic
+  time-stamp
+  time-stamps
+  tool-kit
+  tool-kits
+  topo-graph-i-cal
+  toques
+  trai-tor-ous
+  trans-ceiver
+  trans-ceivers
+  trans-gress
+  trans-ver-sal
+  trans-ver-sals
+  trans-ves-tite
+  trans-ves-tites
+  tra-vers-a-ble
+  tra-ver-sal
+  tra-ver-sals
+  treach-eries
+  trou-ba-dour
+  tur-key
+  tur-keys
+  turn-around
+  turn-arounds
+  typ-al
+  un-at-tached
+  un-err-ing-ly
+  un-friend-ly
+  un-friend-li-er
+  vaguer
+  vaude-ville
+  vaude-villes
+  vic-ars
+  vil-lain-ess
+  vi-vip-a-rous
+  voice-print
+  vspace
+  wad-ding
+  wall-flower
+  wall-flow-ers
+  warm-est
+  waste-water
+  wave-guide
+  wave-let
+  wave-lets
+  web-like
+  week-night
+  week-nights
+  wheel-chair
+  wheel-chairs
+  which-ever
+  white-sided
+  white-space
+  white-spaces
+  wide-spread
+  wing-spread
+  witch-craft
+  word-spac-ing
+  work-around
+  work-arounds
+  work-horse
+  work-horses
+  wrap-around
+  wretch-ed
+  wretch-ed-ly
+  yes-ter-year
+  al-ge-brai-sche
+  Al-le-ghe-ny
+  Ar-kan-sas
+  Aus-tral-asian
+  auto-mati-sier-ter
+  Be-die-nung
+  Bembo
+  bib-li-o-gra-phi-sche
+  Bos-ton
+  Brown-ian
+  Bruns-wick
+  Bu-da-pest
+  Car-ib-bean
+  Charles-ton
+  Char-lottes-ville
+  Co-lum-bia
+  Czecho-slo-va-kia
+  Dijk-stra
+  dy-na-mi-sche
+  Eng-lish
+  Euler-ian
+  Evan-ston
+  Feb-ru-ary
+  Fest-schrift
+  Flor-i-da
+  For-schungs-in-sti-tut
+  funk-tsional
+  Gauss-ian
+  Greifs-wald
+  Grothen-dieck
+  Grund-leh-ren
+  Hai-fa
+  Hamil-ton-ian
+  Hel-sinki
+  Her-mit-ian
+  Hibbs
+  Hok-kai-do
+  Jan-u-ary
+  Ja-pa-nese
+  Kad-om-tsev
+  Kan-sas
+  Karls-ruhe
+  Kor-te-weg
+  Krishna
+  Krish-na-ism
+  Krish-nan
+  Lan-cas-ter
+  Le-gendre
+  Leices-ter
+  Lip-schitz
+  Lip-schitz-ian
+  Lou-i-si-ana
+  Man-ches-ter
+  Mar-kov-ian
+  Markt-ober-dorf
+  Mass-a-chu-setts
+  Min-ne-ap-o-lis
+  Min-ne-sota
+  Mos-cow
+  Nach-richten
+  Nash-ville
+  Nij-me-gen
+  Noe-ther-ian
+  Noord-wijker-hout
+  No-vem-ber
+  Pa-ler-mo
+  Pe-trov-ski
+  Phil-a-del-phia
+  Poin-care
+  Po-ten-tial-glei-chung
+  raths-kel-ler
+  Rie-mann-ian
+  Ryd-berg
+  schot-tische
+  Schro-ding-er
+  Schwa-ba-cher
+  Schwarz-schild
+  Sep-tem-ber
+  Stokes-sche
+  Stutt-gart
+  Sus-que-han-na
+  Tau-ber-ian
+  tech-ni-sche
+  Ten-nes-see
+  ty-po-graphique
+  Ukrain-ian
+  ver-all-ge-mein-erte
+  Ver-ein-i-gung
+  Ver-tei-lun-gen
+  viiith
+  viith
+  Wahr-schein-lich-keits-theo-rie
+  Wer-ther-ian
+  Win-ches-ter
+  Wirt-schaft
+  wis-sen-schaft-lich
+  xviiith
+  xviith
+  xxiiird
+  xxiind
+  Ying-yong Shu-xue Ji-suan
+  Zea-land
+  Zeit-schrift
+}
+
+% EOF
diff --git a/contrib/groff/tmac/latin1.tmac b/contrib/groff/tmac/latin1.tmac
index 01cb561..c521c28 100644
--- a/contrib/groff/tmac/latin1.tmac
+++ b/contrib/groff/tmac/latin1.tmac
@@ -2,104 +2,106 @@
 .\"
 .nr _C \n(.C
 .cp 0
-.de latin1-tr
-.  if c\\$2 .if !c\\$1 .trin \\$1\\$2
-..
-.
-.latin1-tr \[char161] \[r!]
-.latin1-tr \[char162] \[ct]
-.latin1-tr \[char163] \[Po]
-.latin1-tr \[char164] \[Cs]
-.latin1-tr \[char165] \[Ye]
-.latin1-tr \[char166] \[bb]
-.latin1-tr \[char167] \[sc]
-.latin1-tr \[char168] \[ad]
-.latin1-tr \[char169] \[co]
-.latin1-tr \[char170] \[Of]
-.latin1-tr \[char171] \[Fo]
-.latin1-tr \[char172] \[no]
+.\" 0xA1
+.trin \[char161]\[r!]
+.trin \[char162]\[ct]
+.trin \[char163]\[Po]
+.trin \[char164]\[Cs]
+.trin \[char165]\[Ye]
+.trin \[char166]\[bb]
+.trin \[char167]\[sc]
+.trin \[char168]\[ad]
+.trin \[char169]\[co]
+.trin \[char170]\[Of]
+.trin \[char171]\[Fo]
+.trin \[char172]\[tno]
 .\" The soft-hyphen character is only an input character
 .tr \[char173]\%
-.latin1-tr \[char174] \[rg]
-.latin1-tr \[char175] \[a-]
-.latin1-tr \[char176] \[de]
-.latin1-tr \[char177] \[t+-]
-.latin1-tr \[char178] \[S2]
-.latin1-tr \[char179] \[S3]
-.latin1-tr \[char180] \[aa]
-.latin1-tr \[char181] \[mc]
-.latin1-tr \[char182] \[ps]
-.latin1-tr \[char183] \[pc]
-.latin1-tr \[char184] \[ac]
-.latin1-tr \[char185] \[S1]
-.latin1-tr \[char186] \[Om]
-.latin1-tr \[char187] \[Fc]
-.latin1-tr \[char188] \[14]
-.latin1-tr \[char189] \[12]
-.latin1-tr \[char190] \[34]
-.latin1-tr \[char191] \[r?]
-.latin1-tr \[char192] \[`A]
-.latin1-tr \[char193] \['A]
-.latin1-tr \[char194] \[^A]
-.latin1-tr \[char195] \[~A]
-.latin1-tr \[char196] \[:A]
-.latin1-tr \[char197] \[oA]
-.latin1-tr \[char198] \[AE]
-.latin1-tr \[char199] \[,C]
-.latin1-tr \[char200] \[`E]
-.latin1-tr \[char201] \['E]
-.latin1-tr \[char202] \[^E]
-.latin1-tr \[char203] \[:E]
-.latin1-tr \[char204] \[`I]
-.latin1-tr \[char205] \['I]
-.latin1-tr \[char206] \[^I]
-.latin1-tr \[char207] \[:I]
-.latin1-tr \[char208] \[-D]
-.latin1-tr \[char209] \[~N]
-.latin1-tr \[char210] \[`O]
-.latin1-tr \[char211] \['O]
-.latin1-tr \[char212] \[^O]
-.latin1-tr \[char213] \[~O]
-.latin1-tr \[char214] \[:O]
-.latin1-tr \[char215] \[tmu]
-.latin1-tr \[char216] \[/O]
-.latin1-tr \[char217] \[`U]
-.latin1-tr \[char218] \['U]
-.latin1-tr \[char219] \[^U]
-.latin1-tr \[char220] \[:U]
-.latin1-tr \[char221] \['Y]
-.latin1-tr \[char222] \[TP]
-.latin1-tr \[char223] \[ss]
-.latin1-tr \[char224] \[`a]
-.latin1-tr \[char225] \['a]
-.latin1-tr \[char226] \[^a]
-.latin1-tr \[char227] \[~a]
-.latin1-tr \[char228] \[:a]
-.latin1-tr \[char229] \[oa]
-.latin1-tr \[char230] \[ae]
-.latin1-tr \[char231] \[,c]
-.latin1-tr \[char232] \[`e]
-.latin1-tr \[char233] \['e]
-.latin1-tr \[char234] \[^e]
-.latin1-tr \[char235] \[:e]
-.latin1-tr \[char236] \[`i]
-.latin1-tr \[char237] \['i]
-.latin1-tr \[char238] \[^i]
-.latin1-tr \[char239] \[:i]
-.latin1-tr \[char240] \[Sd]
-.latin1-tr \[char241] \[~n]
-.latin1-tr \[char242] \[`o]
-.latin1-tr \[char243] \['o]
-.latin1-tr \[char244] \[^o]
-.latin1-tr \[char245] \[~o]
-.latin1-tr \[char246] \[:o]
-.latin1-tr \[char247] \[tdi]
-.latin1-tr \[char248] \[/o]
-.latin1-tr \[char249] \[`u]
-.latin1-tr \[char250] \['u]
-.latin1-tr \[char251] \[^u]
-.latin1-tr \[char252] \[:u]
-.latin1-tr \[char253] \['y]
-.latin1-tr \[char254] \[Tp]
-.latin1-tr \[char255] \[:y]
+.trin \[char174]\[rg]
+.trin \[char175]\[a-]
+.\" 0xB0
+.trin \[char176]\[de]
+.trin \[char177]\[t+-]
+.trin \[char178]\[S2]
+.trin \[char179]\[S3]
+.trin \[char180]\[aa]
+.trin \[char181]\[mc]
+.trin \[char182]\[ps]
+.trin \[char183]\[pc]
+.trin \[char184]\[ac]
+.trin \[char185]\[S1]
+.trin \[char186]\[Om]
+.trin \[char187]\[Fc]
+.trin \[char188]\[14]
+.trin \[char189]\[12]
+.trin \[char190]\[34]
+.trin \[char191]\[r?]
+.\" 0xC0
+.trin \[char192]\[`A]
+.trin \[char193]\['A]
+.trin \[char194]\[^A]
+.trin \[char195]\[~A]
+.trin \[char196]\[:A]
+.trin \[char197]\[oA]
+.trin \[char198]\[AE]
+.trin \[char199]\[,C]
+.trin \[char200]\[`E]
+.trin \[char201]\['E]
+.trin \[char202]\[^E]
+.trin \[char203]\[:E]
+.trin \[char204]\[`I]
+.trin \[char205]\['I]
+.trin \[char206]\[^I]
+.trin \[char207]\[:I]
+.\" 0xD0
+.trin \[char208]\[-D]
+.trin \[char209]\[~N]
+.trin \[char210]\[`O]
+.trin \[char211]\['O]
+.trin \[char212]\[^O]
+.trin \[char213]\[~O]
+.trin \[char214]\[:O]
+.trin \[char215]\[tmu]
+.trin \[char216]\[/O]
+.trin \[char217]\[`U]
+.trin \[char218]\['U]
+.trin \[char219]\[^U]
+.trin \[char220]\[:U]
+.trin \[char221]\['Y]
+.trin \[char222]\[TP]
+.trin \[char223]\[ss]
+.\" 0xE0
+.trin \[char224]\[`a]
+.trin \[char225]\['a]
+.trin \[char226]\[^a]
+.trin \[char227]\[~a]
+.trin \[char228]\[:a]
+.trin \[char229]\[oa]
+.trin \[char230]\[ae]
+.trin \[char231]\[,c]
+.trin \[char232]\[`e]
+.trin \[char233]\['e]
+.trin \[char234]\[^e]
+.trin \[char235]\[:e]
+.trin \[char236]\[`i]
+.trin \[char237]\['i]
+.trin \[char238]\[^i]
+.trin \[char239]\[:i]
+.\" 0xF0
+.trin \[char240]\[Sd]
+.trin \[char241]\[~n]
+.trin \[char242]\[`o]
+.trin \[char243]\['o]
+.trin \[char244]\[^o]
+.trin \[char245]\[~o]
+.trin \[char246]\[:o]
+.trin \[char247]\[tdi]
+.trin \[char248]\[/o]
+.trin \[char249]\[`u]
+.trin \[char250]\['u]
+.trin \[char251]\[^u]
+.trin \[char252]\[:u]
+.trin \[char253]\['y]
+.trin \[char254]\[Tp]
+.trin \[char255]\[:y]
 .cp \n[_C]
diff --git a/contrib/groff/tmac/latin2.tmac b/contrib/groff/tmac/latin2.tmac
new file mode 100644
index 0000000..ffdc39c
--- /dev/null
+++ b/contrib/groff/tmac/latin2.tmac
@@ -0,0 +1,107 @@
+.\" latin2.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.\" 0xA1
+.trin \[char161]\[A ho]
+.trin \[char162]\[ab]
+.trin \[char163]\[/L]
+.trin \[char164]\[Cs]
+.trin \[char165]\[L ah]
+.trin \[char166]\[S aa]
+.trin \[char167]\[sc]
+.trin \[char168]\[ad]
+.trin \[char169]\[vS]
+.trin \[char170]\[S ac]
+.trin \[char171]\[T ah]
+.trin \[char172]\[Z aa]
+.\" The soft-hyphen character is only an input character
+.tr \[char173]\%
+.trin \[char174]\[vZ]
+.trin \[char175]\[Z a.]
+.\" 0xB0
+.trin \[char176]\[de]
+.trin \[char177]\[a ho]
+.trin \[char178]\[ho]
+.trin \[char179]\[/l]
+.trin \[char180]\[aa]
+.trin \[char181]\[l ah]
+.trin \[char182]\[s aa]
+.trin \[char183]\[ah]
+.trin \[char184]\[ac]
+.trin \[char185]\[vs]
+.trin \[char186]\[s ac]
+.trin \[char187]\[t ah]
+.trin \[char188]\[z aa]
+.trin \[char189]\[a"]
+.trin \[char190]\[vz]
+.trin \[char191]\[z a.]
+.\" C0
+.trin \[char192]\[R aa]
+.trin \[char193]\['A]
+.trin \[char194]\[^A]
+.trin \[char195]\[A ab]
+.trin \[char196]\[:A]
+.trin \[char197]\[L aa]
+.trin \[char198]\[C aa]
+.trin \[char199]\[,C]
+.trin \[char200]\[C ah]
+.trin \[char201]\['E]
+.trin \[char202]\[E ho]
+.trin \[char203]\[:E]
+.trin \[char204]\[E ah]
+.trin \[char205]\['I]
+.trin \[char206]\[^I]
+.trin \[char207]\[D ah]
+.\" 0xD0
+.trin \[char208]\[u0110]
+.trin \[char209]\[N aa]
+.trin \[char210]\[N ah]
+.trin \[char211]\['O]
+.trin \[char212]\[^O]
+.trin \[char213]\[O a"]
+.trin \[char214]\[:O]
+.trin \[char215]\[tmu]
+.trin \[char216]\[R ah]
+.trin \[char217]\[U ao]
+.trin \[char218]\['U]
+.trin \[char219]\[U a"]
+.trin \[char220]\[:U]
+.trin \[char221]\['Y]
+.trin \[char222]\[T ac]
+.trin \[char223]\[ss]
+.\" 0xE0
+.trin \[char224]\[r aa]
+.trin \[char225]\['a]
+.trin \[char226]\[^a]
+.trin \[char227]\[a ab]
+.trin \[char228]\[:a]
+.trin \[char229]\[l aa]
+.trin \[char230]\[c aa]
+.trin \[char231]\[,c]
+.trin \[char232]\[c ah]
+.trin \[char233]\['e]
+.trin \[char234]\[e ho]
+.trin \[char235]\[:e]
+.trin \[char236]\[e ah]
+.trin \[char237]\['i]
+.trin \[char238]\[^i]
+.trin \[char239]\[d ah]
+.\" 0xF0
+.trin \[char240]\[u0111]
+.trin \[char241]\[n aa]
+.trin \[char242]\[n ah]
+.trin \[char243]\['o]
+.trin \[char244]\[^o]
+.trin \[char245]\[o a"]
+.trin \[char246]\[:o]
+.trin \[char247]\[tdi]
+.trin \[char248]\[r ah]
+.trin \[char249]\[u ao]
+.trin \[char250]\['u]
+.trin \[char251]\[u a"]
+.trin \[char252]\[:u]
+.trin \[char253]\['y]
+.trin \[char254]\[t ac]
+.trin \[char255]\[a.]
+.cp \n[_C]
diff --git a/contrib/groff/tmac/latin9.tmac b/contrib/groff/tmac/latin9.tmac
new file mode 100644
index 0000000..6d56232
--- /dev/null
+++ b/contrib/groff/tmac/latin9.tmac
@@ -0,0 +1,107 @@
+.\" latin9.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.\" 0xA1
+.trin \[char161]\[r!]
+.trin \[char162]\[ct]
+.trin \[char163]\[Po]
+.trin \[char164]\[Eu]
+.trin \[char165]\[Ye]
+.trin \[char166]\[vS]
+.trin \[char167]\[sc]
+.trin \[char168]\[vs]
+.trin \[char169]\[co]
+.trin \[char170]\[Of]
+.trin \[char171]\[Fo]
+.trin \[char172]\[tno]
+.\" The soft-hyphen character is only an input character
+.tr \[char173]\%
+.trin \[char174]\[rg]
+.trin \[char175]\[a-]
+.\" 0xB0
+.trin \[char176]\[de]
+.trin \[char177]\[t+-]
+.trin \[char178]\[S2]
+.trin \[char179]\[S3]
+.trin \[char180]\[vZ]
+.trin \[char181]\[mc]
+.trin \[char182]\[ps]
+.trin \[char183]\[pc]
+.trin \[char184]\[vz]
+.trin \[char185]\[S1]
+.trin \[char186]\[Om]
+.trin \[char187]\[Fc]
+.trin \[char188]\[OE]
+.trin \[char189]\[oe]
+.trin \[char190]\[:Y]
+.trin \[char191]\[r?]
+.\" 0xC0
+.trin \[char192]\[`A]
+.trin \[char193]\['A]
+.trin \[char194]\[^A]
+.trin \[char195]\[~A]
+.trin \[char196]\[:A]
+.trin \[char197]\[oA]
+.trin \[char198]\[AE]
+.trin \[char199]\[,C]
+.trin \[char200]\[`E]
+.trin \[char201]\['E]
+.trin \[char202]\[^E]
+.trin \[char203]\[:E]
+.trin \[char204]\[`I]
+.trin \[char205]\['I]
+.trin \[char206]\[^I]
+.trin \[char207]\[:I]
+.\" 0xD0
+.trin \[char208]\[-D]
+.trin \[char209]\[~N]
+.trin \[char210]\[`O]
+.trin \[char211]\['O]
+.trin \[char212]\[^O]
+.trin \[char213]\[~O]
+.trin \[char214]\[:O]
+.trin \[char215]\[tmu]
+.trin \[char216]\[/O]
+.trin \[char217]\[`U]
+.trin \[char218]\['U]
+.trin \[char219]\[^U]
+.trin \[char220]\[:U]
+.trin \[char221]\['Y]
+.trin \[char222]\[TP]
+.trin \[char223]\[ss]
+.\" 0xE0
+.trin \[char224]\[`a]
+.trin \[char225]\['a]
+.trin \[char226]\[^a]
+.trin \[char227]\[~a]
+.trin \[char228]\[:a]
+.trin \[char229]\[oa]
+.trin \[char230]\[ae]
+.trin \[char231]\[,c]
+.trin \[char232]\[`e]
+.trin \[char233]\['e]
+.trin \[char234]\[^e]
+.trin \[char235]\[:e]
+.trin \[char236]\[`i]
+.trin \[char237]\['i]
+.trin \[char238]\[^i]
+.trin \[char239]\[:i]
+.\" 0xF0
+.trin \[char240]\[Sd]
+.trin \[char241]\[~n]
+.trin \[char242]\[`o]
+.trin \[char243]\['o]
+.trin \[char244]\[^o]
+.trin \[char245]\[~o]
+.trin \[char246]\[:o]
+.trin \[char247]\[tdi]
+.trin \[char248]\[/o]
+.trin \[char249]\[`u]
+.trin \[char250]\['u]
+.trin \[char251]\[^u]
+.trin \[char252]\[:u]
+.trin \[char253]\['y]
+.trin \[char254]\[Tp]
+.trin \[char255]\[:y]
+.cp \n[_C]
diff --git a/contrib/groff/tmac/lbp.tmac b/contrib/groff/tmac/lbp.tmac
index e764122..9ac3be4 100644
--- a/contrib/groff/tmac/lbp.tmac
+++ b/contrib/groff/tmac/lbp.tmac
@@ -2,6 +2,7 @@
 .\"
 .nr _C \n(.C
 .cp 0
+.
 .ftr CW CR
 .ftr C CR
 .ftr CO CI
@@ -14,6 +15,72 @@
 .ftr Hx HNBI
 .ftr EBI EI
 .ftr CBI CI
+.
+.fchar \[fi] fi
+.fchar \[fl] fl
+.fchar \[ff] ff
+.fchar \[Fi] f\[fi]
+.fchar \[Fl] f\[fl]
+.fchar \[OE] OE
+.fchar \[oe] oe
+.fchar \[IJ] IJ
+.fchar \[ij] ij
+.fchar \[.i] i
+.fchar \[lq] ``
+.fchar \[rq] ''
+.fchar \[fo] \v'-.1m'\s-3<\s+3\v'+.1m'
+.fchar \[fc] \v'-.1m'\s-3>\s+3\v'+.1m'
+.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'
+.
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
+.\" This is designed so that \[ul], \[rn], and \[br] form corners.
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.
+.fchar \[|=] \v'.075m'\Z'\[mi]'\v'-.15m'\[ap]\v'.075m'
+.
+.de lbp-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\En[skw]+(\w'x'*0)-\\En[skw])'\
+\v'(u;\w'x'*0+\\En[rst]+(\w'\\$3'*0)-\\En[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\En[rst]+(\w'\\$3'*0)+\\En[rst])'\
+\h'|\\En[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.lbp-achar \['A] \'    A     a
+.lbp-achar \['C] \'    C     c
+.lbp-achar \['c] \'    c     c
+.lbp-achar \['I] \'    I     i
+.lbp-achar \['O] \'    O     o
+.lbp-achar \['U] \'    U     u
+.lbp-achar \['Y] \'    Y     y
+.lbp-achar \['y] \'    y     y
+.lbp-achar \[:E] \[ad] E     e
+.lbp-achar \[:I] \[ad] I     i
+.lbp-achar \[:Y] \[ad] Y     y
+.lbp-achar \[^A] ^     A     a
+.lbp-achar \[^E] ^     E     e
+.lbp-achar \[^I] ^     I     i
+.lbp-achar \[^O] ^     O     o
+.lbp-achar \[^U] ^     U     u
+.lbp-achar \[`A] \`    A     a
+.lbp-achar \[`E] \`    E     e
+.lbp-achar \[`I] \`    I     i
+.lbp-achar \[`O] \`    O     o
+.lbp-achar \[`U] \`    U     u
+.lbp-achar \[~O] ~     O     o
+.lbp-achar \[~o] ~     o     o
+.
 .cp \n(_C
 .
 .do mso latin1.tmac
diff --git a/contrib/groff/tmac/lj4.tmac b/contrib/groff/tmac/lj4.tmac
index 524e935..9418023 100644
--- a/contrib/groff/tmac/lj4.tmac
+++ b/contrib/groff/tmac/lj4.tmac
@@ -14,11 +14,18 @@
 .ftr HO UI
 .ftr HX UBI
 .
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
 .\" This is designed so that \[ul], \[rn], and \[br] form corners.
-.fchar \[br] \Z'\v'.25m'\D'R .04m -1m''
-.fchar \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
-.fchar \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
-.fchar \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.
+.char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.
+.fchar \[OK] \s[\En[.s]*6u/10u]\[rs]\s[0]/
+.
+.fchar \[sqrtex] \[radicalex]
 .
 .cp \n[_C]
 .
diff --git a/contrib/groff/tmac/papersize.tmac b/contrib/groff/tmac/papersize.tmac
new file mode 100644
index 0000000..fdfb580
--- /dev/null
+++ b/contrib/groff/tmac/papersize.tmac
@@ -0,0 +1,146 @@
+.\" papersize.tmac
+.\"
+.\" Set up groff for various paper sizes.
+.\"
+.\" Usage:
+.\"
+.\"   groff ... -dpaper=<format> ...
+.\"
+.\" Possible values for `format' are the same as the predefined `papersize'
+.\" values (only lowercase; see the groff_font man page) except a7-d7.
+.\" An appended `l' (ell) character denotes landscape orientation.
+.\" Examples: `a4', `c3l', `letterl'.
+.\"
+.\" Most output drivers need additional command line switches `-p' and
+.\" `-l' to override the default paper length and orientation as set in
+.\" the driver specific DESC file.
+.\"
+.\" For example, use the following for PS output on A4 paper in landscape
+.\" orientation::
+.\"
+.\"   groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps
+.
+.nr _C \n(.C
+.cp 0
+.
+.if d paper \{\
+.  ds paper-a0-length 118.9c
+.  ds paper-a0-width 84.1c
+.  ds paper-a1-length 84.1c
+.  ds paper-a1-width 59.4c
+.  ds paper-a2-length 59.4c
+.  ds paper-a2-width 42c
+.  ds paper-a3-length 42c
+.  ds paper-a3-width 29.7c
+.  ds paper-a4-length 29.7c
+.  ds paper-a4-width 21c
+.  ds paper-a5-length 21c
+.  ds paper-a5-width 14.8c
+.  ds paper-a6-length 14.8c
+.  ds paper-a6-width 10.5c
+.
+.  ds paper-b0-length 141.4c
+.  ds paper-b0-width 100c
+.  ds paper-b1-length 100c
+.  ds paper-b1-width 70.7c
+.  ds paper-b2-length 70.7c
+.  ds paper-b2-width 50c
+.  ds paper-b3-length 50c
+.  ds paper-b3-width 35.3c
+.  ds paper-b4-length 35.3c
+.  ds paper-b4-width 25c
+.  ds paper-b5-length 25c
+.  ds paper-b5-width 17.6c
+.  ds paper-b6-length 17.6c
+.  ds paper-b6-width 12.5c
+.
+.  ds paper-c0-length 129.7c
+.  ds paper-c0-width 91.7c
+.  ds paper-c1-length 91.7c
+.  ds paper-c1-width 64.8c
+.  ds paper-c2-length 64.8c
+.  ds paper-c2-width 45.8c
+.  ds paper-c3-length 45.8c
+.  ds paper-c3-width 32.4c
+.  ds paper-c4-length 32.4c
+.  ds paper-c4-width 22.9c
+.  ds paper-c5-length 22.9c
+.  ds paper-c5-width 16.2c
+.  ds paper-c6-length 16.2c
+.  ds paper-c6-width 11.4c
+.
+.  ds paper-d0-length 109.0c
+.  ds paper-d0-width 77.1c
+.  ds paper-d1-length 77.1c
+.  ds paper-d1-width 54.5c
+.  ds paper-d2-length 54.5c
+.  ds paper-d2-width 38.5c
+.  ds paper-d3-length 38.5c
+.  ds paper-d3-width 27.2c
+.  ds paper-d4-length 27.2c
+.  ds paper-d4-width 19.2c
+.  ds paper-d5-length 19.2c
+.  ds paper-d5-width 13.6c
+.  ds paper-d6-length 13.6c
+.  ds paper-d6-width 9.6c
+.
+.  ds paper-letter-length 11i
+.  ds paper-letter-width 8.5i
+.  ds paper-legal-length 14i
+.  ds paper-legal-width 8.5i
+.  ds paper-tabloid-length 17i
+.  ds paper-tabloid-width 11i
+.  ds paper-ledger-length 11i
+.  ds paper-ledger-width 17i
+.  ds paper-statement-length 8.5i
+.  ds paper-statement-width 5.5i
+.  ds paper-executive-length 10i
+.  ds paper-executive-width 7.5i
+.
+.  ds paper-com10-length 9.5i
+.  ds paper-com10-width 4.125i
+.  ds paper-monarch-length 7.5i
+.  ds paper-monarch-width 3.875i
+.  ds paper-dl-length 22c
+.  ds paper-dl-width 11c
+.
+.  ds paper-p \*[paper]
+.  ds paper-l \*[paper]
+.  length paper-n \*[paper]
+.  if (\n[paper-n] > 1) \{\
+.    substring paper-p 0 -2
+.    substring paper-l -1 -1
+.    if !d paper-\*[paper-p]-length \{\
+.      ds paper-p \*[paper]
+.      ds paper-l
+.    \}
+.  \}
+.
+.  nr paper-w 0
+.
+.  ie d paper-\*[paper-p]-length \{\
+.    ie '\*[paper-l]'l' \{\
+.      pl \*[paper-\*[paper-p]-width]
+.      ll (\*[paper-\*[paper-p]-length] - 2i)
+.    \}
+.    el \{\
+.      ie '\*[paper-l]'' \{\
+.        pl \*[paper-\*[paper-p]-length]
+.        ll (\*[paper-\*[paper-p]-width] - 2i)
+.      \}
+.      el \
+.        nr paper-w 1
+.    \}
+.  \}
+.  el \
+.    nr paper-w 1
+.
+.  ie \n[paper-w] \
+.    tm warning: Unknown paper size `\*[paper]'
+.  el \
+.    if !r LL .nr LL \n[.l]u  \" for ms, mdoc, man
+.\}
+.
+.cp \n[_C]
+.
+.\" EOF
diff --git a/contrib/groff/tmac/ps.tmac b/contrib/groff/tmac/ps.tmac
index 01868ce..05374ac 100644
--- a/contrib/groff/tmac/ps.tmac
+++ b/contrib/groff/tmac/ps.tmac
@@ -25,7 +25,9 @@
 .ftr C CR
 .
 .cflags 8 \[an]
+.
 .char \[radicalex] \h'-\w'\[sr]'u'\[radicalex]\h'\w'\[sr]'u'
+.fchar \[sqrtex] \[radicalex]
 .char \[mo] \h'.08m'\[mo]\h'-.08m'
 .char \[nm] \h'.08m'\[nm]\h'-.08m'
 .char \[parenlefttp] \[parenlefttp]\h'.016m'
@@ -35,21 +37,88 @@
 .char \[parenrightbt] \[parenrightbt]\h'.016m'
 .char \[parenrightex] \[parenrightex]\h'.016m'
 .
+.char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.
+.\" This is designed so that \(ul, \(rn and \(br form corners.
+.char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
+.char \[br] \Z'\v'.25m'\D'l 0 -1m''
+.char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
+.
+.char \[ru] \D'l .5m 0'
+.
 .fchar \[va] \o'\[ua]\[da]'
 .fchar \[ci] \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
 .fchar \[sq] \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.fchar \[ru] \D'l .5m 0'
-.fchar \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
-.fchar \[br] \Z'\v'.25m'\D'l 0 -1m''
-.fchar \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
-.fchar \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
-.fchar \[Fi] ffi
-.fchar \[Fl] ffl
+.fchar \[Fi] f\[fi]
+.fchar \[Fl] f\[fl]
 .fchar \[ff] ff
+.fchar \[fi] fi
+.fchar \[fl] fl
 .fchar \[ij] ij
 .fchar \[IJ] IJ
 .fchar \[tm] \s-3\v'-.3m'TM\v'+.3m'\s+3
 .
+.fchar \[<<] <\h'-.2m'<
+.fchar \[>>] >\h'-.2m'>
+.fchar \[|=] \v'.075m'\Z'\[mi]'\v'-.15m'\[ap]\v'.075m'
+.fchar \[nc] \v'.1m'\Z'\h'.15m'\F[T]\f[R]/'\v'-.1m'\[sp]
+.fchar \[ne] \v'.07m'\Z'\h'.13m'\F[T]\f[R]/'\v'-.07m'\[==]
+.fchar \[-h] \F[T]\f[I]\v'-.53m'\Z'\h'.05m'\D'l .3m 0''\v'.53m'h
+.fchar \[hbar] \[-h]
+.
+.de ps-achar
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  fchar \\$1 \
+\\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\En[skw]+(\w'x'*0)-\\En[skw])'\
+\v'(u;\w'x'*0+\\En[rst]+(\w'\\$3'*0)-\\En[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\En[rst]+(\w'\\$3'*0)+\\En[rst])'\
+\h'|\\En[acc]u'
+.  hcode \\$1\\$4
+..
+.
+.ps-achar \['C] \' C c
+.ps-achar \['c] \' c c
+.
+.de ps-frac
+.  schar \[\\$1\\$2] \
+\v'-.28m'\s[\\En[.s]*6u/10u]\\$1\s0\v'.28m'\
+\[f/]\
+\s[\\En[.s]*6u/10u]\\$2
+..
+.
+.de ps-frac-mono
+.  fschar \\$1 \[\\$2\\$3] \
+\Z'\v'-.28m'\s[\\En[.s]*5u/10u]\\$2\s0\v'.28m''\
+\Z'\h'.35m'\s[\\En[.s]*5u/10u]\\$3\s0'\
+\h'.02m'\[f/]\h'-.02m'
+..
+.
+.ps-frac 1 8
+.ps-frac 3 8
+.ps-frac 5 8
+.ps-frac 7 8
+.
+.ps-frac-mono CR 1 8
+.ps-frac-mono CR 3 8
+.ps-frac-mono CR 5 8
+.ps-frac-mono CR 7 8
+.ps-frac-mono CI 1 8
+.ps-frac-mono CI 3 8
+.ps-frac-mono CI 5 8
+.ps-frac-mono CI 7 8
+.ps-frac-mono CB 1 8
+.ps-frac-mono CB 3 8
+.ps-frac-mono CB 5 8
+.ps-frac-mono CB 7 8
+.ps-frac-mono CBI 1 8
+.ps-frac-mono CBI 3 8
+.ps-frac-mono CBI 5 8
+.ps-frac-mono CBI 7 8
+.
 .\" pic tests this register to see whether it should use \X'ps:...'
 .nr 0p 1
 .
@@ -612,4 +681,6 @@
 .el \
 .  do mso cp1047.tmac
 .
+.do mso europs.tmac
+.
 .\" make sure that no blank lines creep in at the end of this file.
diff --git a/contrib/groff/tmac/pspic.tmac b/contrib/groff/tmac/pspic.tmac
index 6382d91..9fe7e3e 100644
--- a/contrib/groff/tmac/pspic.tmac
+++ b/contrib/groff/tmac/pspic.tmac
@@ -2,8 +2,8 @@
 .\"
 .\" Define the PSPIC macro.
 .\"
-.\" When used other than with -Tps or -Tdvi, it will draw a box around where
-.\" the picture would go.
+.\" When used other than with -Tps, -Tdvi, or -Thtml it will draw a box
+.\" around where the picture would go.
 .
 .de PSPIC
 .  nr ps-offset-mode 0
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index f51eb87..61cb32d 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -18,7 +18,7 @@
 .do ds troffrc!cp1047 tty.tmac
 .do ds troffrc!lj4 lj4.tmac
 .do ds troffrc!lbp lbp.tmac
-.do ds troffrc!html www.tmac
+.do ds troffrc!html html.tmac
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
@@ -33,7 +33,14 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" Set the hyphenation language to `us'.
 .do hla us
 .
-.\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
+.\" Load hyphenation patterns and exceptions.
 .do hpf hyphen.us
+.do hpfa hyphenex.us
+.
+.\" Load composite mappings.
+.do mso composite.tmac
+.
+.\" Handle paper formats
+.do mso papersize.tmac
 .
 .\" Don't let blank lines creep in here.
diff --git a/contrib/groff/tmac/troffrc-end b/contrib/groff/tmac/troffrc-end
index 928c923..ef4f008 100644
--- a/contrib/groff/tmac/troffrc-end
+++ b/contrib/groff/tmac/troffrc-end
@@ -2,7 +2,7 @@
 .
 .\" this file is parsed after all macro sets have been read
 .
-.do if '\*[.T]'html' .do mso html.tmac
+.do if '\*[.T]'html' .do mso html-end.tmac
 .
 .\" if we are running the postscript device for html images then load www.tmac
 .do if r ps4html     .do mso www.tmac
@@ -14,6 +14,7 @@
 .do if !d HTML-IMAGE-LEFT   .do ds HTML-IMAGE-LEFT
 .do if !d HTML-IMAGE-END    .do ds HTML-IMAGE-END
 .do if !d HTML-TAG          .do ds HTML-TAG
+.do if !d HTML-TAG-NS       .do ds HTML-TAG-NS
 .do if !d HTML-DO-IMAGE     .do ds HTML-DO-IMAGE
 .
 .\" Don't let blank lines creep in here.
diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index a0c2b4b..aeeda50 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -45,6 +45,7 @@
 .tty-char \[di] -:-
 .tty-char \[tdi] -:-
 .tty-char \[no] ~
+.tty-char \[tno] ~
 .tty-char \[gr] \Z'\*[tty-rn]'V
 .tty-char \[is] \z'\z,I
 .tty-char \[mo] E
@@ -66,6 +67,7 @@
 .tty-char \[*c] \z,E
 .tty-char \[*d] d
 .tty-char \[*e] e
+.tty-char \[+e] e
 .tty-char \[*f] \z|o
 .tty-char \[+f] \z|o
 .tty-char \[*g] y
@@ -111,6 +113,7 @@
 .tty-char \[ho] \[ac]
 .tty-char \[/_] \z_/
 .tty-char \[=~] =~
+.tty-char \[|=] -~
 .tty-char \[Ah] N
 .tty-char \[CR] _|
 .tty-char \[fa] \z-V
@@ -121,12 +124,17 @@
 .tty-char \[te] 3
 .if c\[md] .tty-char \[tf] .\[md].
 .tty-char \[tf] .:.
+.if c\[md] .tty-char \[3d] .\[md].
+.tty-char \[3d] .:.
 .tty-char \[wp] p
 .tty-char \[~~] ~~
 .tty-char \[Fn] \z,f
 .tty-char \[Bq] ,,
-.tty-char \[bq] ,
 .tty-char \[lz] <>
+.tty-char \[lf] |_
+.tty-char \[rf] _|
+.tty-char \[lc] |~
+.tty-char \[rc] ~|
 .\" Latin-1 characters
 .tty-char \[r!] \z,i
 .tty-char \[Po] \z-L
diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index e6bd598..4b337fd 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -21,22 +21,30 @@
 .fchar \[14] 1/4
 .fchar \[12] 1/2
 .fchar \[34] 3/4
+.fchar \[18] 1/8
+.fchar \[38] 3/8
+.fchar \[58] 5/8
+.fchar \[78] 7/8
 .fchar \[ff] ff
 .fchar \[fi] fi
 .fchar \[fl] fl
-.fchar \[Fi] ffi
-.fchar \[Fl] ffl
+.fchar \[Fi] f\[fi]
+.fchar \[Fl] f\[fl]
 .fchar \[<-] <-
 .fchar \[->] ->
 .fchar \[<>] <->
 .fchar \[em] --
 .fchar \[+-] +-
 .fchar \[t+-] +-
+.fchar \[-+] -+
 .fchar \[co] (C)
 .fchar \[<=] <=
 .fchar \[>=] >=
+.fchar \[<<] <<
+.fchar \[>>] >>
 .fchar \[!=] !=
 .fchar \[==] ==
+.fchar \[ne] !==
 .fchar \[~=] ~=
 .fchar \[sq] []
 .fchar \[lh] <=
@@ -49,9 +57,13 @@
 .fchar \[oe] oe
 .fchar \[AE] AE
 .fchar \[ae] ae
+.fchar \[IJ] IJ
+.fchar \[ij] ij
 .fchar \[an] -
 .fchar \[eu] EUR
 .fchar \[Eu] EUR
+.fchar \[.i] i
+.fchar \[bq] ,
 .
 .\" color definitions
 .defcolor black rgb #000000
@@ -68,7 +80,7 @@
 .ie '\*(.T'cp1047' \
 .  do mso cp1047.tmac
 .el \
-.  if '\*(.T'latin1' \
+.  if !'\*(.T'ascii' \
 .    do mso latin1.tmac
 .
 .\" If you want the character definitions in tty-char.tmac to be loaded
diff --git a/contrib/groff/tmac/www.tmac b/contrib/groff/tmac/www.tmac
index 0db647e..621da7e 100644
--- a/contrib/groff/tmac/www.tmac
+++ b/contrib/groff/tmac/www.tmac
@@ -1,8 +1,47 @@
-.\" www.tmac
-.\"
-.\" A simple set of macros to provide HTML documents with basic
-.\" www functionality.  It should work with any macro set.
-.\"
+.ig
+www.tmac - macro package for adding HTML elements to roff documents.
+
+File position: <groff_source_top>/tmac/www.tmac
+Installed position: groff's main macro directory.
+
+------------------------------------------------------------------------
+    Legalize
+------------------------------------------------------------------------
+
+This file is part of groff, the GNU roff type-setting system.
+
+Copyright (C) 2001, 2002, 2003 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>.
+
+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 2, 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 groff; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+
+
+------------------------------------------------------------------------
+    Description
+------------------------------------------------------------------------
+
+A simple set of macros to provide HTML documents with basic
+www functionality.  It should work with any macro set.
+..
+.
+.\" --------------------------------------------------------------------
+.\" Setup
+.\" --------------------------------------------------------------------
+.
 .nr _C \n(.C
 .cp 0
 .
@@ -10,8 +49,6 @@
 .if '\*[.T]'html' .nr www-html 1
 .
 .\" set up www-image-template
-.\" (cannot do this in html.tmac as the image device must
-.\"  also know about this string)
 .
 .if !d www-image-template \
 .  ds www-image-template
@@ -27,9 +64,187 @@
 .  .
 .\}
 .
+.
+.\" --------------------------------------------------------------------
+.\" Test for `.substring'; result in register `www.substring_ok'.
+.\" The automated break points in .URL addresses are only added if
+.\" this register is non-zero.
+.\"
+.nr www:substring_ok 0
+.de www:@test_substring
+.  if !d substring \
+.    return
+.  ds \\$0:s abcdefg\"
+.  substring \\$0:s 1 1
+.  if !'\\*[\\$0:s]'b' \{\
+.    rm \\$0:s
+.    return
+.  \}
+.  ds \\$0:s abcdefg\"
+.  substring \\$0:s 0 0
+.  if !'\\*[\\$0:s]'a' \{\
+.    rm \\$0:s
+.    return
+.  \}
+.  ds \\$0:s abcdefg\"
+.  substring \\$0:s 1 -1
+.  if !'\\*[\\$0:s]'bcdefg' \{\
+.    rm \\$0:s
+.    return
+.  \}
+.  nr www:substring_ok 1
+.  rm \\$0:s
+..
+.www:@test_substring
+.rm www:@test_substring
+.
+.
+.\" --------------------------------------------------------------------
+.\" Local Macros
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" www:error (<test>...)
+.\"
+.\" Print error message
+.\"
 .de www-error
 .  tm \\n[.F]:\\n[.c]: macro error: \\$*
 ..
+.als www:error www-error
+.
+.\" --------------------------------------------------------------------
+.\" www:lenstr (<register_name> <string_name>)
+.\"
+.\" Store length of string named <string_name> into register named
+.\" <register_name>.
+.\"
+.de www:lenstr
+.  if !(\\n[.$] == 2) \{\
+.    tm .\\$0 expects 2 arguments.
+.    ab
+.  \}
+.  length \\$0:n x\\*[\\$2]
+.  nr \\$1 (\\n[\\$0:n]-1)
+.  rr \\$0:n
+..
+.\" --------------------------------------------------------------------
+.\" www:splitstr (<name>)
+.\"
+.\" Add a space character between any two adjacent characters in string
+.\" <name> and restore result into the string variable <name>; space
+.\" characters are first replaced by the word `space'.
+.\"
+.de www:splitstr
+.  if !(\\n[.$] == 1) \
+.    www:error .\\$0 expects 1 argument.
+.  if '\\*[\\$1]'' \
+.    return
+.  ds \\$0:r "\\*[\\$1]\""
+.  ds \\$0:s\"
+.  while 1 \{\
+.    ds \\$0:c "\\*[\\$0:r]\""
+.    substring \\$0:c 0 0\"
+.    ie '\\*[\\$0:c]' ' \
+.      as \\$0:s " space\""
+.    el \
+.      as \\$0:s " \\*[\\$0:c]\""
+.    www:lenstr \\$0:n \\$0:r
+.    if (\\n[\\$0:n] <= 1) \{\
+.      break
+.    \}
+.    substring \\$0:r 1 -1\"
+.  \}
+.  if !'\\*[\\$0:s]'' \
+.    substring \\$0:s 1 -1 
+.  ds \\$1 \\*[\\$0:s]
+.  rm \\$0:c
+.  rr \\$0:n
+.  rm \\$0:r
+.  rm \\$0:s
+..
+.\" --------------------------------------------------------------------
+.\" www:url_breaks (<string_name>)
+.\"
+.\" Add `\:' (possible break point) within URL strings after `/'.
+.\"
+.\" Smart about multiple `/', existing `\:', and space characters;
+.\" does not set a break point if less than 5 characters would go to
+.\" the next line.
+.\"
+.de www:url_breaks
+.  if !(\\n[.$] == 1) \
+.    www:error .\\$0 expects 1 argument.
+.  if !\n[www:substring_ok] \
+.    return
+.  ds \\$0:s "\\*[\\$1]\""
+.  www:splitstr \\$0:s
+.  www:url_breaks_splitted \\$0:s \\*[\\$0:s]
+.  ds \\$1 "\\*[\\$0:s]\""
+.  rm \\$0:s
+..
+.\" --------------------------------------------------------------------
+.\" www:url_breaks_splitted (<result> <char> [<char>...])
+.\"
+.\" Add `\:' within URL strings, but arguments are a splitted string.
+.\"
+.\" Arguments: >=2: <result> <char> [<char>...]
+.\"
+.de www:url_breaks_splitted
+.  nr \\$0:min 5	\" minimal number of characters for next line
+.  if (\\n[.$] < 2) \
+.    www:error .\\$0 expects at least 2 arguments.
+.  ds \\$0:res \\$1\"
+.  shift
+.  ds \\$0:s\"
+.  nr \\$0:done 0
+.  while !\\n[\\$0:done] \{\
+.    if (\\n[.$] <= 0) \{\
+.      nr \\$0:done 1
+.      break
+.    \}
+.    if '\\$1'space' \{\
+.      as \\$0:s " \""
+.      shift
+.      continue
+.    \}
+.    if (\\n[.$] < \\n[\\$0:min]) \{\
+.      as \\$0:s "\\$1\""
+.      shift
+.      continue
+.    \}
+.    if !'\\$1'/' \{\
+.      as \\$0:s "\\$1\""
+.      shift
+.      continue
+.    \}
+.    \" we are at a `/' character
+.    while '\\$1'/' \{\
+.      as \\$0:s /\"
+.      if (\\n[.$] == 0) \{\
+.        nr \\$0:done 1
+.        break
+.      \}
+.      shift
+.    \}
+.    if \\n[\\$0:done] \
+.      break
+.    if (\\n[.$] < \\n[\\$0:min]) \
+.      continue
+.    if '\\$1'\:' \
+.      shift
+.    as \\$0:s \:\"
+.  \}
+.  ds \\*[\\$0:res] \\*[\\$0:s]\"
+.  rm \\$0:res
+.  rm \\$0:s
+..
+.\" --------------------------------------------------------------------
+.\" User Interface
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" HTML (<address> <description> [<punctuation>])
 .\"
 .\" the main auxiliary macro for the HTML interface
 .\"
@@ -47,47 +262,61 @@
 .  if \\n[www-html] \
 .    nop \X^html:\\$*^\c
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HX n
 .\"
 .\"   Automatic heading level cut off.
 .\"
 .\"   N is the depth limit of automatically linked headings.  So a depth
-.\"   of 2 would cause grohtml to generate a list of links for `.NH 1' and
-.\"   `.NH 2' but not for `.NH 3'.
+.\"   of 2 would cause grohtml to generate a list of links for `.NH 1'
+.\"   and `.NH 2' but not for `.NH 3'.
 .\"
 .de HX
 .  if \\n[www-html] \
 .    nop \X^index:\\$*^
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" BCL foreground background active not-visited visited
 .\"
 .de BCL
 .  HTML <body text=\\$1 bgcolor=\\$2 link=\\$3 alink=\\$4 vlink=\\$5>
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" BGIMG imagefile
 .\"
 .de BGIMG
 .  HTML <body background=\\$1>
 ..
-.\"
-.\" URL url description [after]
+.\" --------------------------------------------------------------------
+.\" URL url [description] [after]
+.\"     if description is absent then the url becomes the anchor text
 .\"
 .de URL
-.  ie \\n[www-html] \
-.    HTML <a href="\\$1">\\$2</a>\\$3
-.  el \
-.    nop \m[blue]\\$2\m[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
+.  ds \\$0:adr \\$1\"
+.  www:url_breaks \\$0:adr
+.  ie \\n[www-html] \{\
+.    ie '\\$2'' \
+.       HTML <a href="\\$1">\\$1</a>\\$3
+.    el \
+.       HTML <a href="\\$1">\\$2</a>\\$3
+.  \}
+.  el \{\
+.    if !r ps4html .ad l
+.    ie '\\$2'' \
+.       nop \%\[la]\m[blue]\f[C]\\*[\\$0:adr]\f[]\m[]\[ra]\\$3
+.    el \
+.       nop \m[blue]\\$2\m[] \%\[la]\f[C]\\*[\\$0:adr]\f[]\[ra]\\$3
+.    if !r ps4html .ad
+.  \}
+.  rm \\$0:adr
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" FTP url description [after]
 .\"
-.\"   Same as UTL.
+.\"   Same as URL.
 .\"
 .als FTP URL
-.\"
+.\" --------------------------------------------------------------------
 .\" MTO address description [after]
 .\"
 .\"   ADDRESS is the email address (without the `mailto:' prefix).
@@ -117,7 +346,7 @@
 .      nop \m[blue]\\$2\m[] \%\[la]\f[C]\\$1\f[]\[ra]\\$3
 .  \}
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" TAG name
 .\"
 .\"   Generate an html name NAME.
@@ -125,7 +354,7 @@
 .de TAG
 .  HTML <a name="\\$1"></a>
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" IMG [-R|-L|-C] filename [width] [height]
 .\"
 .\"   Include an image of any type (will only work for -Thtml).
@@ -155,7 +384,7 @@
 .  el \
 .    nop \[la]\f[C]\\$1\f[]\[ra]
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HTML-TAG
 .\"
 .\"   Emit a tag for grohtml.  This is an internal macro.
@@ -167,7 +396,7 @@
 .    nop \X^html-tag:\\$*^
 .  \}
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HTML-TAG-NS
 .\"
 .\"   Emit a tag for grohtml (without a space).  This is an internal macro.
@@ -176,7 +405,7 @@
 .  if \\n[www-html] \
 .    nop \X^html-tag:\\$*^\c
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" PIMG  [-R|-L|-C] filename [width] [height]
 .\"
 .\"   Include a png image.  It will work for -Tps and -Thtml.
@@ -219,7 +448,7 @@
 .  el \{\
 .    if !r ps4html \{\
 .      www-make-unique-name
-.      sy pngtopnm \\$2 | pnmcrop -white | pnmtops -noturn > \\*[www-unique-name].eps
+.      sy pngtopnm \\$2 | pnmcrop -white | @PNMTOPS_NOSETPAGE@ -noturn > \\*[www-unique-name].eps
 .      ie '\\$1'-C' \
 .        PSPIC \\*[www-unique-name].eps \\$3 \\$4
 .      el \
@@ -228,6 +457,9 @@
 .  \}
 ..
 .
+.\" --------------------------------------------------------------------
+.\" auxiliary definitions for MPIMG
+.\"
 .nr www-left-ll-trap 0
 .nr www-left-po-trap 0
 .nr www-right-ll-trap 0
@@ -274,7 +506,7 @@
 .  wh \\n[www-left-ll-trap]u
 .  nr www-left-ll-trap 0
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" MPIMG [-R|-L] filename [width] [height]
 .\"
 .\"   Include a png image and wrap text around it.  It will work for
@@ -303,7 +535,7 @@
 .  el \{\
 .    if !r ps4html \{\
 .      www-make-unique-name
-.      sy pngtopnm \\$2 | pnmcrop -white | pnmtops -noturn > \\*[www-unique-name].eps
+.      sy pngtopnm \\$2 | pnmcrop -white | @PNMTOPS_NOSETPAGE@ -noturn > \\*[www-unique-name].eps
 .      ie '\\$1'-R' \{\
 .        \" we must now disable a possible left image trap
 .        sp -1
@@ -343,7 +575,7 @@
 .    \}
 .  \}
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HnS n
 .\"
 .\"   Begin heading.  Heading level is N.
@@ -371,7 +603,7 @@
 .    www-error "HnE found without a corresponding HnS"
 .  br
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" LK
 .\"
 .\"   Emit the automatically collected links derived from
@@ -380,7 +612,7 @@
 .de LK
 .  HTML-TAG ".links"
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HR
 .\"
 .\"   Produce a horizontal line
@@ -393,7 +625,7 @@
 .  el \
 .    sp
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" NHR
 .\"
 .\"  Suppresses the generation of the top and bottom rules which grohtml
@@ -408,7 +640,7 @@
 .de www-end-nowhere
 .  di
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HTL
 .\"
 .\"   Generate an HTML title only.  This differs from the -ms .TL macro
@@ -427,6 +659,9 @@
 .  \}
 ..
 .
+.\" --------------------------------------------------------------------
+.\" auxiliary definitions for ULS / ULE
+.\"
 .ds www-level1 \[bu]\ \ \"
 .ds www-level2 \[sq]\ \ \"
 .ds www-level3 \[ci]\ \ \"
@@ -449,7 +684,7 @@
 .    www-error "trying to terminate a list which does not exist"
 .  nr www-level -1
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" ULS
 .\"
 .\"   Start an unordered list.
@@ -464,7 +699,7 @@
 .    nr www-depth +\w'\\*[www-level\\n[www-level]]'u
 .  \}
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" ULE
 .\"
 .\"   End an unordered list.
@@ -474,11 +709,11 @@
 .    HTML "</ul>"
 .  el \{\
 .    nr www-depth -\w'\\*[www-level\\n[www-level]]'u
-.    in \\n[www-depth]
+.    in \\n[www-depth]u
 .  \}
 .  www-pop-level
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" LI
 .\"
 .\"   Insert a list item.
@@ -492,7 +727,7 @@
 .    nop \\*[www-level\\n[www-level]]\c
 .  \}
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" DC l text [color]
 .\"
 .\"   L is the letter to be dropped and enlarged.
@@ -513,9 +748,19 @@
 .  el \{\
 .    ie r ps4html \{\
 .      www-make-unique-name
+.      \" To avoid interferences with another DC macro call which is located
+.      \" very near to the current one, we draw the glyph on a separate page.
+.      \" Otherwise it could theoretically happen that the dropped capital
+.      \" glyphs overlap.
+.      bp
+.      ev www-DC
+.      vs 80p
 .      nop \O[5i\\*[www-unique-name].png]\O[1]
-.      nop \m[\\*[www-dropcolor]]\s[40]\O[3]\\$1\O[4]\s0\m[]
-.      nop \O[2]\O[1]
+.      nop \m[\\*[www-dropcolor]]\s[40]\O[3]\\$1\O[4]
+.      nop \O[2]\O[0]
+.      br
+.      ev
+.      bp
 .    \}
 .    el \{\
 .      nr dummy \w'\\$1'u
@@ -527,6 +772,8 @@
 .  \}
 .  nop \\$2
 ..
+.\" --------------------------------------------------------------------
+.\" Setup around HTML-IMAGE and friends
 .\"
 .\" now set up TS, TE, EQ, EN default macros
 .\"
@@ -537,9 +784,10 @@
 .\"
 .\" supplementary macros used by other macro sets
 .\"
-.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html
-.\" to generate png images from postscript.
-.\"
+.\" here are some tags specially for -Tps or -Thtml when invoked by
+.\" pre-html to generate png images from postscript.
+.
+.\" --------------------------------------------------------------------
 .\" HTML-DO-IMAGE - tells troff to issue an image marker which can be
 .\"                 read back by pre-html
 .\"
@@ -549,7 +797,7 @@
 .  if \\n[www-html] \
 .    nop \O[5\\$2\\$1.png]\O[0]\O[3]
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HTML-IMAGE-END - terminates an image for html
 .\"
 .de HTML-IMAGE-END
@@ -561,7 +809,7 @@
 .
 .nr www-png-no 0
 .
-.\"
+.\" --------------------------------------------------------------------
 .\" www-make-unique-name - generates another unique name in string
 .\"                        `www-unique-name'
 .\"
@@ -569,7 +817,7 @@
 .  nr www-png-no +1
 .  ds www-unique-name \\*[www-image-template]\\n[www-png-no]
 ..
-.\"
+.\" --------------------------------------------------------------------
 .\" HTML-IMAGE and friends tell grohtml that this region of text needs
 .\"            to be rendered as an image.
 .\"
@@ -594,11 +842,42 @@
 .  HTML-DO-IMAGE \\*[www-unique-name] i
 ..
 .
+.\" --------------------------------------------------------------------
+.\" Final Setup
+.\" --------------------------------------------------------------------
+.
 .if \n[www-html] \{\
 .   nh
 .   nr HY 0
 .\}
+.
+.\"
+.\" start of some code
+.\"
+.
+.de CDS
+.ft C
+.nf
+..
+.\"
+.\" end of some code
+.\"
+.
+.de CDE
+.fi
+.ft P
+..
+.
 .if r ps4html .nop \O[0]
 .cp \n(_C
 .
+.\" now set
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
 .\" EOF