reduce the man(7) global indentation from 7n to 5n, see man_term.c rev. 1.244

43 files changed, 582 insertions, 534 deletions

diff --git a/regress/roff/string/escape.out_ascii b/regress/roff/string/escape.out_ascii
index f7c64620..061dc5e0 100644
--- a/regress/roff/string/escape.out_ascii
+++ b/regress/roff/string/escape.out_ascii
@@ -1,27 +1,27 @@
 STRING-ESCAPE(1)            General Commands Manual           STRING-ESCAPE(1)
 
 NNAAMMEE
-       string-escape - preventing string interpolation
+     string-escape - preventing string interpolation
 
 DDEESSCCRRIIPPTTIIOONN
    NNoorrmmaall iinntteerrppoollaattiioonn
-       result: *[right]
+     result: *[right]
 
-       The above line must be "result: *[right]".
+     The above line must be "result: *[right]".
 
    IInntteerrvveenniinngg cchhaarraacctteerr
-       result: \*[right]
+     result: \*[right]
 
-       The above line must be "result: backslash*[right]", not "result: rong".
+     The above line must be "result: backslash*[right]", not "result: rong".
 
    EEssccaappeedd bbaacckkssllaasshh
-       result: \*[right]
+     result: \*[right]
 
-       The above line must be "result: backslash*[right]", not "result: rong".
+     The above line must be "result: backslash*[right]", not "result: rong".
 
    DDeellaayyeedd iinntteerrppoollaattiioonn
-       result: *[right]
+     result: *[right]
 
-       The above line must be "result: *[right]", not "result: wrong".
+     The above line must be "result: *[right]", not "result: wrong".
 
 OpenBSD                        December 3, 2010               STRING-ESCAPE(1)
diff --git a/regress/roff/string/infinite.out_ascii b/regress/roff/string/infinite.out_ascii
index fa8a47e9..d7a3946f 100644
--- a/regress/roff/string/infinite.out_ascii
+++ b/regress/roff/string/infinite.out_ascii
@@ -1,9 +1,9 @@
 STRING-INFINITE(1)          General Commands Manual         STRING-INFINITE(1)
 
 NNAAMMEE
-       string-infinite - endless recursion in string expansion
+     string-infinite - endless recursion in string expansion
 
 DDEESSCCRRIIPPTTIIOONN
-       Blow up, but still render following text correctly.
+     Blow up, but still render following text correctly.
 
 OpenBSD                        December 3, 2010             STRING-INFINITE(1)
diff --git a/regress/roff/string/std.out_ascii b/regress/roff/string/std.out_ascii
index 15bd38ae..f578e8a4 100644
--- a/regress/roff/string/std.out_ascii
+++ b/regress/roff/string/std.out_ascii
@@ -1,11 +1,11 @@
 STRING-STD(1)               General Commands Manual              STRING-STD(1)
 
 NNAAMMEE
-       string-std - expanding standard macros as strings
+     string-std - expanding standard macros as strings
 
 DDEESSCCRRIIPPTTIIOONN
-       expanding the DT macro as a string: >>><<<
+     expanding the DT macro as a string: >>><<<
 
-       the same after renaming it: >>><<<
+     the same after renaming it: >>><<<
 
 OpenBSD                          June 18, 2017                   STRING-STD(1)
diff --git a/regress/roff/string/undef.out_ascii b/regress/roff/string/undef.out_ascii
index 9adae29b..29e327ae 100644
--- a/regress/roff/string/undef.out_ascii
+++ b/regress/roff/string/undef.out_ascii
@@ -1,33 +1,33 @@
 STRING-UNDEF(1)             General Commands Manual            STRING-UNDEF(1)
 
 NNAAMMEE
-       string-undef - expanding undefined strings
+     string-undef - expanding undefined strings
 
 DDEESSCCRRIIPPTTIIOONN
    UUsseerr ddeeffiinneedd ssttrriinngg
-       The sting "mys" is undefined and remains undefined.
+     The sting "mys" is undefined and remains undefined.
 
-       Its value is "", and now it is defined, and its value is still "".
+     Its value is "", and now it is defined, and its value is still "".
 
-       After redefining it to "newval", it is of course still defined.
+     After redefining it to "newval", it is of course still defined.
 
-       After removing the definition, it is now undefined.
+     After removing the definition, it is now undefined.
 
    UUsseerr ddeeffiinneedd mmaaccrroo
-       The macro "mym" is undefined.
+     The macro "mym" is undefined.
 
-       It has no effect: But now it is defined.
+     It has no effect: But now it is defined.
 
-       After defining it as: neweffect it is of course still defined.
+     After defining it as: neweffect it is of course still defined.
 
-       After removing the definition, it is now undefined.
+     After removing the definition, it is now undefined.
 
    RReennaammeedd mmaaccrroo
-       The standard .BR macro is defined, and it wwoorrkkss.
+     The standard .BR macro is defined, and it wwoorrkkss.
 
-       After renaming it, the new name is defined, and wwoorrkkss.
+     After renaming it, the new name is defined, and wwoorrkkss.
 
    PPrreeddeeffiinneedd ssttrriinngg
-       A predefined string is defined and has the value "(R)".
+     A predefined string is defined and has the value "(R)".
 
 OpenBSD                          April 9, 2018                 STRING-UNDEF(1)
diff --git a/regress/roff/string/zerolength.out_ascii b/regress/roff/string/zerolength.out_ascii
index 116fd328..c829d2c2 100644
--- a/regress/roff/string/zerolength.out_ascii
+++ b/regress/roff/string/zerolength.out_ascii
@@ -1,11 +1,11 @@
 STRING-ZEROLENGTH(1)        General Commands Manual       STRING-ZEROLENGTH(1)
 
 NNAAMMEE
-       string-zerolength - handling of zero-length user-defined strings
+     string-zerolength - handling of zero-length user-defined strings
 
 DDEESSCCRRIIPPTTIIOONN
-       use zero-length string: xx x
+     use zero-length string: xx x
 
-       use zero-length macro: xx x
+     use zero-length macro: xx x
 
 OpenBSD                        December 19, 2010          STRING-ZEROLENGTH(1)
diff --git a/regress/roff/ta/basic-man.out_ascii b/regress/roff/ta/basic-man.out_ascii
index efc2fadb..b9d7fe5c 100644
--- a/regress/roff/ta/basic-man.out_ascii
+++ b/regress/roff/ta/basic-man.out_ascii
@@ -1,20 +1,20 @@
 TA-BASIC-MAN(1)             General Commands Manual            TA-BASIC-MAN(1)
 
 NNAAMMEE
-       ta-basic-man - setting tabstop positions in man(7)
+     ta-basic-man - setting tabstop positions in man(7)
 
 DDEESSCCRRIIPPTTIIOONN
-       default:
-       1    2    3
-       10n:
-       1         23
-       none:
-       123
-       3n +6n T 4n +2n:
-       1  2     3   4 5   6 7   8 9
-       default unit:
-       1  2   3    4
-       rounding:
-       1  2   3   4   5   6   7   8   9
+     default:
+     1    2    3
+     10n:
+     1         23
+     none:
+     123
+     3n +6n T 4n +2n:
+     1  2     3   4 5   6 7   8 9
+     default unit:
+     1  2   3    4
+     rounding:
+     1  2   3   4   5   6   7   8   9
 
 OpenBSD                           May 7, 2014                  TA-BASIC-MAN(1)
