[PATCH 26/32] Retire page-local `d` string.

[G. Branden Robinson]

A configure-generated script, edit_man.sh, already handles
parameterization of man page contents.  No additional layer of
indirection in the *roff language is necessary.

* man/infocmp.1m:
* man/infotocap.1m:
* man/ncurses.3x:
* man/term.5:
* man/term.7:
* man/terminfo.head:
* man/terminfo.tail:
* man/tic.1m:
* man/toe.1m:
* man/tput.1:
* man/tset.1: Do it.
---
 man/infocmp.1m    |  3 +--
 man/infotocap.1m  |  3 +--
 man/ncurses.3x    |  5 ++---
 man/term.5        |  9 ++++-----
 man/term.7        |  7 +++----
 man/terminfo.head |  3 +--
 man/terminfo.tail |  6 +++---
 man/tic.1m        | 11 +++++------
 man/toe.1m        |  3 +--
 man/tput.1        |  3 +--
 man/tset.1        |  3 +--
 11 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/man/infocmp.1m b/man/infocmp.1m
index 5f92c96dd..e765d4392 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -49,7 +49,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB@INFOCMP@\fP \-
 compare or print out \fIterminfo\fP descriptions
@@ -584,7 +583,7 @@ .SS "Other Options"
 using the \fB\-x\fP option of \fB@TIC@\fP.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH EXTENSIONS
 The
diff --git a/man/infotocap.1m b/man/infotocap.1m
index 0f0335d44..525791fa8 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@INFOTOCAP@\fP \-
 convert a \fI\%terminfo\fR description into a \fI\%termcap\fR description
@@ -78,7 +77,7 @@ .SH DESCRIPTION
 with this program and exits with a successful status.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 None of X/Open Curses,
diff --git a/man/ncurses.3x b/man/ncurses.3x
index edc8c3ed2..d7b14623f 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -54,7 +54,6 @@
 .  TP
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%ncurses\fP \-
 character-cell terminal interface with optimized output
@@ -388,7 +387,7 @@ .SS "Initialization"
 identifies.
 .I \%TERMINFO
 is useful for developing type descriptions or when write permission to
