[groff] 01/02: man pages: Stop using .TP for ersatz tables.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 0013a2e010a26f242925b33f8e66be83ebb23ef1
Author: G. Branden Robinson <address@hidden>
Date:   Mon Jun 18 01:30:23 2018 -0400

    man pages: Stop using .TP for ersatz tables.
    
    Remove gratuitous calculated indent setting and page-local macro ("Tp")
    often used to facilitate it.  The pages that use this trick do it as a
    way to simulate a 2-column table.
    
    This is a generalization of the fix to Savannah #53797, in which Bjarni
    Ingli Gislason noted one instance in refer(1).
    
    Impact on nroff output with 80 columns:
    
    man/groff_font.5:
    * All 3 items in the list of additional font file commands are
      consistently rendered with a hanging tag (before, none were).
    
    src/preproc/eqn/eqn.1:
    * Use a 2-column tbl(1) table to describe component types.  (Looks good
      in -Tpdf as well.)  I also recast some wording that confused me, after
      consulting src/preproc/eqn/text.cpp to check my understanding.
    
    src/preproc/refer/refer.1:
    * All items in the list of refer commends now have a hanging tag (some
      did before, but the overall indent was much farther to the right).
    * File paragraphs in the FILES section now have mixed hangs.
    
    src/roff/troff/troff.1:
    * Flag paragraphs in the OPTIONS section how have mixed hangs.
    
    src/utils/indxbib/indxbib.1:
    src/utils/lkbib/lkbib.1:
    src/utils/lookbib/lookbib.1:
    * File paragraphs in the FILES section now have mixed hangs.
    
    man/groff_font.5:
    src/devices/gropdf/gropdf.1:
    src/devices/grops/grops.1:
    src/preproc/grn/grn.1:
    src/preproc/pic/pic.1:
    src/utils/tfmtodit/tfmtodit.1:
    * No visible impact.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 man/groff_font.5.man              | 13 +------
 src/devices/grodvi/grodvi.1.man   |  9 +----
 src/devices/gropdf/gropdf.1.man   |  9 +----
 src/devices/grops/grops.1.man     |  9 +----
 src/preproc/eqn/eqn.1.man         | 75 ++++++++++++---------------------------
 src/preproc/grn/grn.1.man         | 13 +------
 src/preproc/pic/pic.1.man         |  9 +----
 src/preproc/refer/refer.1.man     | 16 ++-------
 src/roff/troff/troff.1.man        |  2 +-
 src/utils/afmtodit/afmtodit.1.man | 12 +------
 src/utils/indxbib/indxbib.1.man   |  2 +-
 src/utils/lkbib/lkbib.1.man       | 15 ++------
 src/utils/lookbib/lookbib.1.man   |  2 +-
 src/utils/tfmtodit/tfmtodit.1.man |  8 +----
 14 files changed, 39 insertions(+), 155 deletions(-)

diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index f4801ed..207ead4 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -22,22 +22,11 @@ groff_font \- format of groff device and font description 
files
 .\" <http://www.gnu.org/licenses/gpl-2.0.html>.
 .
 .
-.\" ====================================================================
-.\" Macro definitions
-.\" ====================================================================
-.
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
 .do nr groff_font_C \n[.C]
 .cp 0
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .\" ====================================================================
 .SH DESCRIPTION
 .\" ====================================================================
@@ -673,7 +662,7 @@ Most entries in kernpairs section have a negative value 
for\~\c
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'@FONTDIR@/devname/DESC'u+3n
+.TP
 .BI @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.1.man
index cbfef20..b0aed5e 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -29,13 +29,6 @@ grodvi \- convert groff output to TeX DVI format
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .el .ds tx TeX
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .de FT
 .  if '\\*(.T'dvi' .ft \\$1
 ..
@@ -140,7 +133,7 @@ can be created from tfm files using
 The font description file should contain the following
 additional commands:
 .