diff --git a/regress/roff/ti/basic-man.out_ascii b/regress/roff/ti/basic-man.out_ascii
index ebbae01e..e5e2a9e8 100644
--- a/regress/roff/ti/basic-man.out_ascii
+++ b/regress/roff/ti/basic-man.out_ascii
@@ -1,17 +1,17 @@
 TI-BASIC-MAN(1)             General Commands Manual            TI-BASIC-MAN(1)
 
 NNAAMMEE
-       ti-basic-man - temporary indentation in man(7)
+     ti-basic-man - temporary indentation in man(7)
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
+     initial text
           This text is indented.  However, the indent is temporary, so as soon
-       as the line wraps, it is gone.
-                 The temporary indent can be relative.  All the same, it will
-       expire in the usual way.
-    It is also possible to temporarily reduce the indentation, but that will
-       also last until the next line break only.
+     as the line wraps, it is gone.
+               The temporary indent can be relative.  All the same, it will
+     expire in the usual way.
+  It is also possible to temporarily reduce the indentation, but that will
+     also last until the next line break only.
 Reducing by more than the current offset starts the next line at the physical
-       left margin.
+     left margin.
 
 OpenBSD                           May 8, 2014                  TI-BASIC-MAN(1)
diff --git a/regress/roff/ti/wide.out_ascii b/regress/roff/ti/wide.out_ascii
index 1c21c514..5579acb4 100644
--- a/regress/roff/ti/wide.out_ascii
+++ b/regress/roff/ti/wide.out_ascii
@@ -1,18 +1,18 @@
 TI-WIDE(1)                  General Commands Manual                 TI-WIDE(1)
 
 NNAAMMEE
-       ti-wide - excessive temporary indentation
+     ti-wide - excessive temporary indentation
 
 DDEESSCCRRIIPPTTIIOONN
-       Absolute .ti of more than 72n:
+     Absolute .ti of more than 72n:
                                                                         max
-                                               Indented block plus excessive
-                                               relative indentation:
+                                             Indented block plus excessive
+                                             relative indentation:
                                                                         max
-                                                                         Block
-                                                                         beyond
-                                                                         72n:
-                                                                         same
-       Back to normal.
+                                                                       Block
+                                                                       beyond
+                                                                       72n:
+                                                                        same
+     Back to normal.
 
 OpenBSD                        September 3, 2020                    TI-WIDE(1)
diff --git a/regress/roff/tr/args.out_ascii b/regress/roff/tr/args.out_ascii
index 9251d58d..b59041b7 100644
--- a/regress/roff/tr/args.out_ascii
+++ b/regress/roff/tr/args.out_ascii
@@ -1,10 +1,10 @@
 TR-BASIC(1)                 General Commands Manual                TR-BASIC(1)
 
 NNAAMMEE
-       tr-args - arguments of the tr request
+     tr-args - arguments of the tr request
 
 DDEESSCCRRIIPPTTIIOONN
-       no argument: one character: >> << two characters: >>y<< three
-       characters: >>y << last line
+     no argument: one character: >> << two characters: >>y<< three characters:
+     >>y << last line
 
 OpenBSD                        February 6, 2015                    TR-BASIC(1)
diff --git a/regress/tbl/data/blankline.out_ascii b/regress/tbl/data/blankline.out_ascii
index 6d0f5367..86a42707 100644
--- a/regress/tbl/data/blankline.out_ascii
+++ b/regress/tbl/data/blankline.out_ascii
@@ -1,13 +1,13 @@
 TBL-DATA-BLANKLINE(1)       General Commands Manual      TBL-DATA-BLANKLINE(1)
 
 NNAAMMEE
-       tbl-data-blankline - blank line in a table
+     tbl-data-blankline - blank line in a table
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       ffiirrsstt
+     normal text
+     ffiirrsstt
 
-       llaasstt
-       normal text
+     llaasstt
+     normal text
 
 OpenBSD                        January 21, 2015          TBL-DATA-BLANKLINE(1)
diff --git a/regress/tbl/data/block_empty.out_ascii b/regress/tbl/data/block_empty.out_ascii
index 9af10af9..30e53867 100644
--- a/regress/tbl/data/block_empty.out_ascii
+++ b/regress/tbl/data/block_empty.out_ascii
@@ -1,17 +1,17 @@
 TBL-DATA-BLOCK_EMPTY(1)     General Commands Manual    TBL-DATA-BLOCK_EMPTY(1)
 
 NNAAMMEE
-       tbl-data-block_empty - empty text block
+     tbl-data-block_empty - empty text block
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +------+------+
-       |A     | test |
-       +------+------+
-       |table |      |
-       +------+------+
+     normal text
+     +------+------+
+     |A     | test |
+     +------+------+
+     |table |      |
+     +------+------+
 
 AAUUTTHHOORRSS
-       Eygene Ryabinkin <rea@FreeBSD.org>
+     Eygene Ryabinkin <rea@FreeBSD.org>
 
 OpenBSD                          July 17, 2019         TBL-DATA-BLOCK_EMPTY(1)
diff --git a/regress/tbl/data/block_unclosed.out_ascii b/regress/tbl/data/block_unclosed.out_ascii
index f083beb1..e7ae56b5 100644
--- a/regress/tbl/data/block_unclosed.out_ascii
+++ b/regress/tbl/data/block_unclosed.out_ascii
@@ -1,21 +1,21 @@
 TBL-DATA-BLOCK_UNCLOSED(1)  General Commands Manual TBL-DATA-BLOCK_UNCLOSED(1)
 
 NNAAMMEE
-       tbl-data-block_unclosed - unclosed text block
+     tbl-data-block_unclosed - unclosed text block
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--------------------------+
-       |begin        middle   end |
-       |begin        middle   end |
-       |incomplete   block        |
-       +--------------------------+
-       normal text
-       +----------------------------+
-       |begin        middle   end   |
-       |incomplete   block          |
-       |     reset    still   works |
-       +----------------------------+
-       normal text
+     normal text
+     +--------------------------+
+     |begin        middle   end |
+     |begin        middle   end |
+     |incomplete   block        |
+     +--------------------------+
+     normal text
+     +----------------------------+
+     |begin        middle   end   |
+     |incomplete   block          |
+     |     reset    still   works |
+     +----------------------------+
+     normal text
 
 OpenBSD                        January 28, 2015     TBL-DATA-BLOCK_UNCLOSED(1)
diff --git a/regress/tbl/data/empty.out_ascii b/regress/tbl/data/empty.out_ascii
index aaf8f8e8..69b47b67 100644
--- a/regress/tbl/data/empty.out_ascii
+++ b/regress/tbl/data/empty.out_ascii
@@ -1,11 +1,11 @@
 TBL-DATA-EMPTY(1)           General Commands Manual          TBL-DATA-EMPTY(1)
 
 NNAAMMEE
-       tbl-data-empty - empty table
+     tbl-data-empty - empty table
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
+     normal text
 
-       normal text
+     normal text
 
 OpenBSD                        January 28, 2015              TBL-DATA-EMPTY(1)
diff --git a/regress/tbl/data/escz.out_ascii b/regress/tbl/data/escz.out_ascii
index a9f08ded..a6c176b1 100644
--- a/regress/tbl/data/escz.out_ascii
+++ b/regress/tbl/data/escz.out_ascii
@@ -1,13 +1,13 @@
 TBL-DATA-ESCZ(1)            General Commands Manual           TBL-DATA-ESCZ(1)
 
 NNAAMMEE
-       tbl-data-escz - non-advancing glyph at the end of a tbl(7) cell
+     tbl-data-escz - non-advancing glyph at the end of a tbl(7) cell
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
-       a   b
-       cd  e
+     initial text
+     a   b
+     cd  e
 
