Virgin import of FSF groff v1.16.1

467 files changed, 71850 insertions, 18666 deletions

diff --git a/contrib/groff/BUG-REPORT b/contrib/groff/BUG-REPORT
index b3f325c83718..293101e34e58 100644
--- a/contrib/groff/BUG-REPORT
+++ b/contrib/groff/BUG-REPORT
@@ -20,18 +20,18 @@ OS:
 [The operating system you are using.  For example, `SunOS 4.1.1']
 
 COMPILER:
-[The compiler you are used to compile groff. For example, `g++ 1.40.3']
+[The compiler you are used to compile groff.  For example, `g++ 1.40.3']
 
 INPUT FILES:
 [Include all the files necessary to reproduce the problem that are not
 part of the standard groff distribution.  This includes font
 description files, DESC files and macro files (with the exception of
-the -ms and -mm macros: we have them).  Send them as a shell archive
-or as a uuencoded, compressed tar file.
+the -ms and -mm macros: we have them).  Send them as a shell archive or
+as a uuencoded, compressed tar file.
 
-It's easier for us if you can provide an example that doesn't depend
-on any macro package, but obviously if you're reporting a problem with
-a macro package that won't be possible.  Also a short example is more
+It's easier for us if you can provide an example that doesn't depend on
+any macro package, but obviously if you're reporting a problem with a
+macro package that won't be possible.  Also a short example is more
 convenient than a long one, but don't worry if you can't find a short
 example.  Don't say something like ``any file that X'': Always send a
 definite example.]
@@ -45,11 +45,11 @@ the macros.]
 DESCRIPTION OF INCORRECT BEHAVIOUR:
 [What goes wrong when that command line is run?  For example, `gtroff
 gets a segmentation fault', or `The output looks bad because the bar
-over the x is too long and is too far over to the left.'  If you get
-an error message, include it here without modification: Don't edit it
-to make it more readable.]
+over the x is too long and is too far over to the left.'  If you get an
+error message, include it here without modification: Don't edit it to
+make it more readable.]
 
 SUGGESTED FIX [optional]:
-[If you can suggest a fix for the problem, include a context diff
-here.  But don't delay sending in a bug report in the hope of finding
-a fix.  Guesses about the cause of the bug are not usually helpful.]
+[If you can suggest a fix for the problem, include a context diff here. 
+But don't delay sending in a bug report in the hope of finding a fix. 
+Guesses about the cause of the bug are not usually helpful.]
diff --git a/contrib/groff/ChangeLog b/contrib/groff/ChangeLog
index 6578156537b0..897767e919dd 100644
--- a/contrib/groff/ChangeLog
+++ b/contrib/groff/ChangeLog
@@ -1,3 +1,1383 @@
+2000-07-31  Werner LEMBERG  <wl@gnu.org>
+
+	Preparing release 1.16.1.
+
+	* REVISION: Revision number set to 1.
+	* MORE.STUFF: Added info about port to DOS.
+	* NEWS, win32-diffs: Updated.
+
+	* src/include/nonposix.h: Remove first line -- this file is used
+	in C also.
+
+	* Makefile.in (dist): Delete Imakefile earlier to avoid a soft
+	link to it.
+
+2000-07-30  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/texinfo.tex: Update to latest version.
+
+2000-06-28  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.in (ENVSETUP): Don't assume POSIX make semantics for
+	commands that fail.  Don't assume that "export a=b" is valid shell
+	syntax.  This is needed for Solaris 2.5.1.
+
+	* src/libs/libgroff/tmpfile.cc, src/utils/indxbib/indxbib.cc: Fix
+	comment about missing Solaris headers.
+
+	* PROBLEMS: Add section about problems with Sun Make and VPATH.
+
+2000-06-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devics/grodvi/dvi.cc: Replace _setmode() (for MSC) with
+	SET_BINARY().
+
+	* src/include/posix.h: Use HAVE_UNISTD instead of _MSC_VER.
+
+	* win32-diffs: Updated.
+	* README.WIN32: Added CRs to make all Windows editors happy.
+
+	* src/roff/troff/node.cc: Added WIFSIGNALED() macro (copied from
+	src/roff/groff/pipeline.c).
+
+2000-06-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* src/roff/grog/Makefile.sub (grog): Prepend `-e' to
+	$(SH_SCRIPT_SED_CMD), for the case where its value is empty.
+
+2000-06-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* src/utils/tfmtodit/tfmtodit.cc: #include nonposix.h.
+	(tfm::load, gf::load): Open tfm and gf files in binary mode: these
+	are binary files.
+	(main): Support non-Posix systems with several different styles of
+	slash characters in file names.
+
+	* src/utils/pfbtops/pfbtops.c: #include nonposix.h.
+	(main) [SET_BINARY]: Switch stdin into binary mode.
+
+	* src/utils/indxbib/indxbib.cc: #include nonposix.h.
+	(main): Support file names with several possible slash-type
+	characters, as given by DIR_SEPS[] in nonposix.h.
+	(main) [__MSDOS__]: If renaming the temporary index file fails
+	because it has more than one dot in its trunk, replace the dot
+	with an underscore and try again.
+	(do_file): Use FOPEN_RB instead of "r".  Skip every CR before a
+	Newline.
+	[__MSDOS__ || _MSC_VER]: Stop at the first ^Z character.
+
+	* src/utils/hpftodit/hpftodit.cc: #include nonposix.h.
+	(File::File): Open the input file in binary mode.  Strip CR
+	characters from each CR-LF pair.
+	(xbasename): Support file names with several possible slash-type
+	characters, as given by DIR_SEPS[] in nonposix.h.
+
+	* src/include/Makefile.sub (HDRS): Add nonposix.h.
+
+	* src/roff/troff/node.cc [HAVE_UNISTD_H]: Include <unistd.h>.
+	(WIFEXITED, WEXITSTATUS, WTERMSIG, WIFSTOPPED, WSTOPSIG)
+	[!_POSIX_VERSION]: Define for traditional Unix systems.
+	(real_output_file::real_output_file): Remove the MSVC-specific
+	call to popen, use instead POPEN_WT, appropriately defined on
+	nonposix.h.  #include nonposix.h.
+	(real_output_file::~real_output_file): Remove the MSVC-specific
+	call to pclose, a suitable macro is now defined on nonposix.h.
+	Use the portable macros WIFEXITED, WIFSIGNALED, WTERMSIG, WSTOPSIG
+	and WEXITSTATUS instead of assuming traditional Unix
+	interpretation of the status returned by pclose.
+
+	* src/roff/troff/input.cc (pipe_source): Remove the MSVC-specific
+	call to popen, use POPEN_RT instead (appropriately defined on
+	nonposix.h).  #include nonposix.h.
+	(ps_bbox_request): Open the PostScript file in binary mode.
+	Close the file after processing it.
+	(getpid) [_MSC_VER]: Remove; a suitable macro is now defined on
+	nonposix.h.
+
+	* src/roff/groff/pipeline.c (run_pipeline) [__MSDOS__ || _WIN32]:
+	A version of run_pipeline that doesn't use `fork'.
+	(signal_catcher) [__MSDOS__ || _WIN32]: New function.
+	(system_shell_name, system_shell_dash_c)
+	(is_system_shell) [__MSDOS__ || _WIN32]: New functions, to hide
+	the ugliness of testing DOS/Windows file names for equality, and
+	support both stock shells and ports of Unix shells.
+
+	* src/roff/groff/groff.cc: #include nonposix.h.
+	(BSHELL): Definition moved to nonposix.h.
+	(main): Use PATH_SEP[0] instead of literal ':'.  Use BSHELL_DASH_C
+	instead of a literal "-c".
+	(xbasename): Support file names with several possible slash-type
+	characters, as given by DIR_SEPS[] in nonposix.h.
+	(possible_command::print): Use BSHELL_DASH_C and IS_BSHELL instead
+	of literal strings.
+
+	* src/preproc/soelim/soelim.cc: #include nonposix.h.
+	(do_file): Use IS_ABSOLUTE instead of testing for a literal '/'.
+
+	* src/preproc/pic/Makefile.sub (YTABH): Change pic.tab.h to
+	pic_tab.h.
+
+	* src/preproc/pic/lex.cc: Change pic.tab.h to pic_tab.h.
+
+	* src/preproc/eqn/Makefile.sub (YTABH): Rename eqn.tab.h to
+	eqn_tab.h.
+
+	* src/preproc/eqn/lex.cc: #include eqn_tab.h, not eqn.tab.h.
+
+	* src/libs/libgroff/tmpfile.cc (DEFAULT_TMPDIR) [P_tmpdir]: If
+	P_tmpdir is defined, use it instead of the literal "/tmp".
+	(remove_tmp_files, add_tmp_file): New functions.
+	(xtmpfile): Record temporary files and register an atexit function
+	to delete them explicitly, instead of relying on the OS to do
+	that, which doesn't work on non-Unix systems.
+
+	* src/libs/libgroff/searchpath.cc: #include nonposix.h.
+	(search_path::search_path): Use PATH_SEP instead of a literal
+	colon.
+	(search_path::command_line_dir): Ditto.
+	(search_path::open_file): Use IS_ABSOLUTE, PATH_SEP and DIR_SEPS,
+	to support non-Posix systems.
+
+	* src/libc/libbib/search.cc: #include nonposix.h.
+	(search_list::add_file): Open the file in binary mode.
+
+	* src/libs/libbib/linear.cc: #include nonposix.h.
+	(file_buffer::load): Remove \r characters preceding \n from the
+	loaded buffer.
+
+	* src/libs/libbib/index.cc: #include nonposix.h.
+	(make_index_search_item): Open index_filename in O_BINARY mode.
+	(index_search_item_iterator::get_tag): Ditto.  Remove \r
+	characters before \n characters.
+	(index_search_item::check_files): Open files in binary mode.
+	(index_search_item::munge_filename): Support DOS-style file names
+	with backslashes and drive letters, use IS_ABSOLUTE.
+
+	* src/devices/grops/ps.cc: #include nonposix.h.
+	(main) [SET_BINARY]: Switch stdout to binary mode.
+
+	* src/devices/grolj4/lj4.cc: #include nonposix.h.
+	(main) [SET_BINARY]: Switch stdout to binary mode.
+
+	* src/devices/grolbp/lbp.cc: #include nonposix.h
+	(fill_pattern) [SET_BINARY]: Switch stdout to binary mode.
+
+	* src/devices/grodvi/dvi.cc: #include nonposix.h.
+	[_MSC_VER]: Remove inclusion of Windows-specific headers (done by
+	nonposix.h).
+	(main) [SET_BINARY]: Switch stdout to binary mode.
+	[_MSC_VER]: Remove an explicit call to _setmode.
+
+	* src/include/nonposix.h: New file.
+
+	* Makefile.in (ENVSETUP): New variable, to set up case-sensitive
+	operation when building with DJGPP.
+	($(TARGETS), dot, $(LIBDIRS), $(CPROGDIRS), $(CCPROGDIRS))
+	($(DEVDIRS), $(TTYDEVDIRS), $(INCDIRS), $(OTHERDIRS)): Use
+	ENVSETUP.
+
+	* Makefile.comm: mv y.tab.[ch] to y_tab.[ch], to make it work on
+	MS-DOS.
+	(.man.n): Replace `;' with `|', since FONTPATH, MACROPATH,
+	etc. can include a semi-colon on DOS/Windows.
+	(depend.temp): Use depend1.temp instead of depend.temp1, to
+	prevent files from overerwiting each other on 8+3 filesystems.
+
+	* gendef.sh (t): Change definition to work with DOS/Windows.
+
+	doc/groff.texinfo: Apart of some typo corrections, I also changed
+	some index entris, to make them more non-ambiguous, and also put
+	@ignore around some parts that are not yet written, to allow the
+	Info output be readable.
+
+2000-06-10  Gael Queri  <gqueri@mail.dotcom.fr>
+
+	Replaced specific checks for function declarations with a generic
+	routine taken from GNU bfd.
+
+	* aclocal.m4 (GROFF_NEED_DECLARATION): New function.
+	GROFF_PUTENV, GROFF_POPEN, GROFF_PCLOSE, GROFF_HYPOT: Removed.
+	* configure.in: Use it.
+	* src/devices/grolbp/lbp.cc, src/include/lib.h,
+	src/preproc/grn/hgraph.cc, src/preproc/pic/pic.h,
+	src/roff/groff/groff.cc: Use it.
+	* Makefile.in, configure: Updated.
+
+2000-06-07  Paco Andres Verdu  <pandres@dragonet.es>
+
+	* src/devides/grolbp/lbp.h: Removed unused variables.
+
+2000-05-31  Keith Thompson  <kst@sdsc.edu>
+
+	* src/devices/grolbp/lbp.cc (set_papersizes): Add declaration of
+	strncasecmp().
+
+2000-05-31  Werner LEMBERG  <wl@gnu.org>
+
+	* aclocal.m4 (GROFF_SRAND): New function to test the return value
+	of srand() -- at least SunOS 4.1.3 uses `int' instead of `void'.
+	* configure.in: Use it.
+	* src/preproc/pic/pic.y, src/preproc/pic/pic.cc: Use it.
+	* configure, Makefile.in: Updated.
+
+	* configure.in: Add test for strncasecmp().
+	* src/include/lib.h: Use it.
+
+2000-05-29  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
+
+	* src/preproc/grn/Makefile.sub: Add MLIB.
+
+2000-05-29  Nix  <nix@esperi.demon.co.uk>
+
+	* Makefile.in: Use @datadir@ and @mandir@ appropriately.
+
+2000-05-29  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/grog/Makefile.sub, src/roff/grog/grog.sh: Add `@g@'.
+
+	* PROBLEMS: Small update.
+
+	* src/devices/grolbp/lbp.cc: Various small fixes.
+
+2000-05-28  Keith Thompson  <kst@sdsc.edu>
+
+	* src/roff/nroff/nroff.sh: Fix main loop syntax.
+
+	* src/utils/indxbib/indxbib.cc: Add declaration of mkstemp().
+
+2000-05-25  Werner LEMBERG  <wl@gnu.org>
+
+	* man/roff.man: Removed unused macro.
+
+2000-05-24  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in (dist): Remove src/xditview/Imakefile explicitly. 
+	This is needed e.g. if you do
+	`make distclean; ./configure; make dist'.
+
+Version 1.16 released
+=====================
+
+2000-05-23  Werner LEMBERG  <wl@gnu.org>
+
+	Adding font CWI (constant width italic) to devdvi.
+
+	* font/devdvi/CWI: New file.
+	* font/devdvi/generate/Makefile: Add generating rule.
+	* font/devdvi/DESC.in, font/devdvi/Makefile.sub, win32-diffs,
+	tmac/tmac.dvi: Use it.
+	* NEWS: Announce it.
+
+	* font/devlj4/*: Regenerated (only adding kernings for `cq' glyph).
+	* font/devlj4/generate/Makefile: Cosmetic changes only.
+
+	* man/groff.man: Removed most of the redundant description of
+	special characters (which is in groff_char.man).  Added font
+	translation CB->CR for devdvi.  Other minor fixes.
+
+	* tmac/tmac.dvi: Improved appearance of \(co (copyright) and \(rg
+	(registered) symbols.
+
+2000-05-22  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/Makefile: Added rule for creating info files.
+
+	* font/devdvi/*: Added kernings for `cq' glyph.  Updated to latest
+	AMS font metrics.
+	* font/devdvi/generate/Makefile: Fixed dependencies.
+
+	* font/devps/*: Regenerated.  Heavy changes for Bookman and
+	NewCentury Schoolbook!
+	* font/devps/generate/afmname: Will now run with GNU awk.
+	* font/devps/generate/textmap: Added forgotten `cq' glyph name.
+	* font/devps/generate/Makefile: Cosmetic changes only.
+
+2000-05-21  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.an: Added a new command line option `-rSxx' (`xx' can be
+	10, 11, or 12) to support output with 11pt and 12pt base font sizes. 
+	`.SS' now produces a heading with a smaller size than `.SH'. 
+	Completely formatted.
+	* doc/groff.texinfo, tmac/groff_man.man, NEWS: Document it.
+
+	* man/groff.man: Improved table appearance.  Use of `eo' request
+	to reduce number of doubled backslashes in macro definitions.
+	Replacing `\e' with `\(rs'.  Other minor fixes.
+
+	* src/preproc/tbl/main.cc: Insert HTML table end tag before `lf'
+	to have correct line number.
+
+	* INSTALL: Small improvement.
+
+2000-05-20  Bernd Warken  <bwarken@mayn.de>
+
+	* man/roff.man, tmac/groff_tmac.man: Updates (with corrections by
+	WL).
+
+2000-05-19  Bernd Warken  <bwarken@mayn.de>
+
+	* man/groff.man: Complete update (with a lot of corrections by WL).
+
+2000-05-18  Werner LEMBERG  <wl@gnu.org>
+
+	Adding `cq' (PS name `quoteright') glyph name as an alias for "'".
+
+	* font/*/*: Implement it.
+	* man/groff_char.man, NEWS: Document it.
+
+	* src/include/unix.h: Removed.  It isn't used.
+
+	* doc/groff.texinfo: Slight improvements.
+
+2000-05-17  Werner LEMBERG  <wl@gnu.org>
+
+	* README, win32-diffs: Small fixes and improvements.
+
+2000-05-16  Werner LEMBERG  <wl@gnu.org>
+
+	* FDL: New file (the Free Documentation License version 1.1).
+
+	* doc/groff.texinfo: Added many start-up values for gtroff.
+	Some structural improvements of the source code.
+
+2000-05-15  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc: Added small comment about troffrc-end.
+	* src/roff/troff/troff.man: Added info about troffrc-end.
+
+2000-05-14  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in (EXTRADIRS): Fix typos.
+	(dist): Handle deletion of old .tar.gz file correctly.
+	(DISTDIRS): Include all tty output devices.
+
+	* doc/groff.texinfo: Adding more cross references; countless other
+	fixes.
+
+2000-05-13  Werner LEMBERG  <wl@gnu.org>
+
+	* MORE.STUFF: Added Robert Marks's utilities.
+
+2000-05-12  Werner LEMBERG  <wl@gnu.org>
+
+	Added win32 port contributed by Blake McBride
+	<blake@florida-software.com>.
+
+	* README.WIN32, win32-diffs: New files.
+	* NEWS: Updated.
+
+	* src/preproc/grn/hgraph.cc (HGSetBrush): Replace `%lf' with `%f'.
+	(tmove, tmove2): Added parentheses to avoid compiler warnings.
+	(change): Removed unused variables.
+
+	* src/preproc/grn/main.cc (main, conv): Removed unused variables.
+	(savebounds): Changed return value from `int' to `void'.
+	* src/preproc/grn/hdb.cc: Ditto.
+
+	* src/devices/grolbp/lbp.cc (lbp_printer::draw): Removed superfluous
+	final backslash in comment to avoid compiler warning.
+
+	* src/utils/pfbtops/pfbtops.c: Added `getopt.h'.
+
+	* doc/groff.texinfo: More fixes.
+
+2000-05-11  OKAZAKI Tetsurou  <okazaki@be.to>
+
+	* tmac/tmac.doc: Documentation fix.
+
+2000-05-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Reading the source code shows up a lot of
+	omissions and incorrect data...  More conversion to @Deffn macros.
+
+2000-05-10  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/reg.cc (number_value_to_ascii): Remove ASCII
+	dependency.
+
+	* src/roff/troff/request.h: Removing unused `no_break_flag'.
+
+2000-05-09  Werner LEMBERG  <wl@gnu.org>
+
+	* man/groff.man, man/roff.man, tmac/groff_tmac.man: Minor
+	improvements.
+
+	* doc/groff.texinfo: Extended history section.  More conversion to
+	@Deffn macros.  More .tr documentation.
+
+2000-05-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Completed tab section.  Added info about
+	fields.
+
+2000-05-06  Mike MacIsaac  <mikemac@us.ibm.com>
+
+	* PROBLEMS: Describe configure script fix for OS/390 Unix.
+
+2000-05-05  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/DESC.in: Change size 11pt to 10.95pt (as used in
+	LaTeX 2e).
+	* NEWS: Document it.
+
+	* man/troff.man: Minor optical improvements.
+
+2000-05-03  Werner LEMBERG  <wl@gnu.org>
+
+	Adding `dq' (PS name `quotedbl') glyph name as an alias for `"'.
+
+	* font/*/*: Implement it.
+	* man/groff_char.man, NEWS: Document it.
+
+2000-05-02  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/groff_tmac.man, man/groff.man, man/roff.man: Fixing @MANxEXT@
+	expansion.
+	* NEWS: Document the three new man pages.
+
+	* aclocal.m4 (GROFF_CXX_CHECK): Removing obsolete AC_C_CROSS call.
+	* configure: Updated.
+
+	* font/devcp1047/R.proto: Fixing fatal bug (a missing `"' character).
+
+2000-05-01  Werner LEMBERG  <wl@gnu.org>
+
+	Added grap support to grog.
+
+	* src/roff/grog/grog.sh, src/roff/grog/grog.pl: Implement it.
+	* src/roff/grog/grog.man: Document it.
+
+	* doc/groff.texinfo, NEWS: Add info about grap support.
+
+	Add new man pages comptributed by Bernd Warken <bwarken@mayn.de>
+	(with slight fixes by me).
+
+	* tmac/groff_tmac.man: New file documenting tmac mechanism.
+	* tmac/Makefile.sub: Add groff_tmac.man.
+	* man/roff.man: New file giving overview of roff system.
+	* man/troff.man: A short reference of troff.
+	* man/Makefile.sub: Add roff.man and troff.man.
+
+2000-04-30  Werner LEMBERG  <wl@gnu.org>
+
+	Added grap support to groff.
+
+	* src/roff/groff/groff.cc: Implement it.
+	* src/roff/groff/groff.man: Document it.
+
+	* src/devices/grotty/grotty.man: Add cp1047 device.
+	* src/preproc/eqn/eqn.man, src/preproc/eqn/neqn.sh, tmac/eqnrc:
+	Ditto.
+	* src/roff/groff/groff.man: Ditto.
+	* src/roff/nroff/nroff.sh, src/roff/nroff/nroff.man: Ditto.
+	* doc/groff.texinfo: Ditto.
+
+	* tmac/troffrc: Fix mapping of latin-1 char 160 (non-breakable space)
+	for cp1047.
+
+2000-04-29  Werner LEMBERG  <wl@gnu.org>
+
+	* man/groff_char.man: Add `pc' glyph.
+	* tmac/tmac.latin1: Replacing `md' glyph with `pc'.
+	* tmac/tmac.tty: Add `pc' glyph.
+	* tmac/tmac.tty-char: Use/add `pc' glyph.  Don't call tmac.latin1 if
+	we use cp1047 output device.
+
+	* Makefile.in, aclocal.m4: Don't build utf8 on EBCDIC hosts since
+	there are still hardcoded latin1->unicode values in utf8's font
+	definition files.
+	* configure: Updated.
+	* NEWS: Minor clarification.  Updated.
+
+	* PROBLEMS: Formatted.  Added info about C++ fix pack for OS/390
+	Unix.
+
+2000-04-28  Werner LEMBERG  <wl@gnu.org>
+
+	Adding EBCDIC code page 1047.
+
+	* font/devcp1047/R.proto, font/devcp1047/Makefile.sub,
+	font/devcp1047/DESC.proto: New files.
+
+	* aclocal.m4 (GROFF_EBCDIC): Introduce TTYDEVDIRS which can be
+	either ascii/latin1 or cp1047.
+	* Makefile.in: Use it.
+	* configure: Updated.
+
+	Replacing and/or adding `md' (mathdot) glyph with `pc'
+	(periodcentered) in all text fonts.
+
+	* font/*/*: Change it.
+
+2000-04-27  Werner LEMBERG  <wl@gnu.org>
+
+	* aclocal.m4 (GROFF_OS390): Fixing compiler flags.
+
+	* configure.in: Add check for strings.h.
+	* src/include/driver.h: Use HAVE_STRINGS_H.
+	* src/devices/grolbp/lpb.cc: Remove string.h.
+
+	* src/include/groff-getopt.h: New file.  It will be used instead of
+	getopt.h (to be included in lib.h) to avoid endless problems with
+	picky C++ compilers.
+	* src/include/lib.h: Use groff-getopt.h.
+	* src/include/Makefile.sub: Updated.
+
+	* configure: Updated.
+	* Makefile.in: Updated.
+
+	* NEWS: Mention EBCDIC support.
+
+2000-04-26  Werner LEMBERG  <wl@gnu.org>
+
+	* TODO: Some additions.
+
+2000-04-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/troff.man, doc/groff.texinfo: Fixing documentation
+	of mso request.
+
+2000-04-23  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/troff.man: Minor fixes.
+
+2000-04-22  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/troff.man, doc/groff.texinfo, NEWS: Document the
+	`.T' string register and the incompatible definition of the `.T'
+	number register (compared to Unix troff).
+
+	* man/groff_char.man: Add some missing characters.
+	* font/devutf8/NOTES: Update.
+
+2000-04-21  Werner LEMBERG  <wl@gnu.org>
+
+	* src/include/htmlindicate.h, src/include/lib.h,
+	src/include/posix.h: Fix copyright.
+
+	* src/include/Makefile.sub: Update.
+
+2000-04-20  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/input.cc (input_char_description): Removing
+	superfluous space char.
+
+	* tmac/tmac.X: Fix typo \(bq -> \(Bq.
+
+	* doc/groff.texinfo: Document EBCDIC.
+
+2000-04-19  Werner LEMBERG  <wl@gnu.org>
+
+	Introducing `shc' as the glyph name for the soft hyphen character.
+
+	* tmac/tmac.tty, tmac/tmac.latin1, tmac/tmac.html,
+	font/devlatin1/R.proto: Use it.
+
+	* NEWS: Updated.
+
+2000-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grops/ps.cc (ps_printer::flush_sbuf): Removing
+	dependency on ASCII order.
+
+2000-04-16  Sandor BARANY  <S.Barany@infosys.tuwien.ac.at>
+
+	* src/libs/libgroff/illegal.c: Added EBCDIC table.
+	* src/roff/troff/input.cc: Added adaptation to EBCDIC.
+
+	* src/preproc/refer/refer.cc, src/roff/troff/env.cc: Minor changes
+	to increase portability.
+
+2000-04-15  Werner LEMBERG  <wl@gnu.org>
+
+	* aclocal.m4: Added GROFF_EBCDIC and GROFF_OS390 tests.
+	Redefined AC_OUTPUT_MAKE_DEFS to replace ASCII character `012' with
+	the generic `\n' if under OS/390 Unix.
+
+	* configure.in: Call GROFF_EBCDIC and GROFF_OS390.
+
+	* configure: Regenerated.
+
+2000-04-14  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: More conversions to @Deffn.
+
+2000-04-12  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.psfig: Fix incorrect use of `&' operator by replacing it
+	with `:'.
+
+	* src/roff/nroff/nroff.man: Add note about tmac.tty-char.
+
+2000-04-10  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: More conversions to @Deffn.
+
+2000-04-08  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libgroff/{getopt.c,getopt1.c}, src/include/getopt.h:
+	Updated to latest version (glibc 2.1.3).
+
+2000-04-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/Makefile (clean): Include more index files.
+	Add rule texinfo->dvi.
+
+2000-04-05  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Added new index `op' for operators.  More
+	info on end of sentence characters.  More use of @Deffn.
+
+2000-03-30  Werner LEMBERG  <wl@gnu.org>
+
+	* */*.man: Adding a note that a whitespace can be inserted between
+	a command line option and its parameter -- we are using GNU getopt.
+
+	* src/roff/groff/groff.man: Add example of `-m mandoc'.
+
+2000-03-28  Werner LEMBERG  <wl@gnu.org>
+
+	Correct anachronism of calling the man macro file with `-man'
+	instead of `-m man' etc.
+
+	* tmac/tmac.man, tmac/tmac.mandoc, tmac/tmac.markup, tmac/tmac.mdoc,
+	tmac/tmac.me, tmac/tmac.ms: New files tmac.m<package> which simply
+	load tmac.<package>.
+
+	* tmac/Makefile.sub: Updated.  Take care of $(tmac_an_prefix) etc.
+
+	* NEWS: Updated.
+
+	* doc/groff.texinfo: Updated.
+
+	* tmac/groff_man.man: Copyright added.
+
+2000-03-27  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Introducing macros `Deffn' and `Defmac' to
+	typeset the request resp. escape name with a tt font -- due to a
+	bug in texinfo.tex it is necessary to use the `-e' switch with
+	texi2dvi.
+
+	Improving info about usage of groff units.
+
+	Other minor fixes.
+
+2000-03-20  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Added section about man macro package
+	(I've basically taken groff_man.man).  Introducing new indices `ma'
+	for macros/strings and `gl' for glyph names.  Other minor fixes.
+
+	* tmac/groff_man.man: Fixed some typos.
+
+2000-03-19  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Removed all occurrences of `you', `we', etc.
+	Other minor fixes.
+
+	* doc/texinfo.tex: New file.
+
+2000-03-18  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Improved section on number registers.  Other
+	minor updates.
+
+2000-03-16  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/groff/groff.man: Added info about grolbp.  Make nicer
+	synopsis.
+
+	* src/devices/grolbp/grolbp.man, src/roff/nroff/nroff.man,
+	src/devices/grolj4/grlj4.man, src/devices/grops/grops.man,
+	src/preproc/eqn/eqn.man, src/utils/afmtodit/afmtodit.man,
+	src/utils/tfmtodit/tfmtodit.man: Make nicer synopsis.
+
+	* src/preproc/grn/grn.man: Better synopsis; added copyright.
+
+	* src/roff/grog/grog.man: Updated copyright date.
+
+2000-03-14  Francisco Andres Verdu  <pandres@dragonet.es>
+
+	* configure.in: Added test for strdup.
+
+	* src/devices/grolbp/lbp.cc: Added a strdup() version in case none
+	is available.
+
+	Replaced dynamic allocation of arrays `[...]' with `new' operator.
+
+	Other minor fixes.
+
+2000-03-12  OKAZAKI Tetsurou  <okazaki@be.to>
+
+	* Makefile.comm: Add $(INCLUDES) to $(ALL_CFLAGS).
+
+2000-03-11  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/hdb.cc (DBGetType): Added return value to make
+	compilers silent.
+	* src/preproc/grn/hgraph.cc: Add #ifdef for hypot().
+	* src/include/lib.h: Remove some spaces.
+
+2000-03-10  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libgroff/tmpfile.cc (xtmptemplate, xtmpfile): Removing
+	initializers from arguments (some compilers don't like this).
+
+2000-03-09  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/libs/libgroff/htmlindicate.cc: Added library file which is now
+	used by pic and eqn to tell grohtml where the graphic regions start
+	and end.
+	* src/libs/libgroff/Makefile.sub: Use it.
+	* src/preproc/eqn/main.cc, src/preproc/pic/troff.cc: Altered to use
+	graphic_start() and graphic_end() from htmlindicate.cc.
+
+2000-03-09  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.safer: Will now work correctly in compatibility mode.
+	* tmac/groff_man.man: More fixes.
+
+2000-03-08  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/Makefile: Added texput.log to the `clean' target.
+	* doc/groff.texinfo: Added info about delimiters for escapes.
+
+2000-03-08  Bernd Warken  <bwarken@mayn.de>
+
+	* src/preproc/pic/pic.man: Add info on conversion of pic images to
+	other graphic formats.
+
+2000-03-07  OKAZAKI Tetsurou  <okazaki@be.to>
+
+	* Makefile.in, contrib/mm/Makefile.sub, src/preproc/eqn/Makefile.sub,
+	src/roff/groff/Makefile.sub, src/roff/nroff/Makefile.sub,
+	src/utils/afmtodit/Makefile.sub: Use $(INSTALL_SCRIPT) for script
+	files.
+
+2000-03-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Spelling fixes.
+
+2000-03-06  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/groff_man.man: Completely revised to cover everything in
+	tmac.an.
+
+	* doc/groff.texinfo, src/roff/troff/troff.man: Document evc request.
+	Other minor fixings.
+	* src/roff/troff/env.cc (environment_copy): Improve error message and
+	fix itoa->i_to_a.
+	* src/roff/troff/TODO: Updated.
+
+	* doc/Makefile: Bug fixes -- this is still provisional, though...
+
+	* tmac/eqnrc: Small fixes.
+
+2000-03-05  Abramo Bagnara <abramo@alsa-project.org>
+
+	Adding a request `evc' to copy environments.
+
+	* src/roff/troff/env.cc (environment::copy, environment_copy):
+	Implement it.
+	* src/roff/troff/env.h: Add prototype.
+
+2000-03-05  Francisco Andres Verdu  <pandres@dragonet.es>
+
+	Adding strsep() -- Solaris 8 doesn't have it.
+
+	* configure.in: Test it.
+	* src/devices/grolbp/lbp.cc: Add code.
+
+2000-03-05  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/div.cc (macro_diversion::output,
+	top_level_diversion::output): Fixing an incompatibility with
+	original troff: \x'0' updates the .a register also.  Thanks to
+	<Andries.Brouwer@cwi.nl> for pointing this out.
+	* doc/groff.texinfo: Document it.
+
+	* Makefile.in: Create Makefile.dep if necessary before calling the
+	submake process to avoid warning about nonexistent file.
+
+	* NEWS, PROJECTS: Updated.
+
+2000-03-04  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/troffrc: Add tmac.lbp.
+
+2000-03-03  Francisco Andres Verdu  <pandres@dragonet.es>
+
+	* tmac/tmac.lbp: New file.
+	* src/devices/grolbp/grolbp.man: Add documentation of `lbpname'
+	command.
+
+2000-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in: Fixing $(subdir).
+
+	* README, NEWS: Small fixes.
+
+	* test-groff: Adding path to grolbp.
+
+	* configure.in: The (new) file src/xditview/Imakefile.in will be
+	also configured -- it is now possible to build gxditview in a
+	directory different from $srcdir.
+
+2000-03-02  Blake McBride  <blake@florida-software.com>
+
+	* src/libs/libgroff/searchpath.cc (open_file): Adapting to WinNT.
+
+	* MORE.STUFF: Added website of bell labs and info about plot2dev.
+
+2000-03-01  Colin Phipps  <crp22@cam.ac.uk>
+
+	* src/utils/indxbib/indxbib.cc (main): Use mkstemp() for temporary
+	files.
+
+2000-02-29  Werner LEMBERG  <wl@gnu.org>
+
+	Adding GNU getopt to the groff distribution.
+
+	* src/include/getopt.h, src/libs/libgroff/{getopt.c,getopt1.c}:
+	New files.
+	* src/include/Makefile.sub, src/libs/libgroff/Makefile.sub: Update.
+	* aclocal.a4: Remove GROFF_GETOPT function.
+	* configure.in, Makefile.in, PROBLEMS: Update.
+	* src/include/lib.h: Replace getopt tests with getopt.h.
+	* src/devices/grolbp/lpb.cc: Remove inclusion of getopt.h.
+
+	* doc/groff.texinfo: Further checking/updating.  Adding more index
+	entries.
+
+	* man/groff_out.man: Fix nroff mode activation (for emacs).
+	* man/groff_font.man: Add missing ligature.
+
+2000-02-28  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Further checking/updating.  Adding more index
+	entries.
+
+	* src/devices/grolbp/grolbp.man: Added a comment line at the
+	beginning of the file (similar to shell scripts) which indicates
+	that `tbl' should be used as a preprocessor.
+
+2000-02-27  Blake McBride  <blake@florida-software.com>
+
+	Adapting groff to MS Visual C++ 6.0 compiler (tested with
+	Windows NT 4.0).  Uses _MSC_VER define where necessary.
+
+	* src/devices/grodvi/dvi.cc: Making stdout a binary stream.
+	* src/devices/grolj4/lj4.cc: Making getopt variables `extern "C"'.
+	* src/devices/grohtml/html.cc, src/devices/grops/ps.cc,
+	src/include/lib.h, src/libs/libgroff/errarg.cc,
+	src/libs/libgroff/itoa.c, src/libs/libgroff/nametoindex.cc,
+	src/preproc/refer/label.y, src/preproc/refer/label.cc,
+	src/roff/groff/pipeline.c, src/roff/troff/column.cc,
+	src/roff/troff/div.cc, src/roff/troff/env.cc,
+	src/roff/troff/input.cc, src/roff/troff/node.cc,
+	src/roff/troff/reg.cc: Renaming itoa() to i_to_a() and iftoa() to
+	if_to_a() to avoid name	clashes.
+	* src/include/posix.h: Don't use unistd.h.
+	* src/libs/libgroff/tmpfile.cc: Use `#ifndef...#else...#endif'
+	clause for integrating non-Unix xtmpfile() code.
+	* src/roff/troff/input.cc: Adding `public' keyword to macro_header
+	structure; use "rt" for popen() in pipe_source(); add getpid()
+	dummy function.
+	* src/roff/troff/node.cc: Use special versions of popen() in
+	real_output_file() and pclose() in ~real_output_file().
+
+2000-02-27  Werner LEMBERG  <wl@gnu.org>
+
+	Adding a new driver, grolbp, for Canon CAPSL printers (LBP-4 and
+	LBP-8 series laser printers).  This code has been contributed by
+	Francisco Andres Verdu <pandres@dragonet.es>.
+
+	* src/devices/grolbp/*: The grolbp output device.
+	* font/devlpb/*: The font description files.
+	* Makefile.in: Add grolpb and devlbp subdirectories.
+
+	* src/devices/grodvi/grodvi.man, src/devices/grolj4/grolj4.man,
+	src/devices/grotty/grotty.man,src/roff/troff/troff.man: Minor
+	typographic fixes.
+
+	* doc/groff.texinfo: Further checking/updating.  Adding more index
+	entries.
+
+	* NEWS: Updated.
+
+	* src/devices/grolbp/Makefile.sub: Adding $(srcdir).
+
+	* man/groff_font.man: Adding info about obsolete DESC keywords.
+	* src/devices/grolj4/grolj4.man: Documenting additional DESC
+	keywords.
+
+2000-02-26  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/grn.man: Added info about the gremlin file format
+	(contributed by Daniel Senderowicz <daniel@synchrods.com>).
+
+2000-02-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/main.cc: Allow values of `narrow' parameter and
+	friends to be non-integer.
+
+	* src/preproc/grn/grn.man: Document it.
+
+	* doc/groff.texinfo: Further checking/updating.  Adding more index
+	entries.
+
+2000-02-24  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/main.cc: Introduce BASE_THICKNESS, defining
+	line thicknesses to be integer multiples of this value.
+
+	* src/preproc/grn/grn.man: Commenting out the -s option -- the
+	corresponding code doesn't work (yet).
+
+	* doc/groff.texinfo: Further checking/updating.  Adding more index
+	entries.
+
+2000-02-23  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/{main.cc, hgraph.cc}: Using point units to
+	specify line thickness instead of base units.  The new default
+	values are now 0.15,pt 0.45pt, and 0.75pt for thin, middle, and
+	thick lines respectively.
+
+	Removed unused variable `prevval'.
+
+	* src/preproc/grn/grn.man: Updated.
+
+2000-02-22  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/grn/main.cc: Slight formatting.
+
+	* src/roff/groff/groff.man: Formatting fix.
+	* src/preproc/grn/grn.man: Ditto.
+
+	* src/roff/grog/grog.pl: Fixing two embarassing bugs.
+
+	* doc/groff.texinfo: Further checking/updating.
+
+2000-02-21  Werner LEMBERG  <wl@gnu.org>
+
+	* README, INSTALL, PROJECT, PROBLEMS, BUGREPORT: Updated.
+
+	* test-groff: Added grn subdir to path.
+
+	* doc/groff.texinfo: Some restructing and other small improvements.
+
+	* src/roff/groff/groff.cc (help): Fixed info string.
+
+2000-02-20  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/meref.me: Fix description of .GS request.
+
+	* src/roff/troff/troff.man: Fixing typo.
+
+	Adding the `grn' preprocessor for gremlin graphic files.
+
+	* src/preproc/grn/*: This is the Berkeley distribution written by
+	David Slattengren and Barry Roitblat, adapted to groff by Daniel
+	Senderowicz and Werner Lemberg.
+
+	* doc/grnexampl.{me,g}: A sample for grn.
+
+	* Makefile.in: Added subdirectory entry for grn.
+
+	* src/roff/groff/groff.cc: Added support for grn.  It can be now
+	called with the switch `-g'.
+
+	* src/roff/groff/groff.man: Updated.
+
+	* src/roff/grog/grog.{man,pl,sh}: Updated.
+
+	* NEWS: Updated.
+
+2000-02-11  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/include/lib.h: Added xtmptemplate and made xtmpfile
+	parametrically polymorphic.
+
+	* src/libs/libgroff/tmpfile.cc: Implemented xtmptemplate
+	and the alterations to xtmpfile.
+	xtmpfile can be requested to return the filename created
+	and asked not to unlink the temp file.  The default behaviour
+	if parameters are absent is exactly the same as before.
+
+2000-02-11  Abramo Bagnara  <abramo@alsa-project.org>
+
+	A new request `length' is available which returns the length of a
+	string in a number register:
+
+	* src/roff/troff/input.cc (length_macro): Implement it.
+	* src/roff/troff/input.cc (init_input_requests): Register it.
+
+2000-02-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo, src/roff/troff/troff.man: Add documentation
+	of the `substring' request.
+
+	* src/roff/troff/troff.man, doc/groff.texinfo: Document `length'
+	request.
+
+	* src/roff/troff/TODO, NEWS: Updated.
+
+2000-02-09  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/groff/groff.man: Added an example.
+
+2000-02-06  Werner LEMBERG  <wl@gnu.org>
+
+	I've considerably modified the directory structure of the
+	distribution to get a more vertical layout.  For example, the number
+	of top level directories has been reduced from 42 to 6.
+
+	As a consequence, many changes, especially to the makefiles, were
+	necessary:
+
+	* The makefile variables `top_builddir' and `top_srcdir' have been
+	introduced.  Virtually all relative paths have been replaced with
+	absolute ones using these two variables.
+
+	* Dependencies (in the files `Makefile.dep') are no longer part of
+	the distribution.  Instead, they are created during a `make install'
+	in the build directory.
+
+	* aclocal.m4 (GROFF_SRCDIR, GROFF_BUILDDIR): Two new functions to
+	make `top_srcdir' and `top_builddir' absolute.
+
+	Some other changes:
+
+	* Man pages no depend on the files `VERSION' and `REVISION'.
+
+	* The added shell script `mkinstalldirs' will replace `mkdir' in
+	almost all cases.
+
+	* VERSION: Version number increased to 1.16.
+
+2000-02-04  Werner LEMBERG  <wl@gnu.org>
+
+	* grops/psrm.cc (read_one_of): Fixed pointer incrementation.
+
+	* Makefile.in: Removed $(tmac_m) since it is no longer needed
+	(after an update of the mm stuff).
+
+	* troff/Makefile.sub (majorminor.cc): Fix dependencies.
+
+2000-02-03  Werner LEMBERG  <wl@gnu.org>
+
+	The .psbb request will now also accept Mac PS images (i.e. using LF
+	as the EOL character).
+
+	* troff/input.cc (ps_get_line): New function, taken from psrm.cc
+	(with slight modifications).
+	* troff/input.cc (do_ps_file): Use it.
+
+	* test-groff: Add grohtml and grolj4 output devices to PATH.
+
+2000-01-30  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS, MORE.STUFF: Updated.
+
+2000-01-30  Cary D. Renzema  <caryr@dollar.mxim.com>
+
+	Add the `srand' command to pic.
+
+	* pic/lex.cc, pic/pic.y: Implement it.
+	* pic/pic.man: Document it.
+	* pic/pic.cc, pic/pic.tab.h: Regenerated (with yacc).
+
+2000-01-30  Werner LEMBERG  <wl@gnu.org>
+
+	Add a new request `.psbb'.  This does exactly what the external
+	program psbb did.  It scans a PostScript image file for a
+	%%BoundingBox comment and extracts the bounding box values (in
+	PostScript units) which	are then stored in the four new (read-only)
+	number registers `llx', `lly', `urx', and `ury'.
+
+	This will allow the usage of the .PSPIC macro without worrying
+	about unsafe behaviour of groff, i.e., it will work without the
+	`-U' switch of groff.
+
+	* troff/input.cc: Implement it.
+	* tmac/tmac.pspic: Use it.
+	* troff/troff.man, grops/grops.man, NEWS: Document it.
+	* psbb/*, Makefile.in: Remove it since it is no longer needed.
+
+	This is bloody C code simply adapted from psbb.c!  Any improvements
+	welcome.
+
+2000-01-29  Werner LEMBERG  <wl@gnu.org>
+
+	* man/groff_font.man: Minor clarifications.
+
+	* NEWS: Updated.
+
+2000-01-28  Werner LEMBERG  <wl@gnu.org>
+
+	* afmtodit/afmtodit.pl: Use new `--' comment delimiter.
+
+2000-01-28  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* man/groff_font.man: Brought up to date regarding tcommand
+	extensions.
+	* libgroff/font.cc: Handle everything after `--' as a comment
+	in the font files.
+	* devps/*: Added comment delimiter inside devps font files.
+
+2000-01-28  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.arkup, tmac/groff_markup.man: Replace \fC...\fR with
+	\fC...\fP (which now works as expected).
+
+	* troff/troff.man: Fix typo.
+
+2000-01-27  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Completed the pass_filenames implementation in troff.
+
+	* libdriver/input.cc: Will read the new `F' tcommand.
+	* troff/node.cc, troff/node.h: Will issue the new `F' tcommand.
+	* troff/input.cc: Use it.
+
+2000-01-26  Werner LEMBERG  <wl@gnu.org>
+
+	* troff/env.cc (set_font): Fix the behaviour of \fP.  The previous
+	font will now be updated even if an invalid font is selected.
+
+2000-01-24  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/homepage.ms: Updated for new tmac.arkup.
+
+	* tmac/tmac.html: Disable line breaks after hyphen-like characters.
+
+	* tmac/tmac.arkup: Cleanup.
+
+	Added `\&' to .HTML macro to `leave vertical mode', so to say.
+
+	Removed obsolete .LINK macro completely.
+
+	The macros .URL, .FTP, and .MAILTO now accept a third argument which
+	will be immediately appended to the second argument (to be used with
+	punctuation, for example).
+
+	Disabled .CDFTP macro temporarily for security reasons.
+
+	* tmac/groff_markup.man: Complete revision for latest changes in
+	tmac.arkup -- note that it does not yet format correctly with
+	grohtml :-(
+
+2000-01-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* nroff/nroff.sh: Accept -Tutf8 option and pass it through.
+	* devutf8/R.proto: Add mappings for wp, lh, rh.
+	* devutf8/NOTES: Updated.
+
+2000-01-23  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Updated version/copyright info.
+
+2000-01-21  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Added support for two new directives in device descriptions:
+	`pass_filenames' (to pass the input file name to the output device)
+	and `use_charnames_in_special' (to support e.g. accented characters
+	in the `X' request).
+
+	* include/font.h, troff/charinfo.h: Declare it.
+
+	* libgroff/font.cc, libgroff/fontfile.cc: Set it.
+
+	* devhtml/DESC: Use it.
+
+	* troff/input.cc: New function encoded_char.
+
+	* troff/token.h: Add test for `specialness'.
+
+2000-01-21  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/Makefile.sub: tmac.a4 and tmac.trace have been removed by
+	mistake from the list of files to be installed.
+
+2000-01-18  Werner LEMBERG  <wl@gnu.org>
+
+	* README: Added info how to apply patches.
+
+2000-01-15  Jan Echternach  <echter@informatik.uni-rostock.de>
+
+	* troff/node.cc (ligature_note::operator delete):  Fix g++ warning.
+
+2000-01-15  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* troff/input.cc: Add support for troffrc-end.
+
+	* tbl/main.cc: Altered to issue table-start and table-end special
+	characters if using the html device.
+
+	* devhtml/*: Modified font files to incorporate html encoding of
+	characters.
+
+	* tmac/groff_markup.man: New file documenting tmac.arkup.
+
+	* tmac/troffrc-end: New file.  This is invoked after all user
+	specified macros.  Currently used by the html device to	include
+	tmac.html.  Thus no need for users to specify -mhtml anymore.
+
+	* tmac/Makefile.sub (NORMALFILES): Add troffrc-end.
+	(MAN7): Add groff_markup.man.
+
+	* tmac/tmac.an, tmac/tmac.html: Small html updates.
+
+	* tmac/troffrc: tmac.arkup will now be called for the html device.
+
+	* libgroff/font.cc, libgroff/font.h: Altered to include reading of
+	extra device specific information about fonts.
+
+	* doc/homepage.ms: New file.  It is an example how an HTML home page
+	could look like with grohtml.
+
+	* doc/Makefile: Add homepage.ms.  Remove rule for pic.html.
+
+2000-01-12  Bruno Haible  <haible@clisp.cons.org>
+
+	* devutf8/R.proto: Add mappings for ti, Fn, st, an.  Change mappings
+	of Im, Re.
+
+	* devutf8/NOTES: Updated.
+
+2000-01-08  Bruno Haible  <haible@clisp.cons.org>
+
+	* eqn/box.cc, eqn/lex.cc, eqn/other.cc, eqn/over.cc, eqn/special.cc,
+	eqn/text.cc, grodvi/dvi.cc, grops/ps.cc, grops/psrm.cc,
+	libbib/index.cc, libbib/linear.cc, libbib/search.cc,
+	libdriver/printer.cc, libgroff/font.cc, libgroff/string.cc,
+	pic/lex.cc, pic/object.cc, refer/label.y, refer/ref.cc, tbl/main.cc,
+	tbl/table.cc, tfmtodit/tfmtodit.cc, troff/dictionary.cc,
+	troff/div.cc, troff/env.cc, troff/input.cc, troff/node.cc,
+	troff/node.h, troff/reg.cc: Avoid most "g++ -Wall -Wno-sign-compare"
+	warnings.
+
+	* troff/node.cc (bracket_node::copy): Initialize last to NULL.
+
+2000-01-12  Fabrizio Polacco  <fab@prosa.it>
+
+	grolj4: Paper size will be searched case-insensitively.
+
+	* include/lib.h: Add check for strcasecmp().
+	* grolj4/li4.cc (lookup_paper_size): Use strcasecmp().
+	* configure.in: Check for strcasecmp().
+
+2000-01-11  Werner LEMBERG  <wl@gnu.org>
+
+	* troff/Makefile.sub (majorminor.cc): Fix incorrect path to
+	`REVISION'.
+
+2000-01-10  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.comm, Makefile.in, doc/Makefile: More fixes for the
+	revision scheme.
+
+	Add a new read-only register, `.Y', which contains the groff
+	revision.
+
+	* troff/input.cc (init_input_requests): Define it.
+	* troff/Makefile.sub (majorminor.cc): Define `revision' string.
+	* doc/groff.texinfo, troff/troff.man: Document it.
+
+	* libgroff/Makefile.sub (version.cc): Add definition of
+	`Version_string[]', consisting of `<major>.<minor>.<revision>'
+	* eqn/main.cc, grodvi/dvi.cc, grolj4/lj4.cc, grops/ps.cc,
+	grotty/tty.cc, hpftodit/hpftodit.cc, indxbib/indxbib.cc, pic/main.cc,
+	refer/refer.cc, soelim/soelim.cc, tbl/main.cc, tfmtodit/tfmtodit.cc,
+	troff/input.cc, pfbtops/pfbtops.c: Use it.
+
+2000-01-10  Fabrizio Polacco  <fab@prosa.it>
+
+	Add a revision scheme to the groff package.
+
+	* REVISION: New file.
+	* libgroff/Makefile.sub (version.cc): Use it to define
+	`revision_string[]'.
+	* grops/psrm.cc: Use revision_string (converted to an unsigned
+	integer) in constructor of resource_manager.
+
+2000-01-10  Bruno Haible  <haible@clisp.cons.org>
+
+	* devutf8/Makefile.sub, devutf8/DESC.proto, devutf8/R.proto: New
+	files.
+	* Makefile.in (DEVDIRS): Add devutf8.
+	* grotty/tty.cc: Include device.h.
+	(glyph): Change type of `code' to `unsigned int'.
+	(tty_printer): New field is_utf8.  Constructor takes device argument.
+	(tty_printer::tty_printer): If device if `utf8', set is_utf8.
+	(tty_printer::add_char): Change type of first arg to `unsigned int'.
+	(tty_printer::put_char): New function.
+	(tty_printer::end_page): Use put_char() instead of ::putchar().
+	(make_printer): Pass device to tty_printer constructor.
+	* nroff.sh: Determine default device by calling 'locale'.  As a
+	fallback, look at all of $LC_ALL, $LC_CTYPE, $LANG, $LESSCHARSET.
+	Recognize UTF-8 locales.
+	* tmac/eqnrc: Recognize utf8 like latin1.
+	* tmac/troffrc: Device utf8 needs tmac.tty.
+
+2000-01-07  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/Makefile.sub: tmac.a4 and tmac.trace will now be installed.
+
+2000-01-07  Paul Eggert  <eggert@twinsun.com>
+
+	Add a new predefined writeable number register, `year',
+	which contains the current year.
+
+	* doc/groff.texinfo, PROBLEMS, troff/troff.man: Document it.
+	* tmac/tmac.s: Use it.
+	* troff/input.cc (init_registers): Initialize it.
+
+2000-01-06  Werner LEMBERG  <wl@gnu.org>
+
+	* PROBLEMS: Fixed typo.
+
+2000-01-04  Paul Eggert  <eggert@twinsun.com>
+
+	* PROBLEMS: Add Y2k advice for the yr number register.
+
+2000-01-03  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/groff.texinfo: Fix Y2k bug in documentation of \n(yr.
+
+2000-01-02  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.arkup: Slight modification of macros to provide better
+	appearance for non-HTML formats.
+
+2000-01-01  Charles Levert  <charles@comm.polymtl.ca>
+
+	* soelim/soelim.cc (include_path_append): realloc(NULL, n)
+	does not automatically translate to malloc(n) on all OSes
+	(e.g., SunOS) so do it explicitly.  Also, check the returned
+	value.
+
+2000-01-01  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/tmac.arkup: Added .LINE macro.  Some formatting.
+
+	* Makefile.in: Added $(tmac_m) again since the Makefile in `mm'
+	expects this variable
+
+2000-01-01  Gaius Mulley <gaius@glam.ac.uk>
+
+	* doc/Makefile: Added instructions to create HTML and text
+	versions of some files.
+
+1999-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	* Updated INSTALL.gen.
+
+	* tmac/tmac.arkup: Added fixes so that .FTP and .MAILTO works
+	better resp. correctly with non-HTML devices.
+
 Version 1.15 released
 =====================
 
@@ -552,16 +1932,16 @@ Sat Jun 10 12:28:16 1995  James Clark  <jjc@jclark.com>
 Thu May 11 01:07:16 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
 
 	* addftinfo/addftinfo.cc, eqn/delim.cc, eqn/lex.cc, eqn/list.cc,
-        grodvi/dvi.cc, groff/groff.cc, grops/ps.cc, grops/psrm.cc,
-        grotty/tty.cc, include/ptable.h indxbib/indxbib.cc,
-        libbib/index.cc, libbib/linear.cc, libbib/search.cc,
-        libdriver/input.cc, libdriver/printer.cc, libgroff/font.cc,
-        libgroff/lf.cc, libgroff/nametoindex.cc, libgroff/ptable.cc,
-        libgroff/string.cc, lkbib/lkbib.cc, lookbib/lookbib.cc,
-        pic/lex.cc, pic/object.cc, pic/pic.y refer/label.y refer/ref.cc,
-        refer/refer.cc, refer/token.cc, tbl/main.cc, tbl/table.cc,
-        tfmtodit/tfmtodit.cc, troff/dictionary.cc, troff/div.cc,
-        troff/env.cc, troff/input.cc, troff/node.cc, troff/symbol.cc:
+	grodvi/dvi.cc, groff/groff.cc, grops/ps.cc, grops/psrm.cc,
+	grotty/tty.cc, include/ptable.h indxbib/indxbib.cc,
+	libbib/index.cc, libbib/linear.cc, libbib/search.cc,
+	libdriver/input.cc, libdriver/printer.cc, libgroff/font.cc,
+	libgroff/lf.cc, libgroff/nametoindex.cc, libgroff/ptable.cc,
+	libgroff/string.cc, lkbib/lkbib.cc, lookbib/lookbib.cc,
+	pic/lex.cc, pic/object.cc, pic/pic.y refer/label.y refer/ref.cc,
+	refer/refer.cc, refer/token.cc, tbl/main.cc, tbl/table.cc,
+	tfmtodit/tfmtodit.cc, troff/dictionary.cc, troff/div.cc,
+	troff/env.cc, troff/input.cc, troff/node.cc, troff/symbol.cc:
 	Fix 'for' scoping.
 
 Wed Apr 19 21:15:11 1995  James Clark  <jjc@jclark.com>
@@ -1082,7 +2462,7 @@ Thu May 27 20:04:59 1993  James Clark  (jjc@jclark.com)
 	functions that are later declared as inline.  Don't include inline
 	specifier in friend declaration.
 
-        * libgroff/lib.h: Declare popen and pclose.
+	* libgroff/lib.h: Declare popen and pclose.
 	* acgroff.m4 (GROFF_POPEN): New macro.
 	* configure.in: Call it.
 
@@ -1176,7 +2556,7 @@ Wed Apr 21 08:47:32 1993  James Clark  (jjc at jclark.com)
 	(file_iterator::~file_iterator, file_iterator::next_file): Use
 	file_iterator::close.
 	(file_iterator::backtrace): Say `process' rather than `file' when
-        the stream is popened.
+	the stream is popened.
 	(pipe_source): New function.
 	(init_input_requests): Bind ".pso" to pipe_source.
 
diff --git a/contrib/groff/FDL b/contrib/groff/FDL
new file mode 100644
index 000000000000..79aa3726f8df
--- /dev/null
+++ b/contrib/groff/FDL
@@ -0,0 +1,358 @@
+		GNU Free Documentation License
+		   Version 1.1, March 2000
+
+ Copyright (C) 2000  Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document "free" in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially.  Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License.  The "Document", below, refers to any
+such manual or work.  Any member of the public is a licensee, and is
+addressed as "you".
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent.  A copy that is
+not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification.  Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols.  If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has less than five).
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section entitled "History", and its title, and add to
+   it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. In any section entitled "Acknowledgements" or "Dedications",
+   preserve the section's title, and preserve in the section all the
+   substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+   or to conflict in title with any Invariant Section.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled "History"
+in the various original documents, forming one section entitled
+"History"; likewise combine any sections entitled "Acknowledgements",
+and any sections entitled "Dedications".  You must delete all sections
+entitled "Endorsements."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation.  Such a compilation is called an "aggregate", and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License provided that you also include the
+original English version of this License.  In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns. See
+http:///www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.1
+      or any later version published by the Free Software Foundation;
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+      A copy of the license is included in the section entitled "GNU
+      Free Documentation License".
+
+If you have no Invariant Sections, write "with no Invariant Sections"
+instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of
+"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+
diff --git a/contrib/groff/INSTALL b/contrib/groff/INSTALL
index a27d5a3aff79..0465f4e5890e 100644
--- a/contrib/groff/INSTALL
+++ b/contrib/groff/INSTALL
@@ -2,6 +2,9 @@ To install groff, follow the instructions in the file INSTALL.gen.
 
 This file contains information that supplements those instructions.
 
+(For instructions how to build groff with DJGPP tools for MS-DOS and
+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
 to handle this.  If you don't already have a C++ compiler, I suggest
@@ -22,14 +25,15 @@ files.)  The test-groff script sets up environment variables to allow
 groff to run without being installed.  The current directory must be
 the build directory when the script is run.  For example, you could do
 
-  ./test-groff -man -Tascii groff/groff.n | less
+  ./test-groff -man -Tascii src/roff/groff/groff.n | less
 
-If you want to install gxditview (an X11 previewer), follow the
-instructions in the INSTALL file in the xditview directory.
+If you want to compile and install gxditview (an X11 previewer),
+follow the instructions in the INSTALL file in the src/xditview
+subdirectory.
 
-To get PostScript versions of the documentation resp. reference files for
-the `me' macros and the `pic' preprocessor, simply say `make' in the
-`doc' subdirectory.
+To get PostScript versions of the documentation resp. reference files
+for the `me' macros and the `pic' preprocessor, simply say `make' in
+the `doc' subdirectory.
 
 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/INSTALL.gen b/contrib/groff/INSTALL.gen
index 95d84c820fb8..50dbe439d099 100644
--- a/contrib/groff/INSTALL.gen
+++ b/contrib/groff/INSTALL.gen
@@ -95,6 +95,11 @@ give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
@@ -162,7 +167,9 @@ operates.
 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
 
 `--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
diff --git a/contrib/groff/MORE.STUFF b/contrib/groff/MORE.STUFF
new file mode 100644
index 000000000000..ef29efc7dc65
--- /dev/null
+++ b/contrib/groff/MORE.STUFF
@@ -0,0 +1,89 @@
+More stuff for groff
+====================
+
+win32
+-----
+
+Here two ports using the gcc compiler and other GNU tools:
+
+  Thomer M. Gil <tmgil@cs.vu.nl>:
+
+    http://www.cs.vu.nl/~tmgil/misc/wingroff.html
+
+  Kees Zeelenberg <c.zeelenberg@hccnet.nl>:
+
+    ftp://ftp.franken.de/pub/win32/develop/gnuwin32/
+          cygwin/porters/Zeelenberg_Kees/B20/index.html
+
+dos
+---
+
+Binaries for Eli Zaretskii's port using the djgpp compiler
+are available from
+
+  ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/gro*b.zip
+
+and its mirrors; for installation details please read `arch/djgpp/README'.
+
+grap
+----
+
+An implementation of Kernighan & Bentley's grap language for typesetting
+graphs.  Written by Ted Faber <faber@lunabase.org>.  The actual version
+can be found at 
+
+  http://www.lunabase.org/~faber/Vault/software/grap/
+
+plot2dev
+--------
+
+This utility program can convert plot graphics to either pic or gremlin
+files.  It has been written by Richard Murphey <richard-murphey@rice.edu>
+and Daniel Senderowicz <daniel@synchrods.com> (who has added the gremlin
+driver).  The actual version can be found as
+
+  ftp://ftp.ffii.org/pub/groff/plot2dev-x.x.tar.gz
+
+miscellaneous
+-------------
+
+. Dr. Robert Hermann's groff gems are available from
+
+    http://www.eas.slu.edu/People/RBHerrmann/GROFF/index.html
+
+  At present there are examples for
+
+  o creating business cards
+  o using groff to make large format posters for presentations
+
+. Robert Marks's collection of useful macros and scripts is available from
+
+    http://www.agsm.edu.au/~bobm/odds+ends/scripts.html
+
+  Description:
+
+  o `polish': Is a sed (= the Unix stream editor) script that does many
+    things to ASCII text.  Amongst other things, it breaks lines at new
+    sentences, reduces upper-case acronyms by one point size, adds
+    diacriticals, changes simple quotes into smart quotes, and makes a few
+    simple grammar checks.  The best way to see what it does is to run it as
+    a sed script file (or files) on a text file and then compare the output
+    file with the original.
+
+  o `DropCaps' is a troff script which replaces the initial letters of
+    paragraphs immediately after H1 and H2 headings with drop-capitals of
+    specified point size, and automatically flows the text around the new
+    drop cap.
+
+  o `AJM Header' is a set of troff macros used in production of the
+    Australian Journal of Management.  They use the Memorandum Macros (mm)
+    of AT&T, and so should be invoked with the UNIX troff -mm flag; they
+    should also work with the GNU troff -mm flag.
+
+documentation
+-------------
+
+Many documents related to the original versions of troff, ditroff, pic, and
+others can be accessed from the following web page:
+
+  http://www.cs.bell-labs.com/cm/cs/cstr.html
diff --git a/contrib/groff/Makefile b/contrib/groff/Makefile
index 5e09c198414b..024f48699bda 100644
--- a/contrib/groff/Makefile
+++ b/contrib/groff/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
diff --git a/contrib/groff/Makefile.ccpg b/contrib/groff/Makefile.ccpg
index ff774ddf3a04..02b5d66bc9a6 100644
--- a/contrib/groff/Makefile.ccpg
+++ b/contrib/groff/Makefile.ccpg
@@ -1,6 +1,10 @@
 # Makefile.ccpg
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.ccpg $(srcdir)/Makefile.dep
+MAKEFILEPARTS=\
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.ccpg \
+  Makefile.dep
 
 all: $(PROG) $(MANPAGES)
 
@@ -18,6 +22,9 @@ distfiles: $(YTABC)
 TAGS: TAGS_src
 TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 
 pure: $(PROG).pure
 
diff --git a/contrib/groff/Makefile.comm b/contrib/groff/Makefile.comm
index 01f6dd37f28c..b6cb4eb617c2 100644
--- a/contrib/groff/Makefile.comm
+++ b/contrib/groff/Makefile.comm
@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -20,17 +20,17 @@
 # Makefile.comm
 #
 SHELL=/bin/sh
-INCLUDES=-I. -I$(srcdir) -I../include -I$(srcdir)/../include
+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
-ALL_CFLAGS=$(CDEFINES) $(CFLAGS) $(CPPFLAGS)
+ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
 COMPILE.c=$(CC) $(ALL_CFLAGS)  -c
 LINK.cc=$(CCC) $(CCFLAGS) $(LDFLAGS)
 LINK.c=$(CC) $(CFLAGS) $(LDFLAGS)
-TOP=..
-LIBGROFF=$(TOP)/libgroff/libgroff.a
-LIBBIB=$(TOP)/libbib/libbib.a
-LIBDRIVER=$(TOP)/libdriver/libdriver.a
+LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.a
+LIBBIB=$(top_builddir)/src/libs/libbib/libbib.a
+LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.a
 MLIB=
 XLIBS=
 YTABH=
@@ -41,7 +41,7 @@ CLEANADD=
 MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \
   depend.temp core y.output $(CLEANADD)
 CLEANFILES=$(LIBCLEAN)
-DISTCLEANFILES=TAGS Makefile
+DISTCLEANFILES=TAGS Makefile Makefile.dep
 REALCLEANFILES=$(YTABC) $(YTABH)
 NAMEPREFIX=
 HDRS=
@@ -51,15 +51,22 @@ fontsubdir=$(fontdir)/dev$(DEV)
 
 all install install_bin install_data TAGS depend distfiles uninstall_sub:
 
-install: install_bin install_data
+install: prefix_must_exist install_bin install_data
 uninstall: uninstall_sub
 pure:
 
 .PHONY: all clean distclean mostlyclean realclean extraclean depend distfiles
-.PHONY: install install_bin install_data
+.PHONY: install install_bin install_data prefix_must_exist
 .PHONY: uninstall uninstall_sub
 .PHONY: pure
 
+prefix_must_exist:
+	@test -d $(prefix) \
+	  || (echo ; \
+	      echo The prefix directory \`$(prefix)\' doesn\'t exist; \
+	      echo ; \
+	      exit 1)
+
 mostlyclean:
 	-rm -f $(MOSTLYCLEANFILES)
 
@@ -92,47 +99,53 @@ extraclean:
 	else \
 	  $(YACC) $(YACCFLAGS) $<; \
 	fi
-	mv y.tab.c $@
+	-test -f y.tab.h && mv y.tab.h y_tab.h
+	-test -f y.tab.c && mv y.tab.c y_tab.c
+	mv y_tab.c $@
 # Avoid ending up with two versions of $(YTABH).
 	if test -n "$(YTABH)"; then \
 	  if test -f $(srcdir)/$(YTABH); then \
 	    rm -f $(YTABH); \
-	    mv y.tab.h $(srcdir)/$(YTABH); \
+	    mv y_tab.h $(srcdir)/$(YTABH); \
 	  else \
-	    mv y.tab.h $(YTABH); \
+	    mv y_tab.h $(YTABH); \
 	  fi; \
 	fi
 
+version=`cat $(top_srcdir)/VERSION`
+# No additional number for the groff archive if revision is zero
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
+
 .man.n:
 	@echo Making $@ from $<
 	@-rm -f $@
-	@sed -e "s;@FONTDIR@;$(fontdir);g" \
-	-e "s;@FONTPATH@;$(fontpath);g" \
-	-e "s;@MACRODIR@;$(tmacdir);g" \
-	-e "s;@MACROPATH@;$(tmacpath);g" \
-	-e "s;@DEVICE@;$(DEVICE);g" \
-	-e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
-	-e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
-	-e "s;@INDEX_SUFFIX@;$(indexext);g" \
-	-e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
-	-e "s;@MAN1EXT@;$(man1ext);g" \
-	-e "s;@MAN5EXT@;$(man5ext);g" \
-	-e "s;@MAN7EXT@;$(man7ext);g" \
-	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
-	-e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
-	-e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
-	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
-	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
-	-e "s;@VERSION@;`cat $(srcdir)/../VERSION`;g" \
-	-e "s;@MDATE@;`$(SHELL) $(srcdir)/../mdate.sh $<`;g" \
-	-e "s;@g@;$(g);g" \
-	-e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
+	@sed -e "s|@FONTDIR@|$(fontdir)|g" \
+	-e "s|@FONTPATH@|$(fontpath)|g" \
+	-e "s|@MACRODIR@|$(tmacdir)|g" \
+	-e "s|@MACROPATH@|$(tmacpath)|g" \
+	-e "s|@DEVICE@|$(DEVICE)|g" \
+	-e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
+	-e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
+	-e "s|@INDEX_SUFFIX@|$(indexext)|g" \
+	-e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
+	-e "s|@MAN1EXT@|$(man1ext)|g" \
+	-e "s|@MAN5EXT@|$(man5ext)|g" \
+	-e "s|@MAN7EXT@|$(man7ext)|g" \
+	-e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \
+	-e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \
+	-e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \
+	-e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
+	-e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
+	-e "s|@VERSION@|$(version)$(revision)|g" \
+	-e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+	-e "s|@g@|$(g)|g" \
+	-e "s!@G@!`echo $(g) | tr [a-z] [A-Z]`!g" \
 	$< >$@
 
 .PHONY: install_man
 install_man:
-	-test -d $(manroot) || mkdir $(manroot)
-	-test -d $(man1dir) || mkdir $(man1dir)
+	-test -d $(manroot) || $(mkinstalldirs) $(manroot)
+	-test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
 	 prog=`basename $$p .n`; \
@@ -141,7 +154,7 @@ install_man:
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man5dir) || mkdir $(man5dir)
+	-test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
 	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
@@ -149,7 +162,7 @@ install_man:
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man7dir) || mkdir $(man7dir)
+	-test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
 	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
@@ -181,7 +194,7 @@ uninstall_man:
 
 .PHONY: install_prog
 install_prog:
-	-test -d $(bindir) || mkdir $(bindir)
+	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
 	rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
 	$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
 
@@ -191,12 +204,13 @@ uninstall_prog:
 
 .PHONY: install_dev
 install_dev:
-	-test -d $(datadir) || mkdir $(datadir)
-	-test -d $(datasubdir) || mkdir $(datasubdir)
-	-test -d $(fontdir) || mkdir $(fontdir)
-	-test -d $(fontsubdir) || mkdir $(fontsubdir)
+	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
+	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
+	-test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
+	-test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
 	-if test -d $(srcdir)/generate; then \
-	  test -d $(fontsubdir)/generate || mkdir $(fontsubdir)/generate; \
+	  test -d $(fontsubdir)/generate || \
+	    $(mkinstalldirs) $(fontsubdir)/generate; \
 	fi
 	-for f in $(DEVFILES); do \
 	  rm -f $(fontsubdir)/$$f; \
@@ -226,8 +240,8 @@ depend.temp: FORCE
 	test -z "$(CSRCS)" \
 	  || $(CC) $(ALL_CFLAGS) -MM $(CSRCS) >>depend.temp
 	if test -n "$(YTABH)"; then \
-	  sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend.temp1; \
-	  mv depend.temp1 depend.temp; \
+	  sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend1.temp; \
+	  mv depend1.temp depend.temp; \
 	fi
 
 .PHONY: TAGS_src
diff --git a/contrib/groff/Makefile.cpg b/contrib/groff/Makefile.cpg
index 1b9f66f0da3c..4cb514f4c79a 100644
--- a/contrib/groff/Makefile.cpg
+++ b/contrib/groff/Makefile.cpg
@@ -1,6 +1,10 @@
 # Makefile.cpg
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.cpg $(srcdir)/Makefile.dep
+MAKEFILEPARTS=\
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.cpg \
+  Makefile.dep
 
 all: $(PROG) $(MANPAGES)
 
@@ -18,3 +22,6 @@ distfiles: $(YTABC)
 TAGS: TAGS_src
 TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION
diff --git a/contrib/groff/Makefile.in b/contrib/groff/Makefile.in
index dd0ef84a9738..9856aabe8911 100644
--- a/contrib/groff/Makefile.in
+++ b/contrib/groff/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -48,6 +48,10 @@ BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@
 # DEVICE is the default device.
 DEVICE=ps
 
+# TTYDEVDIRS is either `font/devascii font/devlatin1 font/devutf8' (for
+# ASCII) or `font/devcp1047' (for EBCDIC).
+TTYDEVDIRS=@TTYDEVDIRS@
+
 # PSPRINT is the command to use for printing a PostScript file,
 # for example `lpr'.
 PSPRINT=@PSPRINT@
@@ -74,7 +78,7 @@ exec_prefix=@exec_prefix@
 bindir=$(exec_prefix)/bin
 
 # datasubdir says where to install data files
-datadir=$(prefix)/share
+datadir=@datadir@
 datasubdir=$(datadir)/groff
 
 # fontdir says where to install dev*/*.
@@ -103,13 +107,13 @@ tmac_wrap=@tmac_wrap@
 # Don't make this empty.
 tmac_prefix=g
 
-# The groff -mm macros will be available as -m($(tmac_m_prefix)m.
+# The groff -mm macros will be available as -m$(tmac_m_prefix)m.
 tmac_m_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in m) echo $(tmac_prefix);; esac; done`
-# The groff -ms macros will be available as -m($(tmac_m_prefix)s.
+# The groff -ms macros will be available as -m$(tmac_s_prefix)s.
 tmac_s_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in s) echo $(tmac_prefix);; esac; done`
-# The groff -man macros will be available as -m($(tmac_m_prefix)an.
+# The groff -man macros will be available as -m$(tmac_an_prefix)an.
 tmac_an_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in an) echo $(tmac_prefix);; esac; done`
 
@@ -131,7 +135,7 @@ indexname=Ind
 common_words_file=$(datasubdir)/eign
 
 # manroot is the root of the man page directory tree.
-manroot=$(prefix)/man
+manroot=@mandir@
 
 # man1ext is the man section for user commands.
 man1ext=1
@@ -160,25 +164,32 @@ man7dir=$(manroot)/man$(man7ext)
 # -DHAVE_CC_LIMITS_H		if you have a C++ <limits.h>
 # -DHAVE_SYS_DIR_H		if you have <sys/dir.h>
 # -DHAVE_STDLIB_H		if you have <stdlib.h>
+# -DHAVE_STRINGS_H		if you have <strings.h>
 # -DHAVE_RENAME			if you have rename()
 # -DHAVE_MKSTEMP		if you have mkstemp()
-# -DSTDLIB_H_DECLARES_GETOPT	if your C++ <stdlib.h> declares getopt()
-# -DUNISTD_H_DECLARES_GETOPT	if your C++ <unistd.h> declares getopt()
-# -DSTDLIB_H_DECLARES_PUTENV	if your C++ <stdlib.h> declares putenv()
-# -DSTDIO_H_DECLARES_POPEN	if your C++ <stdio.h> declares popen()
-# -DSTDIO_H_DECLARES_PCLOSE	if your C++ <stdio.h> declares pclose()
+# -DHAVE_STRDUP			if you have strdup()
+# -DHAVE_STRSEP			if you have strsep()
+# -DHAVE_STRCASECMP		if you have strcasecmp()
+# -DNEED_DECLARATION_HYPOT	if your C++ <math.h> doesn't declare hypot()
+# -DNEED_DECLARATION_PUTENV	if your C++ <stdlib.h> doesn't declare putenv()
+# -DNEED_DECLARATION_POPEN	if your C++ <stdio.h> doesn't declare popen()
+# -DNEED_DECLARATION_PCLOSE	if your C++ <stdio.h> doesn't declare pclose()
+# -DNEED_DECLARATION_STRNCASECMP
+#				if your C++ <string.h> doesn't declare
+#				strncasecmp()
+# -DRET_TYPE_SRAND_IS_VOID	if your srand() returns void or int
 # -DHAVE_SYS_NERR		if you have sysnerr in <errno.h> or <stdio.h>
 # -DHAVE_SYS_ERRLIST		if you have sys_errlist in <errno.h> or
 #				<stdio.h>
-# -DMATH_H_DECLARES_HYPOT	if you have hypot() in <math.h>
 # -DTRADITIONAL_CPP		if your C++ compiler uses a traditional
 #				(Reiser) preprocessor
 # -DLONG_FOR_TIME_T		if localtime() takes a long * not a time_t *
 # -DHAVE_STRUCT_EXCEPTION	if <math.h> defines struct exception
 # -DRETSIGTYPE=int		if signal handlers return int not void	
+# -DIS_EBCDIC_HOST		if the host's encoding is EBCDIC
 DEFINES=@DEFS@
 
-# Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o  in LIBOBJS if
+# Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if
 # your C library is missing the corresponding function.
 LIBOBJS=@LIBOBJS@
 
@@ -201,6 +212,7 @@ LIBM=@LIBM@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
 INSTALL_DATA=@INSTALL_DATA@
 LN_S=@LN_S@
 AR=ar
@@ -212,8 +224,14 @@ ETAGSCCFLAG=-C
 PERLPATH=@PERLPATH@
 # Sed command with which to edit sh scripts.
 SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@
-srcdir = @srcdir@
-VPATH = @srcdir@
+
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH=@srcdir@
+top_builddir=@top_builddir@
+
+# the program to create directory hierarchies
+mkinstalldirs=$(top_srcdir)/mkinstalldirs
 
 PURIFY=purify
 PURIFYCCFLAGS=
@@ -223,123 +241,238 @@ PURIFYCCFLAGS=
 # Passing down MAKEOVERRIDES prevents $(MAKE) from containing a second
 # 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)" "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
-  "DEVICE=$(DEVICE)" "PSPRINT=$(PSPRINT)" "DVIPRINT=$(DVIPRINT)" \
-  "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "bindir=$(bindir)" \
-  "g=$(g)" "datadir=$(datadir)" "datasubdir=$(datasubdir)" \
-  "fontdir=$(fontdir)" "fontpath=$(fontpath)" \
-  "tmacdir=$(tmacdir)" "tmacpath=$(tmacpath)" \
-  "indexext=$(indexext)" "indexdir=$(indexdir)" \
-  "indexname=$(indexname)" "common_words_file=$(common_words_file)" \
-  "manroot=$(manroot)" "man1ext=$(man1ext)" "man1dir=$(man1dir)" \
-  "man5ext=$(man5ext)" "man5dir=$(man5dir)" \
-  "man7ext=$(man7ext)" "man7dir=$(man7dir)" \
-  "tmac_wrap=$(tmac_wrap)" "sys_tmac_prefix=$(sys_tmac_prefix)" \
+MDEFINES= \
+  "MAKEOVERRIDES=$(MAKEOVERRIDES)" \
+  "PAGE=$(PAGE)" \
+  "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
+  "DEVICE=$(DEVICE)" \
+  "TTYDEVDIRS=$(TTYDEVDIRS)" \
+  "PSPRINT=$(PSPRINT)" \
+  "DVIPRINT=$(DVIPRINT)" \
+  "top_srcdir=$(top_srcdir)" \
+  "top_builddir=$(top_builddir)" \
+  "prefix=$(prefix)" \
+  "exec_prefix=$(exec_prefix)" \
+  "bindir=$(bindir)" \
+  "g=$(g)" \
+  "datadir=$(datadir)" \
+  "datasubdir=$(datasubdir)" \
+  "fontdir=$(fontdir)" \
+  "fontpath=$(fontpath)" \
+  "tmacdir=$(tmacdir)" \
+  "tmacpath=$(tmacpath)" \
+  "indexext=$(indexext)" \
+  "indexdir=$(indexdir)" \
+  "indexname=$(indexname)" \
+  "common_words_file=$(common_words_file)" \
+  "manroot=$(manroot)" \
+  "man1ext=$(man1ext)" \
+  "man1dir=$(man1dir)" \
+  "man5ext=$(man5ext)" \
+  "man5dir=$(man5dir)" \
+  "man7ext=$(man7ext)" \
+  "man7dir=$(man7dir)" \
+  "mkinstalldirs=$(mkinstalldirs)" \
+  "tmac_wrap=$(tmac_wrap)" \
+  "sys_tmac_prefix=$(sys_tmac_prefix)" \
   "tmac_an_prefix=$(tmac_an_prefix)" \
-  "tmac_s_prefix=$(tmac_s_prefix)" "tmac_m_prefix=$(tmac_m_prefix)" \
-  "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_DATA=$(INSTALL_DATA)" \
-  "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_m_prefix=$(tmac_m_prefix)" \
+  "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)" \
+  "ETAGS=$(ETAGS)" \
+  "ETAGSFLAGS=$(ETAGSFLAGS)" \
+  "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
+  "PERLPATH=$(PERLPATH)" \
+  "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
+  "PURIFY=$(PURIFY)" \
+  "PURIFYCCFLAGS=$(PURIFYCCFLAGS)"
 
 SHELL=/bin/sh
-INCDIRS=include
-LIBDIRS=libgroff libdriver libbib
-CCPROGDIRS=groff troff tbl pic eqn grops grotty grodvi tfmtodit \
-  grolj4 hpftodit refer lookbib indxbib lkbib soelim addftinfo \
-  grohtml
-CPROGDIRS=pfbtops psbb
+INCDIRS=src/include
+LIBDIRS=\
+  src/libs/libgroff \
+  src/libs/libdriver \
+  src/libs/libbib
+CCPROGDIRS=\
+  src/roff/groff \
+  src/roff/troff \
+  src/preproc/tbl \
+  src/preproc/pic \
+  src/preproc/eqn \
+  src/preproc/grn \
+  src/preproc/refer \
+  src/preproc/soelim \
+  src/devices/grops \
+  src/devices/grotty \
+  src/devices/grodvi \
+  src/devices/grolj4 \
+  src/devices/grohtml \
+  src/devices/grolbp \
+  src/utils/tfmtodit \
+  src/utils/hpftodit \
+  src/utils/lookbib \
+  src/utils/indxbib \
+  src/utils/lkbib \
+  src/utils/addftinfo
+CPROGDIRS=src/utils/pfbtops
 PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS)
-DEVDIRS=devps devdvi devascii devlatin1 devX75 devX75-12 devX100 devX100-12 \
-  devlj4 devhtml
-OTHERDIRS=man tmac afmtodit grog nroff mm
-ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDIRS)
-EXTRADIRS=devps/generate devdvi/generate xditview doc
-DISTDIRS=$(ALLDIRS) $(EXTRADIRS)
+DEVDIRS=\
+  font/devps \
+  font/devdvi \
+  font/devX75 \
+  font/devX75-12 \
+  font/devX100 \
+  font/devX100-12 \
+  font/devlj4 \
+  font/devhtml \
+  font/devlbp
+ALLTTYDEVDIRS=\
+  font/devascii \
+  font/devlatin1 \
+  font/devutf8 \
+  font/devcp1047
+OTHERDIRS=\
+  man \
+  tmac \
+  src/utils/afmtodit \
+  src/roff/grog \
+  src/roff/nroff \
+  contrib/mm
+ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+  $(DEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+EXTRADIRS=\
+  font/devps/generate \
+  font/devdvi/generate \
+  src/xditview \
+  doc
+DISTDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+  $(DEVDIRS) $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS)
 TARGETS=all install install_bin install_data clean distclean mostlyclean \
   realclean extraclean distfiles TAGS depend uninstall_sub
 
+# This ENVSETUP gork is required by the DJGPP build on Windows 9X,
+# where Make needs to be case-sensitive to find files like BI and VERSION.
+ENVSETUP=\
+	if test -f $(srcdir)/makefile.ccpg* && \
+	   test -f $(srcdir)/Makefile.ccpg*; \
+	then FNCASE=y; export FNCASE; \
+	else :; \
+	fi
+
 do=all
 dodirs=$(ALLDIRS) dot
 # Default target for subdir_Makefile
-subdir=troff
+subdir=src/roff/troff
 
 
 $(TARGETS):
-	@$(MAKE) $(MDEFINES) do=$@ $(dodirs)
+	@$(ENVSETUP); $(MAKE) $(MDEFINES) do=$@ $(dodirs)
 
 dot: FORCE
-	@$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
-		-f $(srcdir)/Makefile.comm -f $(srcdir)/Makefile.sub $(do)
+	@$(ENVSETUP); \
+	$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $(top_srcdir)/Makefile.sub $(do)
 
 $(LIBDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
-	        -f $$srcdir/../Makefile.lib -f $$srcdir/Makefile.dep $(do)
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.lib \
+	  -f Makefile.dep $(do)
 
 $(CPROGDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
-	        -f $$srcdir/../Makefile.cpg -f $$srcdir/Makefile.dep $(do)
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.cpg \
+	  -f Makefile.dep $(do)
 
 $(CCPROGDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
-	        -f $$srcdir/../Makefile.ccpg -f $$srcdir/Makefile.dep $(do)
-
-$(DEVDIRS): FORCE
-	@if test $(srcdir) = .; \
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.ccpg \
+	  -f Makefile.dep $(do)
+
+$(DEVDIRS) $(TTYDEVDIRS): FORCE
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
-		-f $$srcdir/../Makefile.dev $(do)
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.dev $(do)
 
 $(INCDIRS) $(OTHERDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
-	        -f $$srcdir/../Makefile.man $(do)
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.man $(do)
 
-version=`cat $(srcdir)/VERSION`
+version=`cat $(top_srcdir)/VERSION`
+# No additional number for the groff archive if revision is zero
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 
 .PHONY: dist
 dist:
 	-rm -fr tmp
+	rm -f groff-$(version)$(revision).tar.gz
+	rm -f src/xditview/Imakefile;
 	mkdir tmp
 	for d in $(DISTDIRS); do \
-	  mkdir	tmp/$$d; \
+	  $(mkinstalldirs) tmp/$$d; \
 	done
 	srcdir=`cd $(srcdir); pwd`; \
 	cd tmp; \
@@ -354,10 +487,10 @@ dist:
 	done; \
 	rm -f Makefile; \
 	$(LN_S) $$srcdir/Makefile.init Makefile
-	mv tmp groff-$(version)
-	rm -f groff-$(version).tar.gz
-	tar cfh - groff-$(version) | gzip -c >groff-$(version).tar.gz
-	rm -fr groff-$(version)
+	mv tmp groff-$(version)$(revision)
+	tar cfh - groff-$(version)$(revision) | \
+	  gzip -c >groff-$(version)$(revision).tar.gz
+	rm -fr groff-$(version)$(revision)
 
 # $(PROGDIRS): libgroff
 # grops grotty grodvi: libdriver
@@ -375,14 +508,6 @@ Makefile.cfg: Makefile
 	  echo "$$var" >>Makefile.cfg; \
 	done
 
-depend: srcdir_must_be_dot
-
-.PHONY: srcdir_must_be_dot
-srcdir_must_be_dot:
-	@test "X$(srcdir)" = "X." \
-	  || (echo This target can only be made in the source directory; \
-	      exit 1)
-
 Makefile: Makefile.in
 	$(SHELL) config.status
 
diff --git a/contrib/groff/Makefile.init b/contrib/groff/Makefile.init
index 5e09c198414b..024f48699bda 100644
--- a/contrib/groff/Makefile.init
+++ b/contrib/groff/Makefile.init
@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
diff --git a/contrib/groff/Makefile.lib b/contrib/groff/Makefile.lib
index 019ba6af2105..8861360e9638 100644
--- a/contrib/groff/Makefile.lib
+++ b/contrib/groff/Makefile.lib
@@ -1,6 +1,10 @@
 LIBCLEAN=lib$(LIB).a
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.lib $(srcdir)/Makefile.dep
+MAKEFILEPARTS=\
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.lib \
+  Makefile.dep
 
 all: lib$(LIB).a
 
@@ -12,3 +16,5 @@ depend: depend_src
 depend.temp: $(GENSRCS)
 TAGS: $(CCSRCS) $(CSRCS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep
diff --git a/contrib/groff/Makefile.man b/contrib/groff/Makefile.man
index 59378de01274..2fecd115fb3a 100644
--- a/contrib/groff/Makefile.man
+++ b/contrib/groff/Makefile.man
@@ -2,3 +2,4 @@ all: $(MANPAGES)
 install_data: install_man
 install_man: $(MANPAGES)
 uninstall_sub: uninstall_man
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION
diff --git a/contrib/groff/NEWS b/contrib/groff/NEWS
index 243cbfb4ee6f..855a2689e66d 100644
--- a/contrib/groff/NEWS
+++ b/contrib/groff/NEWS
@@ -1,6 +1,177 @@
 This file describes recent user-visible changes in groff.  Bug fixes
 are not described.  There are more details in the man pages.
 
+VERSION 1.16.1
+==============
+
+Bug fixes only; no user-visible changes.
+
+VERSION 1.16
+============
+
+Groff
+-----
+
+The anachronism of calling the man macro package with `-man' has been fixed;
+now you can say `-m man' also. The same is true for `ms', `me', `markup',
+`mandoc', and `mdoc'.
+
+A new switch `-g' for calling `grn' is available.
+
+A new switch `-G' for calling `grap' is available.
+
+EBCDIC support for tty devices has been added.  On such hosts, IBM code page
+1047 is available with -Tcp1047 instead of -Tascii and -Tlatin1 (and, for
+the moment, -Tutf8).  Note that non-tty devices are not yet supported (but
+installed).
+
+Troff
+-----
+
+A new command line option to the `man' macros is available: `-rSxx' (with
+`xx' either 10, 11, or 12) to set the base document font size to `xx'
+points.  Additionally, `.SH' now produces larger headings than `.SS'.
+
+To solve a problem with the .PSPIC macro which needs the `-U' switch of
+troff to access an external program (psbb), a new request .psbb is now
+available to get the bounding box of a PostScript image file.  The values
+(in PostScript units) are returned in the new read-only number registers
+`llx', `lly', `urx', and `ury'.  Consequently, .PSPIC has been adapted to
+use the new request, and the psbb program has been removed.
+
+A new predefined writable number register, `year', has been added.  It
+contains the current year.
+
+A new read-only register, `.Y', has been added.  It contains the revision
+number of the groff package.
+
+`\fP' now behaves as expected in situations like the following where the
+font `foo' is undefined:
+
+  .B bold text
+  normal text \f[foo]bar\fP normal text
+
+Previously, the text after \fP appeared as bold.
+
+The `substring' request is not new, but hasn't been documented before.
+
+The predefined `.T' string register (which holds the current output device)
+is not new, but hasn't been documented before.
+
+A new request `length' computes the length of a string and returns it in
+a number register.
+
+The macro files `tmac.a4' (for specifying A4 paper format) and `tmac.trace'
+(a debugging aid) are now installed also.
+
+A new resource file, `troffrc-end', is now available.  It is invoked after
+all user-specified macros.  Currently used by the html device to include
+tmac.html; thus no need for users to specify -mhtml anymore.
+
+The soft hyphen character now has a glyph name: `shc'.
+
+The latin-1 character 173 (PS name `periodcentered') has got the troff glyph
+name `pc' and is no longer intermixed with the symbol character `md' (PS
+name `mathdot').
+
+ASCII character 34 (PS name `quotedbl') has got the troff glyph name `dq'
+(which is an alias to character `"').
+
+ASCII character 39 (PS name `quoteright') has got the troff glyph name `cq'
+(which is an alias to character "'").
+
+Some additions to the font description files have been implemented for
+better support of HTML output:
+
+  The new format of lines in the `charset' subsection of font description
+  files is
+
+     name metrics type code [entity_name] [-- comment]
+
+  Currently, only the font description files in devhtml use the optional
+  entity_name string to define glyph entities in HTML.  Everything after the
+  entity_name field is ignored; in case this field isn't used, two hyphen
+  characters are now necessary to start a comment.
+
+  Two new requests are available in DESC files (currently used only with
+  grohtml):
+
+    use_charnames_in_special
+      This command indicates that troff should encode named characters
+      inside special commands.
+
+    pass_filenames
+      requests that troff tells the driver the source file name being
+      processed.  This is achieved by another tcommand: `F filename'.
+
+Grotty
+------
+
+Bruno Haible <haible@clisp.cons.org> contributed support for UTF8 output.
+
+Grohtml
+-------
+
+Added .LINE macro to tmac.arkup.
+
+The obsolete `.LINK' macro has been removed.
+
+.URL, .FTP, and .MAILTO macros now accept an optional third argument which
+will be immediately appended to the second argument (to be used with
+punctuation, for example).
+
+Grodvi
+------
+
+The font size 11pt has been changed to 10.95pt (as used in LaTeX 2e).
+
+A new font file CWI (using cmitt10; this is typewriter italic) has been
+added.
+
+Grolbp
+------
+
+A new driver for Canon CAPSL printers (LBP-4 and LBP-8 series laser
+printers).  This code has been contributed by Francisco Andres Verdu
+<pandres@dragonet.es>.
+
+Grn
+---
+
+A new preprocessor to process gremlin pictures.  It is based on the
+original Berkeley implementation of grn, written by David Slattengren
+and Barry Roitblat, and has been adapted to groff by Daniel Senderowicz
+<daniel@synchrods.com> and Werner Lemberg <wl@gnu.org>.
+
+Pic
+---
+
+Added the `srand' command to set the seed for a new sequence of
+pseudo-random numbers to be returned by `rand'.
+
+Gxditview
+---------
+
+Simplified installation: The Imakefile will now be configured (by groff's
+configure script).
+
+Documentation
+-------------
+
+Three new man pages are available: groff_tmac.5 (documenting how troff macros
+are accessed and where they are found), groff.7 (a short reference of the GNU
+roff language), and roff.7 (a general survey on GNU troff).
+
+Miscellaneous
+-------------
+
+A port to win32 (for use with Microsoft Visual C++ 6.0) is now part of the
+distribution.  It has been contributed by Blake McBride
+<blake@florida-software.com>.
+
+More information about programs, macros, documentation, etc., which is
+related to groff has been collected in the file `MORE.STUFF'.
+
 VERSION 1.13, 1.14, 1.15
 ========================
 
diff --git a/contrib/groff/PROBLEMS b/contrib/groff/PROBLEMS
index 9ee5b40bab2e..b73db2f4fbd0 100644
--- a/contrib/groff/PROBLEMS
+++ b/contrib/groff/PROBLEMS
@@ -2,20 +2,51 @@ This file describes various problems that have been encountered in
 compiling, installing and running groff.  Suggestions for additions or
 other improvements to this file are welcome.
 
+----------------------------------------------------------------------
+
+* My document says that the current year is 19100, not 2000.
+
+In groff, as in traditional troff, the yr number register yields the
+year minus 1900.  Unfortunately, there is a longstanding bug in the
+Troff User's Manual <http://cm.bell-labs.com/cm/cs/cstr/54.ps.gz>,
+which incorrectly claims that yr is the last two digits of the year.
+This claim was never true of either Unix troff or of groff.
+
+If your text looks like this:
+
+	.\" Wrong:
+	This document was formatted in 19\n(yr.
+
+you can correct it as follows:
+
+	This document was formatted in \n[year].
+
+or, if you want to be portable to older troff versions, as follows:
+
+	.nr y4 1900+\n(yr
+	This document was formatted in \n(y4.
+
+----------------------------------------------------------------------
+
 * I get lots of `numeric overflow' error messages whenever I run
-groff; I compiled groff with AT&T C++ 2.0 with an ANSI C compiler.
+  groff; I compiled groff with AT&T C++ 2.0 with an ANSI C compiler.
 
 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.
 
-* I get errors when I try to compile groff with Sun C++ version 5.0 or 5.1.
+----------------------------------------------------------------------
+
+* I get errors when I try to compile groff with Sun C++ version 5.0
+  or 5.1.
 
 This is a known problem; see Sun bug #4301919.  As of this writing, no
 patch is available.  Use GCC 2.95.2 or later instead.
 
+----------------------------------------------------------------------
+
 * I get errors when I try to compile groff with Sun C++ version 3 or
-earlier.
+  earlier.
 
 Groff requires header files that are moderately compatible with AT&T
 C++ and ANSI C.  With some versions of Sun C++, the supplied header
@@ -24,22 +55,67 @@ files need some of the following changes to meet this requirement:
 <memory.h>' to <string.h>); the first argument to fopen and freopen
 should be declared as `const char *'; the first argument to fread
 should be declared as `void *'; the first argument to fwrite should be
-declared as `const void *'; malloc should be declared to return `void
-*'; in <alloca.h>, the declaration `extern "C" { void
-*__builtin_alloca(int); }' should be added; declarations of getopt(),
-optarg, optind and opterr should be added to <stdlib.h>; in
-<sys/signal.h> the return type and the second argument type of
-signal() should be changed to be `void (*)(int)'.
+declared as `const void *'; malloc should be declared to return
+`void *'; in <alloca.h>, the declaration `extern "C" { void
+*__builtin_alloca(int); }' should be added; in <sys/signal.h> the
+return type and the second argument type of signal() should be changed
+to be `void (*)(int)'.
 
 You can either change them in place, or copy them to some other
 directory and include that directory with a -I option.
 
+----------------------------------------------------------------------
+
+* The configure script fails on OS/390 Unix.
+
+There is a bug in the Language Environment (LE) whereby the test
+program for static destructors fails.  You will see the message
+'configure: error: a working C++ compiler is required'
+
+Applying PTF UQ42006 is supposed to fix this, but the test program is
+still returning the wrong value (1).  To work around this problem, you
+can comment out the following in the configure script (near line 956).
+This will effectively bypass the test (static constructors and
+destructors do actually work properly):
+
+#if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+#then
+  echo "$ac_t""yes" 1>&6
+#else
+#  echo "configure: failed program was:" >&5
+#  cat conftest.$ac_ext >&5
+#  rm -fr conftest*
+#  echo "$ac_t""no" 1>&6;{ echo "configure: error: a working C++ compiler is required" 1>&2; exit 1; }
+#fi
+
+----------------------------------------------------------------------
+
 * I get errors when I try to compile groff with DEC C++.
 
 Fix the declaration of write() in <unistd.h> so that the second
 argument is a const char *.  Fix the declaration of open() in
 <sys/file.h> so that the first argument is a const char *.
 
+----------------------------------------------------------------------
+
+* On a host using Unix make (e.g. Solaris), if you are compiling for
+  multiple architectures by building in a subdirectory, the make stops
+  with a message like this:
+
+    make: Fatal error: Don't know how to make target `assert.o'
+
+  or like this:
+
+    make: Fatal error: Can't find /u/src/groff/src/include/Makefile.sub': No such file or directory
+
+This occurs because GNU make and Unix make handle VPATH differently,
+and the groff build relies on GNU make's VPATH handling.
+
+Use GNU make to work around the problem.  In Solaris 8, GNU make is
+on the Software Companion CD and is installed as /opt/sfw/bin/gmake.
+
+----------------------------------------------------------------------
+
 * On Ultrix, the make stops with the message
 
   *** Error code 1
@@ -50,6 +126,8 @@ for no apparent reason.
 
 Use GNU make.
 
+----------------------------------------------------------------------
+
 * I'm having problems compiling groff on 386BSD 0.1.
 
 If you're using ash as /bin/sh, you'll need the following patch.
@@ -78,12 +156,22 @@ If you're using ash as /bin/sh, you'll need the following patch.
 You'll also need to change dirnamemax.c so that it doesn't use
 pathconf().
 
+----------------------------------------------------------------------
+
 * While compiling on Xenix, ranlib libgroff.a fails.
 
 The system ranlib can't handle externals longer than 40 characters.
 Use the ranlib included in demon.co.uk:/pub/xenix/g++-1.40.3a.v1
 instead.
 
+----------------------------------------------------------------------
+
+* There are many empty `Makefile.dep' files.  Is this a bug?
+
+No.  Real dependency files are created with a `make depend' call.
+
+----------------------------------------------------------------------
+
 * 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
@@ -91,20 +179,27 @@ option.  Alternatively there's the sed script in tmac/fixmacros.sed
 which will attempt to edit a file of macros so that it can be used
 with groff without the -C flag.
 
-* groff -Tdvi produces dvi files that use fonts at weird magnifications.
+----------------------------------------------------------------------
+
+* groff -Tdvi produces dvi files that use fonts at weird
+  magnifications.
 
 Yes, it does.  You may need to compile fonts with Metafont at these
-magnifications. The CompileFonts script in the devdvi/generate
-directory may help you to do this. (It will take a *long* time.)
+magnifications.  The CompileFonts script in the devdvi/generate
+directory may help you to do this.  (It will take a *long* time.)
+
+----------------------------------------------------------------------
 
 * pic output is not centered horizontally; pictures sometimes run off
-the bottom of the page.
+  the bottom of the page.
+
+The macro package you are using is not supplying appropriate
+definitions of PS and PE.  Give groff a -mpic option.
 
-The macro package you are using is not supplying appropriate definitions
-of PS and PE.  Give groff a -mpic option.
+----------------------------------------------------------------------
 
-* I'm having problems including PostScript illustrations using the PSPIC
-macro.
+* I'm having problems including PostScript illustrations using the
+  PSPIC macro.
 
 A PostScript document must meet three requirements in order to be
 included with the PSPIC macro: it must comply with the Adobe Document
@@ -124,18 +219,24 @@ specification of Encapsulated PostScript format.  (This is available
 from the Adobe file server; send a message with a body of `help' to
 ps-file-server@adobe.com.)
 
+----------------------------------------------------------------------
+
 * 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.
+  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.
 
+----------------------------------------------------------------------
+
 * Groff doesn't use the font names I'm used to.
 
 Use the `ftr' request.  See gtroff(1).
 
+----------------------------------------------------------------------
+
 * I get errors using the Unix -ms macros with groff -e -C.
 
 Apply this change:
@@ -163,51 +264,66 @@ Apply this change:
   .nr ZN \\n(dn
   .if \\n(ZN>0 .if \\n(YE=0 .LP
 
+----------------------------------------------------------------------
 
-* gpic doesn't accept the syntax `chop N M' for chopping both ends of a
-line.
+* gpic doesn't accept the syntax `chop N M' for chopping both ends of
+  a line.
 
 The correct syntax is `chop N chop M'.
 
-* With gpic -t, when I print `line ->; box' using a dvi to ps
-program, the arrow head sticks through into the inside of the box.
+----------------------------------------------------------------------
+
+* With gpic -t, when I print `line ->; box' using a dvi to ps program,
+  the arrow head sticks through into the inside of the box.
+
+The dvi to ps program should be modified to set the line cap and line
+join parameters to 1 while printing tpic specials.
 
-The dvi to ps program should be modified to set the line cap and
-line join parameters to 1 while printing tpic specials.
+----------------------------------------------------------------------
 
 * 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.
+  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.
 
+----------------------------------------------------------------------
+
 * When I try to print the output of groff -Tps, I get no output at all
-from the printer, and the log file shows the error
-%%[ error: undefined; offendingcommand: BP ]%%
-I'm using TranScript spooling software.
+  from the printer, and the log file shows the error
+  %%[ error: undefined; offendingcommand: BP ]%%
+  I'm using TranScript spooling software.
 
 This is a bug in the page reversal filter in early versions of
 TranScript.  Change the `broken' parameter in
 /usr/local/lib/groff/font/devps/DESC to 7.
 
-* When I preview groff -Tps output using the Sun OpenWindows 2.0 pageview
-program, all the pages are displayed on top of each other.
+----------------------------------------------------------------------
+
+* When I preview groff -Tps output using the Sun OpenWindows 2.0
+  pageview program, all the pages are displayed on top of each other.
 
 This is a defect in pageview.  Change the `broken' parameter in
 /usr/local/lib/groff/font/devps/DESC to 2.
 
+----------------------------------------------------------------------
+
 * With groff -TX75, -TX100 or -X, I can only view the first page.
 
 The left mouse button brings up a menu that allows you to view other
 pages.
 
+----------------------------------------------------------------------
+
 * When I print the output of groff -Tdvi, I just get a black dot in
-upper left corner.
+  upper left corner.
 
 Some dvi drivers (notably early versions of xtex) do not correctly
 handle dvi files that use a resolution different from that used by dvi
 files produced by TeX.  Try getting a more up to date driver.
 
+----------------------------------------------------------------------
+
 * I get lots of errors when I use groff with the AT&T -mm macros.
 
 The AT&T -mm macros need a few changes to work with groff; `make
@@ -216,57 +332,80 @@ and make the necessary changes.  You may need to edit the commands for
 the install.mm target in the Makefile.  Alternatively use the groff
 -mm macros.
 
+----------------------------------------------------------------------
+
 * gtroff doesn't understand lines like `.ce99' with no space between
-the name of the request or macro and the arguments.
+  the name of the request or macro and the arguments.
 
-Gtroff requires a space between macro or request and its arguments
+gtroff requires a space between macro or request and its arguments
 because it allows the use of long names for macros and requests.  You
 can use the -C option or the `cp' request to put gtroff into a
 compatibility mode in which it is not possible to use long names for
 macros but in which no space is required between macros and their
 arguments.  The use of compatibility mode is strongly discouraged.
 
+----------------------------------------------------------------------
+
 * gtroff gives warnings about lines like
   .ev	\" a comment
-(with a tab after the .ev).
+  (with a tab after the .ev).
 
 A tab character cannot be used as a substitute for a space character
 (except in one case: between a control character at the beginning of a
 line and the name of a macro or request).  For example, in Unix troff
+
   .ps	\" restore the previous point size
+
 (with a tab after the .ps) will NOT restore the previous point-size;
 instead it will be silently ignored.  Since this is very likely to be
 an error, gtroff can give a warning about it.  If you want to align
 comments, you can do it like this:
+
   .ev\"				\" a comment
 
+----------------------------------------------------------------------
+
 * I don't like the page headers and footers produced by groff -man.
 
 There seem to be many different styles of page header and footer
 produced by different versions of the -man macros.  You will need to
 modify macros/tmac.an 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
 
-* While formatting a manual page, groff complains about not being able to
-break lines.  The problem seems to be caused by a line like:
+----------------------------------------------------------------------
+
+* While formatting a manual page, groff complains about not being able
+  to break lines.  The problem seems to be caused by a line like:
   .TP \w'label'+2
 
 The -man documentation says that the default scale indicator for TP
 macro is `n'.  The groff -man macros implement this correctly, so that
 the argument will be evaluated as if it were
+
   \w'label'n+2n
+
 The Unix -man macros don't implement this correctly (probably because
 it's hard to do in Unix troff); they just append `n' to the entire
 argument, so that it will be evaluated as if it were
+
   \w'label'u+2n
+
 The solution is to fix the manual page:
+
   .TP \w'label'u+2
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting Ultrix man pages with groff -man.
 
 The Ultrix man pages use a number of non-standard extensions to the
@@ -299,6 +438,8 @@ Frank Wortner):
 Another possible solution is to install tmac/man.ultrix as
 /usr/local/lib/groff/tmac/man.local.
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting HP-UX 9.0 man pages with groff -man.
 
 Rename /usr/local/lib/groff/tmac/tmac.an to (for example)
@@ -307,8 +448,10 @@ Rename /usr/local/lib/groff/tmac/tmac.an to (for example)
 beginning or filter it (and any files it .so's) through
 tmac/fixmacros.sed.
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting man pages produced by the perl
-wrapman script.
+  wrapman script.
 
 Some versions of wrapman have a superfluous blank line before the .TH
 line.  This must be deleted.  Then either use groff -C, or apply the
@@ -387,22 +530,28 @@ following patch:
   .SH SYNOPSIS
 
 
-* When I preview documents using -TX75 or -TX100, the layout is not the same
-as when I print the document with -Tps: the line and page breaks come
-in different places.
+----------------------------------------------------------------------
+
+* When I preview documents using -TX75 or -TX100, the layout is not
+  the same as when I print the document with -Tps: the line and page
+  breaks come in different places.
 
 Use groff -X -Tps.
 
+----------------------------------------------------------------------
+
 * When I try to run gxditview, I get the error:
-Error: Widget viewport has zero width and/or height
+  Error: Widget viewport has zero width and/or height
 
 This error means you haven't correctly installed the application
 defaults file, GXditview.ad; ``make install'' does this for you
 automatically, so either you didn't do ``make install'', or you don't
 have imake configured correctly.
 
+----------------------------------------------------------------------
+
 * groff uses up an enormous amount of memory processing large files.
-I'm using 386BSD 0.1.
+  I'm using 386BSD 0.1.
 
 386BSD includes an old version of g++, 1.39, which has a bug that
 causes a major memory leak in gtroff.  Apply the following fix to g++
@@ -436,14 +585,18 @@ and recompile groff:
         else
   	exprstmt = 0;
 
+----------------------------------------------------------------------
+
 * Where can I get grap?
 
-Grap is not freely available, but there is a nawk script implementing
-an extended subset of grap available for ftp as
-ftp.informatik.uni-rostock.de:/pub/local/software/prag-1.0.shar.gz.
+Ted Faber <faber@lunabase.org> has written a freely available grap:
+
+  http://www.lunabase.org/~faber/Vault/software/grap/
+
+----------------------------------------------------------------------
 
 * How can I use groff with an old LaserJet printer that doesn't work
-with groff -Tlj4?
+  with groff -Tlj4?
 
 You have at least 3 options:
 
@@ -452,11 +605,13 @@ You have at least 3 options:
 - use groff -Tdvi with a TeX .dvi to Laserjet driver;
 
 - use groff with the LaserJet driver in Chris Lewis' psroff package
-(available for ftp from:
-ftp.uunet.ca:/distrib/chris_lewis/psroff3.0pl17).
+  (available for ftp from:
+  ftp.uunet.ca:/distrib/chris_lewis/psroff3.0pl17).
+
+----------------------------------------------------------------------
 
 * Groff seems to generate level 3 Postscript, but my printer is only a
-level 1 or 2 PostScript printer.
+  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
@@ -465,9 +620,11 @@ 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.
 
+----------------------------------------------------------------------
+
 * The \n(st and \n(sb registers don't seem to work.  I thought \w set
-them to the height and depth of its argument, but the registers always
-seem to be 0.
+  them to the height and depth of its argument, but the registers
+  always seem to be 0.
 
 \n(st and \n(sb aren't supposed to give the height and depth of the
 string rather they give the minimum and maximum vertical displacement
@@ -475,6 +632,8 @@ of the baseline.  For example for \v'2u'\v'-3u', \n(st will be 1 and
 \n(sb will be -2.  The height and depth of the string is available in
 the \n[rst] and \n[rsb] registers: these are groff extensions.
 
+----------------------------------------------------------------------
+
 * On an SGI system, how can I make the man command use groff?
 
 From David Hinds <dhinds@allegro.stanford.edu> (some of these steps
diff --git a/contrib/groff/PROJECTS b/contrib/groff/PROJECTS
index 82c6d65c72bc..87aa844fd827 100644
--- a/contrib/groff/PROJECTS
+++ b/contrib/groff/PROJECTS
@@ -1,6 +1,6 @@
 Here are some things that would be useful additions to groff:
 
-  grap
+  ideal preprocessor
 
   -mv macros (for typesetting viewgraphs and slides)
 
diff --git a/contrib/groff/README b/contrib/groff/README
index 71be21f2340a..62ea08d81384 100644
--- a/contrib/groff/README
+++ b/contrib/groff/README
@@ -2,26 +2,25 @@ This is the GNU groff document formatting system.  The version number
 is given in the file VERSION.
 
 Included in this release are implementations of troff, pic, eqn, tbl,
-refer, the -man macros and the -ms macros, and drivers for PostScript,
-TeX dvi format, HP LaserJet 4 printers, HTML format (still alpha), and
-typewriter-like devices.  Also included is a modified version of the
-Berkeley -me macros, an enhanced version of the X11 xditview
-previewer, and an implementation of the -mm macros contributed by
-Joergen Haegg (jh@axis.se).
+grn, refer, -man, -mdoc, and -ms macros, and drivers for PostScript, TeX
+dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
+(still alpha), and typewriter-like devices.  Also included is a modified
+version of the Berkeley -me macros, an enhanced version of the X11
+xditview previewer, and an implementation of the -mm macros contributed
+by Joergen Haegg (jh@axis.se).
 
-See the file INSTALL for installation instructions.  You will require
-a C++ compiler.
+See the file INSTALL for installation instructions.  You will require a
+C++ compiler.
 
 The file NEWS describes recent user-visible changes to groff.
 
 Groff is free software.  See the file COPYING for copying permission.
 
-The file PROBLEMS describes various problems that have been
-encountered in compiling, installing, and running groff.
+The file PROBLEMS describes various problems that have been encountered
+in compiling, installing, and running groff.
 
-For the moment, the documentation assumes that you are already
-familiar with the Unix versions of troff, -man, -ms and the
-preprocessors.
+For the moment, the documentation assumes that you are already familiar
+with the Unix versions of troff, -man, -ms, and the preprocessors.
 
 The most recent released version of groff is always available by
 anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff.
@@ -37,7 +36,7 @@ version of groff.  You can access it with the commands
 After a successful login you no longer need the first two commands; an
 update of a checked out repository should be done with
 
-  cvs -z9 update -d
+  cvs -z9 update -dP
 
 Please read the info pages of cvs for further details.
 
@@ -50,12 +49,20 @@ or a diff file relative to the latest official groff release as
 
   ftp://ftp.ffii.org/pub/groff/devel/groff-<version>-current.diff.gz
 
+Assuming that groff-<version>.tar.gz and
+groff-<version>-current.diff.gz are in the same directory, do the
+following to apply the diff file:
+
+  tar xzvf groff-<version>.tar.gz
+  cd groff-<version>
+  gunzip -c ../groff-<version>-current.diff.gz | patch -p1
+
 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.  At the very least, read the BUG-REPORT form and make sure
 that you supply all the information that it asks for.  Even if you are
-not sure that something is a bug, report it using BUG-REPORT: this
-will enable us to determine whether it really is a bug or not.
+not sure that something is a bug, report it using BUG-REPORT: this will
+enable us to determine whether it really is a bug or not.
 
 Three mailing lists are available:
 
@@ -68,8 +75,8 @@ Note that groff@gnu.org is an alias for groff@ffii.org; you must be
 subscribed to the `groff' and `groff-commit' lists to send mails.
 
 To subscribe, send a mail to <list>-request@<domain> (example:
-groff-request@ffii.org) with the word `subscribe' in either the
-subject or body of the email (don't include the quotes).
+groff-request@ffii.org) with the word `subscribe' in either the subject
+or body of the email (don't include the quotes).
 
 GNU groff was written by James Clark <jjc@jclark.com>.  It is now
 maintained by Ted Harding <ted.harding@nessie.mcc.ac.uk> and Werner
diff --git a/contrib/groff/README.WIN32 b/contrib/groff/README.WIN32
new file mode 100644
index 000000000000..478d13a1fe0d
--- /dev/null
+++ b/contrib/groff/README.WIN32
@@ -0,0 +1,68 @@
+

+WIN32 port of GROFF and friends done by Blake McBride

+(blake@florida-software.com) 4/14/00.

+

+This port differs from other ports in that it uses the Microsoft

+compiler.  The changes were done such that they only have effect on

+the code when compiled with the Microsoft compiler.

+

+Note that not all preprocessors and output devices have been ported;

+missing are grohtml, grolbp, grn, refer, soelim, and groff.  Besides

+these programs, no utility program has been ported.  Of course,

+gxditview (which only runs on the X Window System, the standard Unix

+GUI) is missing also.

+

+

+The following programs were used, running on Windows NT 4.0:

+

+  Microsoft Visual C++ 6.0

+  Unix utilities under NT (gzip, tar, patch)

+

+

+Build Instructions

+------------------

+

+. Unpack groff (using gzip & tar) as follows:

+

+    cd \

+    gzip -dc groff-1.16.tar.gz | tar xvf -

+

+. Now apply the patch file `win32-diffs':

+

+    cd \groff-1.16

+    patch -p1 < win32-diffs

+

+  Note that with older versions of `patch', you will get a lot of

+  *.orig files (most of them are empty) which can be safely deleted.

+

+. Edit the file `src/include/defs.h' and adapt the path names to

+  your needs.

+

+. Build everything by typing:

+

+    nmake -f Makefile.msc

+

+You are done.

+

+The `bin' directory contains some .cmd files to help show how to run

+stuff.  Since Windows 95/98 doesn't understand .cmd files, if you are

+operating under that OS, you'll have to rename them to .bat files. 

+.bat files do have output redirection problems.

+

+

+The changes I made fall into two categories.

+

+1.  Makefiles.  Several makefiles were added.  All makefiles were named

+    Makefile.msc.

+

+2.  The Groff build includes several scripts which generate auxiliary

+    files used by groff (such as DESC, I, R, prologue, etc). 

+

+

+Directories needed at runtime

+-----------------------------

+

+bin

+font

+tmac

+mm  (copied, including sub-directories, from contrib/mm)

diff --git a/contrib/groff/REVISION b/contrib/groff/REVISION
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/contrib/groff/REVISION
@@ -0,0 +1 @@
+1
diff --git a/contrib/groff/TODO b/contrib/groff/TODO
index 9cb74c239f65..c540d3ce68ca 100644
--- a/contrib/groff/TODO
+++ b/contrib/groff/TODO
@@ -1,3 +1,10 @@
+Unicode input:
+  Implementing \U'xxxx' to access Unicode characters directly.
+
+  Making groff 16bit input-clean.
+
+Separating input and output encodings (similar to LaTeX).
+
 Better selection of paper sizes with -Tps.
 
 Make -Tlj4 work with -X.
@@ -8,8 +15,6 @@ Provide man.sun implementing .TX.
 
 Improve GROFF_PRINT macro in aclocal.m4.
 
-Put all dev* files in a separate subdirectory `font'.
-
 Provide a `check' target.
 
 Provide a `bindist' target.
diff --git a/contrib/groff/VERSION b/contrib/groff/VERSION
index d40acaaea098..e71519696fb2 100644
--- a/contrib/groff/VERSION
+++ b/contrib/groff/VERSION
@@ -1 +1 @@
-1.15
+1.16
diff --git a/contrib/groff/aclocal.m4 b/contrib/groff/aclocal.m4
index e3e37f30104e..1cd92ce2e7cf 100644
--- a/contrib/groff/aclocal.m4
+++ b/contrib/groff/aclocal.m4
@@ -55,7 +55,7 @@ dnl Bison generated parsers have problems with C++ compilers other than g++.
 dnl So byacc is preferred over bison.
 dnl
 AC_DEFUN(GROFF_PROG_YACC,
-[AC_CHECK_PROGS(YACC, byacc 'bison -y', yacc)])
+[AC_CHECK_PROGS(YACC, byacc 'bison -y', yacc)])dnl
 dnl
 dnl
 dnl GROFF_CSH_HACK(if hack present, if not present)
@@ -103,53 +103,16 @@ AC_MSG_RESULT(no))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
-AC_DEFUN(GROFF_GETOPT,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of getopt in stdlib.h])
-AC_TRY_COMPILE([#include <stdlib.h>
-extern "C" { void getopt(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDLIB_H_DECLARES_GETOPT))
-AC_MSG_CHECKING([declaration of getopt in unistd.h])
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <unistd.h>
-extern "C" { void getopt(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(UNISTD_H_DECLARES_GETOPT))
-AC_LANG_RESTORE])dnl
+dnl srand() of SunOS 4.1.3 has return type int instead of void
 dnl
-dnl
-AC_DEFUN(GROFF_PUTENV,
+AC_DEFUN(GROFF_SRAND,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of putenv])
+AC_MSG_CHECKING([for return type of srand])
 AC_TRY_COMPILE([#include <stdlib.h>
-extern "C" { void putenv(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDLIB_H_DECLARES_PUTENV))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
-AC_DEFUN(GROFF_POPEN,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of popen])
-AC_TRY_COMPILE([#include <stdio.h>
-extern "C" { void popen(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDIO_H_DECLARES_POPEN))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
-AC_DEFUN(GROFF_PCLOSE,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of pclose])
-AC_TRY_COMPILE([#include <stdio.h>
-extern "C" { void pclose(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDIO_H_DECLARES_PCLOSE))
+extern "C" { void srand(unsigned int); }],,
+AC_MSG_RESULT(void);AC_DEFINE(RET_TYPE_SRAND_IS_VOID),
+AC_MSG_RESULT(int))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
@@ -177,17 +140,6 @@ AC_MSG_RESULT(no))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
-AC_DEFUN(GROFF_HYPOT,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of hypot])
-AC_TRY_COMPILE([#include <math.h>
-extern "C" { double hypot(double,double); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(MATH_H_DECLARES_HYPOT))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
 AC_DEFUN(GROFF_OSFCN_H,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -318,8 +270,7 @@ AC_SUBST(PAGE)])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_CXX_CHECK,
-[AC_REQUIRE([AC_C_CROSS])
-AC_REQUIRE([AC_PROG_CXX])
+[AC_REQUIRE([AC_PROG_CXX])
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 if test "$cross_compiling" = no; then
@@ -353,8 +304,7 @@ AC_TRY_LINK([#include <stdio.h>],
 [fopen(0, 0);],
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no);AC_MSG_ERROR([header files do not support C++ (if you are using a version of gcc/g++ earlier than 2.5, you should install libg++)]))
-AC_LANG_RESTORE
-])dnl
+AC_LANG_RESTORE])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_TMAC,
@@ -413,8 +363,7 @@ elif test -n "$sys_tmac_prefix"; then
 	rm -f conftest.sol
 fi
 AC_MSG_RESULT([$tmac_wrap])
-AC_SUBST(tmac_wrap)
-])dnl
+AC_SUBST(tmac_wrap)])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_G,
@@ -426,8 +375,7 @@ else
 	AC_MSG_RESULT(no)
 	g=
 fi
-AC_SUBST(g)
-])dnl
+AC_SUBST(g)])dnl
 dnl
 dnl
 dnl We need the path to install-sh to be absolute.
@@ -435,8 +383,7 @@ dnl
 AC_DEFUN(GROFF_INSTALL_SH,
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 ac_dir=`cd $ac_aux_dir; pwd`
-ac_install_sh="$ac_dir/install-sh -c"
-])dnl
+ac_install_sh="$ac_dir/install-sh -c"])dnl
 dnl
 dnl
 dnl At least one UNIX system, Apple Macintosh Rhapsody 5.5,
@@ -444,5 +391,122 @@ dnl does not have -lm.
 dnl
 AC_DEFUN(GROFF_LIBM,
 [AC_CHECK_LIB(m,sin,LIBM=-lm)
-AC_SUBST(LIBM)
-])
+AC_SUBST(LIBM)])dnl
+dnl
+dnl
+dnl We need top_srcdir to be absolute.
+dnl
+AC_DEFUN(GROFF_SRCDIR,
+[ac_srcdir_defaulted=no
+srcdir=`cd $srcdir; pwd`])dnl
+dnl
+dnl
+dnl This simplifies Makefile rules.
+dnl
+AC_DEFUN(GROFF_BUILDDIR,
+[top_builddir=`pwd`
+AC_SUBST(top_builddir)])dnl
+dnl
+dnl
+dnl Check for EBCDIC - stolen from the OS390 Unix LYNX port
+dnl
+AC_DEFUN(GROFF_EBCDIC,
+[AC_MSG_CHECKING([whether character set is EBCDIC])
+AC_TRY_COMPILE(,
+[/* Treat any failure as ASCII for compatibility with existing art.
+    Use compile-time rather than run-time tests for cross-compiler
+    tolerance. */
+#if '0' != 240
+make an error "Character set is not EBCDIC"
+#endif],
+groff_cv_ebcdic="yes"
+ TTYDEVDIRS="font/devcp1047"
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(IS_EBCDIC_HOST),
+groff_cv_ebcdic="no"
+ TTYDEVDIRS="font/devascii font/devlatin1 font/devutf8"
+ AC_MSG_RESULT(no))
+AC_SUBST(TTYDEVDIRS)])dnl
+dnl
+dnl
+dnl Check for OS/390 Unix.  We test for EBCDIC also -- the Linux port (with
+dnl gcc) to OS/390 uses ASCII internally.
+dnl
+AC_DEFUN(GROFF_OS390,
+[groff_cv_os390="no"
+if test "$groff_cv_ebcdic" = "yes"; then
+	AC_MSG_CHECKING([for OS/390 Unix])
+	case `uname` in
+	OS/390)
+		CFLAGS="$CFLAGS -D_ALL_SOURCE"
+		groff_cv_os390="yes"
+		AC_MSG_RESULT(yes) ;;
+	*)
+		AC_MSG_RESULT(no) ;;
+	esac
+fi])dnl
+dnl
+dnl
+dnl Finally, we must modify a base function of autoconf to replace the
+dnl ASCII char `012' with its generic equivalent `\n' if we run under
+dnl OS/390 Unix -- unfortunately, not all `tr' variants understand `\n',
+dnl so this hack is necessary.
+dnl
+define([AC_OUTPUT_MAKE_DEFS],
+[# Transform confdefs.h into DEFS.
+dnl Using a here document instead of a string reduces the quoting nightmare.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+changequote(<<, >>)dnl
+s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+changequote([, ])dnl
+EOF
+if test "$groff_cv_os390" = "yes"; then
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
+else
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+fi
+rm -f conftest.defs
+])dnl
+dnl
+dnl
+dnl Check whether we need a declaration for a function.
+dnl
+dnl Stolen from GNU bfd.
+dnl
+AC_DEFUN(GROFF_NEED_DECLARATION,
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_VAL(groff_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif],
+[char *(*pfn) = (char *(*)) $1],
+groff_cv_decl_needed_$1=no,
+groff_cv_decl_needed_$1=yes)])
+AC_MSG_RESULT($groff_cv_decl_needed_$1)
+if test $groff_cv_decl_needed_$1 = yes; then
+	AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]))
+fi
+AC_LANG_RESTORE])dnl
diff --git a/contrib/groff/addftinfo/Makefile.sub b/contrib/groff/addftinfo/Makefile.sub
index 95a8f5bf5857..23848d54fc72 100644
--- a/contrib/groff/addftinfo/Makefile.sub
+++ b/contrib/groff/addftinfo/Makefile.sub
@@ -1,6 +1,11 @@
 PROG=addftinfo
 MAN1=addftinfo.n
 XLIBS=$(LIBGROFF)
-OBJS=addftinfo.o guess.o
-CCSRCS=addftinfo.cc guess.cc
-HDRS=guess.h
+OBJS=\
+  addftinfo.o \
+  guess.o
+CCSRCS=\
+  $(srcdir)/addftinfo.cc \
+  $(srcdir)/guess.cc
+HDRS=\
+  $(srcdir)/guess.h
diff --git a/contrib/groff/afmtodit/Makefile.sub b/contrib/groff/afmtodit/Makefile.sub
index fb5daac6ce84..9fee2def5745 100644
--- a/contrib/groff/afmtodit/Makefile.sub
+++ b/contrib/groff/afmtodit/Makefile.sub
@@ -13,9 +13,9 @@ afmtodit: afmtodit.pl
 	chmod +x afmtodit
 
 install_data: afmtodit
-	-test -d $(bindir) || mkdir $(bindir)
+	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
 	-rm -f $(bindir)/afmtodit
-	$(INSTALL_PROGRAM) afmtodit $(bindir)/afmtodit
+	$(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
 
 uninstall_sub:
 	-rm -f $(bindir)/afmtodit
diff --git a/contrib/groff/afmtodit/afmtodit.man b/contrib/groff/afmtodit/afmtodit.man
index 84fe8f292c0f..e0631e092e0f 100644
--- a/contrib/groff/afmtodit/afmtodit.man
+++ b/contrib/groff/afmtodit/afmtodit.man
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -26,25 +26,26 @@ the original English.
 .SH NAME
 afmtodit \- create font files for use with groff \-Tps
 .SH SYNOPSIS
+.nr a \n(.j
+.ad l
+.nr i \n(.i
+.in +\w'\fBafmtodit 'u
+.ti \niu
 .B afmtodit
-[
-.B \-ns
-]
-[
-.BI \-d desc_file
-]
-[
-.BI \-e enc_file
-]
-[
-.BI \-i n
-]
-[
-.BI \-a n
-]
+.de OP
+.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
+.el .RB "[\ " "\\$1" "\ ]"
+..
+.OP \-ns
+.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
 .SH DESCRIPTION
 .B afmtodit
 creates a font file for use with groff and
diff --git a/contrib/groff/afmtodit/afmtodit.pl b/contrib/groff/afmtodit/afmtodit.pl
index c3d839a224a8..a44ae7a2d6fb 100644
--- a/contrib/groff/afmtodit/afmtodit.pl
+++ b/contrib/groff/afmtodit/afmtodit.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -P-
 # -*- Perl -*-
-#Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+#Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #     Written by James Clark (jjc@jclark.com)
 #
 #This file is part of groff.
@@ -311,7 +311,7 @@ for ($i = 0; $i < 256; $i++) {
 	    printf(",%d", do conv($h));
 	}
 	printf("\t%d", $type);
-	printf("\t0%03o\t%s\n", $i, $ch);
+	printf("\t0%03o\t-- %s\n", $i, $ch);
 	for ($j = 1; $j < $nmap{$ch}; $j++) {
 	    printf("%s\t\"\n", $map{$ch,$j});
 	}
diff --git a/contrib/groff/configure b/contrib/groff/configure
index e6800ae4e814..31d9341e8952 100755
--- a/contrib/groff/configure
+++ b/contrib/groff/configure
@@ -451,7 +451,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=groff/groff.cc
+ac_unique_file=src/roff/groff/groff.cc
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -521,10 +521,14 @@ else
 fi
 
 
+ac_srcdir_defaulted=no
+srcdir=`cd $srcdir; pwd`
+top_builddir=`pwd`
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:528: checking for $ac_word" >&5
+echo "configure:532: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -554,7 +558,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:558: checking for $ac_word" >&5
+echo "configure:562: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -605,7 +609,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:609: checking for $ac_word" >&5
+echo "configure:613: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -637,7 +641,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:641: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:645: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -648,12 +652,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 652 "configure"
+#line 656 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -679,12 +683,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:683: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:687: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:688: checking whether we are using GNU C" >&5
+echo "configure:692: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -693,7 +697,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -712,7 +716,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:716: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:720: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -748,7 +752,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:752: checking for $ac_word" >&5
+echo "configure:756: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -780,7 +784,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:788: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -791,12 +795,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 795 "configure"
+#line 799 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -822,12 +826,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:826: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:830: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:831: checking whether we are using GNU C++" >&5
+echo "configure:835: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -836,7 +840,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -855,7 +859,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:859: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:863: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -888,8 +892,6 @@ fi
 
 
 
-
-
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -899,20 +901,20 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 if test "$cross_compiling" = no; then
 	echo $ac_n "checking that C++ compiler can compile simple program""... $ac_c" 1>&6
-echo "configure:903: checking that C++ compiler can compile simple program" >&5
+echo "configure:905: checking that C++ compiler can compile simple program" >&5
 fi
 if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 909 "configure"
+#line 911 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #endif
 int main() { return 0; }
 EOF
-if { (eval echo configure:916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -926,13 +928,13 @@ fi
 
 if test "$cross_compiling" = no; then
 	echo $ac_n "checking that C++ static constructors and destructors are called""... $ac_c" 1>&6
-echo "configure:930: checking that C++ static constructors and destructors are called" >&5
+echo "configure:932: checking that C++ static constructors and destructors are called" >&5
 fi
 if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 936 "configure"
+#line 938 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -951,7 +953,7 @@ A a;
 int main() { return 1; }
 
 EOF
-if { (eval echo configure:955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -964,16 +966,16 @@ rm -fr conftest*
 fi
 
 echo $ac_n "checking that header files support C++""... $ac_c" 1>&6
-echo "configure:968: checking that header files support C++" >&5
+echo "configure:970: checking that header files support C++" >&5
 cat > conftest.$ac_ext <<EOF
-#line 970 "configure"
+#line 972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 fopen(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -990,14 +992,60 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+echo $ac_n "checking whether character set is EBCDIC""... $ac_c" 1>&6
+echo "configure:997: checking whether character set is EBCDIC" >&5
+cat > conftest.$ac_ext <<EOF
+#line 999 "configure"
+#include "confdefs.h"
 
+int main() {
+/* Treat any failure as ASCII for compatibility with existing art.
+    Use compile-time rather than run-time tests for cross-compiler
+    tolerance. */
+#if '0' != 240
+make an error "Character set is not EBCDIC"
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:1011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  groff_cv_ebcdic="yes"
+ TTYDEVDIRS="font/devcp1047"
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define IS_EBCDIC_HOST 1
+EOF
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  groff_cv_ebcdic="no"
+ TTYDEVDIRS="font/devascii font/devlatin1 font/devutf8"
+ echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+groff_cv_os390="no"
+if test "$groff_cv_ebcdic" = "yes"; then
+	echo $ac_n "checking for OS/390 Unix""... $ac_c" 1>&6
+echo "configure:1033: checking for OS/390 Unix" >&5
+	case `uname` in
+	OS/390)
+		CFLAGS="$CFLAGS -D_ALL_SOURCE"
+		groff_cv_os390="yes"
+		echo "$ac_t""yes" 1>&6 ;;
+	*)
+		echo "$ac_t""no" 1>&6 ;;
+	esac
+fi
 if test -z "$PSPRINT"; then
 	for ac_prog in lpr
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1001: checking for $ac_word" >&5
+echo "configure:1049: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LPR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1031,7 +1079,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1035: checking for $ac_word" >&5
+echo "configure:1083: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1069,7 +1117,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1073: checking for $ac_word" >&5
+echo "configure:1121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LPQ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1108,11 +1156,11 @@ done
 fi
 
 echo $ac_n "checking for command to use for printing PostScript files""... $ac_c" 1>&6
-echo "configure:1112: checking for command to use for printing PostScript files" >&5
+echo "configure:1160: checking for command to use for printing PostScript files" >&5
 echo "$ac_t""$PSPRINT" 1>&6
 # Figure out DVIPRINT from PSPRINT.
 echo $ac_n "checking for command to use for printing dvi files""... $ac_c" 1>&6
-echo "configure:1116: checking for command to use for printing dvi files" >&5
+echo "configure:1164: checking for command to use for printing dvi files" >&5
 if test -n "$PSPRINT" && test -z "$DVIPRINT"; then
 	if test "X$PSPRINT" = "Xlpr"; then
 		DVIPRINT="lpr -d"
@@ -1125,7 +1173,7 @@ echo "$ac_t""$DVIPRINT" 1>&6
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1129: checking for $ac_word" >&5
+echo "configure:1177: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERLPATH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1163,7 +1211,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1167: checking for $ac_word" >&5
+echo "configure:1215: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1196,7 +1244,7 @@ test -n "$YACC" || YACC="yacc"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1200: checking for $ac_word" >&5
+echo "configure:1248: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1244,7 +1292,6 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 ac_dir=`cd $ac_aux_dir; pwd`
 ac_install_sh="$ac_dir/install-sh -c"
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1257,7 +1304,7 @@ ac_install_sh="$ac_dir/install-sh -c"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1261: checking for a BSD compatible install" >&5
+echo "configure:1308: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1310,7 +1357,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1314: checking whether ln -s works" >&5
+echo "configure:1361: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1331,7 +1378,7 @@ else
 fi
 
 echo $ac_n "checking for csh hash hack""... $ac_c" 1>&6
-echo "configure:1335: checking for csh hash hack" >&5
+echo "configure:1382: checking for csh hash hack" >&5
 cat <<EOF >conftest.sh
 #!/bin/sh
 true || exit 0
@@ -1347,7 +1394,7 @@ fi
 rm -f conftest.sh
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1351: checking how to run the C preprocessor" >&5
+echo "configure:1398: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1362,13 +1409,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1366 "configure"
+#line 1413 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1379,13 +1426,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1383 "configure"
+#line 1430 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1396,13 +1443,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1400 "configure"
+#line 1447 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1426,21 +1473,22 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in unistd.h dirent.h limits.h sys/dir.h stdlib.h
+for ac_hdr in stdlib.h unistd.h dirent.h limits.h sys/dir.h \
+                 string.h strings.h math.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1434: checking for $ac_hdr" >&5
+echo "configure:1482: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1439 "configure"
+#line 1487 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1467,7 +1515,7 @@ fi
 done
 
 echo $ac_n "checking for ISC 3.x or 4.x""... $ac_c" 1>&6
-echo "configure:1471: checking for ISC 3.x or 4.x" >&5
+echo "configure:1519: checking for ISC 3.x or 4.x" >&5
 if grep '[34]\.' /usr/options/cb.name >/dev/null 2>&1
 then
 	echo "$ac_t""yes" 1>&6
@@ -1479,7 +1527,7 @@ else
 	echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking whether -D_POSIX_SOURCE is necessary""... $ac_c" 1>&6
-echo "configure:1483: checking whether -D_POSIX_SOURCE is necessary" >&5
+echo "configure:1531: checking whether -D_POSIX_SOURCE is necessary" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1489,7 +1537,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
+#line 1541 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 extern "C" { void fileno(int); }
@@ -1497,7 +1545,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
@@ -1525,55 +1573,94 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking declaration of getopt in stdlib.h""... $ac_c" 1>&6
-echo "configure:1530: checking declaration of getopt in stdlib.h" >&5
+echo $ac_n "checking for return type of srand""... $ac_c" 1>&6
+echo "configure:1578: checking for return type of srand" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1580 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
-extern "C" { void getopt(int); }
+extern "C" { void srand(unsigned int); }
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  echo "$ac_t""void" 1>&6;cat >> confdefs.h <<\EOF
+#define RET_TYPE_SRAND_IS_VOID 1
+EOF
+
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define STDLIB_H_DECLARES_GETOPT 1
-EOF
-
+  echo "$ac_t""int" 1>&6
 fi
 rm -f conftest*
-echo $ac_n "checking declaration of getopt in unistd.h""... $ac_c" 1>&6
-echo "configure:1554: checking declaration of getopt in unistd.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1556 "configure"
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether hypot must be declared""... $ac_c" 1>&6
+echo "configure:1609: checking whether hypot must be declared" >&5
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+if eval "test \"`echo '$''{'groff_cv_decl_needed_hypot'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1622 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-extern "C" { void getopt(int); }
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 int main() {
-
+char *(*pfn) = (char *(*)) hypot
 ; return 0; }
 EOF
-if { (eval echo configure:1565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  groff_cv_decl_needed_hypot=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define UNISTD_H_DECLARES_GETOPT 1
+  groff_cv_decl_needed_hypot=yes
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$groff_cv_decl_needed_hypot" 1>&6
+if test $groff_cv_decl_needed_hypot = yes; then
+	cat >> confdefs.h <<\EOF
+#define NEED_DECLARATION_HYPOT 1
 EOF
 
 fi
-rm -f conftest*
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -1581,6 +1668,8 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+echo $ac_n "checking whether popen must be declared""... $ac_c" 1>&6
+echo "configure:1673: checking whether popen must be declared" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1589,30 +1678,53 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking declaration of putenv""... $ac_c" 1>&6
-echo "configure:1594: checking declaration of putenv" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1596 "configure"
+if eval "test \"`echo '$''{'groff_cv_decl_needed_popen'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1686 "configure"
 #include "confdefs.h"
+
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-extern "C" { void putenv(int); }
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 int main() {
-
+char *(*pfn) = (char *(*)) popen
 ; return 0; }
 EOF
-if { (eval echo configure:1604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  groff_cv_decl_needed_popen=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define STDLIB_H_DECLARES_PUTENV 1
+  groff_cv_decl_needed_popen=yes
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$groff_cv_decl_needed_popen" 1>&6
+if test $groff_cv_decl_needed_popen = yes; then
+	cat >> confdefs.h <<\EOF
+#define NEED_DECLARATION_POPEN 1
 EOF
 
 fi
-rm -f conftest*
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -1620,6 +1732,8 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+echo $ac_n "checking whether pclose must be declared""... $ac_c" 1>&6
+echo "configure:1737: checking whether pclose must be declared" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1628,30 +1742,53 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking declaration of popen""... $ac_c" 1>&6
-echo "configure:1633: checking declaration of popen" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1635 "configure"
+if eval "test \"`echo '$''{'groff_cv_decl_needed_pclose'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1750 "configure"
 #include "confdefs.h"
+
 #include <stdio.h>
-extern "C" { void popen(int); }
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 int main() {
-
+char *(*pfn) = (char *(*)) pclose
 ; return 0; }
 EOF
-if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  groff_cv_decl_needed_pclose=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define STDIO_H_DECLARES_POPEN 1
+  groff_cv_decl_needed_pclose=yes
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$groff_cv_decl_needed_pclose" 1>&6
+if test $groff_cv_decl_needed_pclose = yes; then
+	cat >> confdefs.h <<\EOF
+#define NEED_DECLARATION_PCLOSE 1
 EOF
 
 fi
-rm -f conftest*
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -1659,6 +1796,8 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+echo $ac_n "checking whether putenv must be declared""... $ac_c" 1>&6
+echo "configure:1801: checking whether putenv must be declared" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1667,30 +1806,53 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking declaration of pclose""... $ac_c" 1>&6
-echo "configure:1672: checking declaration of pclose" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1674 "configure"
+if eval "test \"`echo '$''{'groff_cv_decl_needed_putenv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1814 "configure"
 #include "confdefs.h"
+
 #include <stdio.h>
-extern "C" { void pclose(int); }
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 int main() {
-
+char *(*pfn) = (char *(*)) putenv
 ; return 0; }
 EOF
-if { (eval echo configure:1682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  groff_cv_decl_needed_putenv=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define STDIO_H_DECLARES_PCLOSE 1
+  groff_cv_decl_needed_putenv=yes
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$groff_cv_decl_needed_putenv" 1>&6
+if test $groff_cv_decl_needed_putenv = yes; then
+	cat >> confdefs.h <<\EOF
+#define NEED_DECLARATION_PUTENV 1
 EOF
 
 fi
-rm -f conftest*
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -1698,6 +1860,8 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+echo $ac_n "checking whether strncasecmp must be declared""... $ac_c" 1>&6
+echo "configure:1865: checking whether strncasecmp must be declared" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1706,30 +1870,53 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking for sys_nerr in <errno.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1711: checking for sys_nerr in <errno.h> or <stdio.h>" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1713 "configure"
+if eval "test \"`echo '$''{'groff_cv_decl_needed_strncasecmp'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1878 "configure"
 #include "confdefs.h"
-#include <errno.h>
+
 #include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 int main() {
-int k; k = sys_nerr;
+char *(*pfn) = (char *(*)) strncasecmp
 ; return 0; }
 EOF
-if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define HAVE_SYS_NERR 1
-EOF
-
+  groff_cv_decl_needed_strncasecmp=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  groff_cv_decl_needed_strncasecmp=yes
 fi
 rm -f conftest*
+fi
+
+echo "$ac_t""$groff_cv_decl_needed_strncasecmp" 1>&6
+if test $groff_cv_decl_needed_strncasecmp = yes; then
+	cat >> confdefs.h <<\EOF
+#define NEED_DECLARATION_STRNCASECMP 1
+EOF
+
+fi
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -1745,21 +1932,21 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking for sys_errlist in <errno.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1750: checking for sys_errlist in <errno.h> or <stdio.h>" >&5
+echo $ac_n "checking for sys_nerr in <errno.h> or <stdio.h>""... $ac_c" 1>&6
+echo "configure:1937: checking for sys_nerr in <errno.h> or <stdio.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+#line 1939 "configure"
 #include "confdefs.h"
 #include <errno.h>
 #include <stdio.h>
 int main() {
-int k; k = (int)sys_errlist[0];
+int k; k = sys_nerr;
 ; return 0; }
 EOF
-if { (eval echo configure:1760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define HAVE_SYS_ERRLIST 1
+#define HAVE_SYS_NERR 1
 EOF
 
 else
@@ -1784,28 +1971,28 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking declaration of hypot""... $ac_c" 1>&6
-echo "configure:1789: checking declaration of hypot" >&5
+echo $ac_n "checking for sys_errlist in <errno.h> or <stdio.h>""... $ac_c" 1>&6
+echo "configure:1976: checking for sys_errlist in <errno.h> or <stdio.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1791 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
-#include <math.h>
-extern "C" { double hypot(double,double); }
+#include <errno.h>
+#include <stdio.h>
 int main() {
-
+int k; k = (int)sys_errlist[0];
 ; return 0; }
 EOF
-if { (eval echo configure:1799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
+#define HAVE_SYS_ERRLIST 1
+EOF
+
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
-#define MATH_H_DECLARES_HYPOT 1
-EOF
-
+  echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 ac_ext=c
@@ -1824,16 +2011,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking C++ <osfcn.h>""... $ac_c" 1>&6
-echo "configure:1828: checking C++ <osfcn.h>" >&5
+echo "configure:2015: checking C++ <osfcn.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 2017 "configure"
 #include "confdefs.h"
 #include <osfcn.h>
 int main() {
 read(0, 0, 0); open(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:1837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_CC_OSFCN_H 1
@@ -1862,16 +2049,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking C++ <limits.h>""... $ac_c" 1>&6
-echo "configure:1866: checking C++ <limits.h>" >&5
+echo "configure:2053: checking C++ <limits.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 2055 "configure"
 #include "confdefs.h"
 #include <limits.h>
 int main() {
 int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:1875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_CC_LIMITS_H 1
@@ -1900,16 +2087,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for declaration of time_t""... $ac_c" 1>&6
-echo "configure:1904: checking for declaration of time_t" >&5
+echo "configure:2091: checking for declaration of time_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1906 "configure"
+#line 2093 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 time_t t = time(0); struct tm *p = localtime(&t);
 ; return 0; }
 EOF
-if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1930,12 +2117,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1934: checking return type of signal handlers" >&5
+echo "configure:2121: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1939 "configure"
+#line 2126 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1952,7 +2139,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -1971,16 +2158,16 @@ EOF
 
 
 echo $ac_n "checking struct exception""... $ac_c" 1>&6
-echo "configure:1975: checking struct exception" >&5
+echo "configure:2162: checking struct exception" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1977 "configure"
+#line 2164 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 struct exception e;
 ; return 0; }
 EOF
-if { (eval echo configure:1984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_EXCEPTION 1
@@ -1994,7 +2181,7 @@ else
 fi
 rm -f conftest*
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:1998: checking for sin in -lm" >&5
+echo "configure:2185: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2002,7 +2189,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2193 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2013,7 +2200,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2034,22 +2221,21 @@ else
 fi
 
 
-
 for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2043: checking for $ac_hdr" >&5
+echo "configure:2229: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2048 "configure"
+#line 2234 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2078,12 +2264,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2082: checking for $ac_func" >&5
+echo "configure:2268: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2087 "configure"
+#line 2273 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2106,7 +2292,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2131,7 +2317,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2135: checking for working mmap" >&5
+echo "configure:2321: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2139,7 +2325,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2143 "configure"
+#line 2329 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2279,7 +2465,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2306,12 +2492,12 @@ LIBS="$LIBS -lc $LIBM"
 for ac_func in fmod strtol getcwd strerror putenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2310: checking for $ac_func" >&5
+echo "configure:2496: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2315 "configure"
+#line 2501 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2334,7 +2520,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2361,15 +2547,15 @@ done
 
 
 LIBS="$saved_libs"
-for ac_func in rename mkstemp
+for ac_func in rename mkstemp strcasecmp strncasecmp strsep strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2368: checking for $ac_func" >&5
+echo "configure:2554: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2373 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2392,7 +2578,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2417,12 +2603,12 @@ fi
 done
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2421: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2607: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2426 "configure"
+#line 2612 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2434,7 +2620,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2463,16 +2649,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether ANSI array delete syntax supported""... $ac_c" 1>&6
-echo "configure:2467: checking whether ANSI array delete syntax supported" >&5
+echo "configure:2653: checking whether ANSI array delete syntax supported" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2469 "configure"
+#line 2655 "configure"
 #include "confdefs.h"
 
 int main() {
 char *p = new char[5]; delete [] p;
 ; return 0; }
 EOF
-if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2501,16 +2687,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking traditional preprocessor""... $ac_c" 1>&6
-echo "configure:2505: checking traditional preprocessor" >&5
+echo "configure:2691: checking traditional preprocessor" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2507 "configure"
+#line 2693 "configure"
 #include "confdefs.h"
 #define name2(a,b) a/**/b
 int main() {
 int name2(foo,bar);
 ; return 0; }
 EOF
-if { (eval echo configure:2514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define TRADITIONAL_CPP 1
@@ -2531,12 +2717,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking w_coredump""... $ac_c" 1>&6
-echo "configure:2535: checking w_coredump" >&5
+echo "configure:2721: checking w_coredump" >&5
 if test "$cross_compiling" = yes; then
   echo "$ac_t""no" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2540 "configure"
+#line 2726 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2551,7 +2737,7 @@ main()
 #endif
 }
 EOF
-if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define WCOREFLAG 0200
@@ -2567,12 +2753,12 @@ rm -fr conftest*
 fi
 
 echo $ac_n "checking default value for grops -b option""... $ac_c" 1>&6
-echo "configure:2571: checking default value for grops -b option" >&5
+echo "configure:2757: checking default value for grops -b option" >&5
 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7
 echo "$ac_t""$BROKEN_SPOOLER_FLAGS" 1>&6
 
 echo $ac_n "checking default paper size""... $ac_c" 1>&6
-echo "configure:2576: checking default paper size" >&5
+echo "configure:2762: checking default paper size" >&5
 if test -z "$PAGE"; then
 	descfile=
 	if test -r $prefix/share/groff/font/devps/DESC; then
@@ -2607,7 +2793,7 @@ test -n "$PAGE" || PAGE=letter
 echo "$ac_t""$PAGE" 1>&6
 
 echo $ac_n "checking for existing troff installation""... $ac_c" 1>&6
-echo "configure:2611: checking for existing troff installation" >&5
+echo "configure:2797: checking for existing troff installation" >&5
 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
 	echo "$ac_t""yes" 1>&6
 	g=g
@@ -2616,9 +2802,8 @@ else
 	g=
 fi
 
-
 echo $ac_n "checking for prefix of system macro packages""... $ac_c" 1>&6
-echo "configure:2622: checking for prefix of system macro packages" >&5
+echo "configure:2807: checking for prefix of system macro packages" >&5
 sys_tmac_prefix=
 sys_tmac_file_prefix=
 for d in /usr/share/lib/tmac /usr/lib/tmac; do
@@ -2638,7 +2823,7 @@ echo "$ac_t""$sys_tmac_prefix" 1>&6
 
 tmac_wrap=
 echo $ac_n "checking which system macro packages should be made available""... $ac_c" 1>&6
-echo "configure:2642: checking which system macro packages should be made available" >&5
+echo "configure:2827: checking which system macro packages should be made available" >&5
 if test "x$sys_tmac_file_prefix" = "xtmac."; then
 	for f in $sys_tmac_prefix*; do
 		suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
@@ -2675,7 +2860,7 @@ elif test -n "$sys_tmac_prefix"; then
 fi
 echo "$ac_t""$tmac_wrap" 1>&6
 
-
+$srcdir/mkinstalldirs src/xditview
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2749,7 +2934,11 @@ s%\[%\\&%g
 s%\]%\\&%g
 s%\$%$$%g
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+if test "$groff_cv_os390" = "yes"; then
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
+else
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+fi
 rm -f conftest.defs
 
 
@@ -2789,7 +2978,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile src/xditview/Imakefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2821,8 +3010,10 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@top_builddir@%$top_builddir%g
 s%@CC@%$CC%g
 s%@CXX@%$CXX%g
+s%@TTYDEVDIRS@%$TTYDEVDIRS%g
 s%@LPR@%$LPR%g
 s%@LP@%$LP%g
 s%@LPQ@%$LPQ%g
@@ -2885,7 +3076,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/xditview/Imakefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/contrib/groff/configure.in b/contrib/groff/configure.in
index bd4fdc877fd3..081df0e6c4d8 100644
--- a/contrib/groff/configure.in
+++ b/contrib/groff/configure.in
@@ -1,9 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(groff/groff.cc)
+AC_INIT(src/roff/groff/groff.cc)
 dnl checks for programs
+GROFF_SRCDIR
+GROFF_BUILDDIR
 AC_PROG_CC
 AC_PROG_CXX
 GROFF_CXX_CHECK
+GROFF_EBCDIC
+GROFF_OS390
 GROFF_PRINT
 AC_PATH_PROG(PERLPATH, perl, /usr/bin/perl)
 GROFF_PROG_YACC
@@ -14,16 +18,18 @@ AC_PROG_LN_S
 GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='')
 AC_SUBST(SH_SCRIPT_SED_CMD)
 dnl checks for headers
-AC_CHECK_HEADERS(unistd.h dirent.h limits.h sys/dir.h stdlib.h)
+AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \
+                 string.h strings.h math.h)
 GROFF_ISC_SYSV3
 GROFF_POSIX
-GROFF_GETOPT
-GROFF_PUTENV
-GROFF_POPEN
-GROFF_PCLOSE
+GROFF_SRAND
+GROFF_NEED_DECLARATION(hypot)
+GROFF_NEED_DECLARATION(popen)
+GROFF_NEED_DECLARATION(pclose)
+GROFF_NEED_DECLARATION(putenv)
+GROFF_NEED_DECLARATION(strncasecmp)
 GROFF_SYS_NERR
 GROFF_SYS_ERRLIST
-GROFF_HYPOT
 GROFF_OSFCN_H
 GROFF_LIMITS_H
 dnl checks for typedefs
@@ -38,7 +44,7 @@ saved_libs="$LIBS"
 LIBS="$LIBS -lc $LIBM"
 AC_REPLACE_FUNCS(fmod strtol getcwd strerror putenv)
 LIBS="$saved_libs"
-AC_CHECK_FUNCS(rename mkstemp)
+AC_CHECK_FUNCS(rename mkstemp strcasecmp strncasecmp strsep strdup)
 AC_DECL_SYS_SIGLIST
 dnl checks for compiler characteristics
 GROFF_ARRAY_DELETE
@@ -50,4 +56,5 @@ GROFF_BROKEN_SPOOLER_FLAGS
 GROFF_PAGE
 GROFF_G
 GROFF_TMAC
-AC_OUTPUT(Makefile)
+$srcdir/mkinstalldirs src/xditview
+AC_OUTPUT(Makefile src/xditview/Imakefile)
diff --git a/contrib/groff/devX100-12/CB b/contrib/groff/devX100-12/CB
index 3751184aadcc..d151ee33da26 100644
--- a/contrib/groff/devX100-12/CB
+++ b/contrib/groff/devX100-12/CB
@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/CBI b/contrib/groff/devX100-12/CBI
index d7d0145a09a9..f298973000ea 100644
--- a/contrib/groff/devX100-12/CBI
+++ b/contrib/groff/devX100-12/CBI
@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/CI b/contrib/groff/devX100-12/CI
index 804f71f779e6..3f1437f621b2 100644
--- a/contrib/groff/devX100-12/CI
+++ b/contrib/groff/devX100-12/CI
@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,10	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/CR b/contrib/groff/devX100-12/CR
index 140ec55d0756..895c5dd4cdbc 100644
--- a/contrib/groff/devX100-12/CR
+++ b/contrib/groff/devX100-12/CR
@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/HB b/contrib/groff/devX100-12/HB
index e68615e14aa1..9e91e0b9049b 100644
--- a/contrib/groff/devX100-12/HB
+++ b/contrib/groff/devX100-12/HB
@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	6,12	0	041
 "	8,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	12,12	0	046
 '	5,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	10,9,3	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/HBI b/contrib/groff/devX100-12/HBI
index 6723ddff1286..12011ca5838a 100644
--- a/contrib/groff/devX100-12/HBI
+++ b/contrib/groff/devX100-12/HBI
@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	6,12	0	041
 "	8,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	12,12	0	046
 '	5,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	10,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/HI b/contrib/groff/devX100-12/HI
index f002cd630433..c5be9f966f2b 100644
--- a/contrib/groff/devX100-12/HI
+++ b/contrib/groff/devX100-12/HI
@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	11,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	9,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,7	0	0267
+pc	5,7	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/HR b/contrib/groff/devX100-12/HR
index d2b296f64e7e..55d6bf5e3a91 100644
--- a/contrib/groff/devX100-12/HR
+++ b/contrib/groff/devX100-12/HR
@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,11	0	043
 sh	"
 $	9,13,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	11,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,4	0	050
 )	6,12,4	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	9,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/NB b/contrib/groff/devX100-12/NB
index f997df5961df..975de355780e 100644
--- a/contrib/groff/devX100-12/NB
+++ b/contrib/groff/devX100-12/NB
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	10,12	0	043
 sh	"
 $	10,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	14,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,2	0	050
 )	6,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	11,8,3	0	0265
 ps	12,12	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/NBI b/contrib/groff/devX100-12/NBI
index 38c32819b37c..d67e0e42f280 100644
--- a/contrib/groff/devX100-12/NBI
+++ b/contrib/groff/devX100-12/NBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,12	0	041
 "	7,12	0	042
+dq	"
 #	10,12	0	043
 sh	"
 $	9,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	15,12	0	045
 &	15,12	0	046
 '	4,12	0	047
+cq	"
 (	7,12,2	0	050
 )	7,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	11,8,3	0	0265
 ps	11,12	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/NI b/contrib/groff/devX100-12/NI
index 7a34f2af98e8..be54ca399069 100644
--- a/contrib/groff/devX100-12/NI
+++ b/contrib/groff/devX100-12/NI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,12	0	041
 "	7,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	14,12	0	046
 '	3,12	0	047
+cq	"
 (	6,12,2	0	050
 )	5,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	5,12	0	0264
 µ	10,8,3	0	0265
 ps	11,12	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/NR b/contrib/groff/devX100-12/NR
index 0a9a0cfa8200..f4f922ef346c 100644
--- a/contrib/groff/devX100-12/NR
+++ b/contrib/groff/devX100-12/NR
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	13,12	0	046
 '	3,12	0	047
+cq	"
 (	6,12,2	0	050
 )	6,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	5,12	0	0264
 µ	10,8,3	0	0265
 ps	10,12,3	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/TB b/contrib/groff/devX100-12/TB
index 83073d528178..b81e0170b33b 100644
--- a/contrib/groff/devX100-12/TB
+++ b/contrib/groff/devX100-12/TB
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	9,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	16,12	0	045
 &	14,11	0	046
 '	6,11	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	9,8,3	0	0265
 ps	9,11,4	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/TBI b/contrib/groff/devX100-12/TBI
index 71ca713620cb..712f7d217ca6 100644
--- a/contrib/groff/devX100-12/TBI
+++ b/contrib/groff/devX100-12/TBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	9,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	6,11	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/TI b/contrib/groff/devX100-12/TI
index fad269f92525..72ed683a9110 100644
--- a/contrib/groff/devX100-12/TI
+++ b/contrib/groff/devX100-12/TI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	7,10	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	6,10	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	8,8,4	0	0265
 ps	9,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100-12/TR b/contrib/groff/devX100-12/TR
index 6db573e8b221..989dd564cb29 100644
--- a/contrib/groff/devX100-12/TR
+++ b/contrib/groff/devX100-12/TR
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	7,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,11	0	045
 &	13,11	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,4	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/CB b/contrib/groff/devX100/CB
index 7239ed1e0dcb..7353611c15b6 100644
--- a/contrib/groff/devX100/CB
+++ b/contrib/groff/devX100/CB
@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,9	0	0264
 µ	9,7,3	0	0265
 ps	9,10,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/CBI b/contrib/groff/devX100/CBI
index 384f91d7214b..d590a19aed92 100644
--- a/contrib/groff/devX100/CBI
+++ b/contrib/groff/devX100/CBI
@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,10	0	041
 "	9,9	0	042
+dq	"
 #	9,11,1	0	043
 sh	"
 $	9,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,9	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,10	0	052
@@ -158,7 +160,7 @@ aa	9,10	0	0264
 µ	9,7,3	0	0265
 ps	9,10,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/CI b/contrib/groff/devX100/CI
index 07fd0a685a5b..484eeca28a43 100644
--- a/contrib/groff/devX100/CI
+++ b/contrib/groff/devX100/CI
@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,10,3	0	050
 )	9,10,3	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,9	0	0264
 µ	9,7,3	0	0265
 ps	9,9,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/CR b/contrib/groff/devX100/CR
index e425fa602bb2..b8b35d10ff14 100644
--- a/contrib/groff/devX100/CR
+++ b/contrib/groff/devX100/CR
@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,9,1	0	043
 sh	"
 $	9,11,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,10,2	0	050
 )	9,10,2	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,10	0	0264
 µ	9,7,3	0	0265
 ps	9,9,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/HB b/contrib/groff/devX100/HB
index d877fd65a080..1a1d963426e3 100644
--- a/contrib/groff/devX100/HB
+++ b/contrib/groff/devX100/HB
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	7,11	0	042
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	11,10	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/HBI b/contrib/groff/devX100/HBI
index 1cf0e56e638d..bcfbfae401f7 100644
--- a/contrib/groff/devX100/HBI
+++ b/contrib/groff/devX100/HBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	7,11	0	042
+dq	"
 #	10,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	11,10	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	6,11,3	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/HI b/contrib/groff/devX100/HI
index 7908492d431c..4be615cd8704 100644
--- a/contrib/groff/devX100/HI
+++ b/contrib/groff/devX100/HI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	10,10	0	046
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	4,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/HR b/contrib/groff/devX100/HR
index c2f6af390348..f462a24929e3 100644
--- a/contrib/groff/devX100/HR
+++ b/contrib/groff/devX100/HR
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	10,10	0	046
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/NB b/contrib/groff/devX100/NB
index d47fdb2e1e4c..f99169ea4e19 100644
--- a/contrib/groff/devX100/NB
+++ b/contrib/groff/devX100/NB
@@ -4,6 +4,7 @@ charset
 ---	11,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	6,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/NBI b/contrib/groff/devX100/NBI
index c46b945ae863..dd940afc937f 100644
--- a/contrib/groff/devX100/NBI
+++ b/contrib/groff/devX100/NBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	6,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11,1	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	10,7,3	0	0265
 ps	9,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/NI b/contrib/groff/devX100/NI
index 3216f64a0543..bb31b53d18a7 100644
--- a/contrib/groff/devX100/NI
+++ b/contrib/groff/devX100/NI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	6,11	0	042
+dq	"
 #	11,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11,1	0	045
 &	11,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	4,11	0	0264
 µ	9,7,3	0	0265
 ps	9,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/NR b/contrib/groff/devX100/NR
index 8e6717eef145..729f76eb0878 100644
--- a/contrib/groff/devX100/NR
+++ b/contrib/groff/devX100/NR
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,11	0	041
 "	5,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,7,3	0	0265
 ps	9,11,2	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/TB b/contrib/groff/devX100/TB
index ebafbac74b3a..f9f191c083e1 100644
--- a/contrib/groff/devX100/TB
+++ b/contrib/groff/devX100/TB
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,10	0	041
 "	7,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,10	0	045
 &	12,10	0	046
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/TBI b/contrib/groff/devX100/TBI
index 2297b4b2b663..76e9828bcf72 100644
--- a/contrib/groff/devX100/TBI
+++ b/contrib/groff/devX100/TBI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	7,10	0	041
 "	7,10	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,10	0	045
 &	10,10	0	046
 '	5,10	0	047
+cq	"
 (	6,10,3	0	050
 )	6,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	6,10	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/TI b/contrib/groff/devX100/TI
index 80a2f1c4049d..53401e5c44d6 100644
--- a/contrib/groff/devX100/TI
+++ b/contrib/groff/devX100/TI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,10	0	041
 "	6,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,10	0	045
 &	11,10	0	046
 '	5,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	4,10	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX100/TR b/contrib/groff/devX100/TR
index eafc811b264c..39d106a2867b 100644
--- a/contrib/groff/devX100/TR
+++ b/contrib/groff/devX100/TR
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,10	0	041
 "	6,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,10	0	045
 &	11,10	0	046
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	7,7,3	0	0265
 ps	7,10,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/CB b/contrib/groff/devX75-12/CB
index a5d1baff2215..8b3766c1ebf7 100644
--- a/contrib/groff/devX75-12/CB
+++ b/contrib/groff/devX75-12/CB
@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,10,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,9	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,5	0	0267
+pc	7,5	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/CBI b/contrib/groff/devX75-12/CBI
index 764eaf778410..23df8ea75060 100644
--- a/contrib/groff/devX75-12/CBI
+++ b/contrib/groff/devX75-12/CBI
@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,9	0	043
 sh	"
 $	7,10,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,5	0	0267
+pc	7,5	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/CI b/contrib/groff/devX75-12/CI
index acc9ec864705..04f4c46d4592 100644
--- a/contrib/groff/devX75-12/CI
+++ b/contrib/groff/devX75-12/CI
@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,8	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,4	0	0267
+pc	7,4	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/CR b/contrib/groff/devX75-12/CR
index 666e837b435c..957ce6a19e3f 100644
--- a/contrib/groff/devX75-12/CR
+++ b/contrib/groff/devX75-12/CR
@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,4	0	0267
+pc	7,4	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/HB b/contrib/groff/devX75-12/HB
index b8cbb6ef55e6..f9ccd5f716bd 100644
--- a/contrib/groff/devX75-12/HB
+++ b/contrib/groff/devX75-12/HB
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	7,9,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	6,9,3	0	050
 )	6,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,10	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/HBI b/contrib/groff/devX75-12/HBI
index 3014c9027d7c..21d43555f62f 100644
--- a/contrib/groff/devX75-12/HBI
+++ b/contrib/groff/devX75-12/HBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	5,9,3	0	050
 )	5,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/HI b/contrib/groff/devX75-12/HI
index 587e1451eb29..6051dc703593 100644
--- a/contrib/groff/devX75-12/HI
+++ b/contrib/groff/devX75-12/HI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	3,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	5,9	0	052
@@ -158,7 +160,7 @@ aa	2,10	0	0264
 µ	7,7,3	0	0265
 ps	8,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/HR b/contrib/groff/devX75-12/HR
index 86958ed6b56f..f78bed5e9b92 100644
--- a/contrib/groff/devX75-12/HR
+++ b/contrib/groff/devX75-12/HR
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	6,9,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	3,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	5,9	0	052
@@ -158,7 +160,7 @@ aa	2,10	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/NB b/contrib/groff/devX75-12/NB
index 5fea01717d2f..b5f4a08626d1 100644
--- a/contrib/groff/devX75-12/NB
+++ b/contrib/groff/devX75-12/NB
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,9	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,9	0	045
 &	11,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	5,9	0	0264
 µ	9,6,3	0	0265
 ps	10,9	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/NBI b/contrib/groff/devX75-12/NBI
index 0da124adf093..01539d5b4051 100644
--- a/contrib/groff/devX75-12/NBI
+++ b/contrib/groff/devX75-12/NBI
@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	12,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	8,6,3	0	0265
 ps	8,9	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/NI b/contrib/groff/devX75-12/NI
index 05ee8cdbd82e..3ffc94022ffd 100644
--- a/contrib/groff/devX75-12/NI
+++ b/contrib/groff/devX75-12/NI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,9	0	045
 &	10,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	7,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	8,6,3	0	0265
 ps	9,9	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/NR b/contrib/groff/devX75-12/NR
index a1df4867901a..1d91f111a51b 100644
--- a/contrib/groff/devX75-12/NR
+++ b/contrib/groff/devX75-12/NR
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,2	0	050
 )	4,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	8,6,3	0	0265
 ps	8,9,2	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/TB b/contrib/groff/devX75-12/TB
index 348d388104a4..1ac16ecf7dd5 100644
--- a/contrib/groff/devX75-12/TB
+++ b/contrib/groff/devX75-12/TB
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	6,9	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	10,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	8,9,3	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/TBI b/contrib/groff/devX75-12/TBI
index 02793a58073a..68d97ed72b61 100644
--- a/contrib/groff/devX75-12/TBI
+++ b/contrib/groff/devX75-12/TBI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,9	0	041
 "	7,9	0	042
+dq	"
 #	7,9	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	6,9,2	0	050
 )	6,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/TI b/contrib/groff/devX75-12/TI
index dd79bd1d5378..037cec3c1aba 100644
--- a/contrib/groff/devX75-12/TI
+++ b/contrib/groff/devX75-12/TI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	6,9	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	7,9,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75-12/TR b/contrib/groff/devX75-12/TR
index da7c961a1e93..16de8a9681e6 100644
--- a/contrib/groff/devX75-12/TR
+++ b/contrib/groff/devX75-12/TR
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	6,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,9	0	045
 &	10,9	0	046
 '	4,9	0	047
+cq	"
 (	5,9,3	0	050
 )	5,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/CB b/contrib/groff/devX75/CB
index 5583135951a4..58e0d8b09b2b 100644
--- a/contrib/groff/devX75/CB
+++ b/contrib/groff/devX75/CB
@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,6	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,6	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,1	0	050
 )	6,7,1	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,5	0	0267
+pc	6,5	0	0267
 ·	"
 ac	6,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/CBI b/contrib/groff/devX75/CBI
index e6281f44b44a..db6f6baa596a 100644
--- a/contrib/groff/devX75/CBI
+++ b/contrib/groff/devX75/CBI
@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,7	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,0,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/CI b/contrib/groff/devX75/CI
index f19be187d1ea..43d383affcf9 100644
--- a/contrib/groff/devX75/CI
+++ b/contrib/groff/devX75/CI
@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,7	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,1	0	050
 )	6,7,1	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,0,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/CR b/contrib/groff/devX75/CR
index 8bb40b2753ac..900a4a0268ce 100644
--- a/contrib/groff/devX75/CR
+++ b/contrib/groff/devX75/CR
@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,6	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,6,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/HB b/contrib/groff/devX75/HB
index 26894e07f733..ab6f9798ea0e 100644
--- a/contrib/groff/devX75/HB
+++ b/contrib/groff/devX75/HB
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	5,8	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	8,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	6,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/HBI b/contrib/groff/devX75/HBI
index 6488003417a4..ec132d3d648a 100644
--- a/contrib/groff/devX75/HBI
+++ b/contrib/groff/devX75/HBI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	7,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,2	0	050
 )	5,8,2	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	6,6,2	0	0265
 ps	7,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/HI b/contrib/groff/devX75/HI
index 07509511fac5..324e4b712649 100644
--- a/contrib/groff/devX75/HI
+++ b/contrib/groff/devX75/HI
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	4,8	0	042
+dq	"
 #	7,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	5,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/HR b/contrib/groff/devX75/HR
index aeac63ed2735..fc0143d302ea 100644
--- a/contrib/groff/devX75/HR
+++ b/contrib/groff/devX75/HR
@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	3,8	0	041
 "	4,8	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	5,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/NB b/contrib/groff/devX75/NB
index d783d02b781d..9ea6576e4f03 100644
--- a/contrib/groff/devX75/NB
+++ b/contrib/groff/devX75/NB
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,8	0	041
 "	6,8	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,8	0	045
 &	9,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,2	0	050
 )	5,8,2	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	4,8	0	0264
 µ	7,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/NBI b/contrib/groff/devX75/NBI
index bdad1059941e..9346faf2cb99 100644
--- a/contrib/groff/devX75/NBI
+++ b/contrib/groff/devX75/NBI
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	5,8	0	041
 "	6,8	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	6,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,8	0	045
 &	10,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,1	0	050
 )	5,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	4,8	0	0264
 µ	7,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/NI b/contrib/groff/devX75/NI
index 20c2c4246996..d14f9ca9b8ce 100644
--- a/contrib/groff/devX75/NI
+++ b/contrib/groff/devX75/NI
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	5,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	9,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,1	0	050
 )	5,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	6,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/NR b/contrib/groff/devX75/NR
index aa05125e750e..8a04d7786923 100644
--- a/contrib/groff/devX75/NR
+++ b/contrib/groff/devX75/NR
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	5,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	10,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,1	0	050
 )	4,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	6,5,2	0	0265
 ps	7,8,2	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/TB b/contrib/groff/devX75/TB
index 090771428fc5..29fa10adf216 100644
--- a/contrib/groff/devX75/TB
+++ b/contrib/groff/devX75/TB
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,7	0	041
 "	5,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,7	0	045
 &	9,7	0	046
 '	4,7	0	047
+cq	"
 (	4,7,3	0	050
 )	4,7,3	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	4,7	0	0264
 µ	5,5,3	0	0265
 ps	6,7,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/TBI b/contrib/groff/devX75/TBI
index 37d92b0a70c5..064d31de338b 100644
--- a/contrib/groff/devX75/TBI
+++ b/contrib/groff/devX75/TBI
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	5,7	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,7	0	045
 &	8,7	0	046
 '	4,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	4,7	0	0264
 µ	5,5,3	0	0265
 ps	8,7,3	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/TI b/contrib/groff/devX75/TI
index daa858e2eef0..6e091e2f2476 100644
--- a/contrib/groff/devX75/TI
+++ b/contrib/groff/devX75/TI
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,7	0	041
 "	4,8	0	042
+dq	"
 #	5,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,7	0	045
 &	8,7	0	046
 '	3,8	0	047
+cq	"
 (	3,7,2	0	050
 )	4,7,2	0	051
 *	5,7	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	5,5,3	0	0265
 ps	6,7,3	0	0266
 ¶	"
-md	3,3	0	0267
+pc	3,3	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"
diff --git a/contrib/groff/devX75/TR b/contrib/groff/devX75/TR
index c1ac847b408b..819dff4d067a 100644
--- a/contrib/groff/devX75/TR
+++ b/contrib/groff/devX75/TR
@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,7	0	041
 "	4,7	0	042
+dq	"
 #	5,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	8,7	0	045
 &	8,7	0	046
 '	3,7	0	047
+cq	"
 (	4,7,2	0	050
 )	4,7,2	0	051
 *	5,7	0	052
@@ -158,7 +160,7 @@ aa	3,7	0	0264
 µ	5,5,2	0	0265
 ps	6,7,2	0	0266
 ¶	"
-md	2,3	0	0267
+pc	2,3	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"
diff --git a/contrib/groff/devascii/R.proto b/contrib/groff/devascii/R.proto
index 876c74c4a6d8..b4d090778807 100644
--- a/contrib/groff/devascii/R.proto
+++ b/contrib/groff/devascii/R.proto
@@ -4,6 +4,7 @@ spacewidth 24
 charset
 !	24	0	0041
 "	24	0	0042
+dq	"
 lq	"
 rq	"
 #	24	0	0043
@@ -16,6 +17,7 @@ Do	"
 aa	"
 fm	"
 aq	"
+cq	"
 (	24	0	0050
 )	24	0	0051
 *	24	0	0052
diff --git a/contrib/groff/devcp1047/DESC.proto b/contrib/groff/devcp1047/DESC.proto
new file mode 100644
index 000000000000..88399ab16d91
--- /dev/null
+++ b/contrib/groff/devcp1047/DESC.proto
@@ -0,0 +1,8 @@
+res 240
+hor 24
+vert 40
+unitwidth 10
+sizes 10 0
+fonts 4 R I B BI
+tcommand
+postpro grotty
diff --git a/contrib/groff/devcp1047/Makefile.sub b/contrib/groff/devcp1047/Makefile.sub
new file mode 100644
index 000000000000..42721cb9b86e
--- /dev/null
+++ b/contrib/groff/devcp1047/Makefile.sub
@@ -0,0 +1,32 @@
+DEV=cp1047
+FONTS=R I B BI
+DEVFILES=$(FONTS) DESC
+CLEANADD=$(FONTS) DESC
+
+RES=240
+CPI=10
+LPI=6
+
+$(FONTS): R.proto
+	@echo Making $@
+	@-rm -f $@
+	@(charwidth=`expr $(RES) / $(CPI)` ; \
+ 	 sed -e "s/^name [A-Z]*$$/name $@/" \
+	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
+	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+	     -e "s/^internalname .*$$/internalname $@/" \
+	     -e "/^internalname/s/BI/3/" \
+	     -e "/^internalname/s/B/2/" \
+	     -e "/^internalname/s/I/1/" \
+	     -e "/^internalname .*[^ 0-9]/d" \
+	     $(srcdir)/R.proto >$@)
+
+DESC: DESC.proto
+	@echo Making $@
+	@-rm -f $@
+	@sed -e "s/^res .*$$/res $(RES)/" \
+	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+	    $(srcdir)/DESC.proto >$@
+
diff --git a/contrib/groff/devcp1047/R.proto b/contrib/groff/devcp1047/R.proto
new file mode 100644
index 000000000000..6a624c37c771
--- /dev/null
+++ b/contrib/groff/devcp1047/R.proto
@@ -0,0 +1,356 @@
+name R
+internalname 0
+spacewidth 24
+charset
+^a	24	0	0102
+char66	"
+:a	24	0	0103
+char67	"
+`a	24	0	0104
+char68	"
+'a	24	0	0105
+char69	"
+~a	24	0	0106
+char70	"
+oa	24	0	0107
+char71	"
+,c	24	0	0110
+char72	"
+~n	24	0	0111
+char73	"
+ct	24	0	0112
+char74	"
+.	24	0	0113
+<	24	0	0114
+fo	"
+la	"
+(	24	0	0115
++	24	0	0116
+pl	"
+|	24	0	0117
+ba	"
+br	"
+bv	"
+lb	"
+lc	"
+lf	"
+lk	"
+lt	"
+or	"
+rb	"
+rc	"
+rf	"
+rk	"
+rt	"
+&	24	0	0120
+'e	24	0	0121
+char81	"
+^e	24	0	0122
+char82	"
+:e	24	0	0123
+char83	"
+`e	24	0	0124
+char84	"
+'i	24	0	0125
+char85	"
+^i	24	0	0126
+char86	"
+:i	24	0	0127
+char87	"
+`i	24	0	0130
+char88	"
+ss	24	0	0131
+char89	"
+!	24	0	0132
+$	24	0	0133
+Do	"
+*	24	0	0134
+**	"
+)	24	0	0135
+;	24	0	0136
+^	24	0	0137
+a^	"
+ha	"
+\-	24	0	0140
+-	"
+en	"
+hy	"
+mi	"
+/	24	0	0141
+f/	"
+sl	"
+^A	24	0	0142
+char98	"
+:A	24	0	0143
+char99	"
+`A	24	0	0144
+char100	"
+'A	24	0	0145
+char101	"
+~A	24	0	0146
+char102	"
+oA	24	0	0147
+char103	"
+,C	24	0	0150
+char104	"
+~N	24	0	0151
+char105	"
+bb	24	0	0152
+char106	"
+,	24	0	0153
+%	24	0	0154
+_	24	0	0155
+ru	"
+ul	"
+>	24	0	0156
+fc	"
+ra	"
+?	24	0	0157
+/o	24	0	0160
+char112	"
+'E	24	0	0161
+char113	"
+^E	24	0	0162
+char114	"
+:E	24	0	0163
+char115	"
+`E	24	0	0164
+char116	"
+'I	24	0	0165
+char117	"
+^I	24	0	0166
+char118	"
+:I	24	0	0167
+char119	"
+`I	24	0	0170
+char120	"
+`	24	0	0171
+ga	"
+oq	"
+:	24	0	0172
+#	24	0	0173
+sh	"
+@	24	0	0174
+at	"
+'	24	0	0175
+aq	"
+fm	"
+cq	"
+=	24	0	0176
+eq	"
+"	24	0	0177
+dq	"
+lq	"
+rq	"
+/O	24	0	0200
+char128	"
+a	24	0	0201
+b	24	0	0202
+c	24	0	0203
+d	24	0	0204
+e	24	0	0205
+f	24	0	0206
+g	24	0	0207
+h	24	0	0210
+i	24	0	0211
+.i	"
+Fo	24	0	0212
+char138	"
+Fc	24	0	0213
+char139	"
+Sd	24	0	0214
+char140	"
+'y	24	0	0215
+char141	"
+Tp	24	0	0216
+char142	"
++-	24	0	0217
+char143	"
+de	24	0	0220
+char144	"
+j	24	0	0221
+k	24	0	0222
+l	24	0	0223
+m	24	0	0224
+n	24	0	0225
+o	24	0	0226
+*o	"
+p	24	0	0227
+q	24	0	0230
+r	24	0	0231
+Of	24	0	0232
+char154	"
+Om	24	0	0233
+char155	"
+ae	24	0	0234
+char156	"
+ac	24	0	0235
+char157	"
+AE	24	0	0236
+char158	"
+Cs	24	0	0237
+char159	"
+*m	24	0	0240
+char160	"
+~	24	0	0241
+a~	"
+ap	"
+ti	"
+s	24	0	0242
+t	24	0	0243
+u	24	0	0244
+v	24	0	0245
+w	24	0	0246
+x	24	0	0247
+y	24	0	0250
+z	24	0	0251
+r!	24	0	0252
+char170	"
+r?	24	0	0253
+char171	"
+-D	24	0	0254
+char172	"
+[	24	0	0255
+lB	"
+TP	24	0	0256
+char174	"
+rg	24	0	0257
+char175	"
+no	24	0	0260
+char176	"
+Po	24	0	0261
+char177	"
+Ye	24	0	0262
+char178	"
+md	24	0	0263
+pc	"
+char179	"
+co	24	0	0264
+char180	"
+sc	24	0	0265
+char181	"
+ps	24	0	0266
+char182	"
+14	24	0	0267
+char183	"
+12	24	0	0270
+char184	"
+34	24	0	0271
+char185	"
+'Y	24	0	0272
+char186	"
+ad	24	0	0273
+char187	"
+a-	24	0	0274
+char188	"
+]	24	0	0275
+rB	"
+aa	24	0	0276
+char190	"
+mu	24	0	0277
+char191	"
+{	24	0	0300
+lC	"
+A	24	0	0301
+*A	"
+B	24	0	0302
+*B	"
+C	24	0	0303
+D	24	0	0304
+E	24	0	0305
+*E	"
+F	24	0	0306
+G	24	0	0307
+H	24	0	0310
+*Y	"
+I	24	0	0311
+*I	"
+shc	24	0	0312
+char202	"
+^o	24	0	0313
+char203	"
+:o	24	0	0314
+char204	"
+`o	24	0	0315
+char205	"
+'o	24	0	0316
+char206	"
+~o	24	0	0317
+char207	"
+}	24	0	0320
+rC	"
+J	24	0	0321
+K	24	0	0322
+*K	"
+L	24	0	0323
+M	24	0	0324
+*M	"
+N	24	0	0325
+*N	"
+O	24	0	0326
+*O	"
+ci	"
+P	24	0	0327
+*R	"
+Q	24	0	0330
+R	24	0	0331
+S1	24	0	0332
+char218	"
+^u	24	0	0333
+char219	"
+:u	24	0	0334
+char220	"
+`u	24	0	0335
+char221	"
+'u	24	0	0336
+char222	"
+:y	24	0	0337
+char223	"
+\	24	0	0340
+rs	"
+di	24	0	0341
+char225	"
+S	24	0	0342
+T	24	0	0343
+*T	"
+U	24	0	0344
+V	24	0	0345
+W	24	0	0346
+X	24	0	0347
+*X	"
+Y	24	0	0350
+*U	"
+Z	24	0	0351
+*Z	"
+S2	24	0	0352
+char234	"
+^O	24	0	0353
+char235	"
+:O	24	0	0354
+char236	"
+`O	24	0	0355
+char237	"
+'O	24	0	0356
+char238	"
+~O	24	0	0357
+char239	"
+0	24	0	0360
+1	24	0	0361
+2	24	0	0362
+3	24	0	0363
+4	24	0	0364
+5	24	0	0365
+6	24	0	0366
+7	24	0	0367
+8	24	0	0370
+9	24	0	0371
+S3	24	0	0372
+char250	"
+^U	24	0	0373
+char251	"
+:U	24	0	0374
+char252	"
+`U	24	0	0375
+char253	"
+'U	24	0	0376
+char254	"
diff --git a/contrib/groff/devdvi/B b/contrib/groff/devdvi/B
index 240731a75e5e..53a2b9c86b9a 100644
--- a/contrib/groff/devdvi/B
+++ b/contrib/groff/devdvi/B
@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name B
 internalname cmbx10
 spacewidth 401952
@@ -6,14 +9,20 @@ checksum 452076118
 designsize 10485760
 kernpairs
 ff ' 114323
+ff cq 114323
 ff ? 114323
 ff ! 114323
 ff ) 114323
 ff rB 114323
 ff ] 114323
 ' ' -100488
+' cq -100488
+cq ' -100488
+cq cq -100488
 ' ? 133984
+cq ? 133984
 ' ! 133984
+cq ! 133984
 A t -33496
 A C -33496
 A O -33496
@@ -127,6 +136,7 @@ b w -33496
 c h -33496
 c k -33496
 f ' 114323
+f cq 114323
 f ? 114323
 f ! 114323
 f ) 114323
@@ -243,7 +253,8 @@ Do	602928,786432,58254	3	0044
 $	"
 %	1004880,786432,58254	3	0045
 &	937888,728178	2	0046
-'	334960,728178	2	0047
+cq	334960,728178	2	0047
+'	"
 (	468944,786432,262144	3	0050
 )	468944,786432,262144	3	0051
 *	602928,786432	2	0052
diff --git a/contrib/groff/devdvi/BI b/contrib/groff/devdvi/BI
index 16d0193c44ab..35e282469331 100644
--- a/contrib/groff/devdvi/BI
+++ b/contrib/groff/devdvi/BI
@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name BI
 internalname cmbxti10
 spacewidth 434573
@@ -6,6 +9,7 @@ ligatures ff fi fl ffi ffl 0
 checksum 1175274390
 designsize 10485760
 kernpairs
+ff cq 111848
 ff ' 111848
 ff ? 111848
 ff ! 111848
@@ -13,8 +17,13 @@ ff ) 111848
 ff rB 111848
 ff ] 111848
 ' ' -92624
+cq ' -92624
+' cq -92624
+cq cq -92624
 ' ? 123498
+cq ? 123498
 ' ! 123498
+cq ! 123498
 A n -30875
 A l -30875
 A r -30875
@@ -161,7 +170,9 @@ e d -61749
 e c -61749
 e g -61749
 e q -61749
+Fn cq 111848
 Fn ' 111848
+f cq 111848
 f ' 111848
 Fn ? 111848
 f ? 111848
@@ -175,6 +186,7 @@ f rB 111848
 f ] 111848
 l l 61749
 n ' -123498
+n cq -123498
 o e -61749
 o a -61749
 o o -61749
@@ -247,7 +259,8 @@ char163	910723,728178	2	0044
 Po	"
 %	990312,786432,58254,134859	3	0045
 &	928563,728178,0,89421	2	0046
-'	372824,728178,0,135734	2	0047
+cq	372824,728178,0,135734	2	0047
+'	"
 (	496322,786432,262144,165733	3	0050
 )	496322,786432,262144,34661	3	0051
 *	619819,786432,0,150296	2	0052
diff --git a/contrib/groff/devdvi/CW b/contrib/groff/devdvi/CW
index fd94235ce8b4..2039d23e3471 100644
--- a/contrib/groff/devdvi/CW
+++ b/contrib/groff/devdvi/CW
@@ -47,14 +47,16 @@ char216	550498,699051,58254	3	0037
 /O	"
 ---	550498,230104,116509	1	0040
 !	550498,640797	2	0041
-"	550498,640797	2	0042
+dq	550498,640797	2	0042
+"	"
 sh	550498,640797	2	0043
 #	"
 Do	550498,728178,87381	3	0044
 $	"
 %	550498,728178,87381	3	0045
 &	550498,640797	2	0046
-'	550498,640797	2	0047
+cq	550498,640797	2	0047
+'	"
 (	550498,728178,87379	3	0050
 )	550498,728178,87379	3	0051
 *	550498,546134	2	0052
diff --git a/contrib/groff/devdvi/CWI b/contrib/groff/devdvi/CWI
new file mode 100644
index 000000000000..7e7b54083eff
--- /dev/null
+++ b/contrib/groff/devdvi/CWI
@@ -0,0 +1,160 @@
+name CWI
+internalname cmitt10
+spacewidth 550498
+slant 14.036243
+checksum -538297224
+designsize 10485760
+charset
+*G	550498,640797,0,182045	2	0000
+*D	550498,640797,0,182045	2	0001
+*H	550498,640797,0,182045	2	0002
+*L	550498,640797,0,182045	2	0003
+*C	550498,640797,0,182045	2	0004
+*P	550498,640797,0,182045	2	0005
+*S	550498,640797,0,182045	2	0006
+*U	550498,640797,0,182045	2	0007
+*F	550498,640797,0,182045	2	0010
+*Q	550498,640797,0,182045	2	0011
+*W	550498,640797,0,182045	2	0012
+ff	550498,640797,0,182045	2	0013
+fi	550498,640797,0,182045	2	0014
+fl	550498,640797,0,182045	2	0015
+Fi	550498,407779,233018,182045	1	0016
+Fl	550498,407779,233018,182045	1	0017
+.i	550498,451470,0,182045	0	0020
+.j	550498,451470,233018,182045	1	0021
+ga	550498,640797,0,182045	2	0022
+char180	550498,640797,0,182045	2	0023
+aa	"
+ah	550498,593466,0,182045	2	0024
+ab	550498,640797,0,182045	2	0025
+char175	550498,593027,0,182045	2	0026
+a-	"
+ao	550498,640797,0,182045	2	0027
+char184	550498,0,203891,182045	1	0030
+ac	"
+char223	550498,640797,233018,182045	3	0031
+ss	"
+char230	550498,451470,0,182045	0	0032
+ae	"
+oe	550498,451470,0,182045	0	0033
+char248	550498,567979,116509,182045	3	0034
+/o	"
+char198	550498,640797,0,182045	2	0035
+AE	"
+OE	550498,640797,0,182045	2	0036
+char216	550498,699051,58254,182045	3	0037
+/O	"
+---	550498,230104,116509,182045	1	0040
+!	550498,640797,0,182045	2	0041
+dq	550498,640797,0,182045	2	0042
+"	"
+sh	550498,640797,0,182045	2	0043
+#	"
+Do	550498,640797,0,182045	2	0044
+$	"
+%	550498,728178,87381,182045	3	0045
+&	550498,640797,0,182045	2	0046
+cq	550498,640797,0,182045	2	0047
+'	"
+(	550498,728178,87379,182045	3	0050
+)	550498,728178,87379,182045	3	0051
+*	550498,546134,0,182045	2	0052
++	550498,556326,-84470,182045	2	0053
+,	550498,131072,145635,182045	1	0054
+\-	550498,556326,-84470,182045	2	0055
+-	"
+.	550498,131072,0,182045	0	0056
+sl	550498,728178,87379,182045	3	0057
+/	"
+0	550498,640797,0,182045	2	0060
+1	550498,640797,0,182045	2	0061
+2	550498,640797,0,182045	2	0062
+3	550498,640797,0,182045	2	0063
+4	550498,640797,233018,182045	3	0064
+5	550498,640797,0,182045	2	0065
+6	550498,640797,0,182045	2	0066
+7	550498,640797,233018,182045	3	0067
+8	550498,640797,0,182045	2	0070
+9	550498,640797,0,182045	2	0071
+:	550498,451470,0,182045	0	0072
+;	550498,451470,145635,182045	1	0073
+<	550498,582542,-58254,182045	2	0074
+=	550498,435813,-204984,182045	0	0075
+>	550498,582542,-58254,182045	2	0076
+?	550498,640797,0,182045	2	0077
+at	550498,640797,0,182045	2	0100
+@	"
+A	550498,640797,0,182045	2	0101
+B	550498,640797,0,182045	2	0102
+C	550498,640797,0,182045	2	0103
+D	550498,640797,0,182045	2	0104
+E	550498,640797,0,182045	2	0105
+F	550498,640797,0,182045	2	0106
+G	550498,640797,0,182045	2	0107
+H	550498,640797,0,182045	2	0110
+I	550498,640797,0,182045	2	0111
+J	550498,640797,0,182045	2	0112
+K	550498,640797,0,182045	2	0113
+L	550498,640797,0,182045	2	0114
+M	550498,640797,0,182045	2	0115
+N	550498,640797,0,182045	2	0116
+O	550498,640797,0,182045	2	0117
+P	550498,640797,0,182045	2	0120
+Q	550498,640797,145635,182045	3	0121
+R	550498,640797,0,182045	2	0122
+S	550498,640797,0,182045	2	0123
+T	550498,640797,0,182045	2	0124
+U	550498,640797,0,182045	2	0125
+V	550498,640797,0,182045	2	0126
+W	550498,640797,0,182045	2	0127
+X	550498,640797,0,182045	2	0130
+Y	550498,640797,0,182045	2	0131
+Z	550498,640797,0,182045	2	0132
+lB	550498,728178,87379,182045	3	0133
+[	"
+rs	550498,728178,87379,182045	3	0134
+\	"
+rB	550498,728178,87379,182045	3	0135
+]	"
+ha	550498,640797,0,182045	2	0136
+^	"
+a^	"
+_	550498,0,99757,182045	1	0137
+oq	550498,640797,0,182045	2	0140
+`	"
+a	550498,451470,0,182045	0	0141
+b	550498,640797,0,182045	2	0142
+c	550498,451470,0,182045	0	0143
+d	550498,640797,0,182045	2	0144
+e	550498,451470,0,182045	0	0145
+f	550498,640797,233018,182045	3	0146
+g	550498,451470,233018,182045	1	0147
+h	550498,640797,0,182045	2	0150
+i	550498,640797,0,182045	2	0151
+j	550498,640797,233018,182045	3	0152
+k	550498,640797,0,182045	2	0153
+l	550498,640797,0,182045	2	0154
+m	550498,451470,0,182045	0	0155
+n	550498,451470,0,182045	0	0156
+o	550498,451470,0,182045	0	0157
+p	550498,451470,233018,182045	1	0160
+q	550498,451470,233018,182045	1	0161
+r	550498,451470,0,182045	0	0162
+s	550498,451470,0,182045	0	0163
+t	550498,640797,0,182045	2	0164
+u	550498,451470,0,182045	0	0165
+v	550498,451470,0,182045	0	0166
+w	550498,451470,0,182045	0	0167
+x	550498,451470,0,182045	0	0170
+y	550498,451470,233018,182045	1	0171
+z	550498,451470,0,182045	0	0172
+{	550498,728178,87379,182045	3	0173
+lC	"
+|	550498,728178,87379,182045	3	0174
+ba	"
+}	550498,728178,87379,182045	3	0175
+rC	"
+~	550498,640797,0,182045	2	0176
+a~	"
+---	550498,640797,0,182045	2	0177
diff --git a/contrib/groff/devdvi/DESC.in b/contrib/groff/devdvi/DESC.in
index b605255d4f8d..54c1302bf022 100644
--- a/contrib/groff/devdvi/DESC.in
+++ b/contrib/groff/devdvi/DESC.in
@@ -3,8 +3,8 @@ unitwidth 131072
 res 57816
 hor 1
 vert 1
-sizes 500 600 700 800 900 1000 1100 1200 1400 1440 1600 1728 1800
+sizes 500 600 700 800 900 1000 1095 1200 1400 1440 1600 1728 1800
 2000 2074 2200 2400 2488 2800 3600 0
-fonts 13 R I B BI 0 0 0 0 0 MI S EX CW
+fonts 14 R I B BI 0 0 0 0 0 MI S EX CW CWI
 tcommand
 postpro grodvi
diff --git a/contrib/groff/devdvi/H b/contrib/groff/devdvi/H
index 96ae0f5fe0b1..f563c1898f27 100644
--- a/contrib/groff/devdvi/H
+++ b/contrib/groff/devdvi/H
@@ -5,13 +5,16 @@ ligatures ff fi fl ffi ffl 0
 checksum 1831058770
 designsize 10485760
 kernpairs
+ff cq 72818
 ff ' 72818
 ff ? 72818
 ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+cq ? 116509
 ' ? 116509
+cq ! 116509
 ' ! 116509
 A t -29128
 A C -29128
@@ -107,6 +110,7 @@ b q 29128
 b r -29128
 b y -29128
 b w -29128
+f cq 72818
 f ' 72818
 f ? 72818
 f ! 72818
@@ -198,7 +202,8 @@ Do	524290,786432,58254	3	0044
 $	"
 %	873816,786432,58254	3	0045
 &	795173,728178	2	0046
-'	291272,728178	2	0047
+cq	291272,728178	2	0047
+'	"
 (	407781,786432,262144	3	0050
 )	407781,786432,262144	3	0051
 *	524290,786432	2	0052
diff --git a/contrib/groff/devdvi/HB b/contrib/groff/devdvi/HB
index aaff8968112c..c0cc6e2cd9ed 100644
--- a/contrib/groff/devdvi/HB
+++ b/contrib/groff/devdvi/HB
@@ -5,13 +5,16 @@ ligatures ff fi fl ffi ffl 0
 checksum -244629176
 designsize 10485760
 kernpairs
+ff cq 80101
 ff ' 80101
 ff ? 80101
 ff ! 80101
 ff ) 80101
 ff rB 80101
 ff ] 80101
+cq ? 128160
 ' ? 128160
+cq ! 128160
 ' ! 128160
 A t -32040
 A C -32040
@@ -107,6 +110,7 @@ b q 32040
 b r -32040
 b y -32040
 b w -32040
+f cq 80101
 f ' 80101
 f ? 80101
 f ! 80101
@@ -198,7 +202,8 @@ Do	576720,786432,58254	3	0044
 $	"
 %	1079109,786432,58254	3	0045
 &	870906,728178	2	0046
-'	320400,728178	2	0047
+cq	320400,728178	2	0047
+'	"
 (	448560,786432,262144	3	0050
 )	448560,786432,262144	3	0051
 *	576720,786432	2	0052
diff --git a/contrib/groff/devdvi/HI b/contrib/groff/devdvi/HI
index dcfcced1a557..4f96bdb59f30 100644
--- a/contrib/groff/devdvi/HI
+++ b/contrib/groff/devdvi/HI
@@ -6,13 +6,16 @@ ligatures ff fi fl ffi ffl 0
 checksum -984248855
 designsize 10485760
 kernpairs
+ff cq 72818
 ff ' 72818
 ff ? 72818
 ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+cq ? 116509
 ' ? 116509
+cq ! 116509
 ' ! 116509
 A t -29128
 A C -29128
@@ -108,6 +111,7 @@ b q 29128
 b r -29128
 b y -29128
 b w -29128
+f cq 72818
 f ' 72818
 f ? 72818
 f ! 72818
@@ -199,7 +203,8 @@ Do	524290,786432,58254,116982	3	0044
 $	"
 %	873816,786432,58254,32782	3	0045
 &	795173,728178,0,32064	2	0046
-'	291272,728178,0,81960	2	0047
+cq	291272,728178,0,81960	2	0047
+'	"
 (	407781,786432,262144,138032	3	0050
 )	407781,786432,262144,26592	3	0051
 *	524290,786432,0,123469	2	0052
diff --git a/contrib/groff/devdvi/I b/contrib/groff/devdvi/I
index a46501669f44..2323eed5934a 100644
--- a/contrib/groff/devdvi/I
+++ b/contrib/groff/devdvi/I
@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name I
 special
 internalname cmti10
@@ -7,6 +10,7 @@ ligatures ff fi fl ffi ffl 0
 checksum -50321606
 designsize 10485760
 kernpairs
+ff cq 109373
 ff ' 109373
 ff ? 109373
 ff ! 109373
@@ -14,7 +18,12 @@ ff ) 109373
 ff rB 109373
 ff ] 109373
 ' ' -80390
+cq ' -80390
+' cq -80390
+cq cq -80390
+cq ? 107187
 ' ? 107187
+cq ! 107187
 ' ! 107187
 A n -26797
 A l -26797
@@ -162,7 +171,9 @@ e d -53594
 e c -53594
 e g -53594
 e q -53594
+Fn cq 109373
 Fn ' 109373
+f cq 109373
 f ' 109373
 Fn ? 109373
 f ? 109373
@@ -175,6 +186,7 @@ Fn ] 109373
 f rB 109373
 f ] 109373
 l l 53594
+n cq -107187
 n ' -107187
 o e -53594
 o a -53594
@@ -248,7 +260,8 @@ char163	806453,728178	2	0044
 Po	"
 %	857498,786432,58254,143014	3	0045
 &	803904,728178,0,101654	2	0046
-'	321562,728178,0,130200	2	0047
+cq	321562,728178,0,130200	2	0047
+'	"
 (	428749,786432,262144,169811	3	0050
 )	428749,786432,262144,38739	3	0051
 *	535936,786432,0,156413	2	0052
diff --git a/contrib/groff/devdvi/Makefile.sub b/contrib/groff/devdvi/Makefile.sub
index 8c3248fdfca8..5f30be233452 100644
--- a/contrib/groff/devdvi/Makefile.sub
+++ b/contrib/groff/devdvi/Makefile.sub
@@ -1,5 +1,5 @@
 DEV=dvi
-DEVFILES=DESC R I B BI CW MI S EX H HI HB SA SB \
+DEVFILES=DESC R I B BI CW CWI MI S EX H HI HB SA SB \
   generate/CompileFonts 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
diff --git a/contrib/groff/devdvi/R b/contrib/groff/devdvi/R
index 3e49b938e791..2c7fe300b8f7 100644
--- a/contrib/groff/devdvi/R
+++ b/contrib/groff/devdvi/R
@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name R
 special
 internalname cmr10
@@ -6,6 +9,7 @@ ligatures ff fi fl ffi ffl 0
 checksum 1274110073
 designsize 10485760
 kernpairs
+ff cq 81557
 ff ' 81557
 ff ? 81557
 ff ! 81557
@@ -13,8 +17,13 @@ ff ) 81557
 ff rB 81557
 ff ] 81557
 ' ' -87382
+cq ' -87382
+' cq -87382
+cq cq -87382
 ' ? 116509
+cq ? 116509
 ' ! 116509
+cq ! 116509
 *A t -29128
 A t -29128
 *A C -29128
@@ -195,6 +204,7 @@ b w -29128
 c h -29128
 c k -29128
 f ' 81557
+f cq 81557
 f ? 81557
 f ! 81557
 f ) 81557
@@ -311,7 +321,8 @@ Do	524290,786432,58254	3	0044
 $	"
 %	873816,786432,58254	3	0045
 &	815562,728178	2	0046
-'	291272,728178	2	0047
+cq	291272,728178	2	0047
+'	"
 (	407781,786432,262144	3	0050
 )	407781,786432,262144	3	0051
 *	524290,786432	2	0052
diff --git a/contrib/groff/devdvi/S b/contrib/groff/devdvi/S
index 11b79ff9c6db..75abc6c84357 100644
--- a/contrib/groff/devdvi/S
+++ b/contrib/groff/devdvi/S
@@ -8,6 +8,7 @@ charset
 mi	815562,611670,87382	3	0000
 \-	"
 md	291272,466035,-58253	2	0001
+pc	"
 char215	815562,611670,87382	3	0002
 mu	"
 **	524290,487880,-36408	2	0003
diff --git a/contrib/groff/devdvi/SA b/contrib/groff/devdvi/SA
index f2b258f16fd4..91879fc7cce2 100644
--- a/contrib/groff/devdvi/SA
+++ b/contrib/groff/devdvi/SA
@@ -4,39 +4,39 @@ internalname msam10
 checksum -1749815603
 designsize 10485760
 charset
-boxdot	815562,709446	2	0000
-boxplus	815562,709446	2	0001
-boxtimes	815562,709446	2	0002
-square	815562,709446	2	0003
-blacksquare	815562,709446	2	0004
+boxdot	815562,707789	2	0000
+boxplus	815562,707789	2	0001
+boxtimes	815562,707789	2	0002
+square	815562,707789	2	0003
+blacksquare	815562,707789	2	0004
 centerdot	291272,576570	2	0005
-lz	699053,728178,116509	3	0006
+lz	699053,725867,116509	3	0006
 lozenge	"
-blacklozenge	699053,728178,116509	3	0007
+blacklozenge	699053,725867,116509	3	0007
 circlearrowright	815562,610248,85960	3	0010
 circlearrowleft	815562,610248,85960	3	0011
 rightleftharpoons	1048579,547770,14197	3	0012
 leftrightharpoons	1048579,547770,14197	3	0013
-boxminus	815562,709446	2	0014
-Vdash	757307,728178	2	0015
-Vvdash	932070,728178	2	0016
-vDash	640798,728178	2	0017
+boxminus	815562,707789	2	0014
+Vdash	757307,725867	2	0015
+Vvdash	932070,725867	2	0016
+vDash	640798,725867	2	0017
 twoheadrightarrow	1048579,547770,14197	3	0020
 twoheadleftarrow	1048579,547770,14197	3	0021
-leftleftarrows	1048579,709446,189584	3	0022
-rightrightarrows	1048579,709446,189584	3	0023
-upuparrows	873816,728178,203888	3	0024
-downdownarrows	873816,728178,203888	3	0025
-upharpoonright	436909,728178,203888	3	0026
-downharpoonright	436909,728178,203888	3	0027
-upharpoonleft	436909,728178,203888	3	0030
-downharpoonleft	436909,728178,203888	3	0031
+leftleftarrows	1048579,707789,189584	3	0022
+rightrightarrows	1048579,707789,189584	3	0023
+upuparrows	873816,725867,203888	3	0024
+downdownarrows	873816,725867,203888	3	0025
+upharpoonright	436909,725867,203888	3	0026
+downharpoonright	436909,725867,203888	3	0027
+upharpoonleft	436909,725867,203888	3	0030
+downharpoonleft	436909,725867,203888	3	0031
 rightarrowtail	1165088,547770,14197	3	0032
 leftarrowtail	1165088,547770,14197	3	0033
-leftrightarrows	1048579,709446,189584	3	0034
-rightleftarrows	1048579,709446,189584	3	0035
-Lsh	524290,728178	2	0036
-Rsh	524290,728178	2	0037
+leftrightarrows	1048579,707789,189584	3	0034
+rightleftarrows	1048579,707789,189584	3	0035
+Lsh	524290,725867	2	0036
+Rsh	524290,725867	2	0037
 rightsquigarrow	1048579,396238,-139592	0	0040
 leftrightsquigarrow	1456360,396238,-139592	0	0041
 looparrowleft	1048579,576570	2	0042
@@ -46,10 +46,10 @@ succsim	815562,765021,240733	3	0045
 gtrsim	815562,765021,240733	3	0046
 gtrapprox	815562,792549,268261	3	0047
 multimap	1165088,576570	2	0050
-3d	699053,728178	2	0051
+3d	699053,725867	2	0051
 tf	"
 therefore	"
-because	699053,728178	2	0052
+because	699053,725867	2	0052
 doteqdot	815562,610248,85960	3	0053
 triangleq	815562,961197,85960	3	0054
 precsim	815562,765021,240733	3	0055
@@ -62,7 +62,7 @@ curlyeqsucc	815562,667592,143304	3	0063
 preccurlyeq	815562,667592,143304	3	0064
 leqq	815562,792549,268261	3	0065
 leqslant	815562,667592,143304	3	0066
-lessgtr	815562,709446,189584	3	0067
+lessgtr	815562,707789,189584	3	0067
 backprime	288358,576570	2	0070
 ---	524290,486557,-37731	2	0071
 risingdotseq	815562,610248,85960	3	0072
@@ -70,14 +70,14 @@ fallingdotseq	815562,610248,85960	3	0073
 succcurlyeq	815562,667592,143304	3	0074
 geqq	815562,792549,268261	3	0075
 geqslant	815562,667592,143304	3	0076
-gtrless	815562,709446,189584	3	0077
+gtrless	815562,707789,189584	3	0077
 sqsubset	815562,576570,36882	3	0100
 sqsupset	815562,576570,36882	3	0101
 vartriangleright	815562,576570,36882	3	0102
 vartriangleleft	815562,576570,36882	3	0103
 trianglerighteq	815562,667592,143304	3	0104
 trianglelefteq	815562,667592,143304	3	0105
-bigstar	990323,728178,203888	3	0106
+bigstar	990323,725867,203888	3	0106
 between	524290,792549,268261	3	0107
 blacktriangledown	757307,576570	2	0110
 blacktriangleright	815562,576570,36882	3	0111
@@ -87,55 +87,55 @@ blacktriangleleft	815562,576570,36882	3	0112
 vartriangle	757307,576570	2	0115
 blacktriangle	757307,576570	2	0116
 triangledown	757307,576570	2	0117
-eqcirc	815562,728178	2	0120
+eqcirc	815562,725867	2	0120
 lesseqgtr	815562,928714,404426	3	0121
 gtreqless	815562,928714,404426	3	0122
 lesseqqgtr	815562,1030294,506006	3	0123
 gtreqqless	815562,1030294,506006	3	0124
-char165	786434,709446,0,26214	2	0125
+char165	786434,707789,0,26214	2	0125
 Ye	"
 yen	"
 Rrightarrow	1048579,667592,143304	3	0126
 Lleftarrow	1048579,667592,143304	3	0127
-OK	873816,728178	2	0130
+OK	873816,725867	2	0130
 checkmark	"
-veebar	640798,728178,203888	3	0131
-barwedge	640798,728178,203888	3	0132
+veebar	640798,725867,203888	3	0131
+barwedge	640798,725867,203888	3	0132
 doublebarwedge	640798,792549,203888	3	0133
-/_	757307,728178	2	0134
+/_	757307,725867	2	0134
 angle	"
-measuredangle	757307,728178	2	0135
+measuredangle	757307,725867	2	0135
 sphericalangle	757307,547770,36882	3	0136
-varpropto	815562,728178	2	0137
-smallsmile	815562,728178,203888	3	0140
-smallfrown	815562,728178,203888	3	0141
+varpropto	815562,725867	2	0137
+smallsmile	815562,725867,203888	3	0140
+smallfrown	815562,725867,203888	3	0141
 Subset	815562,576570,36882	3	0142
 Supset	815562,576570,36882	3	0143
 Cup	699053,576570	2	0144
 Cap	699053,576570	2	0145
 curlywedge	797355,576570	2	0146
 curlyvee	797355,576570	2	0147
-leftthreetimes	815562,728178	2	0150
-rightthreetimes	815562,728178	2	0151
+leftthreetimes	815562,725867	2	0150
+rightthreetimes	815562,725867	2	0151
 subseteqq	815562,792549,268261	3	0152
 supseteqq	815562,792549,268261	3	0153
 bumpeq	815562,576570,63568	3	0154
 Bumpeq	815562,576570,63568	3	0155
 lll	1398106,576570,36882	3	0156
 ggg	1398106,576570,36882	3	0157
-ulcorner	524290,728178	2	0160
-urcorner	524290,728178	2	0161
-rg	992648,709446,159430	3	0162
+ulcorner	524290,725867	2	0160
+urcorner	524290,725867	2	0161
+rg	992648,725867,163146	3	0162
 char174	"
 circledR	"
-circledS	946045,709446,159430	3	0163
-pitchfork	699053,728178	2	0164
-dotplus	815562,728178,85960	3	0165
+circledS	946045,725867,163146	3	0163
+pitchfork	699053,725867	2	0164
+dotplus	815562,725867,85960	3	0165
 backsim	815562,396238,-139592	0	0166
 backsimeq	815562,486557,-37731	2	0167
 llcorner	524290,396238	0	0170
 lrcorner	524290,396238	0	0171
-maltese	873816,728178	2	0172
+maltese	873816,725867	2	0172
 complement	524290,865080	2	0173
 intercal	582544,451470,203888	1	0174
 circledcirc	815562,610248,85960	3	0175
diff --git a/contrib/groff/devdvi/SB b/contrib/groff/devdvi/SB
index a4be59db29c6..811b351a1efd 100644
--- a/contrib/groff/devdvi/SB
+++ b/contrib/groff/devdvi/SB
@@ -2,7 +2,7 @@ name SB
 special
 internalname msbm10
 spacewidth 314576
-slant 87.709390
+slant 14.036243
 checksum -2001332536
 designsize 10485760
 charset
diff --git a/contrib/groff/devdvi/generate/Makefile b/contrib/groff/devdvi/generate/Makefile
index aeca9774fe8f..c8cd65640d37 100644
--- a/contrib/groff/devdvi/generate/Makefile
+++ b/contrib/groff/devdvi/generate/Makefile
@@ -1,32 +1,35 @@
-#Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.com)
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
+#      Written by James Clark (jjc@jclark.com)
 #
-#This file is part of groff.
+# 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 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.
+# 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.
+# 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 is set up so you can do:
 #   make -f generate/Makefile
 # in the parent directory of the directory containing this file.
 
+# Note that the following font files have manually added kerning values for
+# `` and '': B, BI, I, R.
+
 srcdir=.
 tfmdir=/usr/local/lib/groff-tfm
 gfdir=/usr/local/lib/groff-gf
 
 TFMTODIT=tfmtodit
-FONTS=R I B BI CW MI S EX H HI HB SA SB
+FONTS=R I B BI CW CWI MI S EX H HI HB SA SB
 SPECIALFLAG=-s
 
 all: $(FONTS)
@@ -54,33 +57,44 @@ BI: $(srcdir)/texi.map
 # CW is special because it contains "
 
 CW: $(srcdir)/textt.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/cmtt10.tfm $(srcdir)/textt.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/cmtt10.tfm $(srcdir)/textt.map $@
+
+CWI: $(srcdir)/textt.map
+	$(TFMTODIT) \
+	  $(tfmdir)/cmitt10.tfm $(srcdir)/textt.map $@
 
 MI: $(srcdir)/texmi.map
-	$(TFMTODIT) $(SPECIALFLAG) -k 0177 $(tfmdir)/cmmi10.tfm $(srcdir)/texmi.map $@
+	$(TFMTODIT) $(SPECIALFLAG) -k 0177 \
+	  $(tfmdir)/cmmi10.tfm $(srcdir)/texmi.map $@
 
 S: $(srcdir)/texsy.map
-	$(TFMTODIT) $(SPECIALFLAG) -k 060 $(tfmdir)/cmsy10.tfm $(srcdir)/texsy.map $@
+	$(TFMTODIT) $(SPECIALFLAG) -k 060 \
+	  $(tfmdir)/cmsy10.tfm $(srcdir)/texsy.map $@
 
 EX: $(srcdir)/texex.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/cmex10.tfm $(srcdir)/texex.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/cmex10.tfm $(srcdir)/texex.map $@
 
-H: $(srcdir)/texr.map
-	$(TFMTODIT) -g $(gfdir)/cmss10.300gf $(tfmdir)/cmss10.tfm $(srcdir)/texb.map $@
+H: $(srcdir)/texb.map
+	$(TFMTODIT) -g $(gfdir)/cmss10.300gf \
+	  $(tfmdir)/cmss10.tfm $(srcdir)/texb.map $@
 
-HB: $(srcdir)/texr.map
+HB: $(srcdir)/texb.map
 	$(TFMTODIT) -g $(gfdir)/cmssbx10.300gf \
 	  $(tfmdir)/cmssbx10.tfm $(srcdir)/texb.map $@
 
-HI: $(srcdir)/texr.map
+HI: $(srcdir)/texb.map
 	$(TFMTODIT) -g $(gfdir)/cmssi10.300gf \
 	  $(tfmdir)/cmssi10.tfm $(srcdir)/texb.map $@
 
 SA: $(srcdir)/msam.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/msam10.tfm $(srcdir)/msam.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/msam10.tfm $(srcdir)/msam.map $@
 
 SB: $(srcdir)/msbm.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/msbm10.tfm $(srcdir)/msbm.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/msbm10.tfm $(srcdir)/msbm.map $@
 
 clean:
 
diff --git a/contrib/groff/devdvi/generate/cork.map b/contrib/groff/devdvi/generate/cork.map
index 52cac9c8b10d..4e4a35adfc75 100644
--- a/contrib/groff/devdvi/generate/cork.map
+++ b/contrib/groff/devdvi/generate/cork.map
@@ -31,12 +31,12 @@
 30 Fi
 31 Fl
 33 !
-34 "
+34 " dq
 35 # sh
 36 $ Do
 37 %
 38 &
-39 ' aq
+39 ' aq cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texb.map b/contrib/groff/devdvi/generate/texb.map
index 67008339e9f7..b2bcd1536c43 100644
--- a/contrib/groff/devdvi/generate/texb.map
+++ b/contrib/groff/devdvi/generate/texb.map
@@ -36,7 +36,7 @@
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texi.map b/contrib/groff/devdvi/generate/texi.map
index 835c6421f611..4ca802a28e13 100644
--- a/contrib/groff/devdvi/generate/texi.map
+++ b/contrib/groff/devdvi/generate/texi.map
@@ -36,7 +36,7 @@
 36 Po char163
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texr.map b/contrib/groff/devdvi/generate/texr.map
index bebf67b80c31..7db0e5f71a1c 100644
--- a/contrib/groff/devdvi/generate/texr.map
+++ b/contrib/groff/devdvi/generate/texr.map
@@ -36,7 +36,7 @@
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texsy.map b/contrib/groff/devdvi/generate/texsy.map
index 2c970bc2a47e..fe98eb2508df 100644
--- a/contrib/groff/devdvi/generate/texsy.map
+++ b/contrib/groff/devdvi/generate/texsy.map
@@ -1,5 +1,5 @@
 0 \- mi
-1 md
+1 md pc
 2 mu char215
 3 **
 4 di char247
diff --git a/contrib/groff/devdvi/generate/textt.map b/contrib/groff/devdvi/generate/textt.map
index 1461d0abe9ec..80e8911e7104 100644
--- a/contrib/groff/devdvi/generate/textt.map
+++ b/contrib/groff/devdvi/generate/textt.map
@@ -31,12 +31,12 @@
 30 OE
 31 /O char216
 33 !
-34 "
+34 " dq
 35 # sh
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devhtml/CB b/contrib/groff/devhtml/CB
index 7ca40b89c0e1..b726465f0cf2 100644
--- a/contrib/groff/devhtml/CB
+++ b/contrib/groff/devhtml/CB
@@ -3,14 +3,16 @@ spacewidth 9
 charset
 ---	9,1	0	040
 !	9,9	0	041
-"	9,10	0	042
+"	9,10	0	042	&quot;
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,11,1	0	044
 Do	"
 %	9,10	0	045
-&	9,8	0	046
+&	9,8	0	046	&amp;
 '	9,10	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,9	0	052
@@ -32,10 +34,10 @@ sl	"
 9	9,10	0	071
 :	9,7	0	072
 ;	9,7,2	0	073
-<	9,8	0	074
+<	9,8	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,8	0	076
+>	9,8	0	076	&gt;
 ?	9,9	0	077
 @	9,9	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	9,7,2	0	0241
+r!	9,7,2	0	0241	&iexcl;
 ¡	"
-ct	9,9,1	0	0242
+ct	9,9,1	0	0242	&cent;
 ¢	"
-Po	9,9	0	0243
+Po	9,9	0	0243	&pound;
 £	"
-Cs	9,7	0	0244
+Cs	9,7	0	0244	&curren;
 ¤	"
-Ye	9,9	0	0245
+Ye	9,9	0	0245	&yen;
 ¥	"
-bb	9,9,2	0	0246
+bb	9,9,2	0	0246	&brvbar;
 ¦	"
-sc	9,10,1	0	0247
+sc	9,10,1	0	0247	&sect;
 §	"
-ad	9,10	0	0250
+ad	9,10	0	0250	&uml;
 ¨	"
-co	9,9	0	0251
+co	9,9	0	0251	&copy;
 ©	"
-Of	9,9	0	0252
+Of	9,9	0	0252	&ordf;
 ª	"
-Fo	9,6	0	0253
+Fo	9,6	0	0253	&laquo;
 «	"
-no	9,5	0	0254
+no	9,5	0	0254	&not;
 ¬	"
--	9,5	0	055
-hy	"
+-	9,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	9,9	0	0256
+rg	9,9	0	0256	&reg;
 ®	"
-a-	9,9	0	0257
+a-	9,9	0	0257	&macr;
 ¯	"
-de	9,9	0	0260
+de	9,9	0	0260	&deg;
 °	"
-+-	9,8	0	0261
++-	9,8	0	0261	&plusmn;
 ±	"
-S2	9,10	0	0262
+S2	9,10	0	0262	&sup2;
 ²	"
-S3	9,10	0	0263
+S3	9,10	0	0263	&sup3;
 ³	"
-aa	9,9	0	0264
+aa	9,9	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,10,1	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,10,1	0	0266	&para;
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267	&middot;
 ·	"
-ac	9,1,3	0	0270
+ac	9,1,3	0	0270	&cedil;
 ¸	"
-S1	9,10	0	0271
+S1	9,10	0	0271	&sup1;
 ¹	"
-Om	9,9	0	0272
+Om	9,9	0	0272	&ordm;
 º	"
-Fc	9,6	0	0273
+Fc	9,6	0	0273	&raquo;
 »	"
-14	9,10	0	0274
+14	9,10	0	0274	&frac14;
 ¼	"
-12	9,10	0	0275
+12	9,10	0	0275	&frac12;
 ½	"
-34	9,10	0	0276
+34	9,10	0	0276	&frac34;
 ¾	"
-r?	9,7,2	0	0277
+r?	9,7,2	0	0277	&iquest;
 ¿	"
-`A	9,12	0	0300
+`A	9,12	0	0300	&Agrave;
 À	"
-'A	9,12	0	0301
+'A	9,12	0	0301	&Aacute;
 Á	"
-^A	9,12	0	0302
+^A	9,12	0	0302	&Acirc;
 Â	"
-~A	9,12	0	0303
+~A	9,12	0	0303	&Atilde;
 Ã	"
-:A	9,12	0	0304
+:A	9,12	0	0304	&Auml;
 Ä	"
-oA	9,12	0	0305
+oA	9,12	0	0305	&Aring;
 Å	"
-AE	9,9	0	0306
+AE	9,9	0	0306	&AElig;
 Æ	"
-,C	9,9,4	0	0307
+,C	9,9,4	0	0307	&Ccedil;
 Ç	"
-`E	9,12	0	0310
+`E	9,12	0	0310	&Egrave;
 È	"
-'E	9,12	0	0311
+'E	9,12	0	0311	&Eacute;
 É	"
-^E	9,12	0	0312
+^E	9,12	0	0312	&Ecirc;
 Ê	"
-:E	9,12	0	0313
+:E	9,12	0	0313	&Euml;
 Ë	"
-`I	9,12	0	0314
+`I	9,12	0	0314	&Igrave;
 Ì	"
-'I	9,12	0	0315
+'I	9,12	0	0315	&Iacute;
 Í	"
-^I	9,12	0	0316
+^I	9,12	0	0316	&Icirc;
 Î	"
-:I	9,12	0	0317
+:I	9,12	0	0317	&Iuml;
 Ï	"
--D	9,9	0	0320
+-D	9,9	0	0320	&ETH;
 Ð	"
-~N	9,12	0	0321
+~N	9,12	0	0321	&Ntilde;
 Ñ	"
-`O	9,12	0	0322
+`O	9,12	0	0322	&Ograve;
 Ò	"
-'O	9,12	0	0323
+'O	9,12	0	0323	&Oacute;
 Ó	"
-^O	9,12	0	0324
+^O	9,12	0	0324	&Ocirc;
 Ô	"
-~O	9,12	0	0325
+~O	9,12	0	0325	&Otilde;
 Õ	"
-:O	9,12	0	0326
+:O	9,12	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	9,10	0	0330
+/O	9,10	0	0330	&Oslash;
 Ø	"
-`U	9,12	0	0331
+`U	9,12	0	0331	&Ugrave;
 Ù	"
-'U	9,12	0	0332
+'U	9,12	0	0332	&Uacute;
 Ú	"
-^U	9,12	0	0333
+^U	9,12	0	0333	&Ucirc;
 Û	"
-:U	9,12	0	0334
+:U	9,12	0	0334	&Uuml;
 Ü	"
-'Y	9,12	0	0335
+'Y	9,12	0	0335	&Yacute;
 Ý	"
-TP	9,9	0	0336
+TP	9,9	0	0336	&THORN;
 Þ	"
-ss	9,9	0	0337
+ss	9,9	0	0337	&szlig;
 ß	"
-`a	9,10	0	0340
+`a	9,10	0	0340	&agrave;
 à	"
-'a	9,10	0	0341
+'a	9,10	0	0341	&aacute;
 á	"
-^a	9,10	0	0342
+^a	9,10	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,10	0	0344
+:a	9,10	0	0344	&auml;
 ä	"
-oa	9,10	0	0345
+oa	9,10	0	0345	&aring;
 å	"
-ae	9,7	0	0346
+ae	9,7	0	0346	&aelig;
 æ	"
-,c	9,7,4	0	0347
+,c	9,7,4	0	0347	&ccedil;
 ç	"
-`e	9,10	0	0350
+`e	9,10	0	0350	&egrave;
 è	"
-'e	9,10	0	0351
+'e	9,10	0	0351	&eacute;
 é	"
-^e	9,10	0	0352
+^e	9,10	0	0352	&ecirc;
 ê	"
-:e	9,10	0	0353
+:e	9,10	0	0353	&euml;
 ë	"
-`i	9,10	0	0354
+`i	9,10	0	0354	&igrave;
 ì	"
-'i	9,10	0	0355
+'i	9,10	0	0355	&iacute;
 í	"
-^i	9,10	0	0356
+^i	9,10	0	0356	&icirc;
 î	"
-:i	9,10	0	0357
+:i	9,10	0	0357	&iuml;
 ï	"
-Sd	9,10	0	0360
+Sd	9,10	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	9,10	0	0362
+`o	9,10	0	0362	&ograve;
 ò	"
-'o	9,10	0	0363
+'o	9,10	0	0363	&oacute;
 ó	"
-^o	9,10	0	0364
+^o	9,10	0	0364	&ocirc;
 ô	"
-~o	9,10	0	0365
+~o	9,10	0	0365	&otilde;
 õ	"
-:o	9,10	0	0366
+:o	9,10	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	9,7	0	0370
+/o	9,7	0	0370	&oslash;
 ø	"
-`u	9,10	0	0371
+`u	9,10	0	0371	&ugrave;
 ù	"
-'u	9,10	0	0372
+'u	9,10	0	0372	&uacute;
 ú	"
-^u	9,10	0	0373
+^u	9,10	0	0373	&ucirc;
 û	"
-:u	9,10	0	0374
+:u	9,10	0	0374	&uuml;
 ü	"
-'y	9,10,3	0	0375
+'y	9,10,3	0	0375	&yacute;
 ý	"
-Tp	9,9,3	0	0376
+Tp	9,9,3	0	0376	&thorn;
 þ	"
-:y	9,10,3	0	0377
+:y	9,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/CBI b/contrib/groff/devhtml/CBI
index 551ed26161d8..54d69b958c16 100644
--- a/contrib/groff/devhtml/CBI
+++ b/contrib/groff/devhtml/CBI
@@ -3,14 +3,16 @@ spacewidth 9
 charset
 ---	9,1	0	040
 !	9,10	0	041
-"	9,9	0	042
+"	9,9	0	042	&quot;
+dq	"
 #	9,11,1	0	043
 sh	"
 $	9,11,1	0	044
 Do	"
 %	9,10	0	045
-&	9,8	0	046
+&	9,8	0	046	&amp;
 '	9,9	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,10	0	052
@@ -32,10 +34,10 @@ sl	"
 9	9,10	0	071
 :	9,7	0	072
 ;	9,7,2	0	073
-<	9,8	0	074
+<	9,8	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,8	0	076
+>	9,8	0	076	&gt;
 ?	9,9	0	077
 @	9,9	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	9,7,3	0	0241
+r!	9,7,3	0	0241	&iexcl;
 ¡	"
-ct	9,9,1	0	0242
+ct	9,9,1	0	0242	&cent;
 ¢	"
-Po	9,9	0	0243
+Po	9,9	0	0243	&pound;
 £	"
-Cs	9,7	0	0244
+Cs	9,7	0	0244	&curren;
 ¤	"
-Ye	9,9	0	0245
+Ye	9,9	0	0245	&yen;
 ¥	"
-bb	9,10,2	0	0246
+bb	9,10,2	0	0246	&brvbar;
 ¦	"
-sc	9,10,1	0	0247
+sc	9,10,1	0	0247	&sect;
 §	"
-ad	9,10	0	0250
+ad	9,10	0	0250	&uml;
 ¨	"
-co	9,9	0	0251
+co	9,9	0	0251	&copy;
 ©	"
-Of	9,9	0	0252
+Of	9,9	0	0252	&ordf;
 ª	"
-Fo	9,6	0	0253
+Fo	9,6	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	9,5	0	055
-hy	"
+-	9,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	9,9	0	0256
+rg	9,9	0	0256	&reg;
 ®	"
-a-	9,9	0	0257
+a-	9,9	0	0257	&macr;
 ¯	"
-de	9,10	0	0260
+de	9,10	0	0260	&deg;
 °	"
-+-	9,8	0	0261
++-	9,8	0	0261	&plusmn;
 ±	"
-S2	9,10	0	0262
+S2	9,10	0	0262	&sup2;
 ²	"
-S3	9,10	0	0263
+S3	9,10	0	0263	&sup3;
 ³	"
-aa	9,10	0	0264
+aa	9,10	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,10,1	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,10,1	0	0266	&para;
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267	&middot;
 ·	"
-ac	9,1,3	0	0270
+ac	9,1,3	0	0270	&cedil;
 ¸	"
-S1	9,10	0	0271
+S1	9,10	0	0271	&sup1;
 ¹	"
-Om	9,9	0	0272
+Om	9,9	0	0272	&ordm;
 º	"
-Fc	9,6	0	0273
+Fc	9,6	0	0273	&raquo;
 »	"
-14	9,10	0	0274
+14	9,10	0	0274	&frac14;
 ¼	"
-12	9,10	0	0275
+12	9,10	0	0275	&frac12;
 ½	"
-34	9,10	0	0276
+34	9,10	0	0276	&frac34;
 ¾	"
-r?	9,7,2	0	0277
+r?	9,7,2	0	0277	&iquest;
 ¿	"
-`A	9,12	0	0300
+`A	9,12	0	0300	&Agrave;
 À	"
-'A	9,12	0	0301
+'A	9,12	0	0301	&Aacute;
 Á	"
-^A	9,12	0	0302
+^A	9,12	0	0302	&Acirc;
 Â	"
-~A	9,12	0	0303
+~A	9,12	0	0303	&Atilde;
 Ã	"
-:A	9,12	0	0304
+:A	9,12	0	0304	&Auml;
 Ä	"
-oA	9,12	0	0305
+oA	9,12	0	0305	&Aring;
 Å	"
-AE	9,9	0	0306
+AE	9,9	0	0306	&AElig;
 Æ	"
-,C	9,9,4	0	0307
+,C	9,9,4	0	0307	&Ccedil;
 Ç	"
-`E	9,12	0	0310
+`E	9,12	0	0310	&Egrave;
 È	"
-'E	9,12	0	0311
+'E	9,12	0	0311	&Eacute;
 É	"
-^E	9,12	0	0312
+^E	9,12	0	0312	&Ecirc;
 Ê	"
-:E	9,12	0	0313
+:E	9,12	0	0313	&Euml;
 Ë	"
-`I	9,12	0	0314
+`I	9,12	0	0314	&Igrave;
 Ì	"
-'I	9,12	0	0315
+'I	9,12	0	0315	&Iacute;
 Í	"
-^I	9,12	0	0316
+^I	9,12	0	0316	&Icirc;
 Î	"
-:I	9,12	0	0317
+:I	9,12	0	0317	&Iuml;
 Ï	"
--D	9,9	0	0320
+-D	9,9	0	0320	&ETH;
 Ð	"
-~N	9,12	0	0321
+~N	9,12	0	0321	&Ntilde;
 Ñ	"
-`O	9,12	0	0322
+`O	9,12	0	0322	&Ograve;
 Ò	"
-'O	9,12	0	0323
+'O	9,12	0	0323	&Oacute;
 Ó	"
-^O	9,12	0	0324
+^O	9,12	0	0324	&Ocirc;
 Ô	"
-~O	9,12	0	0325
+~O	9,12	0	0325	&Otilde;
 Õ	"
-:O	9,12	0	0326
+:O	9,12	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	9,9	0	0330
+/O	9,9	0	0330	&Oslash;
 Ø	"
-`U	9,12	0	0331
+`U	9,12	0	0331	&Ugrave;
 Ù	"
-'U	9,12	0	0332
+'U	9,12	0	0332	&Uacute;
 Ú	"
-^U	9,12	0	0333
+^U	9,12	0	0333	&Ucirc;
 Û	"
-:U	9,12	0	0334
+:U	9,12	0	0334	&Uuml;
 Ü	"
-'Y	9,12	0	0335
+'Y	9,12	0	0335	&Yacute;
 Ý	"
-TP	9,9	0	0336
+TP	9,9	0	0336	&THORN;
 Þ	"
-ss	9,9	0	0337
+ss	9,9	0	0337	&szlig;
 ß	"
-`a	9,10	0	0340
+`a	9,10	0	0340	&agrave;
 à	"
-'a	9,10	0	0341
+'a	9,10	0	0341	&aacute;
 á	"
-^a	9,10	0	0342
+^a	9,10	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,10	0	0344
+:a	9,10	0	0344	&auml;
 ä	"
-oa	9,10	0	0345
+oa	9,10	0	0345	&aring;
 å	"
-ae	9,7	0	0346
+ae	9,7	0	0346	&aelig;
 æ	"
-,c	9,7,4	0	0347
+,c	9,7,4	0	0347	&ccedil;
 ç	"
-`e	9,10	0	0350
+`e	9,10	0	0350	&egrave;
 è	"
-'e	9,10	0	0351
+'e	9,10	0	0351	&eacute;
 é	"
-^e	9,10	0	0352
+^e	9,10	0	0352	&ecirc;
 ê	"
-:e	9,10	0	0353
+:e	9,10	0	0353	&euml;
 ë	"
-`i	9,10	0	0354
+`i	9,10	0	0354	&igrave;
 ì	"
-'i	9,10	0	0355
+'i	9,10	0	0355	&iacute;
 í	"
-^i	9,10	0	0356
+^i	9,10	0	0356	&icirc;
 î	"
-:i	9,10	0	0357
+:i	9,10	0	0357	&iuml;
 ï	"
-Sd	9,10	0	0360
+Sd	9,10	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	9,10	0	0362
+`o	9,10	0	0362	&ograve;
 ò	"
-'o	9,10	0	0363
+'o	9,10	0	0363	&oacute;
 ó	"
-^o	9,10	0	0364
+^o	9,10	0	0364	&ocirc;
 ô	"
-~o	9,10	0	0365
+~o	9,10	0	0365	&otilde;
 õ	"
-:o	9,10	0	0366
+:o	9,10	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	9,8	0	0370
+/o	9,8	0	0370	&oslash;
 ø	"
-`u	9,10	0	0371
+`u	9,10	0	0371	&ugrave;
 ù	"
-'u	9,10	0	0372
+'u	9,10	0	0372	&uacute;
 ú	"
-^u	9,10	0	0373
+^u	9,10	0	0373	&ucirc;
 û	"
-:u	9,10	0	0374
+:u	9,10	0	0374	&uuml;
 ü	"
-'y	9,10,3	0	0375
+'y	9,10,3	0	0375	&yacute;
 ý	"
-Tp	9,9,3	0	0376
+Tp	9,9,3	0	0376	&thorn;
 þ	"
-:y	9,10,3	0	0377
+:y	9,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/CI b/contrib/groff/devhtml/CI
index 6b26256beee3..13dacff2458b 100644
--- a/contrib/groff/devhtml/CI
+++ b/contrib/groff/devhtml/CI
@@ -3,14 +3,16 @@ spacewidth 9
 charset
 ---	9,1	0	040
 !	9,9	0	041
-"	9,10	0	042
+"	9,10	0	042	&quot;
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,10,1	0	044
 Do	"
 %	9,10	0	045
-&	9,8	0	046
+&	9,8	0	046	&amp;
 '	9,10	0	047
+cq	"
 (	9,10,3	0	050
 )	9,10,3	0	051
 *	9,9	0	052
@@ -32,10 +34,10 @@ sl	"
 9	9,10	0	071
 :	9,7	0	072
 ;	9,7,2	0	073
-<	9,8	0	074
+<	9,8	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,8	0	076
+>	9,8	0	076	&gt;
 ?	9,9	0	077
 @	9,9	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	9,7,2	0	0241
+r!	9,7,2	0	0241	&iexcl;
 ¡	"
-ct	9,10	0	0242
+ct	9,10	0	0242	&cent;
 ¢	"
-Po	9,9	0	0243
+Po	9,9	0	0243	&pound;
 £	"
-Cs	9,7	0	0244
+Cs	9,7	0	0244	&curren;
 ¤	"
-Ye	9,9	0	0245
+Ye	9,9	0	0245	&yen;
 ¥	"
-bb	9,9,2	0	0246
+bb	9,9,2	0	0246	&brvbar;
 ¦	"
-sc	9,9,1	0	0247
+sc	9,9,1	0	0247	&sect;
 §	"
-ad	9,9	0	0250
+ad	9,9	0	0250	&uml;
 ¨	"
-co	9,9	0	0251
+co	9,9	0	0251	&copy;
 ©	"
-Of	9,9	0	0252
+Of	9,9	0	0252	&ordf;
 ª	"
-Fo	9,7	0	0253
+Fo	9,7	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	9,5	0	055
-hy	"
+-	9,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	9,9	0	0256
+rg	9,9	0	0256	&reg;
 ®	"
-a-	9,9	0	0257
+a-	9,9	0	0257	&macr;
 ¯	"
-de	9,10	0	0260
+de	9,10	0	0260	&deg;
 °	"
-+-	9,8	0	0261
++-	9,8	0	0261	&plusmn;
 ±	"
-S2	9,10	0	0262
+S2	9,10	0	0262	&sup2;
 ²	"
-S3	9,10	0	0263
+S3	9,10	0	0263	&sup3;
 ³	"
-aa	9,9	0	0264
+aa	9,9	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,9,1	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,9,1	0	0266	&para;
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267	&middot;
 ·	"
-ac	9,1,3	0	0270
+ac	9,1,3	0	0270	&cedil;
 ¸	"
-S1	9,10	0	0271
+S1	9,10	0	0271	&sup1;
 ¹	"
-Om	9,9	0	0272
+Om	9,9	0	0272	&ordm;
 º	"
-Fc	9,7	0	0273
+Fc	9,7	0	0273	&raquo;
 »	"
-14	9,10	0	0274
+14	9,10	0	0274	&frac14;
 ¼	"
-12	9,10	0	0275
+12	9,10	0	0275	&frac12;
 ½	"
-34	9,10	0	0276
+34	9,10	0	0276	&frac34;
 ¾	"
-r?	9,7,2	0	0277
+r?	9,7,2	0	0277	&iquest;
 ¿	"
-`A	9,12	0	0300
+`A	9,12	0	0300	&Agrave;
 À	"
-'A	9,12	0	0301
+'A	9,12	0	0301	&Aacute;
 Á	"
-^A	9,12	0	0302
+^A	9,12	0	0302	&Acirc;
 Â	"
-~A	9,12	0	0303
+~A	9,12	0	0303	&Atilde;
 Ã	"
-:A	9,11	0	0304
+:A	9,11	0	0304	&Auml;
 Ä	"
-oA	9,12	0	0305
+oA	9,12	0	0305	&Aring;
 Å	"
-AE	9,9	0	0306
+AE	9,9	0	0306	&AElig;
 Æ	"
-,C	9,9,3	0	0307
+,C	9,9,3	0	0307	&Ccedil;
 Ç	"
-`E	9,12	0	0310
+`E	9,12	0	0310	&Egrave;
 È	"
-'E	9,12	0	0311
+'E	9,12	0	0311	&Eacute;
 É	"
-^E	9,12	0	0312
+^E	9,12	0	0312	&Ecirc;
 Ê	"
-:E	9,11	0	0313
+:E	9,11	0	0313	&Euml;
 Ë	"
-`I	9,12	0	0314
+`I	9,12	0	0314	&Igrave;
 Ì	"
-'I	9,12	0	0315
+'I	9,12	0	0315	&Iacute;
 Í	"
-^I	9,12	0	0316
+^I	9,12	0	0316	&Icirc;
 Î	"
-:I	9,11	0	0317
+:I	9,11	0	0317	&Iuml;
 Ï	"
--D	9,9	0	0320
+-D	9,9	0	0320	&ETH;
 Ð	"
-~N	9,12	0	0321
+~N	9,12	0	0321	&Ntilde;
 Ñ	"
-`O	9,12	0	0322
+`O	9,12	0	0322	&Ograve;
 Ò	"
-'O	9,12	0	0323
+'O	9,12	0	0323	&Oacute;
 Ó	"
-^O	9,12	0	0324
+^O	9,12	0	0324	&Ocirc;
 Ô	"
-~O	9,12	0	0325
+~O	9,12	0	0325	&Otilde;
 Õ	"
-:O	9,11	0	0326
+:O	9,11	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	9,9	0	0330
+/O	9,9	0	0330	&Oslash;
 Ø	"
-`U	9,12	0	0331
+`U	9,12	0	0331	&Ugrave;
 Ù	"
-'U	9,12	0	0332
+'U	9,12	0	0332	&Uacute;
 Ú	"
-^U	9,12	0	0333
+^U	9,12	0	0333	&Ucirc;
 Û	"
-:U	9,11	0	0334
+:U	9,11	0	0334	&Uuml;
 Ü	"
-'Y	9,12	0	0335
+'Y	9,12	0	0335	&Yacute;
 Ý	"
-TP	9,9	0	0336
+TP	9,9	0	0336	&THORN;
 Þ	"
-ss	9,9	0	0337
+ss	9,9	0	0337	&szlig;
 ß	"
-`a	9,10	0	0340
+`a	9,10	0	0340	&agrave;
 à	"
-'a	9,10	0	0341
+'a	9,10	0	0341	&aacute;
 á	"
-^a	9,10	0	0342
+^a	9,10	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,9	0	0344
+:a	9,9	0	0344	&auml;
 ä	"
-oa	9,11	0	0345
+oa	9,11	0	0345	&aring;
 å	"
-ae	9,7	0	0346
+ae	9,7	0	0346	&aelig;
 æ	"
-,c	9,7,3	0	0347
+,c	9,7,3	0	0347	&ccedil;
 ç	"
-`e	9,10	0	0350
+`e	9,10	0	0350	&egrave;
 è	"
-'e	9,10	0	0351
+'e	9,10	0	0351	&eacute;
 é	"
-^e	9,10	0	0352
+^e	9,10	0	0352	&ecirc;
 ê	"
-:e	9,9	0	0353
+:e	9,9	0	0353	&euml;
 ë	"
-`i	9,10	0	0354
+`i	9,10	0	0354	&igrave;
 ì	"
-'i	9,10	0	0355
+'i	9,10	0	0355	&iacute;
 í	"
-^i	9,10	0	0356
+^i	9,10	0	0356	&icirc;
 î	"
-:i	9,9	0	0357
+:i	9,9	0	0357	&iuml;
 ï	"
-Sd	9,10	0	0360
+Sd	9,10	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	9,10	0	0362
+`o	9,10	0	0362	&ograve;
 ò	"
-'o	9,10	0	0363
+'o	9,10	0	0363	&oacute;
 ó	"
-^o	9,10	0	0364
+^o	9,10	0	0364	&ocirc;
 ô	"
-~o	9,10	0	0365
+~o	9,10	0	0365	&otilde;
 õ	"
-:o	9,9	0	0366
+:o	9,9	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	9,7	0	0370
+/o	9,7	0	0370	&oslash;
 ø	"
-`u	9,10	0	0371
+`u	9,10	0	0371	&ugrave;
 ù	"
-'u	9,10	0	0372
+'u	9,10	0	0372	&uacute;
 ú	"
-^u	9,10	0	0373
+^u	9,10	0	0373	&ucirc;
 û	"
-:u	9,9	0	0374
+:u	9,9	0	0374	&uuml;
 ü	"
-'y	9,10,3	0	0375
+'y	9,10,3	0	0375	&yacute;
 ý	"
-Tp	9,9,3	0	0376
+Tp	9,9,3	0	0376	&thorn;
 þ	"
-:y	9,9,3	0	0377
+:y	9,9,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/CR b/contrib/groff/devhtml/CR
index d8020a1b5399..94939c983a1e 100644
--- a/contrib/groff/devhtml/CR
+++ b/contrib/groff/devhtml/CR
@@ -3,14 +3,16 @@ spacewidth 9
 charset
 ---	9,1	0	040
 !	9,9	0	041
-"	9,10	0	042
+"	9,10	0	042	&quot;
+dq	"
 #	9,9,1	0	043
 sh	"
 $	9,11,2	0	044
 Do	"
 %	9,10	0	045
-&	9,8	0	046
+&	9,8	0	046	&amp;
 '	9,10	0	047
+cq	"
 (	9,10,2	0	050
 )	9,10,2	0	051
 *	9,9	0	052
@@ -32,10 +34,10 @@ sl	"
 9	9,10	0	071
 :	9,7	0	072
 ;	9,7,2	0	073
-<	9,8	0	074
+<	9,8	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,8	0	076
+>	9,8	0	076	&gt;
 ?	9,9	0	077
 @	9,9,1	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	9,7,2	0	0241
+r!	9,7,2	0	0241	&iexcl;
 ¡	"
-ct	9,9	0	0242
+ct	9,9	0	0242	&cent;
 ¢	"
-Po	9,9	0	0243
+Po	9,9	0	0243	&pound;
 £	"
-Cs	9,7	0	0244
+Cs	9,7	0	0244	&curren;
 ¤	"
-Ye	9,9	0	0245
+Ye	9,9	0	0245	&yen;
 ¥	"
-bb	9,9,2	0	0246
+bb	9,9,2	0	0246	&brvbar;
 ¦	"
-sc	9,9,1	0	0247
+sc	9,9,1	0	0247	&sect;
 §	"
-ad	9,9	0	0250
+ad	9,9	0	0250	&uml;
 ¨	"
-co	9,9	0	0251
+co	9,9	0	0251	&copy;
 ©	"
-Of	9,9	0	0252
+Of	9,9	0	0252	&ordf;
 ª	"
-Fo	9,7	0	0253
+Fo	9,7	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	9,5	0	 055
-hy	"
+-	9,5	0	 055	&shy;
+hy	"			&shy;
 ­	"
-rg	9,9	0	0256
+rg	9,9	0	0256	&reg;
 ®	"
-a-	9,9	0	0257
+a-	9,9	0	0257	&macr;
 ¯	"
-de	9,10	0	0260
+de	9,10	0	0260	&deg;
 °	"
-+-	9,8	0	0261
++-	9,8	0	0261	&plusmn;
 ±	"
-S2	9,10	0	0262
+S2	9,10	0	0262	&sup2;
 ²	"
-S3	9,10	0	0263
+S3	9,10	0	0263	&sup3;
 ³	"
-aa	9,10	0	0264
+aa	9,10	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,9,1	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,9,1	0	0266	&para;
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267	&middot;
 ·	"
-ac	9,0,3	0	0270
+ac	9,0,3	0	0270	&cedil;
 ¸	"
-S1	9,10	0	0271
+S1	9,10	0	0271	&sup1;
 ¹	"
-Om	9,9	0	0272
+Om	9,9	0	0272	&ordm;
 º	"
-Fc	9,7	0	0273
+Fc	9,7	0	0273	&raquo;
 »	"
-14	9,10	0	0274
+14	9,10	0	0274	&frac14;
 ¼	"
-12	9,10	0	0275
+12	9,10	0	0275	&frac12;
 ½	"
-34	9,10	0	0276
+34	9,10	0	0276	&frac34;
 ¾	"
-r?	9,7,2	0	0277
+r?	9,7,2	0	0277	&iquest;
 ¿	"
-`A	9,12	0	0300
+`A	9,12	0	0300	&Agrave;
 À	"
-'A	9,12	0	0301
+'A	9,12	0	0301	&Aacute;
 Á	"
-^A	9,12	0	0302
+^A	9,12	0	0302	&Acirc;
 Â	"
-~A	9,12	0	0303
+~A	9,12	0	0303	&Atilde;
 Ã	"
-:A	9,11	0	0304
+:A	9,11	0	0304	&Auml;
 Ä	"
-oA	9,12	0	0305
+oA	9,12	0	0305	&Aring;
 Å	"
-AE	9,9	0	0306
+AE	9,9	0	0306	&AElig;
 Æ	"
-,C	9,9,3	0	0307
+,C	9,9,3	0	0307	&Ccedil;
 Ç	"
-`E	9,12	0	0310
+`E	9,12	0	0310	&Egrave;
 È	"
-'E	9,12	0	0311
+'E	9,12	0	0311	&Eacute;
 É	"
-^E	9,12	0	0312
+^E	9,12	0	0312	&Ecirc;
 Ê	"
-:E	9,11	0	0313
+:E	9,11	0	0313	&Euml;
 Ë	"
-`I	9,12	0	0314
+`I	9,12	0	0314	&Igrave;
 Ì	"
-'I	9,12	0	0315
+'I	9,12	0	0315	&Iacute;
 Í	"
-^I	9,12	0	0316
+^I	9,12	0	0316	&Icirc;
 Î	"
-:I	9,11	0	0317
+:I	9,11	0	0317	&Iuml;
 Ï	"
--D	9,9	0	0320
+-D	9,9	0	0320	&ETH;
 Ð	"
-~N	9,12	0	0321
+~N	9,12	0	0321	&Ntilde;
 Ñ	"
-`O	9,12	0	0322
+`O	9,12	0	0322	&Ograve;
 Ò	"
-'O	9,12	0	0323
+'O	9,12	0	0323	&Oacute;
 Ó	"
-^O	9,12	0	0324
+^O	9,12	0	0324	&Ocirc;
 Ô	"
-~O	9,12	0	0325
+~O	9,12	0	0325	&Otilde;
 Õ	"
-:O	9,11	0	0326
+:O	9,11	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	9,9	0	0330
+/O	9,9	0	0330	&Oslash;
 Ø	"
-`U	9,12	0	0331
+`U	9,12	0	0331	&Ugrave;
 Ù	"
-'U	9,12	0	0332
+'U	9,12	0	0332	&Uacute;
 Ú	"
-^U	9,12	0	0333
+^U	9,12	0	0333	&Ucirc;
 Û	"
-:U	9,11	0	0334
+:U	9,11	0	0334	&Uuml;
 Ü	"
-'Y	9,12	0	0335
+'Y	9,12	0	0335	&Yacute;
 Ý	"
-TP	9,9	0	0336
+TP	9,9	0	0336	&THORN;
 Þ	"
-ss	9,9	0	0337
+ss	9,9	0	0337	&szlig;
 ß	"
-`a	9,10	0	0340
+`a	9,10	0	0340	&agrave;
 à	"
-'a	9,10	0	0341
+'a	9,10	0	0341	&aacute;
 á	"
-^a	9,10	0	0342
+^a	9,10	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,9	0	0344
+:a	9,9	0	0344	&auml;
 ä	"
-oa	9,10	0	0345
+oa	9,10	0	0345	&aring;
 å	"
-ae	9,7	0	0346
+ae	9,7	0	0346	&aelig;
 æ	"
-,c	9,7,3	0	0347
+,c	9,7,3	0	0347	&ccedil;
 ç	"
-`e	9,10	0	0350
+`e	9,10	0	0350	&egrave;
 è	"
-'e	9,10	0	0351
+'e	9,10	0	0351	&eacute;
 é	"
-^e	9,10	0	0352
+^e	9,10	0	0352	&ecirc;
 ê	"
-:e	9,9	0	0353
+:e	9,9	0	0353	&euml;
 ë	"
-`i	9,10	0	0354
+`i	9,10	0	0354	&igrave;
 ì	"
-'i	9,10	0	0355
+'i	9,10	0	0355	&iacute;
 í	"
-^i	9,10	0	0356
+^i	9,10	0	0356	&icirc;
 î	"
-:i	9,9	0	0357
+:i	9,9	0	0357	&iuml;
 ï	"
-Sd	9,12	0	0360
+Sd	9,12	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	9,10	0	0362
+`o	9,10	0	0362	&ograve;
 ò	"
-'o	9,10	0	0363
+'o	9,10	0	0363	&oacute;
 ó	"
-^o	9,10	0	0364
+^o	9,10	0	0364	&ocirc;
 ô	"
-~o	9,10	0	0365
+~o	9,10	0	0365	&otilde;
 õ	"
-:o	9,9	0	0366
+:o	9,9	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	9,7	0	0370
+/o	9,7	0	0370	&oslash;
 ø	"
-`u	9,10	0	0371
+`u	9,10	0	0371	&ugrave;
 ù	"
-'u	9,10	0	0372
+'u	9,10	0	0372	&uacute;
 ú	"
-^u	9,10	0	0373
+^u	9,10	0	0373	&ucirc;
 û	"
-:u	9,9	0	0374
+:u	9,9	0	0374	&uuml;
 ü	"
-'y	9,10,3	0	0375
+'y	9,10,3	0	0375	&yacute;
 ý	"
-Tp	9,9,3	0	0376
+Tp	9,9,3	0	0376	&thorn;
 þ	"
-:y	9,9,3	0	0377
+:y	9,9,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/DESC b/contrib/groff/devhtml/DESC
index dcab7cd4adfa..a89775265beb 100644
--- a/contrib/groff/devhtml/DESC
+++ b/contrib/groff/devhtml/DESC
@@ -8,3 +8,5 @@ hor 1
 vert 1
 unitwidth 10
 postpro grohtml
+use_charnames_in_special
+pass_filenames
diff --git a/contrib/groff/devhtml/HB b/contrib/groff/devhtml/HB
index 06f2bf95f61d..0e42103d07f5 100644
--- a/contrib/groff/devhtml/HB
+++ b/contrib/groff/devhtml/HB
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	4,11	0	041
-"	7,11	0	042
+"	7,11	0	042	&quot;
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
 Do	"
 %	13,11	0	045
-&	11,10	0	046
+&	11,10	0	046	&amp;
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	6,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	5,8	0	072
 ;	5,8,1	0	073
-<	8,7	0	074
+<	8,7	0	074	&lt;
 =	9,6	0	075
 eq	"
->	8,7	0	076
+>	8,7	0	076	&gt;
 ?	9,11	0	077
 @	14,11,1	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,8,3	0	0241
+r!	4,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,1	0	0242
+ct	8,9,1	0	0242	&cent;
 ¢	"
-Po	8,11	0	0243
+Po	8,11	0	0243	&pound;
 £	"
-Cs	8,9	0	0244
+Cs	8,9	0	0244	&curren;
 ¤	"
-Ye	9,11	0	0245
+Ye	9,11	0	0245	&yen;
 ¥	"
-bb	4,11,3	0	0246
+bb	4,11,3	0	0246	&brvbar;
 ¦	"
-sc	8,11,3	0	0247
+sc	8,11,3	0	0247	&sect;
 §	"
-ad	5,11	0	0250
+ad	5,11	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	9,7	0	0253
+Fo	9,7	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	4,5	0	055
-hy	"
+-	4,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	5,10	0	0257
+a-	5,10	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	9,9	0	0261
++-	9,9	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	9,8,3	0	0265
-ps	8,11,3	0	0266
+µ	9,8,3	0	0265	&micro;
+ps	8,11,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	4,11	0	0271
+S1	4,11	0	0271	&sup1;
 ¹	"
-Om	6,11	0	0272
+Om	6,11	0	0272	&ordm;
 º	"
-Fc	9,7	0	0273
+Fc	9,7	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	9,8,3	0	0277
+r?	9,8,3	0	0277	&iquest;
 ¿	"
-`A	10,14	0	0300
+`A	10,14	0	0300	&Agrave;
 À	"
-'A	10,14	0	0301
+'A	10,14	0	0301	&Aacute;
 Á	"
-^A	10,14	0	0302
+^A	10,14	0	0302	&Acirc;
 Â	"
-~A	10,14	0	0303
+~A	10,14	0	0303	&Atilde;
 Ã	"
-:A	10,14	0	0304
+:A	10,14	0	0304	&Auml;
 Ä	"
-oA	10,14	0	0305
+oA	10,14	0	0305	&Aring;
 Å	"
-AE	15,11	0	0306
+AE	15,11	0	0306	&AElig;
 Æ	"
-,C	11,11,3	0	0307
+,C	11,11,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,14	0	0313
+:E	9,14	0	0313	&Euml;
 Ë	"
-`I	4,14	0	0314
+`I	4,14	0	0314	&Igrave;
 Ì	"
-'I	4,14	0	0315
+'I	4,14	0	0315	&Iacute;
 Í	"
-^I	4,14	0	0316
+^I	4,14	0	0316	&Icirc;
 Î	"
-:I	4,14	0	0317
+:I	4,14	0	0317	&Iuml;
 Ï	"
--D	11,11	0	0320
+-D	11,11	0	0320	&ETH;
 Ð	"
-~N	11,14	0	0321
+~N	11,14	0	0321	&Ntilde;
 Ñ	"
-`O	12,14	0	0322
+`O	12,14	0	0322	&Ograve;
 Ò	"
-'O	12,14	0	0323
+'O	12,14	0	0323	&Oacute;
 Ó	"
-^O	12,14	0	0324
+^O	12,14	0	0324	&Ocirc;
 Ô	"
-~O	12,14	0	0325
+~O	12,14	0	0325	&Otilde;
 Õ	"
-:O	12,14	0	0326
+:O	12,14	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	12,11	0	0330
+/O	12,11	0	0330	&Oslash;
 Ø	"
-`U	11,14	0	0331
+`U	11,14	0	0331	&Ugrave;
 Ù	"
-'U	11,14	0	0332
+'U	11,14	0	0332	&Uacute;
 Ú	"
-^U	11,14	0	0333
+^U	11,14	0	0333	&Ucirc;
 Û	"
-:U	11,14	0	0334
+:U	11,14	0	0334	&Uuml;
 Ü	"
-'Y	10,14	0	0335
+'Y	10,14	0	0335	&Yacute;
 Ý	"
-TP	10,11	0	0336
+TP	10,11	0	0336	&THORN;
 Þ	"
-ss	8,11	0	0337
+ss	8,11	0	0337	&szlig;
 ß	"
-`a	8,11	0	0340
+`a	8,11	0	0340	&agrave;
 à	"
-'a	8,11	0	0341
+'a	8,11	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,11	0	0343
+~a	8,11	0	0343	&atilde;
 ã	"
-:a	8,11	0	0344
+:a	8,11	0	0344	&auml;
 ä	"
-oa	8,11	0	0345
+oa	8,11	0	0345	&aring;
 å	"
-ae	13,8	0	0346
+ae	13,8	0	0346	&aelig;
 æ	"
-,c	9,8,3	0	0347
+,c	9,8,3	0	0347	&ccedil;
 ç	"
-`e	8,11	0	0350
+`e	8,11	0	0350	&egrave;
 è	"
-'e	8,11	0	0351
+'e	8,11	0	0351	&eacute;
 é	"
-^e	8,11	0	0352
+^e	8,11	0	0352	&ecirc;
 ê	"
-:e	8,11	0	0353
+:e	8,11	0	0353	&euml;
 ë	"
-`i	4,11	0	0354
+`i	4,11	0	0354	&igrave;
 ì	"
-'i	4,11	0	0355
+'i	4,11	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,11	0	0357
+:i	4,11	0	0357	&iuml;
 ï	"
-Sd	9,11	0	0360
+Sd	9,11	0	0360	&eth;
 ð	"
-~n	9,11	0	0361
+~n	9,11	0	0361	&ntilde;
 ñ	"
-`o	9,11	0	0362
+`o	9,11	0	0362	&ograve;
 ò	"
-'o	9,11	0	0363
+'o	9,11	0	0363	&oacute;
 ó	"
-^o	9,11	0	0364
+^o	9,11	0	0364	&ocirc;
 ô	"
-~o	9,11	0	0365
+~o	9,11	0	0365	&otilde;
 õ	"
-:o	9,11	0	0366
+:o	9,11	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	9,8	0	0370
+/o	9,8	0	0370	&oslash;
 ø	"
-`u	9,11	0	0371
+`u	9,11	0	0371	&ugrave;
 ù	"
-'u	9,11	0	0372
+'u	9,11	0	0372	&uacute;
 ú	"
-^u	9,11	0	0373
+^u	9,11	0	0373	&ucirc;
 û	"
-:u	9,11	0	0374
+:u	9,11	0	0374	&uuml;
 ü	"
-'y	8,11,3	0	0375
+'y	8,11,3	0	0375	&yacute;
 ý	"
-Tp	9,11,3	0	0376
+Tp	9,11,3	0	0376	&thorn;
 þ	"
-:y	8,11,3	0	0377
+:y	8,11,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/HBI b/contrib/groff/devhtml/HBI
index bb2031a06c92..a933cfb7f114 100644
--- a/contrib/groff/devhtml/HBI
+++ b/contrib/groff/devhtml/HBI
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	5,11	0	041
-"	7,11	0	042
+"	7,11	0	042	&quot;
+dq	"
 #	10,10	0	043
 sh	"
 $	8,12,1	0	044
 Do	"
 %	13,11	0	045
-&	11,10	0	046
+&	11,10	0	046	&amp;
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	6,11,3	0	051
 *	6,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	5,8	0	072
 ;	5,8,2	0	073
-<	8,7	0	074
+<	8,7	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,7	0	076
+>	9,7	0	076	&gt;
 ?	9,11	0	077
 @	14,11,2	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	5,8,3	0	0241
+r!	5,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,1	0	0242
+ct	8,9,1	0	0242	&cent;
 ¢	"
-Po	9,11	0	0243
+Po	9,11	0	0243	&pound;
 £	"
-Cs	9,8	0	0244
+Cs	9,8	0	0244	&curren;
 ¤	"
-Ye	9,11	0	0245
+Ye	9,11	0	0245	&yen;
 ¥	"
-bb	4,11,3	0	0246
+bb	4,11,3	0	0246	&brvbar;
 ¦	"
-sc	9,11,3	0	0247
+sc	9,11,3	0	0247	&sect;
 §	"
-ad	5,11	0	0250
+ad	5,11	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	11,7	0	0253
+Fo	11,7	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	5,5	0	055
-hy	"
+-	5,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	5,11	0	0257
+a-	5,11	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	9,9	0	0261
++-	9,9	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	9,8,3	0	0265
-ps	8,11,3	0	0266
+µ	9,8,3	0	0265	&micro;
+ps	8,11,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,1,3	0	0270
+ac	5,1,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	6,11	0	0272
+Om	6,11	0	0272	&ordm;
 º	"
-Fc	11,7	0	0273
+Fc	11,7	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	13,11	0	0276
+34	13,11	0	0276	&frac34;
 ¾	"
-r?	8,8,3	0	0277
+r?	8,8,3	0	0277	&iquest;
 ¿	"
-`A	9,14	0	0300
+`A	9,14	0	0300	&Agrave;
 À	"
-'A	9,14	0	0301
+'A	9,14	0	0301	&Aacute;
 Á	"
-^A	9,14	0	0302
+^A	9,14	0	0302	&Acirc;
 Â	"
-~A	9,14	0	0303
+~A	9,14	0	0303	&Atilde;
 Ã	"
-:A	9,14	0	0304
+:A	9,14	0	0304	&Auml;
 Ä	"
-oA	9,14	0	0305
+oA	9,14	0	0305	&Aring;
 Å	"
-AE	14,11	0	0306
+AE	14,11	0	0306	&AElig;
 Æ	"
-,C	11,11,3	0	0307
+,C	11,11,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,14	0	0313
+:E	9,14	0	0313	&Euml;
 Ë	"
-`I	4,14	0	0314
+`I	4,14	0	0314	&Igrave;
 Ì	"
-'I	4,14	0	0315
+'I	4,14	0	0315	&Iacute;
 Í	"
-^I	4,14	0	0316
+^I	4,14	0	0316	&Icirc;
 Î	"
-:I	4,14	0	0317
+:I	4,14	0	0317	&Iuml;
 Ï	"
--D	11,11	0	0320
+-D	11,11	0	0320	&ETH;
 Ð	"
-~N	11,14	0	0321
+~N	11,14	0	0321	&Ntilde;
 Ñ	"
-`O	12,14	0	0322
+`O	12,14	0	0322	&Ograve;
 Ò	"
-'O	12,14	0	0323
+'O	12,14	0	0323	&Oacute;
 Ó	"
-^O	12,14	0	0324
+^O	12,14	0	0324	&Ocirc;
 Ô	"
-~O	12,14	0	0325
+~O	12,14	0	0325	&Otilde;
 Õ	"
-:O	12,14	0	0326
+:O	12,14	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	12,11	0	0330
+/O	12,11	0	0330	&Oslash;
 Ø	"
-`U	11,14	0	0331
+`U	11,14	0	0331	&Ugrave;
 Ù	"
-'U	11,14	0	0332
+'U	11,14	0	0332	&Uacute;
 Ú	"
-^U	11,14	0	0333
+^U	11,14	0	0333	&Ucirc;
 Û	"
-:U	11,14	0	0334
+:U	11,14	0	0334	&Uuml;
 Ü	"
-'Y	10,14	0	0335
+'Y	10,14	0	0335	&Yacute;
 Ý	"
-TP	10,11	0	0336
+TP	10,11	0	0336	&THORN;
 Þ	"
-ss	9,11	0	0337
+ss	9,11	0	0337	&szlig;
 ß	"
-`a	8,11	0	0340
+`a	8,11	0	0340	&agrave;
 à	"
-'a	8,11	0	0341
+'a	8,11	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,11	0	0343
+~a	8,11	0	0343	&atilde;
 ã	"
-:a	8,11	0	0344
+:a	8,11	0	0344	&auml;
 ä	"
-oa	8,11	0	0345
+oa	8,11	0	0345	&aring;
 å	"
-ae	13,8	0	0346
+ae	13,8	0	0346	&aelig;
 æ	"
-,c	8,8,3	0	0347
+,c	8,8,3	0	0347	&ccedil;
 ç	"
-`e	8,11	0	0350
+`e	8,11	0	0350	&egrave;
 è	"
-'e	8,11	0	0351
+'e	8,11	0	0351	&eacute;
 é	"
-^e	8,11	0	0352
+^e	8,11	0	0352	&ecirc;
 ê	"
-:e	8,11	0	0353
+:e	8,11	0	0353	&euml;
 ë	"
-`i	4,11	0	0354
+`i	4,11	0	0354	&igrave;
 ì	"
-'i	4,11	0	0355
+'i	4,11	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,11	0	0357
+:i	4,11	0	0357	&iuml;
 ï	"
-Sd	8,11	0	0360
+Sd	8,11	0	0360	&eth;
 ð	"
-~n	9,11	0	0361
+~n	9,11	0	0361	&ntilde;
 ñ	"
-`o	8,11	0	0362
+`o	8,11	0	0362	&ograve;
 ò	"
-'o	8,11	0	0363
+'o	8,11	0	0363	&oacute;
 ó	"
-^o	8,11	0	0364
+^o	8,11	0	0364	&ocirc;
 ô	"
-~o	8,11	0	0365
+~o	8,11	0	0365	&otilde;
 õ	"
-:o	8,11	0	0366
+:o	8,11	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	8,8	0	0370
+/o	8,8	0	0370	&oslash;
 ø	"
-`u	9,11	0	0371
+`u	9,11	0	0371	&ugrave;
 ù	"
-'u	9,11	0	0372
+'u	9,11	0	0372	&uacute;
 ú	"
-^u	9,11	0	0373
+^u	9,11	0	0373	&ucirc;
 û	"
-:u	9,11	0	0374
+:u	9,11	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	9,11,3	0	0376
+Tp	9,11,3	0	0376	&thorn;
 þ	"
-:y	7,11,3	0	0377
+:y	7,11,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/HI b/contrib/groff/devhtml/HI
index 1c66db735f39..7007ada5db12 100644
--- a/contrib/groff/devhtml/HI
+++ b/contrib/groff/devhtml/HI
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	4,11	0	041
-"	5,11	0	042
+"	5,11	0	042	&quot;
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
 Do	"
 %	12,11	0	045
-&	10,10	0	046
+&	10,10	0	046	&amp;
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	8,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	4,8	0	072
 ;	4,8,2	0	073
-<	9,7	0	074
+<	9,7	0	074	&lt;
 =	9,6	0	075
 eq	"
->	9,7	0	076
+>	9,7	0	076	&gt;
 ?	8,11	0	077
 @	13,11,1	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,8,3	0	0241
+r!	4,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,1	0	0242
+ct	8,9,1	0	0242	&cent;
 ¢	"
-Po	9,11	0	0243
+Po	9,11	0	0243	&pound;
 £	"
-Cs	8,8	0	0244
+Cs	8,8	0	0244	&curren;
 ¤	"
-Ye	9,11	0	0245
+Ye	9,11	0	0245	&yen;
 ¥	"
-bb	4,11,3	0	0246
+bb	4,11,3	0	0246	&brvbar;
 ¦	"
-sc	8,11,3	0	0247
+sc	8,11,3	0	0247	&sect;
 §	"
-ad	5,10	0	0250
+ad	5,10	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	5,11	0	0252
+Of	5,11	0	0252	&ordf;
 ª	"
-Fo	8,6	0	0253
+Fo	8,6	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	5,5	0	055
-hy	"
+-	5,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	4,10	0	0257
+a-	4,10	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	9,9	0	0261
++-	9,9	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	4,11	0	0264
+aa	4,11	0	0264	&acute;
 ´	"
-µ	8,8,3	0	0265
-ps	8,11,3	0	0266
+µ	8,8,3	0	0265	&micro;
+ps	8,11,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	3,0,3	0	0270
+ac	3,0,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	5,11	0	0272
+Om	5,11	0	0272	&ordm;
 º	"
-Fc	8,6	0	0273
+Fc	8,6	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	8,8,3	0	0277
+r?	8,8,3	0	0277	&iquest;
 ¿	"
-`A	11,14	0	0300
+`A	11,14	0	0300	&Agrave;
 À	"
-'A	11,14	0	0301
+'A	11,14	0	0301	&Aacute;
 Á	"
-^A	11,14	0	0302
+^A	11,14	0	0302	&Acirc;
 Â	"
-~A	11,14	0	0303
+~A	11,14	0	0303	&Atilde;
 Ã	"
-:A	11,13	0	0304
+:A	11,13	0	0304	&Auml;
 Ä	"
-oA	11,14	0	0305
+oA	11,14	0	0305	&Aring;
 Å	"
-AE	15,11	0	0306
+AE	15,11	0	0306	&AElig;
 Æ	"
-,C	10,11,3	0	0307
+,C	10,11,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,13	0	0313
+:E	9,13	0	0313	&Euml;
 Ë	"
-`I	5,14	0	0314
+`I	5,14	0	0314	&Igrave;
 Ì	"
-'I	5,14	0	0315
+'I	5,14	0	0315	&Iacute;
 Í	"
-^I	5,14	0	0316
+^I	5,14	0	0316	&Icirc;
 Î	"
-:I	5,13	0	0317
+:I	5,13	0	0317	&Iuml;
 Ï	"
--D	10,11	0	0320
+-D	10,11	0	0320	&ETH;
 Ð	"
-~N	11,14	0	0321
+~N	11,14	0	0321	&Ntilde;
 Ñ	"
-`O	11,14	0	0322
+`O	11,14	0	0322	&Ograve;
 Ò	"
-'O	11,14	0	0323
+'O	11,14	0	0323	&Oacute;
 Ó	"
-^O	11,14	0	0324
+^O	11,14	0	0324	&Ocirc;
 Ô	"
-~O	11,14	0	0325
+~O	11,14	0	0325	&Otilde;
 Õ	"
-:O	11,13	0	0326
+:O	11,13	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	11,11	0	0330
+/O	11,11	0	0330	&Oslash;
 Ø	"
-`U	11,14	0	0331
+`U	11,14	0	0331	&Ugrave;
 Ù	"
-'U	11,14	0	0332
+'U	11,14	0	0332	&Uacute;
 Ú	"
-^U	11,14	0	0333
+^U	11,14	0	0333	&Ucirc;
 Û	"
-:U	11,13	0	0334
+:U	11,13	0	0334	&Uuml;
 Ü	"
-'Y	9,14	0	0335
+'Y	9,14	0	0335	&Yacute;
 Ý	"
-TP	9,11	0	0336
+TP	9,11	0	0336	&THORN;
 Þ	"
-ss	8,11	0	0337
+ss	8,11	0	0337	&szlig;
 ß	"
-`a	8,11	0	0340
+`a	8,11	0	0340	&agrave;
 à	"
-'a	8,11	0	0341
+'a	8,11	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,11	0	0343
+~a	8,11	0	0343	&atilde;
 ã	"
-:a	8,11	0	0344
+:a	8,11	0	0344	&auml;
 ä	"
-oa	8,11	0	0345
+oa	8,11	0	0345	&aring;
 å	"
-ae	12,8	0	0346
+ae	12,8	0	0346	&aelig;
 æ	"
-,c	7,8,3	0	0347
+,c	7,8,3	0	0347	&ccedil;
 ç	"
-`e	8,11	0	0350
+`e	8,11	0	0350	&egrave;
 è	"
-'e	8,11	0	0351
+'e	8,11	0	0351	&eacute;
 é	"
-^e	8,11	0	0352
+^e	8,11	0	0352	&ecirc;
 ê	"
-:e	8,11	0	0353
+:e	8,11	0	0353	&euml;
 ë	"
-`i	3,11	0	0354
+`i	3,11	0	0354	&igrave;
 ì	"
-'i	3,11	0	0355
+'i	3,11	0	0355	&iacute;
 í	"
-^i	3,11	0	0356
+^i	3,11	0	0356	&icirc;
 î	"
-:i	3,11	0	0357
+:i	3,11	0	0357	&iuml;
 ï	"
-Sd	8,11	0	0360
+Sd	8,11	0	0360	&eth;
 ð	"
-~n	8,11	0	0361
+~n	8,11	0	0361	&ntilde;
 ñ	"
-`o	8,11	0	0362
+`o	8,11	0	0362	&ograve;
 ò	"
-'o	8,11	0	0363
+'o	8,11	0	0363	&oacute;
 ó	"
-^o	8,11	0	0364
+^o	8,11	0	0364	&ocirc;
 ô	"
-~o	8,11	0	0365
+~o	8,11	0	0365	&otilde;
 õ	"
-:o	8,11	0	0366
+:o	8,11	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	8,9,1	0	0370
+/o	8,9,1	0	0370	&oslash;
 ø	"
-`u	8,11	0	0371
+`u	8,11	0	0371	&ugrave;
 ù	"
-'u	8,11	0	0372
+'u	8,11	0	0372	&uacute;
 ú	"
-^u	8,11	0	0373
+^u	8,11	0	0373	&ucirc;
 û	"
-:u	8,11	0	0374
+:u	8,11	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	8,11,3	0	0376
+Tp	8,11,3	0	0376	&thorn;
 þ	"
-:y	7,11,3	0	0377
+:y	7,11,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/HR b/contrib/groff/devhtml/HR
index 756ef71120c7..57f5603e044f 100644
--- a/contrib/groff/devhtml/HR
+++ b/contrib/groff/devhtml/HR
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	4,11	0	041
-"	5,11	0	042
+"	5,11	0	042	&quot;
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,2	0	044
 Do	"
 %	12,11	0	045
-&	10,10	0	046
+&	10,10	0	046	&amp;
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	7,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	3,8	0	072
 ;	4,8,2	0	073
-<	8,7	0	074
+<	8,7	0	074	&lt;
 =	9,6	0	075
 eq	"
->	8,7	0	076
+>	8,7	0	076	&gt;
 ?	8,11	0	077
 @	13,11,1	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,8,3	0	0241
+r!	4,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,1	0	0242
+ct	8,9,1	0	0242	&cent;
 ¢	"
-Po	8,11	0	0243
+Po	8,11	0	0243	&pound;
 £	"
-Cs	8,8	0	0244
+Cs	8,8	0	0244	&curren;
 ¤	"
-Ye	7,11	0	0245
+Ye	7,11	0	0245	&yen;
 ¥	"
-bb	3,11,3	0	0246
+bb	3,11,3	0	0246	&brvbar;
 ¦	"
-sc	8,11,3	0	0247
+sc	8,11,3	0	0247	&sect;
 §	"
-ad	5,10	0	0250
+ad	5,10	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	8,7	0	0253
+Fo	8,7	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	4,5	0	055
-hy	"
+-	4,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	4,10	0	0257
+a-	4,10	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	9,9	0	0261
++-	9,9	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	8,8,3	0	0265
-ps	8,11,3	0	0266
+µ	8,8,3	0	0265	&micro;
+ps	8,11,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	6,11	0	0272
+Om	6,11	0	0272	&ordm;
 º	"
-Fc	8,7	0	0273
+Fc	8,7	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	8,8,3	0	0277
+r?	8,8,3	0	0277	&iquest;
 ¿	"
-`A	9,14	0	0300
+`A	9,14	0	0300	&Agrave;
 À	"
-'A	9,14	0	0301
+'A	9,14	0	0301	&Aacute;
 Á	"
-^A	9,14	0	0302
+^A	9,14	0	0302	&Acirc;
 Â	"
-~A	9,13	0	0303
+~A	9,13	0	0303	&Atilde;
 Ã	"
-:A	9,14	0	0304
+:A	9,14	0	0304	&Auml;
 Ä	"
-oA	9,14	0	0305
+oA	9,14	0	0305	&Aring;
 Å	"
-AE	14,11	0	0306
+AE	14,11	0	0306	&AElig;
 Æ	"
-,C	10,11,3	0	0307
+,C	10,11,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,13	0	0313
+:E	9,13	0	0313	&Euml;
 Ë	"
-`I	4,14	0	0314
+`I	4,14	0	0314	&Igrave;
 Ì	"
-'I	4,14	0	0315
+'I	4,14	0	0315	&Iacute;
 Í	"
-^I	4,14	0	0316
+^I	4,14	0	0316	&Icirc;
 Î	"
-:I	4,13	0	0317
+:I	4,13	0	0317	&Iuml;
 Ï	"
--D	10,11	0	0320
+-D	10,11	0	0320	&ETH;
 Ð	"
-~N	10,14	0	0321
+~N	10,14	0	0321	&Ntilde;
 Ñ	"
-`O	11,14	0	0322
+`O	11,14	0	0322	&Ograve;
 Ò	"
-'O	11,14	0	0323
+'O	11,14	0	0323	&Oacute;
 Ó	"
-^O	11,14	0	0324
+^O	11,14	0	0324	&Ocirc;
 Ô	"
-~O	11,14	0	0325
+~O	11,14	0	0325	&Otilde;
 Õ	"
-:O	11,13	0	0326
+:O	11,13	0	0326	&Ouml;
 Ö	"
-mu	9,8	0	0327
+mu	9,8	0	0327	&times;
 ×	"
-/O	11,11	0	0330
+/O	11,11	0	0330	&Oslash;
 Ø	"
-`U	10,14	0	0331
+`U	10,14	0	0331	&Ugrave;
 Ù	"
-'U	10,14	0	0332
+'U	10,14	0	0332	&Uacute;
 Ú	"
-^U	10,14	0	0333
+^U	10,14	0	0333	&Ucirc;
 Û	"
-:U	10,13	0	0334
+:U	10,13	0	0334	&Uuml;
 Ü	"
-'Y	9,14	0	0335
+'Y	9,14	0	0335	&Yacute;
 Ý	"
-TP	9,11	0	0336
+TP	9,11	0	0336	&THORN;
 Þ	"
-ss	7,11	0	0337
+ss	7,11	0	0337	&szlig;
 ß	"
-`a	8,11	0	0340
+`a	8,11	0	0340	&agrave;
 à	"
-'a	8,11	0	0341
+'a	8,11	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,11	0	0343
+~a	8,11	0	0343	&atilde;
 ã	"
-:a	8,11	0	0344
+:a	8,11	0	0344	&auml;
 ä	"
-oa	8,12	0	0345
+oa	8,12	0	0345	&aring;
 å	"
-ae	13,8	0	0346
+ae	13,8	0	0346	&aelig;
 æ	"
-,c	8,8,3	0	0347
+,c	8,8,3	0	0347	&ccedil;
 ç	"
-`e	8,11	0	0350
+`e	8,11	0	0350	&egrave;
 è	"
-'e	8,11	0	0351
+'e	8,11	0	0351	&eacute;
 é	"
-^e	8,11	0	0352
+^e	8,11	0	0352	&ecirc;
 ê	"
-:e	8,11	0	0353
+:e	8,11	0	0353	&euml;
 ë	"
-`i	3,11	0	0354
+`i	3,11	0	0354	&igrave;
 ì	"
-'i	3,11	0	0355
+'i	3,11	0	0355	&iacute;
 í	"
-^i	3,11	0	0356
+^i	3,11	0	0356	&icirc;
 î	"
-:i	3,11	0	0357
+:i	3,11	0	0357	&iuml;
 ï	"
-Sd	8,11	0	0360
+Sd	8,11	0	0360	&eth;
 ð	"
-~n	8,11	0	0361
+~n	8,11	0	0361	&ntilde;
 ñ	"
-`o	8,11	0	0362
+`o	8,11	0	0362	&ograve;
 ò	"
-'o	8,11	0	0363
+'o	8,11	0	0363	&oacute;
 ó	"
-^o	8,11	0	0364
+^o	8,11	0	0364	&ocirc;
 ô	"
-~o	8,11	0	0365
+~o	8,11	0	0365	&otilde;
 õ	"
-:o	8,11	0	0366
+:o	8,11	0	0366	&ouml;
 ö	"
-di	9,8	0	0367
+di	9,8	0	0367	&divide;
 ÷	"
-/o	8,8	0	0370
+/o	8,8	0	0370	&oslash;
 ø	"
-`u	8,11	0	0371
+`u	8,11	0	0371	&ugrave;
 ù	"
-'u	8,11	0	0372
+'u	8,11	0	0372	&uacute;
 ú	"
-^u	8,11	0	0373
+^u	8,11	0	0373	&ucirc;
 û	"
-:u	8,11	0	0374
+:u	8,11	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	8,11,3	0	0376
+Tp	8,11,3	0	0376	&thorn;
 þ	"
-:y	7,10,3	0	0377
+:y	7,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/NB b/contrib/groff/devhtml/NB
index 88ef29f0e595..63f36bd3d9a6 100644
--- a/contrib/groff/devhtml/NB
+++ b/contrib/groff/devhtml/NB
@@ -3,14 +3,16 @@ spacewidth 11
 charset
 ---	11,1	0	040
 !	4,11	0	041
-"	5,11	0	042
+"	5,11	0	042	&quot;
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
 Do	"
 %	13,11	0	045
-&	13,11	0	046
+&	13,11	0	046	&amp;
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	4,7	0	072
 ;	4,7,2	0	073
-<	8,8	0	074
+<	8,8	0	074	&lt;
 =	8,6	0	075
 eq	"
->	8,8	0	076
+>	8,8	0	076	&gt;
 ?	7,11	0	077
 @	14,11	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	5,8,3	0	0241
+r!	5,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,8,1	0	0242
+ct	8,8,1	0	0242	&cent;
 ¢	"
-Po	9,11	0	0243
+Po	9,11	0	0243	&pound;
 £	"
-Cs	9,10	0	0244
+Cs	9,10	0	0244	&curren;
 ¤	"
-Ye	11,11	0	0245
+Ye	11,11	0	0245	&yen;
 ¥	"
-bb	8,11	0	0246
+bb	8,11	0	0246	&brvbar;
 ¦	"
-sc	7,11,2	0	0247
+sc	7,11,2	0	0247	&sect;
 §	"
-ad	7,10	0	0250
+ad	7,10	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	8,6	0	0253
+Fo	8,6	0	0253	&laquo;
 «	"
-no	8,6	0	0254
+no	8,6	0	0254	&not;
 ¬	"
--	5,5	0	055
-hy	"
+-	5,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	7,9	0	0257
+a-	7,9	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	8,8	0	0261
++-	8,8	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	6,11	0	0264
+aa	6,11	0	0264	&acute;
 ´	"
-µ	10,7,3	0	0265
-ps	10,11	0	0266
+µ	10,7,3	0	0265	&micro;
+ps	10,11	0	0266	&para;
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	6,11	0	0272
+Om	6,11	0	0272	&ordm;
 º	"
-Fc	8,6	0	0273
+Fc	8,6	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	7,8,3	0	0277
+r?	7,8,3	0	0277	&iquest;
 ¿	"
-`A	11,15	0	0300
+`A	11,15	0	0300	&Agrave;
 À	"
-'A	11,15	0	0301
+'A	11,15	0	0301	&Aacute;
 Á	"
-^A	11,15	0	0302
+^A	11,15	0	0302	&Acirc;
 Â	"
-~A	11,14	0	0303
+~A	11,14	0	0303	&Atilde;
 Ã	"
-:A	11,14	0	0304
+:A	11,14	0	0304	&Auml;
 Ä	"
-oA	11,15	0	0305
+oA	11,15	0	0305	&Aring;
 Å	"
-AE	15,11	0	0306
+AE	15,11	0	0306	&AElig;
 Æ	"
-,C	11,11,3	0	0307
+,C	11,11,3	0	0307	&Ccedil;
 Ç	"
-`E	10,15	0	0310
+`E	10,15	0	0310	&Egrave;
 È	"
-'E	10,15	0	0311
+'E	10,15	0	0311	&Eacute;
 É	"
-^E	10,15	0	0312
+^E	10,15	0	0312	&Ecirc;
 Ê	"
-:E	10,14	0	0313
+:E	10,14	0	0313	&Euml;
 Ë	"
-`I	7,15	0	0314
+`I	7,15	0	0314	&Igrave;
 Ì	"
-'I	7,15	0	0315
+'I	7,15	0	0315	&Iacute;
 Í	"
-^I	7,15	0	0316
+^I	7,15	0	0316	&Icirc;
 Î	"
-:I	7,14	0	0317
+:I	7,14	0	0317	&Iuml;
 Ï	"
--D	12,11	0	0320
+-D	12,11	0	0320	&ETH;
 Ð	"
-~N	12,14	0	0321
+~N	12,14	0	0321	&Ntilde;
 Ñ	"
-`O	12,15	0	0322
+`O	12,15	0	0322	&Ograve;
 Ò	"
-'O	12,15	0	0323
+'O	12,15	0	0323	&Oacute;
 Ó	"
-^O	12,15	0	0324
+^O	12,15	0	0324	&Ocirc;
 Ô	"
-~O	12,14	0	0325
+~O	12,14	0	0325	&Otilde;
 Õ	"
-:O	12,14	0	0326
+:O	12,14	0	0326	&Ouml;
 Ö	"
-mu	8,8	0	0327
+mu	8,8	0	0327	&times;
 ×	"
-/O	12,11	0	0330
+/O	12,11	0	0330	&Oslash;
 Ø	"
-`U	12,15	0	0331
+`U	12,15	0	0331	&Ugrave;
 Ù	"
-'U	12,15	0	0332
+'U	12,15	0	0332	&Uacute;
 Ú	"
-^U	12,15	0	0333
+^U	12,15	0	0333	&Ucirc;
 Û	"
-:U	12,14	0	0334
+:U	12,14	0	0334	&Uuml;
 Ü	"
-'Y	11,14	0	0335
+'Y	11,14	0	0335	&Yacute;
 Ý	"
-TP	10,11	0	0336
+TP	10,11	0	0336	&THORN;
 Þ	"
-ss	9,11	0	0337
+ss	9,11	0	0337	&szlig;
 ß	"
-`a	9,11	0	0340
+`a	9,11	0	0340	&agrave;
 à	"
-'a	9,11	0	0341
+'a	9,11	0	0341	&aacute;
 á	"
-^a	9,11	0	0342
+^a	9,11	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,10	0	0344
+:a	9,10	0	0344	&auml;
 ä	"
-oa	9,11	0	0345
+oa	9,11	0	0345	&aring;
 å	"
-ae	14,7	0	0346
+ae	14,7	0	0346	&aelig;
 æ	"
-,c	8,7,3	0	0347
+,c	8,7,3	0	0347	&ccedil;
 ç	"
-`e	9,11	0	0350
+`e	9,11	0	0350	&egrave;
 è	"
-'e	9,11	0	0351
+'e	9,11	0	0351	&eacute;
 é	"
-^e	9,11	0	0352
+^e	9,11	0	0352	&ecirc;
 ê	"
-:e	9,10	0	0353
+:e	9,10	0	0353	&euml;
 ë	"
-`i	5,11	0	0354
+`i	5,11	0	0354	&igrave;
 ì	"
-'i	5,11	0	0355
+'i	5,11	0	0355	&iacute;
 í	"
-^i	5,11	0	0356
+^i	5,11	0	0356	&icirc;
 î	"
-:i	5,10	0	0357
+:i	5,10	0	0357	&iuml;
 ï	"
-Sd	9,11	0	0360
+Sd	9,11	0	0360	&eth;
 ð	"
-~n	10,10	0	0361
+~n	10,10	0	0361	&ntilde;
 ñ	"
-`o	9,11	0	0362
+`o	9,11	0	0362	&ograve;
 ò	"
-'o	9,11	0	0363
+'o	9,11	0	0363	&oacute;
 ó	"
-^o	9,11	0	0364
+^o	9,11	0	0364	&ocirc;
 ô	"
-~o	9,10	0	0365
+~o	9,10	0	0365	&otilde;
 õ	"
-:o	9,10	0	0366
+:o	9,10	0	0366	&ouml;
 ö	"
-di	8,8	0	0367
+di	8,8	0	0367	&divide;
 ÷	"
-/o	9,8,1	0	0370
+/o	9,8,1	0	0370	&oslash;
 ø	"
-`u	10,11	0	0371
+`u	10,11	0	0371	&ugrave;
 ù	"
-'u	10,11	0	0372
+'u	10,11	0	0372	&uacute;
 ú	"
-^u	10,11	0	0373
+^u	10,11	0	0373	&ucirc;
 û	"
-:u	10,10	0	0374
+:u	10,10	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	10,11,3	0	0376
+Tp	10,11,3	0	0376	&thorn;
 þ	"
-:y	7,10,3	0	0377
+:y	7,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/NBI b/contrib/groff/devhtml/NBI
index 58d9522ebde8..18379913115f 100644
--- a/contrib/groff/devhtml/NBI
+++ b/contrib/groff/devhtml/NBI
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	5,11	0	041
-"	6,11	0	042
+"	6,11	0	042	&quot;
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
 Do	"
 %	13,11,1	0	045
-&	13,11	0	046
+&	13,11	0	046	&amp;
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	4,7	0	072
 ;	5,7,3	0	073
-<	9,9	0	074
+<	9,9	0	074	&lt;
 =	9,7	0	075
 eq	"
->	9,9	0	076
+>	9,9	0	076	&gt;
 ?	7,11	0	077
 @	13,11	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	5,8,3	0	0241
+r!	5,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,8,1	0	0242
+ct	8,8,1	0	0242	&cent;
 ¢	"
-Po	10,11	0	0243
+Po	10,11	0	0243	&pound;
 £	"
-Cs	8,9	0	0244
+Cs	8,9	0	0244	&curren;
 ¤	"
-Ye	10,11	0	0245
+Ye	10,11	0	0245	&yen;
 ¥	"
-bb	8,11	0	0246
+bb	8,11	0	0246	&brvbar;
 ¦	"
-sc	9,11,2	0	0247
+sc	9,11,2	0	0247	&sect;
 §	"
-ad	6,10	0	0250
+ad	6,10	0	0250	&uml;
 ¨	"
-co	12,11	0	0251
+co	12,11	0	0251	&copy;
 ©	"
-Of	8,11	0	0252
+Of	8,11	0	0252	&ordf;
 ª	"
-Fo	10,7	0	0253
+Fo	10,7	0	0253	&laquo;
 «	"
-no	9,7	0	0254
+no	9,7	0	0254	&not;
 ¬	"
--	5,5	0	055
-hy	"
+-	5,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,11	0	0256
+rg	12,11	0	0256	&reg;
 ®	"
-a-	6,9	0	0257
+a-	6,9	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	8,8	0	0261
++-	8,8	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	10,7,3	0	0265
-ps	9,11	0	0266
+µ	10,7,3	0	0265	&micro;
+ps	9,11	0	0266	&para;
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	8,11	0	0272
+Om	8,11	0	0272	&ordm;
 º	"
-Fc	10,7	0	0273
+Fc	10,7	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	7,8,3	0	0277
+r?	7,8,3	0	0277	&iquest;
 ¿	"
-`A	11,15	0	0300
+`A	11,15	0	0300	&Agrave;
 À	"
-'A	11,15	0	0301
+'A	11,15	0	0301	&Aacute;
 Á	"
-^A	11,15	0	0302
+^A	11,15	0	0302	&Acirc;
 Â	"
-~A	11,14	0	0303
+~A	11,14	0	0303	&Atilde;
 Ã	"
-:A	11,14	0	0304
+:A	11,14	0	0304	&Auml;
 Ä	"
-oA	11,15	0	0305
+oA	11,15	0	0305	&Aring;
 Å	"
-AE	14,11	0	0306
+AE	14,11	0	0306	&AElig;
 Æ	"
-,C	11,11,3	0	0307
+,C	11,11,3	0	0307	&Ccedil;
 Ç	"
-`E	10,15	0	0310
+`E	10,15	0	0310	&Egrave;
 È	"
-'E	10,15	0	0311
+'E	10,15	0	0311	&Eacute;
 É	"
-^E	10,15	0	0312
+^E	10,15	0	0312	&Ecirc;
 Ê	"
-:E	10,14	0	0313
+:E	10,14	0	0313	&Euml;
 Ë	"
-`I	6,15	0	0314
+`I	6,15	0	0314	&Igrave;
 Ì	"
-'I	6,15	0	0315
+'I	6,15	0	0315	&Iacute;
 Í	"
-^I	6,15	0	0316
+^I	6,15	0	0316	&Icirc;
 Î	"
-:I	6,14	0	0317
+:I	6,14	0	0317	&Iuml;
 Ï	"
--D	12,11	0	0320
+-D	12,11	0	0320	&ETH;
 Ð	"
-~N	13,14	0	0321
+~N	13,14	0	0321	&Ntilde;
 Ñ	"
-`O	12,15	0	0322
+`O	12,15	0	0322	&Ograve;
 Ò	"
-'O	12,15	0	0323
+'O	12,15	0	0323	&Oacute;
 Ó	"
-^O	12,15	0	0324
+^O	12,15	0	0324	&Ocirc;
 Ô	"
-~O	12,14	0	0325
+~O	12,14	0	0325	&Otilde;
 Õ	"
-:O	12,14	0	0326
+:O	12,14	0	0326	&Ouml;
 Ö	"
-mu	8,8	0	0327
+mu	8,8	0	0327	&times;
 ×	"
-/O	12,11	0	0330
+/O	12,11	0	0330	&Oslash;
 Ø	"
-`U	12,15	0	0331
+`U	12,15	0	0331	&Ugrave;
 Ù	"
-'U	12,15	0	0332
+'U	12,15	0	0332	&Uacute;
 Ú	"
-^U	12,15	0	0333
+^U	12,15	0	0333	&Ucirc;
 Û	"
-:U	12,14	0	0334
+:U	12,14	0	0334	&Uuml;
 Ü	"
-'Y	9,15	0	0335
+'Y	9,15	0	0335	&Yacute;
 Ý	"
-TP	11,11	0	0336
+TP	11,11	0	0336	&THORN;
 Þ	"
-ss	10,11,3	0	0337
+ss	10,11,3	0	0337	&szlig;
 ß	"
-`a	10,11	0	0340
+`a	10,11	0	0340	&agrave;
 à	"
-'a	10,11	0	0341
+'a	10,11	0	0341	&aacute;
 á	"
-^a	10,11	0	0342
+^a	10,11	0	0342	&acirc;
 â	"
-~a	10,10	0	0343
+~a	10,10	0	0343	&atilde;
 ã	"
-:a	10,10	0	0344
+:a	10,10	0	0344	&auml;
 ä	"
-oa	10,11	0	0345
+oa	10,11	0	0345	&aring;
 å	"
-ae	13,7	0	0346
+ae	13,7	0	0346	&aelig;
 æ	"
-,c	8,7,3	0	0347
+,c	8,7,3	0	0347	&ccedil;
 ç	"
-`e	8,11	0	0350
+`e	8,11	0	0350	&egrave;
 è	"
-'e	8,11	0	0351
+'e	8,11	0	0351	&eacute;
 é	"
-^e	8,11	0	0352
+^e	8,11	0	0352	&ecirc;
 ê	"
-:e	8,10	0	0353
+:e	8,10	0	0353	&euml;
 ë	"
-`i	5,11	0	0354
+`i	5,11	0	0354	&igrave;
 ì	"
-'i	5,11	0	0355
+'i	5,11	0	0355	&iacute;
 í	"
-^i	5,11	0	0356
+^i	5,11	0	0356	&icirc;
 î	"
-:i	5,10	0	0357
+:i	5,10	0	0357	&iuml;
 ï	"
-Sd	8,11	0	0360
+Sd	8,11	0	0360	&eth;
 ð	"
-~n	10,10	0	0361
+~n	10,10	0	0361	&ntilde;
 ñ	"
-`o	8,11	0	0362
+`o	8,11	0	0362	&ograve;
 ò	"
-'o	8,11	0	0363
+'o	8,11	0	0363	&oacute;
 ó	"
-^o	8,11	0	0364
+^o	8,11	0	0364	&ocirc;
 ô	"
-~o	8,10	0	0365
+~o	8,10	0	0365	&otilde;
 õ	"
-:o	8,10	0	0366
+:o	8,10	0	0366	&ouml;
 ö	"
-di	8,8	0	0367
+di	8,8	0	0367	&divide;
 ÷	"
-/o	8,7	0	0370
+/o	8,7	0	0370	&oslash;
 ø	"
-`u	10,11	0	0371
+`u	10,11	0	0371	&ugrave;
 ù	"
-'u	10,11	0	0372
+'u	10,11	0	0372	&uacute;
 ú	"
-^u	10,11	0	0373
+^u	10,11	0	0373	&ucirc;
 û	"
-:u	10,10	0	0374
+:u	10,10	0	0374	&uuml;
 ü	"
-'y	9,11,3	0	0375
+'y	9,11,3	0	0375	&yacute;
 ý	"
-Tp	8,11,3	0	0376
+Tp	8,11,3	0	0376	&thorn;
 þ	"
-:y	9,10,3	0	0377
+:y	9,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/NI b/contrib/groff/devhtml/NI
index b76ed0217895..24e824e0b2ea 100644
--- a/contrib/groff/devhtml/NI
+++ b/contrib/groff/devhtml/NI
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	5,11	0	041
-"	6,11	0	042
+"	6,11	0	042	&quot;
+dq	"
 #	11,10	0	043
 sh	"
 $	8,12,1	0	044
 Do	"
 %	12,11,1	0	045
-&	11,11	0	046
+&	11,11	0	046	&amp;
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	4,7	0	072
 ;	4,7,2	0	073
-<	9,8	0	074
+<	9,8	0	074	&lt;
 =	8,6	0	075
 eq	"
->	9,8	0	076
+>	9,8	0	076	&gt;
 ?	6,11	0	077
 @	12,11	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,8,3	0	0241
+r!	4,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,2	0	0242
+ct	8,9,2	0	0242	&cent;
 ¢	"
-Po	9,11	0	0243
+Po	9,11	0	0243	&pound;
 £	"
-Cs	8,9	0	0244
+Cs	8,9	0	0244	&curren;
 ¤	"
-Ye	9,11	0	0245
+Ye	9,11	0	0245	&yen;
 ¥	"
-bb	8,11	0	0246
+bb	8,11	0	0246	&brvbar;
 ¦	"
-sc	7,11,2	0	0247
+sc	7,11,2	0	0247	&sect;
 §	"
-ad	7,10	0	0250
+ad	7,10	0	0250	&uml;
 ¨	"
-co	13,11	0	0251
+co	13,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	8,7	0	0253
+Fo	8,7	0	0253	&laquo;
 «	"
-no	8,6	0	0254
+no	8,6	0	0254	&not;
 ¬	"
--	5,5	0	055
-hy	"
+-	5,5	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	13,11	0	0256
+rg	13,11	0	0256	&reg;
 ®	"
-a-	6,9	0	0257
+a-	6,9	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	8,8	0	0261
++-	8,8	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	4,11	0	0264
+aa	4,11	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,11	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,11	0	0266	&para;
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	6,11	0	0272
+Om	6,11	0	0272	&ordm;
 º	"
-Fc	8,7	0	0273
+Fc	8,7	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	6,8,3	0	0277
+r?	6,8,3	0	0277	&iquest;
 ¿	"
-`A	11,14	0	0300
+`A	11,14	0	0300	&Agrave;
 À	"
-'A	11,14	0	0301
+'A	11,14	0	0301	&Aacute;
 Á	"
-^A	11,14	0	0302
+^A	11,14	0	0302	&Acirc;
 Â	"
-~A	11,14	0	0303
+~A	11,14	0	0303	&Atilde;
 Ã	"
-:A	11,14	0	0304
+:A	11,14	0	0304	&Auml;
 Ä	"
-oA	11,14	0	0305
+oA	11,14	0	0305	&Aring;
 Å	"
-AE	14,11	0	0306
+AE	14,11	0	0306	&AElig;
 Æ	"
-,C	10,11,3	0	0307
+,C	10,11,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,14	0	0313
+:E	9,14	0	0313	&Euml;
 Ë	"
-`I	7,14	0	0314
+`I	7,14	0	0314	&Igrave;
 Ì	"
-'I	7,14	0	0315
+'I	7,14	0	0315	&Iacute;
 Í	"
-^I	7,14	0	0316
+^I	7,14	0	0316	&Icirc;
 Î	"
-:I	7,14	0	0317
+:I	7,14	0	0317	&Iuml;
 Ï	"
--D	11,11	0	0320
+-D	11,11	0	0320	&ETH;
 Ð	"
-~N	12,14	0	0321
+~N	12,14	0	0321	&Ntilde;
 Ñ	"
-`O	10,14	0	0322
+`O	10,14	0	0322	&Ograve;
 Ò	"
-'O	10,14	0	0323
+'O	10,14	0	0323	&Oacute;
 Ó	"
-^O	10,14	0	0324
+^O	10,14	0	0324	&Ocirc;
 Ô	"
-~O	10,14	0	0325
+~O	10,14	0	0325	&Otilde;
 Õ	"
-:O	10,14	0	0326
+:O	10,14	0	0326	&Ouml;
 Ö	"
-mu	8,8	0	0327
+mu	8,8	0	0327	&times;
 ×	"
-/O	10,11	0	0330
+/O	10,11	0	0330	&Oslash;
 Ø	"
-`U	12,14	0	0331
+`U	12,14	0	0331	&Ugrave;
 Ù	"
-'U	12,14	0	0332
+'U	12,14	0	0332	&Uacute;
 Ú	"
-^U	12,14	0	0333
+^U	12,14	0	0333	&Ucirc;
 Û	"
-:U	12,14	0	0334
+:U	12,14	0	0334	&Uuml;
 Ü	"
-'Y	9,14	0	0335
+'Y	9,14	0	0335	&Yacute;
 Ý	"
-TP	10,11	0	0336
+TP	10,11	0	0336	&THORN;
 Þ	"
-ss	8,11,3	0	0337
+ss	8,11,3	0	0337	&szlig;
 ß	"
-`a	9,11	0	0340
+`a	9,11	0	0340	&agrave;
 à	"
-'a	9,11	0	0341
+'a	9,11	0	0341	&aacute;
 á	"
-^a	9,11	0	0342
+^a	9,11	0	0342	&acirc;
 â	"
-~a	9,10	0	0343
+~a	9,10	0	0343	&atilde;
 ã	"
-:a	9,10	0	0344
+:a	9,10	0	0344	&auml;
 ä	"
-oa	9,11	0	0345
+oa	9,11	0	0345	&aring;
 å	"
-ae	10,7	0	0346
+ae	10,7	0	0346	&aelig;
 æ	"
-,c	6,7,3	0	0347
+,c	6,7,3	0	0347	&ccedil;
 ç	"
-`e	6,11	0	0350
+`e	6,11	0	0350	&egrave;
 è	"
-'e	6,11	0	0351
+'e	6,11	0	0351	&eacute;
 é	"
-^e	6,11	0	0352
+^e	6,11	0	0352	&ecirc;
 ê	"
-:e	6,10	0	0353
+:e	6,10	0	0353	&euml;
 ë	"
-`i	4,11	0	0354
+`i	4,11	0	0354	&igrave;
 ì	"
-'i	4,11	0	0355
+'i	4,11	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,10	0	0357
+:i	4,10	0	0357	&iuml;
 ï	"
-Sd	7,11	0	0360
+Sd	7,11	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	7,11	0	0362
+`o	7,11	0	0362	&ograve;
 ò	"
-'o	7,11	0	0363
+'o	7,11	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,10	0	0365
+~o	7,10	0	0365	&otilde;
 õ	"
-:o	7,10	0	0366
+:o	7,10	0	0366	&ouml;
 ö	"
-di	8,8	0	0367
+di	8,8	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	9,11	0	0371
+`u	9,11	0	0371	&ugrave;
 ù	"
-'u	9,11	0	0372
+'u	9,11	0	0372	&uacute;
 ú	"
-^u	9,11	0	0373
+^u	9,11	0	0373	&ucirc;
 û	"
-:u	9,10	0	0374
+:u	9,10	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	7,11,3	0	0376
+Tp	7,11,3	0	0376	&thorn;
 þ	"
-:y	7,10,3	0	0377
+:y	7,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/NR b/contrib/groff/devhtml/NR
index dd756b794bf6..92204a381e65 100644
--- a/contrib/groff/devhtml/NR
+++ b/contrib/groff/devhtml/NR
@@ -3,14 +3,16 @@ spacewidth 4
 charset
 ---	4,1	0	040
 !	3,11	0	041
-"	5,11	0	042
+"	5,11	0	042	&quot;
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,2	0	044
 Do	"
 %	12,11	0	045
-&	13,11	0	046
+&	13,11	0	046	&amp;
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -32,10 +34,10 @@ sl	"
 9	8,11	0	071
 :	4,7	0	072
 ;	4,7,2	0	073
-<	10,7	0	074
+<	10,7	0	074	&lt;
 =	9,6	0	075
 eq	"
->	10,7	0	076
+>	10,7	0	076	&gt;
 ?	6,11	0	077
 @	13,11	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,8,3	0	0241
+r!	4,8,3	0	0241	&iexcl;
 ¡	"
-ct	8,9,2	0	0242
+ct	8,9,2	0	0242	&cent;
 ¢	"
-Po	8,11	0	0243
+Po	8,11	0	0243	&pound;
 £	"
-Cs	8,9	0	0244
+Cs	8,9	0	0244	&curren;
 ¤	"
-Ye	8,11	0	0245
+Ye	8,11	0	0245	&yen;
 ¥	"
-bb	9,11	0	0246
+bb	9,11	0	0246	&brvbar;
 ¦	"
-sc	7,11,2	0	0247
+sc	7,11,2	0	0247	&sect;
 §	"
-ad	6,10	0	0250
+ad	6,10	0	0250	&uml;
 ¨	"
-co	14,11	0	0251
+co	14,11	0	0251	&copy;
 ©	"
-Of	6,11	0	0252
+Of	6,11	0	0252	&ordf;
 ª	"
-Fo	7,6	0	0253
+Fo	7,6	0	0253	&laquo;
 «	"
-no	9,5	0	0254
+no	9,5	0	0254	&not;
 ¬	"
--	5,4	0	055
-hy	"
+-	5,4	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	14,11	0	0256
+rg	14,11	0	0256	&reg;
 ®	"
-a-	5,9	0	0257
+a-	5,9	0	0257	&macr;
 ¯	"
-de	6,11	0	0260
+de	6,11	0	0260	&deg;
 °	"
-+-	9,7	0	0261
++-	9,7	0	0261	&plusmn;
 ±	"
-S2	5,11	0	0262
+S2	5,11	0	0262	&sup2;
 ²	"
-S3	5,11	0	0263
+S3	5,11	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	9,7,3	0	0265
-ps	9,11,2	0	0266
+µ	9,7,3	0	0265	&micro;
+ps	9,11,2	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,1,3	0	0270
+ac	5,1,3	0	0270	&cedil;
 ¸	"
-S1	5,11	0	0271
+S1	5,11	0	0271	&sup1;
 ¹	"
-Om	5,11	0	0272
+Om	5,11	0	0272	&ordm;
 º	"
-Fc	7,6	0	0273
+Fc	7,6	0	0273	&raquo;
 »	"
-14	12,11	0	0274
+14	12,11	0	0274	&frac14;
 ¼	"
-12	12,11	0	0275
+12	12,11	0	0275	&frac12;
 ½	"
-34	12,11	0	0276
+34	12,11	0	0276	&frac34;
 ¾	"
-r?	6,8,3	0	0277
+r?	6,8,3	0	0277	&iquest;
 ¿	"
-`A	10,14	0	0300
+`A	10,14	0	0300	&Agrave;
 À	"
-'A	10,14	0	0301
+'A	10,14	0	0301	&Aacute;
 Á	"
-^A	10,14	0	0302
+^A	10,14	0	0302	&Acirc;
 Â	"
-~A	10,14	0	0303
+~A	10,14	0	0303	&Atilde;
 Ã	"
-:A	10,13	0	0304
+:A	10,13	0	0304	&Auml;
 Ä	"
-oA	10,14	0	0305
+oA	10,14	0	0305	&Aring;
 Å	"
-AE	15,11	0	0306
+AE	15,11	0	0306	&AElig;
 Æ	"
-,C	11,11,3	0	0307
+,C	11,11,3	0	0307	&Ccedil;
 Ç	"
-`E	10,14	0	0310
+`E	10,14	0	0310	&Egrave;
 È	"
-'E	10,14	0	0311
+'E	10,14	0	0311	&Eacute;
 É	"
-^E	10,14	0	0312
+^E	10,14	0	0312	&Ecirc;
 Ê	"
-:E	10,14	0	0313
+:E	10,14	0	0313	&Euml;
 Ë	"
-`I	6,14	0	0314
+`I	6,14	0	0314	&Igrave;
 Ì	"
-'I	6,14	0	0315
+'I	6,14	0	0315	&Iacute;
 Í	"
-^I	6,14	0	0316
+^I	6,14	0	0316	&Icirc;
 Î	"
-:I	6,14	0	0317
+:I	6,14	0	0317	&Iuml;
 Ï	"
--D	11,11	0	0320
+-D	11,11	0	0320	&ETH;
 Ð	"
-~N	13,14	0	0321
+~N	13,14	0	0321	&Ntilde;
 Ñ	"
-`O	11,14	0	0322
+`O	11,14	0	0322	&Ograve;
 Ò	"
-'O	11,14	0	0323
+'O	11,14	0	0323	&Oacute;
 Ó	"
-^O	11,14	0	0324
+^O	11,14	0	0324	&Ocirc;
 Ô	"
-~O	11,14	0	0325
+~O	11,14	0	0325	&Otilde;
 Õ	"
-:O	11,14	0	0326
+:O	11,14	0	0326	&Ouml;
 Ö	"
-mu	9,7	0	0327
+mu	9,7	0	0327	&times;
 ×	"
-/O	11,11	0	0330
+/O	11,11	0	0330	&Oslash;
 Ø	"
-`U	13,14	0	0331
+`U	13,14	0	0331	&Ugrave;
 Ù	"
-'U	13,14	0	0332
+'U	13,14	0	0332	&Uacute;
 Ú	"
-^U	13,14	0	0333
+^U	13,14	0	0333	&Ucirc;
 Û	"
-:U	13,14	0	0334
+:U	13,14	0	0334	&Uuml;
 Ü	"
-'Y	10,14	0	0335
+'Y	10,14	0	0335	&Yacute;
 Ý	"
-TP	10,11	0	0336
+TP	10,11	0	0336	&THORN;
 Þ	"
-ss	8,11	0	0337
+ss	8,11	0	0337	&szlig;
 ß	"
-`a	8,11	0	0340
+`a	8,11	0	0340	&agrave;
 à	"
-'a	8,11	0	0341
+'a	8,11	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,10	0	0343
+~a	8,10	0	0343	&atilde;
 ã	"
-:a	8,10	0	0344
+:a	8,10	0	0344	&auml;
 ä	"
-oa	8,11	0	0345
+oa	8,11	0	0345	&aring;
 å	"
-ae	12,7	0	0346
+ae	12,7	0	0346	&aelig;
 æ	"
-,c	7,7,3	0	0347
+,c	7,7,3	0	0347	&ccedil;
 ç	"
-`e	7,11	0	0350
+`e	7,11	0	0350	&egrave;
 è	"
-'e	7,11	0	0351
+'e	7,11	0	0351	&eacute;
 é	"
-^e	7,11	0	0352
+^e	7,11	0	0352	&ecirc;
 ê	"
-:e	7,10	0	0353
+:e	7,10	0	0353	&euml;
 ë	"
-`i	4,11	0	0354
+`i	4,11	0	0354	&igrave;
 ì	"
-'i	4,11	0	0355
+'i	4,11	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,10	0	0357
+:i	4,10	0	0357	&iuml;
 ï	"
-Sd	7,11	0	0360
+Sd	7,11	0	0360	&eth;
 ð	"
-~n	9,10	0	0361
+~n	9,10	0	0361	&ntilde;
 ñ	"
-`o	7,11	0	0362
+`o	7,11	0	0362	&ograve;
 ò	"
-'o	7,11	0	0363
+'o	7,11	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,10	0	0365
+~o	7,10	0	0365	&otilde;
 õ	"
-:o	7,10	0	0366
+:o	7,10	0	0366	&ouml;
 ö	"
-di	9,7	0	0367
+di	9,7	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	9,11	0	0371
+`u	9,11	0	0371	&ugrave;
 ù	"
-'u	9,11	0	0372
+'u	9,11	0	0372	&uacute;
 ú	"
-^u	9,11	0	0373
+^u	9,11	0	0373	&ucirc;
 û	"
-:u	9,10	0	0374
+:u	9,10	0	0374	&uuml;
 ü	"
-'y	8,11,3	0	0375
+'y	8,11,3	0	0375	&yacute;
 ý	"
-Tp	8,11,3	0	0376
+Tp	8,11,3	0	0376	&thorn;
 þ	"
-:y	8,10,3	0	0377
+:y	8,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/TB b/contrib/groff/devhtml/TB
index fbc4c8b20e72..1ca1be4f0246 100644
--- a/contrib/groff/devhtml/TB
+++ b/contrib/groff/devhtml/TB
@@ -3,14 +3,16 @@ spacewidth 3
 charset
 ---	3,1	0	040
 !	4,10	0	041
-"	7,10	0	042
+"	7,10	0	042	&quot;
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
 Do	"
 %	14,10	0	045
-&	12,10	0	046
+&	12,10	0	046	&amp;
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -32,10 +34,10 @@ sl	"
 9	7,10	0	071
 :	4,7	0	072
 ;	4,7,2	0	073
-<	8,7	0	074
+<	8,7	0	074	&lt;
 =	8,5	0	075
 eq	"
->	8,7	0	076
+>	8,7	0	076	&gt;
 ?	7,10	0	077
 @	14,10,2	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	4,7,3	0	0241
+r!	4,7,3	0	0241	&iexcl;
 ¡	"
-ct	7,9,2	0	0242
+ct	7,9,2	0	0242	&cent;
 ¢	"
-Po	8,10	0	0243
+Po	8,10	0	0243	&pound;
 £	"
-Cs	8,8	0	0244
+Cs	8,8	0	0244	&curren;
 ¤	"
-Ye	8,10	0	0245
+Ye	8,10	0	0245	&yen;
 ¥	"
-bb	3,10,2	0	0246
+bb	3,10,2	0	0246	&brvbar;
 ¦	"
-sc	7,10,2	0	0247
+sc	7,10,2	0	0247	&sect;
 §	"
-ad	5,10	0	0250
+ad	5,10	0	0250	&uml;
 ¨	"
-co	12,10	0	0251
+co	12,10	0	0251	&copy;
 ©	"
-Of	5,10	0	0252
+Of	5,10	0	0252	&ordf;
 ª	"
-Fo	9,6	0	0253
+Fo	9,6	0	0253	&laquo;
 «	"
-no	9,5	0	0254
+no	9,5	0	0254	&not;
 ¬	"
--	4,4	0	 055
-hy	"
+-	4,4	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,10	0	0256
+rg	12,10	0	0256	&reg;
 ®	"
-a-	5,9	0	0257
+a-	5,9	0	0257	&macr;
 ¯	"
-de	6,10	0	0260
+de	6,10	0	0260	&deg;
 °	"
-+-	8,9	0	0261
++-	8,9	0	0261	&plusmn;
 ±	"
-S2	4,10	0	0262
+S2	4,10	0	0262	&sup2;
 ²	"
-S3	4,10	0	0263
+S3	4,10	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	7,7,3	0	0265
-ps	8,10,3	0	0266
+µ	7,7,3	0	0265	&micro;
+ps	8,10,3	0	0266	&para;
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	4,10	0	0271
+S1	4,10	0	0271	&sup1;
 ¹	"
-Om	5,10	0	0272
+Om	5,10	0	0272	&ordm;
 º	"
-Fc	9,6	0	0273
+Fc	9,6	0	0273	&raquo;
 »	"
-14	10,10	0	0274
+14	10,10	0	0274	&frac14;
 ¼	"
-12	10,10	0	0275
+12	10,10	0	0275	&frac12;
 ½	"
-34	10,10	0	0276
+34	10,10	0	0276	&frac34;
 ¾	"
-r?	7,7,3	0	0277
+r?	7,7,3	0	0277	&iquest;
 ¿	"
-`A	10,14	0	0300
+`A	10,14	0	0300	&Agrave;
 À	"
-'A	10,14	0	0301
+'A	10,14	0	0301	&Aacute;
 Á	"
-^A	10,14	0	0302
+^A	10,14	0	0302	&Acirc;
 Â	"
-~A	10,13	0	0303
+~A	10,13	0	0303	&Atilde;
 Ã	"
-:A	10,13	0	0304
+:A	10,13	0	0304	&Auml;
 Ä	"
-oA	10,14	0	0305
+oA	10,14	0	0305	&Aring;
 Å	"
-AE	14,10	0	0306
+AE	14,10	0	0306	&AElig;
 Æ	"
-,C	10,10,3	0	0307
+,C	10,10,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,13	0	0313
+:E	9,13	0	0313	&Euml;
 Ë	"
-`I	5,14	0	0314
+`I	5,14	0	0314	&Igrave;
 Ì	"
-'I	5,14	0	0315
+'I	5,14	0	0315	&Iacute;
 Í	"
-^I	5,14	0	0316
+^I	5,14	0	0316	&Icirc;
 Î	"
-:I	5,13	0	0317
+:I	5,13	0	0317	&Iuml;
 Ï	"
--D	11,10	0	0320
+-D	11,10	0	0320	&ETH;
 Ð	"
-~N	10,13	0	0321
+~N	10,13	0	0321	&Ntilde;
 Ñ	"
-`O	11,14	0	0322
+`O	11,14	0	0322	&Ograve;
 Ò	"
-'O	11,14	0	0323
+'O	11,14	0	0323	&Oacute;
 Ó	"
-^O	11,14	0	0324
+^O	11,14	0	0324	&Ocirc;
 Ô	"
-~O	11,13	0	0325
+~O	11,13	0	0325	&Otilde;
 Õ	"
-:O	11,13	0	0326
+:O	11,13	0	0326	&Ouml;
 Ö	"
-mu	8,7	0	0327
+mu	8,7	0	0327	&times;
 ×	"
-/O	11,11,1	0	0330
+/O	11,11,1	0	0330	&Oslash;
 Ø	"
-`U	10,14	0	0331
+`U	10,14	0	0331	&Ugrave;
 Ù	"
-'U	10,14	0	0332
+'U	10,14	0	0332	&Uacute;
 Ú	"
-^U	10,14	0	0333
+^U	10,14	0	0333	&Ucirc;
 Û	"
-:U	10,13	0	0334
+:U	10,13	0	0334	&Uuml;
 Ü	"
-'Y	10,14	0	0335
+'Y	10,14	0	0335	&Yacute;
 Ý	"
-TP	9,10	0	0336
+TP	9,10	0	0336	&THORN;
 Þ	"
-ss	8,10	0	0337
+ss	8,10	0	0337	&szlig;
 ß	"
-`a	7,11	0	0340
+`a	7,11	0	0340	&agrave;
 à	"
-'a	7,11	0	0341
+'a	7,11	0	0341	&aacute;
 á	"
-^a	7,11	0	0342
+^a	7,11	0	0342	&acirc;
 â	"
-~a	7,10	0	0343
+~a	7,10	0	0343	&atilde;
 ã	"
-:a	7,10	0	0344
+:a	7,10	0	0344	&auml;
 ä	"
-oa	7,11	0	0345
+oa	7,11	0	0345	&aring;
 å	"
-ae	11,7	0	0346
+ae	11,7	0	0346	&aelig;
 æ	"
-,c	7,7,3	0	0347
+,c	7,7,3	0	0347	&ccedil;
 ç	"
-`e	7,11	0	0350
+`e	7,11	0	0350	&egrave;
 è	"
-'e	7,11	0	0351
+'e	7,11	0	0351	&eacute;
 é	"
-^e	7,11	0	0352
+^e	7,11	0	0352	&ecirc;
 ê	"
-:e	7,10	0	0353
+:e	7,10	0	0353	&euml;
 ë	"
-`i	4,11	0	0354
+`i	4,11	0	0354	&igrave;
 ì	"
-'i	4,11	0	0355
+'i	4,11	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,10	0	0357
+:i	4,10	0	0357	&iuml;
 ï	"
-Sd	7,10	0	0360
+Sd	7,10	0	0360	&eth;
 ð	"
-~n	8,10	0	0361
+~n	8,10	0	0361	&ntilde;
 ñ	"
-`o	7,11	0	0362
+`o	7,11	0	0362	&ograve;
 ò	"
-'o	7,11	0	0363
+'o	7,11	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,10	0	0365
+~o	7,10	0	0365	&otilde;
 õ	"
-:o	7,10	0	0366
+:o	7,10	0	0366	&ouml;
 ö	"
-di	8,7	0	0367
+di	8,7	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	7,11	0	0371
+`u	7,11	0	0371	&ugrave;
 ù	"
-'u	7,11	0	0372
+'u	7,11	0	0372	&uacute;
 ú	"
-^u	7,11	0	0373
+^u	7,11	0	0373	&ucirc;
 û	"
-:u	7,10	0	0374
+:u	7,10	0	0374	&uulm;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	8,10,3	0	0376
+Tp	8,10,3	0	0376	&thorn;
 þ	"
-:y	7,10,3	0	0377
+:y	7,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/TBI b/contrib/groff/devhtml/TBI
index 56c55cf30db3..cebeccae20c8 100644
--- a/contrib/groff/devhtml/TBI
+++ b/contrib/groff/devhtml/TBI
@@ -3,14 +3,16 @@ spacewidth 3
 charset
 ---	3,1	0	040
 !	7,10	0	041
-"	7,10	0	042
+"	7,10	0	042	&quot;
+dq	"
 #	8,10	0	043
 sh	"
 $	7,11,1	0	044
 Do	"
 %	14,10	0	045
-&	10,10	0	046
+&	10,10	0	046	&amp;
 '	5,10	0	047
+cq	"
 (	6,10,3	0	050
 )	6,10,3	0	051
 *	7,10	0	052
@@ -32,10 +34,10 @@ sl	"
 9	7,10	0	071
 :	5,7	0	072
 ;	4,7,2	0	073
-<	8,6	0	074
+<	8,6	0	074	&lt;
 =	10,5	0	075
 eq	"
->	8,6	0	076
+>	8,6	0	076	&gt;
 ?	8,10	0	077
 @	15,10,2	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	7,7,3	0	0241
+r!	7,7,3	0	0241	&iexcl;
 ¡	"
-ct	7,8,1	0	0242
+ct	7,8,1	0	0242	&cent;
 ¢	"
-Po	7,10	0	0243
+Po	7,10	0	0243	&pound;
 £	"
-Cs	8,8	0	0244
+Cs	8,8	0	0244	&curren;
 ¤	"
-Ye	7,10	0	0245
+Ye	7,10	0	0245	&yen;
 ¥	"
-bb	4,10	0	0246
+bb	4,10	0	0246	&brvbar;
 ¦	"
-sc	8,10,3	0	0247
+sc	8,10,3	0	0247	&sect;
 §	"
-ad	6,9	0	0250
+ad	6,9	0	0250	&uml;
 ¨	"
-co	12,10	0	0251
+co	12,10	0	0251	&copy;
 ©	"
-Of	6,10	0	0252
+Of	6,10	0	0252	&ordf;
 ª	"
-Fo	8,6	0	0253
+Fo	8,6	0	0253	&laquo;
 «	"
-no	9,5	0	0254
+no	9,5	0	0254	&not;
 ¬	"
--	5,4	0	 055
-hy	"
+-	5,4	0	055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,10	0	0256
+rg	12,10	0	0256	&reg;
 ®	"
-a-	6,9	0	0257
+a-	6,9	0	0257	&macr;
 ¯	"
-de	6,10	0	0260
+de	6,10	0	0260	&deg;
 °	"
-+-	9,9	0	0261
++-	9,9	0	0261	&plusmn;
 ±	"
-S2	4,10	0	0262
+S2	4,10	0	0262	&sup2;
 ²	"
-S3	4,10	0	0263
+S3	4,10	0	0263	&sup3;
 ³	"
-aa	6,10	0	0264
+aa	6,10	0	0264	&acute;
 ´	"
-µ	7,7,3	0	0265
-ps	8,10,3	0	0266
+µ	7,7,3	0	0265	&micro;
+ps	8,10,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	4,10	0	0271
+S1	4,10	0	0271	&sup1;
 ¹	"
-Om	6,10	0	0272
+Om	6,10	0	0272	&ordm;
 º	"
-Fc	8,6	0	0273
+Fc	8,6	0	0273	&raquo;
 »	"
-14	10,10	0	0274
+14	10,10	0	0274	&frac14;
 ¼	"
-12	10,10	0	0275
+12	10,10	0	0275	&frac12;
 ½	"
-34	10,10	0	0276
+34	10,10	0	0276	&frac34;
 ¾	"
-r?	8,7,3	0	0277
+r?	8,7,3	0	0277	&iquest;
 ¿	"
-`A	9,13	0	0300
+`A	9,13	0	0300	&Agrave;
 À	"
-'A	9,13	0	0301
+'A	9,13	0	0301	&Aacute;
 Á	"
-^A	9,13	0	0302
+^A	9,13	0	0302	&Acirc;
 Â	"
-~A	9,13	0	0303
+~A	9,13	0	0303	&Atilde;
 Ã	"
-:A	9,13	0	0304
+:A	9,13	0	0304	&Auml;
 Ä	"
-oA	9,13	0	0305
+oA	9,13	0	0305	&Aring;
 Å	"
-AE	14,10	0	0306
+AE	14,10	0	0306	&AElig;
 Æ	"
-,C	9,10,3	0	0307
+,C	9,10,3	0	0307	&Ccedil;
 Ç	"
-`E	10,13	0	0310
+`E	10,13	0	0310	&Egrave;
 È	"
-'E	10,13	0	0311
+'E	10,13	0	0311	&Eacute;
 É	"
-^E	10,13	0	0312
+^E	10,13	0	0312	&Ecirc;
 Ê	"
-:E	10,13	0	0313
+:E	10,13	0	0313	&Euml;
 Ë	"
-`I	5,13	0	0314
+`I	5,13	0	0314	&Igrave;
 Ì	"
-'I	5,13	0	0315
+'I	5,13	0	0315	&Iacute;
 Í	"
-^I	5,13	0	0316
+^I	5,13	0	0316	&Icirc;
 Î	"
-:I	5,13	0	0317
+:I	5,13	0	0317	&Iuml;
 Ï	"
--D	10,10	0	0320
+-D	10,10	0	0320	&ETH;
 Ð	"
-~N	11,13	0	0321
+~N	11,13	0	0321	&Ntilde;
 Ñ	"
-`O	10,13	0	0322
+`O	10,13	0	0322	&Ograve;
 Ò	"
-'O	10,13	0	0323
+'O	10,13	0	0323	&Oacute;
 Ó	"
-^O	10,13	0	0324
+^O	10,13	0	0324	&Ocirc;
 Ô	"
-~O	10,13	0	0325
+~O	10,13	0	0325	&Otilde;
 Õ	"
-:O	10,13	0	0326
+:O	10,13	0	0326	&Ouml;
 Ö	"
-mu	9,7	0	0327
+mu	9,7	0	0327	&times;
 ×	"
-/O	10,11,1	0	0330
+/O	10,11,1	0	0330	&Oslash;
 Ø	"
-`U	10,13	0	0331
+`U	10,13	0	0331	&Ugrave;
 Ù	"
-'U	10,13	0	0332
+'U	10,13	0	0332	&Uacute;
 Ú	"
-^U	10,13	0	0333
+^U	10,13	0	0333	&Ucirc;
 Û	"
-:U	10,13	0	0334
+:U	10,13	0	0334	&Uuml;
 Ü	"
-'Y	8,13	0	0335
+'Y	8,13	0	0335	&Yacute;
 Ý	"
-TP	9,10	0	0336
+TP	9,10	0	0336	&THORN;
 Þ	"
-ss	7,10,3	0	0337
+ss	7,10,3	0	0337	&szlig;
 ß	"
-`a	8,10	0	0340
+`a	8,10	0	0340	&agrave;
 à	"
-'a	8,10	0	0341
+'a	8,10	0	0341	&aacute;
 á	"
-^a	8,11	0	0342
+^a	8,11	0	0342	&acirc;
 â	"
-~a	8,10	0	0343
+~a	8,10	0	0343	&atilde;
 ã	"
-:a	8,10	0	0344
+:a	8,10	0	0344	&auml;
 ä	"
-oa	8,11	0	0345
+oa	8,11	0	0345	&aring;
 å	"
-ae	11,7	0	0346
+ae	11,7	0	0346	&aelig;
 æ	"
-,c	6,7,3	0	0347
+,c	6,7,3	0	0347	&ccedil;
 ç	"
-`e	7,10	0	0350
+`e	7,10	0	0350	&egrave;
 è	"
-'e	7,10	0	0351
+'e	7,10	0	0351	&eacute;
 é	"
-^e	7,11	0	0352
+^e	7,11	0	0352	&ecirc;
 ê	"
-:e	7,10	0	0353
+:e	7,10	0	0353	&euml;
 ë	"
-`i	4,10	0	0354
+`i	4,10	0	0354	&igrave;
 ì	"
-'i	4,10	0	0355
+'i	4,10	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,10	0	0357
+:i	4,10	0	0357	&iuml;
 ï	"
-Sd	7,10	0	0360
+Sd	7,10	0	0360	&eth;
 ð	"
-~n	8,10	0	0361
+~n	8,10	0	0361	&ntilde;
 ñ	"
-`o	7,10	0	0362
+`o	7,10	0	0362	&ograve;
 ò	"
-'o	7,10	0	0363
+'o	7,10	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,10	0	0365
+~o	7,10	0	0365	&otilde;
 õ	"
-:o	7,10	0	0366
+:o	7,10	0	0366	&ouml;
 ö	"
-di	9,7	0	0367
+di	9,7	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	7,10	0	0371
+`u	7,10	0	0371	&ugrave;
 ù	"
-'u	7,10	0	0372
+'u	7,10	0	0372	&uacute;
 ú	"
-^u	7,11	0	0373
+^u	7,11	0	0373	&ucirc;
 û	"
-:u	7,10	0	0374
+:u	7,10	0	0374	&uulm;
 ü	"
-'y	6,10,2	0	0375
+'y	6,10,2	0	0375	&yacute;
 ý	"
-Tp	7,10,3	0	0376
+Tp	7,10,3	0	0376	&thorn;
 þ	"
-:y	6,10,2	0	0377
+:y	6,10,2	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/TI b/contrib/groff/devhtml/TI
index fddf4b74fbfe..a3f943b26499 100644
--- a/contrib/groff/devhtml/TI
+++ b/contrib/groff/devhtml/TI
@@ -3,14 +3,16 @@ spacewidth 3
 charset
 ---	3,1	0	040
 !	5,10	0	041
-"	6,10	0	042
+"	6,10	0	042	&quot;
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
 Do	"
 %	12,10	0	045
-&	11,10	0	046
+&	11,10	0	046	&amp;
 '	5,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -32,10 +34,10 @@ sl	"
 9	7,10	0	071
 :	4,7	0	072
 ;	4,7,1	0	073
-<	10,7,1	0	074
+<	10,7,1	0	074	&lt;
 =	10,5	0	075
 eq	"
->	10,7,1	0	076
+>	10,7,1	0	076	&gt;
 ?	7,10	0	077
 @	13,10,3	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	6,7,3	0	0241
+r!	6,7,3	0	0241	&iexcl;
 ¡	"
-ct	7,9,2	0	0242
+ct	7,9,2	0	0242	&cent;
 ¢	"
-Po	7,10	0	0243
+Po	7,10	0	0243	&pound;
 £	"
-Cs	7,8	0	0244
+Cs	7,8	0	0244	&curren;
 ¤	"
-Ye	7,10	0	0245
+Ye	7,10	0	0245	&yen;
 ¥	"
-bb	4,10,3	0	0246
+bb	4,10,3	0	0246	&brvbar;
 ¦	"
-sc	7,11,2	0	0247
+sc	7,11,2	0	0247	&sect;
 §	"
-ad	5,10	0	0250
+ad	5,10	0	0250	&uml;
 ¨	"
-co	12,10	0	0251
+co	12,10	0	0251	&copy;
 ©	"
-Of	5,10	0	0252
+Of	5,10	0	0252	&ordf;
 ª	"
-Fo	7,6	0	0253
+Fo	7,6	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	5,4	0	 055
-hy	"
+-	5,4	0	 055	&shy;
+hy	"			&shy;
 ­	"
-rg	12,10	0	0256
+rg	12,10	0	0256	&reg;
 ®	"
-a-	5,10	0	0257
+a-	5,10	0	0257	&macr;
 ¯	"
-de	6,10	0	0260
+de	6,10	0	0260	&deg;
 °	"
-+-	10,9	0	0261
++-	10,9	0	0261	&plusmn;
 ±	"
-S2	4,10	0	0262
+S2	4,10	0	0262	&sup2;
 ²	"
-S3	4,10	0	0263
+S3	4,10	0	0263	&sup3;
 ³	"
-aa	4,10	0	0264
+aa	4,10	0	0264	&acute;
 ´	"
-µ	7,7,3	0	0265
-ps	8,10,3	0	0266
+µ	7,7,3	0	0265	&micro;
+ps	8,10,3	0	0266	&para;
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	4,10	0	0271
+S1	4,10	0	0271	&sup1;
 ¹	"
-Om	5,10	0	0272
+Om	5,10	0	0272	&ordm;
 º	"
-Fc	7,6	0	0273
+Fc	7,6	0	0273	&raquo;
 »	"
-14	10,10	0	0274
+14	10,10	0	0274	&frac14;
 ¼	"
-12	10,10	0	0275
+12	10,10	0	0275	&frac12;
 ½	"
-34	10,10	0	0276
+34	10,10	0	0276	&frac34;
 ¾	"
-r?	7,7,3	0	0277
+r?	7,7,3	0	0277	&iquest;
 ¿	"
-`A	9,13	0	0300
+`A	9,13	0	0300	&Agrave;
 À	"
-'A	9,13	0	0301
+'A	9,13	0	0301	&Aacute;
 Á	"
-^A	9,13	0	0302
+^A	9,13	0	0302	&Acirc;
 Â	"
-~A	9,13	0	0303
+~A	9,13	0	0303	&Atilde;
 Ã	"
-:A	9,12	0	0304
+:A	9,12	0	0304	&Auml;
 Ä	"
-oA	9,13	0	0305
+oA	9,13	0	0305	&Aring;
 Å	"
-AE	13,10	0	0306
+AE	13,10	0	0306	&AElig;
 Æ	"
-,C	9,10,3	0	0307
+,C	9,10,3	0	0307	&Ccedil;
 Ç	"
-`E	9,13	0	0310
+`E	9,13	0	0310	&Egrave;
 È	"
-'E	9,13	0	0311
+'E	9,13	0	0311	&Eacute;
 É	"
-^E	9,13	0	0312
+^E	9,13	0	0312	&Ecirc;
 Ê	"
-:E	9,12	0	0313
+:E	9,12	0	0313	&Euml;
 Ë	"
-`I	5,13	0	0314
+`I	5,13	0	0314	&Igrave;
 Ì	"
-'I	5,13	0	0315
+'I	5,13	0	0315	&Iacute;
 Í	"
-^I	5,13	0	0316
+^I	5,13	0	0316	&Icirc;
 Î	"
-:I	5,12	0	0317
+:I	5,12	0	0317	&Iuml;
 Ï	"
--D	10,10	0	0320
+-D	10,10	0	0320	&ETH;
 Ð	"
-~N	11,13	0	0321
+~N	11,13	0	0321	&Ntilde;
 Ñ	"
-`O	10,13	0	0322
+`O	10,13	0	0322	&Ograve;
 Ò	"
-'O	10,13	0	0323
+'O	10,13	0	0323	&Oacute;
 Ó	"
-^O	10,13	0	0324
+^O	10,13	0	0324	&Ocirc;
 Ô	"
-~O	10,13	0	0325
+~O	10,13	0	0325	&Otilde;
 Õ	"
-:O	10,12	0	0326
+:O	10,12	0	0326	&Ouml;
 Ö	"
-mu	10,7	0	0327
+mu	10,7	0	0327	&times;
 ×	"
-/O	10,11,1	0	0330
+/O	10,11,1	0	0330	&Oslash;
 Ø	"
-`U	10,13	0	0331
+`U	10,13	0	0331	&Ugrave;
 Ù	"
-'U	10,13	0	0332
+'U	10,13	0	0332	&Uacute;
 Ú	"
-^U	10,13	0	0333
+^U	10,13	0	0333	&Ucirc;
 Û	"
-:U	10,12	0	0334
+:U	10,12	0	0334	&Uuml;
 Ü	"
-'Y	8,13	0	0335
+'Y	8,13	0	0335	&Yacute;
 Ý	"
-TP	9,10	0	0336
+TP	9,10	0	0336	&THORN;
 Þ	"
-ss	7,10,3	0	0337
+ss	7,10,3	0	0337	&szlig;
 ß	"
-`a	7,10	0	0340
+`a	7,10	0	0340	&agrave;
 à	"
-'a	7,10	0	0341
+'a	7,10	0	0341	&aacute;
 á	"
-^a	7,11	0	0342
+^a	7,11	0	0342	&acirc;
 â	"
-~a	7,10	0	0343
+~a	7,10	0	0343	&atilde;
 ã	"
-:a	7,9	0	0344
+:a	7,9	0	0344	&auml;
 ä	"
-oa	7,10	0	0345
+oa	7,10	0	0345	&aring;
 å	"
-ae	10,7	0	0346
+ae	10,7	0	0346	&aelig;
 æ	"
-,c	6,7,3	0	0347
+,c	6,7,3	0	0347	&ccedil;
 ç	"
-`e	7,10	0	0350
+`e	7,10	0	0350	&egrave;
 è	"
-'e	7,10	0	0351
+'e	7,10	0	0351	&eacute;
 é	"
-^e	7,11	0	0352
+^e	7,11	0	0352	&ecirc;
 ê	"
-:e	7,9	0	0353
+:e	7,9	0	0353	&euml;
 ë	"
-`i	4,10	0	0354
+`i	4,10	0	0354	&igrave;
 ì	"
-'i	4,10	0	0355
+'i	4,10	0	0355	&iacute;
 í	"
-^i	4,11	0	0356
+^i	4,11	0	0356	&icirc;
 î	"
-:i	4,9	0	0357
+:i	4,9	0	0357	&iuml;
 ï	"
-Sd	7,10	0	0360
+Sd	7,10	0	0360	&eth;
 ð	"
-~n	7,10	0	0361
+~n	7,10	0	0361	&ntilde;
 ñ	"
-`o	7,10	0	0362
+`o	7,10	0	0362	&ograve;
 ò	"
-'o	7,10	0	0363
+'o	7,10	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,10	0	0365
+~o	7,10	0	0365	&otilde;
 õ	"
-:o	7,9	0	0366
+:o	7,9	0	0366	&ouml;
 ö	"
-di	10,7	0	0367
+di	10,7	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	7,10	0	0371
+`u	7,10	0	0371	&ugrave;
 ù	"
-'u	7,10	0	0372
+'u	7,10	0	0372	&uacute;
 ú	"
-^u	7,11	0	0373
+^u	7,11	0	0373	&ucirc;
 û	"
-:u	7,9	0	0374
+:u	7,9	0	0374	&uulm;
 ü	"
-'y	7,10,3	0	0375
+'y	7,10,3	0	0375	&yacute;
 ý	"
-Tp	7,10,3	0	0376
+Tp	7,10,3	0	0376	&thorn;
 þ	"
-:y	7,9,3	0	0377
+:y	7,9,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devhtml/TR b/contrib/groff/devhtml/TR
index c5c5f54e6b96..fadd71f3aa65 100644
--- a/contrib/groff/devhtml/TR
+++ b/contrib/groff/devhtml/TR
@@ -3,14 +3,16 @@ spacewidth 3
 charset
 ---	3,1	0	040
 !	5,10	0	041
-"	6,10	0	042
+"	6,10	0	042	&quot;
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
 Do	"
 %	12,10	0	045
-&	11,10	0	046
+&	11,10	0	046	&amp;
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -32,10 +34,10 @@ sl	"
 9	7,10	0	071
 :	4,7	0	072
 ;	4,7,2	0	073
-<	8,7	0	074
+<	8,7	0	074	&lt;
 =	8,5	0	075
 eq	"
->	8,7	0	076
+>	8,7	0	076	&gt;
 ?	6,10	0	077
 @	13,10,2	0	0100
 at	"
@@ -114,193 +116,193 @@ rC	"
 a~	"
 ap	"
 ti	"
-r!	5,7,3	0	0241
+r!	5,7,3	0	0241	&iexcl;
 ¡	"
-ct	7,8,1	0	0242
+ct	7,8,1	0	0242	&cent;
 ¢	"
-Po	8,10	0	0243
+Po	8,10	0	0243    &pound;
 £	"
-Cs	7,8	0	0244
+Cs	7,8	0	0244	&curren;
 ¤	"
-Ye	7,10	0	0245
+Ye	7,10	0	0245	&yen;
 ¥	"
-bb	3,10	0	0246
+bb	3,10	0	0246	&brvbar;
 ¦	"
-sc	7,10,3	0	0247
+sc	7,10,3	0	0247	&sect;
 §	"
-ad	5,10	0	0250
+ad	5,10	0	0250	&uml;
 ¨	"
-co	12,10	0	0251
+co	12,10	0	0251	&copy;
 ©	"
-Of	4,10	0	0252
+Of	4,10	0	0252	&ordf;
 ª	"
-Fo	7,6	0	0253
+Fo	7,6	0	0253	&laquo;
 «	"
-no	9,6	0	0254
+no	9,6	0	0254	&not;
 ¬	"
--	4,4	0	 055
-hy	"
+-	4,4	0	0255	&shy;
+hy	4,4	0	0255	&shy;
 ­	"
-rg	12,10	0	0256
+rg	12,10	0	0256	&reg;
 ®	"
-a-	4,9	0	0257
+a-	4,9	0	0257	&macr;
 ¯	"
-de	6,10	0	0260
+de	6,10	0	0260	&deg;
 °	"
-+-	8,7	0	0261
++-	8,7	0	0261	&plusmn;
 ±	"
-S2	4,10	0	0262
+S2	4,10	0	0262	&sup2;
 ²	"
-S3	4,10	0	0263
+S3	4,10	0	0263	&sup3;
 ³	"
-aa	5,11	0	0264
+aa	5,11	0	0264	&acute;
 ´	"
-µ	7,7,3	0	0265
-ps	7,10,3	0	0266
+µ	7,7,3	0	0265	&micro;
+ps	7,10,3	0	0266	&para;
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267	&middot;
 ·	"
-ac	5,0,3	0	0270
+ac	5,0,3	0	0270	&cedil;
 ¸	"
-S1	4,10	0	0271
+S1	4,10	0	0271	&sup1;
 ¹	"
-Om	5,10	0	0272
+Om	5,10	0	0272	&ordm;
 º	"
-Fc	7,6	0	0273
+Fc	7,6	0	0273	&raquo;
 »	"
-14	10,10	0	0274
+14	10,10	0	0274	&frac14;
 ¼	"
-12	10,10	0	0275
+12	10,10	0	0275	&frac12;
 ½	"
-34	10,10	0	0276
+34	10,10	0	0276	&frac34;
 ¾	"
-r?	6,7,3	0	0277
+r?	6,7,3	0	0277	&iquest;
 ¿	"
-`A	11,14	0	0300
+`A	11,14	0	0300	&Agrave;
 À	"
-'A	11,14	0	0301
+'A	11,14	0	0301	&Aacute;
 Á	"
-^A	11,14	0	0302
+^A	11,14	0	0302	&Acirc;
 Â	"
-~A	11,14	0	0303
+~A	11,14	0	0303	&Atilde;
 Ã	"
-:A	11,13	0	0304
+:A	11,13	0	0304	&Auml;
 Ä	"
-oA	11,14	0	0305
+oA	11,14	0	0305	&Aring;
 Å	"
-AE	13,10	0	0306
+AE	13,10	0	0306	&AElig;
 Æ	"
-,C	10,10,3	0	0307
+,C	10,10,3	0	0307	&Ccedil;
 Ç	"
-`E	9,14	0	0310
+`E	9,14	0	0310	&Egrave;
 È	"
-'E	9,14	0	0311
+'E	9,14	0	0311	&Eacute;
 É	"
-^E	9,14	0	0312
+^E	9,14	0	0312	&Ecirc;
 Ê	"
-:E	9,13	0	0313
+:E	9,13	0	0313	&Euml;
 Ë	"
-`I	5,14	0	0314
+`I	5,14	0	0314	&Igrave;
 Ì	"
-'I	5,14	0	0315
+'I	5,14	0	0315	&Iacute;
 Í	"
-^I	5,14	0	0316
+^I	5,14	0	0316	&Icirc;
 Î	"
-:I	5,13	0	0317
+:I	5,13	0	0317	&Iuml;
 Ï	"
--D	10,10	0	0320
+-D	10,10	0	0320	&ETH;
 Ð	"
-~N	11,14	0	0321
+~N	11,14	0	0321	&Ntilde;
 Ñ	"
-`O	10,14	0	0322
+`O	10,14	0	0322	&Ograve;
 Ò	"
-'O	10,14	0	0323
+'O	10,14	0	0323	&Oacute;
 Ó	"
-^O	10,14	0	0324
+^O	10,14	0	0324	&Ocirc;
 Ô	"
-~O	10,14	0	0325
+~O	10,14	0	0325	&Otilde;
 Õ	"
-:O	10,13	0	0326
+:O	10,13	0	0326	&Ouml;
 Ö	"
-mu	8,7	0	0327
+mu	8,7	0	0327	&times;
 ×	"
-/O	10,11,1	0	0330
+/O	10,11,1	0	0330	&Oslash;
 Ø	"
-`U	10,14	0	0331
+`U	10,14	0	0331	&Ugrave;
 Ù	"
-'U	10,14	0	0332
+'U	10,14	0	0332	&Uacute;
 Ú	"
-^U	10,14	0	0333
+^U	10,14	0	0333	&Ucirc;
 Û	"
-:U	10,13	0	0334
+:U	10,13	0	0334	&Uuml;
 Ü	"
-'Y	9,14	0	0335
+'Y	9,14	0	0335	&Yacute;
 Ý	"
-TP	8,10	0	0336
+TP	8,10	0	0336	&THORN;
 Þ	"
-ss	7,10	0	0337
+ss	7,10	0	0337	&szlig;
 ß	"
-`a	7,11	0	0340
+`a	7,11	0	0340	&agrave;
 à	"
-'a	7,11	0	0341
+'a	7,11	0	0341	&aacute;
 á	"
-^a	7,11	0	0342
+^a	7,11	0	0342	&acirc;
 â	"
-~a	7,11	0	0343
+~a	7,11	0	0343	&atilde;
 ã	"
-:a	7,10	0	0344
+:a	7,10	0	0344	&auml;
 ä	"
-oa	7,11	0	0345
+oa	7,11	0	0345	&aring;
 å	"
-ae	11,7	0	0346
+ae	11,7	0	0346	&aelig;
 æ	"
-,c	7,7,3	0	0347
+,c	7,7,3	0	0347	&ccedil;
 ç	"
-`e	7,11	0	0350
+`e	7,11	0	0350	&egrave;
 è	"
-'e	7,11	0	0351
+'e	7,11	0	0351	&eacute;
 é	"
-^e	7,11	0	0352
+^e	7,11	0	0352	&ecirc;
 ê	"
-:e	7,10	0	0353
+:e	7,10	0	0353	&euml;
 ë	"
-`i	3,11	0	0354
+`i	3,11	0	0354	&igrave;
 ì	"
-'i	3,11	0	0355
+'i	3,11	0	0355	&iacute;
 í	"
-^i	3,11	0	0356
+^i	3,11	0	0356	&icirc;
 î	"
-:i	3,10	0	0357
+:i	3,10	0	0357	&iuml;
 ï	"
-Sd	7,10	0	0360
+Sd	7,10	0	0360	&eth;
 ð	"
-~n	7,11	0	0361
+~n	7,11	0	0361	&ntilde;
 ñ	"
-`o	7,11	0	0362
+`o	7,11	0	0362	&ograve;
 ò	"
-'o	7,11	0	0363
+'o	7,11	0	0363	&oacute;
 ó	"
-^o	7,11	0	0364
+^o	7,11	0	0364	&ocirc;
 ô	"
-~o	7,11	0	0365
+~o	7,11	0	0365	&otilde;
 õ	"
-:o	7,10	0	0366
+:o	7,10	0	0366	&ouml;
 ö	"
-di	8,7	0	0367
+di	8,7	0	0367	&divide;
 ÷	"
-/o	7,8,1	0	0370
+/o	7,8,1	0	0370	&oslash;
 ø	"
-`u	7,11	0	0371
+`u	7,11	0	0371	&ugrave;
 ù	"
-'u	7,11	0	0372
+'u	7,11	0	0372	&uacute;
 ú	"
-^u	7,11	0	0373
+^u	7,11	0	0373	&ucirc;
 û	"
-:u	7,10	0	0374
+:u	7,10	0	0374	&uuml;
 ü	"
-'y	7,11,3	0	0375
+'y	7,11,3	0	0375	&yacute;
 ý	"
-Tp	7,10,3	0	0376
+Tp	7,10,3	0	0376	&thorn;
 þ	"
-:y	7,10,3	0	0377
+:y	7,10,3	0	0377	&yuml;
 ÿ	"
diff --git a/contrib/groff/devlatin1/R.proto b/contrib/groff/devlatin1/R.proto
index 29a88754ba3e..a527a9fbc60a 100644
--- a/contrib/groff/devlatin1/R.proto
+++ b/contrib/groff/devlatin1/R.proto
@@ -4,6 +4,7 @@ spacewidth 24
 charset
 !	24	0	0041
 "	24	0	0042
+dq	"
 lq	"
 rq	"
 #	24	0	0043
@@ -15,6 +16,7 @@ Do	"
 '	24	0	0047
 fm	"
 aq	"
+cq	"
 (	24	0	0050
 )	24	0	0051
 *	24	0	0052
@@ -185,7 +187,8 @@ Fo	24	0	0253
 char171	"
 no	24	0	0254
 char172	"
-char173	24	0	0255 
+shc	24	0	0255
+char173	"
 rg	24	0	0256
 char174	"
 a-	24	0	0257
@@ -205,7 +208,8 @@ char180	"
 char181	"
 ps	24	0	0266
 char182	"
-md	24	0	0267
+pc	24	0	0267
+md	"
 char183	"
 ac	24	0	0270
 char184	"
diff --git a/contrib/groff/devlbp/CB b/contrib/groff/devlbp/CB
new file mode 100644
index 000000000000..5c34658f9b48
--- /dev/null
+++ b/contrib/groff/devlbp/CB
@@ -0,0 +1,272 @@
+
+name  CB
+lbpname  NcourierB
+spacewidth 2200
+slant 0
+charset
+aq	2200	0	0x27		--	0,39	#	quotesingle
+space	2200	0	0x20		--	0,32
+!	2200	0	0x21		--	0,33	#	exclam
+"	2200	0	0x22		--	0,34	#	quotedbl
+dq	2200	0	0x22		--	0,34	#	quotedbl
+#	2200	0	0x23		--	0,35	#	numbersign
+sh	2200	0	0x23		--	0,35	#	"
+$	2200	0	0x24		--	0,36	#	dollar
+Do	2200	0	0x24		--	0,36	#	"
+%	2200	0	0x25		--	0,37	#	percent
+&	2200	0	0x26		--	0,38	#	ampersand
+'	2200	0	0x27		--	0,39	#	quoteright
+cq	2200	0	0x27		--	0,39	#	quoteright
+(	2200	0	0x28		--	0,40	#	parenleft
+)	2200	0	0x29		--	0,41	#	parenright
+*	2200	0	0x2a		--	0,42	#	asterisk
++	2200	0	0x2b		--	0,43	#	plus
+,	2200	0	0x2c		--	0,44	#	comma
+-	2200	0	0x2d		--	0,45	#	hyphen
+\-	2200	0	0x2d		--	0,45	#	hyphen
+hy	2200	0	0x2d		--	0,45	#	"
+char173	2200	0	0x2d		--	0,45	#	"
+.	2200	0	0x2e		--	0,46	#	period
+/	2200	0	0x2f		--	0,47	#	slash
+sl	2200	0	0x2f		--	0,47	#	"
+0	2200	0	0x30		--	0,48	#	zero
+1	2200	0	0x31		--	0,49	#	one
+2	2200	0	0x32		--	0,50	#	two
+3	2200	0	0x33		--	0,51	#	three
+4	2200	0	0x34		--	0,52	#	four
+5	2200	0	0x35		--	0,53	#	five
+6	2200	0	0x36		--	0,54	#	six
+7	2200	0	0x37		--	0,55	#	seven
+8	2200	0	0x38		--	0,56	#	eight
+9	2200	0	0x39		--	0,57	#	nine
+:	2200	0	0x3a		--	0,58	#	colon
+;	2200	0	0x3b		--	0,59	#	semicolon
+<	2200	0	0x3c		--	0,60	#	less
+=	2200	0	0x3d		--	0,61	#	equal
+>	2200	0	0x3e		--	0,62	#	greater
+?	2200	0	0x3f		--	0,63	#	question
+@	2200	0	0x40		--	0,64	#	at
+at	2200	0	0x40		--	0,64	#	"
+A	2200	0	0x41		--	0,65	#	A
+B	2200	0	0x42		--	0,66	#	B
+C	2200	0	0x43		--	0,67	#	C
+D	2200	0	0x44		--	0,68	#	D
+E	2200	0	0x45		--	0,69	#	E
+F	2200	0	0x46		--	0,70	#	F
+G	2200	0	0x47		--	0,71	#	G
+H	2200	0	0x48		--	0,72	#	H
+I	2200	0	0x49		--	0,73	#	I
+J	2200	0	0x4a		--	0,74	#	J
+K	2200	0	0x4b		--	0,75	#	K
+L	2200	0	0x4c		--	0,76	#	L
+M	2200	0	0x4d		--	0,77	#	M
+N	2200	0	0x4e		--	0,78	#	N
+O	2200	0	0x4f		--	0,79	#	O
+P	2200	0	0x50		--	0,80	#	P
+Q	2200	0	0x51		--	0,81	#	Q
+R	2200	0	0x52		--	0,82	#	R
+S	2200	0	0x53		--	0,83	#	S
+T	2200	0	0x54		--	0,84	#	T
+U	2200	0	0x55		--	0,85	#	U
+V	2200	0	0x56		--	0,86	#	V
+W	2200	0	0x57		--	0,87	#	W
+X	2200	0	0x58		--	0,88	#	X
+Y	2200	0	0x59		--	0,89	#	Y
+Z	2200	0	0x5a		--	0,90	#	Z
+[	2200	0	0x5b		--	0,91	#	bracketleft
+lB	2200	0	0x5b		--	0,91	#	"
+\	2200	0	0x5c		--	0,92	#	backslash
+rs	2200	0	0x5c		--	0,92	#	"
+]	2200	0	0x5d		--	0,93	#	bracketright
+rB	2200	0	0x5d		--	0,93	#	"
+a^	2200	0	0x5e		--	0,94	#	circumflex
+^	2200	0	0x5e		--	0,94	#	"
+_	2200	0	0x5f		--	0,95	#	underscore
+`	2200	0	0x60		--	0,96	#	quoteleft
+oq	2200	0	0x60		--	0,96	#	"
+a	2200	0	0x61		--	0,97	#	a
+b	2200	0	0x62		--	0,98	#	b
+c	2200	0	0x63		--	0,99	#	c
+d	2200	0	0x64		--	0,100	#	d
+e	2200	0	0x65		--	0,101	#	e
+f	2200	0	0x66		--	0,102	#	f
+g	2200	0	0x67		--	0,103	#	g
+h	2200	0	0x68		--	0,104	#	h
+i	2200	0	0x69		--	0,105	#	i
+j	2200	0	0x6a		--	0,106	#	j
+k	2200	0	0x6b		--	0,107	#	k
+l	2200	0	0x6c		--	0,108	#	l
+m	2200	0	0x6d		--	0,109	#	m
+n	2200	0	0x6e		--	0,110	#	n
+o	2200	0	0x6f		--	0,111	#	o
+p	2200	0	0x70		--	0,112	#	p
+q	2200	0	0x71		--	0,113	#	q
+r	2200	0	0x72		--	0,114	#	r
+s	2200	0	0x73		--	0,115	#	s
+t	2200	0	0x74		--	0,116	#	t
+u	2200	0	0x75		--	0,117	#	u
+v	2200	0	0x76		--	0,118	#	v
+w	2200	0	0x77		--	0,119	#	w
+x	2200	0	0x78		--	0,120	#	x
+y	2200	0	0x79		--	0,121	#	y
+z	2200	0	0x7a		--	0,122	#	z
+lC	2200	0	0x7b		--	0,123	#	braceleft
+{	2200	0	0x7b		--	0,123	#	"
+|	2200	0	0x7c		--	0,124	#	"
+rC	2200	0	0x7d		--	0,125	#	braceright
+}	2200	0	0x7d		--	0,125	#	"
+a~	2200	0	0x7e		--	0,126	#	tilde
+~	2200	0	0x7e		--	0,126	#	"
+char161	2200	0	0xad		--	4,7	#	exclamdown
+char162	2200	0	0x9b		--	4,19	#	cent
+char163	2200	0	0x9c		--	4,11	#	sterling
+char165	2200	0	0x9d		--	4,12	#	yen
+char166	2200	0	0x7c		--	0,124	#	brokenbar
+char167	2200	0	0x15		--	4,6	#	section
+char170	2200	0	0xa6		--	4,15	#	ordfeminine
+char171	2200	0	0xae		--	4,9	#	guillemotleft
+char172	2200	0	0xaa		--	6,20	#	logicalnot
+char175	2200	0	0x2d		--	6,0	#	macron
+char176	2200	0	0xf8		--	6,36	#	degree
+char177	2200	0	0xf1		--	6,1	#	plusminus
+char178	2200	0	0xfd		--	4,20	#	twosuperior
+char181	2200	0	0xe6		--	8,25	#	mu
+char182	2200	0	0x14		--	4,5	#	paragraph
+char183	2200	0	0xfa		--	6,32	#	periodcentered
+char186	2200	0	0xa7		--	4,16	#	ordmasculine
+char187	2200	0	0xaf		--	4,10	#	guillemotright
+char188	2200	0	0xac		--	4,18	#	onequarter
+char189	2200	0	0xab		--	4,17	#	onehalf
+char191	2200	0	0xa8		--	4,8	#	questiondown
+char195	2200	0	0x28e		--	1,76	#	Atilde
+char196	2200	0	0x8e		--	1,30	#	Adieresis
+char197	2200	0	0x8f		--	1,34	#	Aring
+char198	2200	0	0x92		--	1,36	#	AE
+char199	2200	0	0x80		--	1,38	#	Ccedilla
+char201	2200	0	0x90		--	1,40	#	Eacute
+char209	2200	0	0xa5		--	1,56	#	Ntilde
+char214	2200	0	0x99		--	1,62	#	Odieresis
+char220	2200	0	0x9a		--	1,70	#	Udieresis
+char224	2200	0	0x85		--	1,33	#	agrave
+char225	2200	0	0xa0		--	1,27	#	aacute
+char226	2200	0	0x83		--	1,29	#	acircumflex
+char227	2200	0	0x284		--	1,93	#	atilde
+char228	2200	0	0x84		--	1,31	#	adieresis
+char229	2200	0	0x86		--	1,35	#	aring
+char230	2200	0	0x91		--	1,37	#	ae
+char231	2200	0	0x87		--	1,39	#	ccedilla
+char232	2200	0	0x8a		--	1,47	#	egrave
+char233	2200	0	0x82		--	1,41	#	eacute
+char234	2200	0	0x88		--	1,43	#	ecircumflex
+char235	2200	0	0x89		--	1,45	#	edieresis
+char236	2200	0	0x8d		--	1,55	#	igrave
+char237	2200	0	0xa1		--	1,49	#	iacute
+char238	2200	0	0x8c		--	1,51	#	icircumflex
+char239	2200	0	0x8b		--	1,53	#	idieresis
+char241	2200	0	0xa4		--	1,57	#	ntilde
+char242	2200	0	0x95		--	1,65	#	ograve
+char243	2200	0	0xa2		--	1,59	#	oacute
+char244	2200	0	0x93		--	1,61	#	ocircumflex
+char246	2200	0	0x94		--	1,63	#	odieresis
+char247	2200	0	0xf6		--	6,8	#	divide
+char249	2200	0	0x97		--	1,73	#	ugrave
+char250	2200	0	0xa3		--	1,67	#	uacute
+char251	2200	0	0x96		--	1,69	#	ucircumflex
+char252	2200	0	0x81		--	1,71	#	udieresis
+char255	2200	0	0x98		--	1,75	#	ydieresis
+AE	2200	0	0x92		--	1,36	#	AE
+ae	2200	0	0x91		--	1,37	#	ae
+'E	2200	0	0x90		--	1,40	#	Eacute
+'a	2200	0	0xa0		--	1,27	#	aacute
+'e	2200	0	0x82		--	1,41	#	eacute
+'i	2200	0	0xa1		--	1,49	#	iacute
+'o	2200	0	0xa2		--	1,59	#	oacute
+'u	2200	0	0x95		--	1,65	#	uacute
+:A	2200	0	0x8e		--	1,30	#	Adieresis
+:O	2200	0	0x99		--	1,62	#	Odieresis
+:U	2200	0	0x9a		--	1,70	#	Udieresis
+:a	2200	0	0x84		--	1,31	#	adieresis
+:e	2200	0	0x89		--	1,45	#	edieresis
+:i	2200	0	0x8b		--	1,53	#	idieresis
+:o	2200	0	0x94		--	1,63	#	odieresis
+:u	2200	0	0x81		--	1,71	#	udieresis
+:y	2200	0	0x98		--	1,75	#	ydieresis
+^a	2200	0	0x83		--	1,29	#	acircumflex
+^e	2200	0	0x88		--	1,43	#	ecircumflex
+^i	2200	0	0x8c		--	1,51	#	icircumflex
+^o	2200	0	0x93		--	1,61	#	ocircumflex
+^u	2200	0	0x96		--	1,69	#	ucircumflex
+`a	2200	0	0x85		--	1,33	#	agrave
+`e	2200	0	0x8a		--	1,47	#	egrave
+`i	2200	0	0x8d		--	1,55	#	igrave
+`o	2200	0	0x95		--	1,65	#	ograve
+`u	2200	0	0x97		--	1,73	#	ugrave
+~A	2200	0	0x28e		--	1,26	#	Atilde
+~N	2200	0	0xa5		--	1,56	#	Ntilde
+~a	2200	0	0x284		--	---	#	atilde
+~n	2200	0	0xa4		--	1,57	#	ntilde
+,C	2200	0	0x80		--	1,38	#	Ccedilla
+,c	2200	0	0x87		--	1,39	#	ccedilla
+oA	2200	0	0x8f		--	1,34	#	Aring
+oa	2200	0	0x86		--	1,35	#	aring
+a^	2200	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	2200	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	2200	0	0x24		--	0,36	#	dollar
+Po	2200	0	0x9c		--	4,11	#	sterling
+Ye	2200	0	0x9d		--	4,12	#	yen
+Fn	2200	0	0x9f		--	4,14	#	florin
+ct	2200	0	0x9b		--	4,19	#	cent
+Fo	2200	0	0xae		--	4,9	#	guillemotleft
+r!	2200	0	0xad		--	4,7	#	exclamdown
+r?	2200	0	0xa8		--	4,8	#	questiondown
+Of	2200	0	0xa6		--	4,15	#	ordfeminine
+Om	2200	0	0xa7		--	4,16	#	ordmasculine
+S2	2200	0	0xfd		--	4,20	#	twosuperior
+<-	2200	0	0x1b		--	6,22	#	arrowleft
+->	2200	0	0x1a		--	6,21	#	arrowright
+<>	2200	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	2200	0	0x19		--	6,24	#	arrowdown
+ua	2200	0	0x18		--	6,23	#	arrowup
+va	2200	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	2200	0	0xb3		--	3,9	#	bar
+bb	2200	0	0x7c		--	0,124	#	brokenbar
+ul	2200	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	2200	0	0x9		--	4,1	#	circle
+bu	2200	0	0x7		--	4,0	#	bullet
+ps	2200	0	0x14		--	4,5	#	paragraph
+sc	2200	0	0x15		--	4,6	#	section
+de	2200	0	0xf8		--	6,36	#	degree
+12	2200	0	0xab		--	4,17	#	onehalf
+14	2200	0	0xac		--	4,18	#	onequarter
+hy	2200	0	0x2d		--	6,0	#	hyphen
+lB	2200	0	0x5b		--	0,91	#	bracketleft
+rB	2200	0	0x5d		--	0,93	#	bracketright
+lC	2200	0	0x7b		--	0,123	#	braceleft
+rC	2200	0	0x7d		--	0,125	#	braceright
+aq	2200	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	2200	0	0x40		--	0,64	#	at
+.C1	2200	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	2200	0	0x23		--	0,35	#	numbersign
+sl	2200	0	0x2f		--	0,47	#	slash
+rs	2200	0	0x5c		--	0,92	#	backslash
+*a	2200	0	0xe0		--	8,1	#	alpha
+*b	2200	0	0xe1		--	8,3	#	beta
+*d	2200	0	0xeb		--	8,9	#	delta
+*h	2200	0	0xe9		--	8,17	#	theta
+*m	2200	0	0xe6		--	8,25	#	mu
+*p	2200	0	0xe3		--	8,33	#	pi
+*s	2200	0	0xe5		--	8,37	#	sigma
+*t	2200	0	0xe7		--	8,41	#	tau
+~~	2200	0	0xf7		--	6,13	#	approxequal
+~=	2200	0	0xf7		--	6,13	#	approxequal
++-	2200	0	0xf1		--	6,1	#	plusminus
+<=	2200	0	0xf3		--	6,2	#	lessequal
+ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	2200	0	0xc4		--	3,8	#	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"
+DI	2200	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	2200	0	0xae		--	6,77	#	""	"much	less"
+>>	2200	0	0xaf		--	6,78	#	""	"much	greater"
+pc	2200	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/CI b/contrib/groff/devlbp/CI
new file mode 100644
index 000000000000..84b0ac41dab2
--- /dev/null
+++ b/contrib/groff/devlbp/CI
@@ -0,0 +1,272 @@
+
+name  CI
+lbpname  NcourierI
+spacewidth 2200
+slant 0
+charset
+aq	2200	0	0x27		--	0,39	#	quotesingle
+space	2200	0	0x20		--	0,32
+!	2200	0	0x21		--	0,33	#	exclam
+"	2200	0	0x22		--	0,34	#	quotedbl
+dq	2200	0	0x22		--	0,34	#	quotedbl
+#	2200	0	0x23		--	0,35	#	numbersign
+sh	2200	0	0x23		--	0,35	#	"
+$	2200	0	0x24		--	0,36	#	dollar
+Do	2200	0	0x24		--	0,36	#	"
+%	2200	0	0x25		--	0,37	#	percent
+&	2200	0	0x26		--	0,38	#	ampersand
+'	2200	0	0x27		--	0,39	#	quoteright
+cq	2200	0	0x27		--	0,39	#	quoteright
+(	2200	0	0x28		--	0,40	#	parenleft
+)	2200	0	0x29		--	0,41	#	parenright
+*	2200	0	0x2a		--	0,42	#	asterisk
++	2200	0	0x2b		--	0,43	#	plus
+,	2200	0	0x2c		--	0,44	#	comma
+-	2200	0	0x2d		--	0,45	#	hyphen
+\-	2200	0	0x2d		--	0,45	#	hyphen
+hy	2200	0	0x2d		--	0,45	#	"
+char173	2200	0	0x2d		--	0,45	#	"
+.	2200	0	0x2e		--	0,46	#	period
+/	2200	0	0x2f		--	0,47	#	slash
+sl	2200	0	0x2f		--	0,47	#	"
+0	2200	0	0x30		--	0,48	#	zero
+1	2200	0	0x31		--	0,49	#	one
+2	2200	0	0x32		--	0,50	#	two
+3	2200	0	0x33		--	0,51	#	three
+4	2200	0	0x34		--	0,52	#	four
+5	2200	0	0x35		--	0,53	#	five
+6	2200	0	0x36		--	0,54	#	six
+7	2200	0	0x37		--	0,55	#	seven
+8	2200	0	0x38		--	0,56	#	eight
+9	2200	0	0x39		--	0,57	#	nine
+:	2200	0	0x3a		--	0,58	#	colon
+;	2200	0	0x3b		--	0,59	#	semicolon
+<	2200	0	0x3c		--	0,60	#	less
+=	2200	0	0x3d		--	0,61	#	equal
+>	2200	0	0x3e		--	0,62	#	greater
+?	2200	0	0x3f		--	0,63	#	question
+@	2200	0	0x40		--	0,64	#	at
+at	2200	0	0x40		--	0,64	#	"
+A	2200	0	0x41		--	0,65	#	A
+B	2200	0	0x42		--	0,66	#	B
+C	2200	0	0x43		--	0,67	#	C
+D	2200	0	0x44		--	0,68	#	D
+E	2200	0	0x45		--	0,69	#	E
+F	2200	0	0x46		--	0,70	#	F
+G	2200	0	0x47		--	0,71	#	G
+H	2200	0	0x48		--	0,72	#	H
+I	2200	0	0x49		--	0,73	#	I
+J	2200	0	0x4a		--	0,74	#	J
+K	2200	0	0x4b		--	0,75	#	K
+L	2200	0	0x4c		--	0,76	#	L
+M	2200	0	0x4d		--	0,77	#	M
+N	2200	0	0x4e		--	0,78	#	N
+O	2200	0	0x4f		--	0,79	#	O
+P	2200	0	0x50		--	0,80	#	P
+Q	2200	0	0x51		--	0,81	#	Q
+R	2200	0	0x52		--	0,82	#	R
+S	2200	0	0x53		--	0,83	#	S
+T	2200	0	0x54		--	0,84	#	T
+U	2200	0	0x55		--	0,85	#	U
+V	2200	0	0x56		--	0,86	#	V
+W	2200	0	0x57		--	0,87	#	W
+X	2200	0	0x58		--	0,88	#	X
+Y	2200	0	0x59		--	0,89	#	Y
+Z	2200	0	0x5a		--	0,90	#	Z
+[	2200	0	0x5b		--	0,91	#	bracketleft
+lB	2200	0	0x5b		--	0,91	#	"
+\	2200	0	0x5c		--	0,92	#	backslash
+rs	2200	0	0x5c		--	0,92	#	"
+]	2200	0	0x5d		--	0,93	#	bracketright
+rB	2200	0	0x5d		--	0,93	#	"
+a^	2200	0	0x5e		--	0,94	#	circumflex
+^	2200	0	0x5e		--	0,94	#	"
+_	2200	0	0x5f		--	0,95	#	underscore
+`	2200	0	0x60		--	0,96	#	quoteleft
+oq	2200	0	0x60		--	0,96	#	"
+a	2200	0	0x61		--	0,97	#	a
+b	2200	0	0x62		--	0,98	#	b
+c	2200	0	0x63		--	0,99	#	c
+d	2200	0	0x64		--	0,100	#	d
+e	2200	0	0x65		--	0,101	#	e
+f	2200	0	0x66		--	0,102	#	f
+g	2200	0	0x67		--	0,103	#	g
+h	2200	0	0x68		--	0,104	#	h
+i	2200	0	0x69		--	0,105	#	i
+j	2200	0	0x6a		--	0,106	#	j
+k	2200	0	0x6b		--	0,107	#	k
+l	2200	0	0x6c		--	0,108	#	l
+m	2200	0	0x6d		--	0,109	#	m
+n	2200	0	0x6e		--	0,110	#	n
+o	2200	0	0x6f		--	0,111	#	o
+p	2200	0	0x70		--	0,112	#	p
+q	2200	0	0x71		--	0,113	#	q
+r	2200	0	0x72		--	0,114	#	r
+s	2200	0	0x73		--	0,115	#	s
+t	2200	0	0x74		--	0,116	#	t
+u	2200	0	0x75		--	0,117	#	u
+v	2200	0	0x76		--	0,118	#	v
+w	2200	0	0x77		--	0,119	#	w
+x	2200	0	0x78		--	0,120	#	x
+y	2200	0	0x79		--	0,121	#	y
+z	2200	0	0x7a		--	0,122	#	z
+lC	2200	0	0x7b		--	0,123	#	braceleft
+{	2200	0	0x7b		--	0,123	#	"
+|	2200	0	0x7c		--	0,124	#	"
+rC	2200	0	0x7d		--	0,125	#	braceright
+}	2200	0	0x7d		--	0,125	#	"
+a~	2200	0	0x7e		--	0,126	#	tilde
+~	2200	0	0x7e		--	0,126	#	"
+char161	2200	0	0xad		--	4,7	#	exclamdown
+char162	2200	0	0x9b		--	4,19	#	cent
+char163	2200	0	0x9c		--	4,11	#	sterling
+char165	2200	0	0x9d		--	4,12	#	yen
+char166	2200	0	0x7c		--	0,124	#	brokenbar
+char167	2200	0	0x15		--	4,6	#	section
+char170	2200	0	0xa6		--	4,15	#	ordfeminine
+char171	2200	0	0xae		--	4,9	#	guillemotleft
+char172	2200	0	0xaa		--	6,20	#	logicalnot
+char175	2200	0	0x2d		--	6,0	#	macron
+char176	2200	0	0xf8		--	6,36	#	degree
+char177	2200	0	0xf1		--	6,1	#	plusminus
+char178	2200	0	0xfd		--	4,20	#	twosuperior
+char181	2200	0	0xe6		--	8,25	#	mu
+char182	2200	0	0x14		--	4,5	#	paragraph
+char183	2200	0	0xfa		--	6,32	#	periodcentered
+char186	2200	0	0xa7		--	4,16	#	ordmasculine
+char187	2200	0	0xaf		--	4,10	#	guillemotright
+char188	2200	0	0xac		--	4,18	#	onequarter
+char189	2200	0	0xab		--	4,17	#	onehalf
+char191	2200	0	0xa8		--	4,8	#	questiondown
+char195	2200	0	0x28e		--	1,76	#	Atilde
+char196	2200	0	0x8e		--	1,30	#	Adieresis
+char197	2200	0	0x8f		--	1,34	#	Aring
+char198	2200	0	0x92		--	1,36	#	AE
+char199	2200	0	0x80		--	1,38	#	Ccedilla
+char201	2200	0	0x90		--	1,40	#	Eacute
+char209	2200	0	0xa5		--	1,56	#	Ntilde
+char214	2200	0	0x99		--	1,62	#	Odieresis
+char220	2200	0	0x9a		--	1,70	#	Udieresis
+char224	2200	0	0x85		--	1,33	#	agrave
+char225	2200	0	0xa0		--	1,27	#	aacute
+char226	2200	0	0x83		--	1,29	#	acircumflex
+char227	2200	0	0x284		--	1,93	#	atilde
+char228	2200	0	0x84		--	1,31	#	adieresis
+char229	2200	0	0x86		--	1,35	#	aring
+char230	2200	0	0x91		--	1,37	#	ae
+char231	2200	0	0x87		--	1,39	#	ccedilla
+char232	2200	0	0x8a		--	1,47	#	egrave
+char233	2200	0	0x82		--	1,41	#	eacute
+char234	2200	0	0x88		--	1,43	#	ecircumflex
+char235	2200	0	0x89		--	1,45	#	edieresis
+char236	2200	0	0x8d		--	1,55	#	igrave
+char237	2200	0	0xa1		--	1,49	#	iacute
+char238	2200	0	0x8c		--	1,51	#	icircumflex
+char239	2200	0	0x8b		--	1,53	#	idieresis
+char241	2200	0	0xa4		--	1,57	#	ntilde
+char242	2200	0	0x95		--	1,65	#	ograve
+char243	2200	0	0xa2		--	1,59	#	oacute
+char244	2200	0	0x93		--	1,61	#	ocircumflex
+char246	2200	0	0x94		--	1,63	#	odieresis
+char247	2200	0	0xf6		--	6,8	#	divide
+char249	2200	0	0x97		--	1,73	#	ugrave
+char250	2200	0	0xa3		--	1,67	#	uacute
+char251	2200	0	0x96		--	1,69	#	ucircumflex
+char252	2200	0	0x81		--	1,71	#	udieresis
+char255	2200	0	0x98		--	1,75	#	ydieresis
+AE	2200	0	0x92		--	1,36	#	AE
+ae	2200	0	0x91		--	1,37	#	ae
+'E	2200	0	0x90		--	1,40	#	Eacute
+'a	2200	0	0xa0		--	1,27	#	aacute
+'e	2200	0	0x82		--	1,41	#	eacute
+'i	2200	0	0xa1		--	1,49	#	iacute
+'o	2200	0	0xa2		--	1,59	#	oacute
+'u	2200	0	0x95		--	1,65	#	uacute
+:A	2200	0	0x8e		--	1,30	#	Adieresis
+:O	2200	0	0x99		--	1,62	#	Odieresis
+:U	2200	0	0x9a		--	1,70	#	Udieresis
+:a	2200	0	0x84		--	1,31	#	adieresis
+:e	2200	0	0x89		--	1,45	#	edieresis
+:i	2200	0	0x8b		--	1,53	#	idieresis
+:o	2200	0	0x94		--	1,63	#	odieresis
+:u	2200	0	0x81		--	1,71	#	udieresis
+:y	2200	0	0x98		--	1,75	#	ydieresis
+^a	2200	0	0x83		--	1,29	#	acircumflex
+^e	2200	0	0x88		--	1,43	#	ecircumflex
+^i	2200	0	0x8c		--	1,51	#	icircumflex
+^o	2200	0	0x93		--	1,61	#	ocircumflex
+^u	2200	0	0x96		--	1,69	#	ucircumflex
+`a	2200	0	0x85		--	1,33	#	agrave
+`e	2200	0	0x8a		--	1,47	#	egrave
+`i	2200	0	0x8d		--	1,55	#	igrave
+`o	2200	0	0x95		--	1,65	#	ograve
+`u	2200	0	0x97		--	1,73	#	ugrave
+~A	2200	0	0x28e		--	1,26	#	Atilde
+~N	2200	0	0xa5		--	1,56	#	Ntilde
+~a	2200	0	0x284		--	---	#	atilde
+~n	2200	0	0xa4		--	1,57	#	ntilde
+,C	2200	0	0x80		--	1,38	#	Ccedilla
+,c	2200	0	0x87		--	1,39	#	ccedilla
+oA	2200	0	0x8f		--	1,34	#	Aring
+oa	2200	0	0x86		--	1,35	#	aring
+a^	2200	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	2200	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	2200	0	0x24		--	0,36	#	dollar
+Po	2200	0	0x9c		--	4,11	#	sterling
+Ye	2200	0	0x9d		--	4,12	#	yen
+Fn	2200	0	0x9f		--	4,14	#	florin
+ct	2200	0	0x9b		--	4,19	#	cent
+Fo	2200	0	0xae		--	4,9	#	guillemotleft
+r!	2200	0	0xad		--	4,7	#	exclamdown
+r?	2200	0	0xa8		--	4,8	#	questiondown
+Of	2200	0	0xa6		--	4,15	#	ordfeminine
+Om	2200	0	0xa7		--	4,16	#	ordmasculine
+S2	2200	0	0xfd		--	4,20	#	twosuperior
+<-	2200	0	0x1b		--	6,22	#	arrowleft
+->	2200	0	0x1a		--	6,21	#	arrowright
+<>	2200	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	2200	0	0x19		--	6,24	#	arrowdown
+ua	2200	0	0x18		--	6,23	#	arrowup
+va	2200	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	2200	0	0xb3		--	3,9	#	bar
+bb	2200	0	0x7c		--	0,124	#	brokenbar
+ul	2200	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	2200	0	0x9		--	4,1	#	circle
+bu	2200	0	0x7		--	4,0	#	bullet
+ps	2200	0	0x14		--	4,5	#	paragraph
+sc	2200	0	0x15		--	4,6	#	section
+de	2200	0	0xf8		--	6,36	#	degree
+12	2200	0	0xab		--	4,17	#	onehalf
+14	2200	0	0xac		--	4,18	#	onequarter
+hy	2200	0	0x2d		--	6,0	#	hyphen
+lB	2200	0	0x5b		--	0,91	#	bracketleft
+rB	2200	0	0x5d		--	0,93	#	bracketright
+lC	2200	0	0x7b		--	0,123	#	braceleft
+rC	2200	0	0x7d		--	0,125	#	braceright
+aq	2200	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	2200	0	0x40		--	0,64	#	at
+.C1	2200	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	2200	0	0x23		--	0,35	#	numbersign
+sl	2200	0	0x2f		--	0,47	#	slash
+rs	2200	0	0x5c		--	0,92	#	backslash
+*a	2200	0	0xe0		--	8,1	#	alpha
+*b	2200	0	0xe1		--	8,3	#	beta
+*d	2200	0	0xeb		--	8,9	#	delta
+*h	2200	0	0xe9		--	8,17	#	theta
+*m	2200	0	0xe6		--	8,25	#	mu
+*p	2200	0	0xe3		--	8,33	#	pi
+*s	2200	0	0xe5		--	8,37	#	sigma
+*t	2200	0	0xe7		--	8,41	#	tau
+~~	2200	0	0xf7		--	6,13	#	approxequal
+~=	2200	0	0xf7		--	6,13	#	approxequal
++-	2200	0	0xf1		--	6,1	#	plusminus
+<=	2200	0	0xf3		--	6,2	#	lessequal
+ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	2200	0	0xc4		--	3,8	#	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"
+DI	2200	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	2200	0	0xae		--	6,77	#	""	"much	less"
+>>	2200	0	0xaf		--	6,78	#	""	"much	greater"
+pc	2200	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/CR b/contrib/groff/devlbp/CR
new file mode 100644
index 000000000000..ef4a56b2f098
--- /dev/null
+++ b/contrib/groff/devlbp/CR
@@ -0,0 +1,272 @@
+
+name  CR
+lbpname  NcourierR
+spacewidth 2200
+slant 0
+charset
+aq	2200	0	0x27		--	0,39	#	quotesingle
+space	2200	0	0x20		--	0,32
+!	2200	0	0x21		--	0,33	#	exclam
+"	2200	0	0x22		--	0,34	#	quotedbl
+dq	2200	0	0x22		--	0,34	#	quotedbl
+#	2200	0	0x23		--	0,35	#	numbersign
+sh	2200	0	0x23		--	0,35	#	"
+$	2200	0	0x24		--	0,36	#	dollar
+Do	2200	0	0x24		--	0,36	#	"
+%	2200	0	0x25		--	0,37	#	percent
+&	2200	0	0x26		--	0,38	#	ampersand
+'	2200	0	0x27		--	0,39	#	quoteright
+cq	2200	0	0x27		--	0,39	#	quoteright
+(	2200	0	0x28		--	0,40	#	parenleft
+)	2200	0	0x29		--	0,41	#	parenright
+*	2200	0	0x2a		--	0,42	#	asterisk
++	2200	0	0x2b		--	0,43	#	plus
+,	2200	0	0x2c		--	0,44	#	comma
+-	2200	0	0x2d		--	0,45	#	hyphen
+\-	2200	0	0x2d		--	0,45	#	hyphen
+hy	2200	0	0x2d		--	0,45	#	"
+char173	2200	0	0x2d		--	0,45	#	"
+.	2200	0	0x2e		--	0,46	#	period
+/	2200	0	0x2f		--	0,47	#	slash
+sl	2200	0	0x2f		--	0,47	#	"
+0	2200	0	0x30		--	0,48	#	zero
+1	2200	0	0x31		--	0,49	#	one
+2	2200	0	0x32		--	0,50	#	two
+3	2200	0	0x33		--	0,51	#	three
+4	2200	0	0x34		--	0,52	#	four
+5	2200	0	0x35		--	0,53	#	five
+6	2200	0	0x36		--	0,54	#	six
+7	2200	0	0x37		--	0,55	#	seven
+8	2200	0	0x38		--	0,56	#	eight
+9	2200	0	0x39		--	0,57	#	nine
+:	2200	0	0x3a		--	0,58	#	colon
+;	2200	0	0x3b		--	0,59	#	semicolon
+<	2200	0	0x3c		--	0,60	#	less
+=	2200	0	0x3d		--	0,61	#	equal
+>	2200	0	0x3e		--	0,62	#	greater
+?	2200	0	0x3f		--	0,63	#	question
+@	2200	0	0x40		--	0,64	#	at
+at	2200	0	0x40		--	0,64	#	"
+A	2200	0	0x41		--	0,65	#	A
+B	2200	0	0x42		--	0,66	#	B
+C	2200	0	0x43		--	0,67	#	C
+D	2200	0	0x44		--	0,68	#	D
+E	2200	0	0x45		--	0,69	#	E
+F	2200	0	0x46		--	0,70	#	F
+G	2200	0	0x47		--	0,71	#	G
+H	2200	0	0x48		--	0,72	#	H
+I	2200	0	0x49		--	0,73	#	I
+J	2200	0	0x4a		--	0,74	#	J
+K	2200	0	0x4b		--	0,75	#	K
+L	2200	0	0x4c		--	0,76	#	L
+M	2200	0	0x4d		--	0,77	#	M
+N	2200	0	0x4e		--	0,78	#	N
+O	2200	0	0x4f		--	0,79	#	O
+P	2200	0	0x50		--	0,80	#	P
+Q	2200	0	0x51		--	0,81	#	Q
+R	2200	0	0x52		--	0,82	#	R
+S	2200	0	0x53		--	0,83	#	S
+T	2200	0	0x54		--	0,84	#	T
+U	2200	0	0x55		--	0,85	#	U
+V	2200	0	0x56		--	0,86	#	V
+W	2200	0	0x57		--	0,87	#	W
+X	2200	0	0x58		--	0,88	#	X
+Y	2200	0	0x59		--	0,89	#	Y
+Z	2200	0	0x5a		--	0,90	#	Z
+[	2200	0	0x5b		--	0,91	#	bracketleft
+lB	2200	0	0x5b		--	0,91	#	"
+\	2200	0	0x5c		--	0,92	#	backslash
+rs	2200	0	0x5c		--	0,92	#	"
+]	2200	0	0x5d		--	0,93	#	bracketright
+rB	2200	0	0x5d		--	0,93	#	"
+a^	2200	0	0x5e		--	0,94	#	circumflex
+^	2200	0	0x5e		--	0,94	#	"
+_	2200	0	0x5f		--	0,95	#	underscore
+`	2200	0	0x60		--	0,96	#	quoteleft
+oq	2200	0	0x60		--	0,96	#	"
+a	2200	0	0x61		--	0,97	#	a
+b	2200	0	0x62		--	0,98	#	b
+c	2200	0	0x63		--	0,99	#	c
+d	2200	0	0x64		--	0,100	#	d
+e	2200	0	0x65		--	0,101	#	e
+f	2200	0	0x66		--	0,102	#	f
+g	2200	0	0x67		--	0,103	#	g
+h	2200	0	0x68		--	0,104	#	h
+i	2200	0	0x69		--	0,105	#	i
+j	2200	0	0x6a		--	0,106	#	j
+k	2200	0	0x6b		--	0,107	#	k
+l	2200	0	0x6c		--	0,108	#	l
+m	2200	0	0x6d		--	0,109	#	m
+n	2200	0	0x6e		--	0,110	#	n
+o	2200	0	0x6f		--	0,111	#	o
+p	2200	0	0x70		--	0,112	#	p
+q	2200	0	0x71		--	0,113	#	q
+r	2200	0	0x72		--	0,114	#	r
+s	2200	0	0x73		--	0,115	#	s
+t	2200	0	0x74		--	0,116	#	t
+u	2200	0	0x75		--	0,117	#	u
+v	2200	0	0x76		--	0,118	#	v
+w	2200	0	0x77		--	0,119	#	w
+x	2200	0	0x78		--	0,120	#	x
+y	2200	0	0x79		--	0,121	#	y
+z	2200	0	0x7a		--	0,122	#	z
+lC	2200	0	0x7b		--	0,123	#	braceleft
+{	2200	0	0x7b		--	0,123	#	"
+|	2200	0	0x7c		--	0,124	#	"
+rC	2200	0	0x7d		--	0,125	#	braceright
+}	2200	0	0x7d		--	0,125	#	"
+a~	2200	0	0x7e		--	0,126	#	tilde
+~	2200	0	0x7e		--	0,126	#	"
+char161	2200	0	0xad		--	4,7	#	exclamdown
+char162	2200	0	0x9b		--	4,19	#	cent
+char163	2200	0	0x9c		--	4,11	#	sterling
+char165	2200	0	0x9d		--	4,12	#	yen
+char166	2200	0	0x7c		--	0,124	#	brokenbar
+char167	2200	0	0x15		--	4,6	#	section
+char170	2200	0	0xa6		--	4,15	#	ordfeminine
+char171	2200	0	0xae		--	4,9	#	guillemotleft
+char172	2200	0	0xaa		--	6,20	#	logicalnot
+char175	2200	0	0x2d		--	6,0	#	macron
+char176	2200	0	0xf8		--	6,36	#	degree
+char177	2200	0	0xf1		--	6,1	#	plusminus
+char178	2200	0	0xfd		--	4,20	#	twosuperior
+char181	2200	0	0xe6		--	8,25	#	mu
+char182	2200	0	0x14		--	4,5	#	paragraph
+char183	2200	0	0xfa		--	6,32	#	periodcentered
+char186	2200	0	0xa7		--	4,16	#	ordmasculine
+char187	2200	0	0xaf		--	4,10	#	guillemotright
+char188	2200	0	0xac		--	4,18	#	onequarter
+char189	2200	0	0xab		--	4,17	#	onehalf
+char191	2200	0	0xa8		--	4,8	#	questiondown
+char195	2200	0	0x28e		--	1,76	#	Atilde
+char196	2200	0	0x8e		--	1,30	#	Adieresis
+char197	2200	0	0x8f		--	1,34	#	Aring
+char198	2200	0	0x92		--	1,36	#	AE
+char199	2200	0	0x80		--	1,38	#	Ccedilla
+char201	2200	0	0x90		--	1,40	#	Eacute
+char209	2200	0	0xa5		--	1,56	#	Ntilde
+char214	2200	0	0x99		--	1,62	#	Odieresis
+char220	2200	0	0x9a		--	1,70	#	Udieresis
+char224	2200	0	0x85		--	1,33	#	agrave
+char225	2200	0	0xa0		--	1,27	#	aacute
+char226	2200	0	0x83		--	1,29	#	acircumflex
+char227	2200	0	0x284		--	1,93	#	atilde
+char228	2200	0	0x84		--	1,31	#	adieresis
+char229	2200	0	0x86		--	1,35	#	aring
+char230	2200	0	0x91		--	1,37	#	ae
+char231	2200	0	0x87		--	1,39	#	ccedilla
+char232	2200	0	0x8a		--	1,47	#	egrave
+char233	2200	0	0x82		--	1,41	#	eacute
+char234	2200	0	0x88		--	1,43	#	ecircumflex
+char235	2200	0	0x89		--	1,45	#	edieresis
+char236	2200	0	0x8d		--	1,55	#	igrave
+char237	2200	0	0xa1		--	1,49	#	iacute
+char238	2200	0	0x8c		--	1,51	#	icircumflex
+char239	2200	0	0x8b		--	1,53	#	idieresis
+char241	2200	0	0xa4		--	1,57	#	ntilde
+char242	2200	0	0x95		--	1,65	#	ograve
+char243	2200	0	0xa2		--	1,59	#	oacute
+char244	2200	0	0x93		--	1,61	#	ocircumflex
+char246	2200	0	0x94		--	1,63	#	odieresis
+char247	2200	0	0xf6		--	6,8	#	divide
+char249	2200	0	0x97		--	1,73	#	ugrave
+char250	2200	0	0xa3		--	1,67	#	uacute
+char251	2200	0	0x96		--	1,69	#	ucircumflex
+char252	2200	0	0x81		--	1,71	#	udieresis
+char255	2200	0	0x98		--	1,75	#	ydieresis
+AE	2200	0	0x92		--	1,36	#	AE
+ae	2200	0	0x91		--	1,37	#	ae
+'E	2200	0	0x90		--	1,40	#	Eacute
+'a	2200	0	0xa0		--	1,27	#	aacute
+'e	2200	0	0x82		--	1,41	#	eacute
+'i	2200	0	0xa1		--	1,49	#	iacute
+'o	2200	0	0xa2		--	1,59	#	oacute
+'u	2200	0	0x95		--	1,65	#	uacute
+:A	2200	0	0x8e		--	1,30	#	Adieresis
+:O	2200	0	0x99		--	1,62	#	Odieresis
+:U	2200	0	0x9a		--	1,70	#	Udieresis
+:a	2200	0	0x84		--	1,31	#	adieresis
+:e	2200	0	0x89		--	1,45	#	edieresis
+:i	2200	0	0x8b		--	1,53	#	idieresis
+:o	2200	0	0x94		--	1,63	#	odieresis
+:u	2200	0	0x81		--	1,71	#	udieresis
+:y	2200	0	0x98		--	1,75	#	ydieresis
+^a	2200	0	0x83		--	1,29	#	acircumflex
+^e	2200	0	0x88		--	1,43	#	ecircumflex
+^i	2200	0	0x8c		--	1,51	#	icircumflex
+^o	2200	0	0x93		--	1,61	#	ocircumflex
+^u	2200	0	0x96		--	1,69	#	ucircumflex
+`a	2200	0	0x85		--	1,33	#	agrave
+`e	2200	0	0x8a		--	1,47	#	egrave
+`i	2200	0	0x8d		--	1,55	#	igrave
+`o	2200	0	0x95		--	1,65	#	ograve
+`u	2200	0	0x97		--	1,73	#	ugrave
+~A	2200	0	0x28e		--	1,26	#	Atilde
+~N	2200	0	0xa5		--	1,56	#	Ntilde
+~a	2200	0	0x284		--	---	#	atilde
+~n	2200	0	0xa4		--	1,57	#	ntilde
+,C	2200	0	0x80		--	1,38	#	Ccedilla
+,c	2200	0	0x87		--	1,39	#	ccedilla
+oA	2200	0	0x8f		--	1,34	#	Aring
+oa	2200	0	0x86		--	1,35	#	aring
+a^	2200	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	2200	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	2200	0	0x24		--	0,36	#	dollar
+Po	2200	0	0x9c		--	4,11	#	sterling
+Ye	2200	0	0x9d		--	4,12	#	yen
+Fn	2200	0	0x9f		--	4,14	#	florin
+ct	2200	0	0x9b		--	4,19	#	cent
+Fo	2200	0	0xae		--	4,9	#	guillemotleft
+r!	2200	0	0xad		--	4,7	#	exclamdown
+r?	2200	0	0xa8		--	4,8	#	questiondown
+Of	2200	0	0xa6		--	4,15	#	ordfeminine
+Om	2200	0	0xa7		--	4,16	#	ordmasculine
+S2	2200	0	0xfd		--	4,20	#	twosuperior
+<-	2200	0	0x1b		--	6,22	#	arrowleft
+->	2200	0	0x1a		--	6,21	#	arrowright
+<>	2200	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	2200	0	0x19		--	6,24	#	arrowdown
+ua	2200	0	0x18		--	6,23	#	arrowup
+va	2200	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	2200	0	0xb3		--	3,9	#	bar
+bb	2200	0	0x7c		--	0,124	#	brokenbar
+ul	2200	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	2200	0	0x9		--	4,1	#	circle
+bu	2200	0	0x7		--	4,0	#	bullet
+ps	2200	0	0x14		--	4,5	#	paragraph
+sc	2200	0	0x15		--	4,6	#	section
+de	2200	0	0xf8		--	6,36	#	degree
+12	2200	0	0xab		--	4,17	#	onehalf
+14	2200	0	0xac		--	4,18	#	onequarter
+hy	2200	0	0x2d		--	6,0	#	hyphen
+lB	2200	0	0x5b		--	0,91	#	bracketleft
+rB	2200	0	0x5d		--	0,93	#	bracketright
+lC	2200	0	0x7b		--	0,123	#	braceleft
+rC	2200	0	0x7d		--	0,125	#	braceright
+aq	2200	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	2200	0	0x40		--	0,64	#	at
+.C1	2200	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	2200	0	0x23		--	0,35	#	numbersign
+sl	2200	0	0x2f		--	0,47	#	slash
+rs	2200	0	0x5c		--	0,92	#	backslash
+*a	2200	0	0xe0		--	8,1	#	alpha
+*b	2200	0	0xe1		--	8,3	#	beta
+*d	2200	0	0xeb		--	8,9	#	delta
+*h	2200	0	0xe9		--	8,17	#	theta
+*m	2200	0	0xe6		--	8,25	#	mu
+*p	2200	0	0xe3		--	8,33	#	pi
+*s	2200	0	0xe5		--	8,37	#	sigma
+*t	2200	0	0xe7		--	8,41	#	tau
+~~	2200	0	0xf7		--	6,13	#	approxequal
+~=	2200	0	0xf7		--	6,13	#	approxequal
++-	2200	0	0xf1		--	6,1	#	plusminus
+<=	2200	0	0xf3		--	6,2	#	lessequal
+ca	2200	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	2200	0	0xc4		--	3,8	#	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"
+DI	2200	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	2200	0	0xae		--	6,77	#	""	"much	less"
+>>	2200	0	0xaf		--	6,78	#	""	"much	greater"
+pc	2200	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/DESC.in b/contrib/groff/devlbp/DESC.in
new file mode 100644
index 000000000000..eb5d6f24ed0e
--- /dev/null
+++ b/contrib/groff/devlbp/DESC.in
@@ -0,0 +1,9 @@
+res 300
+unitwidth 800
+family T
+styles R I B BI
+sizes 1-1000 0
+fonts 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+tcommand
+orientation portrait
+postpro grolbp
diff --git a/contrib/groff/devlbp/EB b/contrib/groff/devlbp/EB
new file mode 100644
index 000000000000..50c6f71f56c9
--- /dev/null
+++ b/contrib/groff/devlbp/EB
@@ -0,0 +1,272 @@
+
+name  EB
+lbpname  NeliteB
+spacewidth 1900
+slant 0
+charset
+aq	1900	0	0x27		--	0,39	#	quotesingle
+space	1900	0	0x20		--	0,32
+!	1900	0	0x21		--	0,33	#	exclam
+"	1900	0	0x22		--	0,34	#	quotedbl
+dq	1900	0	0x22		--	0,34	#	quotedbl
+#	1900	0	0x23		--	0,35	#	numbersign
+sh	1900	0	0x23		--	0,35	#	"
+$	1900	0	0x24		--	0,36	#	dollar
+Do	1900	0	0x24		--	0,36	#	"
+%	1900	0	0x25		--	0,37	#	percent
+&	1900	0	0x26		--	0,38	#	ampersand
+'	1900	0	0x27		--	0,39	#	quoteright
+cq	1900	0	0x27		--	0,39	#	quoteright
+(	1900	0	0x28		--	0,40	#	parenleft
+)	1900	0	0x29		--	0,41	#	parenright
+*	1900	0	0x2a		--	0,42	#	asterisk
++	1900	0	0x2b		--	0,43	#	plus
+,	1900	0	0x2c		--	0,44	#	comma
+-	1900	0	0x2d		--	0,45	#	hyphen
+\-	1900	0	0x2d		--	0,45	#	hyphen
+hy	1900	0	0x2d		--	0,45	#	"
+char173	1900	0	0x2d		--	0,45	#	"
+.	1900	0	0x2e		--	0,46	#	period
+/	1900	0	0x2f		--	0,47	#	slash
+sl	1900	0	0x2f		--	0,47	#	"
+0	1900	0	0x30		--	0,48	#	zero
+1	1900	0	0x31		--	0,49	#	one
+2	1900	0	0x32		--	0,50	#	two
+3	1900	0	0x33		--	0,51	#	three
+4	1900	0	0x34		--	0,52	#	four
+5	1900	0	0x35		--	0,53	#	five
+6	1900	0	0x36		--	0,54	#	six
+7	1900	0	0x37		--	0,55	#	seven
+8	1900	0	0x38		--	0,56	#	eight
+9	1900	0	0x39		--	0,57	#	nine
+:	1900	0	0x3a		--	0,58	#	colon
+;	1900	0	0x3b		--	0,59	#	semicolon
+<	1900	0	0x3c		--	0,60	#	less
+=	1900	0	0x3d		--	0,61	#	equal
+>	1900	0	0x3e		--	0,62	#	greater
+?	1900	0	0x3f		--	0,63	#	question
+@	1900	0	0x40		--	0,64	#	at
+at	1900	0	0x40		--	0,64	#	"
+A	1900	0	0x41		--	0,65	#	A
+B	1900	0	0x42		--	0,66	#	B
+C	1900	0	0x43		--	0,67	#	C
+D	1900	0	0x44		--	0,68	#	D
+E	1900	0	0x45		--	0,69	#	E
+F	1900	0	0x46		--	0,70	#	F
+G	1900	0	0x47		--	0,71	#	G
+H	1900	0	0x48		--	0,72	#	H
+I	1900	0	0x49		--	0,73	#	I
+J	1900	0	0x4a		--	0,74	#	J
+K	1900	0	0x4b		--	0,75	#	K
+L	1900	0	0x4c		--	0,76	#	L
+M	1900	0	0x4d		--	0,77	#	M
+N	1900	0	0x4e		--	0,78	#	N
+O	1900	0	0x4f		--	0,79	#	O
+P	1900	0	0x50		--	0,80	#	P
+Q	1900	0	0x51		--	0,81	#	Q
+R	1900	0	0x52		--	0,82	#	R
+S	1900	0	0x53		--	0,83	#	S
+T	1900	0	0x54		--	0,84	#	T
+U	1900	0	0x55		--	0,85	#	U
+V	1900	0	0x56		--	0,86	#	V
+W	1900	0	0x57		--	0,87	#	W
+X	1900	0	0x58		--	0,88	#	X
+Y	1900	0	0x59		--	0,89	#	Y
+Z	1900	0	0x5a		--	0,90	#	Z
+[	1900	0	0x5b		--	0,91	#	bracketleft
+lB	1900	0	0x5b		--	0,91	#	"
+\	1900	0	0x5c		--	0,92	#	backslash
+rs	1900	0	0x5c		--	0,92	#	"
+]	1900	0	0x5d		--	0,93	#	bracketright
+rB	1900	0	0x5d		--	0,93	#	"
+a^	1900	0	0x5e		--	0,94	#	circumflex
+^	1900	0	0x5e		--	0,94	#	"
+_	1900	0	0x5f		--	0,95	#	underscore
+`	1900	0	0x60		--	0,96	#	quoteleft
+oq	1900	0	0x60		--	0,96	#	"
+a	1900	0	0x61		--	0,97	#	a
+b	1900	0	0x62		--	0,98	#	b
+c	1900	0	0x63		--	0,99	#	c
+d	1900	0	0x64		--	0,100	#	d
+e	1900	0	0x65		--	0,101	#	e
+f	1900	0	0x66		--	0,102	#	f
+g	1900	0	0x67		--	0,103	#	g
+h	1900	0	0x68		--	0,104	#	h
+i	1900	0	0x69		--	0,105	#	i
+j	1900	0	0x6a		--	0,106	#	j
+k	1900	0	0x6b		--	0,107	#	k
+l	1900	0	0x6c		--	0,108	#	l
+m	1900	0	0x6d		--	0,109	#	m
+n	1900	0	0x6e		--	0,110	#	n
+o	1900	0	0x6f		--	0,111	#	o
+p	1900	0	0x70		--	0,112	#	p
+q	1900	0	0x71		--	0,113	#	q
+r	1900	0	0x72		--	0,114	#	r
+s	1900	0	0x73		--	0,115	#	s
+t	1900	0	0x74		--	0,116	#	t
+u	1900	0	0x75		--	0,117	#	u
+v	1900	0	0x76		--	0,118	#	v
+w	1900	0	0x77		--	0,119	#	w
+x	1900	0	0x78		--	0,120	#	x
+y	1900	0	0x79		--	0,121	#	y
+z	1900	0	0x7a		--	0,122	#	z
+lC	1900	0	0x7b		--	0,123	#	braceleft
+{	1900	0	0x7b		--	0,123	#	"
+|	1900	0	0x7c		--	0,124	#	"
+rC	1900	0	0x7d		--	0,125	#	braceright
+}	1900	0	0x7d		--	0,125	#	"
+a~	1900	0	0x7e		--	0,126	#	tilde
+~	1900	0	0x7e		--	0,126	#	"
+char161	1900	0	0xad		--	4,7	#	exclamdown
+char162	1900	0	0x9b		--	4,19	#	cent
+char163	1900	0	0x9c		--	4,11	#	sterling
+char165	1900	0	0x9d		--	4,12	#	yen
+char166	1900	0	0x7c		--	0,124	#	brokenbar
+char167	1900	0	0x15		--	4,6	#	section
+char170	1900	0	0xa6		--	4,15	#	ordfeminine
+char171	1900	0	0xae		--	4,9	#	guillemotleft
+char172	1900	0	0xaa		--	6,20	#	logicalnot
+char175	1900	0	0x2d		--	6,0	#	macron
+char176	1900	0	0xf8		--	6,36	#	degree
+char177	1900	0	0xf1		--	6,1	#	plusminus
+char178	1900	0	0xfd		--	4,20	#	twosuperior
+char181	1900	0	0xe6		--	8,25	#	mu
+char182	1900	0	0x14		--	4,5	#	paragraph
+char183	1900	0	0xfa		--	6,32	#	periodcentered
+char186	1900	0	0xa7		--	4,16	#	ordmasculine
+char187	1900	0	0xaf		--	4,10	#	guillemotright
+char188	1900	0	0xac		--	4,18	#	onequarter
+char189	1900	0	0xab		--	4,17	#	onehalf
+char191	1900	0	0xa8		--	4,8	#	questiondown
+char195	1900	0	0x28e		--	1,76	#	Atilde
+char196	1900	0	0x8e		--	1,30	#	Adieresis
+char197	1900	0	0x8f		--	1,34	#	Aring
+char198	1900	0	0x92		--	1,36	#	AE
+char199	1900	0	0x80		--	1,38	#	Ccedilla
+char201	1900	0	0x90		--	1,40	#	Eacute
+char209	1900	0	0xa5		--	1,56	#	Ntilde
+char214	1900	0	0x99		--	1,62	#	Odieresis
+char220	1900	0	0x9a		--	1,70	#	Udieresis
+char224	1900	0	0x85		--	1,33	#	agrave
+char225	1900	0	0xa0		--	1,27	#	aacute
+char226	1900	0	0x83		--	1,29	#	acircumflex
+char227	1900	0	0x284		--	1,93	#	atilde
+char228	1900	0	0x84		--	1,31	#	adieresis
+char229	1900	0	0x86		--	1,35	#	aring
+char230	1900	0	0x91		--	1,37	#	ae
+char231	1900	0	0x87		--	1,39	#	ccedilla
+char232	1900	0	0x8a		--	1,47	#	egrave
+char233	1900	0	0x82		--	1,41	#	eacute
+char234	1900	0	0x88		--	1,43	#	ecircumflex
+char235	1900	0	0x89		--	1,45	#	edieresis
+char236	1900	0	0x8d		--	1,55	#	igrave
+char237	1900	0	0xa1		--	1,49	#	iacute
+char238	1900	0	0x8c		--	1,51	#	icircumflex
+char239	1900	0	0x8b		--	1,53	#	idieresis
+char241	1900	0	0xa4		--	1,57	#	ntilde
+char242	1900	0	0x95		--	1,65	#	ograve
+char243	1900	0	0xa2		--	1,59	#	oacute
+char244	1900	0	0x93		--	1,61	#	ocircumflex
+char246	1900	0	0x94		--	1,63	#	odieresis
+char247	1900	0	0xf6		--	6,8	#	divide
+char249	1900	0	0x97		--	1,73	#	ugrave
+char250	1900	0	0xa3		--	1,67	#	uacute
+char251	1900	0	0x96		--	1,69	#	ucircumflex
+char252	1900	0	0x81		--	1,71	#	udieresis
+char255	1900	0	0x98		--	1,75	#	ydieresis
+AE	1900	0	0x92		--	1,36	#	AE
+ae	1900	0	0x91		--	1,37	#	ae
+'E	1900	0	0x90		--	1,40	#	Eacute
+'a	1900	0	0xa0		--	1,27	#	aacute
+'e	1900	0	0x82		--	1,41	#	eacute
+'i	1900	0	0xa1		--	1,49	#	iacute
+'o	1900	0	0xa2		--	1,59	#	oacute
+'u	1900	0	0x95		--	1,65	#	uacute
+:A	1900	0	0x8e		--	1,30	#	Adieresis
+:O	1900	0	0x99		--	1,62	#	Odieresis
+:U	1900	0	0x9a		--	1,70	#	Udieresis
+:a	1900	0	0x84		--	1,31	#	adieresis
+:e	1900	0	0x89		--	1,45	#	edieresis
+:i	1900	0	0x8b		--	1,53	#	idieresis
+:o	1900	0	0x94		--	1,63	#	odieresis
+:u	1900	0	0x81		--	1,71	#	udieresis
+:y	1900	0	0x98		--	1,75	#	ydieresis
+^a	1900	0	0x83		--	1,29	#	acircumflex
+^e	1900	0	0x88		--	1,43	#	ecircumflex
+^i	1900	0	0x8c		--	1,51	#	icircumflex
+^o	1900	0	0x93		--	1,61	#	ocircumflex
+^u	1900	0	0x96		--	1,69	#	ucircumflex
+`a	1900	0	0x85		--	1,33	#	agrave
+`e	1900	0	0x8a		--	1,47	#	egrave
+`i	1900	0	0x8d		--	1,55	#	igrave
+`o	1900	0	0x95		--	1,65	#	ograve
+`u	1900	0	0x97		--	1,73	#	ugrave
+~A	1900	0	0x28e		--	1,26	#	Atilde
+~N	1900	0	0xa5		--	1,56	#	Ntilde
+~a	1900	0	0x284		--	---	#	atilde
+~n	1900	0	0xa4		--	1,57	#	ntilde
+,C	1900	0	0x80		--	1,38	#	Ccedilla
+,c	1900	0	0x87		--	1,39	#	ccedilla
+oA	1900	0	0x8f		--	1,34	#	Aring
+oa	1900	0	0x86		--	1,35	#	aring
+a^	1900	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	1900	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	1900	0	0x24		--	0,36	#	dollar
+Po	1900	0	0x9c		--	4,11	#	sterling
+Ye	1900	0	0x9d		--	4,12	#	yen
+Fn	1900	0	0x9f		--	4,14	#	florin
+ct	1900	0	0x9b		--	4,19	#	cent
+Fo	1900	0	0xae		--	4,9	#	guillemotleft
+r!	1900	0	0xad		--	4,7	#	exclamdown
+r?	1900	0	0xa8		--	4,8	#	questiondown
+Of	1900	0	0xa6		--	4,15	#	ordfeminine
+Om	1900	0	0xa7		--	4,16	#	ordmasculine
+S2	1900	0	0xfd		--	4,20	#	twosuperior
+<-	1900	0	0x1b		--	6,22	#	arrowleft
+->	1900	0	0x1a		--	6,21	#	arrowright
+<>	1900	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	1900	0	0x19		--	6,24	#	arrowdown
+ua	1900	0	0x18		--	6,23	#	arrowup
+va	1900	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	1900	0	0xb3		--	3,9	#	bar
+bb	1900	0	0x7c		--	0,124	#	brokenbar
+ul	1900	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	1900	0	0x9		--	4,1	#	circle
+bu	1900	0	0x7		--	4,0	#	bullet
+ps	1900	0	0x14		--	4,5	#	paragraph
+sc	1900	0	0x15		--	4,6	#	section
+de	1900	0	0xf8		--	6,36	#	degree
+12	1900	0	0xab		--	4,17	#	onehalf
+14	1900	0	0xac		--	4,18	#	onequarter
+hy	1900	0	0x2d		--	6,0	#	hyphen
+lB	1900	0	0x5b		--	0,91	#	bracketleft
+rB	1900	0	0x5d		--	0,93	#	bracketright
+lC	1900	0	0x7b		--	0,123	#	braceleft
+rC	1900	0	0x7d		--	0,125	#	braceright
+aq	1900	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	1900	0	0x40		--	0,64	#	at
+.C1	1900	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	1900	0	0x23		--	0,35	#	numbersign
+sl	1900	0	0x2f		--	0,47	#	slash
+rs	1900	0	0x5c		--	0,92	#	backslash
+*a	1900	0	0xe0		--	8,1	#	alpha
+*b	1900	0	0xe1		--	8,3	#	beta
+*d	1900	0	0xeb		--	8,9	#	delta
+*h	1900	0	0xe9		--	8,17	#	theta
+*m	1900	0	0xe6		--	8,25	#	mu
+*p	1900	0	0xe3		--	8,33	#	pi
+*s	1900	0	0xe5		--	8,37	#	sigma
+*t	1900	0	0xe7		--	8,41	#	tau
+~~	1900	0	0xf7		--	6,13	#	approxequal
+~=	1900	0	0xf7		--	6,13	#	approxequal
++-	1900	0	0xf1		--	6,1	#	plusminus
+<=	1900	0	0xf3		--	6,2	#	lessequal
+ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	1900	0	0xc4		--	3,8	#	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"
+DI	1900	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	1900	0	0xae		--	6,77	#	""	"much	less"
+>>	1900	0	0xaf		--	6,78	#	""	"much	greater"
+pc	1900	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/EI b/contrib/groff/devlbp/EI
new file mode 100644
index 000000000000..364cea69a787
--- /dev/null
+++ b/contrib/groff/devlbp/EI
@@ -0,0 +1,272 @@
+
+name  EI
+lbpname  NeliteI
+spacewidth 1900
+slant 0
+charset
+aq	1900	0	0x27		--	0,39	#	quotesingle
+space	1900	0	0x20		--	0,32
+!	1900	0	0x21		--	0,33	#	exclam
+"	1900	0	0x22		--	0,34	#	quotedbl
+dq	1900	0	0x22		--	0,34	#	quotedbl
+#	1900	0	0x23		--	0,35	#	numbersign
+sh	1900	0	0x23		--	0,35	#	"
+$	1900	0	0x24		--	0,36	#	dollar
+Do	1900	0	0x24		--	0,36	#	"
+%	1900	0	0x25		--	0,37	#	percent
+&	1900	0	0x26		--	0,38	#	ampersand
+'	1900	0	0x27		--	0,39	#	quoteright
+cq	1900	0	0x27		--	0,39	#	quoteright
+(	1900	0	0x28		--	0,40	#	parenleft
+)	1900	0	0x29		--	0,41	#	parenright
+*	1900	0	0x2a		--	0,42	#	asterisk
++	1900	0	0x2b		--	0,43	#	plus
+,	1900	0	0x2c		--	0,44	#	comma
+-	1900	0	0x2d		--	0,45	#	hyphen
+\-	1900	0	0x2d		--	0,45	#	hyphen
+hy	1900	0	0x2d		--	0,45	#	"
+char173	1900	0	0x2d		--	0,45	#	"
+.	1900	0	0x2e		--	0,46	#	period
+/	1900	0	0x2f		--	0,47	#	slash
+sl	1900	0	0x2f		--	0,47	#	"
+0	1900	0	0x30		--	0,48	#	zero
+1	1900	0	0x31		--	0,49	#	one
+2	1900	0	0x32		--	0,50	#	two
+3	1900	0	0x33		--	0,51	#	three
+4	1900	0	0x34		--	0,52	#	four
+5	1900	0	0x35		--	0,53	#	five
+6	1900	0	0x36		--	0,54	#	six
+7	1900	0	0x37		--	0,55	#	seven
+8	1900	0	0x38		--	0,56	#	eight
+9	1900	0	0x39		--	0,57	#	nine
+:	1900	0	0x3a		--	0,58	#	colon
+;	1900	0	0x3b		--	0,59	#	semicolon
+<	1900	0	0x3c		--	0,60	#	less
+=	1900	0	0x3d		--	0,61	#	equal
+>	1900	0	0x3e		--	0,62	#	greater
+?	1900	0	0x3f		--	0,63	#	question
+@	1900	0	0x40		--	0,64	#	at
+at	1900	0	0x40		--	0,64	#	"
+A	1900	0	0x41		--	0,65	#	A
+B	1900	0	0x42		--	0,66	#	B
+C	1900	0	0x43		--	0,67	#	C
+D	1900	0	0x44		--	0,68	#	D
+E	1900	0	0x45		--	0,69	#	E
+F	1900	0	0x46		--	0,70	#	F
+G	1900	0	0x47		--	0,71	#	G
+H	1900	0	0x48		--	0,72	#	H
+I	1900	0	0x49		--	0,73	#	I
+J	1900	0	0x4a		--	0,74	#	J
+K	1900	0	0x4b		--	0,75	#	K
+L	1900	0	0x4c		--	0,76	#	L
+M	1900	0	0x4d		--	0,77	#	M
+N	1900	0	0x4e		--	0,78	#	N
+O	1900	0	0x4f		--	0,79	#	O
+P	1900	0	0x50		--	0,80	#	P
+Q	1900	0	0x51		--	0,81	#	Q
+R	1900	0	0x52		--	0,82	#	R
+S	1900	0	0x53		--	0,83	#	S
+T	1900	0	0x54		--	0,84	#	T
+U	1900	0	0x55		--	0,85	#	U
+V	1900	0	0x56		--	0,86	#	V
+W	1900	0	0x57		--	0,87	#	W
+X	1900	0	0x58		--	0,88	#	X
+Y	1900	0	0x59		--	0,89	#	Y
+Z	1900	0	0x5a		--	0,90	#	Z
+[	1900	0	0x5b		--	0,91	#	bracketleft
+lB	1900	0	0x5b		--	0,91	#	"
+\	1900	0	0x5c		--	0,92	#	backslash
+rs	1900	0	0x5c		--	0,92	#	"
+]	1900	0	0x5d		--	0,93	#	bracketright
+rB	1900	0	0x5d		--	0,93	#	"
+a^	1900	0	0x5e		--	0,94	#	circumflex
+^	1900	0	0x5e		--	0,94	#	"
+_	1900	0	0x5f		--	0,95	#	underscore
+`	1900	0	0x60		--	0,96	#	quoteleft
+oq	1900	0	0x60		--	0,96	#	"
+a	1900	0	0x61		--	0,97	#	a
+b	1900	0	0x62		--	0,98	#	b
+c	1900	0	0x63		--	0,99	#	c
+d	1900	0	0x64		--	0,100	#	d
+e	1900	0	0x65		--	0,101	#	e
+f	1900	0	0x66		--	0,102	#	f
+g	1900	0	0x67		--	0,103	#	g
+h	1900	0	0x68		--	0,104	#	h
+i	1900	0	0x69		--	0,105	#	i
+j	1900	0	0x6a		--	0,106	#	j
+k	1900	0	0x6b		--	0,107	#	k
+l	1900	0	0x6c		--	0,108	#	l
+m	1900	0	0x6d		--	0,109	#	m
+n	1900	0	0x6e		--	0,110	#	n
+o	1900	0	0x6f		--	0,111	#	o
+p	1900	0	0x70		--	0,112	#	p
+q	1900	0	0x71		--	0,113	#	q
+r	1900	0	0x72		--	0,114	#	r
+s	1900	0	0x73		--	0,115	#	s
+t	1900	0	0x74		--	0,116	#	t
+u	1900	0	0x75		--	0,117	#	u
+v	1900	0	0x76		--	0,118	#	v
+w	1900	0	0x77		--	0,119	#	w
+x	1900	0	0x78		--	0,120	#	x
+y	1900	0	0x79		--	0,121	#	y
+z	1900	0	0x7a		--	0,122	#	z
+lC	1900	0	0x7b		--	0,123	#	braceleft
+{	1900	0	0x7b		--	0,123	#	"
+|	1900	0	0x7c		--	0,124	#	"
+rC	1900	0	0x7d		--	0,125	#	braceright
+}	1900	0	0x7d		--	0,125	#	"
+a~	1900	0	0x7e		--	0,126	#	tilde
+~	1900	0	0x7e		--	0,126	#	"
+char161	1900	0	0xad		--	4,7	#	exclamdown
+char162	1900	0	0x9b		--	4,19	#	cent
+char163	1900	0	0x9c		--	4,11	#	sterling
+char165	1900	0	0x9d		--	4,12	#	yen
+char166	1900	0	0x7c		--	0,124	#	brokenbar
+char167	1900	0	0x15		--	4,6	#	section
+char170	1900	0	0xa6		--	4,15	#	ordfeminine
+char171	1900	0	0xae		--	4,9	#	guillemotleft
+char172	1900	0	0xaa		--	6,20	#	logicalnot
+char175	1900	0	0x2d		--	6,0	#	macron
+char176	1900	0	0xf8		--	6,36	#	degree
+char177	1900	0	0xf1		--	6,1	#	plusminus
+char178	1900	0	0xfd		--	4,20	#	twosuperior
+char181	1900	0	0xe6		--	8,25	#	mu
+char182	1900	0	0x14		--	4,5	#	paragraph
+char183	1900	0	0xfa		--	6,32	#	periodcentered
+char186	1900	0	0xa7		--	4,16	#	ordmasculine
+char187	1900	0	0xaf		--	4,10	#	guillemotright
+char188	1900	0	0xac		--	4,18	#	onequarter
+char189	1900	0	0xab		--	4,17	#	onehalf
+char191	1900	0	0xa8		--	4,8	#	questiondown
+char195	1900	0	0x28e		--	1,76	#	Atilde
+char196	1900	0	0x8e		--	1,30	#	Adieresis
+char197	1900	0	0x8f		--	1,34	#	Aring
+char198	1900	0	0x92		--	1,36	#	AE
+char199	1900	0	0x80		--	1,38	#	Ccedilla
+char201	1900	0	0x90		--	1,40	#	Eacute
+char209	1900	0	0xa5		--	1,56	#	Ntilde
+char214	1900	0	0x99		--	1,62	#	Odieresis
+char220	1900	0	0x9a		--	1,70	#	Udieresis
+char224	1900	0	0x85		--	1,33	#	agrave
+char225	1900	0	0xa0		--	1,27	#	aacute
+char226	1900	0	0x83		--	1,29	#	acircumflex
+char227	1900	0	0x284		--	1,93	#	atilde
+char228	1900	0	0x84		--	1,31	#	adieresis
+char229	1900	0	0x86		--	1,35	#	aring
+char230	1900	0	0x91		--	1,37	#	ae
+char231	1900	0	0x87		--	1,39	#	ccedilla
+char232	1900	0	0x8a		--	1,47	#	egrave
+char233	1900	0	0x82		--	1,41	#	eacute
+char234	1900	0	0x88		--	1,43	#	ecircumflex
+char235	1900	0	0x89		--	1,45	#	edieresis
+char236	1900	0	0x8d		--	1,55	#	igrave
+char237	1900	0	0xa1		--	1,49	#	iacute
+char238	1900	0	0x8c		--	1,51	#	icircumflex
+char239	1900	0	0x8b		--	1,53	#	idieresis
+char241	1900	0	0xa4		--	1,57	#	ntilde
+char242	1900	0	0x95		--	1,65	#	ograve
+char243	1900	0	0xa2		--	1,59	#	oacute
+char244	1900	0	0x93		--	1,61	#	ocircumflex
+char246	1900	0	0x94		--	1,63	#	odieresis
+char247	1900	0	0xf6		--	6,8	#	divide
+char249	1900	0	0x97		--	1,73	#	ugrave
+char250	1900	0	0xa3		--	1,67	#	uacute
+char251	1900	0	0x96		--	1,69	#	ucircumflex
+char252	1900	0	0x81		--	1,71	#	udieresis
+char255	1900	0	0x98		--	1,75	#	ydieresis
+AE	1900	0	0x92		--	1,36	#	AE
+ae	1900	0	0x91		--	1,37	#	ae
+'E	1900	0	0x90		--	1,40	#	Eacute
+'a	1900	0	0xa0		--	1,27	#	aacute
+'e	1900	0	0x82		--	1,41	#	eacute
+'i	1900	0	0xa1		--	1,49	#	iacute
+'o	1900	0	0xa2		--	1,59	#	oacute
+'u	1900	0	0x95		--	1,65	#	uacute
+:A	1900	0	0x8e		--	1,30	#	Adieresis
+:O	1900	0	0x99		--	1,62	#	Odieresis
+:U	1900	0	0x9a		--	1,70	#	Udieresis
+:a	1900	0	0x84		--	1,31	#	adieresis
+:e	1900	0	0x89		--	1,45	#	edieresis
+:i	1900	0	0x8b		--	1,53	#	idieresis
+:o	1900	0	0x94		--	1,63	#	odieresis
+:u	1900	0	0x81		--	1,71	#	udieresis
+:y	1900	0	0x98		--	1,75	#	ydieresis
+^a	1900	0	0x83		--	1,29	#	acircumflex
+^e	1900	0	0x88		--	1,43	#	ecircumflex
+^i	1900	0	0x8c		--	1,51	#	icircumflex
+^o	1900	0	0x93		--	1,61	#	ocircumflex
+^u	1900	0	0x96		--	1,69	#	ucircumflex
+`a	1900	0	0x85		--	1,33	#	agrave
+`e	1900	0	0x8a		--	1,47	#	egrave
+`i	1900	0	0x8d		--	1,55	#	igrave
+`o	1900	0	0x95		--	1,65	#	ograve
+`u	1900	0	0x97		--	1,73	#	ugrave
+~A	1900	0	0x28e		--	1,26	#	Atilde
+~N	1900	0	0xa5		--	1,56	#	Ntilde
+~a	1900	0	0x284		--	---	#	atilde
+~n	1900	0	0xa4		--	1,57	#	ntilde
+,C	1900	0	0x80		--	1,38	#	Ccedilla
+,c	1900	0	0x87		--	1,39	#	ccedilla
+oA	1900	0	0x8f		--	1,34	#	Aring
+oa	1900	0	0x86		--	1,35	#	aring
+a^	1900	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	1900	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	1900	0	0x24		--	0,36	#	dollar
+Po	1900	0	0x9c		--	4,11	#	sterling
+Ye	1900	0	0x9d		--	4,12	#	yen
+Fn	1900	0	0x9f		--	4,14	#	florin
+ct	1900	0	0x9b		--	4,19	#	cent
+Fo	1900	0	0xae		--	4,9	#	guillemotleft
+r!	1900	0	0xad		--	4,7	#	exclamdown
+r?	1900	0	0xa8		--	4,8	#	questiondown
+Of	1900	0	0xa6		--	4,15	#	ordfeminine
+Om	1900	0	0xa7		--	4,16	#	ordmasculine
+S2	1900	0	0xfd		--	4,20	#	twosuperior
+<-	1900	0	0x1b		--	6,22	#	arrowleft
+->	1900	0	0x1a		--	6,21	#	arrowright
+<>	1900	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	1900	0	0x19		--	6,24	#	arrowdown
+ua	1900	0	0x18		--	6,23	#	arrowup
+va	1900	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	1900	0	0xb3		--	3,9	#	bar
+bb	1900	0	0x7c		--	0,124	#	brokenbar
+ul	1900	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	1900	0	0x9		--	4,1	#	circle
+bu	1900	0	0x7		--	4,0	#	bullet
+ps	1900	0	0x14		--	4,5	#	paragraph
+sc	1900	0	0x15		--	4,6	#	section
+de	1900	0	0xf8		--	6,36	#	degree
+12	1900	0	0xab		--	4,17	#	onehalf
+14	1900	0	0xac		--	4,18	#	onequarter
+hy	1900	0	0x2d		--	6,0	#	hyphen
+lB	1900	0	0x5b		--	0,91	#	bracketleft
+rB	1900	0	0x5d		--	0,93	#	bracketright
+lC	1900	0	0x7b		--	0,123	#	braceleft
+rC	1900	0	0x7d		--	0,125	#	braceright
+aq	1900	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	1900	0	0x40		--	0,64	#	at
+.C1	1900	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	1900	0	0x23		--	0,35	#	numbersign
+sl	1900	0	0x2f		--	0,47	#	slash
+rs	1900	0	0x5c		--	0,92	#	backslash
+*a	1900	0	0xe0		--	8,1	#	alpha
+*b	1900	0	0xe1		--	8,3	#	beta
+*d	1900	0	0xeb		--	8,9	#	delta
+*h	1900	0	0xe9		--	8,17	#	theta
+*m	1900	0	0xe6		--	8,25	#	mu
+*p	1900	0	0xe3		--	8,33	#	pi
+*s	1900	0	0xe5		--	8,37	#	sigma
+*t	1900	0	0xe7		--	8,41	#	tau
+~~	1900	0	0xf7		--	6,13	#	approxequal
+~=	1900	0	0xf7		--	6,13	#	approxequal
++-	1900	0	0xf1		--	6,1	#	plusminus
+<=	1900	0	0xf3		--	6,2	#	lessequal
+ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	1900	0	0xc4		--	3,8	#	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"
+DI	1900	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	1900	0	0xae		--	6,77	#	""	"much	less"
+>>	1900	0	0xaf		--	6,78	#	""	"much	greater"
+pc	1900	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/ER b/contrib/groff/devlbp/ER
new file mode 100644
index 000000000000..f2734ccd0a97
--- /dev/null
+++ b/contrib/groff/devlbp/ER
@@ -0,0 +1,272 @@
+
+name  ER
+lbpname  NeliteR
+spacewidth 1900
+slant 0
+charset
+aq	1900	0	0x27		--	0,39	#	quotesingle
+space	1900	0	0x20		--	0,32
+!	1900	0	0x21		--	0,33	#	exclam
+"	1900	0	0x22		--	0,34	#	quotedbl
+dq	1900	0	0x22		--	0,34	#	quotedbl
+#	1900	0	0x23		--	0,35	#	numbersign
+sh	1900	0	0x23		--	0,35	#	"
+$	1900	0	0x24		--	0,36	#	dollar
+Do	1900	0	0x24		--	0,36	#	"
+%	1900	0	0x25		--	0,37	#	percent
+&	1900	0	0x26		--	0,38	#	ampersand
+'	1900	0	0x27		--	0,39	#	quoteright
+cq	1900	0	0x27		--	0,39	#	quoteright
+(	1900	0	0x28		--	0,40	#	parenleft
+)	1900	0	0x29		--	0,41	#	parenright
+*	1900	0	0x2a		--	0,42	#	asterisk
++	1900	0	0x2b		--	0,43	#	plus
+,	1900	0	0x2c		--	0,44	#	comma
+-	1900	0	0x2d		--	0,45	#	hyphen
+\-	1900	0	0x2d		--	0,45	#	hyphen
+hy	1900	0	0x2d		--	0,45	#	"
+char173	1900	0	0x2d		--	0,45	#	"
+.	1900	0	0x2e		--	0,46	#	period
+/	1900	0	0x2f		--	0,47	#	slash
+sl	1900	0	0x2f		--	0,47	#	"
+0	1900	0	0x30		--	0,48	#	zero
+1	1900	0	0x31		--	0,49	#	one
+2	1900	0	0x32		--	0,50	#	two
+3	1900	0	0x33		--	0,51	#	three
+4	1900	0	0x34		--	0,52	#	four
+5	1900	0	0x35		--	0,53	#	five
+6	1900	0	0x36		--	0,54	#	six
+7	1900	0	0x37		--	0,55	#	seven
+8	1900	0	0x38		--	0,56	#	eight
+9	1900	0	0x39		--	0,57	#	nine
+:	1900	0	0x3a		--	0,58	#	colon
+;	1900	0	0x3b		--	0,59	#	semicolon
+<	1900	0	0x3c		--	0,60	#	less
+=	1900	0	0x3d		--	0,61	#	equal
+>	1900	0	0x3e		--	0,62	#	greater
+?	1900	0	0x3f		--	0,63	#	question
+@	1900	0	0x40		--	0,64	#	at
+at	1900	0	0x40		--	0,64	#	"
+A	1900	0	0x41		--	0,65	#	A
+B	1900	0	0x42		--	0,66	#	B
+C	1900	0	0x43		--	0,67	#	C
+D	1900	0	0x44		--	0,68	#	D
+E	1900	0	0x45		--	0,69	#	E
+F	1900	0	0x46		--	0,70	#	F
+G	1900	0	0x47		--	0,71	#	G
+H	1900	0	0x48		--	0,72	#	H
+I	1900	0	0x49		--	0,73	#	I
+J	1900	0	0x4a		--	0,74	#	J
+K	1900	0	0x4b		--	0,75	#	K
+L	1900	0	0x4c		--	0,76	#	L
+M	1900	0	0x4d		--	0,77	#	M
+N	1900	0	0x4e		--	0,78	#	N
+O	1900	0	0x4f		--	0,79	#	O
+P	1900	0	0x50		--	0,80	#	P
+Q	1900	0	0x51		--	0,81	#	Q
+R	1900	0	0x52		--	0,82	#	R
+S	1900	0	0x53		--	0,83	#	S
+T	1900	0	0x54		--	0,84	#	T
+U	1900	0	0x55		--	0,85	#	U
+V	1900	0	0x56		--	0,86	#	V
+W	1900	0	0x57		--	0,87	#	W
+X	1900	0	0x58		--	0,88	#	X
+Y	1900	0	0x59		--	0,89	#	Y
+Z	1900	0	0x5a		--	0,90	#	Z
+[	1900	0	0x5b		--	0,91	#	bracketleft
+lB	1900	0	0x5b		--	0,91	#	"
+\	1900	0	0x5c		--	0,92	#	backslash
+rs	1900	0	0x5c		--	0,92	#	"
+]	1900	0	0x5d		--	0,93	#	bracketright
+rB	1900	0	0x5d		--	0,93	#	"
+a^	1900	0	0x5e		--	0,94	#	circumflex
+^	1900	0	0x5e		--	0,94	#	"
+_	1900	0	0x5f		--	0,95	#	underscore
+`	1900	0	0x60		--	0,96	#	quoteleft
+oq	1900	0	0x60		--	0,96	#	"
+a	1900	0	0x61		--	0,97	#	a
+b	1900	0	0x62		--	0,98	#	b
+c	1900	0	0x63		--	0,99	#	c
+d	1900	0	0x64		--	0,100	#	d
+e	1900	0	0x65		--	0,101	#	e
+f	1900	0	0x66		--	0,102	#	f
+g	1900	0	0x67		--	0,103	#	g
+h	1900	0	0x68		--	0,104	#	h
+i	1900	0	0x69		--	0,105	#	i
+j	1900	0	0x6a		--	0,106	#	j
+k	1900	0	0x6b		--	0,107	#	k
+l	1900	0	0x6c		--	0,108	#	l
+m	1900	0	0x6d		--	0,109	#	m
+n	1900	0	0x6e		--	0,110	#	n
+o	1900	0	0x6f		--	0,111	#	o
+p	1900	0	0x70		--	0,112	#	p
+q	1900	0	0x71		--	0,113	#	q
+r	1900	0	0x72		--	0,114	#	r
+s	1900	0	0x73		--	0,115	#	s
+t	1900	0	0x74		--	0,116	#	t
+u	1900	0	0x75		--	0,117	#	u
+v	1900	0	0x76		--	0,118	#	v
+w	1900	0	0x77		--	0,119	#	w
+x	1900	0	0x78		--	0,120	#	x
+y	1900	0	0x79		--	0,121	#	y
+z	1900	0	0x7a		--	0,122	#	z
+lC	1900	0	0x7b		--	0,123	#	braceleft
+{	1900	0	0x7b		--	0,123	#	"
+|	1900	0	0x7c		--	0,124	#	"
+rC	1900	0	0x7d		--	0,125	#	braceright
+}	1900	0	0x7d		--	0,125	#	"
+a~	1900	0	0x7e		--	0,126	#	tilde
+~	1900	0	0x7e		--	0,126	#	"
+char161	1900	0	0xad		--	4,7	#	exclamdown
+char162	1900	0	0x9b		--	4,19	#	cent
+char163	1900	0	0x9c		--	4,11	#	sterling
+char165	1900	0	0x9d		--	4,12	#	yen
+char166	1900	0	0x7c		--	0,124	#	brokenbar
+char167	1900	0	0x15		--	4,6	#	section
+char170	1900	0	0xa6		--	4,15	#	ordfeminine
+char171	1900	0	0xae		--	4,9	#	guillemotleft
+char172	1900	0	0xaa		--	6,20	#	logicalnot
+char175	1900	0	0x2d		--	6,0	#	macron
+char176	1900	0	0xf8		--	6,36	#	degree
+char177	1900	0	0xf1		--	6,1	#	plusminus
+char178	1900	0	0xfd		--	4,20	#	twosuperior
+char181	1900	0	0xe6		--	8,25	#	mu
+char182	1900	0	0x14		--	4,5	#	paragraph
+char183	1900	0	0xfa		--	6,32	#	periodcentered
+char186	1900	0	0xa7		--	4,16	#	ordmasculine
+char187	1900	0	0xaf		--	4,10	#	guillemotright
+char188	1900	0	0xac		--	4,18	#	onequarter
+char189	1900	0	0xab		--	4,17	#	onehalf
+char191	1900	0	0xa8		--	4,8	#	questiondown
+char195	1900	0	0x28e		--	1,76	#	Atilde
+char196	1900	0	0x8e		--	1,30	#	Adieresis
+char197	1900	0	0x8f		--	1,34	#	Aring
+char198	1900	0	0x92		--	1,36	#	AE
+char199	1900	0	0x80		--	1,38	#	Ccedilla
+char201	1900	0	0x90		--	1,40	#	Eacute
+char209	1900	0	0xa5		--	1,56	#	Ntilde
+char214	1900	0	0x99		--	1,62	#	Odieresis
+char220	1900	0	0x9a		--	1,70	#	Udieresis
+char224	1900	0	0x85		--	1,33	#	agrave
+char225	1900	0	0xa0		--	1,27	#	aacute
+char226	1900	0	0x83		--	1,29	#	acircumflex
+char227	1900	0	0x284		--	1,93	#	atilde
+char228	1900	0	0x84		--	1,31	#	adieresis
+char229	1900	0	0x86		--	1,35	#	aring
+char230	1900	0	0x91		--	1,37	#	ae
+char231	1900	0	0x87		--	1,39	#	ccedilla
+char232	1900	0	0x8a		--	1,47	#	egrave
+char233	1900	0	0x82		--	1,41	#	eacute
+char234	1900	0	0x88		--	1,43	#	ecircumflex
+char235	1900	0	0x89		--	1,45	#	edieresis
+char236	1900	0	0x8d		--	1,55	#	igrave
+char237	1900	0	0xa1		--	1,49	#	iacute
+char238	1900	0	0x8c		--	1,51	#	icircumflex
+char239	1900	0	0x8b		--	1,53	#	idieresis
+char241	1900	0	0xa4		--	1,57	#	ntilde
+char242	1900	0	0x95		--	1,65	#	ograve
+char243	1900	0	0xa2		--	1,59	#	oacute
+char244	1900	0	0x93		--	1,61	#	ocircumflex
+char246	1900	0	0x94		--	1,63	#	odieresis
+char247	1900	0	0xf6		--	6,8	#	divide
+char249	1900	0	0x97		--	1,73	#	ugrave
+char250	1900	0	0xa3		--	1,67	#	uacute
+char251	1900	0	0x96		--	1,69	#	ucircumflex
+char252	1900	0	0x81		--	1,71	#	udieresis
+char255	1900	0	0x98		--	1,75	#	ydieresis
+AE	1900	0	0x92		--	1,36	#	AE
+ae	1900	0	0x91		--	1,37	#	ae
+'E	1900	0	0x90		--	1,40	#	Eacute
+'a	1900	0	0xa0		--	1,27	#	aacute
+'e	1900	0	0x82		--	1,41	#	eacute
+'i	1900	0	0xa1		--	1,49	#	iacute
+'o	1900	0	0xa2		--	1,59	#	oacute
+'u	1900	0	0x95		--	1,65	#	uacute
+:A	1900	0	0x8e		--	1,30	#	Adieresis
+:O	1900	0	0x99		--	1,62	#	Odieresis
+:U	1900	0	0x9a		--	1,70	#	Udieresis
+:a	1900	0	0x84		--	1,31	#	adieresis
+:e	1900	0	0x89		--	1,45	#	edieresis
+:i	1900	0	0x8b		--	1,53	#	idieresis
+:o	1900	0	0x94		--	1,63	#	odieresis
+:u	1900	0	0x81		--	1,71	#	udieresis
+:y	1900	0	0x98		--	1,75	#	ydieresis
+^a	1900	0	0x83		--	1,29	#	acircumflex
+^e	1900	0	0x88		--	1,43	#	ecircumflex
+^i	1900	0	0x8c		--	1,51	#	icircumflex
+^o	1900	0	0x93		--	1,61	#	ocircumflex
+^u	1900	0	0x96		--	1,69	#	ucircumflex
+`a	1900	0	0x85		--	1,33	#	agrave
+`e	1900	0	0x8a		--	1,47	#	egrave
+`i	1900	0	0x8d		--	1,55	#	igrave
+`o	1900	0	0x95		--	1,65	#	ograve
+`u	1900	0	0x97		--	1,73	#	ugrave
+~A	1900	0	0x28e		--	1,26	#	Atilde
+~N	1900	0	0xa5		--	1,56	#	Ntilde
+~a	1900	0	0x284		--	---	#	atilde
+~n	1900	0	0xa4		--	1,57	#	ntilde
+,C	1900	0	0x80		--	1,38	#	Ccedilla
+,c	1900	0	0x87		--	1,39	#	ccedilla
+oA	1900	0	0x8f		--	1,34	#	Aring
+oa	1900	0	0x86		--	1,35	#	aring
+a^	1900	0	0x5e		--	1,3	#	circumflex	"circumflex	accent"
+a~	1900	0	0x7e		--	1,2	#	tilde	"tilde	accent"
+Do	1900	0	0x24		--	0,36	#	dollar
+Po	1900	0	0x9c		--	4,11	#	sterling
+Ye	1900	0	0x9d		--	4,12	#	yen
+Fn	1900	0	0x9f		--	4,14	#	florin
+ct	1900	0	0x9b		--	4,19	#	cent
+Fo	1900	0	0xae		--	4,9	#	guillemotleft
+r!	1900	0	0xad		--	4,7	#	exclamdown
+r?	1900	0	0xa8		--	4,8	#	questiondown
+Of	1900	0	0xa6		--	4,15	#	ordfeminine
+Om	1900	0	0xa7		--	4,16	#	ordmasculine
+S2	1900	0	0xfd		--	4,20	#	twosuperior
+<-	1900	0	0x1b		--	6,22	#	arrowleft
+->	1900	0	0x1a		--	6,21	#	arrowright
+<>	1900	0	0x1d		--	6,25	#	arrowboth	"horizontal	double-headed	arrow"
+da	1900	0	0x19		--	6,24	#	arrowdown
+ua	1900	0	0x18		--	6,23	#	arrowup
+va	1900	0	0x12		--	6,26	#	\&	"vertical	double-headed	arrow"
+ba	1900	0	0xb3		--	3,9	#	bar
+bb	1900	0	0x7c		--	0,124	#	brokenbar
+ul	1900	0	0x5f		--	0,95	#	ul	"underline	with	traditional	troff	metrics"
+ci	1900	0	0x9		--	4,1	#	circle
+bu	1900	0	0x7		--	4,0	#	bullet
+ps	1900	0	0x14		--	4,5	#	paragraph
+sc	1900	0	0x15		--	4,6	#	section
+de	1900	0	0xf8		--	6,36	#	degree
+12	1900	0	0xab		--	4,17	#	onehalf
+14	1900	0	0xac		--	4,18	#	onequarter
+hy	1900	0	0x2d		--	6,0	#	hyphen
+lB	1900	0	0x5b		--	0,91	#	bracketleft
+rB	1900	0	0x5d		--	0,93	#	bracketright
+lC	1900	0	0x7b		--	0,123	#	braceleft
+rC	1900	0	0x7d		--	0,125	#	braceright
+aq	1900	0	0x27		--	0,39	#	quotesingle	"apostrophe	quote"
+at	1900	0	0x40		--	0,64	#	at
+.C1	1900	0	0x2d		--	0,45	#	-	minus	"minus	sign	from	current	font"
+sh	1900	0	0x23		--	0,35	#	numbersign
+sl	1900	0	0x2f		--	0,47	#	slash
+rs	1900	0	0x5c		--	0,92	#	backslash
+*a	1900	0	0xe0		--	8,1	#	alpha
+*b	1900	0	0xe1		--	8,3	#	beta
+*d	1900	0	0xeb		--	8,9	#	delta
+*h	1900	0	0xe9		--	8,17	#	theta
+*m	1900	0	0xe6		--	8,25	#	mu
+*p	1900	0	0xe3		--	8,33	#	pi
+*s	1900	0	0xe5		--	8,37	#	sigma
+*t	1900	0	0xe7		--	8,41	#	tau
+~~	1900	0	0xf7		--	6,13	#	approxequal
+~=	1900	0	0xf7		--	6,13	#	approxequal
++-	1900	0	0xf1		--	6,1	#	plusminus
+<=	1900	0	0xf3		--	6,2	#	lessequal
+ca	1900	0	0xef		--	6,16	#	intersection	"intersection,	cap"
+-h	1900	0	0xc4		--	3,8	#	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"
+DI	1900	0	0x4		--	5,169	#	diamond	"diamond	suit"
+<<	1900	0	0xae		--	6,77	#	""	"much	less"
+>>	1900	0	0xaf		--	6,78	#	""	"much	greater"
+pc	1900	0	0xfa		--	6,32	#	periodcentered
diff --git a/contrib/groff/devlbp/HB b/contrib/groff/devlbp/HB
new file mode 100644
index 000000000000..1ad7b4ec7f9e
--- /dev/null
+++ b/contrib/groff/devlbp/HB
@@ -0,0 +1,491 @@
+name  HB
+lbpname  Swiss-Bold
+special
+spacewidth 927
+slant 0
+ligatures fi fl 0
+charset
+ha	1110	2	0x4c3	 0,94	 # asciicircum
+ti	1110	0	0x4c4	 0,126	 # asciitilde
+vS	2223	2	0x169	 1,176	 # Scaron
+vZ	2037	2	0x16e	 1,206	 # Zcaron
+vs	1853	2	0x173	 1,177	 # scaron
+vz	1667	2	0x174	 1,207	 # zcaron
+:Y	2223	2	0x16d	 1,74	 # Ydieresis
+tm	3333	2	0x170	 4,41	 # trademark
+aq	793	2	0x27	 0,39	 # quotesingle
+space	927	0	0x20	 0,32
+!	1110	2	0x21	 0,33	 # exclam
+"	1580	2	0x22	 0,34	 # quotedbl
+dq	1580	2	0x22	 0,34	 # quotedbl
+#	1853	2	0x23	 0,35	 # numbersign
+sh	1853	2	0x23	 0,35	 # "
+$	1853	2	0x24	 0,36	 # dollar
+Do	1853	2	0x24	 0,36	 # "
+%	2963	2	0x25	 0,37	 # percent
+&	2407	2	0x26	 0,38	 # ampersand
+'	793	2	0x27	 0,39	 # quoteright
+cq	793	2	0x27	 0,39	 # quoteright
+(	1110	2	0x28	 0,40	 # parenleft
+)	1110	2	0x29	 0,41	 # parenright
+*	1297	2	0x2a	 0,42	 # asterisk
++	1947	0	0x2b	 0,43	 # plus
+,	927	0	0x2c	 0,44	 # comma
+-	1947	0	0x2d	 0,45	 # hyphen
+hy	1947	0	0x2d	 0,45	 # "
+char173	1947	0	0x2d	 0,45	 # "
+.	927	0	0x2e	 0,46	 # period
+/	927	2	0x2f	 0,47	 # slash
+sl	927	2	0x2f	 0,47	 # "
+0	1853	2	0x30	 0,48	 # zero
+1	1853	2	0x31	 0,49	 # one
+2	1853	2	0x32	 0,50	 # two
+3	1853	2	0x33	 0,51	 # three
+4	1853	2	0x34	 0,52	 # four
+5	1853	2	0x35	 0,53	 # five
+6	1853	2	0x36	 0,54	 # six
+7	1853	2	0x37	 0,55	 # seven
+8	1853	2	0x38	 0,56	 # eight
+9	1853	2	0x39	 0,57	 # nine
+:	1110	0	0x3a	 0,58	 # colon
+;	1110	0	0x3b	 0,59	 # semicolon
+<	1947	0	0x3c	 0,60	 # less
+=	1947	0	0x3d	 0,61	 # equal
+>	1947	0	0x3e	 0,62	 # greater
+?	2037	2	0x3f	 0,63	 # question
+@	3250	2	0x40	 0,64	 # at
+at	3250	2	0x40	 0,64	 # "
+A	2407	2	0x41	 0,65	 # A
+B	2407	2	0x42	 0,66	 # B
+C	2407	2	0x43	 0,67	 # C
+D	2407	2	0x44	 0,68	 # D
+E	2223	2	0x45	 0,69	 # E
+F	2037	2	0x46	 0,70	 # F
+G	2593	2	0x47	 0,71	 # G
+H	2407	2	0x48	 0,72	 # H
+I	927	2	0x49	 0,73	 # I
+J	1853	2	0x4a	 0,74	 # J
+K	2407	2	0x4b	 0,75	 # K
+L	2037	2	0x4c	 0,76	 # L
+M	2777	2	0x4d	 0,77	 # M
+N	2407	2	0x4e	 0,78	 # N
+O	2593	2	0x4f	 0,79	 # O
+P	2223	2	0x50	 0,80	 # P
+Q	2593	2	0x51	 0,81	 # Q
+R	2407	2	0x52	 0,82	 # R
+S	2223	2	0x53	 0,83	 # S
+T	2037	2	0x54	 0,84	 # T
+U	2407	2	0x55	 0,85	 # U
+V	2223	2	0x56	 0,86	 # V
+W	3147	2	0x57	 0,87	 # W
+X	2223	2	0x58	 0,88	 # X
+Y	2223	2	0x59	 0,89	 # Y
+Z	2037	2	0x5a	 0,90	 # Z
+[	1110	2	0x5b	 0,91	 # bracketleft
+lB	1110	2	0x5b	 0,91	 # "
+\	927	2	0x5c	 0,92	 # backslash
+rs	927	2	0x5c	 0,92	 # "
+]	1110	2	0x5d	 0,93	 # bracketright
+rB	1110	2	0x5d	 0,93	 # "
+a^	1110	2	0x5e	 0,94	 # circumflex
+^	1110	2	0x5e	 0,94	 # "
+_	1853	0	0x5f	 0,95	 # underscore
+`	1110	2	0x60	 0,96	 # quoteleft
+oq	1110	2	0x60	 0,96	 # "
+a	1853	0	0x61	 0,97	 # a
+b	2037	2	0x62	 0,98	 # b
+c	1853	0	0x63	 0,99	 # c
+d	2037	2	0x64	 0,100	 # d
+e	1853	0	0x65	 0,101	 # e
+f	1110	2	0x66	 0,102	 # f
+g	2037	1	0x67	 0,103	 # g
+h	2037	2	0x68	 0,104	 # h
+i	927	2	0x69	 0,105	 # i
+j	927	2	0x6a	 0,106	 # j
+k	1853	2	0x6b	 0,107	 # k
+l	927	2	0x6c	 0,108	 # l
+m	2963	0	0x6d	 0,109	 # m
+n	2037	0	0x6e	 0,110	 # n
+o	2037	0	0x6f	 0,111	 # o
+p	2037	1	0x70	 0,112	 # p
+q	2037	1	0x71	 0,113	 # q
+r	1297	0	0x72	 0,114	 # r
+s	1853	0	0x73	 0,115	 # s
+t	1110	2	0x74	 0,116	 # t
+u	2037	0	0x75	 0,117	 # u
+v	1853	0	0x76	 0,118	 # v
+w	2593	0	0x77	 0,119	 # w
+x	1853	0	0x78	 0,120	 # x
+y	1853	1	0x79	 0,121	 # y
+z	1667	0	0x7a	 0,122	 # z
+lC	1297	2	0x7b	 0,123	 # braceleft
+{	1297	2	0x7b	 0,123	 # "
+|	933	2	0x7c	 0,124	 # "
+rC	1297	2	0x7d	 0,125	 # braceright
+}	1297	2	0x7d	 0,125	 # "
+a~	1110	2	0x7e	 0,126	 # tilde
+~	1110	2	0x7e	 0,126	 # "
+char161	1110	1	0xad	 4,7	 # exclamdown
+char162	1853	2	0x9b	 4,19	 # cent
+char163	1853	2	0x9c	 4,11	 # sterling
+char164	1853	2	0x12f	 4,24	 # currency
+char165	1853	2	0x9d	 4,12	 # yen
+char166	933	2	0x7c	 0,124	 # brokenbar
+char167	1853	2	0x15	 4,6	 # section
+char168	1110	2	0x122	 1,7	 # dieresis
+char169	2457	2	0x154	 4,23	 # copyright
+char170	1233	2	0xa6	 4,15	 # ordfeminine
+char171	1853	0	0xae	 4,9	 # guillemotleft
+char172	1947	0	0xaa	 6,20	 # logicalnot
+char173	1853	0	0x132	 4,33	 # hyphen
+char174	2457	2	0x155	 4,22	 # registered
+char175	1947	2	0x2d	 6,0	 # macron
+char176	1333	2	0xf8	 6,36	 # degree
+char177	1947	0	0xf1	 6,1	 # plusminus
+char178	1110	2	0xfd	 4,20	 # twosuperior
+char179	1110	2	0x14d	 4,26	 # threesuperior
+char180	1110	2	0x120	 1,6	 # acute "acute accent"
+char181	2037	1	0xe6	 8,25	 # mu
+char182	1853	2	0x14	 4,5	 # paragraph
+char183	927	0	0xfa	 6,32	 # periodcentered
+char184	1110	0	0x139	 1,17	 # cedilla
+char185	1110	2	0x156	 4,78	 # onesuperior
+char186	1217	2	0xa7	 4,16	 # ordmasculine
+char187	1853	0	0xaf	 4,10	 # guillemotright
+char188	2780	2	0xac	 4,18	 # onequarter
+char189	2780	2	0xab	 4,17	 # onehalf
+char190	2780	2	0x12e	 4,25	 # threequarters
+char191	2037	1	0xa8	 4,8	 # questiondown
+char192	2407	2	0x15c	 1,32	 # Agrave
+char193	2407	2	0x15a	 1,26	 # Aacute
+char194	2407	2	0x15b	 1,28	 # Acircumflex
+char195	2407	2	0x28e	 1,76	 # Atilde
+char196	2407	2	0x8e	 1,30	 # Adieresis
+char197	2407	2	0x8f	 1,34	 # Aring
+char198	3333	2	0x92	 1,36	 # AE
+char199	2407	2	0x80	 1,38	 # Ccedilla
+char200	2223	2	0x160	 1,46	 # Egrave
+char201	2223	2	0x90	 1,40	 # Eacute
+char202	2223	2	0x15e	 1,42	 # Ecircumflex
+char203	2223	2	0x15f	 1,44	 # Edieresis
+char204	927	2	0x164	 1,54	 # Igrave
+char205	927	2	0x161	 1,48	 # Iacute
+char206	927	2	0x162	 1,50	 # Icircumflex
+char207	927	2	0x163	 1,52	 # Idieresis
+char208	2407	2	0x13d	 1,78	 # Eth
+char209	2407	2	0xa5	 1,56	 # Ntilde
+char210	2593	2	0x167	 1,64	 # Ograve
+char211	2593	2	0x165	 1,58	 # Oacute
+char212	2593	2	0x166	 1,60	 # Ocircumflex
+char213	2593	2	0x168	 1,82	 # Otilde
+char214	2593	2	0x99	 1,62	 # Odieresis
+char215	1947	0	0x157	 6,39	 # multiply
+char216	2593	2	0x140	 1,80	 # Oslash
+char217	2407	2	0x16c	 1,72	 # Ugrave
+char218	2407	2	0x16a	 1,66	 # Uacute
+char219	2407	2	0x16b	 1,68	 # Ucircumflex
+char220	2407	2	0x9a	 1,70	 # Udieresis
+char221	2223	2	0x16f	 1,84	 # Yacute
+char222	2223	2	0x13e	 1,88	 # Thorn
+char223	2037	2	0x147	 1,23	 # germandbls
+char224	1853	2	0x85	 1,33	 # agrave
+char225	1853	2	0xa0	 1,27	 # aacute
+char226	1853	2	0x83	 1,29	 # acircumflex
+char227	1853	2	0x284	 1,93	 # atilde
+char228	1853	2	0x84	 1,31	 # adieresis
+char229	1853	2	0x86	 1,35	 # aring
+char230	2963	0	0x91	 1,37	 # ae
+char231	1853	0	0x87	 1,39	 # ccedilla
+char232	1853	2	0x8a	 1,47	 # egrave
+char233	1853	2	0x82	 1,41	 # eacute
+char234	1853	2	0x88	 1,43	 # ecircumflex
+char235	1853	2	0x89	 1,45	 # edieresis
+char236	927	2	0x8d	 1,55	 # igrave
+char237	927	2	0xa1	 1,49	 # iacute
+char238	927	2	0x8c	 1,51	 # icircumflex
+char239	927	2	0x8b	 1,53	 # idieresis
+char240	2037	2	0x148	 1,87	 # eth
+char241	2037	2	0xa4	 1,57	 # ntilde
+char242	2037	2	0x95	 1,65	 # ograve
+char243	2037	2	0xa2	 1,59	 # oacute
+char244	2037	2	0x93	 1,61	 # ocircumflex
+char245	2037	2	0x172	 1,83	 # otilde
+char246	2037	2	0x94	 1,63	 # odieresis
+char247	1947	0	0xf6	 6,8	 # divide
+char248	2037	0	0x145	 1,81	 # oslash
+char249	2037	2	0x97	 1,73	 # ugrave
+char250	2037	2	0xa3	 1,67	 # uacute
+char251	2037	2	0x96	 1,69	 # ucircumflex
+char252	2037	2	0x81	 1,71	 # udieresis
+char253	1853	3	0x175	 1,85	 # yacute
+char254	2037	3	0x143	 1,89	 # thorn
+char255	1853	3	0x98	 1,75	 # ydieresis
+-D	2407	2	0x13d	 1,78	 # Eth "Icelandic uppercase eth"
+Sd	2037	2	0x148	 1,87	 # eth "Icelandic lowercase eth"
+TP	2223	2	0x13e	 1,88	 # Thorn "Icelandic uppercase thorn"
+Tp	2037	3	0x143	 1,89	 # thorn "Icelandic lowercase thorn"
+AE	3333	2	0x92	 1,36	 # AE
+ae	2963	0	0x91	 1,37	 # ae
+OE	3333	2	0x141	 1,166	 # OE
+oe	3147	0	0x146	 1,167	 # oe
+ij	1830	0	0x150	 1,139	 # ij "Dutch ij ligature"
+ss	2037	2	0x147	 1,23	 # germandbls
+'A	2407	2	0x15a	 1,26	 # Aacute
+'E	2223	2	0x90	 1,40	 # Eacute
+'I	927	2	0x161	 1,48	 # Iacute
+'O	2593	2	0x165	 1,58	 # Oacute
+'U	2407	2	0x16a	 1,66	 # Uacute
+'a	1853	2	0xa0	 1,27	 # aacute
+'e	1853	2	0x82	 1,41	 # eacute
+'i	927	2	0xa1	 1,49	 # iacute
+'o	2037	2	0xa2	 1,59	 # oacute
+'u	2037	2	0x95	 1,65	 # uacute
+:A	2407	2	0x8e	 1,30	 # Adieresis
+:E	2223	2	0x15f	 1,44	 # Edieresis
+:I	927	2	0x163	 1,52	 # Idieresis
+:O	2593	2	0x99	 1,62	 # Odieresis
+:U	2407	2	0x9a	 1,70	 # Udieresis
+:Y	2223	2	0x16d	 1,74	 # Ydieresis
+:a	1853	2	0x84	 1,31	 # adieresis
+:e	1853	2	0x89	 1,45	 # edieresis
+:i	927	2	0x8b	 1,53	 # idieresis
+:o	2037	2	0x94	 1,63	 # odieresis
+:u	2037	2	0x81	 1,71	 # udieresis
+:y	1853	3	0x98	 1,75	 # ydieresis
+^A	2407	2	0x15b	 1,28	 # Acircumflex
+^E	2223	2	0x15e	 1,42	 # Ecircumflex
+^I	927	2	0x162	 1,50	 # Icircumflex
+^O	2593	2	0x166	 1,60	 # Ocircumflex
+^U	2407	2	0x16b	 1,68	 # Ucircumflex
+^a	1853	2	0x83	 1,29	 # acircumflex
+^e	1853	2	0x88	 1,43	 # ecircumflex
+^i	927	2	0x8c	 1,51	 # icircumflex
+^o	2037	2	0x93	 1,61	 # ocircumflex
+^u	2037	2	0x96	 1,69	 # ucircumflex
+`A	2407	2	0x15c	 1,32	 # Agrave
+`E	2223	2	0x160	 1,46	 # Egrave
+`I	927	2	0x164	 1,54	 # Igrave
+`O	2593	2	0x167	 1,64	 # Ograve
+`U	2407	2	0x16c	 1,72	 # Ugrave
+`a	1853	2	0x85	 1,33	 # agrave
+~a	1853	2	0x284	 ---	 # atilde
+`e	1853	2	0x8a	 1,47	 # egrave
+`i	927	2	0x8d	 1,55	 # igrave
+`o	2037	2	0x95	 1,65	 # ograve
+`u	2037	2	0x97	 1,73	 # ugrave
+~A	2407	2	0x28e	 1,26	 # Atilde
+~N	2407	2	0xa5	 1,56	 # Ntilde
+~O	2593	2	0x168	 1,82	 # Otilde
+~n	2037	2	0xa4	 1,57	 # ntilde
+~o	2037	2	0x172	 1,83	 # otilde
+vS	2223	2	0x169	 1,176	 # Scaron
+vs	1853	2	0x173	 1,177	 # scaron
+vZ	2037	2	0x16e	 1,206	 # Zcaron
+vz	1667	2	0x174	 1,207	 # zcaron
+,C	2407	2	0x80	 1,38	 # Ccedilla
+,c	1853	0	0x87	 1,39	 # ccedilla
+/L	2037	2	0x13f	 1,152	 # Lslash "Polish L with a slash"
+/l	927	2	0x144	 1,153	 # lslash "Polish l with a slash"
+/O	2593	2	0x140	 1,80	 # Oslash
+/o	2037	0	0x145	 1,81	 # oslash
+oA	2407	2	0x8f	 1,34	 # Aring
+oa	1853	2	0x86	 1,35	 # aring
+a"	1110	2	0x13a	 1,16	 # hungarumlaut "Hungarian umlaut"
+a-	1110	2	0x135	 1,8	 # macron "macron or bar accent"
+a.	1110	2	0x137	 1,15	 # dotaccent "dot accent"
+a^	1110	2	0x5e	 1,3	 # circumflex "circumflex accent"
+aa	1110	2	0x120	 1,6	 # acute "acute accent"
+ga	1110	2	0x121	 1,0	 # grave "grave accent"
+ab	1110	2	0x136	 1,22	 # breve "breve accent"
+ac	1110	0	0x139	 1,17	 # cedilla "cedilla accent"
+ad	1110	2	0x122	 1,7	 # dieresis "umlaut or dieresis"
+ah	1110	2	0x13c	 1,19	 # caron "h\('a\(vcek accent"
+ao	1110	2	0x138	 1,14	 # ring "ring or circle accent"
+a~	1110	2	0x7e	 1,2	 # tilde "tilde accent"
+ho	1110	0	0x13b	 1,18	 # ogonek "hook or ogonek accent"
+.i	927	0	0x142	 1,239	 # dotlessi "i without a dot"
+Cs	1853	2	0x12f	 4,24	 # currency "Scandinavian currency sign"
+Do	1853	2	0x24	 0,36	 # dollar
+Po	1853	2	0x9c	 4,11	 # sterling
+Ye	1853	2	0x9d	 4,12	 # yen
+Fn	1853	2	0x9f	 4,14	 # florin
+ct	1853	2	0x9b	 4,19	 # cent
+Fo	1853	0	0xae	 4,9	 # guillemotleft
+Fc	1110	0	0x4bb	 4,20	 # guillemotright
+fo	1110	0	0x127	 4,35	 # guilsinglleft
+fc	1110	0	0x128	 4,36	 # guilsinglright
+r!	1110	1	0xad	 4,7	 # exclamdown
+r?	2037	1	0xa8	 4,8	 # questiondown
+fi	2037	2	0x130	 4,54	 # fi "fi ligature"
+fl	2037	2	0x131	 4,55	 # fl "fl ligature"
+OK	2037	0	0x3d6	 ---	 # \& "check mark, tick"
+Of	1233	2	0xa6	 4,15	 # ordfeminine
+Om	1217	2	0xa7	 4,16	 # ordmasculine
+S1	1110	2	0x156	 4,78	 # onesuperior
+S2	1110	2	0xfd	 4,20	 # twosuperior
+S3	1110	2	0x14d	 4,26	 # threesuperior
+<-	3290	0	0x1b	 6,22	 # arrowleft
+->	3290	0	0x1a	 6,21	 # arrowright
+<>	3473	0	0x1d	 6,25	 # arrowboth "horizontal double-headed arrow"
+da	2010	0	0x19	 6,24	 # arrowdown
+ua	2010	0	0x18	 6,23	 # arrowup
+va	2010	0	0x12	 6,26	 # \& "vertical double-headed arrow"
+lA	2010	0	0x3dc	 6,57	 # arrowdblleft
+rA	2010	0	0x3de	 6,56	 # arrowdblright
+hA	2010	0	0x3db	 6,60	 # arrowdblboth "horizontal double-headed double arrow"
+dA	2010	0	0x3df	 6,59	 # arrowdbldown
+uA	2010	0	0x3dd	 6,58	 # arrowdblup
+ba	3333	2	0xb3	 3,9	 # bar
+bb	933	2	0x7c	 0,124	 # brokenbar
+br	3333	0	0x1db	 3,9	 # br "box rule with traditional troff metrics"
+ru	3333	0	0x123	 4,34	 # ru "baseline rule"
+ul	1853	0	0x5f	 0,95	 # ul "underline with traditional troff metrics"
+bv	3333	0	0x3f4	 3,9	 # bv "bold vertical"
+ci	2843	0	0x9	 4,1	 # circle
+bu	2120	0	0x7	 4,0	 # bullet
+co	2457	2	0x154	 4,23	 # copyright
+rg	2457	2	0x155	 4,22	 # registered
+tm	3333	2	0x170	 4,41	 # trademark
+dd	1853	2	0x12b	 4,40	 # daggerdbl "double dagger sign"
+dg	1853	2	0x12a	 4,39	 # dagger
+ps	1853	2	0x14	 4,5	 # paragraph
+sc	1853	2	0x15	 4,6	 # section
+de	1333	2	0xf8	 6,36	 # degree
+em	3333	0	0x123	 4,34	 # emdash "em dash"
+en	1853	0	0x132	 4,33	 # endash "en dash"
+%0	3333	2	0x129	 4,75	 # perthousand "per thousand, per mille sign"
+12	2780	2	0xab	 4,17	 # onehalf
+14	2780	2	0xac	 4,18	 # onequarter
+34	2780	2	0x12e	 4,25	 # threequarters
+f/	927	2	0x158	 6,6	 # fraction "bar for fractions"
+fm	927	0	0x3a2	 6,45	 # minute "footmark, prime"
+sd	927	0	0x3b2	 6,46	 # second
+ha	927	2	0x4c3	 6,85	 # asciicircum "\s-2ASCII\s+2 circumflex, hat, caret"
+ti	927	0	0x4c4	 6,12	 # asciitilde "\s-2ASCII\s0 tilde, large tilde"
+hy	1947	0	0x2d	 6,0	 # hyphen
+lB	1110	2	0x5b	 0,91	 # bracketleft
+rB	1110	2	0x5d	 0,93	 # bracketright
+lC	1297	2	0x7b	 0,123	 # braceleft
+rC	1297	2	0x7d	 0,125	 # braceright
+la	1297	0	0x3e1	 6,10	 # angleleft "left angle bracket"
+ra	1297	0	0x3f1	 6,11	 # angleright "right angle bracket"
+Bq	1667	0	0x4b9	 4,63	 # quotedblbase "low double comma quote"
+bq	1667	0	0x4b8	 6,62	 # quotesinglbase "low single comma quote"
+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
+sl	927	2	0x2f	 0,47	 # slash
+rs	927	2	0x5c	 0,92	 # backslash
+3d	927	0	0x35c	 6,102	 # therefore
+tf	927	0	0x35c	 6,102	 # therefore
+*A	927	0	0x341	 8,0	 # Alpha
+*B	927	0	0x342	 8,2	 # Beta
+*C	927	0	0x358	 8,28	 # Xi
+*D	927	0	0x344	 8,8	 # Delta
+*E	927	0	0x345	 8,10	 # Epsilon
+*F	2477	0	0x346	 8,44	 # Phi
+*G	1953	0	0x347	 8,6	 # Gamma
+*H	1953	0	0x351	 8,16	 # Theta
+*I	1953	0	0x349	 8,18	 # Iota
+*K	1953	0	0x34b	 8,20	 # Kappa
+*L	1953	0	0x34c	 8,22	 # Lambda
+*M	1953	0	0x34d	 8,24	 # Mu
+*N	1953	0	0x34e	 8,26	 # Nu
+*O	1953	0	0x34f	 8,30	 # Omicron
+*P	1953	0	0x350	 8,32	 # Pi
+*Q	1953	0	0x359	 8,48	 # Psi
+*R	1953	0	0x352	 8,34	 # Rho
+*S	1953	0	0x353	 8,36	 # Sigma
+*T	1953	0	0x354	 8,40	 # Tau
+*U	1953	0	0x3a1	 8,76	 # Upsilon
+*W	2560	0	0x357	 8,50	 # Omega
+*X	1953	0	0x343	 8,36	 # Chi
+*Y	1953	0	0x348	 8,14	 # Eta
+*Z	1953	0	0x35a	 8,12	 # Zeta
+*a	2027	0	0xe0	 8,1	 # alpha
+*b	2027	0	0xe1	 8,3	 # beta
+*c	2027	0	0x378	 8,29	 # xi
+*d	1980	0	0xeb	 8,9	 # delta
+*e	1980	0	0x36e	 8,70	 # epsilon
+*f	1980	0	0x366	 8,45	 # phi
++f	1980	0	0x36a	 8,77	 # phi1 "variant phi"
+*g	1980	0	0x367	 8,7	 # gamma
+*h	1977	0	0xe9	 8,17	 # theta
++h	1977	0	0x375	 8,71	 # theta1 "variant theta"
+*i	1977	0	0x369	 8,19	 # iota
+*k	1977	0	0x36b	 8,21	 # kappa
+*l	1977	0	0x36c	 8,23	 # lambda
+*m	2037	0	0xe6	 8,25	 # mu
+*n	2037	0	0x36e	 8,27	 # nu
+*o	2037	0	0x36f	 8,31	 # omicron
+*p	2143	0	0xe3	 8,33	 # pi
++p	2143	0	0x376	 8,78	 # omega1 "variant pi, looking like omega"
+*q	2143	0	0x379	 8,49	 # psi
+*r	2143	0	0x372	 8,35	 # rho
+*s	2157	0	0xe5	 8,37	 # sigma
+*t	1503	0	0xe7	 8,41	 # tau
+*u	1503	0	0x375	 8,27	 # upsilon
+*w	1503	0	0x377	 8,51	 # omega
+*x	1503	0	0x363	 8,47	 # chi
+*y	1503	0	0x368	 8,15	 # eta
+*z	1503	0	0x37a	 8,13	 # zeta
+ts	1503	0	0x356	 8,39	 # sigma1 "terminal sigma"
+~~	2663	0	0xf7	 6,13	 # approxequal
+~=	2663	0	0xf7	 6,13	 # approxequal
+!=	2663	0	0x3b9	 6,99	 # notequal
+**	927	0	0x32a	 0,32	 # asteriskmath
++-	1947	0	0xf1	 6,1	 # plusminus
+<=	2407	0	0xf3	 6,2	 # lessequal
+==	2407	0	0x3ba	 8,14	 # equivalence
+=~	2407	0	0x340	 8,116	 # congruent
+>=	2027	0	0x3b3	 8,3	 # greaterequal
+AN	2027	0	0x3d9	 8,85	 # logicaland
+OR	2027	0	0x3da	 8,86	 # logicalor
+no	2027	0	0x3d8	 8,20	 # logicalnot
+te	2027	0	0x324	 8,121	 # existential "there exists, existential quantifier"
+fa	2027	0	0x322	 8,122	 # universal "for all, universal quantifier"
+Ah	2027	0	0x3c0	 9,0	 # aleph
+Im	2027	0	0x3c1	 8,21	 # Ifraktur "Fraktur I, imaginary"
+Re	2027	0	0x3c2	 8,22	 # Rfraktur "Fraktur R, real"
+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
+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"
+pt	1947	0	0x3b5	 6,4	 # proportional
+pp	1947	0	0x35e	 8,89	 # perpendicular
+sb	1947	0	0x3cc	 6,67	 # propersubset
+sp	1947	0	0x3c9	 6,68	 # propersuperset
+ib	1947	0	0x3cd	 6,69	 # reflexsubset
+ip	1947	0	0x3ca	 6,70	 # reflexsuperset
+ap	1947	0	0x37e	 6,12	 # similar
+pd	1947	0	0x3b6	 6,34	 # partialdiff "partial differentiation sign"
+c*	1947	0	0x3c4	 6,80	 # circlemultiply "multiply sign in a circle"
+c+	1947	0	0x3c5	 6,81	 # circleplus "plus sign in a circle"
+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
+gr	3333	0	0x3d1	 6,33	 # gradient
+es	2593	0	0x3c6	 0,79	 # emptyset
+CL	2510	0	0x5	 5,168	 # club "club suit"
+SP	2510	0	0x6	 5,171	 # spade "spade suit"
+HE	2510	0	0x3	 5,170	 # heart "heart suit"
+DI	2510	0	0x4	 5,169	 # diamond "diamond suit"
+CR	2510	0	0x3bf	 5,20	 # carriagereturn "carriage return symbol"
+st	2510	0	0x327	 6,71	 # suchthat
+/_	2510	0	0x3d0	 6,79	 # angle
+<<	1853	0	0xae	 6,77	 # "" "much less"
+>>	1853	0	0xaf	 6,78	 # "" "much greater"
+wp	1853	0	0x3c3	 6,53	 # weierstrass "Weierstrass p"
+lz	1853	0	0x3e0	 6,95	 # lozenge
+an	3333	0	0x3be	 3,8	 # arrowhorizex "horizontal arrow extension"
+pc	927	0	0xfa	 6,32	 # periodcentered
diff --git a/contrib/groff/devlbp/HBI b/contrib/groff/devlbp/HBI
new file mode 100644
index 000000000000..30fa995754eb
--- /dev/null
+++ b/contrib/groff/devlbp/HBI
@@ -0,0 +1,492 @@
+slant 18.49
+name  HBI
+lbpname  Swiss-BoldOblique
+special
+spacewidth 927
+slant 0
+ligatures fi fl 0
+charset
+ha	1110	2	0x4c3	 0,94	 # asciicircum
+ti	1110	0	0x4c4	 0,126	 # asciitilde
+vS	2223	2	0x169	 1,176	 # Scaron
+vZ	2037	2	0x16e	 1,206	 # Zcaron
+vs	1853	2	0x173	 1,177	 # scaron
+vz	1667	2	0x174	 1,207	 # zcaron
+:Y	2223	2	0x16d	 1,74	 # Ydieresis
+tm	3333	2	0x170	 4,41	 # trademark
+aq	793	2	0x27	 0,39	 # quotesingle
+space	927	0	0x20	 0,32
+!	1110	2	0x21	 0,33	 # exclam
+"	1580	2	0x22	 0,34	 # quotedbl
+dq	1580	2	0x22	 0,34	 # quotedbl
+#	1853	2	0x23	 0,35	 # numbersign
+sh	1853	2	0x23	 0,35	 # "
+$	1853	2	0x24	 0,36	 # dollar
+Do	1853	2	0x24	 0,36	 # "
+%	2963	2	0x25	 0,37	 # percent
+&	2407	2	0x26	 0,38	 # ampersand
+'	793	2	0x27	 0,39	 # quoteright
+cq	793	2	0x27	 0,39	 # quoteright
+(	1110	2	0x28	 0,40	 # parenleft
+)	1110	2	0x29	 0,41	 # parenright
+*	1297	2	0x2a	 0,42	 # asterisk
++	1947	0	0x2b	 0,43	 # plus
+,	927	0	0x2c	 0,44	 # comma
+-	1947	0	0x2d	 0,45	 # hyphen
+hy	1947	0	0x2d	 0,45	 # "
+char173	1947	0	0x2d	 0,45	 # "
+.	927	0	0x2e	 0,46	 # period
+/	927	2	0x2f	 0,47	 # slash
+sl	927	2	0x2f	 0,47	 # "
+0	1853	2	0x30	 0,48	 # zero
+1	1853	2	0x31	 0,49	 # one
+2	1853	2	0x32	 0,50	 # two
+3	1853	2	0x33	 0,51	 # three
+4	1853	2	0x34	 0,52	 # four
+5	1853	2	0x35	 0,53	 # five
+6	1853	2	0x36	 0,54	 # six
+7	1853	2	0x37	 0,55	 # seven
+8	1853	2	0x38	 0,56	 # eight
+9	1853	2	0x39	 0,57	 # nine
+:	1110	0	0x3a	 0,58	 # colon
+;	1110	0	0x3b	 0,59	 # semicolon
+<	1947	0	0x3c	 0,60	 # less
+=	1947	0	0x3d	 0,61	 # equal
+>	1947	0	0x3e	 0,62	 # greater
+?	2037	2	0x3f	 0,63	 # question
+@	3250	2	0x40	 0,64	 # at
+at	3250	2	0x40	 0,64	 # "
+A	2407	2	0x41	 0,65	 # A
+B	2407	2	0x42	 0,66	 # B
+C	2407	2	0x43	 0,67	 # C
+D	2407	2	0x44	 0,68	 # D
+E	2223	2	0x45	 0,69	 # E
+F	2037	2	0x46	 0,70	 # F
+G	2593	2	0x47	 0,71	 # G
+H	2407	2	0x48	 0,72	 # H
+I	927	2	0x49	 0,73	 # I
+J	1853	2	0x4a	 0,74	 # J
+K	2407	2	0x4b	 0,75	 # K
+L	2037	2	0x4c	 0,76	 # L
+M	2777	2	0x4d	 0,77	 # M
+N	2407	2	0x4e	 0,78	 # N
+O	2593	2	0x4f	 0,79	 # O
+P	2223	2	0x50	 0,80	 # P
+Q	2593	2	0x51	 0,81	 # Q
+R	2407	2	0x52	 0,82	 # R
+S	2223	2	0x53	 0,83	 # S
+T	2037	2	0x54	 0,84	 # T
+U	2407	2	0x55	 0,85	 # U
+V	2223	2	0x56	 0,86	 # V
+W	3147	2	0x57	 0,87	 # W
+X	2223	2	0x58	 0,88	 # X
+Y	2223	2	0x59	 0,89	 # Y
+Z	2037	2	0x5a	 0,90	 # Z
+[	1110	2	0x5b	 0,91	 # bracketleft
+lB	1110	2	0x5b	 0,91	 # "
+\	927	2	0x5c	 0,92	 # backslash
+rs	927	2	0x5c	 0,92	 # "
+]	1110	2	0x5d	 0,93	 # bracketright
+rB	1110	2	0x5d	 0,93	 # "
+a^	1110	2	0x5e	 0,94	 # circumflex
+^	1110	2	0x5e	 0,94	 # "
+_	1853	0	0x5f	 0,95	 # underscore
+`	1110	2	0x60	 0,96	 # quoteleft
+oq	1110	2	0x60	 0,96	 # "
+a	1853	0	0x61	 0,97	 # a
+b	2037	2	0x62	 0,98	 # b
+c	1853	0	0x63	 0,99	 # c
+d	2037	2	0x64	 0,100	 # d
+e	1853	0	0x65	 0,101	 # e
+f	1110	2	0x66	 0,102	 # f
+g	2037	1	0x67	 0,103	 # g
+h	2037	2	0x68	 0,104	 # h
+i	927	2	0x69	 0,105	 # i
+j	927	2	0x6a	 0,106	 # j
+k	1853	2	0x6b	 0,107	 # k
+l	927	2	0x6c	 0,108	 # l
+m	2963	0	0x6d	 0,109	 # m
+n	2037	0	0x6e	 0,110	 # n
+o	2037	0	0x6f	 0,111	 # o
+p	2037	1	0x70	 0,112	 # p
+q	2037	1	0x71	 0,113	 # q
+r	1297	0	0x72	 0,114	 # r
+s	1853	0	0x73	 0,115	 # s
+t	1110	2	0x74	 0,116	 # t
+u	2037	0	0x75	 0,117	 # u
+v	1853	0	0x76	 0,118	 # v
+w	2593	0	0x77	 0,119	 # w
+x	1853	0	0x78	 0,120	 # x
+y	1853	1	0x79	 0,121	 # y
+z	1667	0	0x7a	 0,122	 # z
+lC	1297	2	0x7b	 0,123	 # braceleft
+{	1297	2	0x7b	 0,123	 # "
+|	933	2	0x7c	 0,124	 # "
+rC	1297	2	0x7d	 0,125	 # braceright
+}	1297	2	0x7d	 0,125	 # "
+a~	1110	2	0x7e	 0,126	 # tilde
+~	1110	2	0x7e	 0,126	 # "
+char161	1110	1	0xad	 4,7	 # exclamdown
+char162	1853	2	0x9b	 4,19	 # cent
+char163	1853	2	0x9c	 4,11	 # sterling
+char164	1853	2	0x12f	 4,24	 # currency
+char165	1853	2	0x9d	 4,12	 # yen
+char166	933	2	0x7c	 0,124	 # brokenbar
+char167	1853	2	0x15	 4,6	 # section
+char168	1110	2	0x122	 1,7	 # dieresis
+char169	2457	2	0x154	 4,23	 # copyright
+char170	1233	2	0xa6	 4,15	 # ordfeminine
+char171	1853	0	0xae	 4,9	 # guillemotleft
+char172	1947	0	0xaa	 6,20	 # logicalnot
+char173	1853	0	0x132	 4,33	 # hyphen
+char174	2457	2	0x155	 4,22	 # registered
+char175	1947	2	0x2d	 6,0	 # macron
+char176	1333	2	0xf8	 6,36	 # degree
+char177	1947	0	0xf1	 6,1	 # plusminus
+char178	1110	2	0xfd	 4,20	 # twosuperior
+char179	1110	2	0x14d	 4,26	 # threesuperior
+char180	1110	2	0x120	 1,6	 # acute "acute accent"
+char181	2037	1	0xe6	 8,25	 # mu
+char182	1853	2	0x14	 4,5	 # paragraph
+char183	927	0	0xfa	 6,32	 # periodcentered
+char184	1110	0	0x139	 1,17	 # cedilla
+char185	1110	2	0x156	 4,78	 # onesuperior
+char186	1217	2	0xa7	 4,16	 # ordmasculine
+char187	1853	0	0xaf	 4,10	 # guillemotright
+char188	2780	2	0xac	 4,18	 # onequarter
+char189	2780	2	0xab	 4,17	 # onehalf
+char190	2780	2	0x12e	 4,25	 # threequarters
+char191	2037	1	0xa8	 4,8	 # questiondown
+char192	2407	2	0x15c	 1,32	 # Agrave
+char193	2407	2	0x15a	 1,26	 # Aacute
+char194	2407	2	0x15b	 1,28	 # Acircumflex
+char195	2407	2	0x28e	 1,76	 # Atilde
+char196	2407	2	0x8e	 1,30	 # Adieresis
+char197	2407	2	0x8f	 1,34	 # Aring
+char198	3333	2	0x92	 1,36	 # AE
+char199	2407	2	0x80	 1,38	 # Ccedilla
+char200	2223	2	0x160	 1,46	 # Egrave
+char201	2223	2	0x90	 1,40	 # Eacute
+char202	2223	2	0x15e	 1,42	 # Ecircumflex
+char203	2223	2	0x15f	 1,44	 # Edieresis
+char204	927	2	0x164	 1,54	 # Igrave
+char205	927	2	0x161	 1,48	 # Iacute
+char206	927	2	0x162	 1,50	 # Icircumflex
+char207	927	2	0x163	 1,52	 # Idieresis
+char208	2407	2	0x13d	 1,78	 # Eth
+char209	2407	2	0xa5	 1,56	 # Ntilde
+char210	2593	2	0x167	 1,64	 # Ograve
+char211	2593	2	0x165	 1,58	 # Oacute
+char212	2593	2	0x166	 1,60	 # Ocircumflex
+char213	2593	2	0x168	 1,82	 # Otilde
+char214	2593	2	0x99	 1,62	 # Odieresis
+char215	1947	0	0x157	 6,39	 # multiply
+char216	2593	2	0x140	 1,80	 # Oslash
+char217	2407	2	0x16c	 1,72	 # Ugrave
+char218	2407	2	0x16a	 1,66	 # Uacute
+char219	2407	2	0x16b	 1,68	 # Ucircumflex
+char220	2407	2	0x9a	 1,70	 # Udieresis
+char221	2223	2	0x16f	 1,84	 # Yacute
+char222	2223	2	0x13e	 1,88	 # Thorn
+char223	2037	2	0x147	 1,23	 # germandbls
+char224	1853	2	0x85	 1,33	 # agrave
+char225	1853	2	0xa0	 1,27	 # aacute
+char226	1853	2	0x83	 1,29	 # acircumflex
+char227	1853	2	0x284	 1,93	 # atilde
+char228	1853	2	0x84	 1,31	 # adieresis
+char229	1853	2	0x86	 1,35	 # aring
+char230	2963	0	0x91	 1,37	 # ae
+char231	1853	0	0x87	 1,39	 # ccedilla
+char232	1853	2	0x8a	 1,47	 # egrave
+char233	1853	2	0x82	 1,41	 # eacute
+char234	1853	2	0x88	 1,43	 # ecircumflex
+char235	1853	2	0x89	 1,45	 # edieresis
+char236	927	2	0x8d	 1,55	 # igrave
+char237	927	2	0xa1	 1,49	 # iacute
+char238	927	2	0x8c	 1,51	 # icircumflex
+char239	927	2	0x8b	 1,53	 # idieresis
+char240	2037	2	0x148	 1,87	 # eth
+char241	2037	2	0xa4	 1,57	 # ntilde
+char242	2037	2	0x95	 1,65	 # ograve
+char243	2037	2	0xa2	 1,59	 # oacute
+char244	2037	2	0x93	 1,61	 # ocircumflex
+char245	2037	2	0x172	 1,83	 # otilde
+char246	2037	2	0x94	 1,63	 # odieresis
+char247	1947	0	0xf6	 6,8	 # divide
+char248	2037	0	0x145	 1,81	 # oslash
+char249	2037	2	0x97	 1,73	 # ugrave
+char250	2037	2	0xa3	 1,67	 # uacute
+char251	2037	2	0x96	 1,69	 # ucircumflex
+char252	2037	2	0x81	 1,71	 # udieresis
+char253	1853	3	0x175	 1,85	 # yacute
+char254	2037	3	0x143	 1,89	 # thorn
+char255	1853	3	0x98	 1,75	 # ydieresis
+-D	2407	2	0x13d	 1,78	 # Eth "Icelandic uppercase eth"
+Sd	2037	2	0x148	 1,87	 # eth "Icelandic lowercase eth"
+TP	2223	2	0x13e	 1,88	 # Thorn "Icelandic uppercase thorn"
+Tp	2037	3	0x143	 1,89	 # thorn "Icelandic lowercase thorn"
+AE	3333	2	0x92	 1,36	 # AE
+ae	2963	0	0x91	 1,37	 # ae
+OE	3333	2	0x141	 1,166	 # OE
+oe	3147	0	0x146	 1,167	 # oe
+ij	1830	0	0x150	 1,139	 # ij "Dutch ij ligature"
+ss	2037	2	0x147	 1,23	 # germandbls
+'A	2407	2	0x15a	 1,26	 # Aacute
+'E	2223	2	0x90	 1,40	 # Eacute
+'I	927	2	0x161	 1,48	 # Iacute
+'O	2593	2	0x165	 1,58	 # Oacute
+'U	2407	2	0x16a	 1,66	 # Uacute
+'a	1853	2	0xa0	 1,27	 # aacute
+'e	1853	2	0x82	 1,41	 # eacute
+'i	927	2	0xa1	 1,49	 # iacute
+'o	2037	2	0xa2	 1,59	 # oacute
+'u	2037	2	0x95	 1,65	 # uacute
+:A	2407	2	0x8e	 1,30	 # Adieresis
+:E	2223	2	0x15f	 1,44	 # Edieresis
+:I	927	2	0x163	 1,52	 # Idieresis
+:O	2593	2	0x99	 1,62	 # Odieresis
+:U	2407	2	0x9a	 1,70	 # Udieresis
+:Y	2223	2	0x16d	 1,74	 # Ydieresis
+:a	1853	2	0x84	 1,31	 # adieresis
+:e	1853	2	0x89	 1,45	 # edieresis
+:i	927	2	0x8b	 1,53	 # idieresis
+:o	2037	2	0x94	 1,63	 # odieresis
+:u	2037	2	0x81	 1,71	 # udieresis
+:y	1853	3	0x98	 1,75	 # ydieresis
+^A	2407	2	0x15b	 1,28	 # Acircumflex
+^E	2223	2	0x15e	 1,42	 # Ecircumflex
+^I	927	2	0x162	 1,50	 # Icircumflex
+^O	2593	2	0x166	 1,60	 # Ocircumflex
+^U	2407	2	0x16b	 1,68	 # Ucircumflex
+^a	1853	2	0x83	 1,29	 # acircumflex
+^e	1853	2	0x88	 1,43	 # ecircumflex
+^i	927	2	0x8c	 1,51	 # icircumflex
+^o	2037	2	0x93	 1,61	 # ocircumflex
+^u	2037	2	0x96	 1,69	 # ucircumflex
+`A	2407	2	0x15c	 1,32	 # Agrave
+`E	2223	2	0x160	 1,46	 # Egrave
+`I	927	2	0x164	 1,54	 # Igrave
+`O	2593	2	0x167	 1,64	 # Ograve
+`U	2407	2	0x16c	 1,72	 # Ugrave
+`a	1853	2	0x85	 1,33	 # agrave
+~a	1853	2	0x284	 ---	 # atilde
+`e	1853	2	0x8a	 1,47	 # egrave
+`i	927	2	0x8d	 1,55	 # igrave
+`o	2037	2	0x95	 1,65	 # ograve
+`u	2037	2	0x97	 1,73	 # ugrave
+~A	2407	2	0x28e	 1,26	 # Atilde
+~N	2407	2	0xa5	 1,56	 # Ntilde
+~O	2593	2	0x168	 1,82	 # Otilde
+~n	2037	2	0xa4	 1,57	 # ntilde
+~o	2037	2	0x172	 1,83	 # otilde
+vS	2223	2	0x169	 1,176	 # Scaron
+vs	1853	2	0x173	 1,177	 # scaron
+vZ	2037	2	0x16e	 1,206	 # Zcaron
+vz	1667	2	0x174	 1,207	 # zcaron
+,C	2407	2	0x80	 1,38	 # Ccedilla
+,c	1853	0	0x87	 1,39	 # ccedilla
+/L	2037	2	0x13f	 1,152	 # Lslash "Polish L with a slash"
+/l	927	2	0x144	 1,153	 # lslash "Polish l with a slash"
+/O	2593	2	0x140	 1,80	 # Oslash
+/o	2037	0	0x145	 1,81	 # oslash
+oA	2407	2	0x8f	 1,34	 # Aring
+oa	1853	2	0x86	 1,35	 # aring
+a"	1110	2	0x13a	 1,16	 # hungarumlaut "Hungarian umlaut"
+a-	1110	2	0x135	 1,8	 # macron "macron or bar accent"
+a.	1110	2	0x137	 1,15	 # dotaccent "dot accent"
+a^	1110	2	0x5e	 1,3	 # circumflex "circumflex accent"
+aa	1110	2	0x120	 1,6	 # acute "acute accent"
+ga	1110	2	0x121	 1,0	 # grave "grave accent"
+ab	1110	2	0x136	 1,22	 # breve "breve accent"
+ac	1110	0	0x139	 1,17	 # cedilla "cedilla accent"
+ad	1110	2	0x122	 1,7	 # dieresis "umlaut or dieresis"
+ah	1110	2	0x13c	 1,19	 # caron "h\('a\(vcek accent"
+ao	1110	2	0x138	 1,14	 # ring "ring or circle accent"
+a~	1110	2	0x7e	 1,2	 # tilde "tilde accent"
+ho	1110	0	0x13b	 1,18	 # ogonek "hook or ogonek accent"
+.i	927	0	0x142	 1,239	 # dotlessi "i without a dot"
+Cs	1853	2	0x12f	 4,24	 # currency "Scandinavian currency sign"
+Do	1853	2	0x24	 0,36	 # dollar
+Po	1853	2	0x9c	 4,11	 # sterling
+Ye	1853	2	0x9d	 4,12	 # yen
+Fn	1853	2	0x9f	 4,14	 # florin
+ct	1853	2	0x9b	 4,19	 # cent
+Fo	1853	0	0xae	 4,9	 # guillemotleft
+Fc	1110	0	0x4bb	 4,20	 # guillemotright
+fo	1110	0	0x127	 4,35	 # guilsinglleft
+fc	1110	0	0x128	 4,36	 # guilsinglright
+r!	1110	1	0xad	 4,7	 # exclamdown
+r?	2037	1	0xa8	 4,8	 # questiondown
+fi	2037	2	0x130	 4,54	 # fi "fi ligature"
+fl	2037	2	0x131	 4,55	 # fl "fl ligature"
+OK	2037	0	0x3d6	 ---	 # \& "check mark, tick"
+Of	1233	2	0xa6	 4,15	 # ordfeminine
+Om	1217	2	0xa7	 4,16	 # ordmasculine
+S1	1110	2	0x156	 4,78	 # onesuperior
+S2	1110	2	0xfd	 4,20	 # twosuperior
+S3	1110	2	0x14d	 4,26	 # threesuperior
+<-	3290	0	0x1b	 6,22	 # arrowleft
+->	3290	0	0x1a	 6,21	 # arrowright
+<>	3473	0	0x1d	 6,25	 # arrowboth "horizontal double-headed arrow"
+da	2010	0	0x19	 6,24	 # arrowdown
+ua	2010	0	0x18	 6,23	 # arrowup
+va	2010	0	0x12	 6,26	 # \& "vertical double-headed arrow"
+lA	2010	0	0x3dc	 6,57	 # arrowdblleft
+rA	2010	0	0x3de	 6,56	 # arrowdblright
+hA	2010	0	0x3db	 6,60	 # arrowdblboth "horizontal double-headed double arrow"
+dA	2010	0	0x3df	 6,59	 # arrowdbldown
+uA	2010	0	0x3dd	 6,58	 # arrowdblup
+ba	3333	2	0xb3	 3,9	 # bar
+bb	933	2	0x7c	 0,124	 # brokenbar
+br	3333	0	0x1db	 3,9	 # br "box rule with traditional troff metrics"
+ru	3333	0	0x123	 4,34	 # ru "baseline rule"
+ul	1853	0	0x5f	 0,95	 # ul "underline with traditional troff metrics"
+bv	3333	0	0x3f4	 3,9	 # bv "bold vertical"
+ci	2843	0	0x9	 4,1	 # circle
+bu	2120	0	0x7	 4,0	 # bullet
+co	2457	2	0x154	 4,23	 # copyright
+rg	2457	2	0x155	 4,22	 # registered
+tm	3333	2	0x170	 4,41	 # trademark
+dd	1853	2	0x12b	 4,40	 # daggerdbl "double dagger sign"
+dg	1853	2	0x12a	 4,39	 # dagger
+ps	1853	2	0x14	 4,5	 # paragraph
+sc	1853	2	0x15	 4,6	 # section
+de	1333	2	0xf8	 6,36	 # degree
+em	3333	0	0x123	 4,34	 # emdash "em dash"
+en	1853	0	0x132	 4,33	 # endash "en dash"
+%0	3333	2	0x129	 4,75	 # perthousand "per thousand, per mille sign"
+12	2780	2	0xab	 4,17	 # onehalf
+14	2780	2	0xac	 4,18	 # onequarter
+34	2780	2	0x12e	 4,25	 # threequarters
+f/	557	2	0x158	 6,6	 # fraction "bar for fractions"
+fm	557	0	0x3a2	 6,45	 # minute "footmark, prime"
+sd	557	0	0x3b2	 6,46	 # second
+ha	557	2	0x4c3	 6,85	 # asciicircum "\s-2ASCII\s+2 circumflex, hat, caret"
+ti	557	0	0x4c4	 6,12	 # asciitilde "\s-2ASCII\s0 tilde, large tilde"
+hy	1947	0	0x2d	 6,0	 # hyphen
+lB	1110	2	0x5b	 0,91	 # bracketleft
+rB	1110	2	0x5d	 0,93	 # bracketright
+lC	1297	2	0x7b	 0,123	 # braceleft