bug-ncurses
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 34/34] Format synopses more consistently.


From: G. Branden Robinson
Subject: [PATCH 34/34] Format synopses more consistently.
Date: Fri, 6 Oct 2023 00:18:46 -0500

Bracket "SYNOPSIS" section between `nf` and `fi` requests to temporarily
disable filling, eliminating the need for repetitious `br` requests.

Use `\fP` escape sequence to return to previous font when done setting
text in italics.

Stop selecting roman (or previous) font at ends of lines.  The next text
line (within the synopsis) always starts with `\fB` anyway.

* man/curs_add_wch.3x:
* man/curs_add_wchstr.3x:
* man/curs_addch.3x:
* man/curs_addchstr.3x:
* man/curs_addstr.3x:
* man/curs_addwstr.3x:
* man/curs_attr.3x:
* man/curs_beep.3x:
* man/curs_bkgd.3x:
* man/curs_bkgrnd.3x:
* man/curs_border.3x:
* man/curs_border_set.3x:
* man/curs_clear.3x:
* man/curs_color.3x:
* man/curs_delch.3x:
* man/curs_deleteln.3x:
* man/curs_extend.3x:
* man/curs_get_wch.3x:
* man/curs_get_wstr.3x:
* man/curs_getcchar.3x:
* man/curs_getch.3x:
* man/curs_getstr.3x:
* man/curs_getyx.3x:
* man/curs_in_wch.3x:
* man/curs_in_wchstr.3x:
* man/curs_inch.3x:
* man/curs_inchstr.3x:
* man/curs_initscr.3x:
* man/curs_inopts.3x:
* man/curs_ins_wch.3x:
* man/curs_ins_wstr.3x:
* man/curs_insch.3x:
* man/curs_insstr.3x:
* man/curs_instr.3x:
* man/curs_inwstr.3x:
* man/curs_kernel.3x:
* man/curs_legacy.3x:
* man/curs_memleaks.3x:
* man/curs_mouse.3x:
* man/curs_move.3x:
* man/curs_opaque.3x:
* man/curs_outopts.3x:
* man/curs_overlay.3x:
* man/curs_pad.3x:
* man/curs_print.3x:
* man/curs_printw.3x:
* man/curs_refresh.3x:
* man/curs_scanw.3x:
* man/curs_scr_dump.3x:
* man/curs_scroll.3x:
* man/curs_slk.3x:
* man/curs_sp_funcs.3x:
* man/curs_termattrs.3x:
* man/curs_termcap.3x:
* man/curs_terminfo.3x:
* man/curs_threads.3x:
* man/curs_touch.3x:
* man/curs_trace.3x:
* man/curs_util.3x:
* man/curs_variables.3x:
* man/curs_window.3x:
* man/default_colors.3x:
* man/define_key.3x:
* man/form.3x:
* man/form_cursor.3x:
* man/form_data.3x:
* man/form_driver.3x:
* man/form_field.3x:
* man/form_field_attributes.3x:
* man/form_field_buffer.3x:
* man/form_field_info.3x:
* man/form_field_just.3x:
* man/form_field_new.3x:
* man/form_field_opts.3x:
* man/form_field_userptr.3x:
* man/form_field_validation.3x:
* man/form_fieldtype.3x:
* man/form_hook.3x:
* man/form_new.3x:
* man/form_new_page.3x:
* man/form_opts.3x:
* man/form_page.3x:
* man/form_post.3x:
* man/form_requestname.3x:
* man/form_userptr.3x:
* man/form_variables.3x:
* man/form_win.3x:
* man/key_defined.3x:
* man/keybound.3x:
* man/keyok.3x:
* man/legacy_coding.3x:
* man/menu.3x:
* man/menu_attributes.3x:
* man/menu_cursor.3x:
* man/menu_driver.3x:
* man/menu_format.3x:
* man/menu_hook.3x:
* man/menu_items.3x:
* man/menu_mark.3x:
* man/menu_new.3x:
* man/menu_opts.3x:
* man/menu_pattern.3x:
* man/menu_post.3x:
* man/menu_requestname.3x:
* man/menu_spacing.3x:
* man/menu_userptr.3x:
* man/menu_win.3x:
* man/mitem_current.3x:
* man/mitem_name.3x:
* man/mitem_new.3x:
* man/mitem_opts.3x:
* man/mitem_userptr.3x:
* man/mitem_value.3x:
* man/mitem_visible.3x:
* man/ncurses.3x:
* man/new_pair.3x:
* man/panel.3x:
* man/resizeterm.3x:
* man/term_variables.3x:
* man/wresize.3x: Do it.
---
 man/curs_add_wch.3x          |  24 ++-
 man/curs_add_wchstr.3x       |  26 ++--
 man/curs_addch.3x            |  23 ++-
 man/curs_addchstr.3x         |  26 ++--
 man/curs_addstr.3x           |  26 ++--
 man/curs_addwstr.3x          |  26 ++--
 man/curs_attr.3x             |  42 ++---
 man/curs_beep.3x             |  10 +-
 man/curs_bkgd.3x             |  21 ++-
 man/curs_bkgrnd.3x           |  25 ++-
 man/curs_border.3x           |  21 +--
 man/curs_border_set.3x       |  17 +--
 man/curs_clear.3x            |  32 ++--
 man/curs_color.3x            |  36 ++---
 man/curs_delch.3x            |  17 +--
 man/curs_deleteln.3x         |  25 ++-
 man/curs_extend.3x           |  11 +-
 man/curs_get_wch.3x          |  21 ++-
 man/curs_get_wstr.3x         |  28 ++--
 man/curs_getcchar.3x         |  20 +--
 man/curs_getch.3x            |  22 ++-
 man/curs_getstr.3x           |  30 ++--
 man/curs_getyx.3x            |  10 +-
 man/curs_in_wch.3x           |  18 +--
 man/curs_in_wchstr.3x        |  28 ++--
 man/curs_inch.3x             |  18 +--
 man/curs_inchstr.3x          |  30 ++--
 man/curs_initscr.3x          |  25 ++-
 man/curs_inopts.3x           |  50 +++---
 man/curs_ins_wch.3x          |  16 +-
 man/curs_ins_wstr.3x         |  28 ++--
 man/curs_insch.3x            |  18 +--
 man/curs_insstr.3x           |  29 ++--
 man/curs_instr.3x            |  30 ++--
 man/curs_inwstr.3x           |  28 ++--
 man/curs_kernel.3x           |  42 +++--
 man/curs_legacy.3x           |  20 +--
 man/curs_memleaks.3x         |  16 +-
 man/curs_mouse.3x            |  28 ++--
 man/curs_move.3x             |  11 +-
 man/curs_opaque.3x           |  32 ++--
 man/curs_outopts.3x          |  30 ++--
 man/curs_overlay.3x          |  14 +-
 man/curs_pad.3x              |   6 +-
 man/curs_print.3x            |   6 +-
 man/curs_printw.3x           |  25 ++-
 man/curs_refresh.3x          |  24 ++-
 man/curs_scanw.3x            |  26 ++--
 man/curs_scr_dump.3x         |  17 +--
 man/curs_scroll.3x           |  15 +-
 man/curs_slk.3x              |  42 ++---
 man/curs_sp_funcs.3x         | 287 +++++++++++++++++------------------
 man/curs_termattrs.3x        |  37 ++---
 man/curs_termcap.3x          |  39 ++---
 man/curs_terminfo.3x         |  66 ++++----
 man/curs_threads.3x          |  18 +--
 man/curs_touch.3x            |  14 +-
 man/curs_trace.3x            |  28 ++--
 man/curs_util.3x             |  28 ++--
 man/curs_variables.3x        |  44 +++---
 man/curs_window.3x           |  18 +--
 man/default_colors.3x        |  11 +-
 man/define_key.3x            |   6 +-
 man/form.3x                  |   4 +-
 man/form_cursor.3x           |   8 +-
 man/form_data.3x             |  11 +-
 man/form_driver.3x           |  11 +-
 man/form_field.3x            |  17 +--
 man/form_field_attributes.3x |  25 ++-
 man/form_field_buffer.3x     |  22 +--
 man/form_field_info.3x       |   8 +-
 man/form_field_just.3x       |  11 +-
 man/form_field_new.3x        |  11 +-
 man/form_field_opts.3x       |  18 +--
 man/form_field_userptr.3x    |  11 +-
 man/form_field_validation.3x |  37 ++---
 man/form_fieldtype.3x        |  14 +-
 man/form_hook.3x             |  32 ++--
 man/form_new.3x              |  11 +-
 man/form_new_page.3x         |  11 +-
 man/form_opts.3x             |  18 +--
 man/form_page.3x             |  26 ++--
 man/form_post.3x             |  11 +-
 man/form_requestname.3x      |  11 +-
 man/form_userptr.3x          |  11 +-
 man/form_variables.3x        |  16 +-
 man/form_win.3x              |  22 +--
 man/key_defined.3x           |   6 +-
 man/keybound.3x              |   6 +-
 man/keyok.3x                 |   6 +-
 man/legacy_coding.3x         |   8 +-
 man/menu.3x                  |   4 +-
 man/menu_attributes.3x       |  32 ++--
 man/menu_cursor.3x           |   8 +-
 man/menu_driver.3x           |   8 +-
 man/menu_format.3x           |  11 +-
 man/menu_hook.3x             |  32 ++--
 man/menu_items.3x            |  14 +-
 man/menu_mark.3x             |  11 +-
 man/menu_new.3x              |  11 +-
 man/menu_opts.3x             |  18 +--
 man/menu_pattern.3x          |  11 +-
 man/menu_post.3x             |  11 +-
 man/menu_requestname.3x      |  11 +-
 man/menu_spacing.3x          |   9 +-
 man/menu_userptr.3x          |  11 +-
 man/menu_win.3x              |  22 +--
 man/mitem_current.3x         |  22 +--
 man/mitem_name.3x            |  11 +-
 man/mitem_new.3x             |  11 +-
 man/mitem_opts.3x            |  18 +--
 man/mitem_userptr.3x         |  11 +-
 man/mitem_value.3x           |  11 +-
 man/mitem_visible.3x         |   8 +-
 man/ncurses.3x               |   4 +-
 man/new_pair.3x              |   8 +-
 man/panel.3x                 |  64 ++++----
 man/resizeterm.3x            |   8 +-
 man/term_variables.3x        |  52 +++----
 man/wresize.3x               |   8 +-
 120 files changed, 1274 insertions(+), 1396 deletions(-)

diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index e927fac2..344dfff0 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -54,19 +54,17 @@ .SH NAME
 \fB\%wecho_wchar\fP \-
 add a \fIcurses\fR complex character to a window and advance the cursor
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint add_wch(const cchar_t *\fIwch\fB);\fR
-.br
-\fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB);\fR
-.br
-\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fB);\fR
-.br
-\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t 
*\fIwch\fB);\fR
-.sp
-\fBint echo_wchar(const cchar_t *\fIwch\fB);\fR
-.br
-\fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint add_wch(const cchar_t *\fIwch\fP);
+\fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t 
*\fIwch\fP);
+.PP
+\fBint echo_wchar(const cchar_t *\fIwch\fP);
+\fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS add_wch
 The
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 1e4918f6..36412fce 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -56,23 +56,17 @@ .SH NAME
 add a \fIcurses\fR complex character string to a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint add_wchstr(const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint add_wchnstr(const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint wadd_wchstr(WINDOW * \fIwin\fB, const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint wadd_wchnstr(WINDOW * \fIwin\fB, const cchar_t *\fIwchstr\fB, int 
\fIn\fB);\fR
-.sp
-\fBint mvadd_wchstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvadd_wchnstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB, 
int \fIn\fB);\fR
-.br
-\fBint mvwadd_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const 
cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvwadd_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const 
cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+\fBint add_wchstr(const cchar_t *\fIwchstr\fP);
+\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint wadd_wchstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP);
+\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int 
\fIn\fP);
+.PP
+\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, 
int \fIn\fP);
+\fBint mvwadd_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const 
cchar_t *\fIwchstr\fP);
+\fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const 
cchar_t *\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions copy the (null-terminated)
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 9cbd90d4..b5a3feb8 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -54,20 +54,17 @@ .SH NAME
 \fB\%wechochar\fP \-
 add a \fIcurses\fR character to a window and advance the cursor
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint addch(const chtype \fIch\fB);\fR
-.br
-\fBint waddch(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
-.br
-\fBint mvaddch(int \fIy\fB, int \fIx\fB, const chtype \fIch\fB);\fR
-.br
-\fBint mvwaddch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype 
\fIch\fB);\fR
-.sp
-\fBint echochar(const chtype \fIch\fB);\fR
-.br
-\fBint wechochar(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
-.br
+\fBint addch(const chtype \fIch\fP);
+\fBint waddch(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+\fBint mvaddch(int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+\fBint mvwaddch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype 
\fIch\fP);
+.PP
+\fBint echochar(const chtype \fIch\fP);
+\fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
+.fi
 .SH DESCRIPTION
 .SS Adding characters
 The \fBaddch\fP, \fBwaddch\fP, \fBmvaddch\fP and \fBmvwaddch\fP routines put
diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x
index 60f897b5..70f4d11c 100644
--- a/man/curs_addchstr.3x
+++ b/man/curs_addchstr.3x
@@ -56,23 +56,17 @@ .SH NAME
 add a \fIcurses\fR character string to a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addchstr(const chtype *\fIchstr\fB);\fR
-.br
-\fBint addchnstr(const chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddchstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB);\fR
-.br
-\fBint waddchnstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB, int 
\fIn\fB);\fR
-.sp
-\fBint mvaddchstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB);\fR
-.br
-\fBint mvaddchnstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwaddchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype 
*\fIchstr\fB);\fR
-.br
-\fBint mvwaddchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype 
*\fIchstr\fB, int \fIn\fB);\fR
+\fBint addchstr(const chtype *\fIchstr\fP);
+\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
+\fBint waddchstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP);
+\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int 
\fIn\fP);
+\fBint mvwaddchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype 
*\fIchstr\fP);
+\fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype 
*\fIchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions copy the (null-terminated)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index 1343fbec..1750cd54 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -56,23 +56,17 @@ .SH NAME
 add a string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addstr(const char *\fIstr\fB);\fR