-       final text
+     final text
 
 OpenBSD                         April 26, 2022                TBL-DATA-ESCZ(1)
diff --git a/regress/tbl/data/escz_end.out_ascii b/regress/tbl/data/escz_end.out_ascii
index e9851d06..1d68b617 100644
--- a/regress/tbl/data/escz_end.out_ascii
+++ b/regress/tbl/data/escz_end.out_ascii
@@ -1,13 +1,13 @@
 TBL-DATA-ESCZ_END(1)        General Commands Manual       TBL-DATA-ESCZ_END(1)
 
 NNAAMMEE
-       tbl-data-escz_end - z escape sequence at the end of a tbl(7) cell
+     tbl-data-escz_end - z escape sequence at the end of a tbl(7) cell
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
-       a   b   c
-       d   e   f
+     initial text
+     a   b   c
+     d   e   f
 
-       final text
+     final text
 
 OpenBSD                         April 26, 2022            TBL-DATA-ESCZ_END(1)
diff --git a/regress/tbl/data/insert.out_ascii b/regress/tbl/data/insert.out_ascii
index d1b5e66c..2e6e8225 100644
--- a/regress/tbl/data/insert.out_ascii
+++ b/regress/tbl/data/insert.out_ascii
@@ -1,17 +1,17 @@
 TBL-DATA-INSERT(1)          General Commands Manual         TBL-DATA-INSERT(1)
 
 NNAAMMEE
-       tbl-data-insert - insertion of empty spans for line-only layout rows
+     tbl-data-insert - insertion of empty spans for line-only layout rows
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
-       -----------------------
-       colum one   column two
-       -----------------------
-       left             right
-       -----------
-           right   left
+     initial text
+     -----------------------
+     colum one   column two
+     -----------------------
+     left             right
+     -----------
+         right   left
 
-       final text
+     final text
 
 OpenBSD                          July 4, 2017               TBL-DATA-INSERT(1)
diff --git a/regress/tbl/layout/badspan.out_ascii b/regress/tbl/layout/badspan.out_ascii
index 07697726..45918580 100644
--- a/regress/tbl/layout/badspan.out_ascii
+++ b/regress/tbl/layout/badspan.out_ascii
@@ -1,14 +1,14 @@
 TBL-LAYOUT-BADSPAN(1)       General Commands Manual      TBL-LAYOUT-BADSPAN(1)
 
 NNAAMMEE
-       tbl-layout-badspan - invalid spanned cells
+     tbl-layout-badspan - invalid spanned cells
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--+-----------+-----+---+
-       |  | span      | end |   |
-       +--+---+---+---+-----+---+
-       |1 | 2 | 3 | 4 | 5   | 6 |
-       +--+---+---+---+-----+---+
+     normal text
+     +--+-----------+-----+---+
+     |  | span      | end |   |
+     +--+---+---+---+-----+---+
+     |1 | 2 | 3 | 4 | 5   | 6 |
+     +--+---+---+---+-----+---+
 
 OpenBSD                        January 11, 2020          TBL-LAYOUT-BADSPAN(1)
diff --git a/regress/tbl/layout/center.out_ascii b/regress/tbl/layout/center.out_ascii
index 52185064..31d8709a 100644
--- a/regress/tbl/layout/center.out_ascii
+++ b/regress/tbl/layout/center.out_ascii
@@ -1,20 +1,20 @@
 TBL-LAYOUT-CENTER(1)        General Commands Manual       TBL-LAYOUT-CENTER(1)
 
 NNAAMMEE
-       tbl-layout-center - centering of table cells
+     tbl-layout-center - centering of table cells
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-           *     *     *
-          **    **     **
-         ***    ***    ***
-            ***        ***
-         ***        ***
-         ***    ***    ***
-        ****   ****    ****
-       *****   *****   *****
+     normal text
+         *     *     *
+        **    **     **
+       ***    ***    ***
+          ***        ***
+       ***        ***
+       ***    ***    ***
+      ****   ****    ****
+     *****   *****   *****
 
-       leaked tab settings:
-       a    b    c    de
+     leaked tab settings:
+     a    b    c    de
 
 OpenBSD                          June 17, 2017            TBL-LAYOUT-CENTER(1)
diff --git a/regress/tbl/layout/complex.out_ascii b/regress/tbl/layout/complex.out_ascii
index d191ea0c..c9937844 100644
--- a/regress/tbl/layout/complex.out_ascii
+++ b/regress/tbl/layout/complex.out_ascii
@@ -1,30 +1,30 @@
 TBL-LAYOUT-COMPLEX(1)       General Commands Manual      TBL-LAYOUT-COMPLEX(1)
 
 NNAAMMEE
-       tbl-layout-complex - complex table layout
+     tbl-layout-complex - complex table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--+-----------++--+
-       |a | bb       c ||d |
-       |e | _f   gg     ||i |
-       +--+-----------++--+
+     normal text
+     +--+-----------++--+
+     |a | bb       c ||d |
+     |e | _f   gg     ||i |
+     +--+-----------++--+
 
-       normal text
-       +------+
-       |a     |
-       |c   d |
-       +------+
+     normal text
+     +------+
+     |a     |
+     |c   d |
+     +------+
 
-       normal text
-       +--++--+
-       |a ||b |
-       +--++--+
-       |c | d |
-       +--+---+
-        e   f
-       --------
+     normal text
+     +--++--+
+     |a ||b |
+     +--++--+
+     |c | d |
+     +--+---+
+      e   f
+     --------
 
-       normal text
+     normal text
 
 OpenBSD                        January 26, 2015          TBL-LAYOUT-COMPLEX(1)
diff --git a/regress/tbl/layout/empty.out_ascii b/regress/tbl/layout/empty.out_ascii
index cc81eeac..f72d91ef 100644
--- a/regress/tbl/layout/empty.out_ascii
+++ b/regress/tbl/layout/empty.out_ascii
@@ -1,13 +1,13 @@
 TBL-LAYOUT-EMPTY(1)         General Commands Manual        TBL-LAYOUT-EMPTY(1)
 
 NNAAMMEE
-       tbl-layout-empty - empty table layout
+     tbl-layout-empty - empty table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       completely empty layout:
-       table text
-       layout only contains a bar:
-       |table text
-       normal text
+     completely empty layout:
+     table text
+     layout only contains a bar:
+     |table text
+     normal text
 
 OpenBSD                        January 29, 2015            TBL-LAYOUT-EMPTY(1)
diff --git a/regress/tbl/layout/emptycol.out_ascii b/regress/tbl/layout/emptycol.out_ascii
index e6ec5b86..f9025bcc 100644
--- a/regress/tbl/layout/emptycol.out_ascii
+++ b/regress/tbl/layout/emptycol.out_ascii
@@ -1,42 +1,42 @@
 TBL-LAYOUT-EMPTYCOL(1)      General Commands Manual     TBL-LAYOUT-EMPTYCOL(1)
 
 NNAAMMEE
-       tbl-layout-emptycol - empty columns in tables
+     tbl-layout-emptycol - empty columns in tables
 
 DDEESSCCRRIIPPTTIIOONN
-       missing final column:
-       +--+---+---+
-       |1 | 2 |   |
-       +--+---+---+
-       |a | b |   |
-       +--+---+---+
+     missing final column:
+     +--+---+---+
+     |1 | 2 |   |
+     +--+---+---+
+     |a | b |   |
+     +--+---+---+
 
