[groff] 15/25: Rename and ship "FontMap-X11".

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b225d5e4f48bb1e29589901fe7dbd6e805e8146d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Feb 27 20:31:10 2022 +1100

    Rename and ship "FontMap-X11".
    
    xtotroff(1) is not very useful without a font name mapping file to read.
    To date it has been available only in the source distribution.  Remedy
    that.  The file is placed directly in the groff font directory alongside
    the device directories because it applies to four different devices, and
    four copies of this data are not required.
    
    * src/devices/xditview/FontMap: Rename to...
    * src/devices/xditview/FontMap-X11: ...this.
    
    * LICENSES:
    * src/devices/xditview/xditview.am (EXTRA_DIST): Reflect rename.
    
    * src/devices/xditview/xditview.am (install_xditview [!WITHOUT_X11],
      uninstall_xtdiview): (Un)-install it.
    
    * src/utils/xtotroff/xtotroff.1.man (Files): Add section documenting the
      presence and purpose of this file.
---
 ChangeLog                                     | 21 +++++++++++++++++++++
 LICENSES                                      |  2 +-
 src/devices/xditview/{FontMap => FontMap-X11} |  0
 src/devices/xditview/xditview.am              |  8 +++++++-
 src/utils/xtotroff/xtotroff.1.man             | 14 ++++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 717b7261..a3fb69ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2022-02-27  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Rename and ship "FontMap-X11".  xtotroff(1) is not very useful
+       without a font name mapping file to read.  To date it has been
+       available only in the source distribution.  Remedy that.  The
+       file is placed directly in the groff font directory alongside
+       the device directories because it applies to four different
+       devices, and four copies of this data are not required.
+
+       * src/devices/xditview/FontMap: Rename to...
+       * src/devices/xditview/FontMap-X11: ...this.
+
+       * LICENSES:
+       * src/devices/xditview/xditview.am (EXTRA_DIST): Reflect rename.
+
+       * src/devices/xditview/xditview.am (install_xditview
+         [!WITHOUT_X11], uninstall_xtdiview): (Un)-install it.
+
+       * src/utils/xtotroff/xtotroff.1.man (Files): Add section
+       documenting the presence and purpose of this file.
+
 2022-02-26  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [xtotroff]: Add `-d` option to produce font description files in
diff --git a/LICENSES b/LICENSES
index dace01ce..63e304ee 100644
--- a/LICENSES
+++ b/LICENSES
@@ -57,7 +57,7 @@ hasn't been assigned to the FSF).
       src/devices/xditview/Dvi.c
       src/devices/xditview/Dvi.h
       src/devices/xditview/DviP.h
-      src/devices/xditview/FontMap
+      src/devices/xditview/FontMap-X11
       src/devices/xditview/GXditview.ad
       src/devices/xditview/Menu.h
       src/devices/xditview/ad2c
diff --git a/src/devices/xditview/FontMap b/src/devices/xditview/FontMap-X11
similarity index 100%
rename from src/devices/xditview/FontMap
rename to src/devices/xditview/FontMap-X11
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 625ab8a9..ad30a171 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -64,7 +64,7 @@ EXTRA_DIST += \
   src/devices/xditview/ad2c \
   src/devices/xditview/ChangeLog \
   src/devices/xditview/DESC.in \
-  src/devices/xditview/FontMap \
+  src/devices/xditview/FontMap-X11 \
   src/devices/xditview/GXditview-color.ad \
   src/devices/xditview/GXditview.ad \
   src/devices/xditview/README \
@@ -90,8 +90,12 @@ install_xditview:
 uninstall_xditview:
 else
 install_xditview: \
+  $(xditview_srcdir)/FontMap-X11 \
   $(xditview_srcdir)/GXditview.ad \
   $(xditview_srcdir)/GXditview-color.ad
+       $(MKDIR_P) $(DESTDIR)$(fontdir)
+       $(INSTALL_DATA) $(xditview_srcdir)/FontMap-X11 \
+         $(DESTDIR)$(fontdir)/FontMap-X11
        -test -d $(DESTDIR)$(appresdir) \
          || $(mkinstalldirs) $(DESTDIR)$(appresdir)
        if test -f $(DESTDIR)$(appresdir)/GXditview; then \
@@ -110,6 +114,8 @@ install_xditview: \
 uninstall_xditview:
        rm -f $(DESTDIR)$(appresdir)/GXditview
        rm -f $(DESTDIR)$(appresdir)/GXditview-color
+       rm -f $(DESTDIR)$(fontdir)/FontMap-X11
+       -rmdir $(DESTDIR)$(fontdir) 2>/dev/null
 
 endif
 
diff --git a/src/utils/xtotroff/xtotroff.1.man 
b/src/utils/xtotroff/xtotroff.1.man
index 317e8f79..e8fb7473 100644
--- a/src/utils/xtotroff/xtotroff.1.man
+++ b/src/utils/xtotroff/xtotroff.1.man
@@ -161,6 +161,20 @@ a size of 10 points is assumed.
 .
 .
 .\" ====================================================================
+.SH Files
+.\" ====================================================================
+.
+.TP
+.I @FONTDIR@/\:\%FontMap\-X11
+is the font mapping file used to produce the pre-generated font
+description files,
+supplied with
+.IR groff ,
+of X11 core fonts corresponding to Adobe's 13 base Type\~1 fonts for
+PostScript.
+.
+.
+.\" ====================================================================
 .SH Bugs
 .\" ====================================================================
 .