-.I \%\*d
+.I \%@TERMINFO@
 is not available.
 .PP
 See section \*(``ENVIRONMENT\*('' below.
@@ -1841,7 +1840,7 @@ .SH FILES
 .I @DATADIR@/tabset
 tab stop initialization database
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal capability database
 .SH NOTES
 X/Open Curses permits most functions it specifies to be made available
diff --git a/man/term.5 b/man/term.5
index cec231f55..12b50ffde 100644
--- a/man/term.5
+++ b/man/term.5
@@ -55,7 +55,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 term \-
 compiled \fIterminfo\fR terminal description
@@ -63,13 +62,13 @@ .SH SYNOPSIS
 .B term
 .SH DESCRIPTION
 .SS "Storage Location"
-Compiled terminfo descriptions are placed under the directory \fB\*d\fP.
+Compiled terminfo descriptions are placed under the directory \fB@TERMINFO@\fP.
 Two configurations are supported
 (when building the \fI\%ncurses\fP libraries):
 .TP 5
 .B directory tree
 A two-level scheme is used to avoid a linear search
-of a huge Unix system directory: \fB\*d/c/name\fP where
+of a huge Unix system directory: \fB@TERMINFO@/c/name\fP where
 .I name
 is the name of the terminal, and
 .I c
@@ -77,7 +76,7 @@ .SS "Storage Location"
 .IR name .
 Thus,
 .I act4
-can be found in the file \fB\*d/a/act4\fP.
+can be found in the file \fB@TERMINFO@/a/act4\fP.
 Synonyms for the same terminal are implemented by multiple
 links to the same compiled file.
 .TP 5
@@ -294,7 +293,7 @@ .SS "Extended Number Format"
 to provide data for the terminfo functions.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 .SS setupterm
diff --git a/man/term.7 b/man/term.7
index 84d100d84..ca4718f88 100644
--- a/man/term.7
+++ b/man/term.7
@@ -40,7 +40,6 @@
 .el   .ds '' ""
 .\}
 .
-.ds d @TERMINFO@
 .SH NAME
 term \-
 conventions for naming terminal types
@@ -83,7 +82,7 @@ .SH DESCRIPTION
 which you wish to override the system default type for your line.
 .PP
 Terminal type descriptions are stored as files of capability data underneath
-\*d.
+@TERMINFO@.
 To browse a list of all terminal names recognized by the system, do
 .sp
         @TOE@ | more
@@ -97,7 +96,7 @@ .SH DESCRIPTION
         @INFOCMP@ \fIentry_name\fP
 .sp
 where \fIentry_name\fP is the name of the type you wish to examine (and the
-name of its capability file the subdirectory of \*d named for its first
+name of its capability file the subdirectory of @TERMINFO@ named for its first
 letter).
 This command dumps a capability file in the text format described by
 \fBterminfo\fP(5).
@@ -221,7 +220,7 @@ .SH DESCRIPTION
 on the \fITERM\fP environment variable when no \-T option is specified.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .TP
 .I /etc/inittab
diff --git a/man/terminfo.head b/man/terminfo.head
index 717f849e2..29c970c96 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -51,12 +51,11 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%terminfo\fP \-
 terminal capability database
 .SH SYNOPSIS
-\*d/*/*
+@TERMINFO@/*/*
 .SH DESCRIPTION
 .I Terminfo
 is a database describing terminals,
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 4d6daa38b..69c05bdcd 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -277,14 +277,14 @@ as a list of colon-separated pathnames of terminal 
databases to be searched.
 .IP
 An empty pathname (i.e., if the variable begins or ends
 with a colon, or contains adjacent colons)
-is interpreted as the system location \fI\*d\fP.
+is interpreted as the system location \fI@TERMINFO@\fP.
 .bP
 Finally, \fI\%ncurses\fP searches these compiled-in locations:
 .RS
 .bP
 a list of directories (@TERMINFO_DIRS@), and
 .bP
-the system terminfo directory, \fI\*d\fP
+the system terminfo directory, \fI@TERMINFO@\fP
 .RE
 .PP
 The \fBTERMINFO\fP variable can contain a terminal description instead
@@ -2019,7 +2019,7 @@ The \-c (check) option also checks resolved (after tc
 expansion) lengths.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database directory
 .SH EXTENSIONS
 Searching for terminal descriptions in
diff --git a/man/tic.1m b/man/tic.1m
index 9c3181ed5..0b6cbde33 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -45,7 +45,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TIC@\fP \-
 compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR
@@ -109,7 +108,7 @@ .SH DESCRIPTION
 For a directory, this would be the \*(``terminfo\*('' leaf,
 versus a "terminfo.db" file.
 .PP
-The results are normally placed in the system terminfo database \fB\*d\fP.
+The results are normally placed in the system terminfo database 
\fB@TERMINFO@\fP.
 The compiled terminal description can be placed
 in a different terminfo database.
 There are two ways to achieve this:
@@ -119,7 +118,7 @@ .SH DESCRIPTION
 or by setting the variable \fI\%TERMINFO\fP
 in your shell environment to a valid database location.
 .bP
-Secondly, if \fB@TIC@\fP cannot write in \fI\*d\fP
+Secondly, if \fB@TIC@\fP cannot write in \fI@TERMINFO@\fP
 or the location specified using your \fI\%TERMINFO\fP variable,
 it looks for the directory \fI$HOME/.terminfo\fP
 (or hashed database \fI$HOME/.terminfo.db)\fP;
@@ -135,7 +134,7 @@ .SH DESCRIPTION
 .bP
 a compiled-in list of directories (@TERMINFO_DIRS@), and
 .bP
-the system terminfo database (\fI\*d\fP).
+the system terminfo database (\fI@TERMINFO@\fP).
 .PP
 The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(5)
 manual goes into further detail.
@@ -419,7 +418,7 @@ .SS Processing
 .PP
 When a \fBuse\fP=\fIentry\fP\-\fIname\fP field is discovered in a
 terminal entry currently being compiled, \fB@TIC@\fP reads in the binary
-from \fB\*d\fP to complete the entry.
+from \fB@TERMINFO@\fP to complete the entry.
 (Entries created from
 \fIfile\fP will be used first.
 \fB@TIC@\fP duplicates the capabilities in
@@ -443,7 +442,7 @@ .SS Processing
 and a warning message will be printed.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH NOTES
 There is some evidence that historic \fB@TIC@\fP implementations treated
diff --git a/man/toe.1m b/man/toe.1m
index c4eba848e..1977810f8 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -50,7 +50,6 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TOE@\fP \-
 list table of entries of \fIterminfo\fR terminal types
@@ -143,7 +142,7 @@ .SH OPTIONS
 with this program and exits with a successful status.
 .SH FILES
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 \fB\%@TOE@\fP is not provided by other implementations.
diff --git a/man/tput.1 b/man/tput.1
index eba073390..6572a39a9 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -45,7 +45,6 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP 
database
@@ -434,7 +433,7 @@ .SH FILES
 .I @DATADIR@/tabset
 tab stop initialization database
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database
 .SH PORTABILITY
 Over time
diff --git a/man/tset.1 b/man/tset.1
index 185227dcd..2f1271160 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -47,7 +47,6 @@
 .el    .IP \(bu 2
 ..
 .
-.ds d @TERMINFO@
 .SH NAME
 \fB\%@TSET@\fP,
 \fB\%@RESET@\fP \-
@@ -314,7 +313,7 @@ .SH FILES
 .I /etc/ttys
 system port name to terminal type mapping database (BSD versions only).
 .TP
-.I \*d
+.I @TERMINFO@
 compiled terminal description database directory
 .SH PORTABILITY
 Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
-- 
2.30.2

signature.asc
Description: PGP signature