-       empty final column:
-       +--+---+---+
-       |1 | 2 |   |
-       +--+---+---+
-       |a | b |   |
-       +--+---+---+
+     empty final column:
+     +--+---+---+
+     |1 | 2 |   |
+     +--+---+---+
+     |a | b |   |
+     +--+---+---+
 
-       final column with zero-width content:
-       +--+---+---+
-       |1 | 2 |   |
-       +--+---+---+
-       |a | b |   |
-       +--+---+---+
+     final column with zero-width content:
+     +--+---+---+
+     |1 | 2 |   |
+     +--+---+---+
+     |a | b |   |
+     +--+---+---+
 
-       empty middle column:
-       +--+---+---+
-       |1 |   | 3 |
-       +--+---+---+
-       |a |   |   |
-       +--+---+---+
+     empty middle column:
+     +--+---+---+
+     |1 |   | 3 |
+     +--+---+---+
+     |a |   |   |
+     +--+---+---+
 
-       span crossing empty middle column:
-       +--+---+---+
-       |1 |   | 3 |
-       +--+---+---+
-       |span      |
-       +----------+
+     span crossing empty middle column:
+     +--+---+---+
+     |1 |   | 3 |
+     +--+---+---+
+     |span      |
+     +----------+
 
 OpenBSD                        December 31, 2019        TBL-LAYOUT-EMPTYCOL(1)
diff --git a/regress/tbl/layout/emptyline.out_ascii b/regress/tbl/layout/emptyline.out_ascii
index d8f156dd..d1d51df5 100644
--- a/regress/tbl/layout/emptyline.out_ascii
+++ b/regress/tbl/layout/emptyline.out_ascii
@@ -1,18 +1,18 @@
 TBL-LAYOUT-EMPTYLINE(1)     General Commands Manual    TBL-LAYOUT-EMPTYLINE(1)
 
 NNAAMMEE
-       tbl-layout-emptyline - empty lines in table layouts
+     tbl-layout-emptyline - empty lines in table layouts
 
 DDEESSCCRRIIPPTTIIOONN
-       An empty line in the middle of a table joins with the next:
-        table text
-       +-----------
-       |       bar
-       |     right
+     An empty line in the middle of a table joins with the next:
+      table text
+     +-----------
+     |       bar
+     |     right
 
-       An empty line at the end of a table is discarded:
-       table text
-            right
-       normal text
+     An empty line at the end of a table is discarded:
+     table text
+          right
+     normal text
 
 OpenBSD                        January 29, 2015        TBL-LAYOUT-EMPTYLINE(1)
diff --git a/regress/tbl/layout/font.out_ascii b/regress/tbl/layout/font.out_ascii
index b0c2c9e2..cd63b23d 100644
--- a/regress/tbl/layout/font.out_ascii
+++ b/regress/tbl/layout/font.out_ascii
@@ -1,16 +1,16 @@
 TBL-LAYOUT-FONT(1)          General Commands Manual         TBL-LAYOUT-FONT(1)
 
 NNAAMMEE
-       tbl-layout-font - font modifiers in the table layout
+     tbl-layout-font - font modifiers in the table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       BEGINTEST
-       +---------------+
-       |bboolldd     roman |
-       +---------------+
-       |roman   _i_t_a_l_i_c |
-       +---------------+
+     BEGINTEST
+     +---------------+
+     |bboolldd     roman |
+     +---------------+
+     |roman   _i_t_a_l_i_c |
+     +---------------+
 
-       ENDTEST
+     ENDTEST
 
 OpenBSD                          May 16, 2021               TBL-LAYOUT-FONT(1)
diff --git a/regress/tbl/layout/numbers.out_ascii b/regress/tbl/layout/numbers.out_ascii
index 10f71e62..607830bd 100644
--- a/regress/tbl/layout/numbers.out_ascii
+++ b/regress/tbl/layout/numbers.out_ascii
@@ -1,14 +1,14 @@
 TBL-LAYOUT-NUMBERS(1)       General Commands Manual      TBL-LAYOUT-NUMBERS(1)
 
 NNAAMMEE
-       tbl-layout-numbers - alignment of numbers in tables
+     tbl-layout-numbers - alignment of numbers in tables
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +---++-------+--------+
-       | 1 ||  1.00 | +42.0  |
-       +---++-------+--------+
-       |10 ||-10.0  |   3.14 |
-       +---++-------+--------+
+     normal text
+     +---++-------+--------+
+     | 1 ||  1.00 | +42.0  |
+     +---++-------+--------+
+     |10 ||-10.0  |   3.14 |
+     +---++-------+--------+
 
 OpenBSD                        January 29, 2017          TBL-LAYOUT-NUMBERS(1)
diff --git a/regress/tbl/layout/shortlines.out_ascii b/regress/tbl/layout/shortlines.out_ascii
index fa5b6fc9..c9baa7a7 100644
--- a/regress/tbl/layout/shortlines.out_ascii
+++ b/regress/tbl/layout/shortlines.out_ascii
@@ -1,42 +1,42 @@
 TBL-LAYOUT-SHORTLINES(1)    General Commands Manual   TBL-LAYOUT-SHORTLINES(1)
 
 NNAAMMEE
-       tbl-layout-shortlines - table lines of different length
+     tbl-layout-shortlines - table lines of different length
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +------+-------+
-       |left  | right |
-       +------+-------+
-       |short |       |
-       +------+-------+
-       |left  | right |
-       +------+-------+
+     normal text
+     +------+-------+
+     |left  | right |
+     +------+-------+
+     |short |       |
+     +------+-------+
+     |left  | right |
+     +------+-------+
 
-       +-------------+-------+
-       |left         | right |
-       +-------------+-------+
-       |first short  |       |
-       +-------------+-------+
-       |second short |       |
-       +-------------+-------+
-       |left         | right |
-       +-------------+-------+
+     +-------------+-------+
+     |left         | right |
+     +-------------+-------+
+     |first short  |       |
+     +-------------+-------+
+     |second short |       |
+     +-------------+-------+
+     |left         | right |
+     +-------------+-------+
 
-       +-----------+--------+-------+
-       |left       | middle | right |
-       +-----------+--------+-------+
-       |short      | line   |       |
-       +-----------+--------+-------+
-       |very short |        |       |
-       +-----------+--------+-------+
+     +-----------+--------+-------+
+     |left       | middle | right |
+     +-----------+--------+-------+
+     |short      | line   |       |
+     +-----------+--------+-------+
+     |very short |        |       |
+     +-----------+--------+-------+
 
-       +-----------+--------+-------+
-       |very short |        |       |
-       +-----------+--------+-------+
-       |short      | line   |       |
-       +-----------+--------+-------+
-       |left       | middle | right |
-       +-----------+--------+-------+
+     +-----------+--------+-------+
+     |very short |        |       |
+     +-----------+--------+-------+
+     |short      | line   |       |
+     +-----------+--------+-------+
+     |left       | middle | right |
+     +-----------+--------+-------+
 
 OpenBSD                        January 11, 2020       TBL-LAYOUT-SHORTLINES(1)
diff --git a/regress/tbl/layout/spacing-nogroff.out_ascii b/regress/tbl/layout/spacing-nogroff.out_ascii
index d5ed47b3..82922c38 100644
--- a/regress/tbl/layout/spacing-nogroff.out_ascii
+++ b/regress/tbl/layout/spacing-nogroff.out_ascii
@@ -1,14 +1,14 @@
 TBL-LAYOUT-SPACING(1)       General Commands Manual      TBL-LAYOUT-SPACING(1)
 
 NNAAMMEE
-       tbl-layout-spacing-nogroff - excessive spacing modifier
+     tbl-layout-spacing-nogroff - excessive spacing modifier
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
-       +------+
-       |a   b |
-       +------+
+     initial text
+     +------+
+     |a   b |
+     +------+
 