-.br
-\fBint addnstr(const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
-.br
-\fBint waddnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvaddstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvaddnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwaddstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIstr\fB);\fR
-.br
-\fBint mvwaddnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIstr\fB, int \fIn\fB);\fR
+\fBint addstr(const char *\fIstr\fP);
+\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
+\fBint waddstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIstr\fP);
+\fBint mvwaddnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions write the (null-terminated) character string
diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x
index b9872131..d51bc4e5 100644
--- a/man/curs_addwstr.3x
+++ b/man/curs_addwstr.3x
@@ -56,23 +56,17 @@ .SH NAME
 add a wide-character string to a \fIcurses\fR window and advance the cursor
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint addwstr(const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint addnwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint waddwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint waddnwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvaddwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvaddnwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwaddwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t 
*\fIwstr\fB);\fR
-.br
-\fBint mvwaddnwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t 
*\fIwstr\fB, int \fIn\fB);\fR
+\fBint addwstr(const wchar_t *\fIwstr\fP);
+\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint waddwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int 
\fIn\fP);
+\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t 
*\fIwstr\fP);
+\fBint mvwaddnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t 
*\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions write the characters of the
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 4ea2b10a..bbfbb83f 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -75,27 +75,27 @@ .SH NAME
 .\" ---------------------------------------------------------------------------
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.PP
-\fBint attr_get(attr_t *\fIattrs\fB, short *\fIpair\fB, void *\fIopts\fB);\fR
-\fBint wattr_get(WINDOW *\fIwin\fB, attr_t *\fIattrs\fB, short *\fIpair\fB,\fR 
\fBvoid *\fIopts\fB);\fR
-\fBint attr_set(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
-\fBint wattr_set(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, short \fIpair\fB, void 
*\fIopts\fB);\fR
-.PP
-\fBint attr_off(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-\fBint wattr_off(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-\fBint attr_on(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-\fBint wattr_on(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
-.PP
-\fBint attroff(int \fIattrs);\fR
-\fBint wattroff(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-\fBint attron(int \fIattrs\fB);\fR
-\fBint wattron(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-\fBint attrset(int \fIattrs\fB);\fR
-\fBint wattrset(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
-.PP
-\fBint chgat(int \fIn\fB, attr_t \fIattr\fB, short \fIpair\fB,\fR \fBconst 
void *\fIopts\fB);\fR
-\fBint wchgat(WINDOW *\fIwin\fB,\fR
+\fB#include <curses.h>
+.PP
+\fBint attr_get(attr_t *\fIattrs\fP, short *\fIpair\fP, void *\fIopts\fP);
+\fBint wattr_get(WINDOW *\fIwin\fP, attr_t *\fIattrs\fP, short *\fIpair\fP,\fR 
\fPvoid *\fIopts\fP);
+\fBint attr_set(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
+\fBint wattr_set(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, short \fIpair\fP, void 
*\fIopts\fP);
+.PP
+\fBint attr_off(attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint wattr_off(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint attr_on(attr_t \fIattrs\fP, void *\fIopts\fP);
+\fBint wattr_on(WINDOW *\fIwin\fP, attr_t \fIattrs\fP, void *\fIopts\fP);
+.PP
+\fBint attroff(int \fIattrs);
+\fBint wattroff(WINDOW *\fIwin\fP, int \fIattrs\fP);
+\fBint attron(int \fIattrs\fP);
+\fBint wattron(WINDOW *\fIwin\fP, int \fIattrs\fP);
+\fBint attrset(int \fIattrs\fP);
+\fBint wattrset(WINDOW *\fIwin\fP, int \fIattrs\fP);
+.PP
+\fBint chgat(int \fIn\fP, attr_t \fIattr\fP, short \fIpair\fP,\fR \fPconst 
void *\fIopts\fP);
+\fBint wchgat(WINDOW *\fIwin\fP,
       \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void 
*\fIopts\fB);\fR
 \fBint mvchgat(int \fIy\fB, int \fIx\fB,\fR
       \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void 
*\fIopts\fB);\fR
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 9e17fa4b..8a71ad20 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -34,12 +34,12 @@ .SH NAME
 \fB\%flash\fP \-
 ring the (visual) bell of the terminal with \fIcurses\fR
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint beep(void);\fP
-.br
-\fBint flash(void);\fP
-.br
+\fBint beep(void);
+\fBint flash(void);
+.fi
 .SH DESCRIPTION
 The \fBbeep\fP and \fBflash\fP routines are used to alert the terminal user.
 The routine \fBbeep\fP sounds an audible alarm on the terminal, if possible;
diff --git a/man/curs_bkgd.3x b/man/curs_bkgd.3x
index 1bbcb3fc..6377e7f3 100644
--- a/man/curs_bkgd.3x
+++ b/man/curs_bkgd.3x
@@ -41,18 +41,17 @@ .SH NAME
 \fB\%getbkgd\fP \-
 manipulate background of a \fIcurses\fR window of characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBvoid bkgdset(chtype \fIch\fB);\fR
-.br
-\fBvoid wbkgdset(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
-.sp
-\fBint bkgd(chtype \fIch\fB);\fR
-.br
-\fBint wbkgd(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
-.sp
-\fBchtype getbkgd(WINDOW *\fIwin\fB);\fR
-.br
+\fBvoid bkgdset(chtype \fIch\fP);
+\fBvoid wbkgdset(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBint bkgd(chtype \fIch\fP);
+\fBint wbkgd(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBchtype getbkgd(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 .SS bkgdset
 The \fBbkgdset\fP and \fBwbkgdset\fP routines
diff --git a/man/curs_bkgrnd.3x b/man/curs_bkgrnd.3x
index 35b8e669..b977e7bb 100644
--- a/man/curs_bkgrnd.3x
+++ b/man/curs_bkgrnd.3x
@@ -42,19 +42,18 @@ .SH NAME
 \fB\%wgetbkgrnd\fP \-
 manipulate background of a \fIcurses\fP window of wide characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fR
-.sp
-\fBint bkgrnd(const cchar_t *\fIwch\fB);\fR
-.br
-\fBint wbkgrnd(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBvoid bkgrndset(const cchar_t *\fIwch\fB);\fR
-.br
-\fBvoid wbkgrndset(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBint getbkgrnd(cchar_t *\fIwch\fB);\fR
-.br
-\fBint wgetbkgrnd(WINDOW *\fIwin\fB, cchar_t *\fIwch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint bkgrnd(const cchar_t *\fIwch\fP);
+\fBint wbkgrnd(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBvoid bkgrndset(const cchar_t *\fIwch\fP);
+\fBvoid wbkgrndset(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBint getbkgrnd(cchar_t *\fIwch\fP);
+\fBint wgetbkgrnd(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS bkgrndset
 The \fBbkgrndset\fP and \fBwbkgrndset\fP routines manipulate the
diff --git a/man/curs_border.3x b/man/curs_border.3x
index 00dd0d63..d24a362d 100644
--- a/man/curs_border.3x
+++ b/man/curs_border.3x
@@ -53,32 +53,27 @@ .SH NAME
 \fB\%mvwvline\fP \-
 draw borders and lines in a \fIcurses\fR window of characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint border(chtype \fIls\fB, chtype \fIrs\fB, chtype \fIts\fB, chtype 
\fIbs\fB,\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint border(chtype \fIls\fP, chtype \fIrs\fP, chtype \fIts\fP, chtype 
\fIbs\fP,
            \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype 
\fIbr\fB);\fR
-.br
 \fBint wborder(WINDOW *\fIwin\fB, chtype \fIls\fB, chtype \fIrs\fB,\fR
             \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype 
\fItr\fB,\fR
             \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
-.sp
+.PP
 \fBint box(WINDOW *\fIwin\fB, chtype \fIverch\fB, chtype \fIhorch\fB);\fR
-.sp
+.PP
 \fBint hline(chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint whline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.sp
+.PP
 \fBint mvhline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint mvwhline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, 
int \fIn\fB);\fR
-.br
 \fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
-.br
 \fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, 
int \fIn\fB);\fR
+.fi
 .SH DESCRIPTION
 The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
 draw a box around the edges of a window.
diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x
index 00b43e53..e2195164 100644
--- a/man/curs_border_set.3x
+++ b/man/curs_border_set.3x
@@ -53,9 +53,10 @@ .SH NAME
 \fB\%mvwvline_set\fP \-
 draw borders and lines in a \fIcurses\fR window of wide characters
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint border_set(\fP
+.nf
+\fB#include <curses.h>
+.PP
+\fBint border_set(
    \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
    \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
    \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
@@ -67,43 +68,35 @@ .SH SYNOPSIS
    \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
    \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
    \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
-.br
 \fBint box_set(\fP
    \fBWINDOW *win\fP,
    \fBconst cchar_t *\fIverch\fR,
    \fBconst cchar_t *\fIhorch\fB);\fR
-.br
 \fBint hline_set(\fP
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint whline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvhline_set(\fP
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvwhline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint vline_set(\fP
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint wvline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvvline_set(\fP
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
-.br
 \fBint mvwvline_set(\fP
    \fBWINDOW *\fIwin\fR,
    \fBint \fIy\fR, \fBint \fIx\fR,
    \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+.fi
 .SH DESCRIPTION
 The
 \fBborder_set\fP
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index d59b321a..30ce4e09 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -44,23 +44,21 @@ .SH NAME
 \fB\%wclrtoeol\fP \-
 clear all or part of a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint erase(void);\fP
-.br
-\fBint werase(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clear(void);\fP
-.br
-\fBint wclear(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clrtobot(void);\fP
-.br
-\fBint wclrtobot(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint clrtoeol(void);\fP
-.br
-\fBint wclrtoeol(WINDOW *\fIwin\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint erase(void);
+\fBint werase(WINDOW *\fIwin\fP);
+.PP
+\fBint clear(void);
+\fBint wclear(WINDOW *\fIwin\fP);
+.PP
+\fBint clrtobot(void);
+\fBint wclrtobot(WINDOW *\fIwin\fP);
+.PP
+\fBint clrtoeol(void);
+\fBint wclrtoeol(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 .SS erase/werase
 The \fBerase\fP and \fBwerase\fP routines copy blanks to every
diff --git a/man/curs_color.3x b/man/curs_color.3x
index a004e0aa..3761a511 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -64,30 +64,30 @@ .SH NAME
 manipulate terminal colors with \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint start_color(void);\fP
+\fBint start_color(void);
 .PP
-\fBbool has_colors(void);\fP
-\fBbool can_change_color(void);\fP
+\fBbool has_colors(void);
+\fBbool can_change_color(void);
 .PP
-\fBint init_pair(short \fIpair\fB, short \fIf\fB, short \fIb\fB);\fR
-\fBint init_color(short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short 
\fIb\fB);\fR
-\fI/* extensions */\fP
-\fBint init_extended_pair(int \fIpair\fB, int \fIf\fB, int \fIb\fB);\fR
-\fBint init_extended_color(int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int 
\fIb\fB);\fR
+\fBint init_pair(short \fIpair\fP, short \fIf\fP, short \fIb\fP);
+\fBint init_color(short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short 
\fIb\fP);
+\fI/* extensions */
+\fBint init_extended_pair(int \fIpair\fP, int \fIf\fP, int \fIb\fP);
+\fBint init_extended_color(int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int 
\fIb\fP);
 .PP
-\fBint color_content(short \fIcolor\fB, short *\fIr\fB, short *\fIg\fB, short 
*\fIb\fB);\fR
-\fBint pair_content(short \fIpair\fB, short *\fIf\fB, short *\fIb\fB);\fR
-\fI/* extensions */\fP
-\fBint extended_color_content(int \fIcolor\fB, int *\fIr\fB, int *\fIg\fB, int 
*\fIb\fB);\fR
-\fBint extended_pair_content(int \fIpair\fB, int *\fIf\fB, int *\fIb\fB);\fR
+\fBint color_content(short \fIcolor\fP, short *\fIr\fP, short *\fIg\fP, short 
*\fIb\fP);
+\fBint pair_content(short \fIpair\fP, short *\fIf\fP, short *\fIb\fP);
+\fI/* extensions */
+\fBint extended_color_content(int \fIcolor\fP, int *\fIr\fP, int *\fIg\fP, int 
*\fIb\fP);
+\fBint extended_pair_content(int \fIpair\fP, int *\fIf\fP, int *\fIb\fP);
 .PP
-\fI/* extensions */\fP
-\fBvoid reset_color_pairs(void);\fP
+\fI/* extensions */
+\fBvoid reset_color_pairs(void);
 .PP
-\fBint COLOR_PAIR(int \fIn\fB);\fR
-\fBPAIR_NUMBER(\fIattrs\fB);\fR
+\fBint COLOR_PAIR(int \fIn\fP);
+\fBPAIR_NUMBER(\fIattrs\fP);
 .fi
 .SH DESCRIPTION
 .SS Overview
diff --git a/man/curs_delch.3x b/man/curs_delch.3x
index 09362c89..e985fb17 100644
--- a/man/curs_delch.3x
+++ b/man/curs_delch.3x
@@ -46,15 +46,14 @@ .SH NAME
 \fB\%mvwdelch\fP \-
 delete the character at the cursor in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint delch(void);\fP
-.br
-\fBint wdelch(WINDOW *\fIwin\fB);\fR
-.br
-\fBint mvdelch(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBint mvwdelch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint delch(void);
+\fBint wdelch(WINDOW *\fIwin\fP);
+\fBint mvdelch(int \fIy\fP, int \fIx\fP);
+\fBint mvwdelch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines delete the character under the cursor; all characters to the
 right of the cursor on the same line are moved to the left one position and the
diff --git a/man/curs_deleteln.3x b/man/curs_deleteln.3x
index 554af5f3..196b1583 100644
--- a/man/curs_deleteln.3x
+++ b/man/curs_deleteln.3x
@@ -38,19 +38,18 @@ .SH NAME
 \fB\%winsertln\fP \-
 delete or insert lines in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint deleteln(void);\fP
-.br
-\fBint wdeleteln(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint insdelln(int \fIn\fB);\fR
-.br
-\fBint winsdelln(WINDOW *\fIwin\fB, int \fIn\fB);\fR
-.sp
-\fBint insertln(void);\fP
-.br
-\fBint winsertln(WINDOW *\fIwin\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint deleteln(void);
+\fBint wdeleteln(WINDOW *\fIwin\fP);
+.PP
+\fBint insdelln(int \fIn\fP);
+\fBint winsdelln(WINDOW *\fIwin\fP, int \fIn\fP);
+.PP
+\fBint insertln(void);
+\fBint winsertln(WINDOW *\fIwin\fP);
+.fi
 .SH DESCRIPTION
 The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
 cursor in the window; all lines below the current line are moved up one line.
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 00020e3e..94b95e9d 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -46,11 +46,12 @@ .SH NAME
 \fB\%use_extended_names\fP \-
 miscellaneous \fIcurses\fR extensions
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBconst char * curses_version(void);\fP
-.br
-\fBint use_extended_names(bool \fIenable\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBconst char * curses_version(void);
+\fBint use_extended_names(bool \fIenable\fP);
+.fi
 .SH DESCRIPTION
 These functions are extensions to the curses library
 which do not fit easily into other categories.
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index bb22ea0d..f857aa58 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -52,17 +52,16 @@ .SH NAME
 \fB\%unget_wch\fP \-
 get (or push back) a wide character from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint get_wch(wint_t *\fIwch\fB);\fR
-.br
-\fBint wget_wch(WINDOW *\fIwin\fB, wint_t *\fIwch\fB);\fR
-.br
-\fBint mvget_wch(int \fIy\fB, int \fIx\fB, wint_t *\fIwch\fB);\fR
-.br
-\fBint mvwget_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t 
*\fIwch\fB);\fR
-.sp
-\fBint unget_wch(const wchar_t \fIwch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint get_wch(wint_t *\fIwch\fP);
+\fBint wget_wch(WINDOW *\fIwin\fP, wint_t *\fIwch\fP);
+\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
+\fBint mvwget_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t 
*\fIwch\fP);
+.PP
+\fBint unget_wch(const wchar_t \fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS wget_wch
 The
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index b3a694f3..912fd72f 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -56,23 +56,17 @@ .SH NAME
 get a wide-character string from a \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint get_wstr(wint_t *\fIwstr\fB);\fR
-.br
-\fBint getn_wstr(wint_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint wget_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB);\fR
-.br
-\fBint wgetn_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvget_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB);\fR
-.br
-\fBint mvgetn_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwget_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t 
*\fIwstr\fB);\fR
-.br
-\fBint mvwgetn_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t 
*\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint get_wstr(wint_t *\fIwstr\fP);
+\fBint getn_wstr(wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint wget_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP);
+\fBint wgetn_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
+\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwget_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t 
*\fIwstr\fP);
+\fBint mvwgetn_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t 
*\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 The function
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 68e1991a..f13c485f 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -38,31 +38,23 @@ .SH NAME
 \fB\%setcchar\fP \-
 convert between a wide-character string and a \fIcurses\fR complex character 
string
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint getcchar(\fP
-.br
+.nf
+\fB#include <curses.h>
+.PP
+\fBint getcchar(
 .B "        const cchar_t *\fIwcval\fP,"
-.br
 .B "        wchar_t *\fIwch\fP,"
-.br
 .B "        attr_t *\fIattrs\fP,"
-.br
 .B "        short *\fIcolor_pair\fP,"
-.br
 .B "        void *\fIopts\fP );"
-.sp
+.PP
 .B "int setcchar("
-.br
 .B "        cchar_t *\fIwcval\fP,"
-.br
 .B "        const wchar_t *\fIwch\fP,"
-.br
 .B "        const attr_t \fIattrs\fP,"
-.br
 .B "        short \fIcolor_pair\fP,"
-.br
 .B "        const void *\fIopts\fP );"
+.fi
 .SH DESCRIPTION
 .SS getcchar
 The \fBgetcchar\fP function gets a wide-character string
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 63b0da44..ca90eaea 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -54,22 +54,20 @@ .SH NAME
 \fB\%has_key\fP \-
 get (or push back) characters from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
+.nf
 .B #include <curses.h>
 .PP
 .B int getch(void);
-.br
-.B int wgetch(WINDOW *\fIwin\fB);
-.sp
-.B int mvgetch(int \fIy\fB, int \fIx\fB);
-.br
-.B int mvwgetch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);
-.sp
-.B int ungetch(int \fIch\fB);
-.sp
+.B int wgetch(WINDOW *\fIwin\fP);
+.PP
+.B int mvgetch(int \fIy\fP, int \fIx\fP);
+.B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.PP
+.B int ungetch(int \fIch\fP);
+.PP
 \fI/* extension */\fP
-.br
-.B int has_key(int \fIch\fB);
-.br
+.B int has_key(int \fIch\fP);
+.fi
 .SH DESCRIPTION
 .SS Reading characters
 The \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP and \fBmvwgetch\fP, routines read
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 7230b63e..e0b1cc5a 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -55,23 +55,19 @@ .SH NAME
 \fB\%mvwgetnstr\fP \-
 accept character strings from \fIcurses\fR terminal keyboard
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint getstr(char *\fIstr\fB);\fR
-.br
-\fBint getnstr(char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint wgetstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
-.br
-\fBint wgetnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvgetstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvwgetstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char 
*\fIstr\fB);\fR
-.br
-\fBint mvgetnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwgetnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char 
*\fIstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint getstr(char *\fIstr\fP);
+\fBint getnstr(char *\fIstr\fP, int \fIn\fP);
+\fBint wgetstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+\fBint wgetnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvwgetstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint mvwgetnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char 
*\fIstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 The function
 \fBwgetnstr\fP
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 887b4c28..98b3c7b5 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -37,12 +37,12 @@ .SH NAME
 get \fIcurses\fR cursor and window coordinates
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBvoid getyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getparyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getbegyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-\fBvoid getmaxyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+\fBvoid getyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getbegyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+\fBvoid getmaxyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .fi
 .SH DESCRIPTION
 The \fB\%getyx\fP macro places the current cursor position of the given window 
in
diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x
index 5f1b7688..f83ea759 100644
--- a/man/curs_in_wch.3x
+++ b/man/curs_in_wch.3x
@@ -46,15 +46,15 @@ .SH NAME
 \fB\%win_wch\fP \-
 get a \fIcurses\fR complex character from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint in_wch(cchar_t *\fIwcval\fB);\fR
-.br
-\fBint win_wch(WINDOW *\fIwin\fB, cchar_t *\fIwcval\fB);\fR
-.sp
-\fBint mvin_wch(int \fIy\fB, int \fIx\fB, cchar_t *\fIwcval\fB);\fR
-.br
-\fBint mvwin_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t 
*\fIwcval\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint in_wch(cchar_t *\fIwcval\fP);
+\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwcval\fP);
+.PP
+\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwcval\fP);
+\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t 
*\fIwcval\fP);
+.fi
 .SH DESCRIPTION
 These functions extract the complex character and rendition from
 the current position in the named window into the \fBcchar_t\fP object
diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x
index 1919396e..3fbcf39d 100644
--- a/man/curs_in_wchstr.3x
+++ b/man/curs_in_wchstr.3x
@@ -51,23 +51,17 @@ .SH NAME
 get a \fIcurses\fR complex character string from a window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint in_wchstr(cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint in_wchnstr(cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.br
-\fBint win_wchstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint win_wchnstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvin_wchstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB);\fR
-.br
-\fBint mvin_wchnstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwin_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t 
*\fIwchstr\fB);\fR
-.br
-\fBint mvwin_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t 
*\fIwchstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint in_wchstr(cchar_t *\fIwchstr\fP);
+\fBint in_wchnstr(cchar_t *\fIwchstr\fP, int \fIn\fP);
+\fBint win_wchstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP);
+\fBint win_wchnstr(WINDOW *\fIwin\fP, cchar_t *\fIwchstr\fP, int \fIn\fP);
+.PP
+\fBint mvin_wchstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP);
+\fBint mvin_wchnstr(int \fIy\fP, int \fIx\fP, cchar_t *\fIwchstr\fP, int 
\fIn\fP);
+\fBint mvwin_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t 
*\fIwchstr\fP);
+\fBint mvwin_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t 
*\fIwchstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These functions return an array of complex characters in \fIwchstr\fP,
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index 4081a3d6..10e2a35b 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -52,15 +52,15 @@ .SH NAME
 \fB\%mvwinch\fP \-
 get a \fIcurses\fR character from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBchtype inch(void);\fP
-.br
-\fBchtype winch(WINDOW *\fIwin\fB);\fR
-.sp
-\fBchtype mvinch(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBchtype mvwinch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBchtype inch(void);
+\fBchtype winch(WINDOW *\fIwin\fP);
+.PP
+\fBchtype mvinch(int \fIy\fP, int \fIx\fP);
+\fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines return the character, of type \fBchtype\fP, at the current
 position in the named window.
diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x
index a8351d5e..debfea86 100644
--- a/man/curs_inchstr.3x
+++ b/man/curs_inchstr.3x
@@ -55,23 +55,19 @@ .SH NAME
 \fB\%mvwinchnstr\fP \-
 get a \fIcurses\fR character string from a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint inchstr(chtype *\fIchstr\fB);\fR
-.br
-\fBint inchnstr(chtype *\fIchstr\fB, int \fIn\fB);\fR
-.br
-\fBint winchstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB);\fR
-.br
-\fBint winchnstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinchstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
-.br
-\fBint mvinchnstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwinchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype 
*\fIchstr\fB);\fR
-.br
-\fBint mvwinchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype 
*\fIchstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint inchstr(chtype *\fIchstr\fP);
+\fBint inchnstr(chtype *\fIchstr\fP, int \fIn\fP);
+\fBint winchstr(WINDOW *\fIwin\fP, chtype *\fIchstr\fP);
+\fBint winchnstr(WINDOW *\fIwin\fP, chtype *\fIchstr\fP, int \fIn\fP);
+.PP
+\fBint mvinchstr(int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP);
+\fBint mvinchnstr(int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP, int \fIn\fP);
+\fBint mvwinchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype 
*\fIchstr\fP);
+\fBint mvwinchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype 
*\fIchstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines return a NULL-terminated array of \fBchtype\fP quantities,
 starting at the current cursor position in the named window and ending at the
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index 93e20f2e..7202d0af 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -53,19 +53,18 @@ .SH NAME
 \fB\%delscreen\fP \-
 initialize, manipulate, or tear down \fIcurses\fR terminal interface
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBWINDOW *initscr(void);\fP
-.br
-\fBint endwin(void);\fP
-.sp
-\fBbool isendwin(void);\fP
-.sp
-\fBSCREEN *newterm(const char *\fItype\fB, FILE *\fIoutf\fB, FILE 
*\fIinf\fB);\fR
-.br
-\fBSCREEN *set_term(SCREEN *\fInew\fB);\fR
-.br
-\fBvoid delscreen(SCREEN* \fIsp\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBWINDOW *initscr(void);
+\fBint endwin(void);
+.PP
+\fBbool isendwin(void);
+.PP
+\fBSCREEN *newterm(const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
+\fBSCREEN *set_term(SCREEN *\fInew\fP);
+\fBvoid delscreen(SCREEN* \fIsp\fP);
+.fi
 .SH DESCRIPTION
 .SS initscr
 \fBinitscr\fP is normally the first \fBcurses\fP routine to call when
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index edc20cfb..98f6ed46 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -67,40 +67,40 @@ .SH NAME
 get and set \fIcurses\fR terminal input options
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint cbreak(void);\fP
-\fBint nocbreak(void);\fP
+\fBint cbreak(void);
+\fBint nocbreak(void);
 .PP
-\fBint echo(void);\fP
-\fBint noecho(void);\fP
+\fBint echo(void);
+\fBint noecho(void);
 .PP
-\fBint intrflush(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint keypad(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint meta(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint nodelay(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-\fBint notimeout(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+\fBint intrflush(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint keypad(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint meta(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint nodelay(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint notimeout(WINDOW *\fIwin\fP, bool \fIbf\fP);
 .PP
-\fBint nl(void);\fP
-\fBint nonl(void);\fP
+\fBint nl(void);
+\fBint nonl(void);
 .PP
-\fBint raw(void);\fP
-\fBint noraw(void);\fP
+\fBint raw(void);
+\fBint noraw(void);
 .PP
-\fBvoid qiflush(void);\fP
-\fBvoid noqiflush(void);\fP
+\fBvoid qiflush(void);
+\fBvoid noqiflush(void);
 .PP
-\fBint halfdelay(int \fItenths\fB);\fR
-\fBvoid timeout(int \fIdelay\fB);\fR
-\fBvoid wtimeout(WINDOW *\fIwin\fB, int \fIdelay\fB);\fR
+\fBint halfdelay(int \fItenths\fP);
+\fBvoid timeout(int \fIdelay\fP);
+\fBvoid wtimeout(WINDOW *\fIwin\fP, int \fIdelay\fP);
 .PP
-\fBint typeahead(int \fIfd\fB);\fR
+\fBint typeahead(int \fIfd\fP);
 .PP
-\fI/* extensions */\fP
-\fBint is_cbreak(void);\fP
-\fBint is_echo(void);\fP
-\fBint is_nl(void);\fP
-\fBint is_raw(void);\fP
+\fI/* extensions */
+\fBint is_cbreak(void);
+\fBint is_echo(void);
+\fBint is_nl(void);
+\fBint is_raw(void);
 .fi
 .SH DESCRIPTION
 The \fIncurses\fP library provides several functions which let an application
diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x
index b99ab2ae..965fde8f 100644
--- a/man/curs_ins_wch.3x
+++ b/man/curs_ins_wch.3x
@@ -46,15 +46,15 @@ .SH NAME
 \fB\%wins_wch\fP \-
 insert a \fIcurses\fR complex character string in a window
 .SH SYNOPSIS
+.nf
 #include <curses.h>
-.sp
-\fBint ins_wch(const cchar_t *\fIwch\fB);\fR
-.br
-\fBint wins_wch(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
-.sp
-\fBint mvins_wch(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwch\fB);\fR
-.br
-\fBint mvwins_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t 
*\fIwch\fB);\fR
+.PP
+\fBint ins_wch(const cchar_t *\fIwch\fP);
+\fBint wins_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+.PP
+\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+\fBint mvwins_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t 
*\fIwch\fP);
+.fi
 .SH DESCRIPTION
 These routines, insert the complex character \fIwch\fP with rendition
 before the character under the cursor.
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index a1c98fb2..e1354a09 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -51,23 +51,17 @@ .SH NAME
 insert a wide-character string in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.sp
-\fBint ins_wstr(const wchar_t *\fIwstr);\fR
-.br
-\fBint ins_nwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint wins_wstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint wins_nwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int 
\fIn\fB);\fR
-.sp
-\fBint mvins_wstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvins_nwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwins_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t 
*\fIwstr\fB);\fR
-.br
-\fBint mvwins_nwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t 
*\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint ins_wstr(const wchar_t *\fIwstr);
+\fBint ins_nwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint wins_wstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+\fBint wins_nwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int 
\fIn\fP);
+\fBint mvwins_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t 
*\fIwstr\fP);
+\fBint mvwins_nwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t 
*\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These routines insert a \fBwchar_t\fP character string
diff --git a/man/curs_insch.3x b/man/curs_insch.3x
index 87676763..567821eb 100644
--- a/man/curs_insch.3x
+++ b/man/curs_insch.3x
@@ -46,15 +46,15 @@ .SH NAME
 \fB\%mvwinsch\fP \-
 insert a \fIcurses\fR character in a window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint insch(chtype \fIch\fB);\fR
-.br
-\fBint winsch(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
-.sp
-\fBint mvinsch(int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
-.br
-\fBint mvwinsch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype 
\fIch\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint insch(chtype \fIch\fP);
+\fBint winsch(WINDOW *\fIwin\fP, chtype \fIch\fP);
+.PP
+\fBint mvinsch(int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+\fBint mvwinsch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+.fi
 .SH DESCRIPTION
 These routines insert the character \fIch\fP before the character under the
 cursor.
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 3717eb8f..b83231fd 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -50,23 +50,18 @@ .SH NAME
 \fB\%mvwinsnstr\fP \-
 insert a string in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.br
-\fBint insstr(const char *\fIstr\fB);\fR
-.br
-\fBint insnstr(const char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint winsstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
-.br
-\fBint winsnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinsstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
-.br
-\fBint mvinsnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwinsstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIstr\fB);\fR
-.br
-\fBint mvwinsnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIstr\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+\fBint insstr(const char *\fIstr\fP);
+\fBint insnstr(const char *\fIstr\fP, int \fIn\fP);
+\fBint winsstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+\fBint winsnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+\fBint mvwinsstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIstr\fP);
+\fBint mvwinsnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIstr\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines insert a character string
 (as many characters as will fit on the line)
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index 749182a2..f3a34f33 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -55,23 +55,19 @@ .SH NAME
 \fB\%mvwinnstr\fP \-
 get a string from a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint instr(char *\fIstr\fB);\fR
-.br
-\fBint innstr(char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint winstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
-.br
-\fBint winnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
-.br
-\fBint mvinnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
-.br
-\fBint mvwinstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char 
*\fIstr\fB);\fR
-.br
-\fBint mvwinnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, 
int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint instr(char *\fIstr\fP);
+\fBint innstr(char *\fIstr\fP, int \fIn\fP);
+\fBint winstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+\fBint winnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+.PP
+\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint mvwinstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+\fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, 
int \fIn\fP);
+.fi
 .SH DESCRIPTION
 These routines return a string of characters in \fIstr\fP, extracted starting
 at the current cursor position in the named window.
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index f20bb732..e19e5e35 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -51,23 +51,17 @@ .SH NAME
 get a wide-character string from a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h> \fP
-.sp
-\fBint inwstr(wchar_t *\fIwstr\fB);\fR
-.br
-\fBint innwstr(wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.br
-\fBint winwstr(WINDOW *\fIwin\fB, wchar_t *\fIwstr\fB);\fR
-.br
-\fBint winnwstr(WINDOW *\fIwin\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
-.sp
-\fBint mvinwstr(int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB);\fR
-.br
-\fBint mvinnwstr(int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int 
\fIn\fB);\fR
-.br
-\fBint mvwinwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t 
*\fIwstr\fB);\fR
-.br
-\fBint mvwinnwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t 
*\fIwstr\fB, int \fIn\fB);\fR
+\fB#include <curses.h>
+.PP
+\fBint inwstr(wchar_t *\fIwstr\fP);
+\fBint innwstr(wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint winwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP);
+\fBint winnwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+.PP
+\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
+\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint mvwinwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t 
*\fIwstr\fP);
+\fBint mvwinnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t 
*\fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index dba09916..1d42c59a 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -58,29 +58,25 @@ .SH NAME
 \fB\%napms\fP \-
 low-level \fIcurses\fR routines
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint def_prog_mode(void);\fP
-.br
-\fBint def_shell_mode(void);\fP
-.sp
-\fBint reset_prog_mode(void);\fP
-.br
-\fBint reset_shell_mode(void);\fP
-.sp
-\fBint resetty(void);\fP
-.br
-\fBint savetty(void);\fP
-.sp
-\fBvoid getsyx(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBvoid setsyx(int \fIy\fB, int \fIx\fB);\fR
-.sp
-\fBint ripoffline(int \fIline\fB, int (*\fIinit\fB)(WINDOW *, int));\fR
-.br
-\fBint curs_set(int \fIvisibility\fB);\fR
-.br
-\fBint napms(int \fIms\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint def_prog_mode(void);
+\fBint def_shell_mode(void);
+.PP
+\fBint reset_prog_mode(void);
+\fBint reset_shell_mode(void);
+.PP
+\fBint resetty(void);
+\fBint savetty(void);
+.PP
+\fBvoid getsyx(int \fIy\fP, int \fIx\fP);
+\fBvoid setsyx(int \fIy\fP, int \fIx\fP);
+.PP
+\fBint ripoffline(int \fIline\fP, int (*\fIinit\fP)(WINDOW *, int));
+\fBint curs_set(int \fIvisibility\fP);
+\fBint napms(int \fIms\fP);
+.fi
 .SH DESCRIPTION
 The following routines give low-level access
 to various \fBcurses\fP capabilities.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 233a2d06..299aca4a 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -46,21 +46,21 @@ .SH NAME
 get \fIcurses\fR cursor and window coordinates or attributes (legacy)
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint getattrs(const WINDOW *\fIwin\fB);\fR
+\fBint getattrs(const WINDOW *\fIwin\fP);
 .PP
-\fBint getbegx(const WINDOW *\fIwin\fB);\fR
-\fBint getbegy(const WINDOW *\fIwin\fB);\fR
+\fBint getbegx(const WINDOW *\fIwin\fP);
+\fBint getbegy(const WINDOW *\fIwin\fP);
 .PP
-\fBint getcurx(const WINDOW *\fIwin\fB);\fR
-\fBint getcury(const WINDOW *\fIwin\fB);\fR
+\fBint getcurx(const WINDOW *\fIwin\fP);
+\fBint getcury(const WINDOW *\fIwin\fP);
 .PP
-\fBint getmaxx(const WINDOW *\fIwin\fB);\fR
-\fBint getmaxy(const WINDOW *\fIwin\fB);\fR
+\fBint getmaxx(const WINDOW *\fIwin\fP);
+\fBint getmaxy(const WINDOW *\fIwin\fP);
 .PP
-\fBint getparx(const WINDOW *\fIwin\fB);\fR
-\fBint getpary(const WINDOW *\fIwin\fB);\fR
+\fBint getparx(const WINDOW *\fIwin\fP);
+\fBint getpary(const WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
 These legacy functions are simpler to use than the X/Open \fIcurses\fP 
functions:
diff --git a/man/curs_memleaks.3x b/man/curs_memleaks.3x
index 532ac47b..68cadb91 100644
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -50,16 +50,16 @@ .SH NAME
 check for memory leaks in \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-\fBvoid exit_curses(int \fIcode\fB);\fR
+\fB#include <curses.h>
+\fBvoid exit_curses(int \fIcode\fP);
 .PP
-\fB#include <term.h>\fP
-\fBvoid exit_terminfo(int \fIcode\fB);\fR
+\fB#include <term.h>
+\fBvoid exit_terminfo(int \fIcode\fP);
 .PP
-\fI/* deprecated (intentionally not declared in curses.h or term.h) */\fP
-\fBvoid _nc_freeall(void);\fP
-\fBvoid _nc_free_and_exit(int \fIcode\fB);\fR
-\fBvoid _nc_free_tinfo(int \fIcode\fB);\fR
+\fI/* deprecated (intentionally not declared in curses.h or term.h) */
+\fBvoid _nc_freeall(void);
+\fBvoid _nc_free_and_exit(int \fIcode\fP);
+\fBvoid _nc_free_tinfo(int \fIcode\fP);
 .fi
 .SH DESCRIPTION
 These functions are used to simplify analysis of memory leaks in the ncurses
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 02f2a4a4..2422ebec 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -57,27 +57,27 @@ .SH NAME
 get mouse events in \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBtypedef unsigned long mmask_t;\fP
+\fBtypedef unsigned long mmask_t;
 .PP
-\fBtypedef struct {\fP
-\fB    short id;         \fI/* ID to distinguish multiple devices */\fR
-\fB    int x, y, z;      \fI/* event coordinates */\fR
-\fB    mmask_t bstate;   \fI/* button state bits */\fR
-\fB} MEVENT;\fP
+\fBtypedef struct {
+\fB    short id;         \fI/* ID to distinguish multiple devices */
+\fB    int x, y, z;      \fI/* event coordinates */
+\fB    mmask_t bstate;   \fI/* button state bits */
+\fB} MEVENT;
 .PP
-\fBbool has_mouse(void);\fP
+\fBbool has_mouse(void);
 .PP
-\fBint getmouse(MEVENT *\fIevent\fB);\fR
-\fBint ungetmouse(MEVENT *\fIevent\fB);\fR
+\fBint getmouse(MEVENT *\fIevent\fP);
+\fBint ungetmouse(MEVENT *\fIevent\fP);
 .PP
-\fBmmask_t mousemask(mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
+\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
 .PP
-\fBbool wenclose(const WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+\fBbool wenclose(const WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
 .PP
-\fBbool mouse_trafo(int* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
-\fBbool wmouse_trafo(const WINDOW* \fIwin\fB,\fR
+\fBbool mouse_trafo(int* \fIpY\fP, int* \fIpX\fP, bool \fIto_screen\fP);
+\fBbool wmouse_trafo(const WINDOW* \fIwin\fP,
                   \fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
 .PP
 \fBint mouseinterval(int \fIerval\fB);\fR
diff --git a/man/curs_move.3x b/man/curs_move.3x
index 3431cc1f..12d47cd6 100644
--- a/man/curs_move.3x
+++ b/man/curs_move.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fB\%wmove\fP \-
 move cursor in a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint move(int \fIy\fB, int \fIx\fB);\fR
-.br
-\fBint wmove(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint move(int \fIy\fP, int \fIx\fP);
+\fBint wmove(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
+.fi
 .SH DESCRIPTION
 These routines move the cursor associated with the window to line \fIy\fP and
 column \fIx\fP.
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index 34f187b9..60cae8f0 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -58,24 +58,24 @@ .SH NAME
 obtain \fIcurses\fR window properties
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBbool is_cleared(const WINDOW *\fIwin\fB);\fR
-\fBbool is_idcok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_idlok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_immedok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_keypad(const WINDOW *\fIwin\fB);\fR
-\fBbool is_leaveok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_nodelay(const WINDOW *\fIwin\fB);\fR
-\fBbool is_notimeout(const WINDOW *\fIwin\fB);\fR
-\fBbool is_pad(const WINDOW *\fIwin\fB);\fR
-\fBbool is_scrollok(const WINDOW *\fIwin\fB);\fR
-\fBbool is_subwin(const WINDOW *\fIwin\fB);\fR
-\fBbool is_syncok(const WINDOW *\fIwin\fB);\fR
+\fBbool is_cleared(const WINDOW *\fIwin\fP);
+\fBbool is_idcok(const WINDOW *\fIwin\fP);
+\fBbool is_idlok(const WINDOW *\fIwin\fP);
+\fBbool is_immedok(const WINDOW *\fIwin\fP);
+\fBbool is_keypad(const WINDOW *\fIwin\fP);
+\fBbool is_leaveok(const WINDOW *\fIwin\fP);
+\fBbool is_nodelay(const WINDOW *\fIwin\fP);
+\fBbool is_notimeout(const WINDOW *\fIwin\fP);
+\fBbool is_pad(const WINDOW *\fIwin\fP);
+\fBbool is_scrollok(const WINDOW *\fIwin\fP);
+\fBbool is_subwin(const WINDOW *\fIwin\fP);
+\fBbool is_syncok(const WINDOW *\fIwin\fP);
 .PP
-\fBWINDOW * wgetparent(const WINDOW *\fIwin\fB);\fR
-\fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
-\fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int 
*\fIbottom\fB);\fR
+\fBWINDOW * wgetparent(const WINDOW *\fIwin\fP);
+\fBint wgetdelay(const WINDOW *\fIwin\fP);
+\fBint wgetscrreg(const WINDOW *\fIwin\fP, int *\fItop\fP, int *\fIbottom\fP);
 .fi
 .SH DESCRIPTION
 \fIncurses\fP provides functions returning properties of a
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index 3f0bfdae..a2e6c1da 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -44,23 +44,19 @@ .SH NAME
 \fB\%scrollok\fP \-
 set \fIcurses\fR output options
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint clearok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint idlok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBvoid idcok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBvoid immedok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint leaveok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
-\fBint scrollok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.sp
-\fBint setscrreg(int \fItop\fB, int \fIbot\fB);\fR
-.br
-\fBint wsetscrreg(WINDOW *\fIwin\fB, int \fItop\fB, int \fIbot\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+\fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+.PP
+\fBint setscrreg(int \fItop\fP, int \fIbot\fP);
+\fBint wsetscrreg(WINDOW *\fIwin\fP, int \fItop\fP, int \fIbot\fP);
+.fi
 .SH DESCRIPTION
 These routines set options that change the style of output within
 \fBcurses\fP.
diff --git a/man/curs_overlay.3x b/man/curs_overlay.3x
index c582152c..119f5dac 100644
--- a/man/curs_overlay.3x
+++ b/man/curs_overlay.3x
@@ -35,15 +35,15 @@ .SH NAME
 \fB\%copywin\fP \-
 overlay \fIcurses\fR windows and manipulate them
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint overlay(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
-.br
-\fBint overwrite(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
-.br
-\fBint copywin(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB, int 
\fIsminrow\fB,\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint overlay(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP);
+\fBint overwrite(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP);
+\fBint copywin(const WINDOW *\fIsrcwin\fP, WINDOW *\fIdstwin\fP, int 
\fIsminrow\fP,
       \fBint \fIsmincol\fB, int \fIdminrow\fB, int \fIdmincol\fB, int 
\fIdmaxrow\fB,\fR
       \fBint \fIdmaxcol\fB, int \fIoverlay\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS overlay, overwrite
 The \fBoverlay\fP and \fBoverwrite\fP routines overlay \fIsrcwin\fP on
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index 2c58047c..3f760d05 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -43,10 +43,10 @@ .SH NAME
 create and display \fIcurses\fR pads
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBWINDOW *newpad(int \fInlines\fB, int \fIncols\fB);\fR
-\fBWINDOW *subpad(WINDOW *\fIorig\fB, int \fInlines\fB, int \fIncols\fB,\fR
+\fBWINDOW *newpad(int \fInlines\fP, int \fIncols\fP);
+\fBWINDOW *subpad(WINDOW *\fIorig\fP, int \fInlines\fP, int \fIncols\fP,
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
 \fBint prefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
       \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int 
\fIsmaxcol\fB);\fR
diff --git a/man/curs_print.3x b/man/curs_print.3x
index a3a5b48b..b3d76fd1 100644
--- a/man/curs_print.3x
+++ b/man/curs_print.3x
@@ -33,9 +33,11 @@ .SH NAME
 \fB\%mcprint\fP \-
 write binary data to printer using \fIterminfo\fR capabilities
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint mcprint(char *\fIdata\fB, int \fIlen\fB);\fR
+\fBint mcprint(char *\fIdata\fP, int \fIlen\fP);
+.fi
 .SH DESCRIPTION
 This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
 if they are present, to ship given data to a printer attached to the terminal.
diff --git a/man/curs_printw.3x b/man/curs_printw.3x
index 365ffb52..1509a863 100644
--- a/man/curs_printw.3x
+++ b/man/curs_printw.3x
@@ -53,21 +53,18 @@ .SH NAME
 \fB\%vw_printw\fP \-
 write formatted output to \fIcurses\fR windows
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint printw(const char *\fIfmt\fB, ...);\fR
-.br
-\fBint wprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvprintw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvwprintw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIfmt\fB, ...);\fR
-.br
-\fBint vw_printw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list 
\fIvarglist\fB);\fR
-.sp
+.nf
+\fB#include <curses.h>
+.PP
+\fBint printw(const char *\fIfmt\fP, ...);
+\fBint wprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, ...);
+\fBint mvprintw(int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+\fBint mvwprintw(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIfmt\fP, ...);
+\fBint vw_printw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list 
\fIvarglist\fP);
+.PP
 \fI/* obsolete */\fP
-.br
-\fBint vwprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list 
\fIvarglist\fB);\fR
+\fBint vwprintw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list 
\fIvarglist\fP);
+.fi
 .SH DESCRIPTION
 The \fBprintw\fP, \fBwprintw\fP, \fBmvprintw\fP and \fBmvwprintw\fP
 routines are analogous to \fBprintf\fP [see \fBprintf\fP(3)].
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 3edb1f3d..577aa4e9 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -53,19 +53,17 @@ .SH NAME
 \fB\%wrefresh\fP \-
 refresh \fIcurses\fR windows or lines thereupon
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint refresh(void);\fP
-.br
-\fBint wrefresh(WINDOW *\fIwin\fB);\fR
-.br
-\fBint wnoutrefresh(WINDOW *\fIwin\fB);\fR
-.br
-\fBint doupdate(void);\fP
-.sp
-\fBint redrawwin(WINDOW *\fIwin\fB);\fR
-.br
-\fBint wredrawln(WINDOW *\fIwin\fB, int \fIbeg_line\fB, int 
\fInum_lines\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint refresh(void);
+\fBint wrefresh(WINDOW *\fIwin\fP);
+\fBint wnoutrefresh(WINDOW *\fIwin\fP);
+\fBint doupdate(void);
+.PP
+\fBint redrawwin(WINDOW *\fIwin\fP);
+\fBint wredrawln(WINDOW *\fIwin\fP, int \fIbeg_line\fP, int \fInum_lines\fP);
+.fi
 .SH DESCRIPTION
 .SS refresh/wrefresh
 The \fBrefresh\fP and \fBwrefresh\fP routines (or \fBwnoutrefresh\fP and
diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x
index ff415fe8..406c0d30 100644
--- a/man/curs_scanw.3x
+++ b/man/curs_scanw.3x
@@ -53,21 +53,19 @@ .SH NAME
 \fB\%vw_scanw\fP \-
 read formatted input from a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scanw(const char *\fIfmt\fB, ...);\fR
-.br
-\fBint wscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvscanw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
-.br
-\fBint mvwscanw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char 
*\fIfmt\fB, ...);\fR
-.sp
-\fBint vw_scanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list 
\fIvarglist\fB);\fR
-.sp
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scanw(const char *\fIfmt\fP, ...);
+\fBint wscanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, ...);
+\fBint mvscanw(int \fIy\fP, int \fIx\fP, const char *\fIfmt\fP, ...);
+\fBint mvwscanw(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char 
*\fIfmt\fP, ...);
+.PP
+\fBint vw_scanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list 
\fIvarglist\fP);
+.PP
 \fI/* obsolete */\fP
-.br
-\fBint vwscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list 
\fIvarglist\fB);\fR
+\fBint vwscanw(WINDOW *\fIwin\fP, const char *\fIfmt\fP, va_list 
\fIvarglist\fP);
+.fi
 .SH DESCRIPTION
 The \fBscanw\fP, \fBwscanw\fP and \fBmvscanw\fP routines are analogous to
 \fBscanf\fP [see \fBscanf\fP(3)].
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 077f3dab..90616c0f 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -51,15 +51,14 @@ .SH NAME
 \fB\%scr_set\fP \-
 read/write a \fIcurses\fR screen from/to a file
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scr_dump(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_restore(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_init(const char *\fIfilename\fB);\fR
-.br
-\fBint scr_set(const char *\fIfilename\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scr_dump(const char *\fIfilename\fP);
+\fBint scr_restore(const char *\fIfilename\fP);
+\fBint scr_init(const char *\fIfilename\fP);
+\fBint scr_set(const char *\fIfilename\fP);
+.fi
 .SH DESCRIPTION
 .SS scr_dump
 The \fBscr_dump\fP routine dumps the current contents
diff --git a/man/curs_scroll.3x b/man/curs_scroll.3x
index b80545d3..d3178e7f 100644
--- a/man/curs_scroll.3x
+++ b/man/curs_scroll.3x
@@ -45,13 +45,14 @@ .SH NAME
 \fB\%wscrl\fP \-
 scroll a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint scroll(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint scrl(int \fIn\fB);\fR
-.br
-\fBint wscrl(WINDOW *\fIwin\fB, int \fIn\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint scroll(WINDOW *\fIwin\fP);
+.PP
+\fBint scrl(int \fIn\fP);
+\fBint wscrl(WINDOW *\fIwin\fP, int \fIn\fP);
+.fi
 .SH DESCRIPTION
 The \fBscroll\fP routine scrolls the window up one line.
 This involves moving
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 0de9dc19..cfc80755 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -66,33 +66,33 @@ .SH NAME
 \fIcurses\fR soft label key routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint slk_init(int \fIfmt\fB);\fR
+\fBint slk_init(int \fIfmt\fP);
 .PP
-\fBint slk_set(int \fIlabnum\fB, const char *\fIlabel\fB, int \fIfmt\fB);\fR
-\fBint slk_wset(int \fIlabnum\fB, const wchar_t *\fIlabel\fB, int 
\fIfmt\fB);\fR
+\fBint slk_set(int \fIlabnum\fP, const char *\fIlabel\fP, int \fIfmt\fP);
+\fBint slk_wset(int \fIlabnum\fP, const wchar_t *\fIlabel\fP, int \fIfmt\fP);
 .PP
-\fBchar *slk_label(int \fIlabnum\fB);\fR
+\fBchar *slk_label(int \fIlabnum\fP);
 .PP
-\fBint slk_refresh(void);\fP
-\fBint slk_noutrefresh(void);\fP
-\fBint slk_clear(void);\fP
-\fBint slk_restore(void);\fP
-\fBint slk_touch(void);\fP
+\fBint slk_refresh(void);
+\fBint slk_noutrefresh(void);
+\fBint slk_clear(void);
+\fBint slk_restore(void);
+\fBint slk_touch(void);
 .PP
-\fBint slk_attron(const chtype \fIattrs\fB);\fR
-\fBint slk_attroff(const chtype \fIattrs\fB);\fR
-\fBint slk_attrset(const chtype \fIattrs\fB);\fR
-\fBint slk_attr_on(attr_t \fIattrs\fB, void* \fIopts\fB);\fR
-\fBint slk_attr_off(const attr_t \fIattrs\fB, void * \fIopts\fB);\fR
-\fBint slk_attr_set(const attr_t \fIattrs\fB, short \fIpair\fB, void* 
\fIopts\fB);\fR
-\fI/* extension */\fP
-\fBattr_t slk_attr(void);\fP
+\fBint slk_attron(const chtype \fIattrs\fP);
+\fBint slk_attroff(const chtype \fIattrs\fP);
+\fBint slk_attrset(const chtype \fIattrs\fP);
+\fBint slk_attr_on(attr_t \fIattrs\fP, void* \fIopts\fP);
+\fBint slk_attr_off(const attr_t \fIattrs\fP, void * \fIopts\fP);
+\fBint slk_attr_set(const attr_t \fIattrs\fP, short \fIpair\fP, void* 
\fIopts\fP);
+\fI/* extension */
+\fBattr_t slk_attr(void);
 .PP
-\fBint slk_color(short \fIpair\fB);\fR
-\fI/* extension */\fP
-\fBint extended_slk_color(int \fIpair\fB);\fR
+\fBint slk_color(short \fIpair\fP);
+\fI/* extension */
+\fBint extended_slk_color(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
 The \fBslk\fP* functions manipulate the set of soft function-key labels that 
exist on
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index 723f3084..bfd8d614 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -43,174 +43,173 @@ .SH NAME
 \fB\%curs_sp_funcs\fP \-
 \fIcurses\fR screen-pointer extension
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .nf
 .PP
-\fBint alloc_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint assume_default_colors_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int 
\fIbg\fB);\fR
-\fBint baudrate_sp(SCREEN* \fIsp\fB);\fR
-\fBint beep_sp(SCREEN* \fIsp\fB);\fR
-\fBbool can_change_color_sp(SCREEN* \fIsp\fB);\fR
-\fBint cbreak_sp(SCREEN* \fIsp\fB);\fR
-\fBint color_content_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short* \fIr\fB, 
short* \fIg\fB, short* \fIb\fB);\fR
-\fBint curs_set_sp(SCREEN* \fIsp\fB, int \fIvisibility\fR);\fR
-\fBint def_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint def_shell_mode_sp(SCREEN* \fIsp\fB);\fR
+\fBint alloc_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint assume_default_colors_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint baudrate_sp(SCREEN* \fIsp\fP);
+\fBint beep_sp(SCREEN* \fIsp\fP);
+\fBbool can_change_color_sp(SCREEN* \fIsp\fP);
+\fBint cbreak_sp(SCREEN* \fIsp\fP);
+\fBint color_content_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short* \fIr\fP, 
short* \fIg\fP, short* \fIb\fP);
+\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fR);
+\fBint def_prog_mode_sp(SCREEN* \fIsp\fP);
+\fBint def_shell_mode_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint define_key_sp(SCREEN* \fIsp\fB, const char * \fIdefinition\fB, int 
\fIkeycode\fB);\fR
-\fBint delay_output_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBint doupdate_sp(SCREEN* \fIsp\fB);\fR
-\fBint echo_sp(SCREEN* \fIsp\fB);\fR
-\fBint endwin_sp(SCREEN* \fIsp\fB);\fR
-\fBchar erasechar_sp(SCREEN* \fIsp\fB);\fR
-\fBint erasewchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-\fBint extended_color_content_sp(SCREEN * \fIsp\fB, int \fIcolor\fB, int * 
\fIr\fB, int * \fIg\fB, int * \fIb\fB);\fR
-\fBint extended_pair_content_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int * 
\fIfg\fB, int * \fIbg\fB);\fR
-\fBint extended_slk_color_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
+\fBint define_key_sp(SCREEN* \fIsp\fP, const char * \fIdefinition\fP, int 
\fIkeycode\fP);
+\fBint delay_output_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBint doupdate_sp(SCREEN* \fIsp\fP);
+\fBint echo_sp(SCREEN* \fIsp\fP);
+\fBint endwin_sp(SCREEN* \fIsp\fP);
+\fBchar erasechar_sp(SCREEN* \fIsp\fP);
+\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBint extended_color_content_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int * 
\fIr\fP, int * \fIg\fP, int * \fIb\fP);
+\fBint extended_pair_content_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int * 
\fIfg\fP, int * \fIbg\fP);
+\fBint extended_slk_color_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
 .PP
-\fBvoid filter_sp(SCREEN* \fIsp\fB);\fR
-\fBint find_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
-\fBint flash_sp(SCREEN* \fIsp\fB);\fR
-\fBint flushinp_sp(SCREEN* \fIsp\fB);\fR
-\fBint free_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
-\fBint get_escdelay_sp(SCREEN* \fIsp\fB);\fR
-\fBint getmouse_sp(SCREEN* \fIsp\fB, MEVENT* \fIevent\fB);\fR
-\fBWINDOW* getwin_sp(SCREEN* \fIsp\fB, FILE* \fIfilep\fB);\fR
-\fBint halfdelay_sp(SCREEN* \fIsp\fB, int \fItenths\fB);\fR
-\fBbool has_colors_sp(SCREEN* \fIsp\fB);\fR
+\fBvoid filter_sp(SCREEN* \fIsp\fP);
+\fBint find_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+\fBint flash_sp(SCREEN* \fIsp\fP);
+\fBint flushinp_sp(SCREEN* \fIsp\fP);
+\fBint free_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
+\fBint get_escdelay_sp(SCREEN* \fIsp\fP);
+\fBint getmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+\fBWINDOW* getwin_sp(SCREEN* \fIsp\fP, FILE* \fIfilep\fP);
+\fBint halfdelay_sp(SCREEN* \fIsp\fP, int \fItenths\fP);
+\fBbool has_colors_sp(SCREEN* \fIsp\fP);
 .PP
-\fBbool has_ic_sp(SCREEN* \fIsp\fB);\fR
-\fBbool has_il_sp(SCREEN* \fIsp\fB);\fR
-\fBint has_key_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-\fBbool has_mouse_sp(SCREEN* \fIsp\fB);\fR
-\fBint init_color_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short \fIr\fB, short 
\fIg\fB, short \fIb\fB);\fR
-\fBint init_extended_color_sp(SCREEN* \fIsp\fB, int \fIcolor\fB, int \fIr\fB, 
int \fIg\fB, int \fIb\fB);\fR
-\fBint init_extended_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int \fIfg\fB, 
int \fIbg\fB);\fR
-\fBint init_pair_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short \fIfg\fB, short 
\fIbg\fB);\fR
-\fBint intrflush_sp(SCREEN* \fIsp\fB, WINDOW* \fIwin\fB, bool \fIbf\fB);\fR
-\fBint is_cbreak_sp(SCREEN* \fIsp\fB);\fR
+\fBbool has_ic_sp(SCREEN* \fIsp\fP);
+\fBbool has_il_sp(SCREEN* \fIsp\fP);
+\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBbool has_mouse_sp(SCREEN* \fIsp\fP);
+\fBint init_color_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short 
\fIg\fP, short \fIb\fP);
+\fBint init_extended_color_sp(SCREEN* \fIsp\fP, int \fIcolor\fP, int \fIr\fP, 
int \fIg\fP, int \fIb\fP);
+\fBint init_extended_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int \fIfg\fP, 
int \fIbg\fP);
+\fBint init_pair_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short 
\fIbg\fP);
+\fBint intrflush_sp(SCREEN* \fIsp\fP, WINDOW* \fIwin\fP, bool \fIbf\fP);
+\fBint is_cbreak_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint is_echo_sp(SCREEN* \fIsp\fB);\fR
-\fBint is_nl_sp(SCREEN* \fIsp\fB);\fR
-\fBint is_raw_sp(SCREEN* \fIsp\fB);\fR
-\fBbool is_term_resized_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int 
\fIcolumns\fB);\fR
-\fBbool isendwin_sp(SCREEN* \fIsp\fB);\fR
-\fBint key_defined_sp(SCREEN* \fIsp\fB, const char *\fIdefinition\fB);\fR
-\fBchar* keybound_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, int \fIcount\fB);\fR
-\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
-\fBint keyok_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, bool \fIenable\fB);\fR
-\fBchar killchar_sp(SCREEN* \fIsp\fB);\fR
+\fBint is_echo_sp(SCREEN* \fIsp\fP);
+\fBint is_nl_sp(SCREEN* \fIsp\fP);
+\fBint is_raw_sp(SCREEN* \fIsp\fP);
+\fBbool is_term_resized_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int 
\fIcolumns\fP);
+\fBbool isendwin_sp(SCREEN* \fIsp\fP);
+\fBint key_defined_sp(SCREEN* \fIsp\fP, const char *\fIdefinition\fP);
+\fBchar* keybound_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
+\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fP, int \fIc\fP);
+\fBint keyok_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
+\fBchar killchar_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint killwchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
-\fBchar* longname_sp(SCREEN* \fIsp\fB);\fR
-\fBint mcprint_sp(SCREEN* \fIsp\fB, char *\fIdata\fB, int \fIlen\fB);\fR
-\fBint mouseinterval_sp(SCREEN* \fIsp\fB, int \fIerval\fB);\fR
-\fBmmask_t mousemask_sp(SCREEN* \fIsp\fB, mmask_t \fInewmask\fB, mmask_t 
*\fIoldmask\fB);\fR
-\fBint mvcur_sp(SCREEN* \fIsp\fB, int \fIoldrow\fB, int \fIoldcol\fB, int 
\fInewrow\fB, int \fInewcol\fB);\fR
-\fBint napms_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBWINDOW* newpad_sp(SCREEN* \fIsp\fB, int \fInrows\fB, int \fIncols\fB);\fR
-\fBSCREEN* new_prescr(void);\fP
-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fB, const char *\fItype\fB, FILE 
*\fIoutfd\fB, FILE *\fIinfd\fB);\fR
+\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIch\fP);
+\fBchar* longname_sp(SCREEN* \fIsp\fP);
+\fBint mcprint_sp(SCREEN* \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
+\fBint mouseinterval_sp(SCREEN* \fIsp\fP, int \fIerval\fP);
+\fBmmask_t mousemask_sp(SCREEN* \fIsp\fP, mmask_t \fInewmask\fP, mmask_t 
*\fIoldmask\fP);
+\fBint mvcur_sp(SCREEN* \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int 
\fInewrow\fP, int \fInewcol\fP);
+\fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
+\fBSCREEN* new_prescr(void);
+\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE 
*\fIoutfd\fP, FILE *\fIinfd\fP);
 .PP
-\fBWINDOW* newwin_sp(SCREEN* \fIsp\fB, int \fInlines\fB, int \fIncols\fB, int 
\fIbegin_y\fB, int \fIbegin_x\fB);\fR
-\fBint nl_sp(SCREEN* \fIsp\fB);\fR
-\fBint nocbreak_sp(SCREEN* \fIsp\fB);\fR
-\fBint noecho_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid nofilter_sp(SCREEN* \fIsp\fB);\fR
-\fBint nonl_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid noqiflush_sp(SCREEN* \fIsp\fB);\fR
-\fBint noraw_sp(SCREEN* \fIsp\fB);\fR
-\fBint pair_content_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short* \fIfg\fB, 
short* \fIbg\fB);\fR
-\fBvoid qiflush_sp(SCREEN* \fIsp\fB);\fR
+\fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int 
\fIbegin_y\fP, int \fIbegin_x\fP);
+\fBint nl_sp(SCREEN* \fIsp\fP);
+\fBint nocbreak_sp(SCREEN* \fIsp\fP);
+\fBint noecho_sp(SCREEN* \fIsp\fP);
+\fBvoid nofilter_sp(SCREEN* \fIsp\fP);
+\fBint nonl_sp(SCREEN* \fIsp\fP);
+\fBvoid noqiflush_sp(SCREEN* \fIsp\fP);
+\fBint noraw_sp(SCREEN* \fIsp\fP);
+\fBint pair_content_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short* \fIfg\fP, 
short* \fIbg\fP);
+\fBvoid qiflush_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint raw_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fB);\fR
-\fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint reset_shell_mode_sp(SCREEN* \fIsp\fB);\fR
-\fBint resetty_sp(SCREEN* \fIsp\fB);\fR
-\fBint resize_term_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resizeterm_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint ripoffline_sp(SCREEN* \fIsp\fB, int \fIline\fB, int 
(*\fIinit\fB)(WINDOW* \fIwin\fB, int \fIfmt\fB));\fR
-\fBint savetty_sp(SCREEN* \fIsp\fB);\fR
-\fBint scr_init_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
+\fBint raw_sp(SCREEN* \fIsp\fP);
+\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fP);
+\fBint reset_prog_mode_sp(SCREEN* \fIsp\fP);
+\fBint reset_shell_mode_sp(SCREEN* \fIsp\fP);
+\fBint resetty_sp(SCREEN* \fIsp\fP);
+\fBint resize_term_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint resizeterm_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+\fBint ripoffline_sp(SCREEN* \fIsp\fP, int \fIline\fP, int 
(*\fIinit\fP)(WINDOW* \fIwin\fP, int \fIfmt\fP));
+\fBint savetty_sp(SCREEN* \fIsp\fP);
+\fBint scr_init_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
 .PP
-\fBint scr_restore_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-\fBint scr_set_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
-\fBint set_escdelay_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
-\fBint set_tabsize_sp(SCREEN* \fIsp\fB, int \fIcols\fB);\fR
-\fBint slk_attrset_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBint slk_attr_set_sp(SCREEN* \fIsp\fB, const attr_t \fIattrs\fB, short 
\fIpair\fB, void*\fIopts\fB);\fR
-\fBint slk_attroff_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBint slk_attron_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
-\fBattr_t slk_attr_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_clear_sp(SCREEN* \fIsp\fB);\fR
+\fBint scr_restore_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+\fBint scr_set_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+\fBint set_escdelay_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+\fBint set_tabsize_sp(SCREEN* \fIsp\fP, int \fIcols\fP);
+\fBint slk_attrset_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attr_set_sp(SCREEN* \fIsp\fP, const attr_t \fIattrs\fP, short 
\fIpair\fP, void*\fIopts\fP);
+\fBint slk_attroff_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBint slk_attron_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+\fBattr_t slk_attr_sp(SCREEN* \fIsp\fP);
+\fBint slk_clear_sp(SCREEN* \fIsp\fP);
 .PP
-\fBint slk_color_sp(SCREEN* \fIsp\fB, short \fIpair\fB);\fR
-\fBint slk_init_sp(SCREEN* \fIsp\fB, int \fIfmt\fB);\fR
-\fBchar* slk_label_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB);\fR
-\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_refresh_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_restore_sp(SCREEN* \fIsp\fB);\fR
-\fBint slk_set_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB, const char * 
\fIlabel\fB, int \fIfmt\fB);\fR
-\fBint slk_touch_sp(SCREEN* \fIsp\fB);\fR
-\fBint start_color_sp(SCREEN* \fIsp\fB);\fR
-\fBattr_t term_attrs_sp(SCREEN* \fIsp\fB);\fR
+\fBint slk_color_sp(SCREEN* \fIsp\fP, short \fIpair\fP);
+\fBint slk_init_sp(SCREEN* \fIsp\fP, int \fIfmt\fP);
+\fBchar* slk_label_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP);
+\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fP);
+\fBint slk_refresh_sp(SCREEN* \fIsp\fP);
+\fBint slk_restore_sp(SCREEN* \fIsp\fP);
+\fBint slk_set_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP, const char * 
\fIlabel\fP, int \fIfmt\fP);
+\fBint slk_touch_sp(SCREEN* \fIsp\fP);
+\fBint start_color_sp(SCREEN* \fIsp\fP);
+\fBattr_t term_attrs_sp(SCREEN* \fIsp\fP);
 .PP
-\fBchtype termattrs_sp(SCREEN* \fIsp\fB);\fR
-\fBchar* termname_sp(SCREEN* \fIsp\fB);\fR
-\fBint typeahead_sp(SCREEN* \fIsp\fB, int \fIfd\fB);\fR
-\fBint unget_wch_sp(SCREEN* \fIsp\fB, const wchar_t \fIwch\fB);\fR
-\fBint ungetch_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
-\fBint ungetmouse_sp(SCREEN* \fIsp\fB, MEVENT* \fIevent\fB);\fR
-\fBint use_default_colors_sp(SCREEN* \fIsp\fB);\fR
-\fBvoid use_env_sp(SCREEN* \fIsp\fB, bool \fIbf\fB);\fR
-\fBint use_legacy_coding_sp(SCREEN* \fIsp\fB, int \fIlevel\fB);\fR
-\fBvoid use_tioctl_sp(SCREEN *\fIsp\fB, bool \fIbf\fB);\fR
+\fBchtype termattrs_sp(SCREEN* \fIsp\fP);
+\fBchar* termname_sp(SCREEN* \fIsp\fP);
+\fBint typeahead_sp(SCREEN* \fIsp\fP, int \fIfd\fP);
+\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwch\fP);
+\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIch\fP);
+\fBint ungetmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+\fBint use_default_colors_sp(SCREEN* \fIsp\fP);
+\fBvoid use_env_sp(SCREEN* \fIsp\fP, bool \fIbf\fP);
+\fBint use_legacy_coding_sp(SCREEN* \fIsp\fP, int \fIlevel\fP);
+\fBvoid use_tioctl_sp(SCREEN *\fIsp\fP, bool \fIbf\fP);
 .PP
-\fBint vid_attr_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, 
void * \fIopts\fB);\fR
-\fBint vid_puts_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, 
void * \fIopts\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
-\fBint vidattr_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB);\fR
-\fBint vidputs_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB, NCURSES_SP_OUTC 
\fIputc\fB);\fR
-\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fB, cchar_t *\fIch\fB);\fR
+\fBint vid_attr_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, 
void * \fIopts\fP);
+\fBint vid_puts_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, 
void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
+\fBint vidattr_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP);
+\fBint vidputs_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC 
\fIputc\fP);
+\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIch\fP);
 .PP
-\fB#include <form.h>\fP
+\fB#include <form.h>
 .PP
-\fBFORM* new_form_sp(SCREEN* \fIsp\fB, FIELD **\fIfields\fB);\fR
+\fBFORM* new_form_sp(SCREEN* \fIsp\fP, FIELD **\fIfields\fP);
 .PP
-\fB#include <menu.h>\fP
+\fB#include <menu.h>
 .PP
-\fBMENU* new_menu_sp(SCREEN* \fIsp\fB, ITEM **\fIitems\fB);\fR
+\fBMENU* new_menu_sp(SCREEN* \fIsp\fP, ITEM **\fIitems\fP);
 .PP
-\fB#include <panel.h>\fP
+\fB#include <panel.h>
 .PP
-\fBPANEL* ceiling_panel(SCREEN* \fIsp\fB);\fR
-.br
-\fBPANEL* ground_panel(SCREEN* \fIsp\fB);\fR
-.br
-\fBvoid update_panels_sp(SCREEN* \fIsp\fB);\fR
+\fBPANEL* ceiling_panel(SCREEN* \fIsp\fP);
+\fBPANEL* ground_panel(SCREEN* \fIsp\fP);
+\fBvoid update_panels_sp(SCREEN* \fIsp\fP);
 .PP
-\fB#include <term.h>\fP
+\fB#include <term.h>
 .PP
-\fBint del_curterm_sp(SCREEN* \fIsp\fB, TERMINAL *\fIoterm\fB);\fR
-\fBint putp_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB);\fR
-\fBint restartterm_sp(SCREEN* \fIsp\fB, NCURSES_CONST char*\fIterm\fB, int 
\fIfiledes\fB, int *\fIerrret\fB);\fR
-\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fB, TERMINAL*\fInterm\fB);\fR
-\fBint tgetent_sp(SCREEN* \fIsp\fB, char *\fIbp\fB, const char *\fIname\fB);\fR
-\fBint tgetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBint tgetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBchar* tgetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, char 
**\fIarea\fB);\fR
-\fBchar* tgoto_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, int \fIcol\fB, 
int \fIrow\fB);\fR
-\fBint tigetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+\fBint del_curterm_sp(SCREEN* \fIsp\fP, TERMINAL *\fIoterm\fP);
+\fBint putp_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP);
+\fBint restartterm_sp(SCREEN* \fIsp\fP, NCURSES_CONST char*\fIterm\fP, int 
\fIfiledes\fP, int *\fIerrret\fP);
+\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fP, TERMINAL*\fInterm\fP);
+\fBint tgetent_sp(SCREEN* \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
+\fBint tgetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBint tgetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBchar* tgetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, char 
**\fIarea\fP);
+\fBchar* tgoto_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, 
int \fIrow\fP);
+\fBint tigetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
 .PP
-\fBint tigetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fBchar* tigetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
-\fI/* may instead use 9 long parameters */\fP
-\fBchar* tparm_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, ...);\fR
-\fBint tputs_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, int \fIaffcnt\fB, 
NCURSES_SP_OUTC \fIputc\fB);\fR
+\fBint tigetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fBchar* tigetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+\fI/* may instead use 9 long parameters */
+\fBchar* tparm_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, ...);
+\fBint tputs_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, 
NCURSES_SP_OUTC \fIputc\fP);
 .PP
