[PATCH 32/34] Post-migrate.

[G. Branden Robinson]

Modify `RS` arguments (in simple cases) to restore indentation to what
it was previously.

For more complex cases, use `RS`/`RE` more (with `PP`) and `IP` and
page-local macro `bP` less to get equivalent results.

Add `PP` calls where necessary to restore vertical space.

* man/infocmp.1m:
* man/curs_attr.3x:
* man/curs_mouse.3x:
* man/ncurses.3x:
* man/scr_dump.5:
* man/tabs.1:
* man/term.5: Do it.
---
 man/curs_attr.3x  |  2 ++
 man/curs_mouse.3x |  6 ++++--
 man/infocmp.1m    |  3 ++-
 man/ncurses.3x    | 50 +++++++++++++++++++++++++++++++++++------------
 man/new_pair.3x   | 10 ++++++----
 man/scr_dump.5    | 19 +++++++++++++++---
 man/tabs.1        |  4 ++++
 man/term.5        |  1 +
 8 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 78624236..4ea2b10a 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -170,6 +170,7 @@ .SS Legacy window attributes
 For example,
 as long as that value fits into the \fBA_COLOR\fP mask,
 then these calls produce similar results:
+.PP
 .RS 4
 .EX
 attrset(A_BOLD | COLOR_PAIR(\fIpair\fP));
@@ -187,6 +188,7 @@ .SS Legacy window attributes
 (or \fBchtype\fP).
 For example, the \fIinput\fP and \fIoutput\fP values in these statements
 would be the same:
+.PP
 .RS 4
 .EX
 int value = A_BOLD | COLOR_PAIR(\fIinput\fP);
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index e00e835f..02f2a4a4 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -270,7 +270,8 @@ .SH PORTABILITY
 .bP
 the \*(``libcurses\*('' manual page lists functions for this feature
 which are prototyped in \fBcurses.h\fP:
-.RS 4
+.PP
+.RS 8
 .EX
 extern int mouse_set(long int);
 extern int mouse_on(long int);
@@ -283,7 +284,8 @@ .SH PORTABILITY
 .RE
 .bP
 the \*(``terminfo\*('' manual page lists capabilities for the feature
-.RS 4
+.PP
+.RS 8
 .EX
 buttons           btns    BT       Number of buttons on the mouse
 get_mouse         getm    Gm       Curses should get button events
diff --git a/man/infocmp.1m b/man/infocmp.1m
index f20cfa41..cdcede9a 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -450,7 +450,8 @@ .SS Other Options
 .IP
 For example, this prints the compiled terminfo value as a string
 which could be assigned to the \fBTERMINFO\fP environment variable:
-.RS 4
+.PP
+.RS 9
 .EX
 @INFOCMP@ \-0 \-q \-Q2
 .EE
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 1efb22a9..8f48b96c 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -90,6 +90,7 @@ .SH DESCRIPTION
 .SS Initialization
 The library uses the locale which the calling program has initialized.
 That is normally done with \fBsetlocale\fP(3):
+.PP
 .RS 4
 .EX
 \fBsetlocale(LC_ALL, "");\fP
@@ -111,6 +112,7 @@ .SS Initialization
 To get character-at-a-time input without echoing (most
 interactive, screen oriented programs want this), the following
 sequence should be used:
+.PP
 .RS 4
 .EX
 \fBinitscr(); cbreak(); noecho();\fP
@@ -118,6 +120,7 @@ .SS Initialization
 .RE
 .PP
 Most programs would additionally use the sequence:
+.PP
 .RS 4
 .EX
 \fBintrflush(stdscr, FALSE);\fP
@@ -193,6 +196,7 @@ .SS Environment variables
 standard place.
 For example, if \fBTERM\fP is set to \fBatt4424\fP, then the
 compiled terminal definition is found in
+.PP
 .RS 4
 .EX
 \fB\*d/a/att4424\fP.
@@ -202,6 +206,7 @@ .SS Environment variables
 (The \fBa\fP is copied from the first letter of \fBatt4424\fP to avoid
 creation of huge directories.)  However, if \fBTERMINFO\fP is set to
 \fB$HOME/myterms\fP, \fBcurses\fP first checks
+.PP
 .RS 4
 .EX
 \fB$HOME/myterms/a/att4424\fP,
@@ -209,6 +214,7 @@ .SS Environment variables
 .RE
 .PP
 and if that fails, it then checks
+.PP
 .RS 4
 .EX
 \fB\*d/a/att4424\fP.
@@ -890,6 +896,7 @@ .SS ESCDELAY
 .SS HOME
 Tells \fBncurses\fP where your home directory is.
 That is where it may read and write auxiliary terminal descriptions:
+.PP
 .RS 4
 .EX
 $HOME/.termcap
@@ -904,6 +911,7 @@ .SS MOUSE_BUTTONS_123
 It specifies the order of buttons on the mouse.
 OS/2 numbers a 3-button mouse inconsistently from other
 platforms:
+.PP
 .RS 4
 .EX
 1 = left
@@ -1038,6 +1046,7 @@ .SS NCURSES_NO_UTF8_ACS
 ncurses checks for an extended terminfo capability \fBU8\fP.
 This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
 For example
+.PP
 .RS 3
 .EX
 # linux console, if patched to provide working
@@ -1107,46 +1116,53 @@ .SS TERMINFO
 This is the scheme used in System V, which legacy Unix systems use,
 and the \fBTERMINFO\fP variable is used by \fIcurses\fP applications on those
 systems to override the default location of the terminal database.
-.bP
+.IP \(bu 4
 If \fBncurses\fP is built to use hashed databases,
 then each entry in this list may be the path of a hashed database file, e.g.,
 .RS 4
+.PP
+.RS 4
 .EX
 /usr/share/terminfo.db
 .EE
 .RE
-.IP
+.PP
 rather than
+.PP
 .RS 4
 .EX
 /usr/share/terminfo/
 .EE
 .RE
-.IP
+.PP
 The hashed database uses less disk-space and is a little faster than the
 directory tree.
 However,
 some applications assume the existence of the directory tree,
 reading it directly
 rather than using the terminfo library calls.
+.RE
 .bP
 If \fBncurses\fP is built with a support for reading termcap files
 directly, then an entry in this list may be the path of a termcap file.
-.bP
+.IP \(bu 4
 If the \fBTERMINFO\fP variable begins with
 \*(``hex:\*('' or \*(``b64:\*('',
 \fBncurses\fP uses the remainder of that variable as a compiled terminal
 description.
 You might produce the base64 format using \fBinfocmp\fP(1M):
 .RS 4
+.PP
+.RS 4
 .EX
 TERMINFO="$(infocmp \-0 \-Q2 \-q)"
 export TERMINFO
 .EE
 .RE
-.IP
+.PP
 The compiled description is used if it corresponds to the terminal identified
 by the \fBTERM\fP variable.
+.RE
 .PP
 Setting \fBTERMINFO\fP is the simplest,
 but not the only way to set location of the default terminal database.
@@ -1187,6 +1203,7 @@ .SS TERMPATH
 .PP
 If the \fBTERMPATH\fP environment variable is not set,
 \fBncurses\fP looks in the files
+.PP
 .RS 4
 .EX
 /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
@@ -1198,6 +1215,7 @@ .SS TERMPATH
 The library may be configured to disregard the following variables when the
 current user is the superuser (root), or if the application uses setuid or
 setgid permissions:
+.PP
 .RS 4
 .EX
 $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
@@ -1211,24 +1229,28 @@ .SH ALTERNATE CONFIGURATIONS
 .TP 5
 \-\-disable\-overwrite
 The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
+.RS 5
+.PP
 .RS 4
 .EX
 \fB#include <curses.h>\fP
 .EE
 .RE
-.IP
+.PP
 This option is used to avoid filename conflicts when \fBncurses\fP
 is not the main implementation of curses of the computer.
 If \fBncurses\fP is installed disabling overwrite, it puts its headers in
 a subdirectory, e.g.,
+.PP
 .RS 4
 .EX
 \fB#include <ncurses/curses.h>\fP
 .EE
 .RE
-.IP
+.PP
 It also omits a symbolic link which would allow you to use \fB\-lcurses\fP
 to build executables.
+.RE
 .TP 5
 \-\-enable\-widec
 The configure script renames the library and
@@ -1236,24 +1258,26 @@ .SH ALTERNATE CONFIGURATIONS
 puts the header files in a different subdirectory.
 All of the library names have a \*(``w\*('' appended to them,
 i.e., instead of
+.RS 5
+.PP
 .RS 4
 .EX
 \fB\-lncurses\fP
 .EE
 .RE
-.IP
+.PP
 you link with
+.PP
 .RS 4
 .EX
 \fB\-lncursesw\fP
 .EE
 .RE
-.IP
+.PP
 You must also enable the wide-character features in the header file
 when compiling for the wide-character library
 to use the extended (wide-character) functions.
 The symbol which enables these features has changed since XSI Curses, Issue 4:
-.RS
 .bP
 Originally, the wide-character feature required the symbol
 \fB_XOPEN_SOURCE_EXTENDED\fP
@@ -1270,17 +1294,17 @@ .SH ALTERNATE CONFIGURATIONS
 with the caveat that some other header file than \fBcurses.h\fP
 may require a specific value for \fB_XOPEN_SOURCE\fP
 (or a system-specific symbol).
-.RE
-.IP
+.PP
 The \fBcurses.h\fP file which is installed for the wide-character
 library is designed to be compatible with the normal library's header.
 Only the size of the \fBWINDOW\fP structure differs, and very few
 applications require more than a pointer to \fBWINDOW\fPs.
-.IP
+.PP
 If the headers are installed allowing overwrite,
 the wide-character library's headers should be installed last,
 to allow applications to be built using either library
 from the same set of headers.
+.RE
 .TP 5
 \-\-with\-pthread
 The configure script renames the library.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 14013f75..574e2958 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -78,21 +78,23 @@ .SH DESCRIPTION
 on a terminal.
 If the library does not keep track of the \fIcombinations\fP of
 colors which are displayed, it will be inefficient.
-.bP
+.IP \(bu 4
 For simple terminal emulators
 with only a few dozen color combinations,
 it is convenient to use the maximum number of combinations
 as the limit on color pairs:
-.RS 4
+.PP
+.RS 8
 .EX
 \fBCOLORS\fI * \fBCOLORS\fR
 .EE
 .RE
-.bP
+.IP \(bu 4
 Terminals which support \fIdefault colors\fP distinct
 from \*(``ANSI colors\*(''
 add to the possible combinations, producing this total:
-.RS 4
+.PP
+.RS 8
 .EX
 \fI( \fBCOLORS\fI + 1 ) * ( \fBCOLORS\fI + 1 )\fR
 .EE
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index 09e4a888..8d1f3d5d 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -60,7 +60,7 @@ .SH DESCRIPTION
 .SS ncurses6
 A longstanding implementation of screen-dump was
 revised with ncurses6 to remedy problems with the earlier approach:
-.bP
+.IP \(bu 4
 A \*(``magic number\*('' is written to the beginning of the dump file,
 allowing applications (such as \fBfile\fP(1)) to recognize curses dump files.
 .IP
@@ -69,19 +69,23 @@ .SS ncurses6
 was unused by other applications.
 This 16-bit number was unused:
 .RS 4
+.PP
+.RS 4
 .EX
 0x8888 (octal \*(``\e210\e210\*('')
 .EE
 .RE
-.IP
+.PP
 but to be more certain, this 32-bit number was chosen:
+.PP
 .RS 4
 .EX
 0x88888888 (octal \*(``\e210\e210\e210\e210\*('')
 .EE
 .RE
-.IP
+.PP
 This is the pattern submitted to the maintainers of the \fBfile\fP program:
+.PP
 .RS 4
 .EX
 #
@@ -93,6 +97,7 @@ .SS ncurses6
 #
 .EE
 .RE
+.RE
 .bP
 The screen dumps are written in textual form,
 so that internal data sizes are not directly related to the dump-format, and
@@ -171,6 +176,7 @@ .SS Unix System V
 The \fBWINDOW\fP data and the lines of text follow, all in binary form.
 .PP
 The Solaris curses source has these definitions:
+.PP
 .RS 4
 .EX
 /* terminfo magic number */
@@ -187,6 +193,7 @@ .SS Unix System V
 The Solaris curses source has no magic number for SVr4 (1989).
 Other operating systems (AIX and HPUX) use a magic number which would
 correspond to this definition:
+.PP
 .RS 4
 .EX
 /* curses screen dump magic number */
@@ -197,6 +204,7 @@ .SS Unix System V
 That octal number in bytes is 001, 035.
 Because most Unix vendors use big-endian hardware,
 the magic number is written with the high-order byte first, e.g.,
+.PP
 .RS 4
 .EX
 \e001\e035
@@ -247,6 +255,7 @@ .SS PDCurses
 but begins the file with its three-byte identifier \*(``PDC\*('',
 followed by a one-byte version,
 e.g.,
+.PP
 .RS 4
 .EX
        \*(``PDC\e001\*(''
@@ -273,6 +282,7 @@ .SS NetBSD
 .SH EXAMPLE
 Given a simple program which writes text to the screen
 (and for the sake of example, limiting the screen-size to 10x20):
+.PP
 .RS 4
 .EX
 #include <curses.h>
@@ -303,6 +313,7 @@ .SH EXAMPLE
 .RE
 .PP
 When run using ncurses6, the output looks like this:
+.PP
 .RS 4
 .EX
 \e210\e210\e210\e210ncurses 6.0.20170415
@@ -347,6 +358,7 @@ .SH EXAMPLE
 .ne 10
 .PP
 Running the same program with Solaris \fIxpg4\fP curses gives this dump:
+.PP
 .RS 4
 .EX
 MAX=10,20
@@ -394,6 +406,7 @@ .SH EXAMPLE
 On the other hand, the SVr4 curses library does know about the background 
color.
 However, its screen dumps are in binary.
 Here is the corresponding dump (using \*(``od \-t x1\*(''):
+.PP
 .RS 4
 .EX
 0000000 1c 01 c3 d6 f3 58 05 00 0b 00 0a 00 14 00 00 00
diff --git a/man/tabs.1 b/man/tabs.1
index e0efd88a..89defc76 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -56,6 +56,7 @@ .SH DESCRIPTION
 This uses the terminfo \fBclear_all_tabs\fP and \fBset_tab\fP capabilities.
 If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops.
 The terminal should be configured to use hard tabs, e.g.,
+.PP
 .RS 4
 .EX
 stty tab0
@@ -75,6 +76,7 @@ .SH DESCRIPTION
 database, the result is unpredictable.
 Before running curses programs,
 you should either reset tab-stops to the standard interval
+.PP
 .RS 4
 .EX
 tabs \-8
@@ -123,6 +125,7 @@ .SS Explicit Lists
 The values in the list must be in increasing numeric order,
 and greater than zero.
 They are separated by a comma or a blank, for example,
+.PP
 .RS 4
 .EX
 tabs 1,6,11,16,21
@@ -133,6 +136,7 @@ .SS Explicit Lists
 Use a \*(``+\*('' to treat a number
 as an increment relative to the previous value,
 e.g.,
+.PP
 .RS 4
 .EX
 tabs 1,+5,+5,+5,+5
diff --git a/man/term.5 b/man/term.5
index 0891167a..3d63a211 100644
--- a/man/term.5
+++ b/man/term.5
@@ -340,6 +340,7 @@ .SS Mixed-case terminal names
 .SH EXAMPLE
 As an example, here is a description for the Lear-Siegler
 ADM\-3, a popular though rather stupid early terminal:
+.PP
 .RS 4
 .EX
 adm3a|lsi adm3a,
-- 
2.30.2

signature.asc
Description: PGP signature