-       final text
+     final text
 
 OpenBSD                        September 1, 2020         TBL-LAYOUT-SPACING(1)
diff --git a/regress/tbl/layout/spacing.out_ascii b/regress/tbl/layout/spacing.out_ascii
index 36b60859..233e527b 100644
--- a/regress/tbl/layout/spacing.out_ascii
+++ b/regress/tbl/layout/spacing.out_ascii
@@ -1,35 +1,35 @@
 TBL-LAYOUT-SPACING(1)       General Commands Manual      TBL-LAYOUT-SPACING(1)
 
 NNAAMMEE
-       tbl-layout-spacing - spacing modifiers
+     tbl-layout-spacing - spacing modifiers
 
 DDEESSCCRRIIPPTTIIOONN
-       default spacing:
-       +------+
-       |a   b |
-       +------+
-
-       spacing 0:
-       +---+
-       |ab |
-       +---+
-
-       spacing 1:
-       +----+
-       |a b |
-       +----+
-
-       spacing 2:
-       +--+--+
-       |a |b |
-       +--+--+
-
-       spacing 5:
-       +---++---+
-       |a  || b |
-       +---++---+
-
-       leaked tab settings:
-       a    b    c    d    e    f
+     default spacing:
+     +------+
+     |a   b |
+     +------+
+
+     spacing 0:
+     +---+
+     |ab |
+     +---+
+
+     spacing 1:
+     +----+
+     |a b |
+     +----+
+
+     spacing 2:
+     +--+--+
+     |a |b |
+     +--+--+
+
+     spacing 5:
+     +---++---+
+     |a  || b |
+     +---++---+
+
+     leaked tab settings:
+     a    b    c    d    e    f
 
 OpenBSD                        September 1, 2020         TBL-LAYOUT-SPACING(1)
diff --git a/regress/tbl/layout/span.out_ascii b/regress/tbl/layout/span.out_ascii
index 1b948cc2..e0d03b2b 100644
--- a/regress/tbl/layout/span.out_ascii
+++ b/regress/tbl/layout/span.out_ascii
@@ -1,48 +1,48 @@
 TBL-LAYOUT-SPAN(1)          General Commands Manual         TBL-LAYOUT-SPAN(1)
 
 NNAAMMEE
-       tbl-layout-span - alignment of spanned cells
+     tbl-layout-span - alignment of spanned cells
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--------------+
-       |a   b   c   d |
-       |s       c   d |
-       |a   s       d |
-       |a   b   s     |
-       +--------------+
-
-       +--------------+
-       |a   b   c   d |
-       |  s     c   d |
-       |a     s     d |
-       |a   b     s   |
-       +--------------+
-
-       +--------------+
-       |a   b   c   d |
-       |    s   c   d |
-       |a       s   d |
-       |a   b       s |
-       +--------------+
-
-       +--+---+---+---+---+
-       |a | b | c | d | e |
-       +--+---+---+---+---+
-       |   s1     |  s2   |
-       +--+---+---+---+---+
-       |a | b | c | d | e |
-       +--+---+---+---+---+
-
-       +----------+
-       |x***nnnnn |
-       +--+-------+
-       |a |  0.01 |
-       +--+-------+
-       |b | 10.0  |
-       +--+-------+
-
-       leaked tab settings:
-       a    b    c    d    e    f
+     normal text
+     +--------------+
+     |a   b   c   d |
+     |s       c   d |
+     |a   s       d |
+     |a   b   s     |
+     +--------------+
+
+     +--------------+
+     |a   b   c   d |
+     |  s     c   d |
+     |a     s     d |
+     |a   b     s   |
+     +--------------+
+
+     +--------------+
+     |a   b   c   d |
+     |    s   c   d |
+     |a       s   d |
+     |a   b       s |
+     +--------------+
+
+     +--+---+---+---+---+
+     |a | b | c | d | e |
+     +--+---+---+---+---+
+     |   s1     |  s2   |
+     +--+---+---+---+---+
+     |a | b | c | d | e |
+     +--+---+---+---+---+
+
+     +----------+
+     |x***nnnnn |
+     +--+-------+
+     |a |  0.01 |
+     +--+-------+
+     |b | 10.0  |
+     +--+-------+
+
+     leaked tab settings:
+     a    b    c    d    e    f
 
 OpenBSD                        September 7, 2021            TBL-LAYOUT-SPAN(1)
diff --git a/regress/tbl/macro/man.out_ascii b/regress/tbl/macro/man.out_ascii
index 588c6b58..2603499f 100644
--- a/regress/tbl/macro/man.out_ascii
+++ b/regress/tbl/macro/man.out_ascii
@@ -1,16 +1,16 @@
 TBL-MACRO-MAN(1)            General Commands Manual           TBL-MACRO-MAN(1)
 
 NNAAMMEE
-       tbl-macro-man - man macro in a table
+     tbl-macro-man - man macro in a table
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--+---+
-       |a | b |
-       +--+---+
-       |c | d |
-       +--+---+
+     normal text
+     +--+---+
+     |a | b |
+     +--+---+
+     |c | d |
+     +--+---+
 
-       normal text
+     normal text
 
 OpenBSD                        December 16, 2014              TBL-MACRO-MAN(1)
diff --git a/regress/tbl/macro/nested.out_ascii b/regress/tbl/macro/nested.out_ascii
index f96e8aa9..cf314105 100644
--- a/regress/tbl/macro/nested.out_ascii
+++ b/regress/tbl/macro/nested.out_ascii
@@ -1,17 +1,17 @@
 TBL-MACRO-NESTED(1)         General Commands Manual        TBL-MACRO-NESTED(1)
 
 NNAAMMEE
-       tbl-macro-nested - nested table
+     tbl-macro-nested - nested table
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--+---+
-       |a | b |
-       +--+---+
-       |c | d |
-       |e | f |
-       +--+---+
+     normal text
+     +--+---+
+     |a | b |
+     +--+---+
+     |c | d |
+     |e | f |
+     +--+---+
 
-       normal text
+     normal text
 
 OpenBSD                        December 16, 2014           TBL-MACRO-NESTED(1)
diff --git a/regress/tbl/macro/req.out_ascii b/regress/tbl/macro/req.out_ascii
index 67b7c98d..82425e73 100644
--- a/regress/tbl/macro/req.out_ascii
+++ b/regress/tbl/macro/req.out_ascii
@@ -1,18 +1,18 @@
 TBL-MACRO-REQ(1)            General Commands Manual           TBL-MACRO-REQ(1)
 
 NNAAMMEE
-       tbl-macro-req - requests generating nodes in a table
+     tbl-macro-req - requests generating nodes in a table
 
 DDEESSCCRRIIPPTTIIOONN
-       initial text
-       +--+-----+
-       |a | b   |
-       +--+-----+
-       |c | d e |
-       |f | g h |
-       |i | j k |
-       +--+-----+
+     initial text
+     +--+-----+
+     |a | b   |
+     +--+-----+
+     |c | d e |
+     |f | g h |
+     |i | j k |
+     +--+-----+
 
-       final text
+     final text
 
 OpenBSD                         April 30, 2022                TBL-MACRO-REQ(1)
diff --git a/regress/tbl/mod/badfont.out_ascii b/regress/tbl/mod/badfont.out_ascii
index 4bbdf970..8e8e5fa1 100644
--- a/regress/tbl/mod/badfont.out_ascii
+++ b/regress/tbl/mod/badfont.out_ascii
@@ -1,15 +1,15 @@
 TBL-MOD-BADFONT(1)          General Commands Manual         TBL-MOD-BADFONT(1)
 
 NNAAMMEE