-\fB#include <unctrl.h>\fP
+\fB#include <unctrl.h>
 .PP
-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fB, chtype \fIc\fB);\fR
+\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIc\fP);
 .fi
 .SH DESCRIPTION
 This implementation can be configured to provide a set of functions which
diff --git a/man/curs_termattrs.3x b/man/curs_termattrs.3x
index f8fe7c06..a3444aa6 100644
--- a/man/curs_termattrs.3x
+++ b/man/curs_termattrs.3x
@@ -43,30 +43,21 @@ .SH NAME
 \fB\%termname\fP \-
 \fIcurses\fR environment query routines
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint baudrate(void);\fP
-.br
-\fBchar erasechar(void);\fP
-.br
-\fBint erasewchar(wchar_t *\fIch\fB);\fR
-.br
-\fBbool has_ic(void);\fP
-.br
-\fBbool has_il(void);\fP
-.br
-\fBchar killchar(void);\fP
-.br
-\fBint killwchar(wchar_t *\fIch\fB);\fR
-.br
-\fBchar *longname(void);\fP
-.br
-\fBattr_t term_attrs(void);\fP
-.br
-\fBchtype termattrs(void);\fP
-.br
-\fBchar *termname(void);\fP
-.br
+\fBint baudrate(void);
+\fBchar erasechar(void);
+\fBint erasewchar(wchar_t *\fIch\fP);
+\fBbool has_ic(void);
+\fBbool has_il(void);
+\fBchar killchar(void);
+\fBint killwchar(wchar_t *\fIch\fP);
+\fBchar *longname(void);
+\fBattr_t term_attrs(void);
+\fBchtype termattrs(void);
+\fBchar *termname(void);
+.fi
 .SH DESCRIPTION
 .SS baudrate
 The \fBbaudrate\fP routine returns the output speed of the terminal.
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 665e1388..d155c0b6 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -59,29 +59,22 @@ .SH NAME
 \fB\%tputs\fP \-
 \fIcurses\fR emulation of \fItermcap\fR
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.br
-\fB#include <term.h>\fP
-.sp
-\fBextern char PC;\fP
-.br
-\fBextern char * UP;\fP
-.br
-\fBextern char * BC;\fP
-.br
-\fBextern @NCURSES_OSPEED@ ospeed;\fP
-.sp
-\fBint tgetent(char *\fIbp\fB, const char *\fIname\fB);\fR
-.br
-\fBint tgetflag(const char *\fIid\fB);\fR
-.br
-\fBint tgetnum(const char *\fIid\fB);\fR
-.br
-\fBchar *tgetstr(const char *\fIid\fB, char **\fIarea\fB);\fR
-.br
-\fBchar *tgoto(const char *\fIcap\fB, int \fIcol\fB, int \fIrow\fB);\fR
-.br
-\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int 
(*\fIputc\fB)(int));\fR
+.nf
+\fB#include <curses.h>
+\fB#include <term.h>
+.PP
+\fBextern char PC;
+\fBextern char * UP;
+\fBextern char * BC;
+\fBextern @NCURSES_OSPEED@ ospeed;
+.PP
+\fBint tgetent(char *\fIbp\fP, const char *\fIname\fP);
+\fBint tgetflag(const char *\fIid\fP);
+\fBint tgetnum(const char *\fIid\fP);
+\fBchar *tgetstr(const char *\fIid\fP, char **\fIarea\fP);
+\fBchar *tgoto(const char *\fIcap\fP, int \fIcol\fP, int \fIrow\fP);
+\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+.fi
 .SH DESCRIPTION
 These routines are included as a conversion aid for programs that use
 the \fItermcap\fP library.
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 480c6f00..3b72ad8e 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -69,49 +69,49 @@ .SH NAME
 \fIcurses\fR interfaces to \fIterminfo\fR database
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-\fB#include <term.h>\fP
+\fB#include <curses.h>
+\fB#include <term.h>
 .PP