-.Tp \w'\fBinternalname'u+2n
+.TP
 .BI internalname\   name
 The name of the tfm file (without the
 .B .tfm
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index 86a4145..8b8f00e 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -28,13 +28,6 @@ gropdf \- PDF driver for groff
 .\" instead of in the original English.
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .de FT
 .  if '\\*(.T'ps' .ft \\$1
 .  if '\\*(.T'pdf' .ft \\$1
@@ -1273,7 +1266,7 @@ creation timestamp in place of the current time.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/devpdf/download'u+2n
+.TP
 .B @FONTDIR@/devpdf/DESC
 Device description file.
 .
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index 47f5da1..47ae546 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -28,13 +28,6 @@ grops \- PostScript driver for groff
 .\" instead of in the original English.
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .de FT
 .  if '\\*(.T'ps' .ft \\$1
 .  if '\\*(.T'pdf' .ft \\$1
@@ -1434,7 +1427,7 @@ creation timestamp in place of the current time.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/devps/download'u+2n
+.TP
 .B @FONTDIR@/devps/DESC
 Device description file.
 .
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index 22e66fe..707999b 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -1,3 +1,4 @@
+'\" t
 .TH @address@hidden @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @address@hidden \- format equations for troff or MathML
@@ -34,14 +35,6 @@
 .  ds tx TeX
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
-.
 .\" ====================================================================
 .SH SYNOPSIS
 .\" ====================================================================
@@ -310,49 +303,29 @@ If delimiters haven't been specified, the call has no 
effect.
 gives each component of an equation a type, and adjusts the spacing
 between components using that type.
 .
-Possible types are:
+Possible types are described in the table below.
 .
-.RS
-.TP \w'punctuation'u+2n
-ordinary
-an ordinary character such as \[oq]1\[cq] or
-.RI \[oq] x \[cq];
 .
-.TP
-operator
+.TS
+lB l.
+ordinary       T{
+an ordinary character such as \[oq]1\[cq] or
+.RI \[oq] x \[cq]
+T}
+operator       T{
 a large operator such as
 .ds Su \[oq]\s+5\(*S\s0\[cq]
 .if \n(.g .if !c\(*S .ds Su the summation operator
-\*(Su;
-.
-.TP
-binary
-a binary operator such as \[oq]\[pl]\[cq];
-.
-.TP
-relation
-a relation such as \[oq]=\[cq];
-.
-.TP
-opening
-a opening bracket such as \[oq](\[cq];
-.
-.TP
-closing
-a closing bracket such as \[oq])\[cq];
-.
-.TP
-punctuation
-a punctuation character such as \[oq],\[cq];
-.
-.TP
-inner
-a subformula contained within brackets;
-.
-.TP
-suppress spacing
-that suppresses automatic spacing adjustment.
-.RE
+\*(Su
+T}
+binary a binary operator such as \[oq]\[pl]\[cq]
+relation       a relation such as \[oq]=\[cq]
+opening        a opening bracket such as \[oq](\[cq]
+closing        a closing bracket such as \[oq])\[cq]
+punctuation    a punctuation character such as \[oq],\[cq]
+inner  a subformula contained within brackets
+suppress       a type that suppresses automatic spacing adjustment
+.TE
 .
 .
 .LP
@@ -834,10 +807,7 @@ Values are in units of hundredths of an em unless 
otherwise stated.
 These descriptions are intended to be expository rather than
 definitive.
 .
-.ie t \
-.  TP \w'\fBdefault_rule_thickness'u+2n
-.el \
-.  TP
+.TP
 .B minimum_size
 .B eqn
 doesn't set anything at a smaller point-size than this.
@@ -1289,7 +1259,7 @@ causes a character to be set in roman type.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/eqnrc'u+2n
+.TP
 .B @MACRODIR@/eqnrc
 Initialization file.
 .
@@ -1402,5 +1372,6 @@ This is allowed by the specification, but inefficient.
 .
 .\" Local Variables:
 .\" mode: nroff
+.\" tab-width: 12
 .\" End:
-.\" vim: set filetype=groff:
+.\" vim: set filetype=groff tabstop=12:
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 73ce2f4..cfca060 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -28,21 +28,10 @@
 .\" instead of in the original English.
 .
 .
-.\" ====================================================================
-.\" Definitons
-.\" ====================================================================
-.
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
 .do nr grn_C \n[.C]
 .cp 0
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .
 .\" ====================================================================
 .SH SYNOPSIS
@@ -769,7 +758,7 @@ cause problems if displayed on the
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'@FONTDIR@/devname/DESC'u+3n
+.TP
 .BI @FONTDIR@/dev name /DESC
 Device description file for device
 .IR name .
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 4e443f9..7c6c225 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -34,13 +34,6 @@
 .\" Definitions
 .\" ====================================================================
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.
 .ie t \{\
 .  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .  ds lx L\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\*(tx
@@ -1254,7 +1247,7 @@ package.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/pic.tmac'u+3n
+.TP
 .B
 @MACRODIR@/pic.tmac
 Example definitions of the
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.man
index 9adb212..19d0a4a 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -26,16 +26,6 @@
 .
 .
 .\" ====================================================================
-.\" Macro Definitions
-.\" ====================================================================
-.
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
-.\" ====================================================================
 .SH SYNOPSIS
 .\" ====================================================================
 .
@@ -844,7 +834,7 @@ is used for an arbitrary string;
 is used for the name of a file.
 .
 .
-.Tp \w'\fBabbreviate-label-ranges'u+2n
+.TP
 .BI abbreviate\*n\  fields\ string1\ string2\ string3\ string4
 Abbreviate the first names of
 .IR fields .
@@ -1717,7 +1707,7 @@ macro.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@'u+2n
+.TP
 .B @DEFAULT_INDEX@
 Default database.
 .
@@ -1740,7 +1730,7 @@ man page for details where such files are created.
 .SH ENVIRONMENT
 .\" ====================================================================
 .
-.Tp \w'\fBREFER'u+2n
+.TP
 .B REFER
 If set, overrides the default database.
 .
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 7a54a84..120a490 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -73,7 +73,7 @@ appropriate order and with the appropriate options.
 It is possible to have whitespace between a command-line option and
 its parameter.
 .
-.TP \w'\-dname=s'u+2n
+.TP
 .B \-a
 Generate an
 .SM ASCII
diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index c7c1b69..7ffce17 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -25,16 +25,6 @@ afmtodit \- create font files for use with groff \-Tps and 
\-Tpdf
 .
 .
 .\" ====================================================================
-.\" Definitions
-.
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
-.\" ====================================================================
 .SH SYNOPSIS
 .\" ====================================================================
 .
@@ -342,7 +332,7 @@ Don't use the built-in Adobe Glyph List.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/devps/download'u+2n
+.TP
 .B @FONTDIR@/devps/DESC
 Device description file.
 .
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.1.man
index 66aa17f..1dd1052 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -231,7 +231,7 @@ is 6.
 .SH FILES
 .\" ====================================================================
 .
-.TP \w'\fBindxbib\fIXXXXXX'u+2n
+.TP
 .IB filename @INDEX_SUFFIX@
 Index.
 .
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index 2d87d39..5e3e831 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -26,17 +26,6 @@ lkbib \- search bibliographic databases
 .
 .
 .\" ====================================================================
-.\" Definitions
-.\" ====================================================================
-.
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
-.\" ====================================================================
 .SH SYNOPSIS
 .\" ====================================================================
 .
@@ -129,7 +118,7 @@ is\~6.
 .SH ENVIRONMENT
 .\" ====================================================================
 .
-.TP \w'\fBREFER'u+2n
+.TP
 .SB REFER
 Default database.
 .
@@ -138,7 +127,7 @@ Default database.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@'u+2n
+.TP
 .B @DEFAULT_INDEX@
 Default database to be used if the
 .SB REFER
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.1.man
index 41c5200..7e4b232 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -98,7 +98,7 @@ is\~6.
 .SH FILES
 .\" ====================================================================
 .
-.TP \w'address@hidden@'u+2n
+.TP
 .IB filename @INDEX_SUFFIX@
 Index files.
 .
diff --git a/src/utils/tfmtodit/tfmtodit.1.man 
b/src/utils/tfmtodit/tfmtodit.1.man
index e2dd871..c6126c0 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -31,12 +31,6 @@ tfmtodit \- create font files for use with groff \-Tdvi
 .
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .el .ds tx TeX
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
 .
 .
 .\" ====================================================================
@@ -223,7 +217,7 @@ commands giving additional font metric information.
 .SH FILES
 .\" ====================================================================
 .
-.Tp \w'address@hidden@/devdvi/DESC'u+2n
+.TP
 .B @FONTDIR@/devdvi/DESC
 Device description file.
 .