-       tbl-mod-badfont - invalid font modifiers in table layouts
+     tbl-mod-badfont - invalid font modifiers in table layouts
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +-------------------+
-       |_i_t_a_l_i_c   one char  |
-       |bboolldd     two chars |
-       |_i_t_a_l_i_c   dot       |
-       |bboolldd     _i_t_a_l_i_c    |
-       +-------------------+
+     normal text
+     +-------------------+
+     |_i_t_a_l_i_c   one char  |
+     |bboolldd     two chars |
+     |_i_t_a_l_i_c   dot       |
+     |bboolldd     _i_t_a_l_i_c    |
+     +-------------------+
 
 OpenBSD                         August 9, 2021              TBL-MOD-BADFONT(1)
diff --git a/regress/tbl/mod/expand-toowide.out_ascii b/regress/tbl/mod/expand-toowide.out_ascii
index bec923c3..9b33bcc5 100644
--- a/regress/tbl/mod/expand-toowide.out_ascii
+++ b/regress/tbl/mod/expand-toowide.out_ascii
@@ -1,18 +1,17 @@
 TBL-MOD-EXPAND-TOOWIDE(1)   General Commands Manual  TBL-MOD-EXPAND-TOOWIDE(1)
 
 NNAAMMEE
-       tbl-mod-expand-toowide - try to expand columns in a table that is
-       already too wide
+     tbl-mod-expand-toowide - try to expand columns in a table that is already
+     too wide
 
 DDEESSCCRRIIPPTTIIOONN
-       In this
-       section, the
-       line length
-       is limited to
-       20
-       characters.
-       x   1234567890   x
+     In this
+     section, the
+     line length is
+     limited to 20
+     characters.
+     x   1234567890   x
 
-       Now we are back to the default terminal width.
+     Now we are back to the default terminal width.
 
 OpenBSD                           May 1, 2017        TBL-MOD-EXPAND-TOOWIDE(1)
diff --git a/regress/tbl/mod/expand.out_ascii b/regress/tbl/mod/expand.out_ascii
index 22407e1f..a634c7a3 100644
--- a/regress/tbl/mod/expand.out_ascii
+++ b/regress/tbl/mod/expand.out_ascii
@@ -1,56 +1,56 @@
 TBL-MOD-EXPAND(1)           General Commands Manual          TBL-MOD-EXPAND(1)
 
 NNAAMMEE
-       tbl-mod-expand - expand modifier in table layout
+     tbl-mod-expand - expand modifier in table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       x   x   123456789012345678901234567890123456789012345678901234567890123
-       x   x    12345678901234567890123456789012345678901234567890123456789012
-       x    x    1234567890123456789012345678901234567890123456789012345678901
-       x    x     123456789012345678901234567890123456789012345678901234567890
-       x   x   x   12345678901234567890123456789012345678901234567890123456789
-       x   x    x   1234567890123456789012345678901234567890123456789012345678
-       x    x   x    123456789012345678901234567890123456789012345678901234567
-       x    x    x    12345678901234567890123456789012345678901234567890123456
-       x   x   x   x   1234567890123456789012345678901234567890123456789012345
-       x   x   x    x   123456789012345678901234567890123456789012345678901234
-       x   x    x   x    12345678901234567890123456789012345678901234567890123
-       x    x   x    x    1234567890123456789012345678901234567890123456789012
-       x   x   x   x   x   123456789012345678901234567890123456789012345678901
-       x   x   x   x    x   12345678901234567890123456789012345678901234567890
-       x   x    x   x   x    1234567890123456789012345678901234567890123456789
-       x    x   x    x   x    123456789012345678901234567890123456789012345678
-       x    x    x   x    x    12345678901234567890123456789012345678901234567
-       x   x   x   x    x   x   1234567890123456789012345678901234567890123456
-       x   x    x   x   x    x   123456789012345678901234567890123456789012345
-       x   x    x   x    x   x    12345678901234567890123456789012345678901234
-       x    x   x    x    x   x    1234567890123456789012345678901234567890123
-       x    x    x   x    x    x    123456789012345678901234567890123456789012
-       x   123456789012345678901234567890123456789012345678901234567890123   x
-       x   12345678901234567890123456789012345678901234567890123456789012    x
-       x    1234567890123456789012345678901234567890123456789012345678901    x
-       x    123456789012345678901234567890123456789012345678901234567890     x
-       x   x   12345678901234567890123456789012345678901234567890123456789   x
-       x   x    1234567890123456789012345678901234567890123456789012345678   x
-       x    x   123456789012345678901234567890123456789012345678901234567    x
-       x    x    12345678901234567890123456789012345678901234567890123456    x
-       x   x   x   1234567890123456789012345678901234567890123456789012345   x
-       x   x   x    123456789012345678901234567890123456789012345678901234   x
-       x   x    x   12345678901234567890123456789012345678901234567890123    x
-       x    x   x    1234567890123456789012345678901234567890123456789012    x
-       x   x   x   x   123456789012345678901234567890123456789012345678901   x
-       x   x   x   x    12345678901234567890123456789012345678901234567890   x
-       x   x    x   x   1234567890123456789012345678901234567890123456789    x
-       x    x   x    x   123456789012345678901234567890123456789012345678    x
-       x    x    x   x    12345678901234567890123456789012345678901234567    x
-       x   x   x   x    x   1234567890123456789012345678901234567890123456   x
-       x   x    x   x   x    123456789012345678901234567890123456789012345   x
-       x   x    x   x    x   12345678901234567890123456789012345678901234    x
-       x    x   x    x    x   1234567890123456789012345678901234567890123    x
-       x    x    x   x    x    123456789012345678901234567890123456789012    x
+     normal text
+     x    x    123456789012345678901234567890123456789012345678901234567890123
+     x    x     12345678901234567890123456789012345678901234567890123456789012
+     x     x     1234567890123456789012345678901234567890123456789012345678901
+     x     x      123456789012345678901234567890123456789012345678901234567890
+     x    x   x    12345678901234567890123456789012345678901234567890123456789
+     x    x    x    1234567890123456789012345678901234567890123456789012345678
+     x    x     x    123456789012345678901234567890123456789012345678901234567
+     x     x    x     12345678901234567890123456789012345678901234567890123456
+     x   x    x   x    1234567890123456789012345678901234567890123456789012345
+     x    x   x    x    123456789012345678901234567890123456789012345678901234
+     x    x    x    x    12345678901234567890123456789012345678901234567890123
+     x    x    x     x    1234567890123456789012345678901234567890123456789012
+     x   x    x   x   x    123456789012345678901234567890123456789012345678901
+     x    x   x    x   x    12345678901234567890123456789012345678901234567890
+     x    x    x   x    x    1234567890123456789012345678901234567890123456789
+     x    x    x    x    x    123456789012345678901234567890123456789012345678
+     x    x    x    x     x    12345678901234567890123456789012345678901234567
+     x   x    x   x    x   x    1234567890123456789012345678901234567890123456
+     x    x   x    x    x   x    123456789012345678901234567890123456789012345
+     x    x    x   x    x    x    12345678901234567890123456789012345678901234
+     x    x    x    x    x    x    1234567890123456789012345678901234567890123
+     x    x    x    x     x    x    123456789012345678901234567890123456789012
+     x    123456789012345678901234567890123456789012345678901234567890123    x
+     x    12345678901234567890123456789012345678901234567890123456789012     x
+     x     1234567890123456789012345678901234567890123456789012345678901     x
+     x     123456789012345678901234567890123456789012345678901234567890      x
+     x    x   12345678901234567890123456789012345678901234567890123456789    x
+     x    x    1234567890123456789012345678901234567890123456789012345678    x
+     x    x     123456789012345678901234567890123456789012345678901234567    x
+     x     x    12345678901234567890123456789012345678901234567890123456     x
+     x   x    x   1234567890123456789012345678901234567890123456789012345    x
+     x    x   x    123456789012345678901234567890123456789012345678901234    x
+     x    x    x    12345678901234567890123456789012345678901234567890123    x
+     x    x    x     1234567890123456789012345678901234567890123456789012    x
+     x   x    x   x   123456789012345678901234567890123456789012345678901    x
+     x    x   x    x   12345678901234567890123456789012345678901234567890    x
+     x    x    x   x    1234567890123456789012345678901234567890123456789    x
+     x    x    x    x    123456789012345678901234567890123456789012345678    x
+     x    x    x    x     12345678901234567890123456789012345678901234567    x
+     x   x    x   x    x   1234567890123456789012345678901234567890123456    x
+     x    x   x    x    x   123456789012345678901234567890123456789012345    x
+     x    x    x   x    x    12345678901234567890123456789012345678901234    x
+     x    x    x    x    x    1234567890123456789012345678901234567890123    x
+     x    x    x    x     x    123456789012345678901234567890123456789012    x
 