-\fBTERMINAL *cur_term;\fP
+\fBTERMINAL *cur_term;
 .PP
-\fBconst char * const boolnames[];\fP
-\fBconst char * const boolcodes[];\fP
-\fBconst char * const boolfnames[];\fP
-\fBconst char * const numnames[];\fP
-\fBconst char * const numcodes[];\fP
-\fBconst char * const numfnames[];\fP
-\fBconst char * const strnames[];\fP
-\fBconst char * const strcodes[];\fP
-\fBconst char * const strfnames[];\fP
+\fBconst char * const boolnames[];
+\fBconst char * const boolcodes[];
+\fBconst char * const boolfnames[];
+\fBconst char * const numnames[];
+\fBconst char * const numcodes[];
+\fBconst char * const numfnames[];
+\fBconst char * const strnames[];
+\fBconst char * const strcodes[];
+\fBconst char * const strfnames[];
 .PP
-\fBint setupterm(const char *\fIterm\fB, int \fIfiledes\fB, int 
*\fIerrret\fB);\fR
-\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fB);\fR
-\fBint del_curterm(TERMINAL *\fIoterm\fB);\fR
-\fBint restartterm(const char *\fIterm\fB, int \fIfiledes\fB, int 
*\fIerrret\fB);\fR
+\fBint setupterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fP);
+\fBint del_curterm(TERMINAL *\fIoterm\fP);
+\fBint restartterm(const char *\fIterm\fP, int \fIfiledes\fP, int 
*\fIerrret\fP);
 .PP
