[groff] 31/122: [man pages]: Suppress hyphenation better.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 1b1e085e9a8928412e85a70333d6c7f4d0a1ba8c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Nov 8 01:57:23 2020 +1100

    [man pages]: Suppress hyphenation better.
    
    * src/devices/grolbp/grolbp.1.man:
    * src/utils/hpftodit/hpftodit.1.man:
    * src/utils/indxbib/indxbib.1.man:
    * src/utils/lkbib/lkbib.1.man:
    * src/utils/pfbtops/pfbtops.1.man:
    * tmac/groff_man.7.man.in:
      Improve file name rendering.  Suppress hyphenation before build-time,
      user-controlled prefix. Add non-printing break points after slashes
      and before dots.  Suppress hyphenation again where necessary in
      subsequent filename components.
---
 src/devices/grolbp/grolbp.1.man   |  6 +++---
 src/utils/hpftodit/hpftodit.1.man |  6 +++---
 src/utils/indxbib/indxbib.1.man   | 12 ++++++------
 src/utils/lkbib/lkbib.1.man       |  2 +-
 src/utils/pfbtops/pfbtops.1.man   |  4 ++--
 tmac/groff_man.7.man.in           | 14 +++++++-------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index 955ba42..eadac9f 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -424,16 +424,16 @@ for more details.
 .\" ====================================================================
 .
 .TP
-.I @FONTDIR@/devlbp/DESC
+.I \%@FONTDIR@/\:\%devlbp/\:DESC
 Device description file.
 .
 .TP
-.IR @FONTDIR@/devlbp/ F
+.IR \%@FONTDIR@/\:\%devlbp/ F
 Font description file for font
 .IR F .
 .
 .TP
-.I @MACRODIR@/lbp.tmac
+.I \%@MACRODIR@/\:lbp\:.tmac
 Macros for use with
 .BR grolbp .
 .
diff --git a/src/utils/hpftodit/hpftodit.1.man 
b/src/utils/hpftodit/hpftodit.1.man
index b675fd6..1350c97 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -399,18 +399,18 @@ the search order is reversed.
 .\" ====================================================================
 .
 .TP
-.I \%@FONTDIR@/\:devlj4/\:DESC
+.I \%@FONTDIR@/\:\%devlj4/\:DESC
 device description file
 .
 .
 .TP
-.IR \%@FONTDIR@/\:devlj4/\: F
+.IR \%@FONTDIR@/\:\%devlj4/\: F
 Font description file for font
 .I F
 .
 .
 .TP
-.IR \%@FONTDIR@/\:devlj4/\:generate/\: * .map
+.IR \%@FONTDIR@/\:\%devlj4/\:\%generate/\: * .map
 symbol mapping files
 .
 .
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.1.man
index acfacd8..55b8a47 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -87,7 +87,7 @@ If no filenames are given on the command line because the
 option has been used, and no
 .B \-o
 option is given, the index will be named
-.IR @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@ .
+.IR \%@DEFAULT_INDEX_NAME@@INDEX_SUFFIX@ .
 .
 .
 .LP
@@ -145,7 +145,7 @@ all exit afterward.
 Read the list of common words from
 .I file
 instead of
-.IR @COMMON_WORDS_FILE@ .
+.IR \%@COMMON_WORDS_FILE@ .
 .
 .TP
 .BI \-d\~ dir
@@ -259,19 +259,19 @@ Each file is a separate record.
 .\" ====================================================================
 .
 .TP
-.RI filename @INDEX_SUFFIX@
+.RI \%filename @INDEX_SUFFIX@
 Index.
 .
 .TP
-.I @DEFAULT_INDEX_NAME@@INDEX_SUFFIX@
+.I \%@DEFAULT_INDEX_NAME@@INDEX_SUFFIX@
 Default index name.
 .
 .TP
-.I @COMMON_WORDS_FILE@
+.I \%@COMMON_WORDS_FILE@
 List of common words.
 .
 .TP
-.IR indxbib XXXXXX
+.IR \%indxbib XXXXXX
 Temporary file.
 .
 .
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index befb931..2b69cea 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -144,7 +144,7 @@ Default database.
 .\" ====================================================================
 .
 .TP
-.I @DEFAULT_INDEX@
+.I \%@DEFAULT_INDEX@
 Default database to be used if the
 .I \%REFER
 environment variable is not set.
diff --git a/src/utils/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.1.man
index 0d63d90..0df9e37 100644
--- a/src/utils/pfbtops/pfbtops.1.man
+++ b/src/utils/pfbtops/pfbtops.1.man
@@ -74,9 +74,9 @@ PostScript fonts for MS-DOS are normally supplied in PFB 
format.
 The resulting ASCII format PostScript font can be used with groff,
 .IR groff (@MAN1EXT@)
 if it is first listed in
-.I \%@FONTDIR@/\:devps/\:download
+.I \%@FONTDIR@/\:\%devps/\:\%download
 and
-.IR \%@FONTDIR@/\:devpdf/\:download .
+.IR \%@FONTDIR@/\:\%devpdf/\:\%download .
 .
 .
 .\" ====================================================================
diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in
index 1b99f75..45627aa 100644
--- a/tmac/groff_man.7.man.in
+++ b/tmac/groff_man.7.man.in
@@ -3115,15 +3115,15 @@ _endif()dnl
 .\" ====================================================================
 .
 .TP
-.I \%@MACRODIR@/\:man.tmac
+.I \%@MACRODIR@/\:man\:.tmac
 .TQ
-.I \%@MACRODIR@/\:an.tmac
+.I \%@MACRODIR@/\:an\:.tmac
 These are wrapper files to call
 .IR andoc.tmac .
 .
 .
 .TP
-.I \%@MACRODIR@/\:andoc.tmac
+.I \%@MACRODIR@/\:andoc\:.tmac
 This brief
 .I groff
 program detects whether the
@@ -3155,7 +3155,7 @@ can be handled.
 .
 .
 .TP
-.I \%@MACRODIR@/\:an\-old.tmac
+.I \%@MACRODIR@/\:an\-old\:.tmac
 Most
 .I man
 macros are contained in this file.
@@ -3166,7 +3166,7 @@ It also loads the extensions from
 .
 .
 .TP
-.I \%@MACRODIR@/\:an\-ext.tmac
+.I \%@MACRODIR@/\:an\-ext\:.tmac
 The extension macro definitions for
 .BR .SY ,
 .BR .OP ,
@@ -3209,7 +3209,7 @@ implementations that may give up their scan for indexing 
material early.
 .
 .
 .TP
-.I \%@LOCALMACRODIR@/\:\%man.local
+.I \%@LOCALMACRODIR@/\:\%man\:\%.local
 Put local changes and customizations into this file.
 _ifstyle()dnl
 .
@@ -3238,7 +3238,7 @@ or to permit their override with a user-specific
 file.
 .
 One way to achieve the latter is by placing the following at the end of
-.IR @LOCALMACRODIR@/\:\%.man.local .
+.IR \%@LOCALMACRODIR@/\:\%man\:\%.local .
 .
 .RS
 .RS