Add a site-specific font directory.

* Makefile.in (localfontdir, legacyfontdir): New variables.
(fontpath): Use them.
(MDEFINES, uninstall_dirs): Updated.
* Makefile.comm (.man.n): Add `LOCALFONTDIR' and `LEGACYFONTDIR'.
Remove `FONTPATH' and `MACROPATH'.

* src/roff/troff/troff.man, NEWS: Updated.
* doc/groff.texinfo (Font Directories): New section.
Other minor fixes.

* src/devices/grodvi/grodvi.man, src/devices/grohtml/grohtml.man,
src/devices/grolbp/grolbp.man, src/devices/grolj4/grolj4.man,
src/preproc/grn/grn.man: Minor fixes.

* src/devices/grohtml/post-html.cc (html_printer::do_tab_ts):
Remove unused variable.

1 files changed, 41 insertions, 32 deletions

diff --git a/Makefile.in b/Makefile.in
index e19a65d0..411d8b9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,7 @@ VPATH=@srcdir@
 top_builddir=@groff_top_builddir@
 
 version=`cat $(top_srcdir)/VERSION`
-# No additional number if revision is zero
+# No additional number if revision is zero.
 revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 
 # Define `page' to be letter if your PostScript printer uses 8.5x11
@@ -54,22 +54,22 @@ PAGE=@PAGE@
 # with a printer that requires page reversal.
 BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@
 
-# DEVICE is the default device.
+# `DEVICE' is the default device.
 DEVICE=ps
 
-# TTYDEVDIRS is either `font/devascii font/devlatin1' (for
+# `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for
 # ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8.
 TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8
 
-# OTHERDEVDIRS is either `font/devlj4 font/devlbp' (for ASCII) or
+# `OTHERDEVDIRS' is either `font/devlj4 font/devlbp' (for ASCII) or
 # empty (for EBCDIC).
 OTHERDEVDIRS=@OTHERDEVDIRS@
 
-# PSPRINT is the command to use for printing a PostScript file,
+# `PSPRINT' is the command to use for printing a PostScript file,
 # for example `lpr'.
 PSPRINT=@PSPRINT@
 
-# DVIPRINT is the command to use for printing a TeX dvi file,
+# `DVIPRINT' is the command to use for printing a TeX dvi file,
 # for example `lpr -d'.
 DVIPRINT=@DVIPRINT@
 
@@ -86,56 +86,62 @@ g=@g@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 
-# bindir says where to install executables.
+# `bindir' says where to install executables.
 bindir=@bindir@
 
-# libdir says where to install platform-dependent data
+# `libdir' says where to install platform-dependent data.
 libdir=@libdir@
 libprogramdir=$(libdir)/groff
 
-# datasubdir says where to install platform-independent data files
+# `datasubdir' says where to install platform-independent data files.
 datadir=@datadir@
 dataprogramdir=$(datadir)/groff
 datasubdir=$(dataprogramdir)/$(version)$(revision)
 
-# infodir says where to install info files
+# `infodir' says where to install info files.
 infodir=@infodir@
 
-# docdir says where to install documentation files
+# `docdir' says where to install documentation files.
 docdir=$(datadir)/doc/groff/$(version)$(revision)
 
-# exampledir says where to install example files
+# `exampledir' says where to install example files.
 exampledir=$(docdir)/examples
 
-# htmldocdir says where to install documentation in HTML format
+# `htmldocdir' says where to install documentation in HTML format.
 htmldocdir=$(docdir)/html
 
-# fontdir says where to install dev*/*.
+# `fontdir' says where to install dev*/*.
 fontdir=$(datasubdir)/font
 
-# fontpath says where to look for dev*/*.
-fontpath=$(fontdir):/usr/lib/font
+# `localfontdir' says where local fonts will be installed (as dev*/*).
+localfontdir=$(dataprogramdir)/site-font
 
-# tmacdir says where to install macros.
+# `legacyfontdir' is for compatibility with non-GNU troff.
+legacyfontdir=/usr/lib/font
+
+# `fontpath' says where to look for dev*/*.
+fontpath=$(localfontdir):$(fontdir):$(legacyfontdir)
+
+# `tmacdir' says where to install macros.
 tmacdir=$(datasubdir)/tmac
 