-       leaked tab settings:
-       a    b    c    d    e    f    g    h
+     leaked tab settings:
+     a    b    c    d    e    f    g    h
 
 OpenBSD                        January 27, 2015              TBL-MOD-EXPAND(1)
diff --git a/regress/tbl/mod/font-eol.out_ascii b/regress/tbl/mod/font-eol.out_ascii
index db521553..5afca272 100644
--- a/regress/tbl/mod/font-eol.out_ascii
+++ b/regress/tbl/mod/font-eol.out_ascii
@@ -1,13 +1,13 @@
 TBL-MOD-FONT-EOL(1)         General Commands Manual        TBL-MOD-FONT-EOL(1)
 
 NNAAMMEE
-       tbl-mod-font-eol - font modifier at eol in table layout
+     tbl-mod-font-eol - font modifier at eol in table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--------------+
-       |bboolldd   none   |
-       |bboolldd   _i_t_a_l_i_c |
-       +--------------+
+     normal text
+     +--------------+
+     |bboolldd   none   |
+     |bboolldd   _i_t_a_l_i_c |
+     +--------------+
 
 OpenBSD                         August 9, 2021             TBL-MOD-FONT-EOL(1)
diff --git a/regress/tbl/mod/font.out_ascii b/regress/tbl/mod/font.out_ascii
index ecc84353..c465db41 100644
--- a/regress/tbl/mod/font.out_ascii
+++ b/regress/tbl/mod/font.out_ascii
@@ -1,18 +1,18 @@
 TBL-MOD-FONT(1)             General Commands Manual            TBL-MOD-FONT(1)
 
 NNAAMMEE
-       tbl-mod-font - font modifiers in table layouts
+     tbl-mod-font - font modifiers in table layouts
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +-------+-------+--------+
-       | bboolldd  | roman | _i_t_a_l_i_c |
-       +-------+-------+--------+
-       |_i_t_a_l_i_c | roman |  bboolldd  |
-       | _a_n_d   |  so   |   oonn   |
-       +-------+-------+--------+
+     normal text
+     +-------+-------+--------+
+     | bboolldd  | roman | _i_t_a_l_i_c |
+     +-------+-------+--------+
+     |_i_t_a_l_i_c | roman |  bboolldd  |
+     | _a_n_d   |  so   |   oonn   |
+     +-------+-------+--------+
 
-       leaked tab settings:
-       a    b    c    d    e
+     leaked tab settings:
+     a    b    c    d    e
 
 OpenBSD                        February 10, 2015               TBL-MOD-FONT(1)
diff --git a/regress/tbl/mod/misalign.out_ascii b/regress/tbl/mod/misalign.out_ascii
index fcfccffd..ee755b04 100644
--- a/regress/tbl/mod/misalign.out_ascii
+++ b/regress/tbl/mod/misalign.out_ascii
@@ -1,18 +1,18 @@
 TBL-MOD-MISALIGN(1)         General Commands Manual        TBL-MOD-MISALIGN(1)
 
 NNAAMMEE
-       tbl-mod-misalign - failing alignment in tables
+     tbl-mod-misalign - failing alignment in tables
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +------+
-       |12.34 |
-       +------+
-       |100.0 |
-       |0.001 |
-       +------+
-       |1000.0 |
-       |0.0001 |
-       +------+
+     normal text
+     +------+
+     |12.34 |
+     +------+
+     |100.0 |
+     |0.001 |
+     +------+
+     |1000.0 |
+     |0.0001 |
+     +------+
 
 OpenBSD                        December 24, 2014           TBL-MOD-MISALIGN(1)
diff --git a/regress/tbl/mod/spacing.out_ascii b/regress/tbl/mod/spacing.out_ascii
index 9366d9b8..4a58dd40 100644
--- a/regress/tbl/mod/spacing.out_ascii
+++ b/regress/tbl/mod/spacing.out_ascii
@@ -1,14 +1,14 @@
 TBL-MOD-SPACING(1)          General Commands Manual         TBL-MOD-SPACING(1)
 
 NNAAMMEE
-       tbl-mod-spacing - spacing modifier in table layout
+     tbl-mod-spacing - spacing modifier in table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--+--+--+----+----+------+------+-----+
-       |ab|c |d | e  | f  |  g   |  h   |   i |
-       |ab|c |d ||e    f  || g   |  h   ||  i |
-       |ab|c |d ||e    f  || g   |  h   ||  i |
-       +--+--+--++--------++-----+------++----+
+     normal text
+     +--+--+--+----+----+------+------+-----+
+     |ab|c |d | e  | f  |  g   |  h   |   i |
+     |ab|c |d ||e    f  || g   |  h   ||  i |
+     |ab|c |d ||e    f  || g   |  h   ||  i |
+     +--+--+--++--------++-----+------++----+
 
 OpenBSD                          June 27, 2017              TBL-MOD-SPACING(1)
diff --git a/regress/tbl/mod/width.out_ascii b/regress/tbl/mod/width.out_ascii
index 154c4f04..51e51112 100644
--- a/regress/tbl/mod/width.out_ascii
+++ b/regress/tbl/mod/width.out_ascii
@@ -1,12 +1,12 @@
 TBL-MOD-WIDTH(1)            General Commands Manual           TBL-MOD-WIDTH(1)
 
 NNAAMMEE
-       tbl-mod-width - width modifier in table layout
+     tbl-mod-width - width modifier in table layout
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +---+------+----+------+
-       |a  | abcd | a  | abcd |
-       +---+------+----+------+
+     normal text
+     +---+------+----+------+
+     |a  | abcd | a  | abcd |
+     +---+------+----+------+
 
 OpenBSD                          June 8, 2017                 TBL-MOD-WIDTH(1)
diff --git a/regress/tbl/opt/box.out_ascii b/regress/tbl/opt/box.out_ascii
index a766fc8b..0bc55e54 100644
--- a/regress/tbl/opt/box.out_ascii
+++ b/regress/tbl/opt/box.out_ascii
@@ -1,43 +1,43 @@
 TBL-OPT-BOX(1)              General Commands Manual             TBL-OPT-BOX(1)
 
 NNAAMMEE