-\fBchar *tparm(const char *\fIstr\fB, ...);\fR
-       \fIor\fP
-\fBchar *tparm(const char *\fIstr\fB, long \fIp1 ... \fBlong \fIp9\fB);\fR
+\fBchar *tparm(const char *\fIstr\fP, ...);
+       \fIor
+\fBchar *tparm(const char *\fIstr\fP, long \fIp1 ... \fPlong \fIp9\fP);
 .PP
-\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int 
(*\fIputc\fB)(int));\fR
-\fBint putp(const char *\fIstr\fB);\fR
+\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+\fBint putp(const char *\fIstr\fP);
 .PP
-\fBint vidputs(chtype \fIattrs\fB, int (*\fIputc\fB)(int));\fR
-\fBint vidattr(chtype \fIattrs\fB);\fR
-\fBint vid_puts(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB, int 
(*\fIputc\fB)(int));\fR
-\fBint vid_attr(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
+\fBint vidputs(chtype \fIattrs\fP, int (*\fIputc\fP)(int));
+\fBint vidattr(chtype \fIattrs\fP);
+\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP, int 
(*\fIputc\fP)(int));
+\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
 .PP
-\fBint mvcur(int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fB, int 
\fInewcol\fB);\fR
+\fBint mvcur(int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int 
\fInewcol\fP);
 .PP