-# systemtmacdir says where to install platform-dependent macros
+# `systemtmacdir' says where to install platform-dependent macros.
 systemtmacdir=$(libprogramdir)/site-tmac
 
-# localtmacdir says where local files will be installed
+# `localtmacdir' says where local files will be installed.
 localtmacdir=$(dataprogramdir)/site-tmac
 
-# tmacpath says where to look for macro files.
+# `tmacpath' says where to look for macro files.
 # The current directory will be prepended in unsafe mode only; the home
 # directory will be always added.
 # `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the
 # current nor in the home directory.
 tmacpath=$(systemtmacdir):$(localtmacdir):$(tmacdir)
 
-# sys_tmac_prefix is prefix (if any) for system macro packages
+# `sys_tmac_prefix' is prefix (if any) for system macro packages.
 sys_tmac_prefix=@sys_tmac_prefix@
 
-# tmac_wrap is list of system macro packages that should be made
+# `tmac_wrap' is list of system macro packages that should be made
 # available to groff by creating a corresponding macro package
 # in the groff macro directory that references the system macro
 # package.
@@ -173,24 +179,24 @@ indexname=Ind
 # otherwise the supplied eign file will be used.
 common_words_file=$(datasubdir)/eign
 
-# manroot is the root of the man page directory tree.
+# `manroot' is the root of the man page directory tree.
 mandir=@mandir@
 manroot=$(mandir)
 
-# man1ext is the man section for user commands.
+# `man1ext' is the man section for user commands.
 man1ext=1
 man1dir=$(manroot)/man$(man1ext)
 
-# man5ext is the man section for file formats.
+# `man5ext' is the man section for file formats.
 man5ext=5
 man5dir=$(manroot)/man$(man5ext)
 
-# man7ext is the man section for macros.
+# `man7ext' is the man section for macros.
 man7ext=7
 man7dir=$(manroot)/man$(man7ext)
 
-# the configure script checks whether all necessary utility programs for
-# grohtml are available -- only then we can build the HTML documentation
+# The configure script checks whether all necessary utility programs for
+# grohtml are available -- only then we can build the HTML documentation.
 make_html=@make_html@
 make_install_html=@make_install_html@
 
@@ -264,7 +270,7 @@ DEFINES=@DEFS@
 # in LIBOBJS if your C library is missing the corresponding function.
 LIBOBJS=@LIBOBJS@
 
-# CCC is the compiler for C++ (.cc) files.
+# `CCC' is the compiler for C++ (.cc) files.
 CCC=@CXX@
 CC=@CC@
 # CCDEFINES are definitions for C++ compilations.
@@ -299,7 +305,7 @@ PERLPATH=@PERLPATH@
 # Sed command with which to edit sh scripts.
 SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@
 
-# the program to create directory hierarchies
+# The program to create directory hierarchies.
 mkinstalldirs=$(top_srcdir)/mkinstalldirs
 
 PURIFY=purify
@@ -337,6 +343,8 @@ MDEFINES= \
   "libprogramdir=$(libprogramdir)" \
   "bindir=$(bindir)" \
   "fontdir=$(fontdir)" \
+  "localfontdir=$(localfontdir)" \
+  "legacyfontdir=$(legacyfontdir)" \
   "fontpath=$(fontpath)" \
   "tmacdir=$(tmacdir)" \
   "systemtmacdir=$(systemtmacdir)" \
@@ -616,9 +624,10 @@ uninstall: uninstall_sub uninstall_dirs
 
 .PHONY: uninstall_dirs
 uninstall_dirs:
-# Use rmdir here so that the directories are only removed if they're empty
+# Use `rmdir' here so that the directories are only removed if they are empty.
 	-rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
-	  $(tmacdir) $(systemtmacdir) $(localtmacdir) $(fontdir) $(bindir) \
+	  $(tmacdir) $(systemtmacdir) $(localtmacdir) \
+	  $(fontdir) $(localfontdir) $(bindir) \
 	  $(datasubdir) $(dataprogramdir) $(datadir) $(infodir) \
 	  $(exampledir) $(htmldocdir) $(docdir) \
 	  $(libprogramdir) $(libdir)