-       tbl-opt-box - box table options
+     tbl-opt-box - box table options
 
 DDEESSCCRRIIPPTTIIOONN
-       no boxing:
-       a   b
-       c   d
-       automatic boxing:
-       +------+
-       |a   b |
-       |c   d |
-       +------+
-       allbox:
-       +--+---+
-       |a | b |
-       +--+---+
-       |c | d |
-       +--+---+
-       manual boxing:
-       +--++--+
-       |a ||b |
-       +--++--+
-       |c ||d |
-       +--++--+
-       automatic and manual boxing:
-       +--++--+
-       |a ||b |
-       +--++--+
-       |c ||d |
-       +--++--+
-       +--++--+
-       allbox and manual boxing:
-       +--++--+
-       |a ||b |
-       +--++--+
-       +--++--+
-       |c ||d |
-       +--++--+
-       +--++--+
+     no boxing:
+     a   b
+     c   d
+     automatic boxing:
+     +------+
+     |a   b |
+     |c   d |
+     +------+
+     allbox:
+     +--+---+
+     |a | b |
+     +--+---+
+     |c | d |
+     +--+---+
+     manual boxing:
+     +--++--+
+     |a ||b |
+     +--++--+
+     |c ||d |
+     +--++--+
+     automatic and manual boxing:
+     +--++--+
+     |a ||b |
+     +--++--+
+     |c ||d |
+     +--++--+
+     +--++--+
+     allbox and manual boxing:
+     +--++--+
+     |a ||b |
+     +--++--+
+     +--++--+
+     |c ||d |
+     +--++--+
+     +--++--+
 
 OpenBSD                         August 28, 2022                 TBL-OPT-BOX(1)
diff --git a/regress/tbl/opt/center.in b/regress/tbl/opt/center.in
index 075dad48..713f1501 100644
--- a/regress/tbl/opt/center.in
+++ b/regress/tbl/opt/center.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: center.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
-.TH TBL-LAYOUT_CENTER 1 "January 28, 2015"
+.\" $OpenBSD: center.in,v 1.3 2023/11/13 20:35:36 schwarze Exp $
+.TH TBL-LAYOUT_CENTER 1 "November 13, 2023"
 .SH NAME
 tbl-layout_center \- center a table as a whole
 .SH DESCRIPTION
@@ -21,6 +21,46 @@ center; l.
 .TE
 .TS
 center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+234567890123
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+23456789012
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+2345678901
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+234567890
+.TE
+.TS
+center; l.
+1234567890123456789012345678901234567890123456789012345678901234567890123456789
+.TE
+.TS
+center; l.
+123456789012345678901234567890123456789012345678901234567890123456789012345678
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901234567
+.TE
+.TS
+center; l.
+1234567890123456789012345678901234567890123456789012345678901234567890123456
+.TE
+.TS
+center; l.
+123456789012345678901234567890123456789012345678901234567890123456789012345
+.TE
+.TS
+center; l.
 12345678901234567890123456789012345678901234567890123456789012345678901234
 .TE
 .TS
diff --git a/regress/tbl/opt/center.out_ascii b/regress/tbl/opt/center.out_ascii
index 97178c2d..ab8c3602 100644
--- a/regress/tbl/opt/center.out_ascii
+++ b/regress/tbl/opt/center.out_ascii
@@ -1,43 +1,52 @@
 TBL-LAYOUT_CENTER(1)        General Commands Manual       TBL-LAYOUT_CENTER(1)
 
 NNAAMMEE
-       tbl-layout_center - center a table as a whole
+     tbl-layout_center - center a table as a whole
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
+     normal text
 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456
 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345
- 123456789012345678901234567890123456789012345678901234567890123456789012345678901234
-      12345678901234567890123456789012345678901234567890123456789012345678901234
-      1234567890123456789012345678901234567890123456789012345678901234567890123
-       123456789012345678901234567890123456789012345678901234567890123456789012
-       12345678901234567890123456789012345678901234567890123456789012345678901
-       1234567890123456789012345678901234567890123456789012345678901234567890
-        123456789012345678901234567890123456789012345678901234567890123456789
-        12345678901234567890123456789012345678901234567890123456789012345678
-                                        ----+
-                                        txt |
-                                        -----+
-                                        text |
-                                        +----
-                                        |txt
-                                        +-----
-                                        |text
-                                        +----+
-                                        |txt |
-                                       +-----+
-                                       |text |
-                                    +----++-----+
-                                    |txt ||text |
-                                    +-----++-----+
-                                    |text ||text |
-                                        +----+
-                                        |txt |
-                                        +----+
+123456789012345678901234567890123456789012345678901234567890123456789012345678901234
+12345678901234567890123456789012345678901234567890123456789012345678901234567890123
+ 1234567890123456789012345678901234567890123456789012345678901234567890123456789012
+ 123456789012345678901234567890123456789012345678901234567890123456789012345678901
+  12345678901234567890123456789012345678901234567890123456789012345678901234567890
+  1234567890123456789012345678901234567890123456789012345678901234567890123456789
+   123456789012345678901234567890123456789012345678901234567890123456789012345678
+   12345678901234567890123456789012345678901234567890123456789012345678901234567
+    1234567890123456789012345678901234567890123456789012345678901234567890123456
+    123456789012345678901234567890123456789012345678901234567890123456789012345
+     12345678901234567890123456789012345678901234567890123456789012345678901234
+     1234567890123456789012345678901234567890123456789012345678901234567890123
+     123456789012345678901234567890123456789012345678901234567890123456789012
+      12345678901234567890123456789012345678901234567890123456789012345678901
+      1234567890123456789012345678901234567890123456789012345678901234567890
+       123456789012345678901234567890123456789012345678901234567890123456789
+       12345678901234567890123456789012345678901234567890123456789012345678
+                                       ----+
+                                       txt |
+                                       -----+
+                                       text |
+                                       +----
+                                       |txt
+                                       +-----
+                                       |text
+                                       +----+
+                                       |txt |
+                                      +-----+
+                                      |text |
+                                   +----++-----+
+                                   |txt ||text |
+                                   +-----++-----+
+                                   |text ||text |
+                                       +----+
+                                       |txt |
+                                       +----+
 
-       normal text
-                                       +-----+
-                                       |text |
-                                       +-----+
+     normal text
+                                      +-----+
+                                      |text |
+                                      +-----+
 
-OpenBSD                        January 28, 2015           TBL-LAYOUT_CENTER(1)
+OpenBSD                        November 13, 2023          TBL-LAYOUT_CENTER(1)
diff --git a/regress/tbl/opt/invalid.out_ascii b/regress/tbl/opt/invalid.out_ascii
index 627a3bf9..fc0de087 100644
--- a/regress/tbl/opt/invalid.out_ascii
+++ b/regress/tbl/opt/invalid.out_ascii
@@ -1,20 +1,20 @@
 TBL-OPT(1)                  General Commands Manual                 TBL-OPT(1)
 
 NNAAMMEE
-       tbl-opt - table options
+     tbl-opt - table options
 
 DDEESSCCRRIIPPTTIIOONN
-       normal text
-       +--------------+
-       |10.0     0.01 |
-       | 0.01   10.0  |
-       +--------------+
+     normal text
+     +--------------+
+     |10.0     0.01 |
+     | 0.01   10.0  |
+     +--------------+
 
-       normal text
-       +------+
-       |a   b |
-       +------+
+     normal text
+     +------+
+     |a   b |
+     +------+
 
-       normal text
+     normal text
 
 OpenBSD                        January 25, 2015                     TBL-OPT(1)