-\fBint tigetflag(const char *\fIcapname\fB);\fR
-\fBint tigetnum(const char *\fIcapname\fB);\fR
-\fBchar *tigetstr(const char *\fIcapname\fB);\fR
+\fBint tigetflag(const char *\fIcapname\fP);
+\fBint tigetnum(const char *\fIcapname\fP);
+\fBchar *tigetstr(const char *\fIcapname\fP);
 .PP
-\fBchar *tiparm(const char *\fIstr\fB, ...);\fR
+\fBchar *tiparm(const char *\fIstr\fP, ...);
 .PP
-\fI/* extensions */\fP
-\fBchar *tiparm_s(int \fIexpected\fB, int \fImask\fB, const char *\fIstr\fB, 
...);\fR
-\fBint tiscan_s(int *\fIexpected\fB, int *\fImask\fB, const char 
*\fIstr\fB);\fR
+\fI/* extensions */
+\fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, 
...);
+\fBint tiscan_s(int *\fIexpected\fP, int *\fImask\fP, const char *\fIstr\fP);
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index ed01588a..44971a83 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -56,18 +56,18 @@ .SH NAME
 \fIcurses\fR support for multi-threaded applications
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fI/* data types */\fP
-\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fP
-\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fP
+\fI/* data types */
+\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
+\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
 .PP
-\fBint get_escdelay(void);\fP
-\fBint set_escdelay(int \fIms\fB);\fR
-\fBint set_tabsize(int \fIcols\fB);\fR
+\fBint get_escdelay(void);
+\fBint set_escdelay(int \fIms\fP);
+\fBint set_tabsize(int \fIcols\fP);
 .PP
-\fBint use_screen(SCREEN *\fIscr\fB, NCURSES_SCREEN_CB \fIfunc\fB, void 
*\fIdata\fB);\fR
-\fBint use_window(WINDOW *\fIwin\fB, NCURSES_WINDOW_CB \fIfunc\fB, void 
*\fIdata\fB);\fR
+\fBint use_screen(SCREEN *\fIscr\fP, NCURSES_SCREEN_CB \fIfunc\fP, void 
*\fIdata\fP);
+\fBint use_window(WINDOW *\fIwin\fP, NCURSES_WINDOW_CB \fIfunc\fP, void 
*\fIdata\fP);
 .fi
 .SH DESCRIPTION
 The \fIncurses\fP library can be configured to support multi-threaded
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index 72bcb6aa..884bfdf2 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -39,17 +39,17 @@ .SH NAME
 control terminal output refresh in a \fIcurses\fR window
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint touchline(WINDOW *\fIwin\fB, int \fIstart\fB, int \fIcount\fB);\fR
+\fBint touchline(WINDOW *\fIwin\fP, int \fIstart\fP, int \fIcount\fP);
 .PP
-\fBint touchwin(WINDOW *\fIwin\fB);\fR
-\fBint wtouchln(WINDOW *\fIwin\fB, int \fIy\fB, int \fIn\fB, int 
\fIchanged\fB);\fR
+\fBint touchwin(WINDOW *\fIwin\fP);
+\fBint wtouchln(WINDOW *\fIwin\fP, int \fIy\fP, int \fIn\fP, int 
\fIchanged\fP);
 .PP
-\fBint untouchwin(WINDOW *\fIwin\fB);\fR
+\fBint untouchwin(WINDOW *\fIwin\fP);
 .PP
-\fBbool is_linetouched(WINDOW *\fIwin\fB, int \fIline\fB);\fR
-\fBbool is_wintouched(WINDOW *\fIwin\fB);\fR
+\fBbool is_linetouched(WINDOW *\fIwin\fP, int \fIline\fP);
+\fBbool is_wintouched(WINDOW *\fIwin\fP);
 .fi
 .SH DESCRIPTION
 The \fB\%touchwin\fP and \fB\%touchline\fP routines throw away all
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index d0ef868c..3de0be61 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -61,26 +61,26 @@ .SH NAME
 \fIcurses\fR debugging routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBunsigned curses_trace(const unsigned \fIparam\fB);\fR
+\fBunsigned curses_trace(const unsigned \fIparam\fP);
 .PP
-\fBvoid _tracef(const char *\fIformat\fB, ...);\fR
+\fBvoid _tracef(const char *\fIformat\fP, ...);
 .PP
-\fBchar *_traceattr(attr_t \fIattr\fB);\fR
-\fBchar *_traceattr2(int \fIbuffer\fB, chtype \fIch\fB);\fR
-\fBchar *_tracecchar_t(const cchar_t *\fIstring\fB);\fR
-\fBchar *_tracecchar_t2(int \fIbuffer\fB, const cchar_t *\fIstring\fB);\fR
-\fBchar *_tracechar(int \fIch\fB);\fR
-\fBchar *_tracechtype(chtype \fIch\fB);\fR
-\fBchar *_tracechtype2(int \fIbuffer\fB, chtype \fIch\fB);\fR
+\fBchar *_traceattr(attr_t \fIattr\fP);
+\fBchar *_traceattr2(int \fIbuffer\fP, chtype \fIch\fP);
+\fBchar *_tracecchar_t(const cchar_t *\fIstring\fP);
+\fBchar *_tracecchar_t2(int \fIbuffer\fP, const cchar_t *\fIstring\fP);
+\fBchar *_tracechar(int \fIch\fP);
+\fBchar *_tracechtype(chtype \fIch\fP);
+\fBchar *_tracechtype2(int \fIbuffer\fP, chtype \fIch\fP);
 .PP
-\fBvoid _tracedump(const char *\fIlabel\fB, WINDOW *\fIwin\fB);\fR
-\fBchar *_nc_tracebits(void);\fP
-\fBchar *_tracemouse(const MEVENT *\fIevent\fB);\fR
+\fBvoid _tracedump(const char *\fIlabel\fP, WINDOW *\fIwin\fP);
+\fBchar *_nc_tracebits(void);
+\fBchar *_tracemouse(const MEVENT *\fIevent\fP);
 .PP
 \fI/* deprecated */\fP
-\fBvoid trace(const unsigned int \fIparam\fB);\fR
+\fBvoid trace(const unsigned int \fIparam\fP);
 .fi
 .SH DESCRIPTION
 The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 3f8dc869..57d0b925 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -61,27 +61,27 @@ .SH NAME
 miscellaneous \fIcurses\fR utility routines
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBconst char *unctrl(chtype \fIc\fB);\fR
-\fBwchar_t *wunctrl(cchar_t *\fIc\fB);\fR
+\fBconst char *unctrl(chtype \fIc\fP);
+\fBwchar_t *wunctrl(cchar_t *\fIc\fP);
 .PP
-\fBconst char *keyname(int \fIc\fB);\fR
-\fBconst char *key_name(wchar_t \fIw\fB);\fR
+\fBconst char *keyname(int \fIc\fP);
+\fBconst char *key_name(wchar_t \fIw\fP);
 .PP
-\fBvoid filter(void);\fP
+\fBvoid filter(void);
 .PP
-\fBvoid use_env(bool \fIf\fB);\fR
+\fBvoid use_env(bool \fIf\fP);
 .PP
-\fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
-\fBWINDOW *getwin(FILE *\fIfilep\fB);\fR
+\fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP);
+\fBWINDOW *getwin(FILE *\fIfilep\fP);
 .PP
-\fBint delay_output(int \fIms\fB);\fR
-\fBint flushinp(void);\fP
+\fBint delay_output(int \fIms\fP);
+\fBint flushinp(void);
 .PP
-\fI/* extensions */\fP
-\fBvoid nofilter(void);\fP
-\fBvoid use_tioctl(bool \fIf\fB);\fR
+\fI/* extensions */
+\fBvoid nofilter(void);
+\fBvoid use_tioctl(bool \fIf\fP);
 .fi
 .SH DESCRIPTION
 .SS unctrl
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index e7338108..b4353272 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -71,32 +71,32 @@ .SH NAME
 \fIcurses\fR data types, constants, and global variables
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fI/* data types */\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP bool;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;\fP
-\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;\fP
+\fI/* data types */
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP bool;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP chtype;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP cchar_t;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP attr_t;
+\fBtypedef \fI/*\fP .\|.\|. \fI*/\fP WINDOW;
 .PP
-\fI/* constants */\fP
-\fBconst bool TRUE;\fP
-\fBconst bool FALSE;\fP
+\fI/* constants */
+\fBconst bool TRUE;
+\fBconst bool FALSE;
 .PP
-\fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;\fP
-\fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;\fP
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;
+\fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;
 .PP
-\fI/* variables */\fP
-\fBint COLOR_PAIRS;\fP
-\fBint COLORS;\fP
-\fBint COLS;\fP
-\fBint ESCDELAY;\fP
-\fBint LINES;\fP
-\fBint TABSIZE;\fP
-\fBWINDOW * curscr;\fP
-\fBWINDOW * newscr;\fP
-\fBWINDOW * stdscr;\fP
+\fI/* variables */
+\fBint COLOR_PAIRS;
+\fBint COLORS;
+\fBint COLS;
+\fBint ESCDELAY;
+\fBint LINES;
+\fBint TABSIZE;
+\fBWINDOW * curscr;
+\fBWINDOW * newscr;
+\fBWINDOW * stdscr;
 .fi
 .SH DESCRIPTION
 This page summarizes data types,
diff --git a/man/curs_window.3x b/man/curs_window.3x
index 91af66bd..e03e082e 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -47,35 +47,27 @@ .SH NAME
 \fB\%wsyncdown\fP \-
 create and manipulate \fIcurses\fR windows
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBWINDOW *newwin(\fP
+.nf
+\fB#include <curses.h>
+.PP
+\fBWINDOW *newwin(
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint delwin(WINDOW *\fIwin\fB);\fR
-.br
 \fBint mvwin(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
-.br
 \fBWINDOW *subwin(WINDOW *\fIorig\fB,\fR
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBWINDOW *derwin(WINDOW *\fIorig\fB,\fR
       \fBint \fInlines\fB, int \fIncols\fB,\fR
       \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
-.br
 \fBint mvderwin(WINDOW *\fIwin\fB, int \fIpar_y\fB, int \fIpar_x\fB);\fR
-.br
 \fBWINDOW *dupwin(WINDOW *\fIwin\fB);\fR
-.br
 \fBvoid wsyncup(WINDOW *\fIwin\fB);\fR
-.br
 \fBint syncok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
-.br
 \fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
-.br
 \fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS newwin
 Calling \fBnewwin\fP creates and returns a pointer to a new window with the
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 88dc4ca0..24d43567 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -46,11 +46,12 @@ .SH NAME
 \fB\%assume_default_colors\fP \-
 use terminal's default colors
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint use_default_colors(void);\fP
-.br
-\fBint assume_default_colors(int \fIfg\fB, int \fIbg\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint use_default_colors(void);
+\fBint assume_default_colors(int \fIfg\fP, int \fIbg\fP);
+.fi
 .SH DESCRIPTION
 The \fBuse_default_colors\fP and \fBassume_default_colors\fP
 functions are extensions to the curses library.
diff --git a/man/define_key.3x b/man/define_key.3x
index b9cf5d89..4facf33e 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%define_key\fP \-
 define a \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint define_key(const char *\fIdefinition\fB, int \fIkeycode\fB);\fR
+\fBint define_key(const char *\fIdefinition\fP, int \fIkeycode\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to define keycodes with their corresponding control
diff --git a/man/form.3x b/man/form.3x
index 7b3d882e..99d63a5c 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -49,7 +49,9 @@ .SH NAME
 \fBform\fP \-
 curses extension for programming forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
+.nf
+\fB#include <form.h>
+.fi
 .SH DESCRIPTION
 The \fBform\fP library provides terminal-independent facilities for composing
 form screens on character-cell terminals.
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index a5f7e752..424795aa 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -34,9 +34,11 @@ .SH NAME
 \fBpos_form_cursor\fP \-
 position a form window cursor
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint pos_form_cursor(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint pos_form_cursor(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpos_form_cursor\fP restores the cursor to the position required
 for the forms driver to continue processing requests.
diff --git a/man/form_data.3x b/man/form_data.3x
index de695c5d..072acbf1 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -35,11 +35,12 @@ .SH NAME
 \fBdata_behind\fP \-
 test for off-screen data in given forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBbool data_ahead(const FORM *\fIform\fB);\fR
-.br
-\fBbool data_behind(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBbool data_ahead(const FORM *\fIform\fP);
+\fBbool data_behind(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBdata_ahead\fP tests whether there is off-screen data
 ahead in the given form.
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 80d7a156..475f666d 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -39,11 +39,12 @@ .SH NAME
 \fBform_driver_w\fP \-
 command-processing loop of the form system
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint form_driver(FORM *\fIform\fB, int \fIc\fB);\fR
-.br
-\fBint form_driver_w(FORM *\fIform\fB, int \fIc\fB, wchar_t \fIwch\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint form_driver(FORM *\fIform\fP, int \fIc\fP);
+\fBint form_driver_w(FORM *\fIform\fP, int \fIc\fP, wchar_t \fIwch\fP);
+.fi
 .SH DESCRIPTION
 .SS form_driver
 Once a form has been posted (displayed), you should funnel input events to it
diff --git a/man/form_field.3x b/man/form_field.3x
index cd0e6500..1cc3bf0c 100644
--- a/man/form_field.3x
+++ b/man/form_field.3x
@@ -34,15 +34,14 @@ .SH NAME
 \fBform_field\fP \-
 make and break connections between fields and forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_fields(FORM *\fIform\fB, FIELD **\fIfields\fB);\fR
-.br
-\fBFIELD **form_fields(const FORM *\fIform\fB);\fR
-.br
-\fBint field_count(const FORM *\fIform\fB);\fR
-.br
-\fBint move_field(FIELD *\fIfield\fB, int \fIfrow\fB, int \fIfcol\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_fields(FORM *\fIform\fP, FIELD **\fIfields\fP);
+\fBFIELD **form_fields(const FORM *\fIform\fP);
+\fBint field_count(const FORM *\fIform\fP);
+\fBint move_field(FIELD *\fIfield\fP, int \fIfrow\fP, int \fIfcol\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_form_fields\fP changes the field pointer array of
 the given \fIform\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/form_field_attributes.3x b/man/form_field_attributes.3x
index 704fa0d3..11ea09ce 100644
--- a/man/form_field_attributes.3x
+++ b/man/form_field_attributes.3x
@@ -44,19 +44,18 @@ .SH NAME
 \fBform_field_attributes\fP \-
 color and attribute control for form fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_fore(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype field_fore(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_field_back(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype field_back(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_field_pad(FIELD *\fIfield\fB, int \fIpad\fB);\fR
-.br
-\fBint field_pad(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_fore(FIELD *\fIfield\fP, chtype \fIattr\fP);
+\fBchtype field_fore(const FIELD *\fIfield\fP);
+.PP
+\fBint set_field_back(FIELD *\fIfield\fP, chtype \fIattr\fP);
+\fBchtype field_back(const FIELD *\fIfield\fP);
+.PP
+\fBint set_field_pad(FIELD *\fIfield\fP, int \fIpad\fP);
+\fBint field_pad(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_fore\fP sets the foreground attribute of
 \fIfield\fP. This is the highlight used to display the field contents.  The
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index c4529515..3df5f5d1 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -48,17 +48,17 @@ .SH NAME
 \fBform_field_buffer\fP \-
 field buffer control
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_buffer(FIELD *\fIfield\fB, int \fIbuf\fB, const char 
*\fIvalue\fB);\fR
-.br
-\fBchar *field_buffer(const FIELD *\fIfield\fB, int \fIbuffer\fB);\fR
-.sp
-\fBint set_field_status(FIELD *\fIfield\fB, bool \fIstatus\fB);\fR
-.br
-\fBbool field_status(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint set_max_field(FIELD *\fIfield\fB, int \fImax\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_buffer(FIELD *\fIfield\fP, int \fIbuf\fP, const char 
*\fIvalue\fP);
+\fBchar *field_buffer(const FIELD *\fIfield\fP, int \fIbuffer\fP);
+.PP
+\fBint set_field_status(FIELD *\fIfield\fP, bool \fIstatus\fP);
+\fBbool field_status(const FIELD *\fIfield\fP);
+.PP
+\fBint set_max_field(FIELD *\fIfield\fP, int \fImax\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_buffer\fP sets the numbered buffer of the given field
 to contain a given string:
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index 20eb5a08..32b5e5e5 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -45,13 +45,13 @@ .SH NAME
 retrieve field characteristics
 .SH SYNOPSIS
 .nf
-\fB#include <form.h>\fP
-.sp
-\fBint field_info(const FIELD *\fIfield\fB,\fR
+\fB#include <form.h>
+.PP
+\fBint field_info(const FIELD *\fIfield\fP,
                \fBint *\fIrows\fB, int *\fIcols\fB,\fR
                \fBint *\fIfrow\fB, int *\fIfcol\fB,\fR
                \fBint *\fInrow\fB, int *\fInbuf\fB);\fR
-.sp
+.PP
 \fBint dynamic_field_info(const FIELD *\fIfield\fB,\fR
                        \fBint *\fIrows\fB, int *\fIcols\fB, int *\fImax\fB);\fR
 .fi
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index ca167b6e..4dadd37d 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -44,11 +44,12 @@ .SH NAME
 \fBfield_just\fP \-
 retrieve field characteristics
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_just(FIELD *\fIfield\fB, int \fIjustification\fB);\fR
-.br
-\fBint field_just(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_just(FIELD *\fIfield\fP, int \fIjustification\fP);
+\fBint field_just(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_just\fP sets the justification attribute of
 a field; \fBfield_just\fP returns a field's justification attribute.
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 0630d2c8..cd3dca6d 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -36,17 +36,16 @@ .SH NAME
 \fBfree_field\fP \-
 create and destroy form fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFIELD *new_field(int \fIheight\fB, int \fIwidth\fB,\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBFIELD *new_field(int \fIheight\fP, int \fIwidth\fP,
                  \fBint \fItoprow\fB, int \fIleftcol\fB,\fR
                  \fBint \fIoffscreen\fB, int \fInbuffers\fB);\fR
-.br
 \fBFIELD *dup_field(FIELD *\fIfield\fB, int \fItoprow\fB, int 
\fIleftcol\fB);\fR
-.br
 \fBFIELD *link_field(FIELD *\fIfield\fB, int \fItoprow\fB, int 
\fIleftcol\fB);\fR
-.br
 \fBint free_field(FIELD *\fIfield\fB);\fR
+.fi
 .SH DESCRIPTION
 The function \fBnew_field\fP allocates a new field and initializes it from the
 parameters given: height, width, row of upper-left corner, column of upper-left
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index 4ad18262..f6baadf0 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -36,15 +36,15 @@ .SH NAME
 \fBfield_opts\fP \-
 set and get field options
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_opts(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBField_Options field_opts(const FIELD *\fIfield\fB);\fR
-.sp
-\fBint field_opts_on(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBint field_opts_off(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_opts(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+\fBField_Options field_opts(const FIELD *\fIfield\fP);
+.PP
+\fBint field_opts_on(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+\fBint field_opts_off(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_field_opts\fP sets all the given field's option bits (field
 option bits may be logically-OR'ed together).
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 48d067f4..04f94309 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBfield_userptr\fP \-
 associate application data with a form field
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_userptr(FIELD *\fIfield\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *field_userptr(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_userptr(FIELD *\fIfield\fP, void *\fIuserptr\fP);
+\fBvoid *field_userptr(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 Every form field has a field that can be used to hold application-specific data
 (that is, the form-driver code leaves it alone).
diff --git a/man/form_field_validation.3x b/man/form_field_validation.3x
index d668f8c0..fedad9a7 100644
--- a/man/form_field_validation.3x
+++ b/man/form_field_validation.3x
@@ -48,29 +48,22 @@ .SH NAME
 \fBform_field_validation\fP \-
 data type validation for fields
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBvoid *field_arg(const FIELD *\fIfield\fB);\fR
-.br
-\fBFIELDTYPE *field_type(const FIELD *\fIfield\fB);\fR
-.br
-\fBint set_field_type(FIELD *\fIfield\fB, FIELDTYPE *\fItype\fB, ...);\fR
-.sp
+.nf
+\fB#include <form.h>
+.PP
+\fBvoid *field_arg(const FIELD *\fIfield\fP);
+\fBFIELDTYPE *field_type(const FIELD *\fIfield\fP);
+\fBint set_field_type(FIELD *\fIfield\fP, FIELDTYPE *\fItype\fP, ...);
+.PP
 \fI/* predefined field types */\fP
-.br
-\fBFIELDTYPE *TYPE_ALNUM;\fP
-.br
-\fBFIELDTYPE *TYPE_ALPHA;\fP
-.br
-\fBFIELDTYPE *TYPE_ENUM;\fP
-.br
-\fBFIELDTYPE *TYPE_INTEGER;\fP
-.br
-\fBFIELDTYPE *TYPE_NUMERIC;\fP
-.br
-\fBFIELDTYPE *TYPE_REGEXP;\fP
-.br
-\fBFIELDTYPE *TYPE_IPV4;\fP
+\fBFIELDTYPE *TYPE_ALNUM;
+\fBFIELDTYPE *TYPE_ALPHA;
+\fBFIELDTYPE *TYPE_ENUM;
+\fBFIELDTYPE *TYPE_INTEGER;
+\fBFIELDTYPE *TYPE_NUMERIC;
+\fBFIELDTYPE *TYPE_REGEXP;
+\fBFIELDTYPE *TYPE_IPV4;
+.fi
 .SH DESCRIPTION
 By default, no validation is done on form fields.
 You can associate a form with with a \fIfield type\fP,
diff --git a/man/form_fieldtype.3x b/man/form_fieldtype.3x
index 4960b065..0744ac0a 100644
--- a/man/form_fieldtype.3x
+++ b/man/form_fieldtype.3x
@@ -37,27 +37,27 @@ .SH NAME
 \fBform_fieldtype\fP \-
 define validation-field types
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFIELDTYPE *new_fieldtype(\fP
+.nf
+\fB#include <form.h>
+.PP
+\fBFIELDTYPE *new_fieldtype(
     \fBbool (* const \fIfield_check\fB)(FIELD *, const void *),\fR
     \fBbool (* const \fIchar_check\fB)(int, const void *));\fR
-.br
 \fBint free_fieldtype(FIELDTYPE *\fIfieldtype\fB);\fR
-.sp
+.PP
 \fBint set_fieldtype_arg(\fP
     \fBFIELDTYPE *\fIfieldtype\fB,\fR
     \fBvoid *(* const \fImake_arg\fB)(va_list *),\fR
     \fBvoid *(* const \fIcopy_arg\fB)(const void *),\fR
     \fBvoid  (* const \fIfree_arg\fB)(void *));\fR
-.br
 \fBint set_fieldtype_choice(\fP
     \fBFIELDTYPE *\fIfieldtype\fB,\fR
     \fBbool (* const \fInext_choice\fB)(FIELD *, const void *),\fR
     \fBbool (* const \fIprev_choice\fB)(FIELD *, const void *));\fR
-.sp
+.PP
 \fBFIELDTYPE *link_fieldtype(FIELDTYPE *\fItype1\fB,\fR
                           \fBFIELDTYPE *\fItype2\fB);\fR
+.fi
 .SH DESCRIPTION
 .SS new_fieldtype
 The function \fBnew_fieldtype\fP creates a new field type usable for data
diff --git a/man/form_hook.3x b/man/form_hook.3x
index 5ebaf212..3ad100e4 100644
--- a/man/form_hook.3x
+++ b/man/form_hook.3x
@@ -33,23 +33,21 @@ .SH NAME
 \fBform_hook\fP \-
 set hooks for automatic invocation by applications
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_field_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook field_init(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_field_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook field_term(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook form_init(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
-.br
-\fBForm_Hook form_term(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_field_init(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook field_init(const FORM *\fIform\fP);
+.PP
+\fBint set_field_term(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook field_term(const FORM *\fIform\fP);
+.PP
+\fBint set_form_init(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook form_init(const FORM *\fIform\fP);
+.PP
+\fBint set_form_term(FORM *\fIform\fP, Form_Hook \fIfunc\fP);
+\fBForm_Hook form_term(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBform_driver\fP.
diff --git a/man/form_new.3x b/man/form_new.3x
index 5c9fd7a5..196e6cd3 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBfree_form\fP \-
 create and destroy forms
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBFORM *new_form(FIELD **\fIfields\fB);\fR
-.br
-\fBint free_form(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBFORM *new_form(FIELD **\fIfields\fP);
+\fBint free_form(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_form\fP creates a new form connected to a specified field
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 95e72247..5855bca3 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -44,11 +44,12 @@ .SH NAME
 \fBnew_page\fP \-
 form pagination functions
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_new_page(FIELD *\fIfield\fB, bool \fInew_page_flag\fB);\fR
-.br
-\fBbool new_page(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_new_page(FIELD *\fIfield\fP, bool \fInew_page_flag\fP);
+\fBbool new_page(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_new_page\fP sets or resets a flag marking the given field
 as the beginning of a new page on its form.
diff --git a/man/form_opts.3x b/man/form_opts.3x
index 3f78a9be..4dea4d5a 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -36,15 +36,15 @@ .SH NAME
 \fBform_opts\fP \-
 set and get form options
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_opts(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBField_Options form_opts(const FORM *\fIform\fB);\fR
-.sp
-\fBint form_opts_on(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
-.br
-\fBint form_opts_off(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_opts(FORM *\fIform\fP, Field_Options \fIopts\fP);
+\fBField_Options form_opts(const FORM *\fIform\fP);
+.PP
+\fBint form_opts_on(FORM *\fIform\fP, Field_Options \fIopts\fP);
+\fBint form_opts_off(FORM *\fIform\fP, Field_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_form_opts\fP sets all the given form's option bits (form
 option bits may be logically-OR'ed together).
diff --git a/man/form_page.3x b/man/form_page.3x
index 040ceb26..e2377a33 100644
--- a/man/form_page.3x
+++ b/man/form_page.3x
@@ -33,19 +33,19 @@ .SH NAME
 \fBform_page\fP \-
 set and get form page number
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_current_field(FORM *\fIform\fB, FIELD *\fIfield\fB);\fR
-.br
-\fBFIELD *current_field(const FORM *\fIform\fB);\fR
-.sp
-\fBint unfocus_current_field(FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_page(FORM *\fIform\fB, int \fIn\fB);\fR
-.br
-\fBint form_page(const FORM *\fIform\fB);\fR
-.sp
-\fBint field_index(const FIELD *\fIfield\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_current_field(FORM *\fIform\fP, FIELD *\fIfield\fP);
+\fBFIELD *current_field(const FORM *\fIform\fP);
+.PP
+\fBint unfocus_current_field(FORM *\fIform\fP);
+.PP
+\fBint set_form_page(FORM *\fIform\fP, int \fIn\fP);
+\fBint form_page(const FORM *\fIform\fP);
+.PP
+\fBint field_index(const FIELD *\fIfield\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_current_field\fP sets the current field of the given
 form; \fBcurrent_field\fP returns the current field of the given form.
diff --git a/man/form_post.3x b/man/form_post.3x
index e52bc125..354b3b87 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBunpost_form\fP \-
 write or erase forms from associated subwindows
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint post_form(FORM *\fIform\fB);\fR
-.br
-\fBint unpost_form(FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint post_form(FORM *\fIform\fP);
+\fBint unpost_form(FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpost_form\fP displays a form to its associated subwindow.
 To trigger physical display of the subwindow,
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 7dd06378..e8743cc1 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBform_request_name\fP \-
 handle printable form request names
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBconst char *form_request_name(int \fIrequest\fB);\fR
-.br
-\fBint form_request_by_name(const char *\fIname\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBconst char *form_request_name(int \fIrequest\fP);
+\fBint form_request_by_name(const char *\fIname\fP);
+.fi
 .SH DESCRIPTION
 The function \fBform_request_name\fP returns the printable name of a form
 request code.
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index 44b1abda..c5b263a2 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBform_userptr\fP \-
 associate application data with a form item
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_userptr(FORM *\fIform\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid* form_userptr(const FORM *\fIform\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_userptr(FORM *\fIform\fP, void *\fIuserptr\fP);
+\fBvoid* form_userptr(const FORM *\fIform\fP);
+.fi
 .SH DESCRIPTION
 Every form and every form item has a field that can be used to hold
 application-specific data (that is, the form-driver code leaves it alone).
diff --git a/man/form_variables.3x b/man/form_variables.3x
index 67995f7a..385a8c7a 100644
--- a/man/form_variables.3x
+++ b/man/form_variables.3x
@@ -40,15 +40,15 @@ .SH NAME
 form system global variables
 .SH SYNOPSIS
 .nf
-\fB#include <form.h>\fP
+\fB#include <form.h>
 .PP
-\fBFIELDTYPE * TYPE_ALNUM;\fP
-\fBFIELDTYPE * TYPE_ALPHA;\fP
-\fBFIELDTYPE * TYPE_ENUM;\fP
-\fBFIELDTYPE * TYPE_INTEGER;\fP
-\fBFIELDTYPE * TYPE_IPV4;\fP
-\fBFIELDTYPE * TYPE_NUMERIC;\fP
-\fBFIELDTYPE * TYPE_REGEXP;\fP
+\fBFIELDTYPE * TYPE_ALNUM;
+\fBFIELDTYPE * TYPE_ALPHA;
+\fBFIELDTYPE * TYPE_ENUM;
+\fBFIELDTYPE * TYPE_INTEGER;
+\fBFIELDTYPE * TYPE_IPV4;
+\fBFIELDTYPE * TYPE_NUMERIC;
+\fBFIELDTYPE * TYPE_REGEXP;
 .fi
 .SH DESCRIPTION
 These are building blocks for the form library,
diff --git a/man/form_win.3x b/man/form_win.3x
index 258ff49f..8858bc21 100644
--- a/man/form_win.3x
+++ b/man/form_win.3x
@@ -33,17 +33,17 @@ .SH NAME
 \fBform_win\fP \-
 make and break form window and subwindow associations
 .SH SYNOPSIS
-\fB#include <form.h>\fP
-.sp
-\fBint set_form_win(FORM *\fIform\fB, WINDOW *\fIwin\fB);\fR
-.br
-\fBWINDOW *form_win(const FORM *\fIform\fB);\fR
-.sp
-\fBint set_form_sub(FORM *\fIform\fB, WINDOW *\fIsub\fB);\fR
-.br
-\fBWINDOW *form_sub(const FORM *\fIform\fB);\fR
-.sp
-\fBint scale_form(const FORM *\fIform\fB, int *\fIrows\fB, int 
*\fIcolumns\fB);\fR
+.nf
+\fB#include <form.h>
+.PP
+\fBint set_form_win(FORM *\fIform\fP, WINDOW *\fIwin\fP);
+\fBWINDOW *form_win(const FORM *\fIform\fP);
+.PP
+\fBint set_form_sub(FORM *\fIform\fP, WINDOW *\fIsub\fP);
+\fBWINDOW *form_sub(const FORM *\fIform\fP);
+.PP
+\fBint scale_form(const FORM *\fIform\fP, int *\fIrows\fP, int *\fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 Every form has an associated pair of \fBcurses\fP windows.
 The form window
diff --git a/man/key_defined.3x b/man/key_defined.3x
index aceea6ed..09a9c985 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fR keycode is defined
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint key_defined(const char *\fIdefinition\fB);\fR
+\fBint key_defined(const char *\fIdefinition\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to determine if a string is currently bound
diff --git a/man/keybound.3x b/man/keybound.3x
index 33630128..61e1245e 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%keybound\fP \-
 get definition of \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBchar * keybound(int \fIkeycode\fB, int \fIcount);\fR
+\fBchar * keybound(int \fIkeycode\fP, int \fIcount);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to determine the string which is defined
diff --git a/man/keyok.3x b/man/keyok.3x
index 92f9af9a..ec2ffff8 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%keyok\fP \-
 enable or disable a \fIcurses\fR keycode
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
 .PP
-\fBint keyok(int \fIkeycode\fB, bool \fIenable\fB);\fR
+\fBint keyok(int \fIkeycode\fP, bool \fIenable\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
 It permits an application to disable specific keycodes, rather than
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index 9f9b421f..d1369677 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%use_legacy_coding\fP \-
 override \fIcurses\fR locale encoding checks
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint use_legacy_coding(int \fIlevel\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint use_legacy_coding(int \fIlevel\fP);
+.fi
 .SH DESCRIPTION
 The \fBuse_legacy_coding\fP function is an extension to the curses library.
 It allows the caller to change the result of \fBunctrl\fP,
diff --git a/man/menu.3x b/man/menu.3x
index 261b6a01..f44a20c0 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -49,7 +49,9 @@ .SH NAME
 \fBmenu\fP \-
 curses extension for programming menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
+.nf
+\fB#include <menu.h>
+.fi
 .SH DESCRIPTION
 The \fBmenu\fP library provides terminal-independent facilities for composing
 menu systems on character-cell terminals.
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index 196701f4..d93d23d7 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -50,23 +50,21 @@ .SH NAME
 \fBset_menu_pad\fP \-
 color and attribute control for menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_fore(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_fore(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_back(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_back(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_grey(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
-.br
-\fBchtype menu_grey(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_pad(MENU *\fImenu\fB, int \fIpad\fB);\fR
-.br
-\fBint menu_pad(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_fore(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_fore(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_back(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_back(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_grey(MENU *\fImenu\fP, chtype \fIattr\fP);
+\fBchtype menu_grey(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_pad(MENU *\fImenu\fP, int \fIpad\fP);
+\fBint menu_pad(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_fore\fP sets the foreground attribute of
 \fImenu\fP. This is the highlight used for selected menu items.
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 170df95b..764ba9c6 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -33,9 +33,11 @@ .SH NAME
 \fBpos_menu_cursor\fP \-
 position a menu's cursor
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint pos_menu_cursor(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint pos_menu_cursor(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpos_menu_cursor\fP restores the cursor to the current position
 associated with the menu's selected item.
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 6acda6b7..002d47bd 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -37,9 +37,11 @@ .SH NAME
 \fBmenu_driver\fP \-
 command-processing loop of the menu system
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint menu_driver(MENU *\fImenu\fB, int \fIc\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint menu_driver(MENU *\fImenu\fP, int \fIc\fP);
+.fi
 .SH DESCRIPTION
 Once a menu has been posted (displayed), you should funnel input events to it
 through \fBmenu_driver\fP.  This routine has three major input cases:
diff --git a/man/menu_format.3x b/man/menu_format.3x
index 89385a64..c6e41c05 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBmenu_format\fP \-
 set and get menu sizes
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_format(MENU *\fImenu\fB, int \fIrows\fB, int \fIcols\fB);\fR
-.br
-\fBvoid menu_format(const MENU *\fImenu\fB, int *\fIrows\fB, int 
*\fIcols\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_format(MENU *\fImenu\fP, int \fIrows\fP, int \fIcols\fP);
+\fBvoid menu_format(const MENU *\fImenu\fP, int *\fIrows\fP, int *\fIcols\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_format\fP sets the maximum display size of the given
 menu.
diff --git a/man/menu_hook.3x b/man/menu_hook.3x
index 69aa77f7..f75a6cf3 100644
--- a/man/menu_hook.3x
+++ b/man/menu_hook.3x
@@ -33,23 +33,21 @@ .SH NAME
 \fBmenu_hook\fP \-
 set hooks for automatic invocation by applications
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_init(MENU *\fImenu\fB, Menu_Hook \fIfunc\fB);\fR
-.br
-\fBMenu_Hook item_init(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_item_term(MENU *\fImenu\fB, Menu_Hook \fIfunc\fB);\fR
-.br
-\fBMenu_Hook item_term(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_init(MENU *\fImenu\fB, Menu_Hook \fIfunc\fB);\fR
-.br
-\fBMenu_Hook menu_init(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_term(MENU *\fImenu\fB, Menu_Hook \fIfunc\fB);\fR
-.br
-\fBMenu_Hook menu_term(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_init(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook item_init(const MENU *\fImenu\fP);
+.PP
+\fBint set_item_term(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook item_term(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_init(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook menu_init(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_term(MENU *\fImenu\fP, Menu_Hook \fIfunc\fP);
+\fBMenu_Hook menu_term(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 These functions make it possible to set hook functions to be called at various
 points in the automatic processing of input event codes by \fBmenu_driver\fP.
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 970e9107..a502ecbc 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -35,13 +35,13 @@ .SH NAME
 \fBitem_count\fP \-
 make and break connections between items and menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_items(MENU *\fImenu\fB, ITEM **\fIitems\fB);\fR
-.br
-\fBITEM **menu_items(const MENU *\fImenu\fB);\fR
-.br
-\fBint item_count(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_items(MENU *\fImenu\fP, ITEM **\fIitems\fP);
+\fBITEM **menu_items(const MENU *\fImenu\fP);
+\fBint item_count(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_items\fP changes the item pointer array of the given
 \fImenu\fP.  The array must be terminated by a \fBNULL\fP.
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 3eb6ac6a..5763cb30 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBmenu_mark\fP \-
 get and set the menu mark string
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_mark(MENU *\fImenu\fB, const char *\fImark\fB);\fR
-.br
-\fBconst char *menu_mark(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_mark(MENU *\fImenu\fP, const char *\fImark\fP);
+\fBconst char *menu_mark(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 In order to make menu selections visible on older terminals without
 highlighting or color capability, the menu library marks selected items
diff --git a/man/menu_new.3x b/man/menu_new.3x
index c541de17..17764fc9 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBfree_menu\fP \-
 create and destroy menus
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBMENU *new_menu(ITEM **\fIitems\fB);\fR
-.br
-\fBint free_menu(MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBMENU *new_menu(ITEM **\fIitems\fP);
+\fBint free_menu(MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_menu\fP creates a new menu connected to a specified item
 pointer array (which must be \fBNULL\fP-terminated).
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 17895cbe..c66aab43 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -36,15 +36,15 @@ .SH NAME
 \fBmenu_opts\fP \-
 set and get menu options
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_opts(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
-.br
-\fBMenu_Options menu_opts(const MENU *\fImenu\fB);\fR
-.sp
-\fBint menu_opts_on(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
-.br
-\fBint menu_opts_off(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_opts(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+\fBMenu_Options menu_opts(const MENU *\fImenu\fP);
+.PP
+\fBint menu_opts_on(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+\fBint menu_opts_off(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index c1400d3d..d9058a00 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBmenu_pattern\fP \-
 set and get a menu's pattern buffer
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_pattern(MENU *\fImenu\fB, const char *\fIpattern\fB);\fR
-.br
-\fBchar *menu_pattern(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_pattern(MENU *\fImenu\fP, const char *\fIpattern\fP);
+\fBchar *menu_pattern(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 Every menu has an associated pattern match buffer.
 As input events that are
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 5b0780a6..d8bdee63 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBunpost_menu\fP \-
 write or erase menus from associated subwindows
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint post_menu(MENU *\fImenu\fB);\fR
-.br
-\fBint unpost_menu(MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint post_menu(MENU *\fImenu\fP);
+\fBint unpost_menu(MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 The function \fBpost_menu\fP displays a menu to its associated subwindow.
 To
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index 20bde158..a15f30fa 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBmenu_request_name\fP \-
 handle printable menu request names
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBconst char *menu_request_name(int \fIrequest\fB);\fR
-.br
-\fBint menu_request_by_name(const char *\fIname\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBconst char *menu_request_name(int \fIrequest\fP);
+\fBint menu_request_by_name(const char *\fIname\fP);
+.fi
 .SH DESCRIPTION
 The function \fBmenu_request_name\fP returns the printable name of a menu
 request code.
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index be485498..c6de5b70 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -34,17 +34,18 @@ .SH NAME
 \fBmenu_spacing\fP \-
 set and get spacing between menu items.
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_spacing(MENU *\fImenu\fB,\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_spacing(MENU *\fImenu\fP,
                      \fBint \fIspc_description\fB,\fR
                      \fBint \fIspc_rows\fB,\fR
                      \fBint \fIspc_columns\fB);\fR
-.br
 \fBint menu_spacing(const MENU *\fImenu\fB,\fR
                  \fBint* \fIspc_description\fB,\fR
                  \fBint* \fIspc_rows\fB,\fR
                  \fBint* \fIspc_columns\fB);\fR
+.fi
 .SH DESCRIPTION
 The function \fBset_menu_spacing\fP sets the spacing information for the menu.
 Its parameters provide the description and the size (in rows and columns).
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 94c4f95c..a7f34242 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBmenu_userptr\fP \-
 associate application data with a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_userptr(MENU *\fImenu\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *menu_userptr(const MENU *\fImenu\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_userptr(MENU *\fImenu\fP, void *\fIuserptr\fP);
+\fBvoid *menu_userptr(const MENU *\fImenu\fP);
+.fi
 .SH DESCRIPTION
 Every menu and every menu item has a field that can be used to hold
 application-specific data (that is, the menu-driver code leaves it alone).
diff --git a/man/menu_win.3x b/man/menu_win.3x
index 23a7cabd..1827b400 100644
--- a/man/menu_win.3x
+++ b/man/menu_win.3x
@@ -33,17 +33,17 @@ .SH NAME
 \fBmenu_win\fP \-
 make and break menu window and subwindow associations
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_menu_win(MENU *\fImenu\fB, WINDOW *\fIwin\fB);\fR
-.br
-\fBWINDOW *menu_win(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_menu_sub(MENU *\fImenu\fB, WINDOW *\fIsub\fB);\fR
-.br
-\fBWINDOW *menu_sub(const MENU *\fImenu\fB);\fR
-.sp
-\fBint scale_menu(const MENU *\fImenu\fB, int *\fIrows\fB, int 
*\fIcolumns\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_menu_win(MENU *\fImenu\fP, WINDOW *\fIwin\fP);
+\fBWINDOW *menu_win(const MENU *\fImenu\fP);
+.PP
+\fBint set_menu_sub(MENU *\fImenu\fP, WINDOW *\fIsub\fP);
+\fBWINDOW *menu_sub(const MENU *\fImenu\fP);
+.PP
+\fBint scale_menu(const MENU *\fImenu\fP, int *\fIrows\fP, int *\fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 Every menu has an associated pair of \fBcurses\fP windows.
 The menu window
diff --git a/man/mitem_current.3x b/man/mitem_current.3x
index b7bce94c..9781cb84 100644
--- a/man/mitem_current.3x
+++ b/man/mitem_current.3x
@@ -33,17 +33,17 @@ .SH NAME
 \fBmitem_current\fP \-
 set and get current_menu_item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_current_item(MENU *\fImenu\fB, ITEM *\fIitem\fB);\fR
-.br
-\fBITEM *current_item(const MENU *\fImenu\fB);\fR
-.sp
-\fBint set_top_row(MENU *\fImenu\fB, int \fIrow\fB);\fR
-.br
-\fBint top_row(const MENU *\fImenu\fB);\fR
-.sp
-\fBint item_index(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_current_item(MENU *\fImenu\fP, ITEM *\fIitem\fP);
+\fBITEM *current_item(const MENU *\fImenu\fP);
+.PP
+\fBint set_top_row(MENU *\fImenu\fP, int \fIrow\fP);
+\fBint top_row(const MENU *\fImenu\fP);
+.PP
+\fBint item_index(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_current_item\fP sets the current item (the item on which
 the menu cursor is positioned).
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index a6c08502..0ad5d315 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBitem_description\fP \-
 get menu item name and description fields
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBconst char *item_name(const ITEM *\fIitem\fB);\fR
-.br
-\fBconst char *item_description(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBconst char *item_name(const ITEM *\fIitem\fP);
+\fBconst char *item_description(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBitem_name\fP returns the name part of the given item.
 .br
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 97ada6f3..6d17fa37 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBfree_item\fP \-
 create and destroy menu items
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBITEM *new_item(const char *\fIname\fB, const char *\fIdescription\fB);\fR
-.br
-\fBint free_item(ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBITEM *new_item(const char *\fIname\fP, const char *\fIdescription\fP);
+\fBint free_item(ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 The function \fBnew_item\fP allocates a new item and initializes it from the
 \fBname\fP and \fBdescription\fP pointers.
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 3e719133..440d49e5 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -36,15 +36,15 @@ .SH NAME
 \fBitem_opts\fP \-
 set and get menu item options
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_opts(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
-.br
-\fBItem_Options item_opts(const ITEM *\fIitem\fB);\fR
-.sp
-\fBint item_opts_on(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
-.br
-\fBint item_opts_off(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_opts(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+\fBItem_Options item_opts(const ITEM *\fIitem\fP);
+.PP
+\fBint item_opts_on(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+\fBint item_opts_off(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+.fi
 .SH DESCRIPTION
 The function \fBset_item_opts\fP sets all the given item's option bits (menu
 option bits may be logically-OR'ed together).
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index 23d764d0..3ff8724a 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBitem_userptr\fP \-
 associate application data with a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_userptr(ITEM *\fIitem\fB, void *\fIuserptr\fB);\fR
-.br
-\fBvoid *item_userptr(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_userptr(ITEM *\fIitem\fP, void *\fIuserptr\fP);
+\fBvoid *item_userptr(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 Every menu item has a field that can be used to hold application-specific data
 (that is, the menu-driver code leaves it alone).
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index ec37afb7..1dc3a854 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -34,11 +34,12 @@ .SH NAME
 \fBitem_value\fP \-
 set and get menu item values
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBint set_item_value(ITEM *\fIitem\fB, bool \fIvalue\fB);\fR
-.br
-\fBbool item_value(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBint set_item_value(ITEM *\fIitem\fP, bool \fIvalue\fP);
+\fBbool item_value(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 If you turn off the menu option \fBO_ONEVALUE\fP (e.g., with
 \fBset_menu_opts\fP or \fBmenu_opts_off\fP; see \fBmenu_opts\fP(3X)), the menu
diff --git a/man/mitem_visible.3x b/man/mitem_visible.3x
index 1e73f7c9..7bcbf227 100644
--- a/man/mitem_visible.3x
+++ b/man/mitem_visible.3x
@@ -33,9 +33,11 @@ .SH NAME
 \fBmitem_visible\fP \-
 check visibility of a menu item
 .SH SYNOPSIS
-\fB#include <menu.h>\fP
-.sp
-\fBbool item_visible(const ITEM *\fIitem\fB);\fR
+.nf
+\fB#include <menu.h>
+.PP
+\fBbool item_visible(const ITEM *\fIitem\fP);
+.fi
 .SH DESCRIPTION
 A menu item is visible when it is in the portion of a posted menu that
 is mapped onto the screen (if the menu is scrollable, in particular, this
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 8f48b96c..e8cc5039 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -47,7 +47,9 @@ .SH NAME
 \fB\%ncurses\fP \-
 character-cell terminal interface with optimized output
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
+.nf
+\fB#include <curses.h>
+.fi
 .SH DESCRIPTION
 The \fBncurses\fP library routines give the user a terminal-independent method
 of updating character screens with reasonable optimization.
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 574e2958..e819f5c5 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -53,11 +53,11 @@ .SH NAME
 dynamically allocate \fIcurses\fR color pairs
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBint alloc_pair(int \fIfg\fB, int \fIbg\fB);\fR
-\fBint find_pair(int \fIfg\fB, int \fIbg\fB);\fR
-\fBint free_pair(int \fIpair\fB);\fR
+\fBint alloc_pair(int \fIfg\fP, int \fIbg\fP);
+\fBint find_pair(int \fIfg\fP, int \fIbg\fP);
+\fBint free_pair(int \fIpair\fP);
 .fi
 .SH DESCRIPTION
 These functions are an extension to the \fIcurses\fP library.
diff --git a/man/panel.3x b/man/panel.3x
index c85a0370..035c2ad1 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -48,44 +48,34 @@ .SH NAME
 panel \-
 panel stack extension for curses
 .SH SYNOPSIS
-\fB#include <panel.h>\fP
-.sp
-\fBPANEL *new_panel(WINDOW *\fIwin\fB);\fR
-.sp
-\fBint bottom_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBint top_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBint show_panel(PANEL *\fIpan\fB);\fR
-.br
-\fBvoid update_panels(void);\fP
-.br
-\fBint hide_panel(PANEL *\fIpan\fB);\fR
-.sp
-\fBWINDOW *panel_window(const PANEL *\fIpan\fB);\fR
-.br
-\fBint replace_panel(PANEL *\fIpan\fB, WINDOW *\fIwindow\fB);\fR
-.br
-\fBint move_panel(PANEL *\fIpan\fB, int \fIstarty\fB, int \fIstartx\fB);\fR
-.br
-\fBint panel_hidden(const PANEL *\fIpan\fB);\fR
-.sp
-\fBPANEL *panel_above(const PANEL *\fIpan\fB);\fR
-.br
-\fBPANEL *panel_below(const PANEL *\fIpan\fB);\fR
-.sp
-\fBint set_panel_userptr(PANEL *\fIpan\fB, const void *\fIptr\fB);\fR
-.br
-\fBconst void *panel_userptr(const PANEL *\fIpan\fB);\fR
-.sp
-\fBint del_panel(PANEL *\fIpan\fB);\fR
-.sp
+.nf
+\fB#include <panel.h>
+.PP
+\fBPANEL *new_panel(WINDOW *\fIwin\fP);
+.PP
+\fBint bottom_panel(PANEL *\fIpan\fP);
+\fBint top_panel(PANEL *\fIpan\fP);
+\fBint show_panel(PANEL *\fIpan\fP);
+\fBvoid update_panels(void);
+\fBint hide_panel(PANEL *\fIpan\fP);
+.PP
+\fBWINDOW *panel_window(const PANEL *\fIpan\fP);
+\fBint replace_panel(PANEL *\fIpan\fP, WINDOW *\fIwindow\fP);
+\fBint move_panel(PANEL *\fIpan\fP, int \fIstarty\fP, int \fIstartx\fP);
+\fBint panel_hidden(const PANEL *\fIpan\fP);
+.PP
+\fBPANEL *panel_above(const PANEL *\fIpan\fP);
+\fBPANEL *panel_below(const PANEL *\fIpan\fP);
+.PP
+\fBint set_panel_userptr(PANEL *\fIpan\fP, const void *\fIptr\fP);
+\fBconst void *panel_userptr(const PANEL *\fIpan\fP);
+.PP
+\fBint del_panel(PANEL *\fIpan\fP);
+.PP
 \fI/* ncurses extensions */\fP
-.br
-\fBPANEL *ground_panel(SCREEN *\fIsp\fB);\fR
-.br
-\fBPANEL *ceiling_panel(SCREEN *\fIsp\fB);\fR
-.br
+\fBPANEL *ground_panel(SCREEN *\fIsp\fP);
+\fBPANEL *ceiling_panel(SCREEN *\fIsp\fP);
+.fi
 .SH DESCRIPTION
 Panels are \fBcurses\fP(3X) windows with the added feature of
 depth.
diff --git a/man/resizeterm.3x b/man/resizeterm.3x
index 08325d60..9cb1812e 100644
--- a/man/resizeterm.3x
+++ b/man/resizeterm.3x
@@ -42,11 +42,11 @@ .SH NAME
 manage the terminal dimensions understood by \fIcurses\fR
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
+\fB#include <curses.h>
 .PP
-\fBbool is_term_resized(int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resize_term(int \fIlines\fB, int \fIcolumns\fB);\fR
-\fBint resizeterm(int \fIlines\fB, int \fIcolumns\fB);\fR
+\fBbool is_term_resized(int \fIlines\fP, int \fIcolumns\fP);
+\fBint resize_term(int \fIlines\fP, int \fIcolumns\fP);
+\fBint resizeterm(int \fIlines\fP, int \fIcolumns\fP);
 .fi
 .SH DESCRIPTION
 This is an extension to the \fIcurses\fP library.
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 8c3179f3..d5680de1 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -58,36 +58,28 @@ .SH NAME
 \fIterminfo\fR global variables
 .SH SYNOPSIS
 .nf
-\fB#include <curses.h>\fP
-.br
-\fB#include <term.h>\fP
-.PP
-\fBchtype acs_map[];\fP
-.sp
-\fBSCREEN * SP;\fP
-.sp
-\fBTERMINAL * cur_term;\fP
-.sp
-\fBchar ttytype[];\fP
-.sp
-\fBNCURSES_CONST char * const boolcodes[];\fP
-.br
-\fBNCURSES_CONST char * const boolfnames[];\fP
-.br
-\fBNCURSES_CONST char * const boolnames[];\fP
-.sp
-\fBNCURSES_CONST char * const numcodes[];\fP
-.br
-\fBNCURSES_CONST char * const numfnames[];\fP
-.br
-\fBNCURSES_CONST char * const numnames[];\fP
-.sp
-\fBNCURSES_CONST char * const strcodes[];\fP
-.br
-\fBNCURSES_CONST char * const strfnames[];\fP
-.br
-\fBNCURSES_CONST char * const strnames[];\fP
-.br
+\fB#include <curses.h>
+\fB#include <term.h>
+.PP
+\fBchtype acs_map[];
+.PP
+\fBSCREEN * SP;
+.PP
+\fBTERMINAL * cur_term;
+.PP
+\fBchar ttytype[];
+.PP
+\fBNCURSES_CONST char * const boolcodes[];
+\fBNCURSES_CONST char * const boolfnames[];
+\fBNCURSES_CONST char * const boolnames[];
+.PP
+\fBNCURSES_CONST char * const numcodes[];
+\fBNCURSES_CONST char * const numfnames[];
+\fBNCURSES_CONST char * const numnames[];
+.PP
+\fBNCURSES_CONST char * const strcodes[];
+\fBNCURSES_CONST char * const strfnames[];
+\fBNCURSES_CONST char * const strnames[];
 .fi
 .SH DESCRIPTION
 This page summarizes variables provided by the \fBcurses\fP library's
diff --git a/man/wresize.3x b/man/wresize.3x
index ab2674d6..0fbe5d66 100644
--- a/man/wresize.3x
+++ b/man/wresize.3x
@@ -35,9 +35,11 @@ .SH NAME
 \fB\%wresize\fP \-
 resize a \fIcurses\fR window
 .SH SYNOPSIS
-\fB#include <curses.h>\fP
-.sp
-\fBint wresize(WINDOW *\fIwin\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+.nf
+\fB#include <curses.h>
+.PP
+\fBint wresize(WINDOW *\fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
+.fi
 .SH DESCRIPTION
 This is an extension to the curses library.
 It reallocates storage for an \fBncurses\fP
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]